@umijs/core 4.0.0-beta.10 → 4.0.0-beta.14

package/dist/route/routesConfig.js

@@ -10,8 +10,12 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     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 });
@@ -24,6 +28,7 @@ function transformRoutes(opts) {
     });
 }
 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 });

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;
@@ -21,13 +21,15 @@ export declare class Plugin {
     apply: Function;
     config: IPluginConfig;
     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/pluginAPI.d.ts

@@ -1,5 +1,5 @@
 import { logger } from '@umijs/utils';
-import { EnableBy, IPluginConfig } from '../types';
+import { EnableBy, Env, IPluginConfig } from '../types';
 import { IOpts as ICommandOpts } from './command';
 import { IGeneratorOpts } from './generator';
 import { IOpts as IHookOpts } from './hook';
@@ -17,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[];

package/dist/service/service.d.ts

@@ -15,7 +15,10 @@ interface IOpts {
 }
 export declare class Service {
     private opts;
-    appData: Record<string, any>;
+    appData: {
+        deps?: Record<string, string>;
+        [key: string]: any;
+    };
     args: yParser.Arguments;
     commands: Record<string, Command>;
     generators: Record<string, Generator>;
@@ -36,6 +39,7 @@ export declare class Service {
         absOutputPath?: string;
     };
     plugins: Record<string, Plugin>;
+    keyToPluginMap: Record<string, Plugin>;
     pluginMethods: Record<string, {
         plugin: Plugin;
         fn: Function;
@@ -66,7 +70,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;
@@ -79,6 +83,8 @@ export interface IServicePluginAPI {
     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>;

package/dist/service/service.js

@@ -41,6 +41,7 @@ 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;
@@ -181,6 +182,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];
@@ -302,6 +307,8 @@ class Service {
                     'name',
                     'paths',
                     'userConfig',
+                    'env',
+                    'isPluginEnable',
                 ],
                 staticProps: {
                     ApplyPluginsType: types_1.ApplyPluginsType,
@@ -315,6 +322,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,
@@ -333,15 +343,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({ config: this.config });
+            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,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.0.0-beta.10",
+  "version": "4.0.0-beta.14",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/core#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
   "repository": {
@@ -20,8 +20,8 @@
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-beta.10",
-    "@umijs/utils": "4.0.0-beta.10"
+    "@umijs/bundler-utils": "4.0.0-beta.14",
+    "@umijs/utils": "4.0.0-beta.14"
   },
   "devDependencies": {
     "@hapi/joi": "17.1.1",