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

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.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/service.d.ts

@@ -52,7 +52,13 @@ 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: {

package/dist/service/service.js

@@ -313,6 +313,7 @@ class Service {
                     'config',
                     'cwd',
                     'pkg',
+                    'pkgPath',
                     'name',
                     'paths',
                     'userConfig',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.0.0-beta.16",
+  "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.16",
-    "@umijs/utils": "4.0.0-beta.16"
+    "@umijs/bundler-utils": "4.0.0-beta.17",
+    "@umijs/utils": "4.0.0-beta.17"
   },
   "devDependencies": {
     "@hapi/joi": "17.1.1",