diff --git a/lerna.json b/lerna.json index a3a7940e..427c36f5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.0-rc.3", + "version": "2.0.0-rc.4", "changelog": { "repo": "WeBankFinTech/fes.js", "cacheDir": ".changelog", diff --git a/packages/create-fes-app/package.json b/packages/create-fes-app/package.json index 8161b84f..1e38303d 100644 --- a/packages/create-fes-app/package.json +++ b/packages/create-fes-app/package.json @@ -1,6 +1,6 @@ { "name": "@fesjs/create-fes-app", - "version": "2.0.0-rc.3", + "version": "2.0.0-rc.4", "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 89184336..d0ab944a 100644 --- a/packages/fes-compiler/package.json +++ b/packages/fes-compiler/package.json @@ -1,6 +1,6 @@ { "name": "@fesjs/compiler", - "version": "2.0.0-rc.3", + "version": "2.0.0-rc.4", "description": "@fesjs/compiler", "main": "lib/index.js", "files": [ diff --git a/packages/fes-compiler/src/config/index.js b/packages/fes-compiler/src/config/index.js index d0406579..a1e7340c 100644 --- a/packages/fes-compiler/src/config/index.js +++ b/packages/fes-compiler/src/config/index.js @@ -1,3 +1,8 @@ +/** + * @copy 该文件代码大部分出自 umi，有需要请参考： + * https://github.com/umijs/umi/tree/master/packages/core + */ + import { existsSync } from 'fs'; import { extname, join } from 'path'; import { diff --git a/packages/fes-compiler/src/index.js b/packages/fes-compiler/src/index.js index d155cf4e..35471148 100644 --- a/packages/fes-compiler/src/index.js +++ b/packages/fes-compiler/src/index.js @@ -1,3 +1,7 @@ +/** + * @copy 该文件代码大部分出自 umi，有需要请参考： + * https://github.com/umijs/umi/tree/master/packages/core + */ import Config from './config'; diff --git a/packages/fes-compiler/src/logger/index.js b/packages/fes-compiler/src/logger/index.js index da9d1c29..6cdec7f9 100644 --- a/packages/fes-compiler/src/logger/index.js +++ b/packages/fes-compiler/src/logger/index.js @@ -1,3 +1,8 @@ +/** + * @copy 该文件代码大部分出自 umi，有需要请参考： + * https://github.com/umijs/umi/tree/master/packages/core + */ + import { createDebug, chalk diff --git a/packages/fes-compiler/src/service/getPaths.js b/packages/fes-compiler/src/service/getPaths.js index 0fccad10..531e4865 100644 --- a/packages/fes-compiler/src/service/getPaths.js +++ b/packages/fes-compiler/src/service/getPaths.js @@ -1,3 +1,8 @@ +/** + * @copy 该文件代码大部分出自 umi，有需要请参考： + * https://github.com/umijs/umi/tree/master/packages/core + */ + import { join } from 'path'; import { existsSync, statSync } from 'fs'; import { lodash, winPath } from '@umijs/utils'; diff --git a/packages/fes-compiler/src/service/index.js b/packages/fes-compiler/src/service/index.js index 41062724..66468460 100644 --- a/packages/fes-compiler/src/service/index.js +++ b/packages/fes-compiler/src/service/index.js @@ -1,3 +1,7 @@ +/** + * @copy 该文件代码大部分出自 umi，有需要请参考： + * https://github.com/umijs/umi/tree/master/packages/core + */ import { join } from 'path'; import { EventEmitter } from 'events'; import assert from 'assert'; diff --git a/packages/fes-compiler/src/service/pluginAPI.js b/packages/fes-compiler/src/service/pluginAPI.js index ffa83f3f..c150747b 100644 --- a/packages/fes-compiler/src/service/pluginAPI.js +++ b/packages/fes-compiler/src/service/pluginAPI.js @@ -1,3 +1,8 @@ +/** + * @copy 该文件代码大部分出自 umi，有需要请参考： + * https://github.com/umijs/umi/tree/master/packages/core + */ + import assert from 'assert'; import * as utils from '@umijs/utils'; import { isValidPlugin, pathToObj } from './utils/pluginUtils'; diff --git a/packages/fes-plugin-jest/package.json b/packages/fes-plugin-jest/package.json index 5d29b739..a51f026a 100644 --- a/packages/fes-plugin-jest/package.json +++ b/packages/fes-plugin-jest/package.json @@ -1,6 +1,6 @@ { "name": "@fesjs/plugin-jest", - "version": "2.0.0-rc.3", + "version": "2.0.0-rc.4", "description": "@fesjs/plugin-jest", "main": "lib/index.js", "files": [ @@ -31,7 +31,7 @@ }, "dependencies": { "@babel/core": "7.11.6", - "@fesjs/compiler": "^2.0.0-rc.3", + "@fesjs/compiler": "^2.0.0-rc.4", "@umijs/babel-preset-umi": "3.2.24", "babel-core": "^7.0.0-bridge.0", "babel-jest": "^26.6.3", diff --git a/packages/fes-plugin-layout/package.json b/packages/fes-plugin-layout/package.json index 917a6f60..de2976bb 100644 --- a/packages/fes-plugin-layout/package.json +++ b/packages/fes-plugin-layout/package.json @@ -1,6 +1,6 @@ { "name": "@fesjs/plugin-layout", - "version": "2.0.0-rc.3", + "version": "2.0.0-rc.4", "description": "@fesjs/plugin-layout", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-locale/package.json b/packages/fes-plugin-locale/package.json index f2652435..275e6332 100644 --- a/packages/fes-plugin-locale/package.json +++ b/packages/fes-plugin-locale/package.json @@ -1,6 +1,6 @@ { "name": "@fesjs/plugin-locale", - "version": "2.0.0-rc.3", + "version": "2.0.0-rc.4", "description": "@fesjs/plugin-locale", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-request/package.json b/packages/fes-plugin-request/package.json index 51b0e43f..c9dd4020 100644 --- a/packages/fes-plugin-request/package.json +++ b/packages/fes-plugin-request/package.json @@ -1,6 +1,6 @@ { "name": "@fesjs/plugin-request", - "version": "2.0.0-rc.3", + "version": "2.0.0-rc.4", "description": "@fesjs/plugin-request", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-request/src/template/paramsProcess.js b/packages/fes-plugin-request/src/template/paramsProcess.js index c68fa6f2..06864044 100644 --- a/packages/fes-plugin-request/src/template/paramsProcess.js +++ b/packages/fes-plugin-request/src/template/paramsProcess.js @@ -3,9 +3,9 @@ import { checkHttpRequestHasBody, trimObj } from './helpers'; export default async (ctx, next) => { const config = ctx.config; if (checkHttpRequestHasBody(config.method)) { - config.data = trimObj(config.data); + trimObj(config.data); } else { - config.params = trimObj(config.params); + trimObj(config.params); } await next(); }; diff --git a/packages/fes-plugin-vuex/package.json b/packages/fes-plugin-vuex/package.json index 8b2ad8cc..a5c0546a 100644 --- a/packages/fes-plugin-vuex/package.json +++ b/packages/fes-plugin-vuex/package.json @@ -1,6 +1,6 @@ { "name": "@fesjs/plugin-vuex", - "version": "2.0.0-rc.3", + "version": "2.0.0-rc.4", "description": "@fesjs/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 4613e368..f49ec247 100644 --- a/packages/fes-preset-built-in/package.json +++ b/packages/fes-preset-built-in/package.json @@ -1,6 +1,6 @@ { "name": "@fesjs/preset-built-in", - "version": "2.0.0-rc.3", + "version": "2.0.0-rc.4", "description": "@fesjs/preset-built-in", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -32,7 +32,7 @@ "@babel/plugin-proposal-pipeline-operator": "^7.12.13", "@babel/plugin-transform-runtime": "^7.12.13", "@babel/preset-env": "^7.12.13", - "@fesjs/compiler": "^2.0.0-rc.3", + "@fesjs/compiler": "^2.0.0-rc.4", "@soda/friendly-errors-webpack-plugin": "^1.8.0", "@umijs/utils": "3.3.3", "@vue/babel-plugin-jsx": "^1.0.2", diff --git a/packages/fes-preset-built-in/src/plugins/commands/build/index.js b/packages/fes-preset-built-in/src/plugins/commands/build/index.js index 4dba4cb9..94ec4a75 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/build/index.js +++ b/packages/fes-preset-built-in/src/plugins/commands/build/index.js @@ -1,3 +1,7 @@ +/** + * @copy 该文件代码大部分出自 umi，有需要请参考： + * https://github.com/umijs/umi/blob/master/packages/preset-built-in/src/plugins/commands/build/build.ts + */ import { Logger } from '@fesjs/compiler'; diff --git a/packages/fes-preset-built-in/src/plugins/commands/buildDevUtils.js b/packages/fes-preset-built-in/src/plugins/commands/buildDevUtils.js index 2e67726b..1d7af459 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/buildDevUtils.js +++ b/packages/fes-preset-built-in/src/plugins/commands/buildDevUtils.js @@ -1,3 +1,8 @@ +/** + * @copy 该文件代码大部分出自 umi，有需要请参考： + * https://github.com/umijs/umi/blob/master/packages/preset-built-in/src/plugins/commands/buildDevUtils.ts + */ + import { join, resolve } from 'path'; import { existsSync, readdirSync, readFileSync } from 'fs'; import { rimraf, chalk } from '@umijs/utils'; diff --git a/packages/fes-preset-built-in/src/plugins/commands/dev/index.js b/packages/fes-preset-built-in/src/plugins/commands/dev/index.js index b3747677..7d4cfccd 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/dev/index.js +++ b/packages/fes-preset-built-in/src/plugins/commands/dev/index.js @@ -1,3 +1,8 @@ +/** + * @copy 该文件代码大部分出自 umi，有需要请参考： + * https://github.com/umijs/umi/blob/master/packages/preset-built-in/src/plugins/commands/dev/dev.ts + */ + const assert = require('assert'); export default (api) => { diff --git a/packages/fes-preset-built-in/src/plugins/commands/dev/watchPkg.js b/packages/fes-preset-built-in/src/plugins/commands/dev/watchPkg.js index bc9722a7..94554acb 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/dev/watchPkg.js +++ b/packages/fes-preset-built-in/src/plugins/commands/dev/watchPkg.js @@ -1,3 +1,8 @@ +/** + * @copy 该文件代码大部分出自 umi，有需要请参考： + * https://github.com/umijs/umi/blob/master/packages/preset-built-in/src/plugins/commands/dev/watchPkg.ts + */ + import { join } from 'path'; import { chokidar, winPath, lodash } from '@umijs/utils'; import { existsSync, readFileSync } from 'fs'; diff --git a/packages/fes-runtime/package.json b/packages/fes-runtime/package.json index b4ba6399..409166ef 100644 --- a/packages/fes-runtime/package.json +++ b/packages/fes-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@fesjs/runtime", - "version": "2.0.0-rc.1", + "version": "2.0.0-rc.4", "description": "@fesjs/runtime", "main": "dist/index.js", "files": [ diff --git a/packages/fes-runtime/src/plugin/index.js b/packages/fes-runtime/src/plugin/index.js index a6a70c56..5d1d2126 100644 --- a/packages/fes-runtime/src/plugin/index.js +++ b/packages/fes-runtime/src/plugin/index.js @@ -1,3 +1,8 @@ +/** + * @copy 该文件代码大部分出自 umi，有需要请参考： + * https://github.com/umijs/umi/blob/master/packages/runtime/src/Plugin/Plugin.ts + */ + import { assert } from '../utils'; function _compose({ fns, args }) { diff --git a/packages/fes/package.json b/packages/fes/package.json index da2167dc..1d221b0f 100644 --- a/packages/fes/package.json +++ b/packages/fes/package.json @@ -1,6 +1,6 @@ { "name": "@fesjs/fes", - "version": "2.0.0-rc.3", + "version": "2.0.0-rc.4", "description": "一个好用的前端管理台快速开发框架", "preferGlobal": true, "scripts": { @@ -39,9 +39,9 @@ "strong" ], "dependencies": { - "@fesjs/compiler": "^2.0.0-rc.3", - "@fesjs/preset-built-in": "^2.0.0-rc.3", - "@fesjs/runtime": "^2.0.0-rc.1", + "@fesjs/compiler": "^2.0.0-rc.4", + "@fesjs/preset-built-in": "^2.0.0-rc.4", + "@fesjs/runtime": "^2.0.0-rc.4", "@umijs/utils": "3.3.3", "resolve-cwd": "^3.0.0" }, diff --git a/packages/fes/src/forkedDev.js b/packages/fes/src/forkedDev.js index 7ddde71c..7abc5d6c 100644 --- a/packages/fes/src/forkedDev.js +++ b/packages/fes/src/forkedDev.js @@ -1,3 +1,8 @@ +/** + * @copy 该文件代码大部分出自 umi，有需要请参考： + * https://github.com/umijs/umi/blob/master/packages/umi/src/forkedDev.ts + */ + import { chalk, yParser } from '@umijs/utils'; import { Service } from './serviceWithBuiltIn'; import getCwd from './utils/getCwd'; diff --git a/packages/fes/src/serviceWithBuiltIn.js b/packages/fes/src/serviceWithBuiltIn.js index 1fe99499..b71038fc 100644 --- a/packages/fes/src/serviceWithBuiltIn.js +++ b/packages/fes/src/serviceWithBuiltIn.js @@ -1,3 +1,8 @@ +/** + * @copy 该文件代码大部分出自 umi，有需要请参考： + * https://github.com/umijs/umi/blob/master/packages/umi/src/ServiceWithBuiltIn.ts + */ + import { dirname } from 'path'; import { Service as CoreService } from '@fesjs/compiler';