@umijs/core 4.0.0-rc.5 → 4.0.0-rc.8

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

@@ -31,7 +31,17 @@ 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"]);
+    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] = Object.assign(Object.assign(Object.assign(Object.assign({}, routeProps), { path: opts.route.path }), (component ? { file: component } : {})), { parentId: opts.parentId, id });
+    if (absPath) {
+        opts.memo.ret[id].absPath = absPath;
+    }
     if (opts.route.routes) {
         transformRoutes({
             routes: opts.route.routes,

package/dist/service/generatePlugin.js

@@ -25,7 +25,6 @@ umi generate
                 const [type] = args._;
                 const runGenerator = (generator) => __awaiter(this, void 0, void 0, function* () {
                     yield (generator === null || generator === void 0 ? void 0 : generator.fn({
-                        api,
                         args,
                         generateFile: utils_1.generateFile,
                         installDeps: utils_1.installDeps,
@@ -39,7 +38,6 @@ umi generate
                     }
                     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) {
@@ -62,7 +60,6 @@ umi generate
                             }
                             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) {

package/dist/service/generator.d.ts

@@ -1,7 +1,5 @@
 import { prompts } from '@umijs/utils';
 import { Plugin } from './plugin';
-import { PluginAPI } from './pluginAPI';
-import { IServicePluginAPI } from './service';
 export declare enum GeneratorType {
     generate = "generate",
     enable = "enable"
@@ -14,20 +12,18 @@ export interface IGeneratorOpts {
     checkEnable?: {
         (opts: {
             args: any;
-            api: PluginAPI & IServicePluginAPI;
         }): boolean;
     };
     fn: {
         (opts: {
             args: any;
-            api: PluginAPI & IServicePluginAPI;
             generateFile: {
                 (opts: {
                     path: string;
                     target: string;
                     data?: any;
                     questions?: prompts.PromptObject[];
-                }): void;
+                }): Promise<void>;
             };
             updatePackageJSON: {
                 (opts: {

package/dist/service/path.d.ts

@@ -7,6 +7,7 @@ export declare function getPaths(opts: {
     cwd: string;
     absSrcPath: string;
     absPagesPath: string;
+    absApiRoutesPath: string;
     absTmpPath: string;
     absNodeModulesPath: string;
     absOutputPath: string;

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);

package/dist/service/pluginAPI.d.ts

@@ -33,7 +33,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;

package/dist/service/pluginAPI.js

@@ -36,6 +36,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) {
@@ -63,6 +68,7 @@ class PluginAPI {
     }
     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 })));
     }
@@ -85,7 +91,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 +105,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 +123,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

@@ -39,6 +39,7 @@ export declare class Service {
         cwd?: string;
         absSrcPath?: string;
         absPagesPath?: string;
+        absApiRoutesPath?: string;
         absTmpPath?: string;
         absNodeModulesPath?: string;
         absOutputPath?: string;
@@ -72,6 +73,7 @@ export declare class Service {
         name: string;
         args?: any;
     }): Promise<void>;
+    _baconPlugins(): void;
     initPreset(opts: {
         preset: Plugin;
         presets: Plugin[];

package/dist/service/service.js

@@ -81,11 +81,15 @@ class Service {
                         if (!this.isPluginEnable(hook))
                             continue;
                         tAdd.tapPromise({
-                            name: hook.plugin.id,
+                            name: hook.plugin.key,
                             stage: hook.stage,
                             before: hook.before,
                         }, (memo) => __awaiter(this, void 0, void 0, function* () {
+                            var _a, _b;
+                            const dateStart = new Date();
                             const items = yield hook.fn(opts.args);
+                            (_a = hook.plugin.time.hooks)[_b = opts.key] || (_a[_b] = []);
+                            hook.plugin.time.hooks[opts.key].push(new Date().getTime() - dateStart.getTime());
                             return memo.concat(items);
                         }));
                     }
@@ -96,11 +100,16 @@ class Service {
                         if (!this.isPluginEnable(hook))
                             continue;
                         tModify.tapPromise({
-                            name: hook.plugin.id,
+                            name: hook.plugin.key,
                             stage: hook.stage,
                             before: hook.before,
                         }, (memo) => __awaiter(this, void 0, void 0, function* () {
-                            return yield hook.fn(memo, opts.args);
+                            var _c, _d;
+                            const dateStart = new Date();
+                            const ret = yield hook.fn(memo, opts.args);
+                            (_c = hook.plugin.time.hooks)[_d = opts.key] || (_c[_d] = []);
+                            hook.plugin.time.hooks[opts.key].push(new Date().getTime() - dateStart.getTime());
+                            return ret;
                         }));
                     }
                     return (yield tModify.promise(opts.initialValue));
@@ -110,11 +119,15 @@ class Service {
                         if (!this.isPluginEnable(hook))
                             continue;
                         tEvent.tapPromise({
-                            name: hook.plugin.id,
+                            name: hook.plugin.key,
                             stage: hook.stage || 0,
                             before: hook.before,
                         }, () => __awaiter(this, void 0, void 0, function* () {
+                            var _f, _g;
+                            const dateStart = new Date();
                             yield hook.fn(opts.args);
+                            (_f = hook.plugin.time.hooks)[_g = opts.key] || (_f[_g] = []);
+                            hook.plugin.time.hooks[opts.key].push(new Date().getTime() - dateStart.getTime());
                         }));
                     }
                     return (yield tEvent.promise(1));
@@ -153,7 +166,7 @@ class Service {
                 }
             }
             this.pkg = pkg;
-            this.pkgPath = pkgPath;
+            this.pkgPath = pkgPath || (0, path_1.join)(this.cwd, 'package.json');
             // get user config
             const configManager = new config_1.Config({
                 cwd: this.cwd,
@@ -187,10 +200,6 @@ 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];
@@ -276,9 +285,24 @@ class Service {
             this.stage = types_1.ServiceStage.runCommand;
             const command = this.commands[name];
             (0, assert_1.default)(command, `Invalid command ${name}, it's not registered.`);
-            return command.fn({ args });
+            let ret = command.fn({ args });
+            if ((0, utils_2.isPromise)(ret)) {
+                ret = yield ret;
+            }
+            this._baconPlugins();
+            return ret;
         });
     }
+    _baconPlugins() {
+        // TODO: prettier
+        if (this.args.baconPlugins) {
+            console.log();
+            for (const id of Object.keys(this.plugins)) {
+                const plugin = this.plugins[id];
+                console.log(utils_1.chalk.green('plugin'), plugin.id, plugin.time);
+            }
+        }
+    }
     initPreset(opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const { presets, plugins } = yield this.initPlugin({
@@ -291,7 +315,7 @@ class Service {
         });
     }
     initPlugin(opts) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             // register to this.plugins
             (0, assert_1.default)(!this.plugins[opts.plugin.id], `${opts.plugin.type} ${opts.plugin.id} is already registered by ${(_a = this.plugins[opts.plugin.id]) === null || _a === void 0 ? void 0 : _a.path}, ${opts.plugin.type} from ${opts.plugin.path} register failed.`);
@@ -328,13 +352,18 @@ class Service {
                     service: this,
                 },
             });
+            let dateStart = new Date();
             let ret = opts.plugin.apply()(proxyPluginAPI);
             if ((0, utils_2.isPromise)(ret)) {
                 ret = yield ret;
             }
+            opts.plugin.time.register = new Date().getTime() - dateStart.getTime();
             if (opts.plugin.type === 'plugin') {
                 (0, assert_1.default)(!ret, `plugin should return nothing`);
             }
+            // key should be unique
+            (0, assert_1.default)(!this.keyToPluginMap[opts.plugin.key], `key ${opts.plugin.key} is already registered by ${(_b = this.keyToPluginMap[opts.plugin.key]) === null || _b === void 0 ? void 0 : _b.path}, ${opts.plugin.type} from ${opts.plugin.path} register failed.`);
+            this.keyToPluginMap[opts.plugin.key] = opts.plugin;
             if (ret === null || ret === void 0 ? void 0 : ret.presets) {
                 ret.presets = ret.presets.map((preset) => new plugin_1.Plugin({
                     path: preset,

package/dist/types.d.ts

@@ -41,6 +41,7 @@ export declare enum EnableBy {
 }
 export interface IRoute {
     path: string;
+    absPath: string;
     file: string;
     id: string;
     parentId?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.0.0-rc.5",
+  "version": "4.0.0-rc.8",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/core#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
   "repository": {
@@ -17,11 +17,12 @@
   "scripts": {
     "build": "pnpm tsc",
     "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
-    "dev": "pnpm build -- --watch"
+    "dev": "pnpm build -- --watch",
+    "test": "jest -c ../../jest.turbo.config.ts"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-rc.5",
-    "@umijs/utils": "4.0.0-rc.5"
+    "@umijs/bundler-utils": "4.0.0-rc.8",
+    "@umijs/utils": "4.0.0-rc.8"
   },
   "devDependencies": {
     "@hapi/joi": "17.1.1",