@umijs/core 4.0.0-rc.9 → 4.0.2

package/dist/config/config.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = void 0;
 const esbuild_1 = __importDefault(require("@umijs/bundler-utils/compiled/esbuild"));
 const utils_1 = require("@umijs/utils");
+const joi_1 = __importDefault(require("@umijs/utils/compiled/@hapi/joi"));
 const assert_1 = __importDefault(require("assert"));
 const fs_1 = require("fs");
 const path_1 = require("path");
-const joi_1 = __importDefault(require("../../compiled/@hapi/joi"));
 const just_diff_1 = require("../../compiled/just-diff");
 const constants_1 = require("../constants");
 const utils_2 = require("./utils");

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

@@ -1,15 +1,4 @@
 "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 };
 };
@@ -18,35 +7,75 @@ 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) {
     (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"]);
+    const { routes, component, wrappers, ...routeProps } = opts.route;
     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
+            ? 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 });
+    opts.memo.ret[id] = {
+        ...routeProps,
+        path: opts.route.path,
+        ...(component
+            ? {
+                file: opts.onResolveComponent
+                    ? opts.onResolveComponent(component)
+                    : component,
+            }
+            : {}),
+        parentId: opts.parentId,
+        id,
+    };
     if (absPath) {
         opts.memo.ret[id].absPath = absPath;
     }
+    if (wrappers === null || wrappers === void 0 ? void 0 : wrappers.length) {
+        let parentId = opts.parentId;
+        let path = opts.route.path;
+        wrappers.forEach((wrapper) => {
+            const { id } = transformRoute({
+                route: { path, component: wrapper },
+                parentId,
+                memo: opts.memo,
+                onResolveComponent: opts.onResolveComponent,
+            });
+            parentId = id;
+            path = '';
+        });
+        opts.memo.ret[id].parentId = parentId;
+        opts.memo.ret[id].path = path;
+    }
     if (opts.route.routes) {
         transformRoutes({
             routes: opts.route.routes,
             parentId: id,
             memo: opts.memo,
+            onResolveComponent: opts.onResolveComponent,
         });
     }
+    return { id };
 }

package/dist/route/routesConvention.js

@@ -44,10 +44,10 @@ function visitFiles(opts) {
         let file = (0, path_1.resolve)(opts.dir, filename);
         let stat = (0, fs_1.lstatSync)(file);
         if (stat.isDirectory()) {
-            visitFiles(Object.assign(Object.assign({}, opts), { dir: file }));
+            visitFiles({ ...opts, dir: file });
         }
         else if (stat.isFile() &&
-            ['.tsx', '.ts', '.js', '.jsx', '.md', '.mdx'].includes((0, path_1.extname)(file))) {
+            ['.tsx', '.ts', '.js', '.jsx', '.md', '.mdx', '.vue'].includes((0, path_1.extname)(file))) {
             opts.visitor((0, path_1.relative)(opts.baseDir, file));
         }
     }
@@ -64,6 +64,8 @@ function createRoutePath(routeId) {
         .replace(/\$/g, ':')
         // routes/not.nested -> routes/not/nested
         .replace(/\./g, '/');
+    // /index/index -> /
+    path = /\b\/?index\/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.js

@@ -19,7 +19,7 @@ function findParentRouteId(routeIds, childRouteId) {
     return routeIds.find((id) => childRouteId.startsWith(`${id}/`));
 }
 exports.findParentRouteId = findParentRouteId;
-const routeModuleExts = ['.js', '.jsx', '.ts', '.tsx', '.md', '.mdx'];
+const routeModuleExts = ['.js', '.jsx', '.ts', '.tsx', '.md', '.mdx', '.vue'];
 function isRouteModuleFile(opts) {
     // TODO: add cache strategy
     for (const excludeRegExp of opts.exclude || []) {

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@umijs/utils");
 const generator_1 = require("./generator");
@@ -19,70 +10,74 @@ exports.default = (api) => {
 umi generate
 `,
         description: 'generate code snippets quickly',
-        fn({ args }) {
+        configResolveMode: 'loose',
+        async fn({ args }) {
             var _a;
-            return __awaiter(this, void 0, void 0, function* () {
-                const [type] = args._;
-                const runGenerator = (generator) => __awaiter(this, void 0, void 0, function* () {
-                    yield (generator === null || generator === void 0 ? void 0 : generator.fn({
+            const [type] = args._;
+            const runGenerator = async (generator) => {
+                await (generator === null || generator === void 0 ? void 0 : generator.fn({
+                    args,
+                    generateFile: utils_1.generateFile,
+                    installDeps: utils_1.installDeps,
+                    updatePackageJSON: utils_1.updatePackageJSON,
+                }));
+            };
+            if (type) {
+                const generator = api.service.generators[type];
+                if (!generator) {
+                    throw new Error(`Generator ${type} not found.`);
+                }
+                if (generator.type === generator_1.GeneratorType.enable) {
+                    const enable = await ((_a = generator.checkEnable) === null || _a === void 0 ? void 0 : _a.call(generator, {
                         args,
-                        generateFile: utils_1.generateFile,
-                        installDeps: utils_1.installDeps,
-                        updatePackageJSON: utils_1.updatePackageJSON,
                     }));
-                });
-                if (type) {
-                    const generator = api.service.generators[type];
-                    if (!generator) {
-                        throw new Error(`Generator ${type} not found.`);
-                    }
-                    if (generator.type === generator_1.GeneratorType.enable) {
-                        const enable = yield ((_a = generator.checkEnable) === null || _a === void 0 ? void 0 : _a.call(generator, {
-                            args,
-                        }));
-                        if (!enable) {
-                            throw new Error(`Generator ${type} is unable.The corresponding function has been turned on or is not available.`);
+                    if (!enable) {
+                        if (typeof generator.disabledDescription === 'function') {
+                            utils_1.logger.warn(generator.disabledDescription());
+                        }
+                        else {
+                            utils_1.logger.warn(generator.disabledDescription);
                         }
+                        return;
                     }
-                    yield runGenerator(generator);
                 }
-                else {
-                    const getEnableGenerators = (generators) => __awaiter(this, void 0, void 0, function* () {
-                        var _b, _c;
-                        const questions = [];
-                        for (const key of Object.keys(generators)) {
-                            if (generators[key].type === generator_1.GeneratorType.generate) {
+                await runGenerator(generator);
+            }
+            else {
+                const getEnableGenerators = async (generators) => {
+                    var _a;
+                    const questions = [];
+                    for (const key of Object.keys(generators)) {
+                        const g = generators[key];
+                        if (g.type === generator_1.GeneratorType.generate) {
+                            questions.push({
+                                title: `${g.name} -- ${g.description}` || '',
+                                value: g.key,
+                            });
+                        }
+                        else {
+                            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,
                                 });
                             }
-                            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, {
-                                    args,
-                                }));
-                                if (enable) {
-                                    questions.push({
-                                        title: `${generators[key].name} -- ${generators[key].description}` ||
-                                            '',
-                                        value: generators[key].key,
-                                    });
-                                }
-                            }
                         }
-                        return questions;
-                    });
-                    const questions = yield getEnableGenerators(api.service.generators);
-                    const { gType } = yield (0, utils_1.prompts)({
-                        type: 'select',
-                        name: 'gType',
-                        message: 'Pick generator type',
-                        choices: questions,
-                    });
-                    yield runGenerator(api.service.generators[gType]);
-                }
-            });
+                    }
+                    return questions;
+                };
+                const questions = await getEnableGenerators(api.service.generators);
+                const { gType } = await (0, utils_1.prompts)({
+                    type: 'select',
+                    name: 'gType',
+                    message: 'Pick generator type',
+                    choices: questions,
+                });
+                await runGenerator(api.service.generators[gType]);
+            }
         },
     });
 };

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?: {
+    name: string;
+    description: string;
+    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,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 });
             });
         }
     }
@@ -64,13 +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.`);
@@ -81,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 }),
+                    });
                 },
         };
     }

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;
@@ -63,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;
@@ -73,6 +81,10 @@ export declare class Service {
         name: string;
         args?: any;
     }): Promise<void>;
+    resolveConfig(): Promise<{
+        config: any;
+        defaultConfig: any;
+    }>;
     _baconPlugins(): void;
     initPreset(opts: {
         preset: Plugin;