@umijs/core 4.0.0-rc.1 → 4.0.0-rc.10

package/compiled/dotenv/index.js

@@ -1 +1 @@
-(function(){var e={958:function(e,n,r){const t=r(747);const o=r(622);const s=r(87);function log(e){console.log(`[dotenv][DEBUG] ${e}`)}const i="\n";const c=/^\s*([\w.-]+)\s*=\s*(.*)?\s*$/;const u=/\\n/g;const l=/\r\n|\n|\r/;function parse(e,n){const r=Boolean(n&&n.debug);const t={};e.toString().split(l).forEach((function(e,n){const o=e.match(c);if(o!=null){const e=o[1];let n=o[2]||"";const r=n.length-1;const s=n[0]==='"'&&n[r]==='"';const c=n[0]==="'"&&n[r]==="'";if(c||s){n=n.substring(1,r);if(s){n=n.replace(u,i)}}else{n=n.trim()}t[e]=n}else if(r){log(`did not match key and value when parsing line ${n+1}: ${e}`)}}));return t}function resolveHome(e){return e[0]==="~"?o.join(s.homedir(),e.slice(1)):e}function config(e){let n=o.resolve(process.cwd(),".env");let r="utf8";let s=false;if(e){if(e.path!=null){n=resolveHome(e.path)}if(e.encoding!=null){r=e.encoding}if(e.debug!=null){s=true}}try{const e=parse(t.readFileSync(n,{encoding:r}),{debug:s});Object.keys(e).forEach((function(n){if(!Object.prototype.hasOwnProperty.call(process.env,n)){process.env[n]=e[n]}else if(s){log(`"${n}" is already defined in \`process.env\` and will not be overwritten`)}}));return{parsed:e}}catch(e){return{error:e}}}e.exports.config=config;e.exports.parse=parse},747:function(e){"use strict";e.exports=require("fs")},87:function(e){"use strict";e.exports=require("os")},622:function(e){"use strict";e.exports=require("path")}};var n={};function __nccwpck_require__(r){var t=n[r];if(t!==undefined){return t.exports}var o=n[r]={exports:{}};var s=true;try{e[r](o,o.exports,__nccwpck_require__);s=false}finally{if(s)delete n[r]}return o.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var r=__nccwpck_require__(958);module.exports=r})();
+(function(){var e={875:function(e,r,n){const o=n(147);const t=n(17);const s=n(37);const i=/(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/gm;function parse(e){const r={};let n=e.toString();n=n.replace(/\r\n?/gm,"\n");let o;while((o=i.exec(n))!=null){const e=o[1];let n=o[2]||"";n=n.trim();const t=n[0];n=n.replace(/^(['"`])([\s\S]*)\1$/gm,"$2");if(t==='"'){n=n.replace(/\\n/g,"\n");n=n.replace(/\\r/g,"\r")}r[e]=n}return r}function _log(e){console.log(`[dotenv][DEBUG] ${e}`)}function _resolveHome(e){return e[0]==="~"?t.join(s.homedir(),e.slice(1)):e}function config(e){let r=t.resolve(process.cwd(),".env");let n="utf8";const s=Boolean(e&&e.debug);const i=Boolean(e&&e.override);if(e){if(e.path!=null){r=_resolveHome(e.path)}if(e.encoding!=null){n=e.encoding}}try{const e=c.parse(o.readFileSync(r,{encoding:n}));Object.keys(e).forEach((function(r){if(!Object.prototype.hasOwnProperty.call(process.env,r)){process.env[r]=e[r]}else{if(i===true){process.env[r]=e[r]}if(s){if(i===true){_log(`"${r}" is already defined in \`process.env\` and WAS overwritten`)}else{_log(`"${r}" is already defined in \`process.env\` and was NOT overwritten`)}}}}));return{parsed:e}}catch(e){if(s){_log(`Failed to load ${r} ${e.message}`)}return{error:e}}}const c={config:config,parse:parse};e.exports.config=c.config;e.exports.parse=c.parse;e.exports=c},147:function(e){"use strict";e.exports=require("fs")},37:function(e){"use strict";e.exports=require("os")},17:function(e){"use strict";e.exports=require("path")}};var r={};function __nccwpck_require__(n){var o=r[n];if(o!==undefined){return o.exports}var t=r[n]={exports:{}};var s=true;try{e[n](t,t.exports,__nccwpck_require__);s=false}finally{if(s)delete r[n]}return t.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var n=__nccwpck_require__(875);module.exports=n})();

package/compiled/dotenv/lib/main.d.ts

@@ -0,0 +1,73 @@
+// TypeScript Version: 3.0
+/// <reference types="node" />
+
+export interface DotenvParseOutput {
+  [name: string]: string;
+}
+
+/**
+ * Parses a string or buffer in the .env file format into an object.
+ *
+ * See https://docs.dotenv.org
+ *
+ * @param src - contents to be parsed. example: `'DB_HOST=localhost'`
+ * @param options - additional options. example: `{ debug: true }`
+ * @returns an object with keys and values based on `src`. example: `{ DB_HOST : 'localhost' }`
+ */
+export function parse<T extends DotenvParseOutput = DotenvParseOutput>(
+  src: string | Buffer
+): T;
+
+export interface DotenvConfigOptions {
+  /**
+   * Default: `path.resolve(process.cwd(), '.env')`
+   *
+   * Specify a custom path if your file containing environment variables is located elsewhere.
+   *
+   * example: `require('dotenv').config({ path: '/custom/path/to/.env' })`
+   */
+  path?: string;
+
+  /**
+   * Default: `utf8`
+   *
+   * Specify the encoding of your file containing environment variables.
+   *
+   * example: `require('dotenv').config({ encoding: 'latin1' })`
+   */
+  encoding?: string;
+
+  /**
+   * Default: `false`
+   *
+   * Turn on logging to help debug why certain keys or values are not being set as you expect.
+   *
+   * example: `require('dotenv').config({ debug: process.env.DEBUG })`
+   */
+  debug?: boolean;
+
+  /**
+   * Default: `false`
+   *
+   * Override any environment variables that have already been set on your machine with values from your .env file.
+   *
+   * example: `require('dotenv').config({ override: true })`
+   */
+  override?: boolean;
+}
+
+export interface DotenvConfigOutput {
+  error?: Error;
+  parsed?: DotenvParseOutput;
+}
+
+/**
+ * Loads `.env` file contents into process.env.
+ *
+ * See https://docs.dotenv.org
+ *
+ * @param options - additional options. example: `{ path: './custom/path', encoding: 'latin1', debug: true, override: false }`
+ * @returns an object with a `parsed` key if successful or `error` key if an error occurred. example: { parsed: { KEY: 'value' } }
+ *
+ */
+export function config(options?: DotenvConfigOptions): DotenvConfigOutput;

package/compiled/dotenv/package.json

@@ -1 +1 @@
-{"name":"dotenv","license":"BSD-2-Clause","types":"types/index.d.ts"}
+{"name":"dotenv","license":"BSD-2-Clause","types":"lib/main.d.ts"}

package/compiled/just-diff/index.js

@@ -1 +1 @@
-(function(){var e={784:function(e){e.exports={diff:diff,jsonPatchPathConverter:jsonPatchPathConverter};function diff(e,r,t){if(!e||typeof e!="object"||!r||typeof r!="object"){throw new Error("both arguments must be objects or arrays")}t||(t=function(e){return e});function getDiff(e,r,a,n){var o=Object.keys(e);var c=o.length;var i=Object.keys(r);var f=i.length;var u;for(var p=0;p<c;p++){var s=Array.isArray(e)?Number(o[p]):o[p];if(!(s in r)){u=a.concat(s);n.remove.push({op:"remove",path:t(u)})}}for(var p=0;p<f;p++){var s=Array.isArray(r)?Number(i[p]):i[p];var v=e[s];var _=r[s];if(!(s in e)){u=a.concat(s);var h=r[s];n.add.push({op:"add",path:t(u),value:h})}else if(v!==_){if(Object(v)!==v||Object(_)!==_){u=pushReplace(u,a,s,n,t,r)}else{if(!Object.keys(v).length&&!Object.keys(_).length&&String(v)!=String(_)){u=pushReplace(u,a,s,n,t,r)}else{getDiff(e[s],r[s],a.concat(s),n)}}}}return n.remove.reverse().concat(n.replace).concat(n.add)}return getDiff(e,r,[],{remove:[],replace:[],add:[]})}function pushReplace(e,r,t,a,n,o){e=r.concat(t);a.replace.push({op:"replace",path:n(e),value:o[t]});return e}function jsonPatchPathConverter(e){return[""].concat(e).join("/")}}};var r={};function __nccwpck_require__(t){var a=r[t];if(a!==undefined){return a.exports}var n=r[t]={exports:{}};var o=true;try{e[t](n,n.exports,__nccwpck_require__);o=false}finally{if(o)delete r[t]}return n.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var t=__nccwpck_require__(784);module.exports=t})();
+(function(){var e={277:function(e){e.exports={diff:diff,jsonPatchPathConverter:jsonPatchPathConverter};function diff(e,r,t){if(!e||typeof e!="object"||!r||typeof r!="object"){throw new Error("both arguments must be objects or arrays")}t||(t=function(e){return e});function getDiff(e,r,a,n){var o=Object.keys(e);var c=o.length;var i=Object.keys(r);var f=i.length;var u;for(var p=0;p<c;p++){var s=Array.isArray(e)?Number(o[p]):o[p];if(!(s in r)){u=a.concat(s);n.remove.push({op:"remove",path:t(u)})}}for(var p=0;p<f;p++){var s=Array.isArray(r)?Number(i[p]):i[p];var v=e[s];var _=r[s];if(!(s in e)){u=a.concat(s);var h=r[s];n.add.push({op:"add",path:t(u),value:h})}else if(v!==_){if(Object(v)!==v||Object(_)!==_){u=pushReplace(u,a,s,n,t,r)}else{if(!Object.keys(v).length&&!Object.keys(_).length&&String(v)!=String(_)){u=pushReplace(u,a,s,n,t,r)}else{getDiff(e[s],r[s],a.concat(s),n)}}}}return n.remove.reverse().concat(n.replace).concat(n.add)}return getDiff(e,r,[],{remove:[],replace:[],add:[]})}function pushReplace(e,r,t,a,n,o){e=r.concat(t);a.replace.push({op:"replace",path:n(e),value:o[t]});return e}function jsonPatchPathConverter(e){return[""].concat(e).join("/")}}};var r={};function __nccwpck_require__(t){var a=r[t];if(a!==undefined){return a.exports}var n=r[t]={exports:{}};var o=true;try{e[t](n,n.exports,__nccwpck_require__);o=false}finally{if(o)delete r[t]}return n.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var t=__nccwpck_require__(277);module.exports=t})();

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/route/defineRoutes.js

@@ -7,13 +7,16 @@ function defineRoutes(callback) {
     const parentRoutes = [];
     const defineRoute = (opts) => {
         opts.options = opts.options || {};
+        const parentRoute = parentRoutes.length > 0 ? parentRoutes[parentRoutes.length - 1] : null;
+        const parentId = parentRoute === null || parentRoute === void 0 ? void 0 : parentRoute.id;
+        const parentAbsPath = parentRoute === null || parentRoute === void 0 ? void 0 : parentRoute.absPath;
+        const absPath = [parentAbsPath, opts.path].join('/');
         const route = {
             path: opts.path || '/',
             id: (0, utils_1.createRouteId)(opts.file),
-            parentId: parentRoutes.length > 0
-                ? parentRoutes[parentRoutes.length - 1].id
-                : undefined,
+            parentId,
             file: opts.file,
+            absPath,
         };
         routes[route.id] = route;
         if (opts.children) {

package/dist/route/route.js

@@ -5,7 +5,11 @@
 // programming route
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/route/routesConfig.js

@@ -31,7 +31,17 @@ function transformRoute(opts) {
     (0, assert_1.default)(!opts.route.children, 'children is not allowed in route props, use routes instead.');
     const id = String(opts.memo.id++);
     const _a = opts.route, { routes, component } = _a, routeProps = __rest(_a, ["routes", "component"]);
+    let absPath = opts.route.path;
+    if ((absPath === null || absPath === void 0 ? void 0 : absPath.charAt(0)) !== '/') {
+        const parentAbsPath = opts.parentId
+            ? opts.memo.ret[opts.parentId].absPath.replace(/\/*$/, '/') // to remove '/'s on the tail
+            : '/';
+        absPath = parentAbsPath + absPath;
+    }
     opts.memo.ret[id] = Object.assign(Object.assign(Object.assign(Object.assign({}, routeProps), { path: opts.route.path }), (component ? { file: component } : {})), { parentId: opts.parentId, id });
+    if (absPath) {
+        opts.memo.ret[id].absPath = absPath;
+    }
     if (opts.route.routes) {
         transformRoutes({
             routes: opts.route.routes,

package/dist/service/generatePlugin.js

@@ -25,7 +25,6 @@ umi generate
                 const [type] = args._;
                 const runGenerator = (generator) => __awaiter(this, void 0, void 0, function* () {
                     yield (generator === null || generator === void 0 ? void 0 : generator.fn({
-                        api,
                         args,
                         generateFile: utils_1.generateFile,
                         installDeps: utils_1.installDeps,
@@ -39,7 +38,6 @@ umi generate
                     }
                     if (generator.type === generator_1.GeneratorType.enable) {
                         const enable = yield ((_a = generator.checkEnable) === null || _a === void 0 ? void 0 : _a.call(generator, {
-                            api,
                             args,
                         }));
                         if (!enable) {
@@ -50,9 +48,9 @@ umi generate
                 }
                 else {
                     const getEnableGenerators = (generators) => __awaiter(this, void 0, void 0, function* () {
+                        var _b, _c;
                         const questions = [];
-                        Object.keys(generators).forEach((key) => __awaiter(this, void 0, void 0, function* () {
-                            var _b, _c;
+                        for (const key of Object.keys(generators)) {
                             if (generators[key].type === generator_1.GeneratorType.generate) {
                                 questions.push({
                                     title: `${generators[key].name} -- ${generators[key].description}` ||
@@ -62,7 +60,6 @@ umi generate
                             }
                             else {
                                 const enable = yield ((_c = (_b = generators[key]) === null || _b === void 0 ? void 0 : _b.checkEnable) === null || _c === void 0 ? void 0 : _c.call(_b, {
-                                    api,
                                     args,
                                 }));
                                 if (enable) {
@@ -73,7 +70,7 @@ umi generate
                                     });
                                 }
                             }
-                        }));
+                        }
                         return questions;
                     });
                     const questions = yield getEnableGenerators(api.service.generators);

package/dist/service/generator.d.ts

@@ -1,7 +1,5 @@
-import { prompts } from '@umijs/utils';
+import { generateFile } from '@umijs/utils';
 import { Plugin } from './plugin';
-import { PluginAPI } from './pluginAPI';
-import { IServicePluginAPI } from './service';
 export declare enum GeneratorType {
     generate = "generate",
     enable = "enable"
@@ -14,21 +12,12 @@ export interface IGeneratorOpts {
     checkEnable?: {
         (opts: {
             args: any;
-            api: PluginAPI & IServicePluginAPI;
         }): boolean;
     };
     fn: {
         (opts: {
             args: any;
-            api: PluginAPI & IServicePluginAPI;
-            generateFile: {
-                (opts: {
-                    path: string;
-                    target: string;
-                    data?: any;
-                    questions?: prompts.PromptObject[];
-                }): void;
-            };
+            generateFile: typeof generateFile;
             updatePackageJSON: {
                 (opts: {
                     opts: object;

package/dist/service/path.d.ts

@@ -7,6 +7,7 @@ export declare function getPaths(opts: {
     cwd: string;
     absSrcPath: string;
     absPagesPath: string;
+    absApiRoutesPath: string;
     absTmpPath: string;
     absNodeModulesPath: string;
     absOutputPath: string;

package/dist/service/path.js

@@ -13,6 +13,7 @@ function getPaths(opts) {
     const src = winJoin(cwd, 'src');
     const absSrcPath = (0, fs_1.existsSync)(src) && (0, fs_1.statSync)(src).isDirectory() ? src : cwd;
     const absPagesPath = winJoin(absSrcPath, 'pages');
+    const absApiRoutesPath = winJoin(absSrcPath, 'api');
     const tmp = opts.env === types_1.Env.development
         ? `.${opts.prefix}`
         : `.${opts.prefix}-${opts.env}`;
@@ -23,6 +24,7 @@ function getPaths(opts) {
         cwd,
         absSrcPath,
         absPagesPath,
+        absApiRoutesPath,
         absTmpPath,
         absNodeModulesPath,
         absOutputPath,

package/dist/service/plugin.d.ts

@@ -20,6 +20,10 @@ export declare class Plugin {
     key: string;
     apply: Function;
     config: IPluginConfig;
+    time: {
+        register?: number;
+        hooks: Record<string, number[]>;
+    };
     enableBy: EnableBy | ((opts: {
         userConfig: any;
         config: any;

package/dist/service/plugin.js

@@ -17,6 +17,7 @@ const RE = {
 class Plugin {
     constructor(opts) {
         this.config = {};
+        this.time = { hooks: {} };
         this.enableBy = types_1.EnableBy.register;
         this.type = opts.type;
         this.path = (0, utils_1.winPath)(opts.path);
@@ -25,7 +26,7 @@ class Plugin {
         let pkg = null;
         // path is the package entry
         let isPkgEntry = false;
-        const pkgJSONPath = utils_1.pkgUp.sync({ cwd: this.path });
+        const pkgJSONPath = utils_1.pkgUp.pkgUpSync({ cwd: this.path });
         if (pkgJSONPath) {
             pkg = require(pkgJSONPath);
             isPkgEntry =
@@ -37,6 +38,7 @@ class Plugin {
         this.apply = () => {
             utils_1.register.register({
                 implementor: esbuild_1.default,
+                exts: ['.ts', '.mjs'],
             });
             utils_1.register.clearFiles();
             let ret;
@@ -46,10 +48,9 @@ class Plugin {
             catch (e) {
                 throw new Error(`Register ${this.type} ${this.path} failed, since ${e.message}`);
             }
-            for (const file of utils_1.register.getFiles()) {
-                delete require.cache[file];
+            finally {
+                utils_1.register.restore();
             }
-            utils_1.register.restore();
             // use the default member for es modules
             return ret.__esModule ? ret.default : ret;
         };

package/dist/service/pluginAPI.d.ts

@@ -33,7 +33,7 @@ export declare class PluginAPI {
     }): void;
     registerPresets(source: Plugin[], presets: any[]): void;
     registerPlugins(source: Plugin[], plugins: any[]): void;
-    skipPlugins(ids: string[]): void;
+    skipPlugins(keys: string[]): void;
     static proxyPluginAPI(opts: {
         pluginAPI: PluginAPI;
         service: Service;

package/dist/service/pluginAPI.js

@@ -36,6 +36,11 @@ class PluginAPI {
         }, {});
     }
     describe(opts) {
+        var _a;
+        // default 值 + 配置开启冲突，会导致就算用户没有配 key，插件也会生效
+        if (opts.enableBy === types_1.EnableBy.config && ((_a = opts.config) === null || _a === void 0 ? void 0 : _a.default)) {
+            throw new Error(`[plugin: ${this.plugin.id}] The config.default is not allowed when enableBy is EnableBy.config.`);
+        }
         this.plugin.merge(opts);
     }
     registerCommand(opts) {
@@ -63,6 +68,7 @@ class PluginAPI {
     }
     register(opts) {
         var _a, _b;
+        (0, assert_1.default)(this.service.stage <= types_1.ServiceStage.initPlugins, 'api.register() should not be called after plugin register stage.');
         (_a = this.service.hooks)[_b = opts.key] || (_a[_b] = []);
         this.service.hooks[opts.key].push(new hook_1.Hook(Object.assign(Object.assign({}, opts), { plugin: this.plugin })));
     }
@@ -85,7 +91,7 @@ class PluginAPI {
             return new plugin_1.Plugin({
                 path: preset,
                 cwd: this.service.cwd,
-                type: types_1.PluginType.plugin,
+                type: types_1.PluginType.preset,
             });
         }));
     }
@@ -99,6 +105,7 @@ class PluginAPI {
                 plugin.enableBy = plugin.enableBy || types_1.EnableBy.register;
                 plugin.apply = plugin.apply || (() => () => { });
                 plugin.config = plugin.config || {};
+                plugin.time = { hooks: {} };
                 return plugin;
             }
             else {
@@ -116,9 +123,11 @@ class PluginAPI {
             source.splice(0, 0, ...mappedPlugins);
         }
     }
-    skipPlugins(ids) {
-        ids.forEach((id) => {
-            this.service.skipPluginIds.add(id);
+    skipPlugins(keys) {
+        keys.forEach((key) => {
+            (0, assert_1.default)(!(this.plugin.key === key), `plugin ${key} can't skip itself!`);
+            (0, assert_1.default)(this.service.keyToPluginMap[key], `key: ${key} is not be registered by any plugin. You can't skip it!`);
+            this.service.skipPluginIds.add(this.service.keyToPluginMap[key].id);
         });
     }
     static proxyPluginAPI(opts) {

package/dist/service/service.d.ts

@@ -20,6 +20,7 @@ export declare class Service {
             version: string;
             matches: string[];
             subpaths: string[];
+            external?: boolean;
         }>;
         [key: string]: any;
     };
@@ -38,6 +39,7 @@ export declare class Service {
         cwd?: string;
         absSrcPath?: string;
         absPagesPath?: string;
+        absApiRoutesPath?: string;
         absTmpPath?: string;
         absNodeModulesPath?: string;
         absOutputPath?: string;
@@ -71,6 +73,7 @@ export declare class Service {
         name: string;
         args?: any;
     }): Promise<void>;
+    _baconPlugins(): void;
     initPreset(opts: {
         preset: Plugin;
         presets: Plugin[];
@@ -109,6 +112,7 @@ export interface IServicePluginAPI {
     ConfigChangeType: typeof ConfigChangeType;
     EnableBy: typeof EnableBy;
     ServiceStage: typeof ServiceStage;
+    registerPresets: (presets: any[]) => void;
     registerPlugins: (plugins: (Plugin | {})[]) => void;
 }
 export {};

package/dist/service/service.js

@@ -25,7 +25,6 @@ const env_1 = require("./env");
 const path_2 = require("./path");
 const plugin_1 = require("./plugin");
 const pluginAPI_1 = require("./pluginAPI");
-const utils_2 = require("./utils");
 class Service {
     constructor(opts) {
         this.appData = {};
@@ -81,11 +80,15 @@ class Service {
                         if (!this.isPluginEnable(hook))
                             continue;
                         tAdd.tapPromise({
-                            name: hook.plugin.id,
+                            name: hook.plugin.key,
                             stage: hook.stage,
                             before: hook.before,
                         }, (memo) => __awaiter(this, void 0, void 0, function* () {
+                            var _a, _b;
+                            const dateStart = new Date();
                             const items = yield hook.fn(opts.args);
+                            (_a = hook.plugin.time.hooks)[_b = opts.key] || (_a[_b] = []);
+                            hook.plugin.time.hooks[opts.key].push(new Date().getTime() - dateStart.getTime());
                             return memo.concat(items);
                         }));
                     }
@@ -96,11 +99,16 @@ class Service {
                         if (!this.isPluginEnable(hook))
                             continue;
                         tModify.tapPromise({
-                            name: hook.plugin.id,
+                            name: hook.plugin.key,
                             stage: hook.stage,
                             before: hook.before,
                         }, (memo) => __awaiter(this, void 0, void 0, function* () {
-                            return yield hook.fn(memo, opts.args);
+                            var _c, _d;
+                            const dateStart = new Date();
+                            const ret = yield hook.fn(memo, opts.args);
+                            (_c = hook.plugin.time.hooks)[_d = opts.key] || (_c[_d] = []);
+                            hook.plugin.time.hooks[opts.key].push(new Date().getTime() - dateStart.getTime());
+                            return ret;
                         }));
                     }
                     return (yield tModify.promise(opts.initialValue));
@@ -110,11 +118,15 @@ class Service {
                         if (!this.isPluginEnable(hook))
                             continue;
                         tEvent.tapPromise({
-                            name: hook.plugin.id,
+                            name: hook.plugin.key,
                             stage: hook.stage || 0,
                             before: hook.before,
                         }, () => __awaiter(this, void 0, void 0, function* () {
+                            var _f, _g;
+                            const dateStart = new Date();
                             yield hook.fn(opts.args);
+                            (_f = hook.plugin.time.hooks)[_g = opts.key] || (_f[_g] = []);
+                            hook.plugin.time.hooks[opts.key].push(new Date().getTime() - dateStart.getTime());
                         }));
                     }
                     return (yield tEvent.promise(1));
@@ -153,12 +165,14 @@ class Service {
                 }
             }
             this.pkg = pkg;
-            this.pkgPath = pkgPath;
+            this.pkgPath = pkgPath || (0, path_1.join)(this.cwd, 'package.json');
+            const prefix = this.opts.frameworkName || constants_1.DEFAULT_FRAMEWORK_NAME;
             // get user config
             const configManager = new config_1.Config({
                 cwd: this.cwd,
                 env: this.env,
                 defaultConfigFiles: this.opts.defaultConfigFiles,
+                specifiedEnv: process.env[`${prefix}_ENV`.toUpperCase()],
             });
             this.configManager = configManager;
             this.userConfig = configManager.getUserConfig().config;
@@ -170,7 +184,7 @@ class Service {
                 plugins: [require.resolve('./generatePlugin')].concat(this.opts.plugins || []),
                 presets: [require.resolve('./servicePlugin')].concat(this.opts.presets || []),
                 userConfig: this.userConfig,
-                prefix: this.opts.frameworkName || constants_1.DEFAULT_FRAMEWORK_NAME,
+                prefix,
             });
             // register presets and plugins
             this.stage = types_1.ServiceStage.initPresets;
@@ -187,10 +201,6 @@ class Service {
             while (plugins.length) {
                 yield this.initPlugin({ plugin: plugins.shift(), plugins });
             }
-            // keyToPluginMap
-            for (const id of Object.keys(this.plugins)) {
-                this.keyToPluginMap[this.plugins[id].key] = this.plugins[id];
-            }
             // collect configSchemas and configDefaults
             for (const id of Object.keys(this.plugins)) {
                 const { config, key } = this.plugins[id];
@@ -207,9 +217,6 @@ class Service {
                 env: this.env,
                 prefix: this.opts.frameworkName || constants_1.DEFAULT_FRAMEWORK_NAME,
             });
-            if (this.config.outputPath) {
-                paths.absOutputPath = (0, path_1.join)(this.cwd, this.config.outputPath);
-            }
             this.stage = types_1.ServiceStage.resolveConfig;
             const config = yield this.applyPlugins({
                 key: 'modifyConfig',
@@ -226,6 +233,9 @@ class Service {
                 initialValue: this.configDefaults,
             });
             this.config = utils_1.lodash.merge(defaultConfig, config);
+            if (this.config.outputPath) {
+                paths.absOutputPath = (0, path_1.join)(this.cwd, this.config.outputPath);
+            }
             this.paths = yield this.applyPlugins({
                 key: 'modifyPaths',
                 initialValue: paths,
@@ -276,9 +286,21 @@ class Service {
             this.stage = types_1.ServiceStage.runCommand;
             const command = this.commands[name];
             (0, assert_1.default)(command, `Invalid command ${name}, it's not registered.`);
-            return command.fn({ args });
+            let ret = yield command.fn({ args });
+            this._baconPlugins();
+            return ret;
         });
     }
+    _baconPlugins() {
+        // TODO: prettier
+        if (this.args.baconPlugins) {
+            console.log();
+            for (const id of Object.keys(this.plugins)) {
+                const plugin = this.plugins[id];
+                console.log(utils_1.chalk.green('plugin'), plugin.id, plugin.time);
+            }
+        }
+    }
     initPreset(opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const { presets, plugins } = yield this.initPlugin({
@@ -291,7 +313,7 @@ class Service {
         });
     }
     initPlugin(opts) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             // register to this.plugins
             (0, assert_1.default)(!this.plugins[opts.plugin.id], `${opts.plugin.type} ${opts.plugin.id} is already registered by ${(_a = this.plugins[opts.plugin.id]) === null || _a === void 0 ? void 0 : _a.path}, ${opts.plugin.type} from ${opts.plugin.path} register failed.`);
@@ -328,13 +350,15 @@ class Service {
                     service: this,
                 },
             });
-            let ret = opts.plugin.apply()(proxyPluginAPI);
-            if ((0, utils_2.isPromise)(ret)) {
-                ret = yield ret;
-            }
+            let dateStart = new Date();
+            let ret = yield opts.plugin.apply()(proxyPluginAPI);
+            opts.plugin.time.register = new Date().getTime() - dateStart.getTime();
             if (opts.plugin.type === 'plugin') {
                 (0, assert_1.default)(!ret, `plugin should return nothing`);
             }
+            // key should be unique
+            (0, assert_1.default)(!this.keyToPluginMap[opts.plugin.key], `key ${opts.plugin.key} is already registered by ${(_b = this.keyToPluginMap[opts.plugin.key]) === null || _b === void 0 ? void 0 : _b.path}, ${opts.plugin.type} from ${opts.plugin.path} register failed.`);
+            this.keyToPluginMap[opts.plugin.key] = opts.plugin;
             if (ret === null || ret === void 0 ? void 0 : ret.presets) {
                 ret.presets = ret.presets.map((preset) => new plugin_1.Plugin({
                     path: preset,
@@ -369,7 +393,15 @@ class Service {
             return false;
         if (enableBy === types_1.EnableBy.config) {
             // TODO: 提供单独的命令用于启用插件
-            return key in this.userConfig;
+            // this.userConfig 中如果存在，启用
+            // this.config 好了之后如果存在，启用
+            // this.config 在 modifyConfig 和 modifyDefaultConfig 之后才会 ready
+            // 这意味着 modifyConfig 和 modifyDefaultConfig 只能判断 api.userConfig
+            // 举个具体场景:
+            //   - p1 enableBy config, p2 modifyDefaultConfig p1 = {}
+            //   - p1 里 modifyConfig 和 modifyDefaultConfig 仅 userConfig 里有 p1 有效，其他 p2 开启时即有效
+            //   - p2 里因为用了 modifyDefaultConfig，如果 p2 是 enableBy config，需要 userConfig 里配 p2，p2 和 p1 才有效
+            return key in this.userConfig || (this.config && key in this.config);
         }
         if (typeof enableBy === 'function')
             return enableBy({

package/dist/types.d.ts

@@ -41,6 +41,7 @@ export declare enum EnableBy {
 }
 export interface IRoute {
     path: string;
+    absPath: string;
     file: string;
     id: string;
     parentId?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.0.0-rc.1",
+  "version": "4.0.0-rc.10",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/core#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
   "repository": {
@@ -17,17 +17,18 @@
   "scripts": {
     "build": "pnpm tsc",
     "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
-    "dev": "pnpm build -- --watch"
+    "dev": "pnpm build -- --watch",
+    "test": "jest -c ../../jest.turbo.config.ts"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-rc.1",
-    "@umijs/utils": "4.0.0-rc.1"
+    "@umijs/bundler-utils": "4.0.0-rc.10",
+    "@umijs/utils": "4.0.0-rc.10"
   },
   "devDependencies": {
     "@hapi/joi": "17.1.1",
-    "@types/hapi__joi": "17.1.7",
-    "dotenv": "10.0.0",
-    "just-diff": "3.1.1",
+    "@types/hapi__joi": "17.1.8",
+    "dotenv": "16.0.0",
+    "just-diff": "5.0.1",
     "tapable": "2.2.1"
   },
   "publishConfig": {