diff --git a/package.json b/package.json index cd8ca965e..230c76238 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,6 @@ "@typescript-eslint/eslint-plugin": "^5.9.1", "@typescript-eslint/parser": "^5.9.1", "@vue/compiler-sfc": "^3.2.47", - "@vue/runtime-dom": "^3.2.47", "@vue/tsconfig": "^0.1.3", "async-exit-hook": "^2.0.1", "autoprefixer": "^10.0.1", @@ -61,7 +60,7 @@ "to-string-loader": "^1.2.0", "ts-node": "^10.7.0", "typescript": "^4.4.4", - "vue-loader": "^16.8.3", + "vue-loader": "^17.0.0", "vue-tsc": "^1.0.24", "webpack": "^5.31.2", "webpack-bundle-analyzer": "^4.5.0", @@ -70,7 +69,6 @@ }, "dependencies": { "@popperjs/core": "^2.6.0", - "@vue/compat": "^3.2.47", "color": "^3.1.2", "fuse.js": "^6.4.6", "jszip": "^3.7.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 242d2e1db..3bdfff8ec 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,9 +22,7 @@ specifiers: '@types/ws': ^8.2.3 '@typescript-eslint/eslint-plugin': ^5.9.1 '@typescript-eslint/parser': ^5.9.1 - '@vue/compat': ^3.2.47 '@vue/compiler-sfc': ^3.2.47 - '@vue/runtime-dom': ^3.2.47 '@vue/tsconfig': ^0.1.3 async-exit-hook: ^2.0.1 autoprefixer: ^10.0.1 @@ -60,7 +58,7 @@ specifiers: ts-node: ^10.7.0 typescript: ^4.4.4 vue: ^3.2.47 - vue-loader: ^16.8.3 + vue-loader: ^17.0.0 vue-tsc: ^1.0.24 webpack: ^5.31.2 webpack-bundle-analyzer: ^4.5.0 @@ -69,7 +67,6 @@ specifiers: dependencies: '@popperjs/core': 2.11.5 - '@vue/compat': 3.2.47_vue@3.2.47 color: 3.2.1 fuse.js: 6.6.1 jszip: 3.9.1 @@ -102,7 +99,6 @@ devDependencies: '@typescript-eslint/eslint-plugin': 5.22.0_e7x4dwqa46aij5nkdae76zedue '@typescript-eslint/parser': 5.22.0_e4zyhrvfnqudwdx5bevnvkluy4 '@vue/compiler-sfc': 3.2.47 - '@vue/runtime-dom': 3.2.47 '@vue/tsconfig': 0.1.3_@types+node@17.0.31 async-exit-hook: 2.0.1 autoprefixer: 10.4.7_postcss@8.4.13 @@ -129,7 +125,7 @@ devDependencies: to-string-loader: 1.2.0 ts-node: 10.7.0_l47be6km5p57gglrggidw5gsgm typescript: 4.6.4 - vue-loader: 16.8.3_r7vvfzv63hczw4zeceew7yfrmi + vue-loader: 17.0.1_r7vvfzv63hczw4zeceew7yfrmi vue-tsc: 1.0.24_typescript@4.6.4 webpack: 5.72.0_webpack-cli@4.9.2 webpack-bundle-analyzer: 4.5.0 @@ -1868,17 +1864,6 @@ packages: '@volar/vue-language-core': 1.0.24 dev: true - /@vue/compat/3.2.47_vue@3.2.47: - resolution: {integrity: sha512-spULbnhceN3fIGYRRgq75RPRqsakfUV0tyZ4zTweOB48bWtwHUn677exg8/58uLOBc1F5B5lXTD5qf7epqpTuw==} - peerDependencies: - vue: 3.2.47 - dependencies: - '@babel/parser': 7.18.5 - estree-walker: 2.0.2 - source-map: 0.6.1 - vue: 3.2.47 - dev: false - /@vue/compiler-core/3.2.47: resolution: {integrity: sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig==} dependencies: @@ -2365,7 +2350,7 @@ packages: dev: true /big.js/5.2.2: - resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npm.taobao.org/big.js/-/big.js-5.2.2.tgz} + resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} dev: true /binary-extensions/2.2.0: @@ -2556,10 +2541,10 @@ packages: dev: true /color-name/1.1.3: - resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npm.taobao.org/color-name/-/color-name-1.1.3.tgz} + resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==} /color-name/1.1.4: - resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npm.taobao.org/color-name/-/color-name-1.1.4.tgz} + resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} /color-string/1.9.1: resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npm.taobao.org/color-string/-/color-string-1.9.1.tgz} @@ -2837,7 +2822,7 @@ packages: dev: true /emojis-list/3.0.0: - resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npm.taobao.org/emojis-list/-/emojis-list-3.0.0.tgz} + resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} dev: true @@ -3833,14 +3818,14 @@ packages: dev: true /json5/1.0.1: - resolution: {integrity: sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npm.taobao.org/json5/-/json5-1.0.1.tgz} + resolution: {integrity: sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==} hasBin: true dependencies: minimist: 1.2.6 dev: true /json5/2.2.1: - resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npm.taobao.org/json5/-/json5-2.2.1.tgz} + resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==} engines: {node: '>=6'} hasBin: true dev: true @@ -3903,7 +3888,7 @@ packages: dev: true /loader-utils/2.0.2: - resolution: {integrity: sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npm.taobao.org/loader-utils/-/loader-utils-2.0.2.tgz} + resolution: {integrity: sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==} engines: {node: '>=8.9.0'} dependencies: big.js: 5.2.2 @@ -5512,11 +5497,11 @@ packages: - supports-color dev: true - /vue-loader/16.8.3_r7vvfzv63hczw4zeceew7yfrmi: - resolution: {integrity: sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==} + /vue-loader/17.0.1_r7vvfzv63hczw4zeceew7yfrmi: + resolution: {integrity: sha512-/OOyugJnImKCkAKrAvdsWMuwoCqGxWT5USLsjohzWbMgOwpA5wQmzQiLMzZd7DjhIfunzAGIApTOgIylz/kwcg==} peerDependencies: - '@vue/compiler-sfc': ^3.0.8 - vue: ^3.2.13 + '@vue/compiler-sfc': '*' + vue: '*' webpack: ^4.1.0 || ^5.0.0-0 peerDependenciesMeta: '@vue/compiler-sfc': diff --git a/src/vue-compat.d.ts b/src/vue-compat.d.ts deleted file mode 100644 index 63ddd7559..000000000 --- a/src/vue-compat.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -declare module 'vue' { - import type { CompatVue } from '@vue/runtime-dom' - - const Vue: CompatVue - export * from '@vue/runtime-dom' - const { configureCompat } = Vue - export { configureCompat } -} diff --git a/tsconfig.json b/tsconfig.json index b4e2dc9b5..72c8905f3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,10 +8,7 @@ "paths": { "@/*": [ "src/*" - ], - "vue": [ - "node_modules/@vue/compat" - ], + ] } }, "include": [ diff --git a/webpack/webpack.config.ts b/webpack/webpack.config.ts index c036f4742..521216f29 100644 --- a/webpack/webpack.config.ts +++ b/webpack/webpack.config.ts @@ -29,7 +29,6 @@ export const getDefaultConfig = (src = relativePath('src')): Configuration => { alias: { '@': relativePath('src'), 'fuse.js$': 'fuse.js/dist/fuse.basic.esm.min.js', - vue: '@vue/compat', }, }, performance: { @@ -103,11 +102,6 @@ export const getDefaultConfig = (src = relativePath('src')): Configuration => { options: { optimizeSSR: false, hotReload: false, - compilerOptions: { - compatConfig: { - MODE: 2, - }, - }, }, }, ],