From 9ba386c8d4ff9ea7580d47a6b58aa5582048cfa1 Mon Sep 17 00:00:00 2001 From: bac-joker Date: Mon, 1 Mar 2021 12:32:29 +0800 Subject: [PATCH 1/3] fix: analyzer --- .../src/plugins/features/analyze.js | 15 +- packages/fes-template/.fes.js | 2 +- packages/fes-template/src/app.js | 6 - .../fes-template/src/pages/simpleList.vue | 376 ------------------ packages/fes/src/cli.js | 1 - 5 files changed, 7 insertions(+), 393 deletions(-) delete mode 100644 packages/fes-template/src/pages/simpleList.vue diff --git a/packages/fes-preset-built-in/src/plugins/features/analyze.js b/packages/fes-preset-built-in/src/plugins/features/analyze.js index 86346225..50ace33d 100644 --- a/packages/fes-preset-built-in/src/plugins/features/analyze.js +++ b/packages/fes-preset-built-in/src/plugins/features/analyze.js @@ -30,15 +30,12 @@ export default (api) => { }, enableBy: () => !!process.env.ANALYZE }); - api.chainWebpack((webpackConfig, opts) => { - const { type } = opts; - if (type === 'csr') { - webpackConfig - .plugin('bundle-analyzer') - .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin, [ - api.config?.analyze || {} - ]); - } + api.chainWebpack((webpackConfig) => { + webpackConfig + .plugin('bundle-analyzer') + .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin, [ + api.config?.analyze || {} + ]); return webpackConfig; }); }; diff --git a/packages/fes-template/.fes.js b/packages/fes-template/.fes.js index dd8f4cdd..8e0fe175 100644 --- a/packages/fes-template/.fes.js +++ b/packages/fes-template/.fes.js @@ -9,7 +9,7 @@ export default { publicPath: '/', access: { roles: { - admin: ["/", "/onepiece", '/store', '/simpleList'] + admin: ["/", "/onepiece", '/store'] } }, request: { diff --git a/packages/fes-template/src/app.js b/packages/fes-template/src/app.js index e47a0bf7..266d9666 100644 --- a/packages/fes-template/src/app.js +++ b/packages/fes-template/src/app.js @@ -3,8 +3,6 @@ import { access } from '@webank/fes'; import PageLoading from '@/components/PageLoading'; import UserCenter from '@/components/UserCenter'; -import Andt from 'ant-design-vue'; -import 'ant-design-vue/dist/antd.css'; export const beforeRender = { loading: , @@ -21,10 +19,6 @@ export const beforeRender = { } }; -export const onAppCreated = ({ app }) => { - app.use(Andt); -}; - export const layout = { customHeader: }; diff --git a/packages/fes-template/src/pages/simpleList.vue b/packages/fes-template/src/pages/simpleList.vue deleted file mode 100644 index 331a9768..00000000 --- a/packages/fes-template/src/pages/simpleList.vue +++ /dev/null @@ -1,376 +0,0 @@ - - - - - - - -{ - "name": "simpleList", - "title": "列表页面" -} - diff --git a/packages/fes/src/cli.js b/packages/fes/src/cli.js index 991ea768..ae7ec16c 100644 --- a/packages/fes/src/cli.js +++ b/packages/fes/src/cli.js @@ -56,7 +56,6 @@ const args = yParser(rawArgv); args, rawArgv }); - process.exit(0); } } catch (e) { console.error(chalk.red(e.message)); From 69800458378a8504cb607ba6c22fcdeb5aad530d Mon Sep 17 00:00:00 2001 From: bac-joker Date: Mon, 1 Mar 2021 15:13:18 +0800 Subject: [PATCH 2/3] feat: alpha to rc --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e0ad707..c0935e2a 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "clean": "lerna clean", "bootstrap": "lerna bootstrap", "build": "father-build --watch", - "ver": "lerna version prerelease --preid alpha --no-changelog --no-commit-hooks --no-private", + "ver": "lerna version prerelease --preid rc --no-changelog --no-commit-hooks --no-private", "release": "father-build && lerna publish from-git --dist-tag next", "docs:dev": "vuepress dev docs --clean-cache", "docs:build": "vuepress build docs --clean-cache" From 92ba3a389915505ca12dd2363a7774e995148c1d Mon Sep 17 00:00:00 2001 From: bac-joker Date: Mon, 1 Mar 2021 15:14:13 +0800 Subject: [PATCH 3/3] chore(release): publish --- lerna.json | 2 +- packages/create-fes-app/package.json | 2 +- packages/fes-compiler/package.json | 4 +- packages/fes-plugin-access/package.json | 2 +- packages/fes-plugin-enums/package.json | 2 +- packages/fes-plugin-icon/package.json | 2 +- packages/fes-plugin-jest/package.json | 4 +- packages/fes-plugin-layout/package.json | 2 +- packages/fes-plugin-locale/package.json | 2 +- packages/fes-plugin-model/package.json | 2 +- packages/fes-plugin-request/package.json | 2 +- packages/fes-plugin-vuex/package.json | 2 +- packages/fes-preset-built-in/package.json | 56 +++++++++++------------ packages/fes-runtime/package.json | 2 +- packages/fes/package.json | 8 ++-- 15 files changed, 47 insertions(+), 47 deletions(-) diff --git a/lerna.json b/lerna.json index 71814b8a..459ce563 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.0-alpha.8", + "version": "2.0.0-rc.0", "changelog": { "repo": "WeBankFinTech/fes.js", "cacheDir": ".changelog", diff --git a/packages/create-fes-app/package.json b/packages/create-fes-app/package.json index d68b67cc..5d39e295 100644 --- a/packages/create-fes-app/package.json +++ b/packages/create-fes-app/package.json @@ -1,6 +1,6 @@ { "name": "@webank/create-fes-app", - "version": "2.0.0-alpha.8", + "version": "2.0.0-rc.0", "description": "create a app base on fes.js", "main": "lib/index.js", "files": [ diff --git a/packages/fes-compiler/package.json b/packages/fes-compiler/package.json index ff104d38..9e411ed8 100644 --- a/packages/fes-compiler/package.json +++ b/packages/fes-compiler/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-compiler", - "version": "2.0.0-alpha.8", + "version": "2.0.0-rc.0", "description": "@webank/fes-compiler", "main": "lib/index.js", "files": [ @@ -24,8 +24,8 @@ "access": "public" }, "dependencies": { - "@babel/register": "^7.12.13", "@babel/preset-env": "^7.12.13", + "@babel/register": "^7.12.13", "@umijs/utils": "3.3.3", "commander": "^7.0.0", "dotenv": "8.2.0", diff --git a/packages/fes-plugin-access/package.json b/packages/fes-plugin-access/package.json index 1470ab11..78089ed8 100644 --- a/packages/fes-plugin-access/package.json +++ b/packages/fes-plugin-access/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-access", - "version": "2.0.0-alpha.8", + "version": "2.0.0-rc.0", "description": "@webank/fes-plugin-access", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-enums/package.json b/packages/fes-plugin-enums/package.json index 01f55fda..4494f8d1 100644 --- a/packages/fes-plugin-enums/package.json +++ b/packages/fes-plugin-enums/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-enums", - "version": "2.0.0-alpha.8", + "version": "2.0.0-rc.0", "description": "@webank/fes-plugin-enums", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-icon/package.json b/packages/fes-plugin-icon/package.json index 063d892f..5a2f986c 100644 --- a/packages/fes-plugin-icon/package.json +++ b/packages/fes-plugin-icon/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-icon", - "version": "2.0.0-alpha.8", + "version": "2.0.0-rc.0", "description": "@webank/fes-plugin-icon", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-jest/package.json b/packages/fes-plugin-jest/package.json index 54d75c18..8087ca4f 100644 --- a/packages/fes-plugin-jest/package.json +++ b/packages/fes-plugin-jest/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-jest", - "version": "2.0.0-alpha.8", + "version": "2.0.0-rc.0", "description": "@webank/fes-plugin-jest", "main": "lib/index.js", "files": [ @@ -32,7 +32,7 @@ "dependencies": { "@babel/core": "7.11.6", "@umijs/babel-preset-umi": "3.2.24", - "@webank/fes-compiler": "^2.0.0-alpha.8", + "@webank/fes-compiler": "^2.0.0-rc.0", "babel-core": "^7.0.0-bridge.0", "babel-jest": "^26.6.3", "core-js": "3.6.5", diff --git a/packages/fes-plugin-layout/package.json b/packages/fes-plugin-layout/package.json index 1fc4448f..5a3cc872 100644 --- a/packages/fes-plugin-layout/package.json +++ b/packages/fes-plugin-layout/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-layout", - "version": "2.0.0-alpha.8", + "version": "2.0.0-rc.0", "description": "@webank/fes-plugin-layout", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-locale/package.json b/packages/fes-plugin-locale/package.json index 8b70d739..cf60ec87 100644 --- a/packages/fes-plugin-locale/package.json +++ b/packages/fes-plugin-locale/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-locale", - "version": "2.0.0-alpha.8", + "version": "2.0.0-rc.0", "description": "@webank/fes-plugin-locale", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-model/package.json b/packages/fes-plugin-model/package.json index 7a867297..708e091e 100644 --- a/packages/fes-plugin-model/package.json +++ b/packages/fes-plugin-model/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-model", - "version": "2.0.0-alpha.8", + "version": "2.0.0-rc.0", "description": "@webank/fes-plugin-model", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-request/package.json b/packages/fes-plugin-request/package.json index 55a5e263..a2f376fd 100644 --- a/packages/fes-plugin-request/package.json +++ b/packages/fes-plugin-request/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-request", - "version": "2.0.0-alpha.8", + "version": "2.0.0-rc.0", "description": "@webank/fes-plugin-request", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-vuex/package.json b/packages/fes-plugin-vuex/package.json index 2e0035f5..fb2bb367 100644 --- a/packages/fes-plugin-vuex/package.json +++ b/packages/fes-plugin-vuex/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-vuex", - "version": "2.0.0-alpha.8", + "version": "2.0.0-rc.0", "description": "@webank/fes-plugin-vuex", "main": "lib/index.js", "files": [ diff --git a/packages/fes-preset-built-in/package.json b/packages/fes-preset-built-in/package.json index 9b2f9592..a93feca0 100644 --- a/packages/fes-preset-built-in/package.json +++ b/packages/fes-preset-built-in/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-preset-built-in", - "version": "2.0.0-alpha.8", + "version": "2.0.0-rc.0", "description": "@webank/fes-preset-built-in", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -26,49 +26,49 @@ }, "dependencies": { "@babel/core": "^7.12.13", - "@babel/preset-env": "^7.12.13", - "@babel/plugin-proposal-export-default-from": "^7.12.13", - "@babel/plugin-proposal-pipeline-operator": "^7.12.13", "@babel/plugin-proposal-do-expressions": "^7.12.13", + "@babel/plugin-proposal-export-default-from": "^7.12.13", "@babel/plugin-proposal-function-bind": "^7.12.13", + "@babel/plugin-proposal-pipeline-operator": "^7.12.13", "@babel/plugin-transform-runtime": "^7.12.13", + "@babel/preset-env": "^7.12.13", + "@soda/friendly-errors-webpack-plugin": "^1.8.0", "@umijs/utils": "3.3.3", "@vue/babel-plugin-jsx": "^1.0.2", "@vue/compiler-sfc": "^3.0.4", + "@webank/fes-compiler": "^2.0.0-rc.0", + "autoprefixer": "^10.2.4", "babel-loader": "^8.2.2", - "core-js": "^3.8.3", + "babel-plugin-import": "1.13.3", + "body-parser": "^1.19.0", + "cli-highlight": "^2.1.4", "cliui": "7.0.4", + "cookie-parser": "^1.4.5", + "copy-webpack-plugin": "^7.0.0", + "core-js": "^3.8.3", + "css-loader": "^5.0.1", + "css-minimizer-webpack-plugin": "^1.2.0", + "deepmerge": "^4.2.2", + "envinfo": "^7.7.3", + "file-loader": "^6.2.0", "html-webpack-plugin": "^5.0.0", "html-webpack-tags-plugin": "^3.0.0", - "webpackbar": "^5.0.0-3", - "@soda/friendly-errors-webpack-plugin": "^1.8.0", - "webpack-bundle-analyzer": "^4.4.0", - "webpack-dev-server": "^3.11.2", - "babel-plugin-import": "1.13.3", - "file-loader": "^6.2.0", - "url-loader": "^4.1.1", - "raw-loader": "^4.0.2", - "css-loader": "^5.0.1", - "style-loader": "^2.0.0", - "mini-css-extract-plugin": "^1.3.5", - "css-minimizer-webpack-plugin": "^1.2.0", "less": "3.9.0", "less-loader": "^8.0.0", - "autoprefixer": "^10.2.4", - "postcss-loader": "^4.2.0", + "mini-css-extract-plugin": "^1.3.5", + "mockjs": "^1.1.0", "postcss": "^8.2.4", "postcss-flexbugs-fixes": "^5.0.2", + "postcss-loader": "^4.2.0", "postcss-safe-parser": "^5.0.2", - "copy-webpack-plugin": "^7.0.0", - "webpack": "^5.21.0", - "deepmerge": "^4.2.2", - "@webank/fes-compiler": "^2.0.0-alpha.8", - "envinfo": "^7.7.3", + "raw-loader": "^4.0.2", + "style-loader": "^2.0.0", + "url-loader": "^4.1.1", "vue-loader": "^16.1.2", - "cli-highlight": "^2.1.4", + "webpack": "^5.21.0", + "webpack-bundle-analyzer": "^4.4.0", "webpack-chain": "^6.5.1", - "body-parser": "^1.19.0", - "cookie-parser": "^1.4.5", - "mockjs": "^1.1.0" + "webpack-dev-server": "^3.11.2", + "webpackbar": "^5.0.0-3" } } diff --git a/packages/fes-runtime/package.json b/packages/fes-runtime/package.json index 89cbe670..f0213304 100644 --- a/packages/fes-runtime/package.json +++ b/packages/fes-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-runtime", - "version": "2.0.0-alpha.8", + "version": "2.0.0-rc.0", "description": "@webank/fes-runtime", "main": "dist/index.js", "files": [ diff --git a/packages/fes/package.json b/packages/fes/package.json index cd87ba5a..ea09217e 100644 --- a/packages/fes/package.json +++ b/packages/fes/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes", - "version": "2.0.0-alpha.8", + "version": "2.0.0-rc.0", "description": "一个好用的前端管理台快速开发框架", "preferGlobal": true, "scripts": { @@ -40,9 +40,9 @@ ], "dependencies": { "@umijs/utils": "3.3.3", - "@webank/fes-compiler": "^2.0.0-alpha.8", - "@webank/fes-preset-built-in": "^2.0.0-alpha.8", - "@webank/fes-runtime": "^2.0.0-alpha.8", + "@webank/fes-compiler": "^2.0.0-rc.0", + "@webank/fes-preset-built-in": "^2.0.0-rc.0", + "@webank/fes-runtime": "^2.0.0-rc.0", "resolve-cwd": "^3.0.0" }, "engines": {