dumi 2.0.0-beta.11 → 2.0.0-beta.13

package/dist/features/configPlugins/schema.js

@@ -30,7 +30,7 @@ function getSchemas() {
     resolve: (Joi) => Joi.object({
       docDirs: Joi.array().items(Joi.alternatives(Joi.string(), Joi.object({ dir: Joi.string(), type: Joi.string().optional() }))).optional(),
       atomDirs: Joi.array().items(Joi.object({ type: Joi.string(), dir: Joi.string() })).optional(),
-      entityDirs: Joi.forbidden().error(new Error("`entityDirs` is already deprecated, please rename it to `atomDirs` in `.umirc.ts` or `config/config.ts`")),
+      entityDirs: Joi.forbidden().error(new Error("`entityDirs` is already deprecated, please rename it to `atomDirs` in `.dumirc.ts`")),
       codeBlockMode: Joi.string().valid("active", "passive").optional(),
       entryFile: Joi.string().optional()
     }).optional(),

package/dist/features/routes.js

@@ -44,6 +44,12 @@ function localizeUmiRoute(route, locales) {
     route.absPath = route.path !== "/" ? `/${route.path}` : route.path;
   }
 }
+function flatRoute(route) {
+  if (route.parentId !== "DocLayout") {
+    route.parentId = "DocLayout";
+    route.path = route.path === "*" ? route.path : route.absPath.slice(1);
+  }
+}
 var routes_default = (api) => {
   var _a, _b, _c;
   const extraWatchPaths = [
@@ -111,9 +117,9 @@ var routes_default = (api) => {
       };
     }
     Object.entries(pages).forEach(([, route]) => {
-      route.parentId = docLayoutId;
       route.file = (0, import_plugin_utils.winPath)(import_path.default.resolve(pagesDir, route.file));
-      route.path = route.absPath.slice(1);
+      flatRoute(route);
+      routes[route.id] = route;
     });
     docDirs.map(normalizeDocDir).forEach(({ type, dir }) => {
       const base = import_path.default.join(api.cwd, dir);
@@ -123,8 +129,7 @@ var routes_default = (api) => {
       });
       Object.entries(dirRoutes).forEach(([key, route]) => {
         route.id = `${dir}/${key}`;
-        route.parentId = docLayoutId;
-        route.path = route.absPath.slice(1);
+        flatRoute(route);
         if (type) {
           const pluralType = (0, import_pluralize.plural)(type);
           route.path = `${pluralType}/${route.path}`.replace(/\/+$/, "/");

package/dist/features/tabs.js

@@ -48,6 +48,7 @@ var tabs_default = (api) => {
     });
     tabsFromPlugins.forEach((tab) => {
       tab.id ?? (tab.id = `plugin-tab${tab.test ? `-${tab.test}` : ""}-${tab.key}`);
+      tab.component = (0, import_plugin_utils.winPath)(tab.component);
     });
     return memo;
   });

package/dist/features/theme/index.js

@@ -39,7 +39,7 @@ function getPkgThemeName(api) {
 }
 function getPkgThemePath(api) {
   const pkgThemeName = getPkgThemeName(api);
-  return pkgThemeName && import_path.default.basename(require.resolve(`${pkgThemeName}/package.json`, { paths: [api.cwd] }));
+  return pkgThemeName && import_path.default.dirname(require.resolve(`${pkgThemeName}/package.json`, { paths: [api.cwd] }));
 }
 var theme_default = (api) => {
   const defaultThemeData = (0, import_loader.default)(DEFAULT_THEME_PATH);
@@ -147,6 +147,16 @@ export default function DumiContextWrapper() {
 }`
     });
   });
+  if (require("@umijs/core/package").__npminstall_done && import_fs.default.existsSync(localThemePath) && import_fs.default.lstatSync(localThemePath).isSymbolicLink()) {
+    api.chainWebpack((memo) => {
+      const devThemeNodeModules = import_path.default.join(api.cwd, "../node_modules");
+      memo.snapshot((0, import_plugin_utils.deepmerge)(memo.get("snapshot"), {
+        immutablePaths: [devThemeNodeModules],
+        managedPaths: [devThemeNodeModules]
+      }));
+      return memo;
+    });
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/preset.js

@@ -25,8 +25,21 @@ __export(preset_exports, {
   default: () => preset_default
 });
 module.exports = __toCommonJS(preset_exports);
+var import_fs = __toESM(require("fs"));
+var import_path = __toESM(require("path"));
+var import_plugin_utils = require("umi/plugin-utils");
 var preset_default = (api) => {
   api.describe({ key: "dumi-preset" });
+  const legacyConfig = [
+    ".umirc.ts",
+    ".umirc.js",
+    "config/config.ts",
+    "config/config.js"
+  ].find((file) => import_fs.default.existsSync(import_path.default.join(api.cwd, file)));
+  if (legacyConfig) {
+    import_plugin_utils.logger.warn(`Detected you are using legacy config file \`${legacyConfig}\`, it will no longer be loaded, please migrate to the new \`.dumirc.ts\` file, and the tmp file also from \`.umi\` to \`.dumi/tmp\`, please update related files such as \`.gitignore\`, \`tsconfig.json\` & etc.`);
+    import_plugin_utils.logger.warn(`\u68C0\u6D4B\u5230\u4F60\u5728\u4F7F\u7528\u65E7\u914D\u7F6E\u6587\u4EF6 \`${legacyConfig}\`\uFF0C\u5B83\u5DF2\u4E0D\u518D\u751F\u6548\uFF0C\u8BF7\u5C06\u5185\u5BB9\u8FC1\u79FB\u5230\u65B0\u7684 \`.dumirc.ts\` \u914D\u7F6E\u6587\u4EF6\u4E2D\uFF0C\u53E6\u5916\u4E34\u65F6\u6587\u4EF6\u5939\u4E5F\u4ECE \`.umi\` \u8FC1\u79FB\u5230 \`.dumi/tmp\`\uFF0C\u8BF7\u540C\u65F6\u66F4\u65B0\u76F8\u5173\u6587\u4EF6\u5982 \`.gitignore\`\u3001\`tsconfig.json\` \u7B49`);
+  }
   return {
     plugins: [
       require.resolve("./registerMethods"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.0.0-beta.11",
+  "version": "2.0.0-beta.13",
   "description": "Framework for developing UI components",
   "keywords": [],
   "license": "MIT",