fix(windicss): support transforming dist files #327
+69
−123
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ import gracefulFs from 'graceful-fs' | |
| import clearModule from 'clear-module' | ||
| import jiti from 'jiti' | ||
| import defaultWindiConfig from './windi.config' | ||
| import fg from 'fast-glob' | ||
|
|
||
| const r = (...args: string[]) => resolve(__dirname, ...args) | ||
|
|
||
|
|
@@ -55,33 +56,42 @@ export default <Module>function themeSetupModule() { | |
| // Get Windi config at user project level | ||
| const localWindiConfig = loadWindiConfig(options) | ||
|
|
||
| hook('windicss:options', async (windiOptions: WindiConfig) => { | ||
| // Merge user and theme Windi configs | ||
| windiOptions.config = defu.arrayFn(windiOptions.config || {}, localWindiConfig || {}, defaultWindiConfig) | ||
|
|
||
| const transformFiles = await fg( | ||
| '**/*.{vue,css}', | ||
|
There was a problem hiding this comment. if you have any other style file type in the future with @apply's it will need to be added here |
||
| { | ||
| cwd: join(options.rootDir, '/node_modules/docus/dist'), | ||
| onlyFiles: true, | ||
| absolute: true, | ||
| }, | ||
| ) | ||
| // make sure file @apply's get transformed | ||
| windiOptions.scanOptions.extraTransformTargets = { | ||
| css: transformFiles.filter((f : string) => f.endsWith('.css')), | ||
| detect: transformFiles.filter((f : string) => f.endsWith('.vue')) | ||
| } | ||
|
|
||
| const glob = '/**/*.{html,vue,md,mdx,pug,jsx,tsx,svelte,css}' | ||
|
There was a problem hiding this comment. just cleaned this up a little and added css so that the scan will find them |
||
| // Resolve admin runtime path | ||
| const adminPath = join(__dirname, '../admin') | ||
|
|
||
| windiOptions.scanOptions.include.push( | ||
| join(adminPath, glob), | ||
| join(__dirname, glob), | ||
| join(options.rootDir, '/node_modules/docus/dist/' + glob), | ||
| join(options.themeDir, glob) | ||
| ) | ||
|
|
||
| // Merge shortcuts | ||
| windiOptions.config.shortcuts = { | ||
| ...(windiOptions.shortcuts || {}), | ||
| ...(settings?.theme?.shortcuts || {}) | ||
| } | ||
|
|
||
| return windiOptions | ||
| }) | ||
|
|
||
| hook('components:dirs', async (dirs: any) => { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -106,6 +106,11 @@ | |
| "@algolia/logger-common" "4.9.1" | ||
| "@algolia/requester-common" "4.9.1" | ||
|
|
||
| "@antfu/utils@^0.1.6": | ||
| version "0.1.6" | ||
| resolved "https://registry.yarnpkg.com/@antfu/utils/-/utils-0.1.6.tgz#a9e801f103fd14a59785dd0485fec06b6dc34d94" | ||
| integrity sha512-1lcCCEOv4gYlYa/OCjM2JA5nbNll04mNMhSXYu4QetbG14m3LdCvkyDAPlc2AmqRQEqkKpJldRL++9sPpOIydw== | ||
|
|
||
| "@babel/[email protected]": | ||
| version "7.12.11" | ||
| resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" | ||
|
|
@@ -2635,18 +2640,18 @@ | |
| "@webassemblyjs/wast-parser" "1.9.0" | ||
| "@xtuc/long" "4.2.2" | ||
|
|
||
| "@windicss/plugin-utils@0.16.0-beta.22": | ||
| version "0.16.0-beta.22" | ||
| resolved "https://registry.yarnpkg.com/@windicss/plugin-utils/-/plugin-utils-0.16.0-beta.22.tgz#fe6f11af4169517f5747ae6fe39e8a608b7e36d6" | ||
| integrity sha512-+OGayqsaWIQzcavpj4oq8+0q6UnDA6OdI2M/MsC9CWGqB+2DgYSsT51tDcypJRYDQE5FEL0+yFvcDuwsnynVAw== | ||
| dependencies: | ||
| "@antfu/utils" "^0.1.6" | ||
| debug "^4.3.2" | ||
| fast-glob "^3.2.5" | ||
| jiti "^1.9.2" | ||
| magic-string "^0.25.7" | ||
| micromatch "^4.0.4" | ||
| windicss "^3.0.9" | ||
|
|
||
| "@xtuc/ieee754@^1.2.0": | ||
| version "1.2.0" | ||
|
|
@@ -2844,11 +2849,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: | |
| dependencies: | ||
| color-convert "^2.0.1" | ||
|
|
||
| anymatch@^2.0.0: | ||
| version "2.0.0" | ||
| resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" | ||
|
|
@@ -4336,7 +4336,7 @@ commander@^2.19.0, commander@^2.20.0, commander@^2.20.3: | |
| resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" | ||
| integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== | ||
|
|
||
| commander@^4.1.1: | ||
| version "4.1.1" | ||
| resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" | ||
| integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== | ||
|
|
@@ -6567,18 +6567,6 @@ glob-to-regexp@^0.4.1: | |
| resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" | ||
| integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== | ||
|
|
||
| glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: | ||
| version "7.1.7" | ||
| resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" | ||
|
|
@@ -8553,7 +8541,7 @@ micromatch@^3.1.10, micromatch@^3.1.4: | |
| snapdragon "^0.8.1" | ||
| to-regex "^3.0.2" | ||
|
|
||
| micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4: | ||
| version "4.0.4" | ||
| resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" | ||
| integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== | ||
|
|
@@ -8790,15 +8778,6 @@ [email protected]: | |
| resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" | ||
| integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== | ||
|
|
||
| nan@^2.12.1: | ||
| version "2.14.2" | ||
| resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" | ||
|
|
@@ -8896,9 +8875,9 @@ node-forge@^0.10.0: | |
| integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== | ||
|
|
||
| node-html-parser@^3.3.0: | ||
| version "3.3.3" | ||
| resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-3.3.3.tgz#b937f6debbaa1e29cc34f43d7bc0295fb8c8082f" | ||
| integrity sha512-hyKoZ+qlr4/XFo9CUp6PKOkpBQ+28HXko7typIpPAoG9CIzAdVLbVON1etvoPXcr1dXKhApil4IVsrcTkKBb8w== | ||
| dependencies: | ||
| css-select "^3.1.2" | ||
| he "1.2.0" | ||
|
|
@@ -8932,11 +8911,6 @@ node-libs-browser@^2.2.1: | |
| util "^0.11.0" | ||
| vm-browserify "^1.0.1" | ||
|
|
||
| node-object-hash@^1.2.0: | ||
| version "1.4.2" | ||
| resolved "https://registry.yarnpkg.com/node-object-hash/-/node-object-hash-1.4.2.tgz#385833d85b229902b75826224f6077be969a9e94" | ||
|
|
@@ -9140,18 +9114,18 @@ nuxt-vite@^0.1.0: | |
| vite "~2.2.1" | ||
| vite-plugin-vue2 "^1.5.1" | ||
|
|
||
| nuxt-windicss@0.8.0-3: | ||
| version "0.8.0-3" | ||
| resolved "https://registry.yarnpkg.com/nuxt-windicss/-/nuxt-windicss-0.8.0-3.tgz#ca8f131ace31ede3d84b61a9a918e038a4bb4307" | ||
| integrity sha512-NtEOozdoYFpf7+QrZ0cyy943Lckz96rO1RW/0U4JbiE1hlc4BJV6QZsDqeQzTuUclrCqKFh2wKAb9/Tx1lF0vA== | ||
| dependencies: | ||
| clear-module "^4.1.1" | ||
| defu "^4.0.1" | ||
| rimraf "^3.0.2" | ||
| semver "^7.3.5" | ||
| upath "^2.0.1" | ||
| vite-plugin-windicss "0.16.0-beta.22" | ||
| windicss-webpack-plugin "0.6.0-4" | ||
|
|
||
| object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: | ||
| version "4.1.1" | ||
|
|
@@ -9652,13 +9626,6 @@ pinkie@^2.0.0: | |
| resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" | ||
| integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= | ||
|
|
||
| pkg-dir@^2.0.0: | ||
| version "2.0.0" | ||
| resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" | ||
|
|
@@ -12319,18 +12286,6 @@ stylehacks@^4.0.0: | |
| postcss "^7.0.0" | ||
| postcss-selector-parser "^3.0.0" | ||
|
|
||
| supports-color@^2.0.0: | ||
| version "2.0.0" | ||
| resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" | ||
|
|
@@ -12499,20 +12454,6 @@ theme-colors@^0.0.5: | |
| resolved "https://registry.yarnpkg.com/theme-colors/-/theme-colors-0.0.5.tgz#88f91ccf78b5bc17fa53ee59f38b166395fedce6" | ||
| integrity sha512-EAxGOASXbsrhcaFxEWsCRZb29sHhII/cs8a+Cn3a3AI/FT9uCqNM8rMQBf10jtgqIdl8kxg2rQXz5I2JLHuplA== | ||
|
|
||
| thread-loader@^3.0.4: | ||
| version "3.0.4" | ||
| resolved "https://registry.yarnpkg.com/thread-loader/-/thread-loader-3.0.4.tgz#c392e4c0241fbc80430eb680e4886819b504a31b" | ||
|
|
@@ -12655,11 +12596,6 @@ trough@^1.0.0: | |
| resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" | ||
| integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== | ||
|
|
||
| ts-loader@^8.0.17: | ||
| version "8.2.0" | ||
| resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.2.0.tgz#6a3aeaa378aecda543e2ed2c332d3123841d52e0" | ||
|
|
@@ -13148,15 +13084,15 @@ vite-plugin-vue2@^1.5.1: | |
| vue-template-compiler "^2.6.11" | ||
| vue-template-es2015-compiler "^1.9.1" | ||
|
|
||
| vite-plugin-windicss@0.16.0-beta.22: | ||
| version "0.16.0-beta.22" | ||
| resolved "https://registry.yarnpkg.com/vite-plugin-windicss/-/vite-plugin-windicss-0.16.0-beta.22.tgz#2b78c563c6271d1f96d0533775a4507cdfdfa22e" | ||
| integrity sha512-7EW4krZglxIefZ3cVMYKVBFLLUxjZI9R4Z1n3vRNELLJur+Hl62IP28YeDbGs2LfxjOg4nN9kwYO5gUAgNFXLQ== | ||
| dependencies: | ||
| "@windicss/plugin-utils" "0.16.0-beta.22" | ||
| chalk "^4.1.1" | ||
| debug "^4.3.2" | ||
| windicss "^3.0.9" | ||
|
|
||
| vite@~2.2.1: | ||
| version "2.2.4" | ||
|
|
@@ -13416,10 +13352,10 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack- | |
| source-list-map "^2.0.0" | ||
| source-map "~0.6.1" | ||
|
|
||
| webpack-virtual-modules@^0.4.3: | ||
| version "0.4.3" | ||
| resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.3.tgz#cd597c6d51d5a5ecb473eea1983a58fa8a17ded9" | ||
| integrity sha512-5NUqC2JquIL2pBAAo/VfBP6KuGkHIZQXW/lNKupLPfhViwh8wNsu0BObtl09yuKZszeEUfbXz8xhrHvSG16Nqw== | ||
|
|
||
| webpack@^4.46.0: | ||
| version "4.46.0" | ||
|
|
@@ -13508,23 +13444,23 @@ widest-line@^3.1.0: | |
| dependencies: | ||
| string-width "^4.0.0" | ||
|
|
||
| windicss-webpack-plugin@0.6.0-4: | ||
| version "0.6.0-4" | ||
| resolved "https://registry.yarnpkg.com/windicss-webpack-plugin/-/windicss-webpack-plugin-0.6.0-4.tgz#98960d9f0a11cbc0bfd2ec1016711cc5cc103efc" | ||
| integrity sha512-rlF9Uxfd+AHKl8C03Y00tWsRuZ4YFTBtuM1uUkfqjMn6fyV2SbwRyWX+e0dnkMS3WsYHkLB2l3mAuYXz9LRn1g== | ||
| dependencies: | ||
| "@windicss/plugin-utils" "0.16.0-beta.22" | ||
| debug "^4.3.1" | ||
| loader-utils "^2.0.0" | ||
| magic-string "^0.25.7" | ||
| upath "^2.0.1" | ||
| webpack-virtual-modules "^0.4.3" | ||
| windicss "3.0.9" | ||
|
|
||
| windicss@3.0.9, windicss@^3.0.9: | ||
| version "3.0.9" | ||
| resolved "https://registry.yarnpkg.com/windicss/-/windicss-3.0.9.tgz#bc71e6fac60f779f9f3c4b4680565156623911d3" | ||
| integrity sha512-pv/SnYPfqYwz25672irDzNZpcEK/QlN9Dlhe2KUQXDjqd46wl/zLAi51BNB0pdfDZDbNjyvI1XgDXHk1oFF51A== | ||
|
|
||
| with@^7.0.0: | ||
| version "7.0.2" | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this only works before the options have been resolved, this hook is run after the options are resolved though
so the
includebelow should be good enough