From ea95dc3496db12af2a29078666b077bbd94bb7db Mon Sep 17 00:00:00 2001 From: winixt Date: Mon, 27 Dec 2021 19:11:49 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B0=86=20ignore=20vue=20custom=20blo?= =?UTF-8?q?ck=20logic=20move=20to=20preset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fes-plugin-windicss/package.json | 3 +- packages/fes-plugin-windicss/src/index.js | 10 - packages/fes-preset-built-in/package.json | 3 +- .../commands/webpackConfig}/pitcher.js | 0 .../src/plugins/commands/webpackConfig/vue.js | 12 +- packages/fes-template-h5/package.json | 4 +- packages/fes-template-h5/src/pages/index.vue | 2 +- .../fes-template-h5/src/pages/onepiece.vue | 2 +- yarn.lock | 172 +----------------- 9 files changed, 24 insertions(+), 184 deletions(-) rename packages/{fes-plugin-windicss/src => fes-preset-built-in/src/plugins/commands/webpackConfig}/pitcher.js (100%) diff --git a/packages/fes-plugin-windicss/package.json b/packages/fes-plugin-windicss/package.json index e0973104..e81c0250 100644 --- a/packages/fes-plugin-windicss/package.json +++ b/packages/fes-plugin-windicss/package.json @@ -31,7 +31,6 @@ "vue": "^3.0.5" }, "dependencies": { - "qs": "^6.10.2", "windicss-webpack-plugin": "^1.6.0" } -} +} \ No newline at end of file diff --git a/packages/fes-plugin-windicss/src/index.js b/packages/fes-plugin-windicss/src/index.js index e522b43b..6add0d27 100644 --- a/packages/fes-plugin-windicss/src/index.js +++ b/packages/fes-plugin-windicss/src/index.js @@ -1,7 +1,6 @@ import WindiCSSWebpackPlugin from 'windicss-webpack-plugin'; import { resolve } from 'path'; -import qs from 'qs'; export default (api) => { api.describe({ @@ -23,15 +22,6 @@ export default (api) => { ...api.config.windicss } ]); - memo.module - .rule('vue-custom') - .resourceQuery((query) => { - if (!query) { - return false; - } - const parsed = qs.parse(query.slice(1)); - return parsed.vue != null; - }).use('vue-custom-loader').loader(require.resolve('./pitcher')); return memo; }); }; diff --git a/packages/fes-preset-built-in/package.json b/packages/fes-preset-built-in/package.json index 8c72dc79..87c02eb8 100644 --- a/packages/fes-preset-built-in/package.json +++ b/packages/fes-preset-built-in/package.json @@ -61,6 +61,7 @@ "postcss-flexbugs-fixes": "^5.0.2", "postcss-loader": "^4.2.0", "postcss-safe-parser": "^5.0.2", + "qs": "^6.10.2", "raw-loader": "^4.0.2", "style-loader": "^2.0.0", "url-loader": "^4.1.1", @@ -74,4 +75,4 @@ "peerDependencies": { "@vue/compiler-sfc": "^3.0.5" } -} +} \ No newline at end of file diff --git a/packages/fes-plugin-windicss/src/pitcher.js b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/pitcher.js similarity index 100% rename from packages/fes-plugin-windicss/src/pitcher.js rename to packages/fes-preset-built-in/src/plugins/commands/webpackConfig/pitcher.js 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 99a8c1b8..40eef753 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 @@ -1,4 +1,4 @@ -// import webpack from 'webpack'; +import qs from 'qs'; export default function createVueWebpackConfig({ config, @@ -15,6 +15,16 @@ export default function createVueWebpackConfig({ }) .end(); + webpackConfig.module + .rule('vue-custom') + .resourceQuery((query) => { + if (!query) { + return false; + } + const parsed = qs.parse(query.slice(1)); + return parsed.vue != null; + }).use('vue-custom-loader').loader(require.resolve('./pitcher')); + webpackConfig .plugin('vue-loader-plugin') .use(require('vue-loader').VueLoaderPlugin); diff --git a/packages/fes-template-h5/package.json b/packages/fes-template-h5/package.json index 180328e0..014c66be 100644 --- a/packages/fes-template-h5/package.json +++ b/packages/fes-template-h5/package.json @@ -42,14 +42,14 @@ "devDependencies": { "@webank/eslint-config-webank": "0.3.1", "@ttou/postcss-px-to-viewport": "1.1.4", - "@vue/compiler-sfc": "3.2.2" + "@vue/compiler-sfc": "^3.2.2" }, "dependencies": { "@fesjs/fes": "^2.0.0", "@fesjs/plugin-icon": "^2.0.0", "@fesjs/plugin-request": "^2.0.0", "@fesjs/plugin-windicss": "^2.0.0", - "vue": "3.2.2" + "vue": "^3.2.2" }, "private": true } \ No newline at end of file diff --git a/packages/fes-template-h5/src/pages/index.vue b/packages/fes-template-h5/src/pages/index.vue index 2ec56fc7..85d16f8d 100644 --- a/packages/fes-template-h5/src/pages/index.vue +++ b/packages/fes-template-h5/src/pages/index.vue @@ -1,5 +1,5 @@