diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 841cbfe3d..30611f8d8 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -16,11 +16,6 @@ enabled: false, }, - { - matchPackageNames: ['typescript'], - enabled: false, - }, - { groupName: 'volarjs', groupSlug: 'volar-related', diff --git a/package.json b/package.json index 0f4f0fb14..37d0a7e62 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "tsup": "^6.6.3", "tsx": "^3.12.5", "turbo": "^1.8.3", - "typescript": "^5.0.0-beta", + "typescript": "^5.0.2", "vite": "^4.1.4", "vitest": "^0.29.2", "vue": "^3.2.47", diff --git a/packages/volar/package.json b/packages/volar/package.json index d13bac4a5..66f1ae656 100644 --- a/packages/volar/package.json +++ b/packages/volar/package.json @@ -53,7 +53,7 @@ "devDependencies": { "@volar/vue-language-core": "1.1.7", "@vue/compiler-dom": "^3.2.47", - "typescript": "^5.0.0-beta", + "typescript": "^5.0.2", "vue-tsc": "^1.2.0" }, "engines": { diff --git a/playground/vue2/package.json b/playground/vue2/package.json index 4e93cf936..24d1d1d75 100644 --- a/playground/vue2/package.json +++ b/playground/vue2/package.json @@ -23,7 +23,7 @@ "rollup": "^3.19.1", "rollup-plugin-esbuild": "^5.0.0", "tsx": "^3.12.5", - "typescript": "^5.0.0-beta", + "typescript": "^5.0.2", "unplugin-vue-macros": "workspace:*", "vite": "^4.1.4", "vite-plugin-inspect": "^0.7.16", diff --git a/playground/vue3/package.json b/playground/vue3/package.json index ef7089562..ac7728e29 100644 --- a/playground/vue3/package.json +++ b/playground/vue3/package.json @@ -27,7 +27,7 @@ "rollup-plugin-esbuild": "^5.0.0", "tsx": "^3.12.5", "type-fest": "^3.6.1", - "typescript": "^5.0.0-beta", + "typescript": "^5.0.2", "unplugin-vue-macros": "workspace:*", "vite": "^4.1.4", "vite-plugin-inspect": "^0.7.16", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2d1717ab6..c47909cd0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,7 +24,7 @@ importers: tsup: ^6.6.3 tsx: ^3.12.5 turbo: ^1.8.3 - typescript: ^5.0.0-beta + typescript: ^5.0.2 vite: ^4.1.4 vitest: ^0.29.2 vue: ^3.2.47 @@ -35,7 +35,7 @@ importers: '@babel/types': 7.21.2 '@changesets/changelog-github': 0.4.8 '@changesets/cli': 2.26.0 - '@sxzz/eslint-config': 2.4.5_wqkwafyslvsnji22smjojifwse + '@sxzz/eslint-config': 2.4.5_rnw7zc2wljykqwrgq332y2pw2i '@types/node': 18.15.3 '@vitest/coverage-c8': 0.29.2_vitest@0.29.2 '@vitest/ui': 0.29.2 @@ -49,14 +49,14 @@ importers: monoman: 0.1.2 npm-run-all: 4.1.5 rollup-plugin-esbuild: 5.0.0_esbuild@0.17.11 - tsup: 6.6.3_vlov7tp5tlvvzafykf2zptoypm + tsup: 6.6.3_typescript@5.0.2 tsx: 3.12.5 turbo: 1.8.3 - typescript: 5.0.0-dev.20230222 + typescript: 5.0.2 vite: 4.1.4_@types+node@18.15.3 vitest: 0.29.2_@vitest+ui@0.29.2 vue: 3.2.47 - vue-tsc: 1.2.0_vlov7tp5tlvvzafykf2zptoypm + vue-tsc: 1.2.0_typescript@5.0.2 vue2: /vue/2.7.14 webpack: 5.76.1_esbuild@0.17.11 @@ -453,7 +453,7 @@ importers: '@vue-macros/short-vmodel': workspace:~ '@vue/compiler-dom': ^3.2.47 muggle-string: ^0.2.2 - typescript: ^5.0.0-beta + typescript: ^5.0.2 vue-tsc: ^1.2.0 dependencies: '@volar/language-core': 1.0.24 @@ -464,8 +464,8 @@ importers: devDependencies: '@volar/vue-language-core': 1.1.7 '@vue/compiler-dom': 3.2.47 - typescript: 5.0.0-dev.20230222 - vue-tsc: 1.2.0_vlov7tp5tlvvzafykf2zptoypm + typescript: 5.0.2 + vue-tsc: 1.2.0_typescript@5.0.2 playground/vue2: specifiers: @@ -479,7 +479,7 @@ importers: rollup: ^3.19.1 rollup-plugin-esbuild: ^5.0.0 tsx: ^3.12.5 - typescript: ^5.0.0-beta + typescript: ^5.0.2 unplugin-vue-macros: workspace:* vite: ^4.1.4 vite-plugin-inspect: ^0.7.16 @@ -498,11 +498,11 @@ importers: rollup: 3.19.1 rollup-plugin-esbuild: 5.0.0_caszwlkzzxo5hzxqu45fmzwfye tsx: 3.12.5 - typescript: 5.0.0-dev.20230222 + typescript: 5.0.2 unplugin-vue-macros: link:../../packages/macros vite: 4.1.4 vite-plugin-inspect: 0.7.16_rollup@3.19.1+vite@4.1.4 - vue-tsc: 1.2.0_vlov7tp5tlvvzafykf2zptoypm + vue-tsc: 1.2.0_typescript@5.0.2 playground/vue3: specifiers: @@ -520,7 +520,7 @@ importers: rollup-plugin-esbuild: ^5.0.0 tsx: ^3.12.5 type-fest: ^3.6.1 - typescript: ^5.0.0-beta + typescript: ^5.0.2 unplugin-vue-macros: workspace:* vite: ^4.1.4 vite-plugin-inspect: ^0.7.16 @@ -543,11 +543,11 @@ importers: rollup-plugin-esbuild: 5.0.0_caszwlkzzxo5hzxqu45fmzwfye tsx: 3.12.5 type-fest: 3.6.1 - typescript: 5.0.0-dev.20230222 + typescript: 5.0.2 unplugin-vue-macros: link:../../packages/macros vite: 4.1.4 vite-plugin-inspect: 0.7.16_rollup@3.19.1+vite@4.1.4 - vue-tsc: 1.2.0_vlov7tp5tlvvzafykf2zptoypm + vue-tsc: 1.2.0_typescript@5.0.2 packages: @@ -2983,25 +2983,25 @@ packages: - supports-color dev: true - /@sxzz/eslint-config-ts/2.4.5_zdawhrnvdgu3dqgzoirdd2xmwy: + /@sxzz/eslint-config-ts/2.4.5_j4766f7ecgqbon3u7zlxn5zszu: resolution: {integrity: sha512-QVpT6MwN5SJIDQ6sn4CksnWhutsIbWqiAQRHrXTO2NgtN8M4Y+WjfReF4Vg5sdXh7tiZce60Z3pdhmBBIeQ+RQ==} peerDependencies: eslint: '>=7.4.0' typescript: '>=3.9' dependencies: '@sxzz/eslint-config-basic': 2.4.5_uodme5gdk3cnryickrhyux6l6y - '@typescript-eslint/eslint-plugin': 5.53.0_6k643w56q742kmlzk7u4endcpa - '@typescript-eslint/parser': 5.53.0_zdawhrnvdgu3dqgzoirdd2xmwy + '@typescript-eslint/eslint-plugin': 5.53.0_lxmgrk4yxdo4f5klbwj2ejjmuy + '@typescript-eslint/parser': 5.53.0_j4766f7ecgqbon3u7zlxn5zszu eslint: 8.36.0 eslint-define-config: 1.16.0 - typescript: 5.0.0-dev.20230222 + typescript: 5.0.2 transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack - supports-color dev: true - /@sxzz/eslint-config-vue/2.4.5_wqkwafyslvsnji22smjojifwse: + /@sxzz/eslint-config-vue/2.4.5_rnw7zc2wljykqwrgq332y2pw2i: resolution: {integrity: sha512-qX+wURu+OBbu4i8jYZ1O88gljbvsJhSzWic6cYwGAj674qcHCuZ2nkENL6hVJzuiPfJWYp6trjBzopXJINW2LQ==} peerDependencies: eslint: '>=7.4.0' @@ -3010,7 +3010,7 @@ packages: vue: optional: true dependencies: - '@sxzz/eslint-config-ts': 2.4.5_zdawhrnvdgu3dqgzoirdd2xmwy + '@sxzz/eslint-config-ts': 2.4.5_j4766f7ecgqbon3u7zlxn5zszu eslint: 8.36.0 eslint-define-config: 1.16.0 eslint-plugin-vue: 9.9.0_eslint@8.36.0 @@ -3023,13 +3023,13 @@ packages: - typescript dev: true - /@sxzz/eslint-config/2.4.5_wqkwafyslvsnji22smjojifwse: + /@sxzz/eslint-config/2.4.5_rnw7zc2wljykqwrgq332y2pw2i: resolution: {integrity: sha512-Mremyfz6bfeS9SZOZfW/ECmpKI5V1DuA8LtsZ+1+65VUaN2GIJvd5E9Q+m7wBrS5ngq3xRc21XgLN7tVzNboEQ==} peerDependencies: eslint: '>=8.0.0' dependencies: '@sxzz/eslint-config-prettier': 2.4.5_eslint@8.36.0 - '@sxzz/eslint-config-vue': 2.4.5_wqkwafyslvsnji22smjojifwse + '@sxzz/eslint-config-vue': 2.4.5_rnw7zc2wljykqwrgq332y2pw2i eslint: 8.36.0 transitivePeerDependencies: - eslint-import-resolver-typescript @@ -3148,7 +3148,7 @@ packages: /@types/web-bluetooth/0.0.16: resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==} - /@typescript-eslint/eslint-plugin/5.53.0_6k643w56q742kmlzk7u4endcpa: + /@typescript-eslint/eslint-plugin/5.53.0_lxmgrk4yxdo4f5klbwj2ejjmuy: resolution: {integrity: sha512-alFpFWNucPLdUOySmXCJpzr6HKC3bu7XooShWM+3w/EL6J2HIoB2PFxpLnq4JauWVk6DiVeNKzQlFEaE+X9sGw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3159,10 +3159,10 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.53.0_zdawhrnvdgu3dqgzoirdd2xmwy + '@typescript-eslint/parser': 5.53.0_j4766f7ecgqbon3u7zlxn5zszu '@typescript-eslint/scope-manager': 5.53.0 - '@typescript-eslint/type-utils': 5.53.0_zdawhrnvdgu3dqgzoirdd2xmwy - '@typescript-eslint/utils': 5.53.0_zdawhrnvdgu3dqgzoirdd2xmwy + '@typescript-eslint/type-utils': 5.53.0_j4766f7ecgqbon3u7zlxn5zszu + '@typescript-eslint/utils': 5.53.0_j4766f7ecgqbon3u7zlxn5zszu debug: 4.3.4 eslint: 8.36.0 grapheme-splitter: 1.0.4 @@ -3170,13 +3170,13 @@ packages: natural-compare-lite: 1.4.0 regexpp: 3.2.0 semver: 7.3.8 - tsutils: 3.21.0_vlov7tp5tlvvzafykf2zptoypm - typescript: 5.0.0-dev.20230222 + tsutils: 3.21.0_typescript@5.0.2 + typescript: 5.0.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser/5.53.0_zdawhrnvdgu3dqgzoirdd2xmwy: + /@typescript-eslint/parser/5.53.0_j4766f7ecgqbon3u7zlxn5zszu: resolution: {integrity: sha512-MKBw9i0DLYlmdOb3Oq/526+al20AJZpANdT6Ct9ffxcV8nKCHz63t/S0IhlTFNsBIHJv+GY5SFJ0XfqVeydQrQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3188,10 +3188,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.53.0 '@typescript-eslint/types': 5.53.0 - '@typescript-eslint/typescript-estree': 5.53.0_vlov7tp5tlvvzafykf2zptoypm + '@typescript-eslint/typescript-estree': 5.53.0_typescript@5.0.2 debug: 4.3.4 eslint: 8.36.0 - typescript: 5.0.0-dev.20230222 + typescript: 5.0.2 transitivePeerDependencies: - supports-color dev: true @@ -3204,7 +3204,7 @@ packages: '@typescript-eslint/visitor-keys': 5.53.0 dev: true - /@typescript-eslint/type-utils/5.53.0_zdawhrnvdgu3dqgzoirdd2xmwy: + /@typescript-eslint/type-utils/5.53.0_j4766f7ecgqbon3u7zlxn5zszu: resolution: {integrity: sha512-HO2hh0fmtqNLzTAme/KnND5uFNwbsdYhCZghK2SoxGp3Ifn2emv+hi0PBUjzzSh0dstUIFqOj3bp0AwQlK4OWw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3214,12 +3214,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.53.0_vlov7tp5tlvvzafykf2zptoypm - '@typescript-eslint/utils': 5.53.0_zdawhrnvdgu3dqgzoirdd2xmwy + '@typescript-eslint/typescript-estree': 5.53.0_typescript@5.0.2 + '@typescript-eslint/utils': 5.53.0_j4766f7ecgqbon3u7zlxn5zszu debug: 4.3.4 eslint: 8.36.0 - tsutils: 3.21.0_vlov7tp5tlvvzafykf2zptoypm - typescript: 5.0.0-dev.20230222 + tsutils: 3.21.0_typescript@5.0.2 + typescript: 5.0.2 transitivePeerDependencies: - supports-color dev: true @@ -3229,7 +3229,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.53.0_vlov7tp5tlvvzafykf2zptoypm: + /@typescript-eslint/typescript-estree/5.53.0_typescript@5.0.2: resolution: {integrity: sha512-eKmipH7QyScpHSkhbptBBYh9v8FxtngLquq292YTEQ1pxVs39yFBlLC1xeIZcPPz1RWGqb7YgERJRGkjw8ZV7w==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3244,13 +3244,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.3.8 - tsutils: 3.21.0_vlov7tp5tlvvzafykf2zptoypm - typescript: 5.0.0-dev.20230222 + tsutils: 3.21.0_typescript@5.0.2 + typescript: 5.0.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils/5.53.0_zdawhrnvdgu3dqgzoirdd2xmwy: + /@typescript-eslint/utils/5.53.0_j4766f7ecgqbon3u7zlxn5zszu: resolution: {integrity: sha512-VUOOtPv27UNWLxFwQK/8+7kvxVC+hPHNsJjzlJyotlaHjLSIgOCKj9I0DBUjwOOA64qjBwx5afAPjksqOxMO0g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3260,7 +3260,7 @@ packages: '@types/semver': 7.3.13 '@typescript-eslint/scope-manager': 5.53.0 '@typescript-eslint/types': 5.53.0 - '@typescript-eslint/typescript-estree': 5.53.0_vlov7tp5tlvvzafykf2zptoypm + '@typescript-eslint/typescript-estree': 5.53.0_typescript@5.0.2 eslint: 8.36.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@8.36.0 @@ -5268,7 +5268,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.53.0_zdawhrnvdgu3dqgzoirdd2xmwy + '@typescript-eslint/parser': 5.53.0_j4766f7ecgqbon3u7zlxn5zszu debug: 3.2.7 eslint: 8.36.0 eslint-import-resolver-node: 0.3.7 @@ -5303,7 +5303,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.53.0_zdawhrnvdgu3dqgzoirdd2xmwy + '@typescript-eslint/parser': 5.53.0_j4766f7ecgqbon3u7zlxn5zszu array-includes: 3.1.6 array.prototype.flat: 1.3.1 array.prototype.flatmap: 1.3.1 @@ -8747,7 +8747,7 @@ packages: - ts-node dev: true - /tsup/6.6.3_vlov7tp5tlvvzafykf2zptoypm: + /tsup/6.6.3_typescript@5.0.2: resolution: {integrity: sha512-OLx/jFllYlVeZQ7sCHBuRVEQBBa1tFbouoc/gbYakyipjVQdWy/iQOvmExUA/ewap9iQ7tbJf9pW0PgcEFfJcQ==} engines: {node: '>=14.18'} hasBin: true @@ -8777,20 +8777,20 @@ packages: source-map: 0.8.0-beta.0 sucrase: 3.29.0 tree-kill: 1.2.2 - typescript: 5.0.0-dev.20230222 + typescript: 5.0.2 transitivePeerDependencies: - supports-color - ts-node dev: true - /tsutils/3.21.0_vlov7tp5tlvvzafykf2zptoypm: + /tsutils/3.21.0_typescript@5.0.2: resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 5.0.0-dev.20230222 + typescript: 5.0.2 dev: true /tsx/3.12.5: @@ -8939,9 +8939,9 @@ packages: is-typed-array: 1.1.10 dev: true - /typescript/5.0.0-dev.20230222: - resolution: {integrity: sha512-OCNanAIcGf3Uy1aBvLbPNe524MnDEZChefbzgo9gvEZPYNG7Zma1C6dXuOBSCapLgbLHksOTyoPwixKTbDkZPQ==} - engines: {node: '>=4.2.0'} + /typescript/5.0.2: + resolution: {integrity: sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==} + engines: {node: '>=12.20'} hasBin: true dev: true @@ -9570,7 +9570,7 @@ packages: he: 1.2.0 dev: true - /vue-tsc/1.2.0_vlov7tp5tlvvzafykf2zptoypm: + /vue-tsc/1.2.0_typescript@5.0.2: resolution: {integrity: sha512-rIlzqdrhyPYyLG9zxsVRa+JEseeS9s8F2BbVVVWRRsTZvJO2BbhLEb2HW3MY+DFma0378tnIqs+vfTzbcQtRFw==} hasBin: true peerDependencies: @@ -9578,7 +9578,7 @@ packages: dependencies: '@volar/vue-language-core': 1.2.0 '@volar/vue-typescript': 1.2.0 - typescript: 5.0.0-dev.20230222 + typescript: 5.0.2 dev: true /vue/2.7.14: