@umijs/core 4.0.0-rc.2 → 4.0.0-rc.20

package/dist/service/pluginAPI.js

@@ -12,6 +12,7 @@ const generator_1 = require("./generator");
 const hook_1 = require("./hook");
 const plugin_1 = require("./plugin");
 const utils_2 = require("./utils");
+const resolveConfigModes = ['strict', 'loose'];
 class PluginAPI {
     constructor(opts) {
         this.service = opts.service;
@@ -36,6 +37,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) {
@@ -43,15 +49,20 @@ class PluginAPI {
         delete opts.alias;
         const registerCommand = (commandOpts) => {
             var _a;
-            const { name } = commandOpts;
+            const { name, configResolveMode } = commandOpts;
+            (0, assert_1.default)(!configResolveMode ||
+                resolveConfigModes.indexOf(configResolveMode) >= 0, `configResolveMode must be one of ${resolveConfigModes.join(',')}, but got ${configResolveMode}`);
             (0, assert_1.default)(!this.service.commands[name], `api.registerCommand() failed, the command ${name} is exists from ${(_a = this.service.commands[name]) === null || _a === void 0 ? void 0 : _a.plugin.id}.`);
-            this.service.commands[name] = new command_1.Command(Object.assign(Object.assign({}, commandOpts), { plugin: this.plugin }));
+            this.service.commands[name] = new command_1.Command({
+                ...commandOpts,
+                plugin: this.plugin,
+            });
         };
         registerCommand(opts);
         if (alias) {
             const aliases = (0, utils_2.makeArray)(alias);
             aliases.forEach((alias) => {
-                registerCommand(Object.assign(Object.assign({}, opts), { name: alias }));
+                registerCommand({ ...opts, name: alias });
             });
         }
     }
@@ -59,12 +70,16 @@ class PluginAPI {
         var _a;
         const { key } = opts;
         (0, assert_1.default)(!this.service.generators[key], `api.registerGenerator() failed, the generator ${key} is exists from ${(_a = this.service.generators[key]) === null || _a === void 0 ? void 0 : _a.plugin.id}.`);
-        this.service.generators[key] = new generator_1.Generator(Object.assign(Object.assign({}, opts), { plugin: this.plugin }));
+        this.service.generators[key] = (0, generator_1.makeGenerator)({
+            ...opts,
+            plugin: this.plugin,
+        });
     }
     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 })));
+        this.service.hooks[opts.key].push(new hook_1.Hook({ ...opts, plugin: this.plugin }));
     }
     registerMethod(opts) {
         (0, assert_1.default)(!this.service.pluginMethods[opts.name], `api.registerMethod() failed, method ${opts.name} is already exist.`);
@@ -75,7 +90,10 @@ class PluginAPI {
                 // 否则 pluginId 会不会，导致不能正确 skip plugin
                 function (fn) {
                     // @ts-ignore
-                    this.register(Object.assign({ key: opts.name }, (utils_1.lodash.isPlainObject(fn) ? fn : { fn })));
+                    this.register({
+                        key: opts.name,
+                        ...(utils_1.lodash.isPlainObject(fn) ? fn : { fn }),
+                    });
                 },
         };
     }
@@ -85,7 +103,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 +117,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 +135,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

@@ -1,6 +1,6 @@
 import { yParser } from '@umijs/utils';
 import { Config } from '../config/config';
-import { ApplyPluginsType, ConfigChangeType, EnableBy, Env, IEvent, IModify, ServiceStage } from '../types';
+import { ApplyPluginsType, ConfigChangeType, EnableBy, Env, IEvent, IFrameworkType, IModify, ServiceStage } from '../types';
 import { Command } from './command';
 import { Generator } from './generator';
 import { Hook } from './hook';
@@ -22,6 +22,7 @@ export declare class Service {
             subpaths: string[];
             external?: boolean;
         }>;
+        framework?: IFrameworkType;
         [key: string]: any;
     };
     args: yParser.Arguments;
@@ -39,6 +40,7 @@ export declare class Service {
         cwd?: string;
         absSrcPath?: string;
         absPagesPath?: string;
+        absApiRoutesPath?: string;
         absTmpPath?: string;
         absNodeModulesPath?: string;
         absOutputPath?: string;
@@ -62,6 +64,13 @@ export declare class Service {
     };
     pkgPath: string;
     constructor(opts: IOpts);
+    applyPlugins<T>(opts: {
+        key: string;
+        type?: ApplyPluginsType.event;
+        initialValue?: any;
+        args?: any;
+        sync: true;
+    }): typeof opts.initialValue | T;
     applyPlugins<T>(opts: {
         key: string;
         type?: ApplyPluginsType;
@@ -72,6 +81,11 @@ export declare class Service {
         name: string;
         args?: any;
     }): Promise<void>;
+    resolveConfig(): Promise<{
+        config: any;
+        defaultConfig: any;
+    }>;
+    _baconPlugins(): void;
     initPreset(opts: {
         preset: Plugin;
         presets: Plugin[];
@@ -110,6 +124,7 @@ export interface IServicePluginAPI {
     ConfigChangeType: typeof ConfigChangeType;
     EnableBy: typeof EnableBy;
     ServiceStage: typeof ServiceStage;
+    registerPresets: (presets: any[]) => void;
     registerPlugins: (plugins: (Plugin | {})[]) => void;
 }
 export {};