feat: 优化包依赖 + 优化 fes-plugin-test

build.config.js

@@ -18,7 +18,8 @@ module.exports = {
         'fes-plugin-sass',
         'fes-plugin-vuex',
         'fes-preset-built-in',
-        'fes-runtime'
+        'fes-runtime',
+        'fes-utils'
     ],
     copy: []
 };

jest.config.js

@@ -12,6 +12,7 @@ module.exports = {
         'node_modules'
     ],
     transformIgnorePatterns: [
-        'node_modules/(?!lodash-es)'
+        'node_modules/(?!lodash-es)',
+        'fes-template'
     ]
 };

package.json

@@ -28,7 +28,7 @@
     "strong"
   ],
   "dependencies": {
-    "lerna": "^3.22.1"
+    "lerna": "^4.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.15.0",
@@ -117,4 +117,4 @@
       }
     }
   }
-}
+}

packages/create-fes-app/package.json

@@ -30,10 +30,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@umijs/utils": "3.3.3",
+    "@fesjs/utils": "^2.0.0",
-    "fs-extra": "^9.0.1",
+    "fs-extra": "^10.0.0",
     "inquirer": "^7.3.3",
     "readline": "^1.3.0",
     "validate-npm-package-name": "^3.0.0"
   }
-}
+}

packages/create-fes-app/src/cli.js

@@ -1,4 +1,4 @@
-import { chalk, yParser } from '@umijs/utils';
+import { chalk, yParser } from '@fesjs/utils';
 import { existsSync } from 'fs';
 import { join } from 'path';
 

packages/create-fes-app/src/generator/App.js

@@ -1,4 +1,4 @@
-import { Generator } from '@umijs/utils';
+import { Generator } from '@fesjs/utils';
 
 export default class AppGenerator extends Generator {
     constructor({
@@ -15,7 +15,7 @@ export default class AppGenerator extends Generator {
     async writing() {
         this.copyDirectory({
             context: {
-                version: require('../../package').version
+                version: require('../../package.json').version
             },
             path: this.path,
             target: this.targetDir

packages/create-fes-app/src/index.js

@@ -1,5 +1,5 @@
 import path from 'path';
-import { chalk } from '@umijs/utils';
+import { chalk } from '@fesjs/utils';
 import validateProjectName from 'validate-npm-package-name';
 import fs from 'fs-extra';
 import inquirer from 'inquirer';
@@ -27,7 +27,7 @@ export default async ({ cwd, args }) => {
         });
         throw new Error('Process exited');
     }
-    if (fs.existsSync(targetDir) && !args.merge) {
+    if (fs.pathExistsSync(targetDir) && !args.merge) {
         if (args.force) {
             await fs.remove(targetDir);
         } else if (inCurrent) {

packages/deps/README.md

@@ -1 +0,0 @@
-# Fes.js 公共依赖包管理

packages/fes-compiler/package.json

@@ -26,7 +26,7 @@
   "dependencies": {
     "@babel/preset-env": "^7.12.13",
     "@babel/register": "^7.12.13",
-    "@umijs/utils": "3.3.3",
+    "@fesjs/utils": "^2.0.0",
     "commander": "^7.0.0",
     "dotenv": "8.2.0",
     "joi": "17.3.0",
@@ -34,4 +34,4 @@
     "set-value": "3.0.2",
     "tapable": "^2.2.0"
   }
-}
+}

packages/fes-compiler/src/config/index.js

@@ -13,9 +13,8 @@ import {
     cleanRequireCache,
     lodash,
     parseRequireDeps,
-    winPath,
+    winPath
-    getFile
+} from '@fesjs/utils';
-} from '@umijs/utils';
 import assert from 'assert';
 import joi from 'joi';
 import { ServiceStage } from '../service/enums';
@@ -181,20 +180,11 @@ export default class Config {
         // 潜在问题：
         // .local 和 .env 的配置必须有 configFile 才有效
         if (process.env.FES_ENV) {
-            const envConfigFileName = this.addAffix(
+            envConfigFile = this.addAffix(
                 configFile,
                 process.env.FES_ENV
             );
-            const fileNameWithoutExt = envConfigFileName.replace(
+            if (!existsSync(join(this.cwd, envConfigFile))) {
-                extname(envConfigFileName),
-                ''
-            );
-            envConfigFile = getFile({
-                base: this.cwd,
-                fileNameWithoutExt,
-                type: 'javascript'
-            }).filename;
-            if (!envConfigFile) {
                 throw new Error(
                     `get user config failed, ${envConfigFile} does not exist, but process.env.FES_ENV is set to ${process.env.FES_ENV}.`
                 );

packages/fes-compiler/src/config/utils/configUtils.js

@@ -1,4 +1,4 @@
-import { lodash } from '@umijs/utils';
+import { lodash } from '@fesjs/utils';
 import set from 'set-value';
 
 export function updateUserConfigWithKey({

packages/fes-compiler/src/config/utils/isEqual.js

@@ -1,4 +1,4 @@
-import { lodash } from '@umijs/utils';
+import { lodash } from '@fesjs/utils';
 
 function funcToStr(obj) {
     if (typeof obj === 'function') return obj.toString();

packages/fes-compiler/src/config/utils/mergeDefault.js

@@ -1,4 +1,4 @@
-import { deepmerge, lodash } from '@umijs/utils';
+import { deepmerge, lodash } from '@fesjs/utils';
 
 
 export default ({ defaultConfig, config }) => {

packages/fes-compiler/src/logger/index.js

@@ -6,7 +6,7 @@
 import {
     createDebug,
     chalk
-} from '@umijs/utils';
+} from '@fesjs/utils';
 import readline from 'readline';
 
 export default class Logger {

packages/fes-compiler/src/service/babelRegister.js

@@ -1,7 +1,7 @@
 import {
     lodash,
     winPath
-} from '@umijs/utils';
+} from '@fesjs/utils';
 
 
 export default class BabelRegister {

packages/fes-compiler/src/service/getPaths.js

@@ -5,7 +5,7 @@
 
 import { join } from 'path';
 import { existsSync, statSync } from 'fs';
-import { lodash, winPath } from '@umijs/utils';
+import { lodash, winPath } from '@fesjs/utils';
 
 function isDirectoryAndExist(path) {
     return existsSync(path) && statSync(path).isDirectory();

packages/fes-compiler/src/service/index.js

@@ -7,7 +7,7 @@ import { EventEmitter } from 'events';
 import assert from 'assert';
 import { AsyncSeriesWaterfallHook } from 'tapable';
 import { existsSync } from 'fs';
-import { lodash, chalk } from '@umijs/utils';
+import { lodash, chalk } from '@fesjs/utils';
 import { Command, Option } from 'commander';
 import { resolvePresets, pathToObj, resolvePlugins } from './utils/pluginUtils';
 import loadDotEnv from './utils/loadDotEnv';
@@ -520,7 +520,6 @@ export default class Service extends EventEmitter {
 
     async runCommand({ rawArgv = {}, args = {} }) {
         assert(this.stage >= ServiceStage.init, 'service is not initialized.');
-
         Object.keys(this.commands).forEach((command) => {
             const commandOptionConfig = this.commands[command];
             const program = this.program;

packages/fes-compiler/src/service/pluginAPI.js

@@ -4,7 +4,7 @@
  */
 
 import assert from 'assert';
-import * as utils from '@umijs/utils';
+import * as utils from '@fesjs/utils';
 import { isValidPlugin, pathToObj } from './utils/pluginUtils';
 import { EnableBy, PluginType, ServiceStage } from './enums';
 import Logger from '../logger';

packages/fes-compiler/src/service/utils/pluginUtils.js

@@ -7,7 +7,7 @@ import {
     winPath,
     pkgUp,
     lodash
-} from '@umijs/utils';
+} from '@fesjs/utils';
 
 import { PluginType } from '../enums';
 

packages/fes-plugin-access/package.json

@@ -27,10 +27,10 @@
     "access": "public"
   },
   "dependencies": {
-    "lodash": "^4.17.15"
+    "lodash-es": "^4.17.15"
   },
   "peerDependencies": {
     "@fesjs/fes": "^2.0.0",
     "vue": "^3.0.5"
   }
-}
+}

packages/fes-plugin-access/src/runtime/core.tpl

@@ -1,7 +1,7 @@
 import { reactive, unref, computed, inject } from "vue";
 import createDirective from "./createDirective";
 import createComponent from "./createComponent";
-import isPlainObject from "lodash/isPlainObject";
+import {isPlainObject} from "lodash-es";
 
 const accessKey = Symbol("plugin-access");
 

packages/fes-plugin-icon/package.json

@@ -30,6 +30,6 @@
     "vue": "^3.0.5"
   },
   "dependencies": {
-    "svgo": "1.3.2"
+    "svgo": "^2.3.1"
   }
-}
+}

packages/fes-plugin-icon/src/optimizeSvg.js

@@ -1,90 +1,30 @@
 import { extname, basename } from 'path';
 import { statSync, readFileSync } from 'fs';
+import { extendDefaultPlugins, optimize } from 'svgo';
 
 
-import SVGO from 'svgo/lib/svgo';
+const plugins = extendDefaultPlugins([
+    'sortAttrs',
+    'removeDimensions',
+    {
+        name: 'removeAttrs',
+        params: {
+            attrs: '(stroke|fill|class)'
+        }
+    }
+]);
 
-const svgo = new SVGO({
-    plugins: [{
-        cleanupAttrs: true
-    }, {
-        removeDoctype: true
-    }, {
-        removeXMLProcInst: true
-    }, {
-        removeComments: true
-    }, {
-        removeMetadata: true
-    }, {
-        removeTitle: true
-    }, {
-        removeDesc: true
-    }, {
-        removeUselessDefs: true
-    }, {
-        removeEditorsNSData: true
-    }, {
-        removeEmptyAttrs: true
-    }, {
-        removeHiddenElems: true
-    }, {
-        removeEmptyText: true
-    }, {
-        removeEmptyContainers: true
-    }, {
-        removeViewBox: false
-    }, {
-        cleanupEnableBackground: true
-    }, {
-        convertStyleToAttrs: true
-    }, {
-        convertColors: true
-    }, {
-        convertPathData: true
-    }, {
-        convertTransform: true
-    }, {
-        removeUnknownsAndDefaults: true
-    }, {
-        removeNonInheritableGroupAttrs: true
-    }, {
-        removeUselessStrokeAndFill: true
-    }, {
-        removeUnusedNS: true
-    }, {
-        cleanupIDs: true
-    }, {
-        cleanupNumericValues: true
-    }, {
-        moveElemsAttrsToGroup: true
-    }, {
-        moveGroupAttrsToElems: true
-    }, {
-        collapseGroups: true
-    }, {
-        removeRasterImages: false
-    }, {
-        mergePaths: true
-    }, {
-        convertShapeToPath: true
-    }, {
-        sortAttrs: true
-    }, {
-        removeDimensions: true
-    }, {
-        removeAttrs: { attrs: '(stroke|fill)' }
-    }]
-});
 
 export default function optimizeSvg(files) {
     const optimizedSvgData = [];
     for (const filePath of files) {
         if (statSync(filePath).isFile() && extname(filePath) === '.svg') {
             const data = readFileSync(filePath, 'utf-8');
-            optimizedSvgData.push(svgo.optimize(data, { path: filePath }).then(svgData => ({
+            const svgData = optimize(data, { path: filePath, plugins });
+            optimizedSvgData.push({
                 fileName: basename(filePath),
                 ...svgData
-            })));
+            });
         }
     }
     return Promise.all(optimizedSvgData);

packages/fes-plugin-jest/helpers/setupFiles/jasmine.js

@@ -1 +0,0 @@
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 200000; // eslint-disable-line

packages/fes-plugin-jest/helpers/setupFiles/shim.js

@@ -1,6 +0,0 @@
-require('core-js/stable');
-require('regenerator-runtime/runtime');
-
-if (typeof window !== 'undefined') {
-    require('whatwg-fetch');
-}

packages/fes-plugin-jest/helpers/transformers/css.js

@@ -1,9 +0,0 @@
-module.exports = {
-    process() {
-        return 'module.exports = {};';
-    },
-    getCacheKey() {
-    // The output is always the same.
-        return 'css';
-    }
-};

packages/fes-plugin-jest/helpers/transformers/javascript.js

@@ -1,7 +1,10 @@
-const babelJest = require('babel-jest');
+const babelJest = require('babel-jest').default;
 
 module.exports = babelJest.createTransformer({
-    presets: [require.resolve('@umijs/babel-preset-umi/node')],
+    presets: [
+        ['@babel/preset-env', { targets: { node: 'current' } }]
+    ],
+    plugins: ['@vue/babel-plugin-jsx'],
     babelrc: false,
     configFile: false
 });

packages/fes-plugin-jest/package.json

@@ -30,21 +30,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@babel/core": "7.11.6",
     "@fesjs/compiler": "^2.0.0",
-    "@umijs/babel-preset-umi": "3.2.24",
+    "@babel/preset-env": "^7.15.0",
-    "babel-core": "^7.0.0-bridge.0",
+    "@vue/babel-plugin-jsx": "^1.0.6",
-    "babel-jest": "^26.6.3",
+    "babel-jest": "^27.0.6",
-    "core-js": "3.6.5",
+    "jest": "^27.0.6",
-    "jest": "^26.6.3",
-    "jest-cli": "^26.6.3",
-    "jest-serializer-vue": "^2.0.2",
     "jest-transform-stub": "^2.0.0",
     "jest-watch-typeahead": "^0.6.1",
-    "regenerator-runtime": "^0.13.7",
+    "ts-jest": "^27.0.4",
-    "ts-jest": "^26.5.0",
+    "typescript": "^4.3.5",
-    "typescript": "~4.1.2",
+    "vue3-jest": "^27.0.0-alpha.1"
-    "vue-jest": "^5.0.0-0",
-    "whatwg-fetch": "^3.4.1"
   }
-}
+}

packages/fes-plugin-jest/src/createDefaultConfig.js

@@ -9,8 +9,8 @@ export default (cwd, args) => {
     const hasSrc = existsSync(join(cwd, 'src'));
     return {
         collectCoverageFrom: [
-            'index.{js,jsx,ts,tsx,vue}',
+            'index.{js,jsx,vue}',
-            hasSrc && 'src/**/*.{js,jsx,ts,tsx,vue}',
+            hasSrc && 'src/**/*.{js,jsx,vue}',
             '!**/.fes/**',
             '!**/typings/**',
             '!**/types/**',
@@ -27,24 +27,18 @@ export default (cwd, args) => {
         ],
         transform: {
             // process *.vue files with vue-jest
-            '^.+\\.vue$': require.resolve('vue-jest'),
+            '^.+\\.vue$': require.resolve('vue3-jest'),
             '.+\\.(css|styl|less|sass|scss|jpg|jpeg|png|svg|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
                 require.resolve('jest-transform-stub'),
             '^.+\\.jsx?$': require.resolve(
                 '../helpers/transformers/javascript'
             )
         },
-        setupFiles: [require.resolve('../helpers/setupFiles/shim')],
-        setupFilesAfterEnv: [require.resolve('../helpers/setupFiles/jasmine')],
         transformIgnorePatterns: ['/node_modules/'],
         // support the same @ -> src alias mapping in source code
         moduleNameMapper: {
             '^@/(.*)$': '<rootDir>/src/$1'
         },
-        // serializer for snapshots
-        snapshotSerializers: [
-            'jest-serializer-vue'
-        ],
         testMatch: [
             `**/tests/**/*.(${testMatchTypes.join('|')}).[jt]s?(x)`,
             '**/__tests__/**/*.[jt]s?(x)'

packages/fes-plugin-jest/src/index.js

@@ -3,7 +3,8 @@ import assert from 'assert';
 import { join } from 'path';
 import { existsSync } from 'fs';
 import { Logger } from '@fesjs/compiler';
-import { options as CliOptions } from 'jest-cli/build/cli/args';
+// jest-cli 不在暴露 options，维护一份本地的 options
+import { options as CliOptions } from './jestArgs';
 import createDefaultConfig from './createDefaultConfig';
 
 const logger = new Logger('fes:plugin-unit-jest');

packages/fes-plugin-jest/src/jestArgs.js

@@ -0,0 +1,622 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+export const usage = 'Usage: $0 [--config=<pathToConfigFile>] [TestPathPattern]';
+export const docs = 'Documentation: https://jestjs.io/';
+
+// The default values are all set in jest-config
+export const options = {
+    all: {
+        description:
+       'The opposite of `onlyChanged`. If `onlyChanged` is set by '
+       + 'default, running jest with `--all` will force Jest to run all tests '
+       + 'instead of running only tests related to changed files.',
+        type: 'boolean'
+    },
+    automock: {
+        description: 'Automock all files by default.',
+        type: 'boolean'
+    },
+    bail: {
+        alias: 'b',
+        description:
+       'Exit the test suite immediately after `n` number of failing tests.',
+        type: 'boolean'
+    },
+    browser: {
+        description:
+       'Respect the "browser" field in package.json '
+       + 'when resolving modules. Some packages export different versions '
+       + 'based on whether they are operating in node.js or a browser.',
+        type: 'boolean'
+    },
+    cache: {
+        description:
+       'Whether to use the transform cache. Disable the cache '
+       + 'using --no-cache.',
+        type: 'boolean'
+    },
+    cacheDirectory: {
+        description:
+       'The directory where Jest should store its cached '
+       + ' dependency information.',
+        type: 'string'
+    },
+    changedFilesWithAncestor: {
+        description:
+       'Runs tests related to the current changes and the changes made in the '
+       + 'last commit. Behaves similarly to `--onlyChanged`.',
+        type: 'boolean'
+    },
+    changedSince: {
+        description:
+       'Runs tests related to the changes since the provided branch. If the '
+       + 'current branch has diverged from the given branch, then only changes '
+       + 'made locally will be tested. Behaves similarly to `--onlyChanged`.',
+        nargs: 1,
+        type: 'string'
+    },
+    ci: {
+        description:
+       'Whether to run Jest in continuous integration (CI) mode. '
+       + 'This option is on by default in most popular CI environments. It will '
+       + 'prevent snapshots from being written unless explicitly requested.',
+        type: 'boolean'
+    },
+    clearCache: {
+        description:
+       'Clears the configured Jest cache directory and then exits. '
+       + 'Default directory can be found by calling jest --showConfig',
+        type: 'boolean'
+    },
+    clearMocks: {
+        description:
+       'Automatically clear mock calls and instances between every '
+       + 'test. Equivalent to calling jest.clearAllMocks() between each test.',
+        type: 'boolean'
+    },
+    collectCoverage: {
+        description: 'Alias for --coverage.',
+        type: 'boolean'
+    },
+    collectCoverageFrom: {
+        description:
+       'A glob pattern relative to <rootDir> matching the files that coverage '
+       + 'info needs to be collected from.',
+        type: 'string'
+    },
+    collectCoverageOnlyFrom: {
+        description: 'Explicit list of paths coverage will be restricted to.',
+        string: true,
+        type: 'array'
+    },
+    color: {
+        description:
+       'Forces test results output color highlighting (even if '
+       + 'stdout is not a TTY). Set to false if you would like to have no colors.',
+        type: 'boolean'
+    },
+    colors: {
+        description: 'Alias for `--color`.',
+        type: 'boolean'
+    },
+    config: {
+        alias: 'c',
+        description:
+       'The path to a jest config file specifying how to find '
+       + 'and execute tests. If no rootDir is set in the config, the directory '
+       + 'containing the config file is assumed to be the rootDir for the project.'
+       + 'This can also be a JSON encoded value which Jest will use as configuration.',
+        type: 'string'
+    },
+    coverage: {
+        description:
+       'Indicates that test coverage information should be '
+       + 'collected and reported in the output.',
+        type: 'boolean'
+    },
+    coverageDirectory: {
+        description: 'The directory where Jest should output its coverage files.',
+        type: 'string'
+    },
+    coveragePathIgnorePatterns: {
+        description:
+       'An array of regexp pattern strings that are matched '
+       + 'against all file paths before executing the test. If the file path'
+       + 'matches any of the patterns, coverage information will be skipped.',
+        string: true,
+        type: 'array'
+    },
+    coverageProvider: {
+        choices: ['babel', 'v8'],
+        description: 'Select between Babel and V8 to collect coverage'
+    },
+    coverageReporters: {
+        description:
+       'A list of reporter names that Jest uses when writing '
+       + 'coverage reports. Any istanbul reporter can be used.',
+        string: true,
+        type: 'array'
+    },
+    coverageThreshold: {
+        description:
+       'A JSON string with which will be used to configure '
+       + 'minimum threshold enforcement for coverage results',
+        type: 'string'
+    },
+    debug: {
+        description: 'Print debugging info about your jest config.',
+        type: 'boolean'
+    },
+    detectLeaks: {
+        description:
+       '**EXPERIMENTAL**: Detect memory leaks in tests. After executing a '
+       + 'test, it will try to garbage collect the global object used, and fail '
+       + 'if it was leaked',
+        type: 'boolean'
+    },
+    detectOpenHandles: {
+        description:
+       'Print out remaining open handles preventing Jest from exiting at the '
+       + 'end of a test run. Implies `runInBand`.',
+        type: 'boolean'
+    },
+    env: {
+        description:
+       'The test environment used for all tests. This can point to '
+       + 'any file or node module. Examples: `jsdom`, `node` or '
+       + '`path/to/my-environment.js`',
+        type: 'string'
+    },
+    errorOnDeprecated: {
+        description: 'Make calling deprecated APIs throw helpful error messages.',
+        type: 'boolean'
+    },
+    expand: {
+        alias: 'e',
+        description: 'Use this flag to show full diffs instead of a patch.',
+        type: 'boolean'
+    },
+    filter: {
+        description:
+       'Path to a module exporting a filtering function. This method receives '
+       + 'a list of tests which can be manipulated to exclude tests from '
+       + 'running. Especially useful when used in conjunction with a testing '
+       + 'infrastructure to filter known broken tests.',
+        type: 'string'
+    },
+    findRelatedTests: {
+        description:
+       'Find related tests for a list of source files that were '
+       + 'passed in as arguments. Useful for pre-commit hook integration to run '
+       + 'the minimal amount of tests necessary.',
+        type: 'boolean'
+    },
+    forceExit: {
+        description:
+       'Force Jest to exit after all tests have completed running. '
+       + 'This is useful when resources set up by test code cannot be '
+       + 'adequately cleaned up.',
+        type: 'boolean'
+    },
+    globalSetup: {
+        description: 'The path to a module that runs before All Tests.',
+        type: 'string'
+    },
+    globalTeardown: {
+        description: 'The path to a module that runs after All Tests.',
+        type: 'string'
+    },
+    globals: {
+        description:
+       'A JSON string with map of global variables that need '
+       + 'to be available in all test environments.',
+        type: 'string'
+    },
+    haste: {
+        description:
+       'A JSON string with map of variables for the haste module system',
+        type: 'string'
+    },
+    init: {
+        description: 'Generate a basic configuration file',
+        type: 'boolean'
+    },
+    injectGlobals: {
+        description: 'Should Jest inject global variables or not',
+        type: 'boolean'
+    },
+    json: {
+        description:
+       'Prints the test results in JSON. This mode will send all '
+       + 'other test output and user messages to stderr.',
+        type: 'boolean'
+    },
+    lastCommit: {
+        description:
+       'Run all tests affected by file changes in the last commit made. '
+       + 'Behaves similarly to `--onlyChanged`.',
+        type: 'boolean'
+    },
+    listTests: {
+        description:
+       'Lists all tests Jest will run given the arguments and '
+       + 'exits. Most useful in a CI system together with `--findRelatedTests` '
+       + 'to determine the tests Jest will run based on specific files',
+        type: 'boolean'
+    },
+    logHeapUsage: {
+        description:
+       'Logs the heap usage after every test. Useful to debug '
+       + 'memory leaks. Use together with `--runInBand` and `--expose-gc` in '
+       + 'node.',
+        type: 'boolean'
+    },
+    maxConcurrency: {
+        description:
+       'Specifies the maximum number of tests that are allowed to run'
+       + 'concurrently. This only affects tests using `test.concurrent`.',
+        type: 'number'
+    },
+    maxWorkers: {
+        alias: 'w',
+        description:
+       'Specifies the maximum number of workers the worker-pool '
+       + 'will spawn for running tests. This defaults to the number of the '
+       + 'cores available on your machine. (its usually best not to override '
+       + 'this default)',
+        type: 'string'
+    },
+    moduleDirectories: {
+        description:
+       'An array of directory names to be searched recursively '
+       + "up from the requiring module's location.",
+        string: true,
+        type: 'array'
+    },
+    moduleFileExtensions: {
+        description:
+       'An array of file extensions your modules use. If you '
+       + 'require modules without specifying a file extension, these are the '
+       + 'extensions Jest will look for. ',
+        string: true,
+        type: 'array'
+    },
+    moduleNameMapper: {
+        description:
+       'A JSON string with a map from regular expressions to '
+       + 'module names or to arrays of module names that allow to stub '
+       + 'out resources, like images or styles with a single module',
+        type: 'string'
+    },
+    modulePathIgnorePatterns: {
+        description:
+       'An array of regexp pattern strings that are matched '
+       + 'against all module paths before those paths are to be considered '
+       + '"visible" to the module loader.',
+        string: true,
+        type: 'array'
+    },
+    modulePaths: {
+        description:
+       'An alternative API to setting the NODE_PATH env variable, '
+       + 'modulePaths is an array of absolute paths to additional locations to '
+       + 'search when resolving modules.',
+        string: true,
+        type: 'array'
+    },
+    noStackTrace: {
+        description: 'Disables stack trace in test results output',
+        type: 'boolean'
+    },
+    notify: {
+        description: 'Activates notifications for test results.',
+        type: 'boolean'
+    },
+    notifyMode: {
+        description: 'Specifies when notifications will appear for test results.',
+        type: 'string'
+    },
+    onlyChanged: {
+        alias: 'o',
+        description:
+       'Attempts to identify which tests to run based on which '
+       + "files have changed in the current repository. Only works if you're "
+       + 'running tests in a git or hg repository at the moment.',
+        type: 'boolean'
+    },
+    onlyFailures: {
+        alias: 'f',
+        description: 'Run tests that failed in the previous execution.',
+        type: 'boolean'
+    },
+    outputFile: {
+        description:
+       'Write test results to a file when the --json option is '
+       + 'also specified.',
+        type: 'string'
+    },
+    passWithNoTests: {
+        description:
+       'Will not fail if no tests are found (for example while using `--testPathPattern`.)',
+        type: 'boolean'
+    },
+    preset: {
+        description: "A preset that is used as a base for Jest's configuration.",
+        type: 'string'
+    },
+    prettierPath: {
+        description: 'The path to the "prettier" module used for inline snapshots.',
+        type: 'string'
+    },
+    projects: {
+        description:
+       'A list of projects that use Jest to run all tests of all '
+       + 'projects in a single instance of Jest.',
+        string: true,
+        type: 'array'
+    },
+    reporters: {
+        description: 'A list of custom reporters for the test suite.',
+        string: true,
+        type: 'array'
+    },
+    resetMocks: {
+        description:
+       'Automatically reset mock state between every test. '
+       + 'Equivalent to calling jest.resetAllMocks() between each test.',
+        type: 'boolean'
+    },
+    resetModules: {
+        description:
+       'If enabled, the module registry for every test file will '
+       + 'be reset before running each individual test.',
+        type: 'boolean'
+    },
+    resolver: {
+        description: 'A JSON string which allows the use of a custom resolver.',
+        type: 'string'
+    },
+    restoreMocks: {
+        description:
+       'Automatically restore mock state and implementation between every test. '
+       + 'Equivalent to calling jest.restoreAllMocks() between each test.',
+        type: 'boolean'
+    },
+    rootDir: {
+        description:
+       'The root directory that Jest should scan for tests and '
+       + 'modules within.',
+        type: 'string'
+    },
+    roots: {
+        description:
+       'A list of paths to directories that Jest should use to '
+       + 'search for files in.',
+        string: true,
+        type: 'array'
+    },
+    runInBand: {
+        alias: 'i',
+        description:
+       'Run all tests serially in the current process (rather than '
+       + 'creating a worker pool of child processes that run tests). This '
+       + 'is sometimes useful for debugging, but such use cases are pretty '
+       + 'rare.',
+        type: 'boolean'
+    },
+    runTestsByPath: {
+        description:
+       'Used when provided patterns are exact file paths. This avoids '
+       + 'converting them into a regular expression and matching it against '
+       + 'every single file.',
+        type: 'boolean'
+    },
+    runner: {
+        description:
+       "Allows to use a custom runner instead of Jest's default test runner.",
+        type: 'string'
+    },
+    selectProjects: {
+        description:
+       'Run only the tests of the specified projects.'
+       + 'Jest uses the attribute `displayName` in the configuration to identify each project.',
+        string: true,
+        type: 'array'
+    },
+    setupFiles: {
+        description:
+       'A list of paths to modules that run some code to configure or '
+       + 'set up the testing environment before each test. ',
+        string: true,
+        type: 'array'
+    },
+    setupFilesAfterEnv: {
+        description:
+       'A list of paths to modules that run some code to configure or '
+       + 'set up the testing framework before each test ',
+        string: true,
+        type: 'array'
+    },
+    showConfig: {
+        description: 'Print your jest config and then exits.',
+        type: 'boolean'
+    },
+    silent: {
+        description: 'Prevent tests from printing messages through the console.',
+        type: 'boolean'
+    },
+    skipFilter: {
+        description:
+       'Disables the filter provided by --filter. Useful for CI jobs, or '
+       + 'local enforcement when fixing tests.',
+        type: 'boolean'
+    },
+    snapshotSerializers: {
+        description:
+       'A list of paths to snapshot serializer modules Jest should '
+       + 'use for snapshot testing.',
+        string: true,
+        type: 'array'
+    },
+    testEnvironment: {
+        description: 'Alias for --env',
+        type: 'string'
+    },
+    testEnvironmentOptions: {
+        description:
+       'Test environment options that will be passed to the testEnvironment. '
+       + 'The relevant options depend on the environment.',
+        type: 'string' // Object
+    },
+    testFailureExitCode: {
+        description: 'Exit code of `jest` command if the test run failed',
+        type: 'string' // number
+    },
+    testLocationInResults: {
+        description: 'Add `location` information to the test results',
+        type: 'boolean'
+    },
+    testMatch: {
+        description: 'The glob patterns Jest uses to detect test files.',
+        string: true,
+        type: 'array'
+    },
+    testNamePattern: {
+        alias: 't',
+        description: 'Run only tests with a name that matches the regex pattern.',
+        type: 'string'
+    },
+    testPathIgnorePatterns: {
+        description:
+       'An array of regexp pattern strings that are matched '
+       + 'against all test paths before executing the test. If the test path '
+       + 'matches any of the patterns, it will be skipped.',
+        string: true,
+        type: 'array'
+    },
+    testPathPattern: {
+        description:
+       'A regexp pattern string that is matched against all tests '
+       + 'paths before executing the test.',
+        string: true,
+        type: 'array'
+    },
+    testRegex: {
+        description:
+       'A string or array of string regexp patterns that Jest uses to detect test files.',
+        string: true,
+        type: 'array'
+    },
+    testResultsProcessor: {
+        description:
+       'Allows the use of a custom results processor. '
+       + 'This processor must be a node module that exports '
+       + 'a function expecting as the first argument the result object.',
+        type: 'string'
+    },
+    testRunner: {
+        description:
+       'Allows to specify a custom test runner. The default is'
+       + ' `jest-circus/runner`. A path to a custom test runner can be provided:'
+       + ' `<rootDir>/path/to/testRunner.js`.',
+        type: 'string'
+    },
+    testSequencer: {
+        description:
+       'Allows to specify a custom test sequencer. The default is '
+       + '`@jest/test-sequencer`. A path to a custom test sequencer can be '
+       + 'provided: `<rootDir>/path/to/testSequencer.js`',
+        type: 'string'
+    },
+    testTimeout: {
+        description: 'This option sets the default timeouts of test cases.',
+        type: 'number'
+    },
+    testURL: {
+        description: 'This option sets the URL for the jsdom environment.',
+        type: 'string'
+    },
+    timers: {
+        description:
+       'Setting this value to fake allows the use of fake timers '
+       + 'for functions such as setTimeout.',
+        type: 'string'
+    },
+    transform: {
+        description:
+       'A JSON string which maps from regular expressions to paths '
+       + 'to transformers.',
+        type: 'string'
+    },
+    transformIgnorePatterns: {
+        description:
+       'An array of regexp pattern strings that are matched '
+       + 'against all source file paths before transformation.',
+        string: true,
+        type: 'array'
+    },
+    unmockedModulePathPatterns: {
+        description:
+       'An array of regexp pattern strings that are matched '
+       + 'against all modules before the module loader will automatically '
+       + 'return a mock for them.',
+        string: true,
+        type: 'array'
+    },
+    updateSnapshot: {
+        alias: 'u',
+        description:
+       'Use this flag to re-record snapshots. '
+       + 'Can be used together with a test suite pattern or with '
+       + '`--testNamePattern` to re-record snapshot for test matching '
+       + 'the pattern',
+        type: 'boolean'
+    },
+    useStderr: {
+        description: 'Divert all output to stderr.',
+        type: 'boolean'
+    },
+    verbose: {
+        description:
+       'Display individual test results with the test suite hierarchy.',
+        type: 'boolean'
+    },
+    version: {
+        alias: 'v',
+        description: 'Print the version and exit',
+        type: 'boolean'
+    },
+    watch: {
+        description:
+       'Watch files for changes and rerun tests related to '
+       + 'changed files. If you want to re-run all tests when a file has '
+       + 'changed, use the `--watchAll` option.',
+        type: 'boolean'
+    },
+    watchAll: {
+        description:
+       'Watch files for changes and rerun all tests. If you want '
+       + 'to re-run only the tests related to the changed files, use the '
+       + '`--watch` option.',
+        type: 'boolean'
+    },
+    watchPathIgnorePatterns: {
+        description:
+       'An array of regexp pattern strings that are matched '
+       + 'against all paths before trigger test re-run in watch mode. '
+       + 'If the test path matches any of the patterns, it will be skipped.',
+        string: true,
+        type: 'array'
+    },
+    watchman: {
+        description:
+       'Whether to use watchman for file crawling. Disable using '
+       + '--no-watchman.',
+        type: 'boolean'
+    }
+};

packages/fes-plugin-layout/package.json

@@ -27,7 +27,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@umijs/utils": "3.3.3"
+    "@fesjs/utils": "^2.0.0"
   },
   "peerDependencies": {
     "@ant-design/icons-vue": "^5.1.6",
@@ -35,4 +35,4 @@
     "ant-design-vue": "^2.2.0",
     "vue": "^3.0.5"
   }
-}
+}

packages/fes-plugin-layout/src/index.js

@@ -1,6 +1,6 @@
 import { readFileSync } from 'fs';
 import { join } from 'path';
-import { winPath } from '@umijs/utils';
+import { winPath } from '@fesjs/utils';
 
 const namespace = 'plugin-layout';
 

packages/fes-plugin-locale/package.json

@@ -27,7 +27,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@umijs/utils": "3.3.3",
+    "@fesjs/utils": "^2.0.0",
     "vue-i18n": "^9.0.0"
   },
   "peerDependencies": {
@@ -36,4 +36,4 @@
     "ant-design-vue": "^2.2.0",
     "vue": "^3.0.5"
   }
-}
+}

packages/fes-plugin-locale/src/utils/index.js

@@ -1,4 +1,4 @@
-import { glob } from '@umijs/utils';
+import { glob } from '@fesjs/utils';
 import { join, basename } from 'path';
 
 export function getLocales(cwd) {

packages/fes-plugin-model/package.json

@@ -27,10 +27,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@umijs/utils": "3.3.3"
+    "@fesjs/utils": "^2.0.0"
   },
   "peerDependencies": {
     "@fesjs/fes": "^2.0.0",
     "vue": "^3.0.5"
   }
-}
+}

packages/fes-plugin-model/src/index.js

@@ -1,7 +1,7 @@
 
 import { readFileSync } from 'fs';
 import { join } from 'path';
-import { lodash, winPath } from '@umijs/utils';
+import { lodash, winPath } from '@fesjs/utils';
 import { getModels } from './utils/getModels';
 import { getTmpFile } from './utils/getTmpFile';
 

packages/fes-plugin-model/src/utils/getModels.js

@@ -1,4 +1,4 @@
-import { glob } from '@umijs/utils';
+import { glob } from '@fesjs/utils';
 import { getValidFiles } from '.';
 
 export function getModels(cwd, pattern) {

packages/fes-plugin-model/src/utils/getTmpFile.js

@@ -1,5 +1,5 @@
 import { EOL } from 'os';
-import { winPath } from '@umijs/utils';
+import { winPath } from '@fesjs/utils';
 import {
     genImports, genModels, genExtraModels
 } from './index';

packages/fes-plugin-model/src/utils/index.js

@@ -1,7 +1,7 @@
 import path from 'path';
 import { EOL } from 'os';
 import { readFileSync } from 'fs';
-import { parser, traverse, winPath } from '@umijs/utils';
+import { parser, traverse, winPath } from '@fesjs/utils';
 
 const getFileName = (name) => {
     const fileName = path.basename(name, path.extname(name));
@@ -119,7 +119,7 @@ export const genModels = (imports, absSrcPath) => {
 
         const use = [];
 
-        traverse.default(ast, {
+        traverse(ast, {
             enter(astPath) {
                 if (astPath.isIdentifier({ name: 'useModel' })) {
                     try {
@@ -167,7 +167,7 @@ export const isValidHook = (filePath) => {
     });
     let valid = false;
     let identifierName = '';
-    traverse.default(ast, {
+    traverse(ast, {
         enter(p) {
             if (p.isExportDefaultDeclaration()) {
                 const { type } = p.node.declaration;

packages/fes-plugin-monaco-editor/package.json

@@ -25,8 +25,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@umijs/utils": "3.3.3",
+    "@fesjs/utils": "^2.0.0",
-    "lodash": "^4.17.15",
+    "lodash-es": "^4.17.15",
     "monaco-editor": "^0.20.0",
     "monaco-editor-webpack-plugin": "^1.9.1"
   },
@@ -34,4 +34,4 @@
     "@fesjs/fes": "^2.0.0",
     "vue": "^3.0.5"
   }
-}
+}

packages/fes-plugin-monaco-editor/src/runtime/editor.vue

@@ -5,7 +5,7 @@
 import {
     computed, ref, watch, onMounted, onBeforeUnmount
 } from 'vue';
-import { merge, debounce } from 'lodash';
+import { merge, debounce } from 'lodash-es';
 // eslint-disable-next-line
 import monaco from './loader';
 

packages/fes-plugin-qiankun/package.json

@@ -29,9 +29,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@umijs/utils": "3.3.3",
+    "@fesjs/utils": "^2.0.0",
     "address": "^1.1.2",
-    "lodash": "^4.17.15",
+    "lodash-es": "^4.17.15",
     "qiankun": "^2.4.4"
   },
   "devDependencies": {
@@ -41,4 +41,4 @@
     "@fesjs/fes": "^2.0.0",
     "vue": "^3.0.5"
   }
-}
+}

packages/fes-plugin-qiankun/src/main/runtime/MicroApp.tpl

@@ -8,7 +8,7 @@ import {
     onMounted,
 } from "vue";
 import { loadMicroApp } from "qiankun";
-import mergeWith from "lodash/mergeWith";
+import {mergeWith} from "lodash-es";
 // eslint-disable-next-line import/extensions
 import { getMasterOptions } from "./masterOptions";
 import { onBeforeRouteLeave } from "@@/core/coreExports";

packages/fes-plugin-qiankun/src/micro/index.js

@@ -1,6 +1,6 @@
 import assert from 'assert';
 import address from 'address';
-import { lodash } from '@umijs/utils';
+import { lodash } from '@fesjs/utils';
 import { readFileSync } from 'fs';
 import { join } from 'path';
 import { qiankunStateFromMainModelNamespace } from '../constants';

packages/fes-plugin-request/package.json

@@ -34,4 +34,4 @@
     "@fesjs/compiler": "^2.0.0",
     "axios": "0.21.1"
   }
-}
+}

packages/fes-plugin-request/src/template/request.js

@@ -67,7 +67,6 @@ function getRequestInstance() {
 
     // 洋葱模型内部应该这是对数据的处理，避免有副作用调用
     scheduler
-        .use(setDataField) // 最外层进行数据格式化
         .use(paramsProcess)
         .use(genRequestKey)
         .use(cacheControl)
@@ -75,7 +74,8 @@ function getRequestInstance() {
         .use(throttle)
         .use(axiosMiddleware)
         .use(resDataAdaptor)
-        .use(resErrorProcess);
+        .use(resErrorProcess)
+        .use(setDataField);
 
     return {
         context: {
@@ -181,7 +181,7 @@ export const request = (url, data, options = {}) => {
 
     return currentRequestInstance.request(context).then(async () => {
         if (!context.error) {
-            return context.config.useResonse ? context.response : context.response.data;
+            return context.config.useResonse ? context.response : context.filterData || context.response.data;
         }
         await handleRequestError(context);
         return Promise.reject(context.error);

packages/fes-plugin-request/src/template/setDataField.js

@@ -2,9 +2,9 @@ import { isObject } from './helpers';
 
 // FEATURE: 后续支持 a.b.c
 export default async (ctx, next) => {
-    await next();
     const dataField = ctx.config.dataField ?? ctx.dataField;
-    if (!ctx.error && ctx.response && isObject(ctx.response.data) && dataField) {
+    if (ctx.response && isObject(ctx.response.data) && dataField) {
-        ctx.response.data = ctx.response.data[dataField];
+        ctx.filterData = ctx.response.data[dataField];
     }
+    await next();
 };

packages/fes-plugin-vuex/package.json

@@ -27,11 +27,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@umijs/utils": "3.3.3"
+    "@fesjs/utils": "^2.0.0"
   },
   "peerDependencies": {
     "@fesjs/fes": "^2.0.0",
     "vue": "^3.0.5",
     "vuex": "^4.0.0"
   }
-}
+}

packages/fes-plugin-vuex/src/helper.js

@@ -1,4 +1,4 @@
-import { parser, winPath } from '@umijs/utils';
+import { parser, winPath } from '@fesjs/utils';
 import { readdirSync, readFileSync, statSync } from 'fs';
 import { join } from 'path';
 

packages/fes-plugin-vuex/src/index.js

@@ -1,6 +1,6 @@
 import { readFileSync } from 'fs';
 import { join } from 'path';
-import { winPath } from '@umijs/utils';
+import { winPath } from '@fesjs/utils';
 import { parseStore } from './helper';
 
 const namespace = 'plugin-vuex';

packages/fes-preset-built-in/package.json

@@ -34,7 +34,7 @@
     "@babel/preset-env": "^7.12.13",
     "@fesjs/compiler": "^2.0.0",
     "@soda/friendly-errors-webpack-plugin": "^1.8.0",
-    "@umijs/utils": "3.3.3",
+    "@fesjs/utils": "^2.0.0",
     "@vue/babel-plugin-jsx": "^1.0.2",
     "@vue/compiler-sfc": "^3.0.4",
     "autoprefixer": "^10.2.4",
@@ -72,4 +72,4 @@
     "webpack-dev-server": "^3.11.2",
     "webpackbar": "^5.0.0-3"
   }
-}
+}

packages/fes-preset-built-in/src/plugins/commands/buildDevUtils.js

@@ -5,7 +5,7 @@
 
 import { join, resolve } from 'path';
 import { existsSync, readdirSync, readFileSync } from 'fs';
-import { rimraf, chalk } from '@umijs/utils';
+import { rimraf, chalk } from '@fesjs/utils';
 import zlib from 'zlib';
 import getConfig from './webpackConfig';
 

packages/fes-preset-built-in/src/plugins/commands/dev/index.js

@@ -39,7 +39,7 @@ export default (api) => {
                 cleanTmpPathExceptCache,
                 getBundleAndConfigs
             } = require('../buildDevUtils');
-            const { delay } = require('@umijs/utils');
+            const { delay } = require('@fesjs/utils');
             const createRouteMiddleware = require('./createRouteMiddleware').default;
             const generateFiles = require('../../../utils/generateFiles').default;
             const { watchPkg } = require('./watchPkg');

packages/fes-preset-built-in/src/plugins/commands/dev/watchPkg.js

@@ -4,7 +4,7 @@
  */
 
 import { join } from 'path';
-import { chokidar, winPath, lodash } from '@umijs/utils';
+import { chokidar, winPath, lodash } from '@fesjs/utils';
 import { existsSync, readFileSync } from 'fs';
 import { isPluginOrPreset, PluginType } from '@fesjs/compiler';
 

packages/fes-preset-built-in/src/plugins/commands/webpackConfig/getBabelOpts.js

@@ -1,6 +1,6 @@
 import {
     winPath
-} from '@umijs/utils';
+} from '@fesjs/utils';
 
 function getBabelOpts({
     cwd,

packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js

@@ -2,7 +2,7 @@ import { join, resolve } from 'path';
 import { existsSync } from 'fs';
 import {
     winPath
-} from '@umijs/utils';
+} from '@fesjs/utils';
 import resolveDefine from './resolveDefine';
 
 export default async function createHtmlWebpackConfig({

packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index.js

@@ -186,22 +186,24 @@ export default async function getConfig({
         .loader(require.resolve('babel-loader'))
         .options(babelOpts);
 
-    // 为了避免第三方依赖包编译不充分导致线上问题，默认对 node_modules 也进行全编译
+    // 为了避免第三方依赖包编译不充分导致线上问题，默认对 node_modules 也进行全编译，只在生产构建的时候进行
-    const transpileDepRegex = genTranspileDepRegex(config.nodeModulesTransform.exclude);
+    if (isProd) {
-    webpackConfig.module
+        const transpileDepRegex = genTranspileDepRegex(config.nodeModulesTransform.exclude);
-        .rule('js-in-node_modules')
+        webpackConfig.module
-        .test(/\.(js|mjs)$/)
+            .rule('js-in-node_modules')
-        .include.add(/node_modules/).end()
+            .test(/\.(js|mjs)$/)
-        .exclude.add((filepath) => {
+            .include.add(/node_modules/).end()
-            if (transpileDepRegex && transpileDepRegex.test(filepath)) {
+            .exclude.add((filepath) => {
-                return true;
+                if (transpileDepRegex && transpileDepRegex.test(filepath)) {
-            }
+                    return true;
+                }
 
-            return false;
+                return false;
-        }).end()
+            }).end()
-        .use('babel-loader')
+            .use('babel-loader')
-        .loader(require.resolve('babel-loader'))
+            .loader(require.resolve('babel-loader'))
-        .options(babelOpts);
+            .options(babelOpts);
+    }
 
     // --------------- css -----------
     const createCSSRule = createCssWebpackConfig({

packages/fes-preset-built-in/src/plugins/features/mock.js

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync } from 'fs';
 import { resolve } from 'path';
-import { chokidar, lodash, parseRequireDeps } from '@umijs/utils';
+import { chokidar, lodash, parseRequireDeps } from '@fesjs/utils';
 import bodyParser from 'body-parser';
 import cookieParser from 'cookie-parser';
 import mockjs from 'mockjs';

packages/fes-preset-built-in/src/plugins/generateFiles/core/plugin/index.js

@@ -1,6 +1,6 @@
-import { readFileSync } from 'fs';
+import { readFileSync, existsSync } from 'fs';
 import { join } from 'path';
-import { getFile, winPath } from '@umijs/utils';
+import { winPath } from '@fesjs/utils';
 import { runtimePath } from '../../../../utils/constants';
 
 export default function (api) {
@@ -33,15 +33,12 @@ export default function (api) {
                 'onRouterCreated'
             ]
         });
+        const appPath = winPath(join(paths.absSrcPath, 'app.js'));
         const plugins = await api.applyPlugins({
             key: 'addRuntimePlugin',
             type: api.ApplyPluginsType.add,
             initialValue: [
-                getFile({
+                existsSync(appPath) && appPath
-                    base: paths.absSrcPath,
-                    fileNameWithoutExt: 'app',
-                    type: 'javascript'
-                })?.path
             ].filter(Boolean)
         });
         api.writeTmpFile({

packages/fes-preset-built-in/src/plugins/generateFiles/fes/index.js

@@ -1,6 +1,6 @@
 import { readFileSync } from 'fs';
 import { join } from 'path';
-import { winPath } from '@umijs/utils';
+import { winPath } from '@fesjs/utils';
 import { runtimePath } from '../../../utils/constants';
 
 export function importsToStr(imports) {

packages/fes-preset-built-in/src/plugins/misc/route/index.js

@@ -2,7 +2,7 @@ import { readdirSync, statSync, readFileSync } from 'fs';
 import {
     join, extname, posix, basename
 } from 'path';
-import { lodash } from '@umijs/utils';
+import { lodash } from '@fesjs/utils';
 import { parse } from '@vue/compiler-sfc';
 import { runtimePath } from '../../../utils/constants';
 

packages/fes-preset-built-in/src/utils/constants.js

@@ -1,4 +1,4 @@
-import { winPath } from '@umijs/utils';
+import { winPath } from '@fesjs/utils';
 import { dirname } from 'path';
 
 export const runtimePath = winPath(

packages/fes-preset-built-in/src/utils/generateExports.js

@@ -1,4 +1,4 @@
-import { lodash, winPath } from '@umijs/utils';
+import { lodash, winPath } from '@fesjs/utils';
 import assert from 'assert';
 import path from 'path';
 

packages/fes-preset-built-in/src/utils/generateFiles.js

@@ -1,4 +1,4 @@
-import { chokidar, lodash, winPath } from '@umijs/utils';
+import { chokidar, lodash, winPath } from '@fesjs/utils';
 import { join } from 'path';
 
 export default async ({ api, watch }) => {

packages/fes-runtime/package.json

@@ -2,7 +2,7 @@
   "name": "@fesjs/runtime",
   "version": "2.0.1",
   "description": "@fesjs/runtime",
-  "main": "lib/index.js",
+  "main": "es/index.js",
   "module": "es/index.js",
   "files": [
     "lib",
@@ -32,4 +32,4 @@
   "dependencies": {
     "vue-router": "^4.0.1"
   }
-}
+}

packages/fes-template-h5/package.json

@@ -3,7 +3,6 @@
   "version": "2.0.0",
   "description": "fes 移动端项目模版",
   "scripts": {
-    "build": "fes build",
     "prod": "FES_ENV=prod fes build",
     "dev": "fes dev"
   },
@@ -45,7 +44,6 @@
     "@ttou/postcss-px-to-viewport": "1.1.4"
   },
   "dependencies": {
-    "debounce": "1.2.1",
     "@fesjs/fes": "^2.0.0",
     "@fesjs/plugin-icon": "^2.0.0",
     "@fesjs/plugin-request": "^2.0.0",

packages/fes-template-h5/src/common/service.js

@@ -1,4 +1 @@
-import { request } from '@fesjs/fes';
-import { debounce } from 'debounce';
 
-export const debounceRequest = debounce(request, 300);

packages/fes-template-h5/src/pages/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="onepiece">
-        fes & 拉夫德鲁<br />
+        fes h5 & 拉夫德鲁<br />
         <fes-icon :spin="true" class="one-icon" type="smile" @click="clickIcon" />
     </div>
 </template>
@@ -119,7 +119,7 @@ div {
     .hover();
 }
 .onepiece {
+    text-align: center;
     .hairline("top");
-    background: url('../images/male.png');
 }
 </style>

packages/fes-template/__tests__/add.js

@@ -1,4 +1,4 @@
-import sum from '../src/utils/sum';
+import sum from '@/utils/sum';
 
 test('adds 1 + 2 to equal 3', () => {
     expect(sum(1, 2)).toBe(3);

packages/fes-template/src/models/user.js

@@ -0,0 +1,8 @@
+import { ref } from 'vue';
+
+export default function user() {
+    const count = ref(1);
+    return {
+        count
+    };
+}

packages/fes-utils/index.js

@@ -1,9 +0,0 @@
-
-// TODO fes-utils 完善
-export function main() {
-    console.log('hello world');
-}
-
-export function isHtmlElement(node) {
-    return node && node.nodeType === Node.ELEMENT_NODE;
-}

packages/fes-utils/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@fesjs/utils",
-  "version": "0.0.0",
+  "version": "2.0.0",
-  "description": "@fesjs/fesjsutils",
+  "description": "@fesjs/utils",
-  "main": "index.js",
+  "main": "lib/index.js",
-  "scripts": {
+  "files": [
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "lib"
-  },
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/WeBankFinTech/fes.js.git",
@@ -20,5 +20,26 @@
     "url": "https://github.com/WeBankFinTech/fes.js/issues"
   },
   "homepage": "https://github.com/WeBankFinTech/fes.js#readme",
-  "private": true
+  "publishConfig": {
-}
+    "access": "public"
+  },
+  "dependencies": {
+    "@babel/parser": "^7.15.0",
+    "@babel/traverse": "^7.15.0",
+    "chalk": "^4.1.2",
+    "chokidar": "^3.5.2",
+    "crequire": "^1.8.1",
+    "deepmerge": "^4.2.2",
+    "debug": "^4.3.2",
+    "glob": "^7.1.7",
+    "lodash": "^4.17.21",
+    "mkdirp": "^1.0.4",
+    "mustache": "^4.2.0",
+    "pkg-up": "^3.1.0",
+    "portfinder": "^1.0.28",
+    "resolve": "^1.20.0",
+    "rimraf": "^3.0.2",
+    "semver": "^7.3.5",
+    "yargs-parser": "^20.2.9"
+  }
+}

packages/fes-utils/src/Generator.js

@@ -0,0 +1,60 @@
+import {
+    copyFileSync, readFileSync, statSync, writeFileSync
+} from 'fs';
+import { dirname, relative, join } from 'path';
+import {
+    chalk, mkdirp, Mustache, glob
+} from './index';
+
+
+class Generator {
+  cwd;
+
+  args;
+
+  constructor({ cwd, args }) {
+      this.cwd = cwd;
+      this.args = args;
+  }
+
+  async run() {
+      await this.writing();
+  }
+
+  // eslint-disable-next-line
+  async writing() {}
+
+  copyTpl(opts) {
+      const tpl = readFileSync(opts.templatePath, 'utf-8');
+      const content = Mustache.render(tpl, opts.context);
+      mkdirp.sync(dirname(opts.target));
+      console.log(`${chalk.green('Write:')} ${relative(this.cwd, opts.target)}`);
+      writeFileSync(opts.target, content, 'utf-8');
+  }
+
+  copyDirectory(opts) {
+      const files = glob.sync('**/*', {
+          cwd: opts.path,
+          dot: true,
+          ignore: ['**/node_modules/**']
+      });
+      files.forEach((file) => {
+          const absFile = join(opts.path, file);
+          if (statSync(absFile).isDirectory()) return;
+          if (file.endsWith('.tpl')) {
+              this.copyTpl({
+                  templatePath: absFile,
+                  target: join(opts.target, file.replace(/\.tpl$/, '')),
+                  context: opts.context
+              });
+          } else {
+              console.log(`${chalk.green('Copy: ')} ${file}`);
+              const absTarget = join(opts.target, file);
+              mkdirp.sync(dirname(absTarget));
+              copyFileSync(absFile, absTarget);
+          }
+      });
+  }
+}
+
+export default Generator;

packages/fes-utils/src/cleanRequireCache.js

@@ -0,0 +1,21 @@
+export const isWindows = typeof process !== 'undefined' && process.platform === 'win32';
+
+// 暂时无法使用 jest 进行单元测试，原因可参见
+// https://github.com/facebook/jest/issues/5741
+
+export default function (cacheKey) {
+    // windows 下 require.cache 中路径 key 为类似 ‘c:\demo\.umirc.ts’
+    const cachePath = isWindows ? cacheKey.replace(/\//g, '\\') : cacheKey;
+    if (require.cache[cachePath]) {
+        const cacheParent = (require.cache[cachePath]).parent;
+        let i = cacheParent?.children.length || 0;
+        // 清理 require cache 中 parents 的引用
+        while (i--) {
+            if (cacheParent.children[i].id === cachePath) {
+                cacheParent.children.splice(i, 1);
+            }
+        }
+
+        delete require.cache[cachePath];
+    }
+}

packages/fes-utils/src/compatESModuleRequire.js

@@ -0,0 +1,3 @@
+export default function compatESModuleRequire(m) {
+    return m.__esModule ? m.default : m;
+}

packages/fes-utils/src/delay.js

@@ -0,0 +1 @@
+export default ms => new Promise(resolve => setTimeout(resolve, ms));

packages/fes-utils/src/index.js

@@ -0,0 +1,51 @@
+import chalk from 'chalk';
+import yParser from 'yargs-parser';
+import lodash from 'lodash';
+import * as chokidar from 'chokidar';
+import semver from 'semver';
+import deepmerge from 'deepmerge';
+import glob from 'glob';
+import createDebug from 'debug';
+import * as parser from '@babel/parser';
+import traverse from '@babel/traverse';
+import rimraf from 'rimraf';
+import mkdirp from 'mkdirp';
+import pkgUp from 'pkg-up';
+import portfinder from 'portfinder';
+import resolve from 'resolve';
+import Mustache from 'mustache';
+
+import winPath from './winPath';
+import delay from './delay';
+import compatESModuleRequire from './compatESModuleRequire';
+import cleanRequireCache from './cleanRequireCache';
+import parseRequireDeps from './parseRequireDeps';
+import mergeConfig from './mergeConfig';
+
+export {
+    chalk,
+    yParser,
+    lodash,
+    chokidar,
+    semver,
+    deepmerge,
+    glob,
+    createDebug,
+    mkdirp,
+    Mustache,
+    parser,
+    rimraf,
+    traverse,
+    pkgUp,
+    portfinder,
+    resolve
+};
+
+export {
+    winPath,
+    delay,
+    compatESModuleRequire,
+    cleanRequireCache,
+    parseRequireDeps,
+    mergeConfig
+};

packages/fes-utils/src/mergeConfig.js

@@ -0,0 +1,16 @@
+
+export default function mergeConfig(defaultConfig, ...configs) {
+    const ret = { ...defaultConfig };
+    configs.forEach((config) => {
+        if (!config) return;
+        Object.keys(config).forEach((key) => {
+            const val = config[key];
+            if (typeof val === 'function') {
+                ret[key] = val(ret[key]);
+            } else {
+                ret[key] = val;
+            }
+        });
+    });
+    return ret;
+}

packages/fes-utils/src/parseRequireDeps.js

@@ -0,0 +1,37 @@
+
+// @ts-ignore
+import crequire from 'crequire';
+import lodash from 'lodash';
+import resolve from 'resolve';
+import { readFileSync } from 'fs';
+import { dirname } from 'path';
+import winPath from './winPath';
+
+function parse(filePath) {
+    const content = readFileSync(filePath, 'utf-8');
+    return (crequire(content))
+        .map(o => o.path)
+        .filter(path => path.charAt(0) === '.')
+        .map(path => winPath(
+            resolve.sync(path, {
+                basedir: dirname(filePath),
+                extensions: ['.tsx', '.ts', '.jsx', '.js']
+            })
+        ));
+}
+
+export default function parseRequireDeps(filePath) {
+    const paths = [filePath];
+    const ret = [winPath(filePath)];
+
+    while (paths.length) {
+    // 避免依赖循环
+        const extraPaths = lodash.pullAll(parse(paths.shift()), ret);
+        if (extraPaths.length) {
+            paths.push(...extraPaths);
+            ret.push(...extraPaths);
+        }
+    }
+
+    return ret;
+}

packages/fes-utils/src/winPath.js

@@ -0,0 +1,8 @@
+export default function (path) {
+    const isExtendedLengthPath = /^\\\\\?\\/.test(path);
+    if (isExtendedLengthPath) {
+        return path;
+    }
+
+    return path.replace(/\\/g, '/');
+}

packages/fes/package.json

@@ -41,7 +41,7 @@
         "@fesjs/compiler": "^2.0.0",
         "@fesjs/preset-built-in": "^2.0.1",
         "@fesjs/runtime": "^2.0.1",
-        "@umijs/utils": "3.3.3",
+        "@fesjs/utils": "^2.0.0",
         "resolve-cwd": "^3.0.0"
     },
     "engines": {

packages/fes/src/cli.js

@@ -1,4 +1,4 @@
-import { chalk, yParser, semver } from '@umijs/utils';
+import { chalk, yParser, semver } from '@fesjs/utils';
 import { Service } from './serviceWithBuiltIn';
 import fork from './utils/fork';
 import getCwd from './utils/getCwd';

packages/fes/src/forkedDev.js

@@ -3,7 +3,7 @@
  * https://github.com/umijs/umi/blob/master/packages/umi/src/forkedDev.ts
  */
 
-import { chalk, yParser } from '@umijs/utils';
+import { chalk, yParser } from '@fesjs/utils';
 import { Service } from './serviceWithBuiltIn';
 import getCwd from './utils/getCwd';
 import getPkg from './utils/getPkg';