dumi 2.4.51 → 2.4.52

package/dist/assetParsers/block.d.ts

@@ -11,6 +11,8 @@ export interface IParsedBlockAsset {
      * }
      */
     resolveMap: Record<string, string>;
+    /** Resolved ordinary styles requested exclusively by side-effect imports. */
+    sideEffectStyles?: string[];
     frontmatter: ReturnType<typeof parseCodeFrontmatter>['frontmatter'];
 }
 interface IParseBlockAssetOptions {
@@ -22,6 +24,7 @@ interface IParseBlockAssetOptions {
     resolver: typeof sync;
     techStack: IDumiTechStack;
     cacheable?: boolean;
+    collectSideEffectStyles?: boolean;
 }
 declare function parseBlockAsset(opts: IParseBlockAssetOptions): Promise<IParsedBlockAsset>;
 export default parseBlockAsset;

package/dist/assetParsers/block.js

@@ -33,6 +33,7 @@ __export(block_exports, {
 });
 module.exports = __toCommonJS(block_exports);
 var import_utils = require("../utils");
+var import_core = require("@swc/core");
 var import_esbuild = require("@umijs/bundler-utils/compiled/esbuild");
 var import_assert = __toESM(require("assert"));
 var import_fs = __toESM(require("fs"));
@@ -42,9 +43,11 @@ var import_constants = require("../constants");
 var MAX_BLOCK_ASSET_CACHE_SIZE = 512;
 var blockAssetCache = /* @__PURE__ */ new Map();
 function cloneParsedBlockAsset(ret) {
+  var _a;
   return {
     asset: JSON.parse(JSON.stringify(ret.asset)),
     resolveMap: { ...ret.resolveMap },
+    sideEffectStyles: (_a = ret.sideEffectStyles) == null ? void 0 : _a.slice(),
     frontmatter: ret.frontmatter ? JSON.parse(JSON.stringify(ret.frontmatter)) : ret.frontmatter
   };
 }
@@ -72,7 +75,8 @@ function getParseCacheKey(opts) {
     runtimeOpts: opts.techStack.runtimeOpts,
     hasOnBlockLoad: Boolean(opts.techStack.onBlockLoad),
     hasGenerateMetadata: Boolean(opts.techStack.generateMetadata),
-    hasGenerateSources: Boolean(opts.techStack.generateSources)
+    hasGenerateSources: Boolean(opts.techStack.generateSources),
+    collectSideEffectStyles: Boolean(opts.collectSideEffectStyles)
   });
 }
 function getParseDeps(ret, entryFile) {
@@ -98,6 +102,31 @@ function setCachedBlockAsset(cacheKey, ret, deps) {
     result: cloneParsedBlockAsset(ret)
   });
 }
+function getSideEffectImports(code, ext) {
+  const imports = /* @__PURE__ */ Object.create(null);
+  try {
+    const program = (0, import_core.parseSync)(
+      code,
+      ext === ".ts" || ext === ".tsx" ? { syntax: "typescript", tsx: ext === ".tsx", decorators: true } : { syntax: "ecmascript", jsx: ext === ".jsx", decorators: true }
+    );
+    for (const item of program.body) {
+      if (item.type === "ImportDeclaration") {
+        if (item.typeOnly || item.specifiers.length > 0 && item.specifiers.every(
+          (specifier) => specifier.type === "ImportSpecifier" && specifier.isTypeOnly
+        )) {
+          continue;
+        }
+        const source = item.source.value;
+        imports[source] = imports[source] !== false && item.specifiers.length === 0;
+      } else if ((item.type === "ExportNamedDeclaration" || item.type === "ExportAllDeclaration") && item.source && !(item.type === "ExportNamedDeclaration" && item.typeOnly)) {
+        imports[item.source.value] = false;
+      }
+    }
+  } catch {
+    return {};
+  }
+  return imports;
+}
 async function parseBlockAsset(opts) {
   const cacheKey = opts.cacheable ? getParseCacheKey(opts) : "";
   const cached = cacheKey ? getCachedBlockAsset(cacheKey) : void 0;
@@ -114,8 +143,10 @@ async function parseBlockAsset(opts) {
   const result = {
     asset,
     resolveMap: {},
+    sideEffectStyles: [],
     frontmatter: null
   };
+  const styleImports = /* @__PURE__ */ new Map();
   const deferrer = (0, import_esbuild.build)({
     // do not emit file
     write: false,
@@ -132,12 +163,20 @@ async function parseBlockAsset(opts) {
         name: "plugin-dumi-collect-deps",
         setup: (builder) => {
           builder.onResolve({ filter: /.*/ }, (args) => {
-            if (args.kind !== "entry-point" && !args.path.startsWith(".")) {
-              const resolved = opts.resolver(args.resolveDir, args.path);
-              (0, import_assert.default)(
-                resolved,
-                `Can't resolve ${args.path} from ${args.resolveDir}`
+            var _a, _b;
+            const resolved = args.kind === "entry-point" ? import_path.default.join(args.resolveDir, args.path) : opts.resolver(args.resolveDir, args.path);
+            (0, import_assert.default)(
+              resolved,
+              `Can't resolve ${args.path} from ${args.resolveDir}`
+            );
+            if (opts.collectSideEffectStyles && opts.techStack.runtimeOpts && args.kind !== "entry-point" && !/[?#]/.test(args.path) && /\.(css|less|sass|scss|styl)$/i.test(resolved) && !/\.module\.[^.]+$/i.test(resolved)) {
+              const key = args.path.startsWith(".") ? (0, import_plugin_utils.winPath)(resolved) : args.path;
+              styleImports.set(
+                key,
+                styleImports.get(key) !== false && args.kind === "import-statement" && ((_b = (_a = args.pluginData) == null ? void 0 : _a.sideEffectImports) == null ? void 0 : _b[args.path]) === true
               );
+            }
+            if (args.kind !== "entry-point" && !args.path.startsWith(".")) {
               const pkgJsonPath = import_plugin_utils.pkgUp.pkgUpSync({
                 cwd: resolved
               });
@@ -153,7 +192,7 @@ async function parseBlockAsset(opts) {
               return { path: args.path, external: true };
             }
             return {
-              path: args.kind !== "entry-point" ? opts.resolver(args.resolveDir, args.path) : import_path.default.join(args.resolveDir, args.path),
+              path: resolved,
               pluginData: {
                 kind: args.kind,
                 resolveDir: args.resolveDir,
@@ -219,7 +258,10 @@ async function parseBlockAsset(opts) {
               return {
                 // only continue to load for module files
                 contents: isModule ? contents ?? file.value : "",
-                loader: isModule ? ext.slice(1) : "text"
+                loader: isModule ? ext.slice(1) : "text",
+                pluginData: {
+                  sideEffectImports: opts.collectSideEffectStyles && isModule ? getSideEffectImports(contents ?? file.value, ext) : {}
+                }
               };
             }
           });
@@ -233,6 +275,9 @@ async function parseBlockAsset(opts) {
   } catch {
     hasError = true;
   }
+  if (!hasError) {
+    result.sideEffectStyles = Array.from(styleImports).filter(([, sideEffectOnly]) => sideEffectOnly).map(([key]) => key);
+  }
   if (!hasError && cacheKey) {
     setCachedBlockAsset(
       cacheKey,

package/dist/features/compile/index.js

@@ -142,7 +142,8 @@ var compile_default = (api) => {
             api.config.extraRemarkPlugins,
             api.config.extraRehypePlugins,
             ((_b = api.service.configManager) == null ? void 0 : _b.files) ?? [],
-            demoAssetsFile
+            demoAssetsFile,
+            api.config.alias
           )
         });
       }

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

@@ -5,5 +5,5 @@ export declare const UTOOPACK_DEMO_ASSETS_FILENAME = "dumi-utoopack-demo-assets.
 export declare function buildLoaderContextContent(techStacks: IDumiTechStack[], builtins?: Record<string, {
     specifier: string;
     source: string;
-}>, routes?: Record<string, unknown>, extraRemarkPlugins?: IApi['config']['extraRemarkPlugins'], extraRehypePlugins?: IApi['config']['extraRehypePlugins'], sourceFiles?: string[], demoAssetsFile?: string): string;
+}>, routes?: Record<string, unknown>, extraRemarkPlugins?: IApi['config']['extraRemarkPlugins'], extraRehypePlugins?: IApi['config']['extraRehypePlugins'], sourceFiles?: string[], demoAssetsFile?: string, alias?: IApi['config']['alias']): string;
 export declare const getUtoopackRules: (api: IApi, config?: IApi['config']) => Record<string, unknown>;

package/dist/features/compile/utoopackLoaders.js

@@ -171,7 +171,7 @@ function toPluginRefs(plugins = [], sourceFiles = []) {
     return toPluginTargetRef(plugin, sourceFiles);
   }).join(", ")}]`;
 }
-function buildLoaderContextContent(techStacks, builtins = {}, routes = {}, extraRemarkPlugins = [], extraRehypePlugins = [], sourceFiles = [], demoAssetsFile) {
+function buildLoaderContextContent(techStacks, builtins = {}, routes = {}, extraRemarkPlugins = [], extraRehypePlugins = [], sourceFiles = [], demoAssetsFile, alias) {
   const refs = toTechStackRefs(techStacks);
   return `'use strict';
 try {
@@ -186,6 +186,7 @@ try {
 exports.techStacks = [${refs.join(", ")}];
 exports.builtins = ${JSON.stringify(builtins)};
 exports.routes = ${JSON.stringify(routes)};
+exports.alias = ${JSON.stringify(alias)};
 exports.demoAssetsFile = ${JSON.stringify(demoAssetsFile)};
 exports.extraRemarkPlugins = ${toPluginRefs(
     extraRemarkPlugins,

package/dist/loaders/markdown/index.js

@@ -46,6 +46,7 @@ var import_path = __toESM(require("path"));
 var import_plugin_utils = require("umi/plugin-utils");
 var import_transformer = __toESM(require("./transformer"));
 var import_rehypeText = require("./transformer/rehypeText");
+var MD_LOADER_CACHE_VERSION = 1;
 function isMalformedCacheError(err) {
   return err instanceof SyntaxError || err instanceof Error && /Unexpected end of JSON input|Unterminated string in JSON/.test(
     err.message
@@ -153,6 +154,7 @@ function emitDemo(opts, ret) {
   const shareDepsMap = {};
   const demoDepsMap = {};
   const relativeDepsMap = {};
+  const sideEffectDepsMap = /* @__PURE__ */ new Map();
   demos == null ? void 0 : demos.forEach((demo) => {
     var _a, _b;
     if ("resolveMap" in demo && "asset" in demo) {
@@ -160,10 +162,15 @@ function emitDemo(opts, ret) {
       demoDepsMap[_a = demo.id] ?? (demoDepsMap[_a] = {});
       relativeDepsMap[_b = demo.id] ?? (relativeDepsMap[_b] = {});
       Object.keys(demo.resolveMap).forEach((key, index) => {
+        var _a2;
         const specifier = `${demo.id.replace(/[^\w\d]/g, "_")}_deps_${index}`;
         if (key !== entryFileName) {
           const isRelative = isRelativePath(key);
           const normalizedKey = isRelative ? (0, import_plugin_utils.winPath)(demo.resolveMap[key]) : key;
+          sideEffectDepsMap.set(
+            normalizedKey,
+            sideEffectDepsMap.get(normalizedKey) !== false && ((_a2 = demo.sideEffectStyles) == null ? void 0 : _a2.includes(normalizedKey)) === true
+          );
           if (!shareDepsMap[normalizedKey]) {
             demoDepsMap[demo.id][normalizedKey] = specifier;
             shareDepsMap[normalizedKey] = specifier;
@@ -182,7 +189,12 @@ function emitDemo(opts, ret) {
       Object.entries(deps).map(([key, specifier]) => {
         const existingIndex = acc.findIndex((obj) => obj.key === key);
         if (existingIndex === -1) {
-          return { key, specifier };
+          return {
+            key,
+            specifier,
+            // Preserve webpack's namespace behavior, including custom style exports.
+            sideEffectOnly: Boolean(opts[import_utoopackLoaders.UTOOPACK_LOADER_CTX_KEY]) && sideEffectDepsMap.get(key) === true
+          };
         }
         return void 0;
       }).filter((item) => item !== void 0)
@@ -193,7 +205,13 @@ function emitDemo(opts, ret) {
     `import React from 'react';
 import '${(0, import_plugin_utils.winPath)(this.resourcePath)}?watch=parent';
 {{#dedupedDemosDeps}}
+{{#sideEffectOnly}}
+import '{{{key}}}';
+const {{{specifier}}} = {};
+{{/sideEffectOnly}}
+{{^sideEffectOnly}}
 import * as {{{specifier}}} from '{{{key}}}';
+{{/sideEffectOnly}}
 {{/dedupedDemosDeps}}
 export const demos = {
   {{#demos}}
@@ -496,6 +514,9 @@ function mdLoader(content) {
     if (!((_a = opts.techStacks) == null ? void 0 : _a.length)) {
       opts.techStacks = ctx.techStacks;
     }
+    if (ctx.alias !== void 0) {
+      opts = { ...opts, alias: ctx.alias };
+    }
     if (ctx.builtins && !Object.keys(opts.builtins ?? {}).length) {
       opts.builtins = ctx.builtins;
     }
@@ -520,6 +541,7 @@ function mdLoader(content) {
   }
   const cache = (0, import_utils.getCache)("md-loader");
   const baseCacheKey = [
+    MD_LOADER_CACHE_VERSION,
     this.resourcePath,
     (0, import_utils.getContentHash)(content),
     useUtoopackDemoHMR,
@@ -542,7 +564,8 @@ function mdLoader(content) {
   deferrer[cacheKey] = (0, import_transformer.default)(content, {
     ...import_plugin_utils.lodash.omit(opts, ["mode", "builtins", "onResolveDemos"]),
     fileAbsPath: (0, import_plugin_utils.winPath)(this.resourcePath),
-    useUtoopackDemoHMR
+    useUtoopackDemoHMR,
+    collectSideEffectStyles: Boolean(loaderContextPath)
   });
   deferrer[cacheKey].then((ret) => {
     depsMapping[this.resourcePath] = ret.meta.embeds.concat(

package/dist/loaders/markdown/transformer/index.d.ts

@@ -24,6 +24,7 @@ declare module 'vfile' {
             component: string;
             asset: IParsedBlockAsset['asset'];
             resolveMap: IParsedBlockAsset['resolveMap'];
+            sideEffectStyles?: IParsedBlockAsset['sideEffectStyles'];
             renderOpts: {
                 type?: string;
                 rendererPath?: string;
@@ -51,6 +52,7 @@ export interface IMdTransformerOptions {
     cwd: string;
     fileAbsPath: string;
     useUtoopackDemoHMR?: boolean;
+    collectSideEffectStyles?: boolean;
     alias: ResolveOptions['alias'];
     parentAbsPath?: string;
     techStacks: IDumiTechStack[];

package/dist/loaders/markdown/transformer/index.js

@@ -114,6 +114,7 @@ var transformer_default = async (raw, opts) => {
     fileLocaleLessPath,
     fileLocale,
     useUtoopackDemoHMR: opts.useUtoopackDemoHMR,
+    collectSideEffectStyles: opts.collectSideEffectStyles,
     resolve: opts.resolve,
     resolver,
     codeBlockBabelPlugins: opts.codeBlockBabelPlugins

package/dist/loaders/markdown/transformer/rehypeDemo.d.ts

@@ -11,6 +11,7 @@ type IRehypeDemoOptions = Pick<IMdTransformerOptions, 'techStacks' | 'cwd' | 'fi
     fileLocaleLessPath: string;
     fileLocale?: string;
     useUtoopackDemoHMR?: boolean;
+    collectSideEffectStyles?: boolean;
 };
 export default function rehypeDemo(opts: IRehypeDemoOptions): Transformer<Root>;
 export {};

package/dist/loaders/markdown/transformer/rehypeDemo.js

@@ -310,9 +310,15 @@ function rehypeDemo(opts) {
             deferrers.push(
               (0, import_block.default)({
                 ...parseOpts,
-                cacheable: opts.useUtoopackDemoHMR
+                cacheable: opts.useUtoopackDemoHMR,
+                collectSideEffectStyles: opts.collectSideEffectStyles
               }).then(
-                async ({ asset, resolveMap, frontmatter }) => {
+                async ({
+                  asset,
+                  resolveMap,
+                  frontmatter,
+                  sideEffectStyles
+                }) => {
                   var _a2, _b2, _c2;
                   if (demoIds.indexOf(parseOpts.id) !== demoIds.lastIndexOf(parseOpts.id)) {
                     const startLine = (_a2 = node.position) == null ? void 0 : _a2.start.line;
@@ -396,6 +402,8 @@ function rehypeDemo(opts) {
                       resolveMap,
                       techStackOpts
                     ) : resolveMap,
+                    // Custom source mappings may replace the original dependencies.
+                    sideEffectStyles: techStack.generateSources ? void 0 : sideEffectStyles,
                     renderOpts: {
                       rendererPath: runtimeOpts == null ? void 0 : runtimeOpts.rendererPath,
                       compilePath: runtimeOpts == null ? void 0 : runtimeOpts.compilePath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.4.51",
+  "version": "2.4.52",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",