Skip to content

Commit

Permalink
build: resolve dependency issues with built vsix (#1801)
Browse files Browse the repository at this point in the history 
The built `vsix` needs `vscode-html-languageservice` and
`vscode-languageserver-textdocument` in the node_modules of the vsix
after microsoft/vscode-html-languageservice@e7ae8a7.
These dependencies must be listed as direct dependencies in the
`package.json` rather than `devDependencies`.
  • Loading branch information
@atscott
atscott authored Nov 15, 2022
1 parent a0ae25d commit 340bc76
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 27 deletions.
2 changes: 2 additions & 0 deletions BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@ npm_package(
":node_modules/vscode-html-languageservice",
":node_modules/vscode-languageclient",
":node_modules/vscode-languageserver-protocol",
":node_modules/vscode-languageserver-textdocument",
":node_modules/vscode-languageserver-types",
":node_modules/vscode-languageserver",
":node_modules/vscode-nls",
":node_modules/vscode-uri",
":node_modules/yallist",
],
Expand Down
9 changes: 5 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,14 @@
"test:legacy-syntaxes": "yarn compile:syntaxes-test && yarn build:syntaxes && jasmine dist/syntaxes/test/driver.js"
},
"dependencies": {
"@angular/language-service": "15.0.0-next.0",
"@angular/language-service": "15.0.0-rc.4",
"typescript": "4.8.2",
"vscode-html-languageservice": "^4.2.5",
"vscode-jsonrpc": "6.0.0",
"vscode-languageclient": "7.0.0",
"vscode-languageserver": "7.0.0",
"vscode-uri": "3.0.3"
"vscode-languageserver-textdocument": "^1.0.7",
"vscode-uri": "3.0.4"
},
"devDependencies": {
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#262cb3bb487e8dddb3c404f4f2c8b34a9a1f14c2",
Expand All @@ -249,9 +251,8 @@
"tslint": "6.1.3",
"tslint-eslint-rules": "5.4.0",
"vsce": "1.100.1",
"vscode-html-languageservice": "^5.0.2",
"vscode-languageserver-protocol": "3.16.0",
"vscode-languageserver-textdocument": "1.0.7",
"vscode-languageserver-types": "3.16.0",
"vscode-test": "1.6.1",
"vscode-tmgrammar-test": "0.0.11"
},
Expand Down
4 changes: 2 additions & 2 deletions server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"ngserver": "./bin/ngserver"
},
"dependencies": {
"@angular/language-service": "15.0.0-next.0",
"vscode-html-languageservice": "^5.0.2",
"@angular/language-service": "15.0.0-rc.4",
"vscode-html-languageservice": "^4.2.5",
"vscode-jsonrpc": "6.0.0",
"vscode-languageserver": "7.0.0",
"vscode-languageserver-textdocument": "^1.0.7",
Expand Down
2 changes: 1 addition & 1 deletion server/src/version_provider.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import url from 'url';

import {NodeModule, resolve, Version} from '../../common/resolver';

const MIN_TS_VERSION = '4.3';
const MIN_TS_VERSION = '4.8';
const MIN_NG_VERSION = '13.0';
const TSSERVERLIB = 'typescript/lib/tsserverlibrary';

Expand Down
40 changes: 20 additions & 20 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,10 @@
uuid "^8.3.2"
yargs "^17.0.0"

"@angular/[email protected]next.0":
version "15.0.0-next.0"
resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-15.0.0-next.0.tgz#3613afda131ef69caaaacd49651f5ed99721798d"
integrity sha512-9luLYZs1ZnqhNLw5U+CEvjq98nprMn/uLmW229WW4cIWYfTSu4jwXhb/d+PaDhAUX6qQaFAjdzT/p58Vmt2L6w==
"@angular/[email protected]rc.4":
version "15.0.0-rc.4"
resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-15.0.0-rc.4.tgz#870ac420104e970fc88979ce84381f995c1c778b"
integrity sha512-bf1yAkMMacvvXCztT5M+Z5nySrsRfgEFYVq4d7hEXvr3EIFE9ORFsdmYyuTE2FP2vWtGmaxpPZcyIXRdFGEsJw==

"@assemblyscript/loader@^0.10.1":
version "0.10.1"
Expand Down Expand Up @@ -7573,15 +7573,15 @@ [email protected]:
yauzl "^2.3.1"
yazl "^2.2.2"

vscode-html-languageservice@^5.0.2:
version "5.0.2"
resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-5.0.2.tgz#a66cb9d779f3094a8d14dd3a8f7935748435fd2a"
integrity sha512-TQmeyE14Ure/w/S+RV2IItuRWmw/i1QaS+om6t70iHCpamuTTWnACQPMSltVGm/DlbdyMquUePJREjd/h3AVkQ==
vscode-html-languageservice@^4.2.5:
version "4.2.5"
resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-4.2.5.tgz#c0cc8ff3d824d16388bbac187e1828749eccf006"
integrity sha512-dbr10KHabB9EaK8lI0XZW7SqOsTfrNyT3Nuj0GoPi4LjGKUmMiLtsqzfedIzRTzqY+w0FiLdh0/kQrnQ0tLxrw==
dependencies:
vscode-languageserver-textdocument "^1.0.7"
vscode-languageserver-types "^3.17.2"
vscode-nls "^5.2.0"
vscode-uri "^3.0.4"
vscode-languageserver-textdocument "^1.0.4"
vscode-languageserver-types "^3.16.0"
vscode-nls "^5.0.0"
vscode-uri "^3.0.3"

[email protected]:
version "6.0.0"
Expand All @@ -7605,7 +7605,7 @@ [email protected]:
vscode-jsonrpc "6.0.0"
vscode-languageserver-types "3.16.0"

[email protected].7, vscode-languageserver-textdocument@^1.0.7:
vscode-languageserver-textdocument@^1.0.4, vscode-languageserver-textdocument@^1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz#16df468d5c2606103c90554ae05f9f3d335b771b"
integrity sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg==
Expand All @@ -7615,7 +7615,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247"
integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==

vscode-languageserver-types@^3.17.2:
vscode-languageserver-types@^3.16.0:
version "3.17.2"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2"
integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==
Expand All @@ -7627,7 +7627,7 @@ [email protected]:
dependencies:
vscode-languageserver-protocol "3.16.0"

vscode-nls@^5.2.0:
vscode-nls@^5.0.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
Expand Down Expand Up @@ -7664,12 +7664,12 @@ [email protected]:
vscode-oniguruma "^1.5.1"
vscode-textmate "^5.4.0"

[email protected].3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84"
integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==
[email protected].4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.4.tgz#703c6dd7c0b727ee1c34a1287434138fb52d054f"
integrity sha512-aEmKD6H8Sg8gaQAUrnadG0BMeWXtiWhRsj1a94n2FYsMkDpgnK7BRVzZjOUYIvkv2B+bp5Bmt4ImZCpYbnJwkg==

vscode-uri@^3.0.4:
vscode-uri@^3.0.3:
version "3.0.6"
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.6.tgz#5e6e2e1a4170543af30151b561a41f71db1d6f91"
integrity sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ==
Expand Down

0 comments on commit 340bc76

Please sign in to comment.