@umijs/core 4.0.0-rc.15 → 4.0.0-rc.16

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export * from './config/config';
 export * from './route/route';
-export { GeneratorType, IGeneratorOpts } from './service/generator';
+export { Generator, GeneratorType } from './service/generator';
 export * from './service/pluginAPI';
 export * from './service/service';
 export { Env, IAdd, IEvent, IModify, IRoute } from './types';

package/dist/route/routesConfig.d.ts

@@ -1,5 +1,6 @@
 interface IOpts {
     routes: any[];
+    onResolveComponent?: (component: string) => string;
 }
 export declare function getConfigRoutes(opts: IOpts): any[];
 export {};

package/dist/route/routesConfig.js

@@ -7,13 +7,23 @@ 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 });
+    transformRoutes({
+        routes: opts.routes,
+        parentId: undefined,
+        memo,
+        onResolveComponent: opts.onResolveComponent,
+    });
     return memo.ret;
 }
 exports.getConfigRoutes = getConfigRoutes;
 function transformRoutes(opts) {
     opts.routes.forEach((route) => {
-        transformRoute({ route, parentId: opts.parentId, memo: opts.memo });
+        transformRoute({
+            route,
+            parentId: opts.parentId,
+            memo: opts.memo,
+            onResolveComponent: opts.onResolveComponent,
+        });
     });
 }
 function transformRoute(opts) {
@@ -30,7 +40,13 @@ function transformRoute(opts) {
     opts.memo.ret[id] = {
         ...routeProps,
         path: opts.route.path,
-        ...(component ? { file: component } : {}),
+        ...(component
+            ? {
+                file: opts.onResolveComponent
+                    ? opts.onResolveComponent(component)
+                    : component,
+            }
+            : {}),
         parentId: opts.parentId,
         id,
     };
@@ -45,6 +61,7 @@ function transformRoute(opts) {
                 route: { path, component: wrapper },
                 parentId,
                 memo: opts.memo,
+                onResolveComponent: opts.onResolveComponent,
             });
             parentId = id;
             path = '';

package/dist/service/command.d.ts

@@ -1,5 +1,6 @@
 import { yParser } from '@umijs/utils';
 import { Plugin } from './plugin';
+import { ResolveConfigMode } from './pluginAPI';
 export interface IOpts {
     name: string;
     description?: string;
@@ -11,12 +12,14 @@ export interface IOpts {
         }): void;
     };
     plugin: Plugin;
+    configResolveMode?: ResolveConfigMode;
 }
 export declare class Command {
     name: string;
     description?: string;
     options?: string;
     details?: string;
+    configResolveMode: ResolveConfigMode;
     fn: {
         ({ args }: {
             args: yParser.Arguments;

package/dist/service/command.js

@@ -9,6 +9,7 @@ class Command {
         this.details = opts.details;
         this.fn = opts.fn;
         this.plugin = opts.plugin;
+        this.configResolveMode = opts.configResolveMode || 'strict';
     }
 }
 exports.Command = Command;

package/dist/service/generatePlugin.js

@@ -10,6 +10,7 @@ exports.default = (api) => {
 umi generate
 `,
         description: 'generate code snippets quickly',
+        configResolveMode: 'loose',
         async fn({ args }) {
             var _a;
             const [type] = args._;
@@ -31,32 +32,37 @@ umi generate
                         args,
                     }));
                     if (!enable) {
-                        throw new Error(`Generator ${type} is unable.The corresponding function has been turned on or is not available.`);
+                        if (typeof generator.disabledDescription === 'function') {
+                            utils_1.logger.warn(generator.disabledDescription());
+                        }
+                        else {
+                            utils_1.logger.warn(generator.disabledDescription);
+                        }
+                        return;
                     }
                 }
                 await runGenerator(generator);
             }
             else {
                 const getEnableGenerators = async (generators) => {
-                    var _a, _b;
+                    var _a;
                     const questions = [];
                     for (const key of Object.keys(generators)) {
-                        if (generators[key].type === generator_1.GeneratorType.generate) {
+                        const g = generators[key];
+                        if (g.type === generator_1.GeneratorType.generate) {
                             questions.push({
-                                title: `${generators[key].name} -- ${generators[key].description}` ||
-                                    '',
-                                value: generators[key].key,
+                                title: `${g.name} -- ${g.description}` || '',
+                                value: g.key,
                             });
                         }
                         else {
-                            const enable = await ((_b = (_a = generators[key]) === null || _a === void 0 ? void 0 : _a.checkEnable) === null || _b === void 0 ? void 0 : _b.call(_a, {
+                            const enable = await ((_a = g === null || g === void 0 ? void 0 : g.checkEnable) === null || _a === void 0 ? void 0 : _a.call(g, {
                                 args,
                             }));
                             if (enable) {
                                 questions.push({
-                                    title: `${generators[key].name} -- ${generators[key].description}` ||
-                                        '',
-                                    value: generators[key].key,
+                                    title: `${g.name} -- ${g.description}` || '',
+                                    value: g.key,
                                 });
                             }
                         }

package/dist/service/generator.d.ts

@@ -4,16 +4,45 @@ export declare enum GeneratorType {
     generate = "generate",
     enable = "enable"
 }
-export interface IGeneratorOpts {
+declare type IGeneratorOptsWithoutEnableCheck = {
     key: string;
     name: string;
     description: string;
-    type?: GeneratorType;
-    checkEnable?: {
+    type: GeneratorType.generate;
+    fn: {
+        (opts: {
+            args: any;
+            generateFile: typeof generateFile;
+            updatePackageJSON: {
+                (opts: {
+                    opts: object;
+                    cwd?: string;
+                }): void;
+            };
+            installDeps: {
+                (opts: {
+                    opts: {
+                        devDependencies?: string[];
+                        dependencies?: string[];
+                    };
+                    cwd?: string;
+                }): void;
+            };
+        }): void;
+    };
+    plugin: Plugin;
+};
+declare type IGeneratorOptsWithEnableCheck = {
+    key: string;
+    name: string;
+    description: string;
+    type: GeneratorType.enable;
+    checkEnable: {
         (opts: {
             args: any;
         }): boolean;
     };
+    disabledDescription: string | (() => string);
     fn: {
         (opts: {
             args: any;
@@ -36,14 +65,7 @@ export interface IGeneratorOpts {
         }): void;
     };
     plugin: Plugin;
-}
-export declare class Generator {
-    key: IGeneratorOpts['key'];
-    name: IGeneratorOpts['name'];
-    description: IGeneratorOpts['description'];
-    type?: IGeneratorOpts['type'];
-    checkEnable?: IGeneratorOpts['checkEnable'];
-    fn: IGeneratorOpts['fn'];
-    plugin: IGeneratorOpts['plugin'];
-    constructor(opts: IGeneratorOpts);
-}
+};
+export declare type Generator = IGeneratorOptsWithEnableCheck | IGeneratorOptsWithoutEnableCheck;
+export declare function makeGenerator<T>(opts: T): T;
+export {};

package/dist/service/generator.js

@@ -1,20 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Generator = exports.GeneratorType = void 0;
+exports.makeGenerator = exports.GeneratorType = void 0;
 var GeneratorType;
 (function (GeneratorType) {
     GeneratorType["generate"] = "generate";
     GeneratorType["enable"] = "enable";
 })(GeneratorType = exports.GeneratorType || (exports.GeneratorType = {}));
-class Generator {
-    constructor(opts) {
-        this.key = opts.key;
-        this.name = opts.name;
-        this.type = opts.type;
-        this.description = opts.description;
-        this.checkEnable = opts.checkEnable;
-        this.fn = opts.fn;
-        this.plugin = opts.plugin;
-    }
+function makeGenerator(opts) {
+    return {
+        ...opts,
+    };
 }
-exports.Generator = Generator;
+exports.makeGenerator = makeGenerator;

package/dist/service/path.d.ts

@@ -12,3 +12,4 @@ export declare function getPaths(opts: {
     absNodeModulesPath: string;
     absOutputPath: string;
 };
+export declare type Paths = ReturnType<typeof getPaths>;

package/dist/service/pluginAPI.d.ts

@@ -1,11 +1,14 @@
 import { logger } from '@umijs/utils';
 import { EnableBy, Env, IPluginConfig } from '../types';
 import { IOpts as ICommandOpts } from './command';
-import { IGeneratorOpts } from './generator';
+import { Generator } from './generator';
 import { IOpts as IHookOpts } from './hook';
 import { Plugin } from './plugin';
 import { Service } from './service';
 declare type Logger = typeof logger;
+declare const resolveConfigModes: readonly ["strict", "loose"];
+export declare type ResolveConfigMode = typeof resolveConfigModes[number];
+declare type DistributiveOmit<T, K extends keyof any> = T extends any ? Omit<T, K> : never;
 export declare class PluginAPI {
     service: Service;
     plugin: Plugin;
@@ -25,7 +28,7 @@ export declare class PluginAPI {
     registerCommand(opts: Omit<ICommandOpts, 'plugin'> & {
         alias?: string | string[];
     }): void;
-    registerGenerator(opts: Omit<IGeneratorOpts, 'plugin'>): void;
+    registerGenerator(opts: DistributiveOmit<Generator, 'plugin'>): void;
     register(opts: Omit<IHookOpts, 'plugin'>): void;
     registerMethod(opts: {
         name: string;

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;
@@ -48,7 +49,9 @@ 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({
                 ...commandOpts,
@@ -67,7 +70,7 @@ 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({
+        this.service.generators[key] = (0, generator_1.makeGenerator)({
             ...opts,
             plugin: this.plugin,
         });

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;
@@ -80,10 +81,9 @@ export declare class Service {
         name: string;
         args?: any;
     }): Promise<void>;
-    generateFinalConfig(): Promise<{
+    resolveConfig(): Promise<{
         config: any;
         defaultConfig: any;
-        finalConfig: Record<string, any>;
     }>;
     _baconPlugins(): void;
     initPreset(opts: {

package/dist/service/service.js

@@ -71,7 +71,7 @@ class Service {
                         continue;
                     tAdd.tapPromise({
                         name: hook.plugin.key,
-                        stage: hook.stage,
+                        stage: hook.stage || 0,
                         before: hook.before,
                     }, async (memo) => {
                         var _a, _b;
@@ -90,7 +90,7 @@ class Service {
                         continue;
                     tModify.tapPromise({
                         name: hook.plugin.key,
-                        stage: hook.stage,
+                        stage: hook.stage || 0,
                         before: hook.before,
                     }, async (memo) => {
                         var _a, _b;
@@ -216,6 +216,8 @@ class Service {
         while (plugins.length) {
             await this.initPlugin({ plugin: plugins.shift(), plugins });
         }
+        const command = this.commands[name];
+        (0, assert_1.default)(command, `Invalid command ${name}, it's not registered.`);
         // collect configSchemas and configDefaults
         for (const id of Object.keys(this.plugins)) {
             const { config, key } = this.plugins[id];
@@ -228,7 +230,7 @@ class Service {
         }
         // setup api.config from modifyConfig and modifyDefaultConfig
         this.stage = types_1.ServiceStage.resolveConfig;
-        const { config, defaultConfig } = await this.generateFinalConfig();
+        const { config, defaultConfig } = await this.resolveConfig();
         if (this.config.outputPath) {
             paths.absOutputPath = (0, path_1.isAbsolute)(this.config.outputPath)
                 ? this.config.outputPath
@@ -282,34 +284,32 @@ class Service {
         });
         // run command
         this.stage = types_1.ServiceStage.runCommand;
-        const command = this.commands[name];
-        (0, assert_1.default)(command, `Invalid command ${name}, it's not registered.`);
         let ret = await command.fn({ args });
         this._baconPlugins();
         return ret;
     }
-    // generate config and defaultConfig, and assign values to this.config
-    async generateFinalConfig() {
-        var _a;
+    async resolveConfig() {
         // configManager and paths are not available until the init stage
         (0, assert_1.default)(this.stage > types_1.ServiceStage.init, `Can't generate final config before init stage`);
+        const resolveMode = this.commands[this.name].configResolveMode;
         const config = await this.applyPlugins({
             key: 'modifyConfig',
             // why clone deep?
             // user may change the config in modifyConfig
             // e.g. memo.alias = xxx
-            initialValue: utils_1.lodash.cloneDeep((_a = this.configManager) === null || _a === void 0 ? void 0 : _a.getConfig({
-                schemas: this.configSchemas,
-            }).config),
+            initialValue: utils_1.lodash.cloneDeep(resolveMode === 'strict'
+                ? this.configManager.getConfig({
+                    schemas: this.configSchemas,
+                }).config
+                : this.configManager.getUserConfig().config),
             args: { paths: this.paths },
         });
         const defaultConfig = await this.applyPlugins({
             key: 'modifyDefaultConfig',
             initialValue: this.configDefaults,
         });
-        const finalConfig = utils_1.lodash.merge(defaultConfig, config);
-        this.config = finalConfig;
-        return { config, defaultConfig, finalConfig };
+        this.config = utils_1.lodash.merge(defaultConfig, config);
+        return { config, defaultConfig };
     }
     _baconPlugins() {
         // TODO: prettier

package/dist/types.d.ts

@@ -108,3 +108,4 @@ export interface IAdd<T, U> {
         };
     }): void;
 }
+export declare type IFrameworkType = 'vue' | 'react';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.0.0-rc.15",
+  "version": "4.0.0-rc.16",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/core#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
   "repository": {
@@ -21,8 +21,8 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-rc.15",
-    "@umijs/utils": "4.0.0-rc.15"
+    "@umijs/bundler-utils": "4.0.0-rc.16",
+    "@umijs/utils": "4.0.0-rc.16"
   },
   "devDependencies": {
     "@hapi/joi": "17.1.1",