dumi 2.4.26 → 2.4.28

package/dist/features/compile/index.js

@@ -230,7 +230,7 @@ var compile_default = (api) => {
             ...memo.utoopack.module || {},
             rules: {
               ...((_a = memo.utoopack.module) == null ? void 0 : _a.rules) || {},
-              ...(0, import_utoopackLoaders.getUtoopackRules)(api)
+              ...(0, import_utoopackLoaders.getUtoopackRules)(api, memo)
             }
           }
         };

package/dist/features/compile/utoopackLoaders.d.ts

@@ -5,4 +5,4 @@ export declare function buildLoaderContextContent(techStacks: IDumiTechStack[],
     specifier: string;
     source: string;
 }>, routes?: Record<string, unknown>): string;
-export declare const getUtoopackRules: (api: IApi) => Record<string, unknown>;
+export declare const getUtoopackRules: (api: IApi, config?: IApi['config']) => Record<string, unknown>;

package/dist/features/compile/utoopackLoaders.js

@@ -85,16 +85,16 @@ exports.builtins = ${JSON.stringify(builtins)};
 exports.routes = ${JSON.stringify(routes)};
 `;
 }
-var getUtoopackRules = (api) => {
+var getUtoopackRules = (api, config = api.config) => {
   const disableLiveDemo = (0, import_utils.shouldDisabledLiveDemo)(api);
   const loaderContextPath = import_path.default.join(
     api.paths.absTmpPath,
     LOADER_CTX_FILENAME
   );
-  const cfgResolve = api.config.resolve ?? {};
+  const cfgResolve = config.resolve ?? {};
   const serializableBaseOpts = toSerializable({
     cwd: api.cwd,
-    alias: api.config.alias || {},
+    alias: config.alias || {},
     resolve: {
       atomDirs: cfgResolve.atomDirs ?? [{ type: "component", dir: "src" }],
       docDirs: cfgResolve.docDirs ?? ["docs"],
@@ -104,11 +104,18 @@ var getUtoopackRules = (api) => {
     },
     routes: {},
     builtins: {},
-    locales: api.config.locales || [],
+    locales: config.locales || [],
     pkg: api.pkg,
     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.26",
+  "version": "2.4.28",
   "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",