Skip to content

Commit f77f6e2

Browse files
authored
Merge pull request #20985 from dannon/vue-tsc-fixes-and-pin
Tsc fixes and pin
2 parents 2a62168 + a8f51c6 commit f77f6e2

File tree

3 files changed

+122
-3
lines changed

3 files changed

+122
-3
lines changed

.github/workflows/js_lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ jobs:
3737
working-directory: client
3838
- name: Run vue-tsc
3939
working-directory: client
40-
run: npx vue-tsc --noEmit
40+
run: yarn type-check

client/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@
151151
"jest": "jest --config tests/jest/jest.config.js",
152152
"jest-watch": "jest --config tests/jest/jest.config.js --watch",
153153
"eslint-precommit": "eslint -c .eslintrc.js --quiet --ext .js,.vue,.ts src tests/jest/standalone",
154-
"eslint": "eslint -c .eslintrc.js --ext .js,.vue,.ts src tests/jest/standalone"
154+
"eslint": "eslint -c .eslintrc.js --ext .js,.vue,.ts src tests/jest/standalone",
155+
"type-check": "vue-tsc --noEmit"
155156
},
156157
"devDependencies": {
157158
"@babel/core": "^7.23.2",
@@ -221,6 +222,7 @@
221222
"typescript": "^5.7.3",
222223
"vue-loader": "^15.11.1",
223224
"vue-template-compiler": "^2.7.16",
225+
"vue-tsc": "2.2.12",
224226
"webpack": "^5.98.0",
225227
"webpack-cli": "^6.0.1",
226228
"webpack-dev-server": "^5.2.0",

client/yarn.lock

Lines changed: 118 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,13 @@
514514
dependencies:
515515
"@babel/types" "^7.27.1"
516516

517+
"@babel/parser@^7.28.4":
518+
version "7.28.4"
519+
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.4.tgz#da25d4643532890932cc03f7705fe19637e03fa8"
520+
integrity sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==
521+
dependencies:
522+
"@babel/types" "^7.28.4"
523+
517524
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.15":
518525
version "7.22.15"
519526
resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz#02dc8a03f613ed5fdc29fb2f728397c78146c962"
@@ -1360,6 +1367,14 @@
13601367
"@babel/helper-string-parser" "^7.27.1"
13611368
"@babel/helper-validator-identifier" "^7.27.1"
13621369

1370+
"@babel/types@^7.28.4":
1371+
version "7.28.4"
1372+
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.4.tgz#0a4e618f4c60a7cd6c11cb2d48060e4dbe38ac3a"
1373+
integrity sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==
1374+
dependencies:
1375+
"@babel/helper-string-parser" "^7.27.1"
1376+
"@babel/helper-validator-identifier" "^7.27.1"
1377+
13631378
"@bcoe/v8-coverage@^0.2.3":
13641379
version "0.2.3"
13651380
resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"
@@ -3108,6 +3123,46 @@
31083123
resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
31093124
integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
31103125

3126+
3127+
version "2.4.15"
3128+
resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-2.4.15.tgz#759d04cb4eab9920560b8bcfa4515d5b08a1b7ce"
3129+
integrity sha512-3VHw+QZU0ZG9IuQmzT68IyN4hZNd9GchGPhbD9+pa8CVv7rnoOZwo7T8weIbrRmihqy3ATpdfXFnqRrfPVK6CA==
3130+
dependencies:
3131+
"@volar/source-map" "2.4.15"
3132+
3133+
3134+
version "2.4.15"
3135+
resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-2.4.15.tgz#18aba09994c0268e59a418f9d738e4a85302781d"
3136+
integrity sha512-CPbMWlUN6hVZJYGcU/GSoHu4EnCHiLaXI9n8c9la6RaI9W5JHX+NqG+GSQcB0JdC2FIBLdZJwGsfKyBB71VlTg==
3137+
3138+
3139+
version "2.4.15"
3140+
resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-2.4.15.tgz#1445d23f8e4f9ad821b6bfa58cf4a2b980dc5f97"
3141+
integrity sha512-2aZ8i0cqPGjXb4BhkMsPYDkkuc2ZQ6yOpqwAuNwUoncELqoy5fRgOQtLR9gB0g902iS0NAkvpIzs27geVyVdPg==
3142+
dependencies:
3143+
"@volar/language-core" "2.4.15"
3144+
path-browserify "^1.0.1"
3145+
vscode-uri "^3.0.8"
3146+
3147+
3148+
version "3.5.22"
3149+
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.5.22.tgz#bb8294a0dd31df540563cc6ffa0456f1f7687b97"
3150+
integrity sha512-jQ0pFPmZwTEiRNSb+i9Ow/I/cHv2tXYqsnHKKyCQ08irI2kdF5qmYedmF8si8mA7zepUFmJ2hqzS8CQmNOWOkQ==
3151+
dependencies:
3152+
"@babel/parser" "^7.28.4"
3153+
"@vue/shared" "3.5.22"
3154+
entities "^4.5.0"
3155+
estree-walker "^2.0.2"
3156+
source-map-js "^1.2.1"
3157+
3158+
"@vue/compiler-dom@^3.5.0":
3159+
version "3.5.22"
3160+
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.5.22.tgz#6c9c2c9843520f6d3dbc685e5d0e1e12a2c04c56"
3161+
integrity sha512-W8RknzUM1BLkypvdz10OVsGxnMAuSIZs9Wdx1vzA3mL5fNMN15rhrSCLiTm6blWeACwUwizzPVqGJgOGBEN/hA==
3162+
dependencies:
3163+
"@vue/compiler-core" "3.5.22"
3164+
"@vue/shared" "3.5.22"
3165+
31113166
31123167
version "2.7.16"
31133168
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz#ff81711a0fac9c68683d8bb00b63f857de77dc83"
@@ -3119,6 +3174,14 @@
31193174
optionalDependencies:
31203175
prettier "^1.18.2 || ^2.0.0"
31213176

3177+
"@vue/compiler-vue2@^2.7.16":
3178+
version "2.7.16"
3179+
resolved "https://registry.yarnpkg.com/@vue/compiler-vue2/-/compiler-vue2-2.7.16.tgz#2ba837cbd3f1b33c2bc865fbe1a3b53fb611e249"
3180+
integrity sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==
3181+
dependencies:
3182+
de-indent "^1.0.2"
3183+
he "^1.2.0"
3184+
31223185
"@vue/component-compiler-utils@^3.1.0":
31233186
version "3.3.0"
31243187
resolved "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz"
@@ -3140,6 +3203,25 @@
31403203
resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.5.0.tgz#98b99425edee70b4c992692628fa1ea2c1e57d07"
31413204
integrity sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==
31423205

3206+
3207+
version "2.2.12"
3208+
resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-2.2.12.tgz#d01f7e865f593f968cb65c12a13d8337e65641f0"
3209+
integrity sha512-IsGljWbKGU1MZpBPN+BvPAdr55YPkj2nB/TBNGNC32Vy2qLG25DYu/NBN2vNtZqdRbTRjaoYrahLrToim2NanA==
3210+
dependencies:
3211+
"@volar/language-core" "2.4.15"
3212+
"@vue/compiler-dom" "^3.5.0"
3213+
"@vue/compiler-vue2" "^2.7.16"
3214+
"@vue/shared" "^3.5.0"
3215+
alien-signals "^1.0.3"
3216+
minimatch "^9.0.3"
3217+
muggle-string "^0.4.1"
3218+
path-browserify "^1.0.1"
3219+
3220+
"@vue/[email protected]", "@vue/shared@^3.5.0":
3221+
version "3.5.22"
3222+
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.22.tgz#9d56a1644a3becb8af1e34655928b0e288d827f8"
3223+
integrity sha512-F4yc6palwq3TT0u+FYf0Ns4Tfl9GRFURDN2gWG7L1ecIaS/4fCIuFOjMTnCyjsu/OK6vaDKLCrGAa+KvvH+h4w==
3224+
31433225
"@vue/test-utils@^1.3.6":
31443226
version "1.3.6"
31453227
resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.3.6.tgz#6656bd8fa44dd088b4ad80ff1ee28abe7e5ddf87"
@@ -3607,6 +3689,11 @@ ajv@^8.9.0:
36073689
require-from-string "^2.0.2"
36083690
uri-js "^4.2.2"
36093691

3692+
alien-signals@^1.0.3:
3693+
version "1.0.13"
3694+
resolved "https://registry.yarnpkg.com/alien-signals/-/alien-signals-1.0.13.tgz#8d6db73462f742ee6b89671fbd8c37d0b1727a7e"
3695+
integrity sha512-OGj9yyTnJEttvzhTUWuscOvtqxq5vrhF7vL9oS0xJ2mK0ItPYP1/y+vCFebfxoEyAz0++1AIwJ5CMr+Fk3nDmg==
3696+
36103697
amdi18n-loader@^0.9.4:
36113698
version "0.9.4"
36123699
resolved "https://registry.yarnpkg.com/amdi18n-loader/-/amdi18n-loader-0.9.4.tgz#bd931ad3fe7f530478b2fe1faea387038a998a0d"
@@ -5574,7 +5661,7 @@ enhanced-resolve@^5.0.0, enhanced-resolve@^5.17.1, enhanced-resolve@^5.7.0:
55745661
graceful-fs "^4.2.4"
55755662
tapable "^2.2.0"
55765663

5577-
entities@^4.2.0:
5664+
entities@^4.2.0, entities@^4.5.0:
55785665
version "4.5.0"
55795666
resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
55805667
integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
@@ -6012,6 +6099,11 @@ estraverse@^5.1.0, estraverse@^5.2.0:
60126099
resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
60136100
integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
60146101

6102+
estree-walker@^2.0.2:
6103+
version "2.0.2"
6104+
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
6105+
integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
6106+
60156107
esutils@^2.0.2:
60166108
version "2.0.3"
60176109
resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
@@ -8667,6 +8759,13 @@ minimatch@^9.0.1:
86678759
dependencies:
86688760
brace-expansion "^2.0.1"
86698761

8762+
minimatch@^9.0.3:
8763+
version "9.0.5"
8764+
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
8765+
integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
8766+
dependencies:
8767+
brace-expansion "^2.0.1"
8768+
86708769
minimist@^1.2.0, minimist@^1.2.6:
86718770
version "1.2.6"
86728771
resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"
@@ -8790,6 +8889,11 @@ msw@^2.3.4:
87908889
type-fest "^4.9.0"
87918890
yargs "^17.7.2"
87928891

8892+
muggle-string@^0.4.1:
8893+
version "0.4.1"
8894+
resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.4.1.tgz#3b366bd43b32f809dc20659534dd30e7c8a0d328"
8895+
integrity sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==
8896+
87938897
multicast-dns@^7.2.5:
87948898
version "7.2.5"
87958899
resolved "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz"
@@ -12032,6 +12136,11 @@ vscode-uri@^3.0.0:
1203212136
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f"
1203312137
integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==
1203412138

12139+
vscode-uri@^3.0.8:
12140+
version "3.1.0"
12141+
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.1.0.tgz#dd09ec5a66a38b5c3fffc774015713496d14e09c"
12142+
integrity sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==
12143+
1203512144
vue-class-component@^7.2.6:
1203612145
version "7.2.6"
1203712146
resolved "https://registry.yarnpkg.com/vue-class-component/-/vue-class-component-7.2.6.tgz#8471e037b8e4762f5a464686e19e5afc708502e4"
@@ -12167,6 +12276,14 @@ vue-template-es2015-compiler@^1.9.0:
1216712276
resolved "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"
1216812277
integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
1216912278

12279+
12280+
version "2.2.12"
12281+
resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-2.2.12.tgz#5f719b08ef7390a763c1a20169ca5c9d09d55688"
12282+
integrity sha512-P7OP77b2h/Pmk+lZdJ0YWs+5tJ6J2+uOQPo7tlBnY44QqQSPYvS0qVT4wqDJgwrZaLe47etJLLQRFia71GYITw==
12283+
dependencies:
12284+
"@volar/typescript" "2.4.15"
12285+
"@vue/language-core" "2.2.12"
12286+
1217012287
vue-virtual-scroll-list@^2.3.5:
1217112288
version "2.3.5"
1217212289
resolved "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-2.3.5.tgz#b589ac6245faf857c35090f854e59d653e90626c"

0 commit comments

Comments
 (0)