From 1ffc2b7e9ce6091eea8a334b1cb90a082fd16249 Mon Sep 17 00:00:00 2001 From: aibayanyu20 Date: Fri, 27 Sep 2024 21:29:02 +0800 Subject: [PATCH 1/2] chore: change ts version --- package.json | 2 +- pnpm-lock.yaml | 214 ++++++++++++++++++++++++------------------------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/package.json b/package.json index fcf29b3..adbf1e4 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "changelogen": "^0.5.7", "eslint": "^9.11.1", "nuxt": "^3.13.2", - "typescript": "5.6.2", + "typescript": "~5.5.4", "vitest": "^2.1.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b324e84..05895fc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,29 +10,29 @@ importers: dependencies: '@ant-design/icons-vue': specifier: ^7.0.1 - version: 7.0.1(vue@3.5.9(typescript@5.6.2)) + version: 7.0.1(vue@3.5.9(typescript@5.5.4)) '@nuxt/kit': specifier: ^3.13.2 version: 3.13.2(magicast@0.3.5)(rollup@4.22.5)(webpack-sources@3.2.3) devDependencies: '@nuxt/eslint-config': specifier: ^0.5.7 - version: 0.5.7(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + version: 0.5.7(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4) '@nuxt/module-builder': specifier: ^0.8.4 - version: 0.8.4(@nuxt/kit@3.13.2(magicast@0.3.5)(rollup@4.22.5)(webpack-sources@3.2.3))(nuxi@3.14.0)(typescript@5.6.2)(webpack-sources@3.2.3) + version: 0.8.4(@nuxt/kit@3.13.2(magicast@0.3.5)(rollup@4.22.5)(webpack-sources@3.2.3))(nuxi@3.14.0)(typescript@5.5.4)(webpack-sources@3.2.3) '@nuxt/schema': specifier: ^3.13.2 version: 3.13.2(rollup@4.22.5)(webpack-sources@3.2.3) '@nuxt/test-utils': specifier: ^3.14.2 - version: 3.14.2(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.22.5)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vitest@2.1.1(@types/node@18.19.53)(terser@5.34.0))(vue-router@4.4.5(vue@3.5.9(typescript@5.6.2)))(vue@3.5.9(typescript@5.6.2))(webpack-sources@3.2.3) + version: 3.14.2(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.22.5)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vitest@2.1.1(@types/node@18.19.53)(terser@5.34.0))(vue-router@4.4.5(vue@3.5.9(typescript@5.5.4)))(vue@3.5.9(typescript@5.5.4))(webpack-sources@3.2.3) '@types/node': specifier: ^18.19.53 version: 18.19.53 ant-design-vue: specifier: ^4.2.5 - version: 4.2.5(vue@3.5.9(typescript@5.6.2)) + version: 4.2.5(vue@3.5.9(typescript@5.5.4)) changelogen: specifier: ^0.5.7 version: 0.5.7(magicast@0.3.5) @@ -41,10 +41,10 @@ importers: version: 9.11.1(jiti@2.0.0) nuxt: specifier: ^3.13.2 - version: 3.13.2(@parcel/watcher@2.4.1)(@types/node@18.19.53)(encoding@0.1.13)(eslint@9.11.1(jiti@2.0.0))(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.22.5)(terser@5.34.0)(typescript@5.6.2)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(webpack-sources@3.2.3) + version: 3.13.2(@parcel/watcher@2.4.1)(@types/node@18.19.53)(encoding@0.1.13)(eslint@9.11.1(jiti@2.0.0))(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.22.5)(terser@5.34.0)(typescript@5.5.4)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(webpack-sources@3.2.3) typescript: - specifier: 5.6.2 - version: 5.6.2 + specifier: ~5.5.4 + version: 5.5.4 vitest: specifier: ^2.1.1 version: 2.1.1(@types/node@18.19.53)(terser@5.34.0) @@ -3878,8 +3878,8 @@ packages: type-level-regexp@0.1.17: resolution: {integrity: sha512-wTk4DH3cxwk196uGLK/E9pE45aLfeKJacKmcEgEOA/q5dnPGNxXt0cfYdFxb57L+sEpf1oJH4Dnx/pnRcku9jg==} - typescript@5.6.2: - resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==} + typescript@5.5.4: + resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==} engines: {node: '>=14.17'} hasBin: true @@ -4306,11 +4306,11 @@ snapshots: '@ant-design/icons-svg@4.4.2': {} - '@ant-design/icons-vue@7.0.1(vue@3.5.9(typescript@5.6.2))': + '@ant-design/icons-vue@7.0.1(vue@3.5.9(typescript@5.5.4))': dependencies: '@ant-design/colors': 6.0.0 '@ant-design/icons-svg': 4.4.2 - vue: 3.5.9(typescript@5.6.2) + vue: 3.5.9(typescript@5.5.4) '@antfu/utils@0.7.10': {} @@ -4971,13 +4971,13 @@ snapshots: rc9: 2.1.2 semver: 7.6.3 - '@nuxt/devtools@1.5.1(rollup@4.22.5)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vue@3.5.9(typescript@5.6.2))(webpack-sources@3.2.3)': + '@nuxt/devtools@1.5.1(rollup@4.22.5)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vue@3.5.9(typescript@5.5.4))(webpack-sources@3.2.3)': dependencies: '@antfu/utils': 0.7.10 '@nuxt/devtools-kit': 1.5.1(magicast@0.3.5)(rollup@4.22.5)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(webpack-sources@3.2.3) '@nuxt/devtools-wizard': 1.5.1 '@nuxt/kit': 3.13.2(magicast@0.3.5)(rollup@4.22.5)(webpack-sources@3.2.3) - '@vue/devtools-core': 7.4.4(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vue@3.5.9(typescript@5.6.2)) + '@vue/devtools-core': 7.4.4(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vue@3.5.9(typescript@5.5.4)) '@vue/devtools-kit': 7.4.4 birpc: 0.2.17 consola: 3.2.3 @@ -5019,17 +5019,17 @@ snapshots: - vue - webpack-sources - '@nuxt/eslint-config@0.5.7(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@nuxt/eslint-config@0.5.7(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4)': dependencies: '@eslint/js': 9.11.1 - '@nuxt/eslint-plugin': 0.5.7(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) - '@stylistic/eslint-plugin': 2.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/eslint-plugin': 8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/parser': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@nuxt/eslint-plugin': 0.5.7(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4) + '@stylistic/eslint-plugin': 2.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4) + '@typescript-eslint/eslint-plugin': 8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4))(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4) + '@typescript-eslint/parser': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4) eslint: 9.11.1(jiti@2.0.0) eslint-config-flat-gitignore: 0.3.0(eslint@9.11.1(jiti@2.0.0)) eslint-flat-config-utils: 0.4.0 - eslint-plugin-import-x: 4.3.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + eslint-plugin-import-x: 4.3.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4) eslint-plugin-jsdoc: 50.3.0(eslint@9.11.1(jiti@2.0.0)) eslint-plugin-regexp: 2.6.0(eslint@9.11.1(jiti@2.0.0)) eslint-plugin-unicorn: 55.0.0(eslint@9.11.1(jiti@2.0.0)) @@ -5042,10 +5042,10 @@ snapshots: - supports-color - typescript - '@nuxt/eslint-plugin@0.5.7(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@nuxt/eslint-plugin@0.5.7(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4)': dependencies: '@typescript-eslint/types': 8.7.0 - '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4) eslint: 9.11.1(jiti@2.0.0) transitivePeerDependencies: - supports-color @@ -5079,7 +5079,7 @@ snapshots: - supports-color - webpack-sources - '@nuxt/module-builder@0.8.4(@nuxt/kit@3.13.2(magicast@0.3.5)(rollup@4.22.5)(webpack-sources@3.2.3))(nuxi@3.14.0)(typescript@5.6.2)(webpack-sources@3.2.3)': + '@nuxt/module-builder@0.8.4(@nuxt/kit@3.13.2(magicast@0.3.5)(rollup@4.22.5)(webpack-sources@3.2.3))(nuxi@3.14.0)(typescript@5.5.4)(webpack-sources@3.2.3)': dependencies: '@nuxt/kit': 3.13.2(magicast@0.3.5)(rollup@4.22.5)(webpack-sources@3.2.3) citty: 0.1.6 @@ -5090,8 +5090,8 @@ snapshots: nuxi: 3.14.0 pathe: 1.1.2 pkg-types: 1.2.0 - tsconfck: 3.1.3(typescript@5.6.2) - unbuild: 2.0.0(typescript@5.6.2) + tsconfck: 3.1.3(typescript@5.5.4) + unbuild: 2.0.0(typescript@5.5.4) transitivePeerDependencies: - sass - supports-color @@ -5144,7 +5144,7 @@ snapshots: - supports-color - webpack-sources - '@nuxt/test-utils@3.14.2(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.22.5)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vitest@2.1.1(@types/node@18.19.53)(terser@5.34.0))(vue-router@4.4.5(vue@3.5.9(typescript@5.6.2)))(vue@3.5.9(typescript@5.6.2))(webpack-sources@3.2.3)': + '@nuxt/test-utils@3.14.2(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.22.5)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vitest@2.1.1(@types/node@18.19.53)(terser@5.34.0))(vue-router@4.4.5(vue@3.5.9(typescript@5.5.4)))(vue@3.5.9(typescript@5.5.4))(webpack-sources@3.2.3)': dependencies: '@nuxt/kit': 3.13.2(magicast@0.3.5)(rollup@4.22.5)(webpack-sources@3.2.3) '@nuxt/schema': 3.13.2(rollup@4.22.5)(webpack-sources@3.2.3) @@ -5171,9 +5171,9 @@ snapshots: unenv: 1.10.0 unplugin: 1.14.1(webpack-sources@3.2.3) vite: 5.4.8(@types/node@18.19.53)(terser@5.34.0) - vitest-environment-nuxt: 1.0.1(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.22.5)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vitest@2.1.1(@types/node@18.19.53)(terser@5.34.0))(vue-router@4.4.5(vue@3.5.9(typescript@5.6.2)))(vue@3.5.9(typescript@5.6.2))(webpack-sources@3.2.3) - vue: 3.5.9(typescript@5.6.2) - vue-router: 4.4.5(vue@3.5.9(typescript@5.6.2)) + vitest-environment-nuxt: 1.0.1(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.22.5)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vitest@2.1.1(@types/node@18.19.53)(terser@5.34.0))(vue-router@4.4.5(vue@3.5.9(typescript@5.5.4)))(vue@3.5.9(typescript@5.5.4))(webpack-sources@3.2.3) + vue: 3.5.9(typescript@5.5.4) + vue-router: 4.4.5(vue@3.5.9(typescript@5.5.4)) optionalDependencies: vitest: 2.1.1(@types/node@18.19.53)(terser@5.34.0) transitivePeerDependencies: @@ -5182,12 +5182,12 @@ snapshots: - supports-color - webpack-sources - '@nuxt/vite-builder@3.13.2(@types/node@18.19.53)(eslint@9.11.1(jiti@2.0.0))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.22.5)(terser@5.34.0)(typescript@5.6.2)(vue@3.5.9(typescript@5.6.2))(webpack-sources@3.2.3)': + '@nuxt/vite-builder@3.13.2(@types/node@18.19.53)(eslint@9.11.1(jiti@2.0.0))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.22.5)(terser@5.34.0)(typescript@5.5.4)(vue@3.5.9(typescript@5.5.4))(webpack-sources@3.2.3)': dependencies: '@nuxt/kit': 3.13.2(magicast@0.3.5)(rollup@4.22.5)(webpack-sources@3.2.3) '@rollup/plugin-replace': 5.0.7(rollup@4.22.5) - '@vitejs/plugin-vue': 5.1.4(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vue@3.5.9(typescript@5.6.2)) - '@vitejs/plugin-vue-jsx': 4.0.1(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vue@3.5.9(typescript@5.6.2)) + '@vitejs/plugin-vue': 5.1.4(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vue@3.5.9(typescript@5.5.4)) + '@vitejs/plugin-vue-jsx': 4.0.1(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vue@3.5.9(typescript@5.5.4)) autoprefixer: 10.4.20(postcss@8.4.47) clear: 0.1.0 consola: 3.2.3 @@ -5215,8 +5215,8 @@ snapshots: unplugin: 1.14.1(webpack-sources@3.2.3) vite: 5.4.8(@types/node@18.19.53)(terser@5.34.0) vite-node: 2.1.1(@types/node@18.19.53)(terser@5.34.0) - vite-plugin-checker: 0.8.0(eslint@9.11.1(jiti@2.0.0))(optionator@0.9.4)(typescript@5.6.2)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0)) - vue: 3.5.9(typescript@5.6.2) + vite-plugin-checker: 0.8.0(eslint@9.11.1(jiti@2.0.0))(optionator@0.9.4)(typescript@5.5.4)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0)) + vue: 3.5.9(typescript@5.5.4) vue-bundle-renderer: 2.1.1 transitivePeerDependencies: - '@biomejs/biome' @@ -5478,9 +5478,9 @@ snapshots: '@sindresorhus/merge-streams@2.3.0': {} - '@stylistic/eslint-plugin@2.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@stylistic/eslint-plugin@2.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4)': dependencies: - '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4) eslint: 9.11.1(jiti@2.0.0) eslint-visitor-keys: 4.0.0 espree: 10.1.0 @@ -5508,34 +5508,34 @@ snapshots: '@types/resolve@1.20.2': {} - '@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4))(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4)': dependencies: '@eslint-community/regexpp': 4.11.1 - '@typescript-eslint/parser': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/parser': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4) '@typescript-eslint/scope-manager': 8.7.0 - '@typescript-eslint/type-utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/type-utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4) + '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4) '@typescript-eslint/visitor-keys': 8.7.0 eslint: 9.11.1(jiti@2.0.0) graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 - ts-api-utils: 1.3.0(typescript@5.6.2) + ts-api-utils: 1.3.0(typescript@5.5.4) optionalDependencies: - typescript: 5.6.2 + typescript: 5.5.4 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4)': dependencies: '@typescript-eslint/scope-manager': 8.7.0 '@typescript-eslint/types': 8.7.0 - '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.5.4) '@typescript-eslint/visitor-keys': 8.7.0 debug: 4.3.7 eslint: 9.11.1(jiti@2.0.0) optionalDependencies: - typescript: 5.6.2 + typescript: 5.5.4 transitivePeerDependencies: - supports-color @@ -5544,21 +5544,21 @@ snapshots: '@typescript-eslint/types': 8.7.0 '@typescript-eslint/visitor-keys': 8.7.0 - '@typescript-eslint/type-utils@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/type-utils@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4)': dependencies: - '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.6.2) - '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.5.4) + '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4) debug: 4.3.7 - ts-api-utils: 1.3.0(typescript@5.6.2) + ts-api-utils: 1.3.0(typescript@5.5.4) optionalDependencies: - typescript: 5.6.2 + typescript: 5.5.4 transitivePeerDependencies: - eslint - supports-color '@typescript-eslint/types@8.7.0': {} - '@typescript-eslint/typescript-estree@8.7.0(typescript@5.6.2)': + '@typescript-eslint/typescript-estree@8.7.0(typescript@5.5.4)': dependencies: '@typescript-eslint/types': 8.7.0 '@typescript-eslint/visitor-keys': 8.7.0 @@ -5567,18 +5567,18 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@5.6.2) + ts-api-utils: 1.3.0(typescript@5.5.4) optionalDependencies: - typescript: 5.6.2 + typescript: 5.5.4 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/utils@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) '@typescript-eslint/scope-manager': 8.7.0 '@typescript-eslint/types': 8.7.0 - '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.5.4) eslint: 9.11.1(jiti@2.0.0) transitivePeerDependencies: - supports-color @@ -5608,14 +5608,14 @@ snapshots: '@unhead/schema': 1.11.6 '@unhead/shared': 1.11.6 - '@unhead/vue@1.11.6(vue@3.5.9(typescript@5.6.2))': + '@unhead/vue@1.11.6(vue@3.5.9(typescript@5.5.4))': dependencies: '@unhead/schema': 1.11.6 '@unhead/shared': 1.11.6 defu: 6.1.4 hookable: 5.5.3 unhead: 1.11.6 - vue: 3.5.9(typescript@5.6.2) + vue: 3.5.9(typescript@5.5.4) '@vercel/nft@0.26.5(encoding@0.1.13)': dependencies: @@ -5635,20 +5635,20 @@ snapshots: - encoding - supports-color - '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vue@3.5.9(typescript@5.6.2))': + '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vue@3.5.9(typescript@5.5.4))': dependencies: '@babel/core': 7.25.2 '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2) '@vue/babel-plugin-jsx': 1.2.5(@babel/core@7.25.2) vite: 5.4.8(@types/node@18.19.53)(terser@5.34.0) - vue: 3.5.9(typescript@5.6.2) + vue: 3.5.9(typescript@5.5.4) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue@5.1.4(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vue@3.5.9(typescript@5.6.2))': + '@vitejs/plugin-vue@5.1.4(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vue@3.5.9(typescript@5.5.4))': dependencies: vite: 5.4.8(@types/node@18.19.53)(terser@5.34.0) - vue: 3.5.9(typescript@5.6.2) + vue: 3.5.9(typescript@5.5.4) '@vitest/expect@2.1.1': dependencies: @@ -5690,7 +5690,7 @@ snapshots: loupe: 3.1.1 tinyrainbow: 1.2.0 - '@vue-macros/common@1.14.0(rollup@4.22.5)(vue@3.5.9(typescript@5.6.2))': + '@vue-macros/common@1.14.0(rollup@4.22.5)(vue@3.5.9(typescript@5.5.4))': dependencies: '@babel/types': 7.25.6 '@rollup/pluginutils': 5.1.2(rollup@4.22.5) @@ -5699,7 +5699,7 @@ snapshots: local-pkg: 0.5.0 magic-string-ast: 0.6.2 optionalDependencies: - vue: 3.5.9(typescript@5.6.2) + vue: 3.5.9(typescript@5.5.4) transitivePeerDependencies: - rollup @@ -5765,7 +5765,7 @@ snapshots: '@vue/devtools-api@6.6.4': {} - '@vue/devtools-core@7.4.4(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vue@3.5.9(typescript@5.6.2))': + '@vue/devtools-core@7.4.4(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vue@3.5.9(typescript@5.5.4))': dependencies: '@vue/devtools-kit': 7.4.4 '@vue/devtools-shared': 7.4.6 @@ -5773,7 +5773,7 @@ snapshots: nanoid: 3.3.7 pathe: 1.1.2 vite-hot-client: 0.2.3(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0)) - vue: 3.5.9(typescript@5.6.2) + vue: 3.5.9(typescript@5.5.4) transitivePeerDependencies: - vite @@ -5807,11 +5807,11 @@ snapshots: '@vue/shared': 3.5.9 csstype: 3.1.3 - '@vue/server-renderer@3.5.9(vue@3.5.9(typescript@5.6.2))': + '@vue/server-renderer@3.5.9(vue@3.5.9(typescript@5.5.4))': dependencies: '@vue/compiler-ssr': 3.5.9 '@vue/shared': 3.5.9 - vue: 3.5.9(typescript@5.6.2) + vue: 3.5.9(typescript@5.5.4) '@vue/shared@3.5.9': {} @@ -5864,10 +5864,10 @@ snapshots: ansi-styles@6.2.1: {} - ant-design-vue@4.2.5(vue@3.5.9(typescript@5.6.2)): + ant-design-vue@4.2.5(vue@3.5.9(typescript@5.5.4)): dependencies: '@ant-design/colors': 6.0.0 - '@ant-design/icons-vue': 7.0.1(vue@3.5.9(typescript@5.6.2)) + '@ant-design/icons-vue': 7.0.1(vue@3.5.9(typescript@5.5.4)) '@babel/runtime': 7.25.6 '@ctrl/tinycolor': 3.6.1 '@emotion/hash': 0.9.2 @@ -5886,8 +5886,8 @@ snapshots: shallow-equal: 1.2.1 stylis: 4.3.4 throttle-debounce: 5.0.2 - vue: 3.5.9(typescript@5.6.2) - vue-types: 3.0.2(vue@3.5.9(typescript@5.6.2)) + vue: 3.5.9(typescript@5.5.4) + vue-types: 3.0.2(vue@3.5.9(typescript@5.5.4)) warning: 4.0.3 anymatch@3.1.3: @@ -6545,9 +6545,9 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-import-x@4.3.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2): + eslint-plugin-import-x@4.3.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4): dependencies: - '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.5.4) debug: 4.3.7 doctrine: 3.0.0 eslint: 9.11.1(jiti@2.0.0) @@ -7362,7 +7362,7 @@ snapshots: mkdirp@1.0.4: {} - mkdist@1.5.9(typescript@5.6.2): + mkdist@1.5.9(typescript@5.5.4): dependencies: autoprefixer: 10.4.20(postcss@8.4.47) citty: 0.1.6 @@ -7378,7 +7378,7 @@ snapshots: postcss-nested: 6.2.0(postcss@8.4.47) semver: 7.6.3 optionalDependencies: - typescript: 5.6.2 + typescript: 5.5.4 mlly@1.7.1: dependencies: @@ -7547,18 +7547,18 @@ snapshots: nuxi@3.14.0: {} - nuxt@3.13.2(@parcel/watcher@2.4.1)(@types/node@18.19.53)(encoding@0.1.13)(eslint@9.11.1(jiti@2.0.0))(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.22.5)(terser@5.34.0)(typescript@5.6.2)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(webpack-sources@3.2.3): + nuxt@3.13.2(@parcel/watcher@2.4.1)(@types/node@18.19.53)(encoding@0.1.13)(eslint@9.11.1(jiti@2.0.0))(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.22.5)(terser@5.34.0)(typescript@5.5.4)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(webpack-sources@3.2.3): dependencies: '@nuxt/devalue': 2.0.2 - '@nuxt/devtools': 1.5.1(rollup@4.22.5)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vue@3.5.9(typescript@5.6.2))(webpack-sources@3.2.3) + '@nuxt/devtools': 1.5.1(rollup@4.22.5)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vue@3.5.9(typescript@5.5.4))(webpack-sources@3.2.3) '@nuxt/kit': 3.13.2(magicast@0.3.5)(rollup@4.22.5)(webpack-sources@3.2.3) '@nuxt/schema': 3.13.2(rollup@4.22.5)(webpack-sources@3.2.3) '@nuxt/telemetry': 2.6.0(magicast@0.3.5)(rollup@4.22.5)(webpack-sources@3.2.3) - '@nuxt/vite-builder': 3.13.2(@types/node@18.19.53)(eslint@9.11.1(jiti@2.0.0))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.22.5)(terser@5.34.0)(typescript@5.6.2)(vue@3.5.9(typescript@5.6.2))(webpack-sources@3.2.3) + '@nuxt/vite-builder': 3.13.2(@types/node@18.19.53)(eslint@9.11.1(jiti@2.0.0))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.22.5)(terser@5.34.0)(typescript@5.5.4)(vue@3.5.9(typescript@5.5.4))(webpack-sources@3.2.3) '@unhead/dom': 1.11.6 '@unhead/shared': 1.11.6 '@unhead/ssr': 1.11.6 - '@unhead/vue': 1.11.6(vue@3.5.9(typescript@5.6.2)) + '@unhead/vue': 1.11.6(vue@3.5.9(typescript@5.5.4)) '@vue/shared': 3.5.9 acorn: 8.12.1 c12: 1.11.2(magicast@0.3.5) @@ -7606,13 +7606,13 @@ snapshots: unhead: 1.11.6 unimport: 3.13.0(rollup@4.22.5)(webpack-sources@3.2.3) unplugin: 1.14.1(webpack-sources@3.2.3) - unplugin-vue-router: 0.10.8(rollup@4.22.5)(vue-router@4.4.5(vue@3.5.9(typescript@5.6.2)))(vue@3.5.9(typescript@5.6.2))(webpack-sources@3.2.3) + unplugin-vue-router: 0.10.8(rollup@4.22.5)(vue-router@4.4.5(vue@3.5.9(typescript@5.5.4)))(vue@3.5.9(typescript@5.5.4))(webpack-sources@3.2.3) unstorage: 1.12.0(ioredis@5.4.1) untyped: 1.5.0 - vue: 3.5.9(typescript@5.6.2) + vue: 3.5.9(typescript@5.5.4) vue-bundle-renderer: 2.1.1 vue-devtools-stub: 0.1.0 - vue-router: 4.4.5(vue@3.5.9(typescript@5.6.2)) + vue-router: 4.4.5(vue@3.5.9(typescript@5.5.4)) optionalDependencies: '@parcel/watcher': 2.4.1 '@types/node': 18.19.53 @@ -8107,11 +8107,11 @@ snapshots: dependencies: glob: 7.2.3 - rollup-plugin-dts@6.1.1(rollup@3.29.5)(typescript@5.6.2): + rollup-plugin-dts@6.1.1(rollup@3.29.5)(typescript@5.5.4): dependencies: magic-string: 0.30.11 rollup: 3.29.5 - typescript: 5.6.2 + typescript: 5.5.4 optionalDependencies: '@babel/code-frame': 7.24.7 @@ -8454,13 +8454,13 @@ snapshots: tr46@0.0.3: {} - ts-api-utils@1.3.0(typescript@5.6.2): + ts-api-utils@1.3.0(typescript@5.5.4): dependencies: - typescript: 5.6.2 + typescript: 5.5.4 - tsconfck@3.1.3(typescript@5.6.2): + tsconfck@3.1.3(typescript@5.5.4): optionalDependencies: - typescript: 5.6.2 + typescript: 5.5.4 tslib@2.7.0: {} @@ -8480,13 +8480,13 @@ snapshots: type-level-regexp@0.1.17: {} - typescript@5.6.2: {} + typescript@5.5.4: {} ufo@1.5.4: {} ultrahtml@1.5.3: {} - unbuild@2.0.0(typescript@5.6.2): + unbuild@2.0.0(typescript@5.5.4): dependencies: '@rollup/plugin-alias': 5.1.1(rollup@3.29.5) '@rollup/plugin-commonjs': 25.0.8(rollup@3.29.5) @@ -8503,17 +8503,17 @@ snapshots: hookable: 5.5.3 jiti: 1.21.6 magic-string: 0.30.11 - mkdist: 1.5.9(typescript@5.6.2) + mkdist: 1.5.9(typescript@5.5.4) mlly: 1.7.1 pathe: 1.1.2 pkg-types: 1.2.0 pretty-bytes: 6.1.1 rollup: 3.29.5 - rollup-plugin-dts: 6.1.1(rollup@3.29.5)(typescript@5.6.2) + rollup-plugin-dts: 6.1.1(rollup@3.29.5)(typescript@5.5.4) scule: 1.3.0 untyped: 1.5.0 optionalDependencies: - typescript: 5.6.2 + typescript: 5.5.4 transitivePeerDependencies: - sass - supports-color @@ -8574,11 +8574,11 @@ snapshots: universalify@2.0.1: {} - unplugin-vue-router@0.10.8(rollup@4.22.5)(vue-router@4.4.5(vue@3.5.9(typescript@5.6.2)))(vue@3.5.9(typescript@5.6.2))(webpack-sources@3.2.3): + unplugin-vue-router@0.10.8(rollup@4.22.5)(vue-router@4.4.5(vue@3.5.9(typescript@5.5.4)))(vue@3.5.9(typescript@5.5.4))(webpack-sources@3.2.3): dependencies: '@babel/types': 7.25.6 '@rollup/pluginutils': 5.1.2(rollup@4.22.5) - '@vue-macros/common': 1.14.0(rollup@4.22.5)(vue@3.5.9(typescript@5.6.2)) + '@vue-macros/common': 1.14.0(rollup@4.22.5)(vue@3.5.9(typescript@5.5.4)) ast-walker-scope: 0.6.2 chokidar: 3.6.0 fast-glob: 3.3.2 @@ -8591,7 +8591,7 @@ snapshots: unplugin: 1.14.1(webpack-sources@3.2.3) yaml: 2.5.1 optionalDependencies: - vue-router: 4.4.5(vue@3.5.9(typescript@5.6.2)) + vue-router: 4.4.5(vue@3.5.9(typescript@5.5.4)) transitivePeerDependencies: - rollup - vue @@ -8692,7 +8692,7 @@ snapshots: - supports-color - terser - vite-plugin-checker@0.8.0(eslint@9.11.1(jiti@2.0.0))(optionator@0.9.4)(typescript@5.6.2)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0)): + vite-plugin-checker@0.8.0(eslint@9.11.1(jiti@2.0.0))(optionator@0.9.4)(typescript@5.5.4)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0)): dependencies: '@babel/code-frame': 7.24.7 ansi-escapes: 4.3.2 @@ -8712,7 +8712,7 @@ snapshots: optionalDependencies: eslint: 9.11.1(jiti@2.0.0) optionator: 0.9.4 - typescript: 5.6.2 + typescript: 5.5.4 vite-plugin-inspect@0.8.7(@nuxt/kit@3.13.2(magicast@0.3.5)(rollup@4.22.5)(webpack-sources@3.2.3))(rollup@4.22.5)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0)): dependencies: @@ -8757,9 +8757,9 @@ snapshots: fsevents: 2.3.3 terser: 5.34.0 - vitest-environment-nuxt@1.0.1(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.22.5)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vitest@2.1.1(@types/node@18.19.53)(terser@5.34.0))(vue-router@4.4.5(vue@3.5.9(typescript@5.6.2)))(vue@3.5.9(typescript@5.6.2))(webpack-sources@3.2.3): + vitest-environment-nuxt@1.0.1(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.22.5)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vitest@2.1.1(@types/node@18.19.53)(terser@5.34.0))(vue-router@4.4.5(vue@3.5.9(typescript@5.5.4)))(vue@3.5.9(typescript@5.5.4))(webpack-sources@3.2.3): dependencies: - '@nuxt/test-utils': 3.14.2(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.22.5)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vitest@2.1.1(@types/node@18.19.53)(terser@5.34.0))(vue-router@4.4.5(vue@3.5.9(typescript@5.6.2)))(vue@3.5.9(typescript@5.6.2))(webpack-sources@3.2.3) + '@nuxt/test-utils': 3.14.2(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.22.5)(vite@5.4.8(@types/node@18.19.53)(terser@5.34.0))(vitest@2.1.1(@types/node@18.19.53)(terser@5.34.0))(vue-router@4.4.5(vue@3.5.9(typescript@5.5.4)))(vue@3.5.9(typescript@5.5.4))(webpack-sources@3.2.3) transitivePeerDependencies: - '@cucumber/cucumber' - '@jest/globals' @@ -8857,25 +8857,25 @@ snapshots: transitivePeerDependencies: - supports-color - vue-router@4.4.5(vue@3.5.9(typescript@5.6.2)): + vue-router@4.4.5(vue@3.5.9(typescript@5.5.4)): dependencies: '@vue/devtools-api': 6.6.4 - vue: 3.5.9(typescript@5.6.2) + vue: 3.5.9(typescript@5.5.4) - vue-types@3.0.2(vue@3.5.9(typescript@5.6.2)): + vue-types@3.0.2(vue@3.5.9(typescript@5.5.4)): dependencies: is-plain-object: 3.0.1 - vue: 3.5.9(typescript@5.6.2) + vue: 3.5.9(typescript@5.5.4) - vue@3.5.9(typescript@5.6.2): + vue@3.5.9(typescript@5.5.4): dependencies: '@vue/compiler-dom': 3.5.9 '@vue/compiler-sfc': 3.5.9 '@vue/runtime-dom': 3.5.9 - '@vue/server-renderer': 3.5.9(vue@3.5.9(typescript@5.6.2)) + '@vue/server-renderer': 3.5.9(vue@3.5.9(typescript@5.5.4)) '@vue/shared': 3.5.9 optionalDependencies: - typescript: 5.6.2 + typescript: 5.5.4 warning@4.0.3: dependencies: From 66b2d7aba9e0e64251e018cf4711d7446a24538b Mon Sep 17 00:00:00 2001 From: xuanhen2013 <1072671832@qq.com> Date: Fri, 18 Oct 2024 10:34:32 +0000 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=B0=86=E6=89=80=E6=9C=89=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=8B=86=E5=8C=85=E6=96=B9=E5=BC=8F=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/components.ts | 13 +++++++------ src/core/imports.ts | 5 ++--- src/core/options.ts | 6 +++++- src/module.ts | 7 +++++-- src/runtime/antd.ts | 2 ++ 5 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 src/runtime/antd.ts diff --git a/src/core/components.ts b/src/core/components.ts index 51aa945..946bfc5 100644 --- a/src/core/components.ts +++ b/src/core/components.ts @@ -1,8 +1,9 @@ import type { Options } from "../types"; -import { iconLibraryName, libraryName, prefix } from "../config" +import { prefix } from "../config" import { addComponent } from "@nuxt/kit"; -export const resolveComponents = (config:Options) =>{ +export const resolveComponents = (config:Options, filePath: string) =>{ + const { components,icons } = config; const allComponents = components === false ? [] : components; allComponents.forEach(component=>{ @@ -10,13 +11,13 @@ export const resolveComponents = (config:Options) =>{ addComponent({ export: component, name: prefix + component, - filePath: libraryName + '/es' + filePath }) }else if (Array.isArray(component)){ addComponent({ export: component[0], name: prefix + component[1], - filePath: libraryName + '/es' + filePath }) } }) @@ -29,13 +30,13 @@ export const resolveComponents = (config:Options) =>{ addComponent({ export: icon, name: icon, - filePath: iconLibraryName + filePath }) }else if (Array.isArray(icon)){ addComponent({ export: icon[0], name: icon[1], - filePath: iconLibraryName + filePath }) } }) diff --git a/src/core/imports.ts b/src/core/imports.ts index 75e9a72..5dadc38 100644 --- a/src/core/imports.ts +++ b/src/core/imports.ts @@ -1,12 +1,11 @@ import { addImportsSources } from "@nuxt/kit"; import type { Options } from "../types"; -import { libraryName } from "../config"; -export const resolveImports = (config:Options) => { +export const resolveImports = (config:Options, filePath: string) => { const { imports } = config const allImports = imports ? imports : [] addImportsSources({ - from: libraryName + '/es', + from: filePath, imports: [...allImports] }) } diff --git a/src/core/options.ts b/src/core/options.ts index 0d4d0ba..ea348be 100644 --- a/src/core/options.ts +++ b/src/core/options.ts @@ -16,9 +16,13 @@ export function resolveOptions () { resolve:{ alias:[ { - find: /^(ant-design-vue)(?!\/(es|dist))/, + find: /^(ant-design-vue)(?!\/(es|lib))/, replacement: 'ant-design-vue/es', }, + { + find: /^@ant-design\/icons-vue$/, + replacement: '@ant-design/icons-vue', + }, { find: /^dayjs\/plugin\/(.*)$/, replacement: 'dayjs/esm/plugin/$1', diff --git a/src/module.ts b/src/module.ts index 3908725..d8a85e2 100644 --- a/src/module.ts +++ b/src/module.ts @@ -15,10 +15,13 @@ export default defineNuxtModule>({ const options = _options as Options; resolveOptions() + + const antdRuntimePath = createResolver(import.meta.url).resolve('./runtime/antd') + // eslint-disable-next-line @typescript-eslint/no-unused-expressions - nuxt.options.imports.autoImport !== false && resolveImports(options) + nuxt.options.imports.autoImport !== false && resolveImports(options, antdRuntimePath) // eslint-disable-next-line @typescript-eslint/no-unused-expressions - nuxt.options.components !== false && resolveComponents(options) + nuxt.options.components !== false && resolveComponents(options, antdRuntimePath) if (options.extractStyle) { extractStyle() diff --git a/src/runtime/antd.ts b/src/runtime/antd.ts new file mode 100644 index 0000000..4ede6bd --- /dev/null +++ b/src/runtime/antd.ts @@ -0,0 +1,2 @@ +export * from 'ant-design-vue/es'; +export * from '@ant-design/icons-vue';