Skip to content

Commit 340bc76

Browse files
atscottatscott
authored
build: resolve dependency issues with built vsix (#1801)
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`.
1 parent a0ae25d commit 340bc76

File tree

5 files changed

+30
-27
lines changed

5 files changed

+30
-27
lines changed

‎BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@ npm_package(
5858
":node_modules/vscode-html-languageservice",
5959
":node_modules/vscode-languageclient",
6060
":node_modules/vscode-languageserver-protocol",
61+
":node_modules/vscode-languageserver-textdocument",
6162
":node_modules/vscode-languageserver-types",
6263
":node_modules/vscode-languageserver",
64+
":node_modules/vscode-nls",
6365
":node_modules/vscode-uri",
6466
":node_modules/yallist",
6567
],

‎package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,14 @@
225225
"test:legacy-syntaxes": "yarn compile:syntaxes-test && yarn build:syntaxes && jasmine dist/syntaxes/test/driver.js"
226226
},
227227
"dependencies": {
228-
"@angular/language-service": "15.0.0-next.0",
228+
"@angular/language-service": "15.0.0-rc.4",
229229
"typescript": "4.8.2",
230+
"vscode-html-languageservice": "^4.2.5",
230231
"vscode-jsonrpc": "6.0.0",
231232
"vscode-languageclient": "7.0.0",
232233
"vscode-languageserver": "7.0.0",
233-
"vscode-uri": "3.0.3"
234+
"vscode-languageserver-textdocument": "^1.0.7",
235+
"vscode-uri": "3.0.4"
234236
},
235237
"devDependencies": {
236238
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#262cb3bb487e8dddb3c404f4f2c8b34a9a1f14c2",
@@ -249,9 +251,8 @@
249251
"tslint": "6.1.3",
250252
"tslint-eslint-rules": "5.4.0",
251253
"vsce": "1.100.1",
252-
"vscode-html-languageservice": "^5.0.2",
253254
"vscode-languageserver-protocol": "3.16.0",
254-
"vscode-languageserver-textdocument": "1.0.7",
255+
"vscode-languageserver-types": "3.16.0",
255256
"vscode-test": "1.6.1",
256257
"vscode-tmgrammar-test": "0.0.11"
257258
},

‎server/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"ngserver": "./bin/ngserver"
1616
},
1717
"dependencies": {
18-
"@angular/language-service": "15.0.0-next.0",
19-
"vscode-html-languageservice": "^5.0.2",
18+
"@angular/language-service": "15.0.0-rc.4",
19+
"vscode-html-languageservice": "^4.2.5",
2020
"vscode-jsonrpc": "6.0.0",
2121
"vscode-languageserver": "7.0.0",
2222
"vscode-languageserver-textdocument": "^1.0.7",

‎server/src/version_provider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import url from 'url';
1212

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

15-
const MIN_TS_VERSION = '4.3';
15+
const MIN_TS_VERSION = '4.8';
1616
const MIN_NG_VERSION = '13.0';
1717
const TSSERVERLIB = 'typescript/lib/tsserverlibrary';
1818

‎yarn.lock

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,10 @@
158158
uuid "^8.3.2"
159159
yargs "^17.0.0"
160160

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

166166
"@assemblyscript/loader@^0.10.1":
167167
version "0.10.1"
@@ -7573,15 +7573,15 @@ vsce@1.100.1:
75737573
yauzl "^2.3.1"
75747574
yazl "^2.2.2"
75757575

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

75867586
vscode-jsonrpc@6.0.0:
75877587
version "6.0.0"
@@ -7605,7 +7605,7 @@ vscode-languageserver-protocol@3.16.0:
76057605
vscode-jsonrpc "6.0.0"
76067606
vscode-languageserver-types "3.16.0"
76077607

7608-
vscode-languageserver-textdocument@1.0.7, vscode-languageserver-textdocument@^1.0.7:
7608+
vscode-languageserver-textdocument@^1.0.4, vscode-languageserver-textdocument@^1.0.7:
76097609
version "1.0.7"
76107610
resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz#16df468d5c2606103c90554ae05f9f3d335b771b"
76117611
integrity sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg==
@@ -7615,7 +7615,7 @@ vscode-languageserver-types@3.16.0:
76157615
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247"
76167616
integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==
76177617

7618-
vscode-languageserver-types@^3.17.2:
7618+
vscode-languageserver-types@^3.16.0:
76197619
version "3.17.2"
76207620
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2"
76217621
integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==
@@ -7627,7 +7627,7 @@ vscode-languageserver@7.0.0:
76277627
dependencies:
76287628
vscode-languageserver-protocol "3.16.0"
76297629

7630-
vscode-nls@^5.2.0:
7630+
vscode-nls@^5.0.0:
76317631
version "5.2.0"
76327632
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
76337633
integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
@@ -7664,12 +7664,12 @@ vscode-tmgrammar-test@0.0.11:
76647664
vscode-oniguruma "^1.5.1"
76657665
vscode-textmate "^5.4.0"
76667666

7667-
vscode-uri@3.0.3:
7668-
version "3.0.3"
7669-
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84"
7670-
integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==
7667+
vscode-uri@3.0.4:
7668+
version "3.0.4"
7669+
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.4.tgz#703c6dd7c0b727ee1c34a1287434138fb52d054f"
7670+
integrity sha512-aEmKD6H8Sg8gaQAUrnadG0BMeWXtiWhRsj1a94n2FYsMkDpgnK7BRVzZjOUYIvkv2B+bp5Bmt4ImZCpYbnJwkg==
76717671

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

0 commit comments

Comments
 (0)