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

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/route/defineRoutes.js

@@ -7,13 +7,16 @@ function defineRoutes(callback) {
     const parentRoutes = [];
     const defineRoute = (opts) => {
         opts.options = opts.options || {};
+        const parentRoute = parentRoutes.length > 0 ? parentRoutes[parentRoutes.length - 1] : null;
+        const parentId = parentRoute === null || parentRoute === void 0 ? void 0 : parentRoute.id;
+        const parentAbsPath = parentRoute === null || parentRoute === void 0 ? void 0 : parentRoute.absPath;
+        const absPath = [parentAbsPath, opts.path].join('/');
         const route = {
             path: opts.path || '/',
             id: (0, utils_1.createRouteId)(opts.file),
-            parentId: parentRoutes.length > 0
-                ? parentRoutes[parentRoutes.length - 1].id
-                : undefined,
+            parentId,
             file: opts.file,
+            absPath,
         };
         routes[route.id] = route;
         if (opts.children) {

package/dist/route/route.js

@@ -5,7 +5,11 @@
 // programming route
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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,25 +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"]);
-    opts.memo.ret[id] = Object.assign(Object.assign(Object.assign(Object.assign({}, routeProps), { path: opts.route.path }), (component ? { file: component } : {})), { parentId: opts.parentId, id });
+    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
+            : '/';
+        absPath = parentAbsPath + absPath;
+    }
+    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));
         }
     }

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,73 +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({
-                        api,
+            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, {
-                            api,
-                            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* () {
-                        const questions = [];
-                        Object.keys(generators).forEach((key) => __awaiter(this, void 0, void 0, function* () {
-                            var _b, _c;
-                            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, {
-                                    api,
-                                    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

@@ -1,34 +1,52 @@
-import { prompts } from '@umijs/utils';
+import { generateFile } from '@umijs/utils';
 import { Plugin } from './plugin';
-import { PluginAPI } from './pluginAPI';
-import { IServicePluginAPI } from './service';
 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;
-            api: PluginAPI & IServicePluginAPI;
         }): boolean;
     };
+    disabledDescription: string | (() => string);
     fn: {
         (opts: {
             args: any;
-            api: PluginAPI & IServicePluginAPI;
-            generateFile: {
-                (opts: {
-                    path: string;
-                    target: string;
-                    data?: any;
-                    questions?: prompts.PromptObject[];
-                }): void;
-            };
+            generateFile: typeof generateFile;
             updatePackageJSON: {
                 (opts: {
                     opts: object;
@@ -47,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

@@ -7,7 +7,9 @@ export declare function getPaths(opts: {
     cwd: string;
     absSrcPath: string;
     absPagesPath: string;
+    absApiRoutesPath: string;
     absTmpPath: string;
     absNodeModulesPath: string;
     absOutputPath: string;
 };
+export declare type Paths = ReturnType<typeof getPaths>;

package/dist/service/path.js

@@ -13,6 +13,7 @@ function getPaths(opts) {
     const src = winJoin(cwd, 'src');
     const absSrcPath = (0, fs_1.existsSync)(src) && (0, fs_1.statSync)(src).isDirectory() ? src : cwd;
     const absPagesPath = winJoin(absSrcPath, 'pages');
+    const absApiRoutesPath = winJoin(absSrcPath, 'api');
     const tmp = opts.env === types_1.Env.development
         ? `.${opts.prefix}`
         : `.${opts.prefix}-${opts.env}`;
@@ -23,6 +24,7 @@ function getPaths(opts) {
         cwd,
         absSrcPath,
         absPagesPath,
+        absApiRoutesPath,
         absTmpPath,
         absNodeModulesPath,
         absOutputPath,

package/dist/service/plugin.d.ts

@@ -20,6 +20,10 @@ export declare class Plugin {
     key: string;
     apply: Function;
     config: IPluginConfig;
+    time: {
+        register?: number;
+        hooks: Record<string, number[]>;
+    };
     enableBy: EnableBy | ((opts: {
         userConfig: any;
         config: any;

package/dist/service/plugin.js

@@ -17,6 +17,7 @@ const RE = {
 class Plugin {
     constructor(opts) {
         this.config = {};
+        this.time = { hooks: {} };
         this.enableBy = types_1.EnableBy.register;
         this.type = opts.type;
         this.path = (0, utils_1.winPath)(opts.path);
@@ -37,6 +38,7 @@ class Plugin {
         this.apply = () => {
             utils_1.register.register({
                 implementor: esbuild_1.default,
+                exts: ['.ts', '.mjs'],
             });
             utils_1.register.clearFiles();
             let ret;
@@ -46,10 +48,9 @@ class Plugin {
             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];
+            finally {
+                utils_1.register.restore();
             }
-            utils_1.register.restore();
             // use the default member for es modules
             return ret.__esModule ? ret.default : ret;
         };

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;
@@ -33,7 +36,7 @@ export declare class PluginAPI {
     }): void;
     registerPresets(source: Plugin[], presets: any[]): void;
     registerPlugins(source: Plugin[], plugins: any[]): void;
-    skipPlugins(ids: string[]): void;
+    skipPlugins(keys: string[]): void;
     static proxyPluginAPI(opts: {
         pluginAPI: PluginAPI;
         service: Service;