@umijs/core 4.0.0-beta.13 → 4.0.0-beta.17

package/dist/config/config.js

@@ -114,7 +114,6 @@ class Config {
         let config = {};
         let files = [];
         for (const configFile of opts.configFiles) {
-            files.push(configFile);
             if ((0, fs_1.existsSync)(configFile)) {
                 utils_1.register.register({
                     implementor: esbuild_1.default,
@@ -124,9 +123,13 @@ class Config {
                 for (const file of utils_1.register.getFiles()) {
                     delete require.cache[file];
                 }
+                // includes the config File
                 files.push(...utils_1.register.getFiles());
                 utils_1.register.restore();
             }
+            else {
+                files.push(configFile);
+            }
         }
         return {
             config,

package/dist/route/routeUtils.d.ts

@@ -4,4 +4,5 @@ export declare function addParentRoute(opts: {
     addToAll?: boolean;
     target: IRoute;
     routes: Record<string, IRoute>;
+    test?: Function;
 }): void;

package/dist/route/routeUtils.js

@@ -4,13 +4,16 @@ exports.addParentRoute = void 0;
 function addParentRoute(opts) {
     if (opts.addToAll) {
         for (const id of Object.keys(opts.routes)) {
-            if (opts.routes[id].parentId === undefined) {
+            if (opts.routes[id].parentId === undefined &&
+                (!opts.test || opts.test(opts.routes[id]))) {
                 opts.routes[id].parentId = opts.target.id;
             }
         }
     }
     else if (opts.id) {
-        opts.routes[opts.id].parentId = opts.target.id;
+        if (!opts.test || opts.test(opts.routes[opts.id])) {
+            opts.routes[opts.id].parentId = opts.target.id;
+        }
     }
     else {
         throw new Error(`addParentRoute failed, opts.addToAll or opts.id must be supplied.`);

package/dist/route/routesConvention.d.ts

@@ -1,4 +1,5 @@
 export declare function getConventionRoutes(opts: {
     base: string;
     prefix?: string;
+    exclude?: RegExp[];
 }): any;

package/dist/route/routesConvention.js

@@ -18,12 +18,9 @@ function getConventionRoutes(opts) {
         dir: opts.base,
         visitor: (file) => {
             const routeId = (0, utils_2.createRouteId)(file);
-            if ((0, utils_2.isRouteModuleFile)({ file })) {
+            if ((0, utils_2.isRouteModuleFile)({ file: (0, utils_1.winPath)(file), exclude: opts.exclude })) {
                 files[routeId] = (0, utils_1.winPath)(file);
             }
-            else {
-                throw new Error(`Invalid route module file: ${(0, path_1.join)(opts.base, file)}`);
-            }
         },
     });
     const routeIds = Object.keys(files).sort(utils_2.byLongestFirst);
@@ -52,13 +49,13 @@ function visitFiles(opts) {
             visitFiles(Object.assign(Object.assign({}, opts), { dir: file }));
         }
         else if (stat.isFile() &&
-            ['.tsx', '.ts', '.js', '.jsx'].includes((0, path_1.extname)(file))) {
+            ['.tsx', '.ts', '.js', '.jsx', '.md', '.mdx'].includes((0, path_1.extname)(file))) {
             opts.visitor((0, path_1.relative)(opts.baseDir, file));
         }
     }
 }
 function createRoutePath(routeId) {
-    const path = routeId
+    let path = routeId
         // routes/$ -> routes/*
         // routes/nested/$.tsx (with a "routes/nested.tsx" layout)
         .replace(/^\$$/, '*')
@@ -69,5 +66,7 @@ function createRoutePath(routeId) {
         .replace(/\$/g, ':')
         // routes/not.nested -> routes/not/nested
         .replace(/\./g, '/');
-    return /\b\/?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.d.ts

@@ -4,4 +4,5 @@ export declare function byLongestFirst(a: string, b: string): number;
 export declare function findParentRouteId(routeIds: string[], childRouteId: string): string | undefined;
 export declare function isRouteModuleFile(opts: {
     file: string;
+    exclude?: RegExp[];
 }): boolean;

package/dist/route/utils.js

@@ -21,6 +21,14 @@ function findParentRouteId(routeIds, childRouteId) {
 exports.findParentRouteId = findParentRouteId;
 const routeModuleExts = ['.js', '.jsx', '.ts', '.tsx', '.md', '.mdx'];
 function isRouteModuleFile(opts) {
+    // TODO: add cache strategy
+    for (const excludeRegExp of opts.exclude || []) {
+        if (opts.file &&
+            excludeRegExp instanceof RegExp &&
+            excludeRegExp.test(opts.file)) {
+            return false;
+        }
+    }
     return routeModuleExts.includes((0, path_1.extname)(opts.file));
 }
 exports.isRouteModuleFile = isRouteModuleFile;

package/dist/service/plugin.d.ts

@@ -21,6 +21,7 @@ export declare class Plugin {
     apply: Function;
     config: IPluginConfig;
     enableBy: EnableBy | ((opts: {
+        userConfig: any;
         config: any;
         env: Env;
     }) => boolean);

package/dist/service/plugin.js

@@ -114,9 +114,9 @@ class Plugin {
                     .split(',')
                     .filter(Boolean),
                 // dependencies
-                ...Object.keys(opts.pkg.devDependencies || {})
-                    .concat(Object.keys(opts.pkg.dependencies || {}))
-                    .filter(Plugin.isPluginOrPreset.bind(null, type)),
+                // ...Object.keys(opts.pkg.devDependencies || {})
+                //   .concat(Object.keys(opts.pkg.dependencies || {}))
+                //   .filter(Plugin.isPluginOrPreset.bind(null, type)),
                 // user config
                 ...(opts.userConfig[types] || []),
             ].map((path) => {

package/dist/service/pluginAPI.d.ts

@@ -18,7 +18,7 @@ export declare class PluginAPI {
         key?: string;
         config?: IPluginConfig;
         enableBy?: EnableBy | ((enableByOpts: {
-            config: any;
+            userConfig: any;
             env: Env;
         }) => boolean);
     }): void;

package/dist/service/service.d.ts

@@ -16,7 +16,11 @@ interface IOpts {
 export declare class Service {
     private opts;
     appData: {
-        deps?: Record<string, string>;
+        deps?: Record<string, {
+            version: string;
+            matches: string[];
+            subpaths: string[];
+        }>;
         [key: string]: any;
     };
     args: yParser.Arguments;
@@ -39,6 +43,7 @@ export declare class Service {
         absOutputPath?: string;
     };
     plugins: Record<string, Plugin>;
+    keyToPluginMap: Record<string, Plugin>;
     pluginMethods: Record<string, {
         plugin: Plugin;
         fn: Function;
@@ -47,7 +52,14 @@ export declare class Service {
     stage: ServiceStage;
     userConfig: Record<string, any>;
     configManager: Config | null;
-    pkg: Record<string, string | Record<string, any>>;
+    pkg: {
+        name?: string;
+        version?: string;
+        dependencies?: Record<string, string>;
+        devDependencies?: Record<string, string>;
+        [key: string]: any;
+    };
+    pkgPath: string;
     constructor(opts: IOpts);
     applyPlugins<T>(opts: {
         key: string;
@@ -69,7 +81,7 @@ export declare class Service {
         presets?: Plugin[];
         plugins: Plugin[];
     }): Promise<any>;
-    isPluginEnable(hook: Hook): boolean;
+    isPluginEnable(hook: Hook | string): boolean;
 }
 export interface IServicePluginAPI {
     appData: typeof Service.prototype.appData;
@@ -79,10 +91,12 @@ export interface IServicePluginAPI {
     cwd: typeof Service.prototype.cwd;
     generators: typeof Service.prototype.generators;
     pkg: typeof Service.prototype.pkg;
+    pkgPath: typeof Service.prototype.pkgPath;
     name: typeof Service.prototype.name;
     paths: Required<typeof Service.prototype.paths>;
     userConfig: typeof Service.prototype.userConfig;
     env: typeof Service.prototype.env;
+    isPluginEnable: typeof Service.prototype.isPluginEnable;
     onCheck: IEvent<null>;
     onStart: IEvent<null>;
     modifyAppData: IModify<typeof Service.prototype.appData, null>;

package/dist/service/service.js

@@ -41,12 +41,14 @@ class Service {
         this.paths = {};
         // preset is plugin with different type
         this.plugins = {};
+        this.keyToPluginMap = {};
         this.pluginMethods = {};
         this.skipPluginIds = new Set();
         this.stage = types_1.ServiceStage.uninitialized;
         this.userConfig = {};
         this.configManager = null;
         this.pkg = {};
+        this.pkgPath = '';
         this.cwd = opts.cwd;
         this.env = opts.env;
         this.opts = opts;
@@ -135,19 +137,23 @@ class Service {
             (0, env_1.loadEnv)({ cwd: this.cwd, envFile: '.env' });
             // get pkg from package.json
             let pkg = {};
+            let pkgPath = '';
             try {
                 pkg = require((0, path_1.join)(this.cwd, 'package.json'));
+                pkgPath = (0, path_1.join)(this.cwd, 'package.json');
             }
             catch (_e) {
                 // APP_ROOT
                 if (this.cwd !== process.cwd()) {
                     try {
                         pkg = require((0, path_1.join)(process.cwd(), 'package.json'));
+                        pkgPath = (0, path_1.join)(process.cwd(), 'package.json');
                     }
                     catch (_e) { }
                 }
             }
             this.pkg = pkg;
+            this.pkgPath = pkgPath;
             // get user config
             const configManager = new config_1.Config({
                 cwd: this.cwd,
@@ -181,6 +187,10 @@ 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];
@@ -203,9 +213,12 @@ class Service {
             this.stage = types_1.ServiceStage.resolveConfig;
             const config = yield this.applyPlugins({
                 key: 'modifyConfig',
-                initialValue: configManager.getConfig({
+                // why clone deep?
+                // user may change the config in modifyConfig
+                // e.g. memo.alias = xxx
+                initialValue: utils_1.lodash.cloneDeep(configManager.getConfig({
                     schemas: this.configSchemas,
-                }).config,
+                }).config),
                 args: { paths },
             });
             const defaultConfig = yield this.applyPlugins({
@@ -226,6 +239,7 @@ class Service {
                     // base
                     cwd: this.cwd,
                     pkg,
+                    pkgPath,
                     plugins,
                     presets,
                     name,
@@ -299,10 +313,12 @@ class Service {
                     'config',
                     'cwd',
                     'pkg',
+                    'pkgPath',
                     'name',
                     'paths',
                     'userConfig',
                     'env',
+                    'isPluginEnable',
                 ],
                 staticProps: {
                     ApplyPluginsType: types_1.ApplyPluginsType,
@@ -337,21 +353,30 @@ class Service {
         });
     }
     isPluginEnable(hook) {
-        const { id, key, enableBy } = hook.plugin;
+        let plugin;
+        if (hook.plugin) {
+            plugin = hook.plugin;
+        }
+        else {
+            plugin = this.keyToPluginMap[hook];
+        }
+        const { id, key, enableBy } = plugin;
         if (this.skipPluginIds.has(id))
             return false;
         if (this.userConfig[key] === false)
             return false;
-        if (enableBy === types_1.EnableBy.config &&
-            // this.config is not ready when modifyConfig or modifyDefaultConfig is called
-            // fallback to this.userConfig
-            !(key in
-                (['modifyConfig', 'modifyDefaultConfig'].includes(hook.key)
-                    ? this.userConfig
-                    : this.config)))
+        if (this.config[key] === false)
             return false;
+        if (enableBy === types_1.EnableBy.config) {
+            // TODO: 提供单独的命令用于启用插件
+            return key in this.userConfig;
+        }
         if (typeof enableBy === 'function')
-            return enableBy({ config: this.config, env: this.env });
+            return enableBy({
+                userConfig: this.userConfig,
+                config: this.config,
+                env: this.env,
+            });
         // EnableBy.register
         return true;
     }

package/dist/types.d.ts

@@ -44,6 +44,7 @@ export interface IRoute {
     file: string;
     id: string;
     parentId?: string;
+    [key: string]: any;
 }
 export interface IEvent<T> {
     (fn: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.0.0-beta.13",
+  "version": "4.0.0-beta.17",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/core#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
   "repository": {
@@ -20,8 +20,8 @@
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-beta.13",
-    "@umijs/utils": "4.0.0-beta.13"
+    "@umijs/bundler-utils": "4.0.0-beta.17",
+    "@umijs/utils": "4.0.0-beta.17"
   },
   "devDependencies": {
     "@hapi/joi": "17.1.1",