diff --git a/package.json b/package.json index 5ec8f8e..020a569 100644 --- a/package.json +++ b/package.json @@ -66,8 +66,6 @@ "@vitejs/plugin-vue-jsx": "^1.3.7", "autoprefixer": "^10.4.2", "commitizen": "^4.2.4", - "consola": "^2.15.3", - "console": "npm:Console@^0.7.2", "eslint": "^8.9.0", "eslint-config-prettier": "^8.3.0", "eslint-define-config": "^1.2.5", @@ -92,7 +90,7 @@ "vite-plugin-eslint": "^1.3.0", "vite-plugin-mock": "^2.9.6", "vite-plugin-purge-icons": "^0.7.0", - "vite-plugin-style-import": "^2.0.0", + "vite-plugin-style-import": "1.4.1", "vite-plugin-svg-icons": "^2.0.1", "vite-plugin-vue-setup-extend": "^0.4.0", "vite-plugin-windicss": "^1.7.1", @@ -100,9 +98,6 @@ "windicss": "^3.4.3", "windicss-analysis": "^0.3.5" }, - "resolutions": { - "console": "consola" - }, "engines": { "node": ">= 14.0.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2042fd4..b0305cc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,8 +25,6 @@ specifiers: autoprefixer: ^10.4.2 axios: ^0.26.0 commitizen: ^4.2.4 - consola: ^2.15.3 - console: npm:Console@^0.7.2 echarts: ^5.3.0 echarts-wordcloud: ^2.0.0 element-plus: 2.0.2 @@ -61,7 +59,7 @@ specifiers: vite-plugin-eslint: ^1.3.0 vite-plugin-mock: ^2.9.6 vite-plugin-purge-icons: ^0.7.0 - vite-plugin-style-import: ^2.0.0 + vite-plugin-style-import: 1.4.1 vite-plugin-svg-icons: ^2.0.1 vite-plugin-vue-setup-extend: ^0.4.0 vite-plugin-windicss: ^1.7.1 @@ -116,8 +114,6 @@ devDependencies: '@vitejs/plugin-vue-jsx': registry.npmmirror.com/@vitejs/plugin-vue-jsx/1.3.7 autoprefixer: registry.npmmirror.com/autoprefixer/10.4.2_postcss@8.4.6 commitizen: registry.npmmirror.com/commitizen/4.2.4 - consola: registry.npmmirror.com/consola/2.15.3 - console: registry.npmmirror.com/Console/0.7.2 eslint: registry.npmmirror.com/eslint/8.9.0 eslint-config-prettier: registry.nlark.com/eslint-config-prettier/8.3.0_eslint@8.9.0 eslint-define-config: registry.npmmirror.com/eslint-define-config/1.2.5 @@ -142,7 +138,7 @@ devDependencies: vite-plugin-eslint: registry.nlark.com/vite-plugin-eslint/1.3.0_vite@2.8.3 vite-plugin-mock: registry.npmmirror.com/vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@2.8.3 vite-plugin-purge-icons: registry.nlark.com/vite-plugin-purge-icons/0.7.0_vite@2.8.3 - vite-plugin-style-import: registry.npmmirror.com/vite-plugin-style-import/2.0.0_vite@2.8.3 + vite-plugin-style-import: registry.npmmirror.com/vite-plugin-style-import/1.4.1_vite@2.8.3 vite-plugin-svg-icons: registry.npmmirror.com/vite-plugin-svg-icons/2.0.1_vite@2.8.3 vite-plugin-vue-setup-extend: registry.npmmirror.com/vite-plugin-vue-setup-extend/0.4.0_vite@2.8.3 vite-plugin-windicss: registry.npmmirror.com/vite-plugin-windicss/1.7.1_vite@2.8.3 @@ -4519,17 +4515,6 @@ packages: fastest-levenshtein: registry.npmmirror.com/fastest-levenshtein/1.0.12 dev: false - registry.npmmirror.com/Console/0.7.2: - resolution: - { - integrity: sha512-+JSDwGunA4MTEgAV/4VBKwUHonP8CzJ/6GIuwPi6acKFqFfHUdSGCm89ZxZ5FfGWdZfkdgAroy5bJ5FSeN/t4g==, - registry: https://registry.npm.taobao.org/, - tarball: https://registry.npmmirror.com/Console/-/Console-0.7.2.tgz - } - name: Console - version: 0.7.2 - dev: true - registry.npmmirror.com/JSONStream/1.3.5: resolution: { @@ -5758,17 +5743,6 @@ packages: version: 1.0.17 dev: false - registry.npmmirror.com/consola/2.15.3: - resolution: - { - integrity: sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==, - registry: https://registry.npm.taobao.org/, - tarball: https://registry.npmmirror.com/consola/-/consola-2.15.3.tgz - } - name: consola - version: 2.15.3 - dev: true - registry.npmmirror.com/constant-case/3.0.4: resolution: { @@ -13588,27 +13562,28 @@ packages: - supports-color dev: true - registry.npmmirror.com/vite-plugin-style-import/2.0.0_vite@2.8.3: + registry.npmmirror.com/vite-plugin-style-import/1.4.1_vite@2.8.3: resolution: { - integrity: sha512-qtoHQae5dSUQPo/rYz/8p190VU5y19rtBaeV7ryLa/AYAU/e9CG89NrN/3+k7MR8mJy/GPIu91iJ3zk9foUOSA==, + integrity: sha512-lJCRvm7+So0hHdnSJiJPg9gD5mxtL6YY0jmhEph+k7ArpsyvqOh6han2kG5htbWWDZxHkUN9d1BuTFL//yCLLQ==, registry: https://registry.npm.taobao.org/, - tarball: https://registry.npmmirror.com/vite-plugin-style-import/-/vite-plugin-style-import-2.0.0.tgz + tarball: https://registry.npmmirror.com/vite-plugin-style-import/-/vite-plugin-style-import-1.4.1.tgz } - id: registry.npmmirror.com/vite-plugin-style-import/2.0.0 + id: registry.npmmirror.com/vite-plugin-style-import/1.4.1 name: vite-plugin-style-import - version: 2.0.0 + version: 1.4.1 peerDependencies: vite: '>=2.0.0' dependencies: '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.1.2 change-case: registry.npmmirror.com/change-case/4.1.2 - console: registry.npmmirror.com/Console/0.7.2 + debug: registry.npmmirror.com/debug/4.3.3 es-module-lexer: registry.npmmirror.com/es-module-lexer/0.9.3 fs-extra: registry.npmmirror.com/fs-extra/10.0.0 magic-string: registry.npmmirror.com/magic-string/0.25.7 - pathe: registry.npmmirror.com/pathe/0.2.0 vite: registry.npmmirror.com/vite/2.8.3_less@4.1.2 + transitivePeerDependencies: + - supports-color dev: true registry.npmmirror.com/vite-plugin-svg-icons/2.0.1_vite@2.8.3: diff --git a/vite.config.ts b/vite.config.ts index 5c1831e..a6ac12f 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -6,7 +6,7 @@ import WindiCSS from 'vite-plugin-windicss' import VueJsx from '@vitejs/plugin-vue-jsx' import EslintPlugin from 'vite-plugin-eslint' import VueI18n from '@intlify/vite-plugin-vue-i18n' -import { createStyleImportPlugin, ElementPlusResolve } from 'vite-plugin-style-import' +import styleImport, { ElementPlusResolve } from 'vite-plugin-style-import' import { createSvgIconsPlugin } from 'vite-plugin-svg-icons' import PurgeIcons from 'vite-plugin-purge-icons' import { viteMockServe } from 'vite-plugin-mock' @@ -34,7 +34,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => { Vue(), VueJsx(), WindiCSS(), - createStyleImportPlugin({ + styleImport({ resolves: [ElementPlusResolve()], libs: [{ libraryName: 'element-plus',