@umijs/core 4.0.0-beta.7 → 4.0.0-rc.2

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/config/config.js

@@ -114,7 +114,6 @@ class Config {
         let config = {};
         let files = [];
         for (const configFile of opts.configFiles) {
-            files.push(configFile);
             if ((0, fs_1.existsSync)(configFile)) {
                 utils_1.register.register({
                     implementor: esbuild_1.default,
@@ -124,7 +123,12 @@ class Config {
                 for (const file of utils_1.register.getFiles()) {
                     delete require.cache[file];
                 }
+                // includes the config File
                 files.push(...utils_1.register.getFiles());
+                utils_1.register.restore();
+            }
+            else {
+                files.push(configFile);
             }
         }
         return {

package/dist/route/route.d.ts

@@ -1,2 +1,3 @@
+export * from './routesConfig';
 export * from './routesConvention';
 export * from './routeUtils';

package/dist/route/route.js

@@ -14,5 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./routesConfig"), exports);
 __exportStar(require("./routesConvention"), exports);
 __exportStar(require("./routeUtils"), exports);

package/dist/route/routeUtils.d.ts

@@ -4,4 +4,5 @@ export declare function addParentRoute(opts: {
     addToAll?: boolean;
     target: IRoute;
     routes: Record<string, IRoute>;
+    test?: Function;
 }): void;

package/dist/route/routeUtils.js

@@ -4,13 +4,16 @@ exports.addParentRoute = void 0;
 function addParentRoute(opts) {
     if (opts.addToAll) {
         for (const id of Object.keys(opts.routes)) {
-            if (opts.routes[id].parentId === undefined) {
+            if (opts.routes[id].parentId === undefined &&
+                (!opts.test || opts.test(opts.routes[id]))) {
                 opts.routes[id].parentId = opts.target.id;
             }
         }
     }
     else if (opts.id) {
-        opts.routes[opts.id].parentId = opts.target.id;
+        if (!opts.test || opts.test(opts.routes[opts.id])) {
+            opts.routes[opts.id].parentId = opts.target.id;
+        }
     }
     else {
         throw new Error(`addParentRoute failed, opts.addToAll or opts.id must be supplied.`);

package/dist/route/routesConfig.d.ts

@@ -0,0 +1,5 @@
+interface IOpts {
+    routes: any[];
+}
+export declare function getConfigRoutes(opts: IOpts): any[];
+export {};

package/dist/route/routesConfig.js

@@ -1 +1,42 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConfigRoutes = void 0;
+const assert_1 = __importDefault(require("assert"));
+function getConfigRoutes(opts) {
+    const memo = { ret: {}, id: 1 };
+    transformRoutes({ routes: opts.routes, parentId: undefined, memo });
+    return memo.ret;
+}
+exports.getConfigRoutes = getConfigRoutes;
+function transformRoutes(opts) {
+    opts.routes.forEach((route) => {
+        transformRoute({ route, parentId: opts.parentId, memo: opts.memo });
+    });
+}
+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"]);
+    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 (opts.route.routes) {
+        transformRoutes({
+            routes: opts.route.routes,
+            parentId: id,
+            memo: opts.memo,
+        });
+    }
+}

package/dist/route/routesConvention.d.ts

@@ -1,3 +1,5 @@
 export declare function getConventionRoutes(opts: {
     base: string;
+    prefix?: string;
+    exclude?: RegExp[];
 }): any;

package/dist/route/routesConvention.js

@@ -1,11 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConventionRoutes = void 0;
 const utils_1 = require("@umijs/utils");
-const assert_1 = __importDefault(require("assert"));
 const fs_1 = require("fs");
 const path_1 = require("path");
 const defineRoutes_1 = require("./defineRoutes");
@@ -13,17 +9,16 @@ const utils_2 = require("./utils");
 // opts.base: path of pages
 function getConventionRoutes(opts) {
     const files = {};
-    (0, assert_1.default)((0, fs_1.existsSync)(opts.base) && (0, fs_1.statSync)(opts.base).isDirectory(), `Convention routes base not found.`);
+    if (!((0, fs_1.existsSync)(opts.base) && (0, fs_1.statSync)(opts.base).isDirectory())) {
+        return {};
+    }
     visitFiles({
         dir: opts.base,
         visitor: (file) => {
             const routeId = (0, utils_2.createRouteId)(file);
-            if ((0, utils_2.isRouteModuleFile)({ file })) {
+            if ((0, utils_2.isRouteModuleFile)({ file: (0, utils_1.winPath)(file), exclude: opts.exclude })) {
                 files[routeId] = (0, utils_1.winPath)(file);
             }
-            else {
-                throw new Error(`Invalid route module file: ${(0, path_1.join)(opts.base, file)}`);
-            }
         },
     });
     const routeIds = Object.keys(files).sort(utils_2.byLongestFirst);
@@ -33,7 +28,7 @@ function getConventionRoutes(opts) {
             let routePath = createRoutePath(parentId ? routeId.slice(parentId.length + 1) : routeId);
             defineRoute({
                 path: routePath,
-                file: files[routeId],
+                file: `${opts.prefix || ''}${files[routeId]}`,
                 children() {
                     defineNestedRoutes(defineRoute, routeId);
                 },
@@ -52,13 +47,13 @@ function visitFiles(opts) {
             visitFiles(Object.assign(Object.assign({}, opts), { dir: file }));
         }
         else if (stat.isFile() &&
-            ['.tsx', '.ts', '.js', '.jsx'].includes((0, path_1.extname)(file))) {
+            ['.tsx', '.ts', '.js', '.jsx', '.md', '.mdx'].includes((0, path_1.extname)(file))) {
             opts.visitor((0, path_1.relative)(opts.baseDir, file));
         }
     }
 }
 function createRoutePath(routeId) {
-    const path = routeId
+    let path = routeId
         // routes/$ -> routes/*
         // routes/nested/$.tsx (with a "routes/nested.tsx" layout)
         .replace(/^\$$/, '*')
@@ -69,5 +64,7 @@ function createRoutePath(routeId) {
         .replace(/\$/g, ':')
         // routes/not.nested -> routes/not/nested
         .replace(/\./g, '/');
-    return /\b\/?index$/.test(path) ? path.replace(/\/?index$/, '') : path;
+    path = /\b\/?index$/.test(path) ? path.replace(/\/?index$/, '') : path;
+    path = /\b\/?README$/.test(path) ? path.replace(/\/?README$/, '') : path;
+    return path;
 }

package/dist/route/utils.d.ts

@@ -4,4 +4,5 @@ export declare function byLongestFirst(a: string, b: string): number;
 export declare function findParentRouteId(routeIds: string[], childRouteId: string): string | undefined;
 export declare function isRouteModuleFile(opts: {
     file: string;
+    exclude?: RegExp[];
 }): boolean;

package/dist/route/utils.js

@@ -21,6 +21,14 @@ function findParentRouteId(routeIds, childRouteId) {
 exports.findParentRouteId = findParentRouteId;
 const routeModuleExts = ['.js', '.jsx', '.ts', '.tsx', '.md', '.mdx'];
 function isRouteModuleFile(opts) {
+    // TODO: add cache strategy
+    for (const excludeRegExp of opts.exclude || []) {
+        if (opts.file &&
+            excludeRegExp instanceof RegExp &&
+            excludeRegExp.test(opts.file)) {
+            return false;
+        }
+    }
     return routeModuleExts.includes((0, path_1.extname)(opts.file));
 }
 exports.isRouteModuleFile = isRouteModuleFile;

package/dist/service/generatePlugin.js

@@ -23,15 +23,15 @@ umi generate
             var _a;
             return __awaiter(this, void 0, void 0, function* () {
                 const [type] = args._;
-                const runGenerator = (generator) => {
-                    generator === null || generator === void 0 ? void 0 : generator.fn({
+                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,
                         updatePackageJSON: utils_1.updatePackageJSON,
-                    });
-                };
+                    }));
+                });
                 if (type) {
                     const generator = api.service.generators[type];
                     if (!generator) {
@@ -46,7 +46,7 @@ umi generate
                             throw new Error(`Generator ${type} is unable.The corresponding function has been turned on or is not available.`);
                         }
                     }
-                    runGenerator(generator);
+                    yield runGenerator(generator);
                 }
                 else {
                     const getEnableGenerators = (generators) => __awaiter(this, void 0, void 0, function* () {
@@ -83,7 +83,7 @@ umi generate
                         message: 'Pick generator type',
                         choices: questions,
                     });
-                    runGenerator(api.service.generators[gType]);
+                    yield runGenerator(api.service.generators[gType]);
                 }
             });
         },

package/dist/service/plugin.d.ts

@@ -1,4 +1,4 @@
-import { EnableBy, IPluginConfig } from '../types';
+import { EnableBy, Env, IPluginConfig } from '../types';
 declare type PluginType = 'plugin' | 'preset';
 interface IOpts {
     path: string;
@@ -20,12 +20,16 @@ export declare class Plugin {
     key: string;
     apply: Function;
     config: IPluginConfig;
-    enableBy: EnableBy | (() => boolean);
+    enableBy: EnableBy | ((opts: {
+        userConfig: any;
+        config: any;
+        env: Env;
+    }) => boolean);
     constructor(opts: IOpts);
     merge(opts: {
         key?: string;
         config?: IPluginConfig;
-        enableBy?: EnableBy | (() => boolean);
+        enableBy?: any;
     }): void;
     getId(opts: {
         pkg: any;

package/dist/service/plugin.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Plugin = void 0;
+const esbuild_1 = __importDefault(require("@umijs/bundler-utils/compiled/esbuild"));
 const utils_1 = require("@umijs/utils");
 const assert_1 = __importDefault(require("assert"));
 const fs_1 = require("fs");
@@ -24,7 +25,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 =
@@ -34,14 +35,23 @@ class Plugin {
         this.id = this.getId({ pkg, isPkgEntry, pkgJSONPath });
         this.key = this.getKey({ pkg, isPkgEntry });
         this.apply = () => {
+            utils_1.register.register({
+                implementor: esbuild_1.default,
+            });
+            utils_1.register.clearFiles();
+            let ret;
             try {
-                const ret = require(this.path);
-                // use the default member for es modules
-                return ret.__esModule ? ret.default : ret;
+                ret = require(this.path);
             }
             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];
+            }
+            utils_1.register.restore();
+            // use the default member for es modules
+            return ret.__esModule ? ret.default : ret;
         };
     }
     merge(opts) {
@@ -104,9 +114,9 @@ class Plugin {
                     .split(',')
                     .filter(Boolean),
                 // dependencies
-                ...Object.keys(opts.pkg.devDependencies || {})
-                    .concat(Object.keys(opts.pkg.dependencies || {}))
-                    .filter(Plugin.isPluginOrPreset.bind(null, type)),
+                // ...Object.keys(opts.pkg.devDependencies || {})
+                //   .concat(Object.keys(opts.pkg.dependencies || {}))
+                //   .filter(Plugin.isPluginOrPreset.bind(null, type)),
                 // user config
                 ...(opts.userConfig[types] || []),
             ].map((path) => {

package/dist/service/pluginAPI.d.ts

@@ -1,12 +1,15 @@
-import { EnableBy, IPluginConfig } from '../types';
+import { logger } from '@umijs/utils';
+import { EnableBy, Env, IPluginConfig } from '../types';
 import { IOpts as ICommandOpts } from './command';
 import { IGeneratorOpts } from './generator';
 import { IOpts as IHookOpts } from './hook';
 import { Plugin } from './plugin';
 import { Service } from './service';
+declare type Logger = typeof logger;
 export declare class PluginAPI {
     service: Service;
     plugin: Plugin;
+    logger: Logger;
     constructor(opts: {
         service: Service;
         plugin: Plugin;
@@ -14,7 +17,10 @@ export declare class PluginAPI {
     describe(opts: {
         key?: string;
         config?: IPluginConfig;
-        enableBy?: EnableBy | (() => boolean);
+        enableBy?: EnableBy | ((enableByOpts: {
+            userConfig: any;
+            env: Env;
+        }) => boolean);
     }): void;
     registerCommand(opts: Omit<ICommandOpts, 'plugin'> & {
         alias?: string | string[];
@@ -35,3 +41,4 @@ export declare class PluginAPI {
         staticProps: Record<string, any>;
     }): PluginAPI;
 }
+export {};

package/dist/service/pluginAPI.js

@@ -16,8 +16,24 @@ class PluginAPI {
     constructor(opts) {
         this.service = opts.service;
         this.plugin = opts.plugin;
-        // TODO
         // logger
+        const loggerKeys = [
+            'wait',
+            'error',
+            'warn',
+            'ready',
+            'info',
+            'event',
+        ];
+        // @ts-ignore
+        this.logger = loggerKeys.reduce((memo, key) => {
+            // @ts-ignore
+            memo[key] = (...message) => {
+                // @ts-ignore
+                utils_1.logger[key](utils_1.chalk.green(`[plugin: ${this.plugin.id}]`), ...message);
+            };
+            return memo;
+        }, {});
     }
     describe(opts) {
         this.plugin.merge(opts);
@@ -55,9 +71,12 @@ class PluginAPI {
         this.service.pluginMethods[opts.name] = {
             plugin: this.plugin,
             fn: opts.fn ||
-                ((fn) => {
+                // 这里不能用 arrow function，this 需指向执行此方法的 PluginAPI
+                // 否则 pluginId 会不会，导致不能正确 skip plugin
+                function (fn) {
+                    // @ts-ignore
                     this.register(Object.assign({ key: opts.name }, (utils_1.lodash.isPlainObject(fn) ? fn : { fn })));
-                }),
+                },
         };
     }
     registerPresets(source, presets) {

package/dist/service/service.d.ts

@@ -15,7 +15,15 @@ interface IOpts {
 }
 export declare class Service {
     private opts;
-    appData: Record<string, any>;
+    appData: {
+        deps?: Record<string, {
+            version: string;
+            matches: string[];
+            subpaths: string[];
+            external?: boolean;
+        }>;
+        [key: string]: any;
+    };
     args: yParser.Arguments;
     commands: Record<string, Command>;
     generators: Record<string, Generator>;
@@ -36,6 +44,7 @@ export declare class Service {
         absOutputPath?: string;
     };
     plugins: Record<string, Plugin>;
+    keyToPluginMap: Record<string, Plugin>;
     pluginMethods: Record<string, {
         plugin: Plugin;
         fn: Function;
@@ -44,7 +53,14 @@ export declare class Service {
     stage: ServiceStage;
     userConfig: Record<string, any>;
     configManager: Config | null;
-    pkg: Record<string, string | Record<string, any>>;
+    pkg: {
+        name?: string;
+        version?: string;
+        dependencies?: Record<string, string>;
+        devDependencies?: Record<string, string>;
+        [key: string]: any;
+    };
+    pkgPath: string;
     constructor(opts: IOpts);
     applyPlugins<T>(opts: {
         key: string;
@@ -66,7 +82,7 @@ export declare class Service {
         presets?: Plugin[];
         plugins: Plugin[];
     }): Promise<any>;
-    isPluginEnable(hook: Hook): boolean;
+    isPluginEnable(hook: Hook | string): boolean;
 }
 export interface IServicePluginAPI {
     appData: typeof Service.prototype.appData;
@@ -76,13 +92,18 @@ export interface IServicePluginAPI {
     cwd: typeof Service.prototype.cwd;
     generators: typeof Service.prototype.generators;
     pkg: typeof Service.prototype.pkg;
+    pkgPath: typeof Service.prototype.pkgPath;
     name: typeof Service.prototype.name;
     paths: Required<typeof Service.prototype.paths>;
     userConfig: typeof Service.prototype.userConfig;
+    env: typeof Service.prototype.env;
+    isPluginEnable: typeof Service.prototype.isPluginEnable;
     onCheck: IEvent<null>;
     onStart: IEvent<null>;
     modifyAppData: IModify<typeof Service.prototype.appData, null>;
-    modifyConfig: IModify<typeof Service.prototype.config, null>;
+    modifyConfig: IModify<typeof Service.prototype.config, {
+        paths: Record<string, string>;
+    }>;
     modifyDefaultConfig: IModify<typeof Service.prototype.config, null>;
     modifyPaths: IModify<typeof Service.prototype.paths, null>;
     ApplyPluginsType: typeof ApplyPluginsType;

package/dist/service/service.js

@@ -41,12 +41,14 @@ class Service {
         this.paths = {};
         // preset is plugin with different type
         this.plugins = {};
+        this.keyToPluginMap = {};
         this.pluginMethods = {};
         this.skipPluginIds = new Set();
         this.stage = types_1.ServiceStage.uninitialized;
         this.userConfig = {};
         this.configManager = null;
         this.pkg = {};
+        this.pkgPath = '';
         this.cwd = opts.cwd;
         this.env = opts.env;
         this.opts = opts;
@@ -135,19 +137,23 @@ class Service {
             (0, env_1.loadEnv)({ cwd: this.cwd, envFile: '.env' });
             // get pkg from package.json
             let pkg = {};
+            let pkgPath = '';
             try {
                 pkg = require((0, path_1.join)(this.cwd, 'package.json'));
+                pkgPath = (0, path_1.join)(this.cwd, 'package.json');
             }
             catch (_e) {
                 // APP_ROOT
                 if (this.cwd !== process.cwd()) {
                     try {
                         pkg = require((0, path_1.join)(process.cwd(), 'package.json'));
+                        pkgPath = (0, path_1.join)(process.cwd(), 'package.json');
                     }
                     catch (_e) { }
                 }
             }
             this.pkg = pkg;
+            this.pkgPath = pkgPath;
             // get user config
             const configManager = new config_1.Config({
                 cwd: this.cwd,
@@ -181,6 +187,10 @@ 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];
@@ -192,23 +202,27 @@ class Service {
                 this.configOnChanges[key] = config.onChange || types_1.ConfigChangeType.reload;
             }
             // setup api.config from modifyConfig and modifyDefaultConfig
+            const paths = (0, path_2.getPaths)({
+                cwd: this.cwd,
+                env: this.env,
+                prefix: this.opts.frameworkName || constants_1.DEFAULT_FRAMEWORK_NAME,
+            });
             this.stage = types_1.ServiceStage.resolveConfig;
             const config = yield this.applyPlugins({
                 key: 'modifyConfig',
-                initialValue: configManager.getConfig({
+                // why clone deep?
+                // user may change the config in modifyConfig
+                // e.g. memo.alias = xxx
+                initialValue: utils_1.lodash.cloneDeep(configManager.getConfig({
                     schemas: this.configSchemas,
-                }).config,
+                }).config),
+                args: { paths },
             });
             const defaultConfig = yield this.applyPlugins({
                 key: 'modifyDefaultConfig',
                 initialValue: this.configDefaults,
             });
             this.config = utils_1.lodash.merge(defaultConfig, config);
-            const paths = (0, path_2.getPaths)({
-                cwd: this.cwd,
-                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);
             }
@@ -225,6 +239,7 @@ class Service {
                     // base
                     cwd: this.cwd,
                     pkg,
+                    pkgPath,
                     plugins,
                     presets,
                     name,
@@ -298,9 +313,12 @@ class Service {
                     'config',
                     'cwd',
                     'pkg',
+                    'pkgPath',
                     'name',
                     'paths',
                     'userConfig',
+                    'env',
+                    'isPluginEnable',
                 ],
                 staticProps: {
                     ApplyPluginsType: types_1.ApplyPluginsType,
@@ -314,6 +332,9 @@ class Service {
             if ((0, utils_2.isPromise)(ret)) {
                 ret = yield ret;
             }
+            if (opts.plugin.type === 'plugin') {
+                (0, assert_1.default)(!ret, `plugin should return nothing`);
+            }
             if (ret === null || ret === void 0 ? void 0 : ret.presets) {
                 ret.presets = ret.presets.map((preset) => new plugin_1.Plugin({
                     path: preset,
@@ -332,15 +353,30 @@ class Service {
         });
     }
     isPluginEnable(hook) {
-        const { id, key, enableBy } = hook.plugin;
+        let plugin;
+        if (hook.plugin) {
+            plugin = hook.plugin;
+        }
+        else {
+            plugin = this.keyToPluginMap[hook];
+        }
+        const { id, key, enableBy } = plugin;
         if (this.skipPluginIds.has(id))
             return false;
         if (this.userConfig[key] === false)
             return false;
-        if (enableBy === types_1.EnableBy.config && !(key in this.config))
+        if (this.config[key] === false)
             return false;
+        if (enableBy === types_1.EnableBy.config) {
+            // TODO: 提供单独的命令用于启用插件
+            return key in this.userConfig;
+        }
         if (typeof enableBy === 'function')
-            return enableBy();
+            return enableBy({
+                userConfig: this.userConfig,
+                config: this.config,
+                env: this.env,
+            });
         // EnableBy.register
         return true;
     }

package/dist/types.d.ts

@@ -44,6 +44,7 @@ export interface IRoute {
     file: string;
     id: string;
     parentId?: string;
+    [key: string]: any;
 }
 export interface IEvent<T> {
     (fn: {

package/package.json

@@ -1,6 +1,13 @@
 {
   "name": "@umijs/core",
-  "version": "4.0.0-beta.7",
+  "version": "4.0.0-rc.2",
+  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/core#readme",
+  "bugs": "https://github.com/umijs/umi-next/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/umijs/umi-next"
+  },
+  "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -12,30 +19,23 @@
     "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
     "dev": "pnpm build -- --watch"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/umijs/umi-next"
-  },
-  "authors": [
-    "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
-  ],
-  "license": "MIT",
-  "bugs": "https://github.com/umijs/umi-next/issues",
-  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/core#readme",
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-beta.7",
-    "@umijs/utils": "4.0.0-beta.7"
+    "@umijs/bundler-utils": "4.0.0-rc.2",
+    "@umijs/utils": "4.0.0-rc.2"
   },
   "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": {
+    "access": "public"
+  },
+  "authors": [
+    "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
+  ],
   "compiledConfig": {
     "deps": [
       "@hapi/joi",