diff --git a/build/vite/plugin/theme.ts b/build/vite/plugin/theme.ts index 928b96cc0193c3a5c73969f0bc8666050ebb6541..93bf142a910334e22e7d25013cc9a91b4d990794 100644 --- a/build/vite/plugin/theme.ts +++ b/build/vite/plugin/theme.ts @@ -22,7 +22,17 @@ export function configThemePlugin(isBuild: boolean): Plugin[] { }); const plugin = [ viteThemePlugin({ - resolveSelector: (s) => `[data-theme] ${s}`, + resolveSelector: (s) => { + s = s.trim(); + switch (s) { + case '.ant-steps-item-process .ant-steps-item-icon > .ant-steps-icon': + return '.ant-steps-item-icon > .ant-steps-icon'; + case '.ant-steps-item-icon > .ant-steps-icon': + return s; + } + + return `[data-theme] ${s}`; + }, colorVariables: [...getThemeColors(), ...colors], }), antdDarkThemePlugin({ diff --git a/package.json b/package.json index f8e2a94b743244d533789b08439e6b602c5f9afe..44d925a2eac89f221b2229ed38f578a8261baee7 100644 --- a/package.json +++ b/package.json @@ -114,14 +114,14 @@ "vite-plugin-style-import": "^0.9.2", "vite-plugin-svg-icons": "^0.4.1", "vite-plugin-theme": "^0.6.3", - "vite-plugin-windicss": "0.13.1", + "vite-plugin-windicss": "0.13.2", "vue-eslint-parser": "^7.6.0" }, "resolutions": { "//": "Used to install imagemin dependencies, because imagemin may not be installed in China.If it is abroad, you can delete it", "bin-wrapper": "npm:bin-wrapper-china", "rollup": "^2.45.1", - "esbuild": "^0.11.6" + "esbuild": "^0.11.7" }, "repository": { "type": "git", diff --git a/yarn.lock b/yarn.lock index 85a28978b19ff502a601002f6f47642b37948115..9d5f2637bb8938549fd78bfa3f7b6d49f1a29d51 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1696,10 +1696,10 @@ dependencies: vue-demi latest -"@windicss/plugin-utils@0.13.1": - version "0.13.1" - resolved "https://registry.npmjs.org/@windicss/plugin-utils/-/plugin-utils-0.13.1.tgz#e0e172855ebcf0b8a5f0f358befdcaf44bae5cf1" - integrity sha512-Vr7f7yWxmB5AWwe+iDPV3JbhTlZHbDvM89IfJ0hyP6PqYmZNTtUfMXMbHXZJHVAbQ54dWBMG23WmeC9X327ETA== +"@windicss/plugin-utils@0.13.2": + version "0.13.2" + resolved "https://registry.npmjs.org/@windicss/plugin-utils/-/plugin-utils-0.13.2.tgz#8df77495f38002edb9a92503a7a9dab99c773c1b" + integrity sha512-ZnHIPhyHSCYmkc3dcytSkTq3fchzCIvNsiptzP5twtK1Q7aWRNrOpPDywer64goWOBYHJIgCp8GFgzFSden3jw== dependencies: debug "^4.3.2" fast-glob "^3.2.5" @@ -3596,10 +3596,10 @@ esbuild-register@^2.2.0: esbuild "^0.11.5" jsonc-parser "^3.0.0" -esbuild@^0.11.4, esbuild@^0.11.5, esbuild@^0.11.6, esbuild@^0.9.2, esbuild@^0.9.3: - version "0.11.6" - resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.11.6.tgz#20961309c4cfed00b71027e18806150358d0cbb0" - integrity sha512-L+nKW9ftVS/N2CVJMR9YmXHbkm+vHzlNYuo09rzipQhF7dYNvRLfWoEPSDRTl10and4owFBV9rJ2CTFNtLIOiw== +esbuild@^0.11.4, esbuild@^0.11.5, esbuild@^0.11.6, esbuild@^0.11.7, esbuild@^0.9.2, esbuild@^0.9.3: + version "0.11.7" + resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.11.7.tgz#c32ee844d3b0db489e62ea0ad028e109f6f205c7" + integrity sha512-rY+jA0TiCFVLcvxUbbp+yQ9EEBXDsfIU4rsY7RKJEsx/fjjRFjyGnamRCBwUZQspK37G9We6xAkX7IibGA24AA== escalade@^3.1.1: version "3.1.1" @@ -9126,12 +9126,12 @@ vite-plugin-theme@^0.6.3: esbuild-plugin-alias "^0.1.2" tinycolor2 "^1.4.2" -vite-plugin-windicss@0.13.1: - version "0.13.1" - resolved "https://registry.npmjs.org/vite-plugin-windicss/-/vite-plugin-windicss-0.13.1.tgz#82a488f3395be710ae2166b83b0612a5eaec7738" - integrity sha512-WmFfTLTMSY5gRC3MWX9o72Yni2HRdrtJ2im+cCyZ2W/p4WE6T702zFCScO8Tnz/E08GDx4OH6oFCZWeZYwgxzg== +vite-plugin-windicss@0.13.2: + version "0.13.2" + resolved "https://registry.npmjs.org/vite-plugin-windicss/-/vite-plugin-windicss-0.13.2.tgz#c6390e42c4ceef2bd407fcbad8cab467ba695d87" + integrity sha512-yy9jncbjMl79hEnJC8F8UQhM3b+r9g+JDFtn1ximK0BZvMpS4UKBuayWjmmk9tb8/5I9W+H1osnrfhhlneLW1Q== dependencies: - "@windicss/plugin-utils" "0.13.1" + "@windicss/plugin-utils" "0.13.2" chalk "^4.1.0" debug "^4.3.2" windicss "^2.5.12"