@umijs/core 4.0.0-beta.5 → 4.0.0-beta.9

package/dist/config/config.js

@@ -125,6 +125,7 @@ class Config {
                     delete require.cache[file];
                 }
                 files.push(...utils_1.register.getFiles());
+                utils_1.register.restore();
             }
         }
         return {

package/dist/route/route.d.ts

@@ -1,2 +1,3 @@
+export * from './routesConfig';
 export * from './routesConvention';
 export * from './routeUtils';

package/dist/route/route.js

@@ -14,5 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./routesConfig"), exports);
 __exportStar(require("./routesConvention"), exports);
 __exportStar(require("./routeUtils"), exports);

package/dist/route/routesConfig.d.ts

@@ -0,0 +1,5 @@
+interface IOpts {
+    routes: any[];
+}
+export declare function getConfigRoutes(opts: IOpts): any[];
+export {};

package/dist/route/routesConfig.js

@@ -1 +1,37 @@
 "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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConfigRoutes = void 0;
+function getConfigRoutes(opts) {
+    const memo = { ret: {}, id: 1 };
+    transformRoutes({ routes: opts.routes, parentId: undefined, memo });
+    return memo.ret;
+}
+exports.getConfigRoutes = getConfigRoutes;
+function transformRoutes(opts) {
+    opts.routes.forEach((route) => {
+        transformRoute({ route, parentId: opts.parentId, memo: opts.memo });
+    });
+}
+function transformRoute(opts) {
+    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 });
+    if (opts.route.routes) {
+        transformRoutes({
+            routes: opts.route.routes,
+            parentId: id,
+            memo: opts.memo,
+        });
+    }
+}

package/dist/route/routesConvention.d.ts

@@ -1,3 +1,4 @@
 export declare function getConventionRoutes(opts: {
     base: string;
+    prefix?: string;
 }): any;

package/dist/route/routesConvention.js

@@ -33,7 +33,7 @@ function getConventionRoutes(opts) {
             let routePath = createRoutePath(parentId ? routeId.slice(parentId.length + 1) : routeId);
             defineRoute({
                 path: routePath,
-                file: files[routeId],
+                file: `${opts.prefix || ''}${files[routeId]}`,
                 children() {
                     defineNestedRoutes(defineRoute, routeId);
                 },

package/dist/service/generatePlugin.js

@@ -23,15 +23,15 @@ umi generate
             var _a;
             return __awaiter(this, void 0, void 0, function* () {
                 const [type] = args._;
-                const runGenerator = (generator) => {
-                    generator === null || generator === void 0 ? void 0 : generator.fn({
+                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,
                         updatePackageJSON: utils_1.updatePackageJSON,
-                    });
-                };
+                    }));
+                });
                 if (type) {
                     const generator = api.service.generators[type];
                     if (!generator) {
@@ -46,7 +46,7 @@ umi generate
                             throw new Error(`Generator ${type} is unable.The corresponding function has been turned on or is not available.`);
                         }
                     }
-                    runGenerator(generator);
+                    yield runGenerator(generator);
                 }
                 else {
                     const getEnableGenerators = (generators) => __awaiter(this, void 0, void 0, function* () {
@@ -83,7 +83,7 @@ umi generate
                         message: 'Pick generator type',
                         choices: questions,
                     });
-                    runGenerator(api.service.generators[gType]);
+                    yield runGenerator(api.service.generators[gType]);
                 }
             });
         },

package/dist/service/plugin.d.ts

@@ -20,7 +20,9 @@ export declare class Plugin {
     key: string;
     apply: Function;
     config: IPluginConfig;
-    enableBy: EnableBy | (() => boolean);
+    enableBy: EnableBy | ((opts: {
+        config: any;
+    }) => boolean);
     constructor(opts: IOpts);
     merge(opts: {
         key?: string;

package/dist/service/plugin.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Plugin = void 0;
+const esbuild_1 = __importDefault(require("@umijs/bundler-utils/compiled/esbuild"));
 const utils_1 = require("@umijs/utils");
 const assert_1 = __importDefault(require("assert"));
 const fs_1 = require("fs");
@@ -34,14 +35,23 @@ class Plugin {
         this.id = this.getId({ pkg, isPkgEntry, pkgJSONPath });
         this.key = this.getKey({ pkg, isPkgEntry });
         this.apply = () => {
+            utils_1.register.register({
+                implementor: esbuild_1.default,
+            });
+            utils_1.register.clearFiles();
+            let ret;
             try {
-                const ret = require(this.path);
-                // use the default member for es modules
-                return ret.__esModule ? ret.default : ret;
+                ret = require(this.path);
             }
             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];
+            }
+            utils_1.register.restore();
+            // use the default member for es modules
+            return ret.__esModule ? ret.default : ret;
         };
     }
     merge(opts) {
@@ -66,7 +76,7 @@ class Plugin {
         else {
             id = (0, utils_1.winPath)(this.path);
         }
-        id = id.replace('@umijs/preset-built-in/lib/plugins', '@@');
+        id = id.replace('@umijs/preset-umi/lib/plugins', '@@');
         id = id.replace(/\.js$/, '');
         return id;
     }

package/dist/service/pluginAPI.d.ts

@@ -1,12 +1,15 @@
+import { logger } from '@umijs/utils';
 import { EnableBy, IPluginConfig } from '../types';
 import { IOpts as ICommandOpts } from './command';
 import { IGeneratorOpts } from './generator';
 import { IOpts as IHookOpts } from './hook';
 import { Plugin } from './plugin';
 import { Service } from './service';
+declare type Logger = typeof logger;
 export declare class PluginAPI {
     service: Service;
     plugin: Plugin;
+    logger: Logger;
     constructor(opts: {
         service: Service;
         plugin: Plugin;
@@ -35,3 +38,4 @@ export declare class PluginAPI {
         staticProps: Record<string, any>;
     }): PluginAPI;
 }
+export {};

package/dist/service/pluginAPI.js

@@ -16,8 +16,24 @@ class PluginAPI {
     constructor(opts) {
         this.service = opts.service;
         this.plugin = opts.plugin;
-        // TODO
         // logger
+        const loggerKeys = [
+            'wait',
+            'error',
+            'warn',
+            'ready',
+            'info',
+            'event',
+        ];
+        // @ts-ignore
+        this.logger = loggerKeys.reduce((memo, key) => {
+            // @ts-ignore
+            memo[key] = (...message) => {
+                // @ts-ignore
+                utils_1.logger[key](utils_1.chalk.green(`[plugin: ${this.plugin.id}]`), ...message);
+            };
+            return memo;
+        }, {});
     }
     describe(opts) {
         this.plugin.merge(opts);
@@ -55,9 +71,12 @@ class PluginAPI {
         this.service.pluginMethods[opts.name] = {
             plugin: this.plugin,
             fn: opts.fn ||
-                ((fn) => {
+                // 这里不能用 arrow function，this 需指向执行此方法的 PluginAPI
+                // 否则 pluginId 会不会，导致不能正确 skip plugin
+                function (fn) {
+                    // @ts-ignore
                     this.register(Object.assign({ key: opts.name }, (utils_1.lodash.isPlainObject(fn) ? fn : { fn })));
-                }),
+                },
         };
     }
     registerPresets(source, presets) {

package/dist/service/service.d.ts

@@ -82,7 +82,9 @@ export interface IServicePluginAPI {
     onCheck: IEvent<null>;
     onStart: IEvent<null>;
     modifyAppData: IModify<typeof Service.prototype.appData, null>;
-    modifyConfig: IModify<typeof Service.prototype.config, null>;
+    modifyConfig: IModify<typeof Service.prototype.config, {
+        paths: Record<string, string>;
+    }>;
     modifyDefaultConfig: IModify<typeof Service.prototype.config, null>;
     modifyPaths: IModify<typeof Service.prototype.paths, null>;
     ApplyPluginsType: typeof ApplyPluginsType;

package/dist/service/service.js

@@ -192,26 +192,27 @@ class Service {
                 this.configOnChanges[key] = config.onChange || types_1.ConfigChangeType.reload;
             }
             // setup api.config from modifyConfig and modifyDefaultConfig
+            const paths = (0, path_2.getPaths)({
+                cwd: this.cwd,
+                env: this.env,
+                prefix: this.opts.frameworkName || constants_1.DEFAULT_FRAMEWORK_NAME,
+            });
+            if (this.config.outputPath) {
+                paths.absOutputPath = (0, path_1.join)(this.cwd, this.config.outputPath);
+            }
             this.stage = types_1.ServiceStage.resolveConfig;
             const config = yield this.applyPlugins({
                 key: 'modifyConfig',
                 initialValue: configManager.getConfig({
                     schemas: this.configSchemas,
                 }).config,
+                args: { paths },
             });
             const defaultConfig = yield this.applyPlugins({
                 key: 'modifyDefaultConfig',
                 initialValue: this.configDefaults,
             });
             this.config = utils_1.lodash.merge(defaultConfig, config);
-            const paths = (0, path_2.getPaths)({
-                cwd: this.cwd,
-                env: this.env,
-                prefix: this.opts.frameworkName || constants_1.DEFAULT_FRAMEWORK_NAME,
-            });
-            if (this.config.outputPath) {
-                paths.absOutputPath = (0, path_1.join)(this.cwd, this.config.outputPath);
-            }
             this.paths = yield this.applyPlugins({
                 key: 'modifyPaths',
                 initialValue: paths,
@@ -340,7 +341,7 @@ class Service {
         if (enableBy === types_1.EnableBy.config && !(key in this.config))
             return false;
         if (typeof enableBy === 'function')
-            return enableBy();
+            return enableBy({ config: this.config });
         // EnableBy.register
         return true;
     }

package/package.json

@@ -1,6 +1,13 @@
 {
   "name": "@umijs/core",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.9",
+  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/core#readme",
+  "bugs": "https://github.com/umijs/umi-next/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/umijs/umi-next"
+  },
+  "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -12,22 +19,9 @@
     "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
     "dev": "pnpm build -- --watch"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/umijs/umi-next"
-  },
-  "authors": [
-    "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
-  ],
-  "license": "MIT",
-  "bugs": "https://github.com/umijs/umi-next/issues",
-  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/core#readme",
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-beta.5",
-    "@umijs/utils": "4.0.0-beta.5"
+    "@umijs/bundler-utils": "4.0.0-beta.9",
+    "@umijs/utils": "4.0.0-beta.9"
   },
   "devDependencies": {
     "@hapi/joi": "17.1.1",
@@ -36,6 +30,12 @@
     "just-diff": "3.1.1",
     "tapable": "2.2.1"
   },
+  "publishConfig": {
+    "access": "public"
+  },
+  "authors": [
+    "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
+  ],
   "compiledConfig": {
     "deps": [
       "@hapi/joi",