dumi 2.4.25 → 2.4.27

package/dist/features/compile/index.js

@@ -35,6 +35,7 @@ __export(compile_exports, {
 module.exports = __toCommonJS(compile_exports);
 var import_react = __toESM(require("../../techStacks/react"));
 var import_utils = require("../../utils");
+var import_enhanced_resolve = __toESM(require("enhanced-resolve"));
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_assets = require("../assets");
@@ -42,6 +43,31 @@ var import_makoHooks = require("./makoHooks");
 var import_utils2 = require("./utils");
 var import_utoopackLoaders = require("./utoopackLoaders");
 var techStacks = [];
+function normalizeMakoAliases(alias, cwd) {
+  const normalizedAlias = { ...alias };
+  const resolver = import_enhanced_resolve.default.create.sync({
+    alias,
+    conditionNames: ["import", "require", "default", "browser", "node"],
+    extensions: [".js", ".jsx", ".ts", ".tsx", ".mjs", ".json"],
+    exportsFields: [],
+    mainFields: ["browser", "module", "main"]
+  });
+  Object.keys(alias).forEach((key) => {
+    if (!key.endsWith("$"))
+      return;
+    const makoAliasKey = key.slice(0, -1);
+    const aliasValue = alias[key];
+    delete normalizedAlias[key];
+    if (makoAliasKey in normalizedAlias)
+      return;
+    try {
+      normalizedAlias[makoAliasKey] = resolver(cwd, aliasValue);
+    } catch {
+      normalizedAlias[makoAliasKey] = aliasValue;
+    }
+  });
+  return normalizedAlias;
+}
 var compile_default = (api) => {
   api.describe({ key: "dumi:compile" });
   api.register({
@@ -182,6 +208,7 @@ var compile_default = (api) => {
     fn: (memo) => {
       var _a;
       if (memo.mako || ((_a = memo.ssr) == null ? void 0 : _a.builder) === "mako") {
+        memo.alias = normalizeMakoAliases(memo.alias, api.cwd);
         memo.mako ?? (memo.mako = {});
         memo.mako.plugins = [
           {

package/dist/features/compile/utoopackLoaders.js

@@ -109,6 +109,13 @@ var getUtoopackRules = (api) => {
     disableLiveDemo,
     [UTOOPACK_LOADER_CTX_KEY]: loaderContextPath
   });
+  const externalDemoLoader = {
+    loader: require.resolve("../../loaders/demo"),
+    options: toSerializable({
+      cwd: api.cwd,
+      [UTOOPACK_LOADER_CTX_KEY]: loaderContextPath
+    })
+  };
   return {
     // handle ?watch=parent virtual module: return empty content to establish file-watching dependency
     "**/*": [
@@ -130,16 +137,34 @@ var getUtoopackRules = (api) => {
       // handle external demo component files (?techStack=xxx)
       // techStacks are NOT serializable; pass loaderContextPath and hydrate in the loader
       {
-        condition: { query: /^\?techStack=.*$/ },
-        loaders: [
-          {
-            loader: require.resolve("../../loaders/demo"),
-            options: toSerializable({
-              cwd: api.cwd,
-              [UTOOPACK_LOADER_CTX_KEY]: loaderContextPath
-            })
-          }
-        ],
+        condition: {
+          all: [{ query: /^\?techStack=.*$/ }, { path: /\.tsx$/ }]
+        },
+        loaders: [externalDemoLoader],
+        as: "*.tsx"
+      },
+      {
+        condition: {
+          all: [{ query: /^\?techStack=.*$/ }, { path: /\.ts$/ }]
+        },
+        loaders: [externalDemoLoader],
+        as: "*.ts"
+      },
+      {
+        condition: {
+          all: [{ query: /^\?techStack=.*$/ }, { path: /\.jsx$/ }]
+        },
+        loaders: [externalDemoLoader],
+        as: "*.jsx"
+      },
+      {
+        condition: {
+          all: [
+            { query: /^\?techStack=.*$/ },
+            { not: { path: /\.(tsx?|jsx)$/ } }
+          ]
+        },
+        loaders: [externalDemoLoader],
         as: "*.js"
       }
     ],

package/dist/features/derivative.js

@@ -91,8 +91,8 @@ var derivative_default = (api) => {
       );
     }
     (0, import_assert.default)(
-      !api.config.ssr || api.config.ssr.builder === "webpack" || api.config.ssr.builder === "mako",
-      "Only `webpack` and `mako` builder is supported in SSR mode!"
+      !api.config.ssr || api.config.ssr.builder === "webpack" || api.config.ssr.builder === "mako" || api.config.ssr.builder === "utoopack",
+      "Only `webpack`, `mako` and `utoopack` builder is supported in SSR mode!"
     );
     (0, import_assert.default)(
       ((_a = api.config.cssLoader) == null ? void 0 : _a.modules) === void 0 && api.config.cssLoaderModules === void 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.4.25",
+  "version": "2.4.27",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",
@@ -65,9 +65,9 @@
     "@swc/core": "1.9.2",
     "@types/hast": "^2.3.5",
     "@types/mdast": "^3.0.12",
-    "@umijs/bundler-utils": "^4.6.53",
-    "@umijs/core": "^4.6.53",
-    "@umijs/utils": "^4.6.53",
+    "@umijs/bundler-utils": "^4.6.55",
+    "@umijs/core": "^4.6.55",
+    "@umijs/utils": "^4.6.55",
     "animated-scroll-to": "^2.3.0",
     "classnames": "2.3.2",
     "codesandbox-import-utils": "^2.2.3",
@@ -119,7 +119,7 @@
     "sass": "^1.64.1",
     "sitemap": "^7.1.1",
     "sucrase": "^3.34.0",
-    "umi": "^4.6.53",
+    "umi": "^4.6.55",
     "unified": "^10.1.2",
     "unist-util-visit": "^4.1.2",
     "unist-util-visit-parents": "^5.1.3",
@@ -142,7 +142,7 @@
     "@types/react": "^18.2.17",
     "@types/react-copy-to-clipboard": "^5.0.4",
     "@types/react-dom": "^18.2.7",
-    "@umijs/lint": "^4.6.53",
+    "@umijs/lint": "^4.6.55",
     "@umijs/plugins": "4.0.32",
     "eslint": "^8.46.0",
     "esno": "^4.7.0",