diff --git a/build.config.js b/build.config.js index 9e546dec..1c964ad4 100644 --- a/build.config.js +++ b/build.config.js @@ -18,6 +18,7 @@ module.exports = { 'fes-plugin-sass', 'fes-plugin-vuex', 'fes-preset-built-in', + 'fes-plugin-windicss', 'fes-runtime', 'fes-utils' ], diff --git a/packages/fes-plugin-windicss/.fatherrc.js b/packages/fes-plugin-windicss/.fatherrc.js new file mode 100644 index 00000000..332f1bff --- /dev/null +++ b/packages/fes-plugin-windicss/.fatherrc.js @@ -0,0 +1,3 @@ +export default { + disableTypeCheck: false, +}; diff --git a/packages/fes-plugin-windicss/LICENSE b/packages/fes-plugin-windicss/LICENSE new file mode 100644 index 00000000..0978fbf7 --- /dev/null +++ b/packages/fes-plugin-windicss/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020-present webank + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/packages/fes-plugin-windicss/package.json b/packages/fes-plugin-windicss/package.json new file mode 100644 index 00000000..d953c968 --- /dev/null +++ b/packages/fes-plugin-windicss/package.json @@ -0,0 +1,35 @@ +{ + "name": "@fesjs/plugin-windicss", + "version": "2.0.0", + "description": "@fesjs/plugin-windicss", + "main": "lib/index.js", + "files": [ + "lib" + ], + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/WeBankFinTech/fes.js.git", + "directory": "packages/fes-plugin-windicss" + }, + "keywords": [ + "fes" + ], + "author": "qlin", + "license": "MIT", + "bugs": { + "url": "https://github.com/WeBankFinTech/fes.js/issues" + }, + "homepage": "https://github.com/WeBankFinTech/fes.js#readme", + "publishConfig": { + "access": "public" + }, + "peerDependencies": { + "vue": "^3.0.5" + }, + "dependencies": { + "windicss-webpack-plugin": "^1.5.6" + } +} \ No newline at end of file diff --git a/packages/fes-plugin-windicss/src/index.js b/packages/fes-plugin-windicss/src/index.js new file mode 100644 index 00000000..733b0731 --- /dev/null +++ b/packages/fes-plugin-windicss/src/index.js @@ -0,0 +1,18 @@ + +import WindiCSSWebpackPlugin from 'windicss-webpack-plugin'; + +export default (api) => { + api.describe({ + key: 'windi', + config: { + default: {} + } + }); + + api.addEntryImportsAhead(() => [{ source: 'windi.css' }]); + + api.chainWebpack((memo) => { + memo.plugin('windicss').before('vue-loader-plugin').use(WindiCSSWebpackPlugin); + return memo; + }); +}; diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/vue.js b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/vue.js index 66788475..99a8c1b8 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/vue.js +++ b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/vue.js @@ -16,6 +16,6 @@ export default function createVueWebpackConfig({ .end(); webpackConfig - .plugin('vue-loader') + .plugin('vue-loader-plugin') .use(require('vue-loader').VueLoaderPlugin); } diff --git a/packages/fes-template/.fes.js b/packages/fes-template/.fes.js index 9c036b3d..105c7a30 100644 --- a/packages/fes-template/.fes.js +++ b/packages/fes-template/.fes.js @@ -2,7 +2,6 @@ export default { exportStatic: {}, - base: "/base/", define: { __DEV__: false, }, diff --git a/packages/fes-template/package.json b/packages/fes-template/package.json index 40e01eeb..2810630b 100644 --- a/packages/fes-template/package.json +++ b/packages/fes-template/package.json @@ -58,6 +58,7 @@ "@fesjs/plugin-qiankun": "^2.0.0", "@fesjs/plugin-sass": "^2.0.0", "@fesjs/plugin-monaco-editor": "^2.0.0-beta.0", + "@fesjs/plugin-windicss": "^2.0.0", "ant-design-vue": "^2.2.0", "vue": "^3.0.5", "vuex": "^4.0.0" diff --git a/packages/fes-template/windi.config.js b/packages/fes-template/windi.config.js new file mode 100644 index 00000000..84363184 --- /dev/null +++ b/packages/fes-template/windi.config.js @@ -0,0 +1,8 @@ +export default { + extract: { + // A common use case is scanning files from the root directory + include: ['**/*.{vue,jsx,tsx}'], + // if you are excluding files, make sure you always include node_modules and .git + exclude: ['node_modules', '.git', 'dist'] + } +}; diff --git a/yarn.lock b/yarn.lock index df26ed8f..f98d24b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -147,6 +147,13 @@ "@types/lodash" "^4.14.165" lodash "^4.17.15" +"@antfu/utils@^0.3.0": + version "0.3.0" + resolved "https://registry.npmjs.org/@antfu/utils/-/utils-0.3.0.tgz#6306c43b52a883bd8e973e3ed8dd64248418bcc4" + integrity sha512-UU8TLr/EoXdg7OjMp0h9oDoIAVr+Z/oW9cpOxQQyrsz6Qzd2ms/1CdWx8fl2OQdFpxGmq5Vc4TwfLHId6nAZjA== + dependencies: + "@types/throttle-debounce" "^2.1.0" + "@apideck/better-ajv-errors@^0.2.4": version "0.2.5" resolved "http://10.107.103.115:8001/@apideck/better-ajv-errors/download/@apideck/better-ajv-errors-0.2.5.tgz#b9c0092b7f7f23c356a0a31600334f7b8958458b" @@ -2924,6 +2931,11 @@ resolved "http://10.107.103.115:8001/@types/strip-json-comments/download/@types/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1" integrity sha1-mqMMBNshKpoGSdaub9UKzMQHSKE= +"@types/throttle-debounce@^2.1.0": + version "2.1.0" + resolved "https://registry.npmjs.org/@types/throttle-debounce/-/throttle-debounce-2.1.0.tgz#1c3df624bfc4b62f992d3012b84c56d41eab3776" + integrity sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ== + "@types/trusted-types@^2.0.2": version "2.0.2" resolved "http://10.107.103.115:8001/@types/trusted-types/download/@types/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756" @@ -2966,17 +2978,6 @@ html-tags "^3.1.0" svg-tags "^1.0.0" -"@vue/compiler-core@3.2.11": - version "3.2.11" - resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.11.tgz#10af3777dba303ee7aae668029f131cb90391bee" - integrity sha512-bcbsLx5XyQg8WDDEGwmpX0BfEfv82wIs9fWFelpyVhNRGMaABvUTalYINyfhVT+jOqNaD4JBhJiVKd/8TmsHWg== - dependencies: - "@babel/parser" "^7.15.0" - "@babel/types" "^7.15.0" - "@vue/shared" "3.2.11" - estree-walker "^2.0.2" - source-map "^0.6.1" - "@vue/compiler-core@3.2.2": version "3.2.2" resolved "http://10.107.103.115:8001/@vue/compiler-core/download/@vue/compiler-core-3.2.2.tgz#8d3e29f129579ed9b14f48af735fd8d95f248504" @@ -2988,14 +2989,6 @@ estree-walker "^2.0.1" source-map "^0.6.1" -"@vue/compiler-dom@3.2.11": - version "3.2.11" - resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.11.tgz#d066f8e1f1812b4e881593819ade0fe6d654c776" - integrity sha512-DNvhUHI/1Hn0/+ZYDYGAuDGasUm+XHKC3FE4GqkNCTO/fcLaJMRg/7eT1m1lkc7jPffUwwfh1rZru5mwzOjrNw== - dependencies: - "@vue/compiler-core" "3.2.11" - "@vue/shared" "3.2.11" - "@vue/compiler-dom@3.2.2": version "3.2.2" resolved "http://10.107.103.115:8001/@vue/compiler-dom/download/@vue/compiler-dom-3.2.2.tgz#26e198498746c53047c3744d26fc95e670692ab7" @@ -3027,38 +3020,6 @@ postcss-selector-parser "^6.0.4" source-map "^0.6.1" -"@vue/compiler-sfc@^3.0.4": - version "3.2.11" - resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.11.tgz#628fa12238760d9b9b339ac2e125a759224fadbf" - integrity sha512-cUIaS8mgJrQ6yucj2AupWAwBRITK3W/a8wCOn9g5fJGtOl8h4APY8vN3lzP8HIJDyEeRF3I8SfRhL+oX97kSnw== - dependencies: - "@babel/parser" "^7.15.0" - "@babel/types" "^7.15.0" - "@types/estree" "^0.0.48" - "@vue/compiler-core" "3.2.11" - "@vue/compiler-dom" "3.2.11" - "@vue/compiler-ssr" "3.2.11" - "@vue/ref-transform" "3.2.11" - "@vue/shared" "3.2.11" - consolidate "^0.16.0" - estree-walker "^2.0.2" - hash-sum "^2.0.0" - lru-cache "^5.1.1" - magic-string "^0.25.7" - merge-source-map "^1.1.0" - postcss "^8.1.10" - postcss-modules "^4.0.0" - postcss-selector-parser "^6.0.4" - source-map "^0.6.1" - -"@vue/compiler-ssr@3.2.11": - version "3.2.11" - resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.11.tgz#702cef3429651645bdbe09fe5962803b5a621abb" - integrity sha512-+ptAdUlFDij+Z0VGCbRRkxQlNev5LkbZAntvkxrFjc08CTMhZmiV4Js48n2hAmuSXaKNEpmGkDGU26c/vf1+xw== - dependencies: - "@vue/compiler-dom" "3.2.11" - "@vue/shared" "3.2.11" - "@vue/compiler-ssr@3.2.2": version "3.2.2" resolved "http://10.107.103.115:8001/@vue/compiler-ssr/download/@vue/compiler-ssr-3.2.2.tgz#633bb8e01f00a969c35ca12db32be7fe4c7185a9" @@ -3079,17 +3040,6 @@ dependencies: "@vue/shared" "3.2.2" -"@vue/ref-transform@3.2.11": - version "3.2.11" - resolved "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.11.tgz#4d282b9570d1485a73e7bf5d57cce27b4a7aa690" - integrity sha512-7rX0YsfYb7+1PeKPME1tQyUQcQgt0sIXRRnPD1Vw8Zs2KIo90YLy9CrvwalcRCxGw0ScsjBEhVjJtWIT79TElg== - dependencies: - "@babel/parser" "^7.15.0" - "@vue/compiler-core" "3.2.11" - "@vue/shared" "3.2.11" - estree-walker "^2.0.2" - magic-string "^0.25.7" - "@vue/runtime-core@3.2.2": version "3.2.2" resolved "http://10.107.103.115:8001/@vue/runtime-core/download/@vue/runtime-core-3.2.2.tgz#b9a7250783de19dd8dd6febf008084b0f9144586" @@ -3115,11 +3065,6 @@ "@vue/compiler-ssr" "3.2.2" "@vue/shared" "3.2.2" -"@vue/shared@3.2.11": - version "3.2.11" - resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.11.tgz#01899f54949caf1ac241de397bd17069632574de" - integrity sha512-ovfXAsSsCvV9JVceWjkqC/7OF5HbgLOtCWjCIosmPGG8lxbPuavhIxRH1dTx4Dg9xLgRTNLvI3pVxG4ItQZekg== - "@vue/shared@3.2.2", "@vue/shared@^3.2.2": version "3.2.2" resolved "http://10.107.103.115:8001/@vue/shared/download/@vue/shared-3.2.2.tgz#6104185ebd57af5a14ac51c1f491b2205fc24054" @@ -3541,6 +3486,28 @@ "@webassemblyjs/ast" "1.11.1" "@xtuc/long" "4.2.2" +"@windicss/config@1.5.1": + version "1.5.1" + resolved "https://registry.npmjs.org/@windicss/config/-/config-1.5.1.tgz#e3fdaddfc553442c85f67f2e9290ef46ce87b3a1" + integrity sha512-nWNgvvJj9RcYhLcqwju/Z8FfaHRjyWHDYS3IgY7lWUM+vWTLFuKqhavKfC1589kdYjiO9JeX07Vg+YzfcxP0Yw== + dependencies: + debug "^4.3.2" + jiti "^1.12.9" + windicss "^3.2.1" + +"@windicss/plugin-utils@^1.5.1": + version "1.5.1" + resolved "https://registry.npmjs.org/@windicss/plugin-utils/-/plugin-utils-1.5.1.tgz#9750bb72e8c14585e011d46a33351d47d8519e31" + integrity sha512-gxJiTCMKv1p1x4W2BLG2yfNe+DfIVPc8+aKvfCUCtOpdg5GB5yzhuAC4ROsKiXHxu4QXoojrh7jXH6ELlrELpQ== + dependencies: + "@antfu/utils" "^0.3.0" + "@windicss/config" "1.5.1" + debug "^4.3.2" + fast-glob "^3.2.7" + magic-string "^0.25.7" + micromatch "^4.0.4" + windicss "^3.2.1" + "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "http://10.107.103.115:8001/@xtuc/ieee754/download/@xtuc/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -6154,7 +6121,7 @@ estree-walker@^1.0.1: resolved "http://10.107.103.115:8001/estree-walker/download/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" integrity sha1-MbxdYSyWtwQQa0d+bdXYqhOMtwA= -estree-walker@^2.0.1, estree-walker@^2.0.2: +estree-walker@^2.0.1: version "2.0.2" resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== @@ -6367,7 +6334,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "http://10.107.103.115:8001/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU= -fast-glob@^3.1.1, fast-glob@^3.2.4, fast-glob@^3.2.5: +fast-glob@^3.1.1, fast-glob@^3.2.4, fast-glob@^3.2.5, fast-glob@^3.2.7: version "3.2.7" resolved "http://10.107.103.115:8001/fast-glob/download/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" integrity sha1-/Wy3otfpqnp4RhEehaGW1rL3ZqE= @@ -8498,6 +8465,11 @@ jest@^27.0.6: import-local "^3.0.2" jest-cli "^27.0.6" +jiti@^1.12.9: + version "1.12.9" + resolved "https://registry.npmjs.org/jiti/-/jiti-1.12.9.tgz#2ce45b265cfc8dc91ebd70a5204807cf915291bc" + integrity sha512-TdcJywkQtcwLxogc4rSMAi479G2eDPzfW0fLySks7TPhgZZ4s/tM6stnzayIh3gS/db3zExWJyUx4cNWrwAmoQ== + joi@17.3.0: version "17.3.0" resolved "http://10.107.103.115:8001/joi/download/joi-17.3.0.tgz#f1be4a6ce29bc1716665819ac361dfa139fff5d2" @@ -13552,6 +13524,11 @@ webpack-sources@^3.2.0: resolved "http://10.107.103.115:8001/webpack-sources/download/webpack-sources-3.2.0.tgz#b16973bcf844ebcdb3afde32eda1c04d0b90f89d" integrity sha1-sWlzvPhE682zr94y7aHATQuQ+J0= +webpack-virtual-modules@^0.4.3: + version "0.4.3" + resolved "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.4.3.tgz#cd597c6d51d5a5ecb473eea1983a58fa8a17ded9" + integrity sha512-5NUqC2JquIL2pBAAo/VfBP6KuGkHIZQXW/lNKupLPfhViwh8wNsu0BObtl09yuKZszeEUfbXz8xhrHvSG16Nqw== + webpack@^5.24.2, webpack@^5.50.0: version "5.50.0" resolved "http://10.107.103.115:8001/webpack/download/webpack-5.50.0.tgz#5562d75902a749eb4d75131f5627eac3a3192527" @@ -13687,6 +13664,25 @@ wildcard@^2.0.0: resolved "http://10.107.103.115:8001/wildcard/download/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" integrity sha1-p30g5SAMb6qsl55LOq3Hs91/j+w= +windicss-webpack-plugin@^1.5.6: + version "1.5.6" + resolved "https://registry.npmjs.org/windicss-webpack-plugin/-/windicss-webpack-plugin-1.5.6.tgz#451333bac64d3d0b229d4a58c70f5f66249acefd" + integrity sha512-Wap3bvaNlIFKkJugaeVMqV1ICMDfSmwernYkYrRftK/ZJXP7/pkVvdXu5DDvFIlRVXjhlJlltIlFb1UNJn84sA== + dependencies: + "@windicss/plugin-utils" "^1.5.1" + debug "^4.3.2" + loader-utils "^2.0.0" + lodash "^4.17.21" + magic-string "^0.25.7" + upath "^2.0.1" + webpack-virtual-modules "^0.4.3" + windicss "^3.2.1" + +windicss@^3.2.1: + version "3.2.1" + resolved "https://registry.npmjs.org/windicss/-/windicss-3.2.1.tgz#bd0f7b9ebabba04ea8dfedcbb0263c2ef9591db4" + integrity sha512-LusrIrryBFHAPQ/OOTbS4EWWuzI6eGeJglI9nQ3kDBr1cqH69NWt8Z8q59f9kTkgptXroejmWfksWwqgHs8EVw== + word-wrap@^1.0.3, word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" resolved "http://10.107.103.115:8001/word-wrap/download/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"