From e22712fded02f1369d2ed8cabab94e47976d898c Mon Sep 17 00:00:00 2001 From: Harlan Wilton Date: Sun, 23 May 2021 14:19:58 +1000 Subject: [PATCH 1/4] fix(windicss): tranform dist file @applys --- docs/nuxt.config.ts | 5 +- package.json | 2 +- src/defaultTheme/module.ts | 32 +++++--- yarn.lock | 158 +++++++++++-------------------------- 4 files changed, 73 insertions(+), 124 deletions(-) diff --git a/docs/nuxt.config.ts b/docs/nuxt.config.ts index 0fc381199..287f4ef01 100644 --- a/docs/nuxt.config.ts +++ b/docs/nuxt.config.ts @@ -9,7 +9,10 @@ export default withDocus({ /** * Modules */ - buildModules: ['vue-plausible', '@nuxt/typescript-build'], + buildModules: [ + // 'vue-plausible', + '@nuxt/typescript-build' + ], /** * Modules config */ diff --git a/package.json b/package.json index 1e1646372..a10bf7c40 100755 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "nuxt-extend": "^0.1.0", "nuxt-i18n": "^6.27.0", "nuxt-vite": "^0.1.0", - "nuxt-windicss": "^0.5.4", + "nuxt-windicss": "0.8.0-3", "ohmyfetch": "^0.1.8", "plausible-tracker": "^0.3.1", "postinstall-postinstall": "^2.1.0", diff --git a/src/defaultTheme/module.ts b/src/defaultTheme/module.ts index ff5aa06fd..c433a9d3d 100644 --- a/src/defaultTheme/module.ts +++ b/src/defaultTheme/module.ts @@ -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,26 +56,33 @@ export default function themeSetupModule() { // Get Windi config at user project level const localWindiConfig = loadWindiConfig(options) - hook('windicss:options', (windiOptions: WindiConfig) => { + hook('windicss:options', async (windiOptions: WindiConfig) => { // Merge user and theme Windi configs windiOptions.config = defu.arrayFn(windiOptions.config || {}, localWindiConfig || {}, defaultWindiConfig) - // Include local & npm depencies directories in scan process - windiOptions.scanOptions.dirs.push( - __dirname, - join(__dirname, '/node_modules/docus/dist'), - join(options.rootDir, '/node_modules/docus/dist'), - join(options.themeDir) + const transformFiles = await fg( + '**/*.{vue,css}', + { + 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}' // Resolve admin runtime path const adminPath = join(__dirname, '../admin') windiOptions.scanOptions.include.push( - join(adminPath, '/**/*.{html,vue,md,mdx,pug,jsx,tsx,svelte}'), - join(__dirname, '/**/*.{html,vue,md,mdx,pug,jsx,tsx,svelte}'), - join(options.rootDir, '/node_modules/docus/dist/**/*.{html,vue,md,mdx,pug,jsx,tsx,svelte}'), - join(options.themeDir, '/**/*.{html,vue,md,mdx,pug,jsx,tsx,svelte}') + join(adminPath, glob), + join(__dirname, glob), + join(options.rootDir, '/node_modules/docus/dist/' + glob), + join(options.themeDir, glob) ) // Merge shortcuts @@ -82,6 +90,8 @@ export default function themeSetupModule() { ...(windiOptions.shortcuts || {}), ...(settings?.theme?.shortcuts || {}) } + + return windiOptions }) hook('components:dirs', async (dirs: any) => { diff --git a/yarn.lock b/yarn.lock index b64484131..edb8137e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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/code-frame@7.12.11": 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.12.5": - version "0.12.5" - resolved "https://registry.yarnpkg.com/@windicss/plugin-utils/-/plugin-utils-0.12.5.tgz#d03517d1ae7a48b5b459e3d670e873d38b63e4a1" - integrity sha512-4ux2o4s6D/gRTD68os41oxs/0NFk/eSJxHhZL9nN2wy4RGt+pPMQJyOHV56l7zDh9B0ywU5+ZRxDjdw2cl5Yvg== +"@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.2" - pirates "^4.0.1" - sucrase "^3.17.1" - windicss "^2.5.11" + 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" -any-promise@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" - integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= - 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.0.0, commander@^4.1.1: +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.1.6: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - 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.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 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -mz@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" - integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== - dependencies: - any-promise "^1.0.0" - object-assign "^4.0.1" - thenify-all "^1.0.0" - 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.0" - resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-3.3.0.tgz#6009e52c7cde40c43edcc21116f6cf505129196b" - integrity sha512-grr0KoPA0QDR8nROXr01M5LvpX21ncnyI+Z0HO9JyevYzejS80c3J5t/YNRhBGPHp/EI26bo0NZRRDctxNgC+g== + 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-modules-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" - integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= - 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.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/nuxt-windicss/-/nuxt-windicss-0.5.4.tgz#f061a36827c221f521d463816d91489a09c7f827" - integrity sha512-I21jFQUfjrGKpfWOZmguCvjf6/be93gsqRUGvhys+IfaPKhmnFaua8lYPBUYOv3E5RFQV082kWL3UTLwFPBnEA== +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 "^3.2.2" + defu "^4.0.1" rimraf "^3.0.2" semver "^7.3.5" upath "^2.0.1" - vite-plugin-windicss "^0.12.5" - windicss-webpack-plugin "^0.3.3" + 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= -pirates@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" - integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== - dependencies: - node-modules-regexp "^1.0.0" - 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" -sucrase@^3.17.1: - version "3.18.1" - resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.18.1.tgz#7c699d5148734b1105542ca4ea2aa69bcab7f728" - integrity sha512-TRyO38wwOPhLLlM8QLOG3TgMj0FKk+arlTrS9pRAanF8cAcHvgRPKIYWGO25mPSp/Rj87zMMTjFfkqIZGI6ZdA== - dependencies: - commander "^4.0.0" - glob "7.1.6" - lines-and-columns "^1.1.6" - mz "^2.7.0" - pirates "^4.0.1" - ts-interface-checker "^0.1.9" - 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== -thenify-all@^1.0.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" - integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= - dependencies: - thenify ">= 3.1.0 < 4" - -"thenify@>= 3.1.0 < 4": - version "3.3.1" - resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f" - integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw== - dependencies: - any-promise "^1.0.0" - 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-interface-checker@^0.1.9: - version "0.1.13" - resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699" - integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA== - 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.12.5: - version "0.12.5" - resolved "https://registry.yarnpkg.com/vite-plugin-windicss/-/vite-plugin-windicss-0.12.5.tgz#74a5043db3615fe432855f6ecff13be36f7a6843" - integrity sha512-M/eEA+x94kxZNpEEkJLdY7M6Lp3WFhN0Kb/a2zhdPxBviMwaHSA5A7fUqN1xTYMxlQe4xM7D7naxL7EpnSNlmg== +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.12.5" - chalk "^4.1.0" + "@windicss/plugin-utils" "0.16.0-beta.22" + chalk "^4.1.1" debug "^4.3.2" - windicss "^2.5.11" + 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.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.2.tgz#68ce4479df7334a491b7a3f3bead47fe382947d9" - integrity sha512-OUsT1VZhArN8nY7g6mMlw91HWnXcNXsIQjsQ83WteF4ViZ6YXqF2sWKOTDIZ0H+PPiApQdszLdZIrD7NNlU0Yw== +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.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/windicss-webpack-plugin/-/windicss-webpack-plugin-0.3.3.tgz#74addc441b3c9e20bb727598bcacb6c8903d67d8" - integrity sha512-XtV7cprqmWEglN6B3ALp09aGFIETnG3G3t762SROVbEgLsBq2Om8sB0MlCvdfBvq0jpIj/hPllApMSq5iVNcXg== +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.12.5" + "@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.2" - windicss "^2.5.12" + webpack-virtual-modules "^0.4.3" + windicss "3.0.9" -windicss@^2.5.11, windicss@^2.5.12: - version "2.5.14" - resolved "https://registry.yarnpkg.com/windicss/-/windicss-2.5.14.tgz#41236ccc2517c0947e1adb69e0d5e8aa9bed9c1e" - integrity sha512-8Lm7U1M5AzJPbiaVSVz7qWdETRzlkv//5LBMICBBAojos1jo09lUGhNZ5rBzHeldB9JmqYMDOGgrrXHExu0EAg== +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" From b93bf3be96b531f01f41e85b4d0ef793603db204 Mon Sep 17 00:00:00 2001 From: Harlan Wilton Date: Sun, 23 May 2021 14:21:50 +1000 Subject: [PATCH 2/4] revert: nuxt.config.js artifact --- docs/nuxt.config.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/nuxt.config.ts b/docs/nuxt.config.ts index 287f4ef01..0fc381199 100644 --- a/docs/nuxt.config.ts +++ b/docs/nuxt.config.ts @@ -9,10 +9,7 @@ export default withDocus({ /** * Modules */ - buildModules: [ - // 'vue-plausible', - '@nuxt/typescript-build' - ], + buildModules: ['vue-plausible', '@nuxt/typescript-build'], /** * Modules config */ From e357dc53b9b61b1c4522c130c6e826135f80808f Mon Sep 17 00:00:00 2001 From: Harlan Wilton Date: Sun, 23 May 2021 14:30:32 +1000 Subject: [PATCH 3/4] fix: use non-static windicss version --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a10bf7c40..5ab487bc5 100755 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "nuxt-extend": "^0.1.0", "nuxt-i18n": "^6.27.0", "nuxt-vite": "^0.1.0", - "nuxt-windicss": "0.8.0-3", + "nuxt-windicss": "^0.8.0-3", "ohmyfetch": "^0.1.8", "plausible-tracker": "^0.3.1", "postinstall-postinstall": "^2.1.0", diff --git a/yarn.lock b/yarn.lock index edb8137e2..999c29c3e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9114,7 +9114,7 @@ nuxt-vite@^0.1.0: vite "~2.2.1" vite-plugin-vue2 "^1.5.1" -nuxt-windicss@0.8.0-3: +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== From 504267e39402b1506819b1ef5ce028ce6ea07041 Mon Sep 17 00:00:00 2001 From: Harlan Wilton Date: Mon, 24 May 2021 18:25:08 +1000 Subject: [PATCH 4/4] chore: bump nuxt-windicss --- package.json | 2 +- yarn.lock | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 5ab487bc5..9cbb907e0 100755 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "nuxt-extend": "^0.1.0", "nuxt-i18n": "^6.27.0", "nuxt-vite": "^0.1.0", - "nuxt-windicss": "^0.8.0-3", + "nuxt-windicss": "^0.8.0", "ohmyfetch": "^0.1.8", "plausible-tracker": "^0.3.1", "postinstall-postinstall": "^2.1.0", diff --git a/yarn.lock b/yarn.lock index 999c29c3e..f2fe3fe69 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2640,10 +2640,10 @@ "@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== +"@windicss/plugin-utils@0.16.0": + version "0.16.0" + resolved "https://registry.yarnpkg.com/@windicss/plugin-utils/-/plugin-utils-0.16.0.tgz#660586b95ed3394b07f9970b2be77f681ea1ecd4" + integrity sha512-Gu6iHqFnqfxE0J8Oa74+2W5L2052ptqEHBtPaOuXOFgIMTJAT2KoXb6v+/Z0ldHsxVC1q+MSsom877SJ0cL2iA== dependencies: "@antfu/utils" "^0.1.6" debug "^4.3.2" @@ -9114,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== +nuxt-windicss@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/nuxt-windicss/-/nuxt-windicss-0.8.0.tgz#2a56aa0fdfb8038f280f761d68c1d809cff294ad" + integrity sha512-o5XhQtNwBg04qG6mqht0jLM7zzUQ4pWgWPL+/N3H2X6YvHIAfw97TduzS3SjdulMTenaS52QgrGgpIwke7tBug== 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" + vite-plugin-windicss "0.16.0" + windicss-webpack-plugin "0.6.1" object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" @@ -13084,12 +13084,12 @@ 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== +vite-plugin-windicss@0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vite-plugin-windicss/-/vite-plugin-windicss-0.16.0.tgz#d3ef9da930cc33aec162b9b760f4d42835eb353c" + integrity sha512-XaYnPNKsq2yZ5Ph39ZmPvtsTheyVsGSXibTOq/kWCKcXyLxIinTL6xQvLsagjF8QzHpHPF4NbsFvvGtO81gxgA== dependencies: - "@windicss/plugin-utils" "0.16.0-beta.22" + "@windicss/plugin-utils" "0.16.0" chalk "^4.1.1" debug "^4.3.2" windicss "^3.0.9" @@ -13444,12 +13444,12 @@ 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== +windicss-webpack-plugin@0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/windicss-webpack-plugin/-/windicss-webpack-plugin-0.6.1.tgz#2c3b6d4a8bfdee95e24cd387fcbb27dd1f41a2e5" + integrity sha512-k8s8CnFH7SL3yebCxSYbQY46QGA74d4uMn+BszEb9g2ioolCgQTKSVDnn36OoqH61g1kkqp0kJviCmYhK1Eu/w== dependencies: - "@windicss/plugin-utils" "0.16.0-beta.22" + "@windicss/plugin-utils" "0.16.0" debug "^4.3.1" loader-utils "^2.0.0" magic-string "^0.25.7"