storybook-builder-rsbuild 2.0.2 → 2.0.4

package/dist/index.js

@@ -102,6 +102,41 @@ var require_pretty_hrtime = __commonJS({
   }
 });
 
+// ../../node_modules/.pnpm/common-path-prefix@3.0.0/node_modules/common-path-prefix/index.js
+var require_common_path_prefix = __commonJS({
+  "../../node_modules/.pnpm/common-path-prefix@3.0.0/node_modules/common-path-prefix/index.js"(exports, module2) {
+    "use strict";
+    var { sep: DEFAULT_SEPARATOR } = require("path");
+    var determineSeparator = (paths) => {
+      for (const path6 of paths) {
+        const match = /(\/|\\)/.exec(path6);
+        if (match !== null)
+          return match[0];
+      }
+      return DEFAULT_SEPARATOR;
+    };
+    module2.exports = function commonPathPrefix2(paths, sep = determineSeparator(paths)) {
+      const [first = "", ...remaining] = paths;
+      if (first === "" || remaining.length === 0)
+        return "";
+      const parts = first.split(sep);
+      let endOfPrefix = parts.length;
+      for (const path6 of remaining) {
+        const compare = path6.split(sep);
+        for (let i = 0; i < endOfPrefix; i++) {
+          if (compare[i] !== parts[i]) {
+            endOfPrefix = i;
+          }
+        }
+        if (endOfPrefix === 0)
+          return "";
+      }
+      const prefix = parts.slice(0, endOfPrefix).join(sep);
+      return prefix.endsWith(sep) ? prefix : prefix + sep;
+    };
+  }
+});
+
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
@@ -120,7 +155,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_node_net = require("net");
-var import_node_path5 = require("path");
+var import_node_path9 = require("path");
 var rsbuildReal = __toESM(require("@rsbuild/core"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_pretty_hrtime = __toESM(require_pretty_hrtime());
@@ -129,7 +164,7 @@ var import_common3 = require("storybook/internal/common");
 var import_server_errors = require("storybook/internal/server-errors");
 
 // src/preview/iframe-rsbuild.config.ts
-var import_node_path3 = require("path");
+var import_node_path7 = require("path");
 var import_core = require("@rsbuild/core");
 var import_plugin_type_check = require("@rsbuild/plugin-type-check");
 var import_preset = require("@storybook/addon-docs/preset");
@@ -140,19 +175,166 @@ var import_globals = require("storybook/internal/preview/globals");
 var import_ts_dedent2 = require("ts-dedent");
 
 // src/preview/virtual-module-mapping.ts
-var import_node_fs = __toESM(require("fs"));
-var import_node_path = __toESM(require("path"));
-var import_node_path2 = require("path");
+var import_node_fs4 = __toESM(require("fs"));
+var import_node_path5 = __toESM(require("path"));
+var import_node_path6 = require("path");
 var import_core_webpack = require("@storybook/core-webpack");
-var import_find_cache_dir = __toESM(require("find-cache-dir"));
+
+// ../../node_modules/.pnpm/find-cache-dir@5.0.0/node_modules/find-cache-dir/index.js
+var import_node_process2 = __toESM(require("process"), 1);
+var import_node_path4 = __toESM(require("path"), 1);
+var import_node_fs3 = __toESM(require("fs"), 1);
+var import_common_path_prefix = __toESM(require_common_path_prefix(), 1);
+
+// ../../node_modules/.pnpm/pkg-dir@7.0.0/node_modules/pkg-dir/index.js
+var import_node_path3 = __toESM(require("path"), 1);
+
+// ../../node_modules/.pnpm/find-up@6.3.0/node_modules/find-up/index.js
+var import_node_path2 = __toESM(require("path"), 1);
+var import_node_url2 = require("url");
+
+// ../../node_modules/.pnpm/locate-path@7.2.0/node_modules/locate-path/index.js
+var import_node_process = __toESM(require("process"), 1);
+var import_node_path = __toESM(require("path"), 1);
+var import_node_fs = __toESM(require("fs"), 1);
+var import_node_url = require("url");
+var typeMappings = {
+  directory: "isDirectory",
+  file: "isFile"
+};
+function checkType(type) {
+  if (Object.hasOwnProperty.call(typeMappings, type)) {
+    return;
+  }
+  throw new Error(`Invalid type specified: ${type}`);
+}
+var matchType = (type, stat) => stat[typeMappings[type]]();
+var toPath = (urlOrPath) => urlOrPath instanceof URL ? (0, import_node_url.fileURLToPath)(urlOrPath) : urlOrPath;
+function locatePathSync(paths, {
+  cwd: cwd2 = import_node_process.default.cwd(),
+  type = "file",
+  allowSymlinks = true
+} = {}) {
+  checkType(type);
+  cwd2 = toPath(cwd2);
+  const statFunction = allowSymlinks ? import_node_fs.default.statSync : import_node_fs.default.lstatSync;
+  for (const path_ of paths) {
+    try {
+      const stat = statFunction(import_node_path.default.resolve(cwd2, path_), {
+        throwIfNoEntry: false
+      });
+      if (!stat) {
+        continue;
+      }
+      if (matchType(type, stat)) {
+        return path_;
+      }
+    } catch {
+    }
+  }
+}
+
+// ../../node_modules/.pnpm/path-exists@5.0.0/node_modules/path-exists/index.js
+var import_node_fs2 = __toESM(require("fs"), 1);
+
+// ../../node_modules/.pnpm/find-up@6.3.0/node_modules/find-up/index.js
+var toPath2 = (urlOrPath) => urlOrPath instanceof URL ? (0, import_node_url2.fileURLToPath)(urlOrPath) : urlOrPath;
+var findUpStop = Symbol("findUpStop");
+function findUpMultipleSync(name, options = {}) {
+  let directory = import_node_path2.default.resolve(toPath2(options.cwd) || "");
+  const { root } = import_node_path2.default.parse(directory);
+  const stopAt = options.stopAt || root;
+  const limit = options.limit || Number.POSITIVE_INFINITY;
+  const paths = [name].flat();
+  const runMatcher = (locateOptions) => {
+    if (typeof name !== "function") {
+      return locatePathSync(paths, locateOptions);
+    }
+    const foundPath = name(locateOptions.cwd);
+    if (typeof foundPath === "string") {
+      return locatePathSync([foundPath], locateOptions);
+    }
+    return foundPath;
+  };
+  const matches = [];
+  while (true) {
+    const foundPath = runMatcher({ ...options, cwd: directory });
+    if (foundPath === findUpStop) {
+      break;
+    }
+    if (foundPath) {
+      matches.push(import_node_path2.default.resolve(directory, foundPath));
+    }
+    if (directory === stopAt || matches.length >= limit) {
+      break;
+    }
+    directory = import_node_path2.default.dirname(directory);
+  }
+  return matches;
+}
+function findUpSync(name, options = {}) {
+  const matches = findUpMultipleSync(name, { ...options, limit: 1 });
+  return matches[0];
+}
+
+// ../../node_modules/.pnpm/pkg-dir@7.0.0/node_modules/pkg-dir/index.js
+function packageDirectorySync({ cwd: cwd2 } = {}) {
+  const filePath = findUpSync("package.json", { cwd: cwd2 });
+  return filePath && import_node_path3.default.dirname(filePath);
+}
+
+// ../../node_modules/.pnpm/find-cache-dir@5.0.0/node_modules/find-cache-dir/index.js
+var { env, cwd } = import_node_process2.default;
+var isWritable = (path6) => {
+  try {
+    import_node_fs3.default.accessSync(path6, import_node_fs3.default.constants.W_OK);
+    return true;
+  } catch {
+    return false;
+  }
+};
+function useDirectory(directory, options) {
+  if (options.create) {
+    import_node_fs3.default.mkdirSync(directory, { recursive: true });
+  }
+  return directory;
+}
+function getNodeModuleDirectory(directory) {
+  const nodeModules = import_node_path4.default.join(directory, "node_modules");
+  if (!isWritable(nodeModules) && (import_node_fs3.default.existsSync(nodeModules) || !isWritable(import_node_path4.default.join(directory)))) {
+    return;
+  }
+  return nodeModules;
+}
+function findCacheDirectory(options = {}) {
+  if (env.CACHE_DIR && !["true", "false", "1", "0"].includes(env.CACHE_DIR)) {
+    return useDirectory(import_node_path4.default.join(env.CACHE_DIR, options.name), options);
+  }
+  let { cwd: directory = cwd(), files } = options;
+  if (files) {
+    if (!Array.isArray(files)) {
+      throw new TypeError(`Expected \`files\` option to be an array, got \`${typeof files}\`.`);
+    }
+    directory = (0, import_common_path_prefix.default)(files.map((file) => import_node_path4.default.resolve(directory, file)));
+  }
+  directory = packageDirectorySync({ cwd: directory });
+  if (!directory) {
+    return;
+  }
+  const nodeModules = getNodeModuleDirectory(directory);
+  if (!nodeModules) {
+    return;
+  }
+  return useDirectory(import_node_path4.default.join(directory, "node_modules", ".cache", options.name), options);
+}
 
 // ../../node_modules/.pnpm/slash@5.1.0/node_modules/slash/index.js
-function slash(path2) {
-  const isExtendedLengthPath = path2.startsWith("\\\\?\\");
+function slash(path6) {
+  const isExtendedLengthPath = path6.startsWith("\\\\?\\");
   if (isExtendedLengthPath) {
-    return path2;
+    return path6;
   }
-  return path2.replace(/\\/g, "/");
+  return path6.replace(/\\/g, "/");
 }
 
 // src/preview/virtual-module-mapping.ts
@@ -160,17 +342,17 @@ var import_common = require("storybook/internal/common");
 var import_ts_dedent = require("ts-dedent");
 var getVirtualModules = async (options) => {
   const virtualModules = {};
-  const cwd = process.cwd();
+  const cwd2 = process.cwd();
   const workingDir = options.cache ? (
     // TODO: This is a hard code cache dir, as Rspack doesn't support virtual modules now.
     // Remove this when Rspack supports virtual modules.
-    (0, import_find_cache_dir.default)({
+    findCacheDirectory({
       name: "storybook-rsbuild-builder",
       create: true
     })
   ) : process.cwd();
-  if (!import_node_fs.default.existsSync(workingDir)) {
-    import_node_fs.default.mkdirSync(workingDir, { recursive: true });
+  if (!import_node_fs4.default.existsSync(workingDir)) {
+    import_node_fs4.default.mkdirSync(workingDir, { recursive: true });
   }
   const isProd = options.configType === "PRODUCTION";
   const nonNormalizedStories = await options.presets.apply("stories", []);
@@ -179,7 +361,7 @@ var getVirtualModules = async (options) => {
     configDir: options.configDir,
     workingDir
   });
-  const realPathRelativeToCwd = import_node_path.default.relative(workingDir, cwd).split(import_node_path.default.sep).join(import_node_path.default.posix.sep);
+  const realPathRelativeToCwd = import_node_path5.default.relative(workingDir, cwd2).split(import_node_path5.default.sep).join(import_node_path5.default.posix.sep);
   const previewAnnotations = [
     ...(await options.presets.apply(
       "previewAnnotations",
@@ -194,13 +376,13 @@ var getVirtualModules = async (options) => {
     (0, import_common.loadPreviewOrConfigFile)(options)
   ].filter(Boolean);
   const storiesFilename = "storybook-stories.js";
-  const storiesPath = (0, import_node_path2.resolve)((0, import_node_path2.join)(workingDir, storiesFilename));
+  const storiesPath = (0, import_node_path6.resolve)((0, import_node_path6.join)(workingDir, storiesFilename));
   const builderOptions = await (0, import_common.getBuilderOptions)(options);
   const needPipelinedImport = !!builderOptions.lazyCompilation && !isProd;
   virtualModules[storiesPath] = toImportFn(stories, realPathRelativeToCwd, {
     needPipelinedImport
   });
-  const configEntryPath = (0, import_node_path2.resolve)((0, import_node_path2.join)(workingDir, "storybook-config-entry.js"));
+  const configEntryPath = (0, import_node_path6.resolve)((0, import_node_path6.join)(workingDir, "storybook-config-entry.js"));
   virtualModules[configEntryPath] = (await (0, import_common.readTemplate)(
     require.resolve("storybook-builder-rsbuild/templates/virtualModuleModernEntry.js")
   )).replaceAll(`'{{storiesFilename}}'`, `'./${storiesFilename}'`).replaceAll(
@@ -212,7 +394,7 @@ var getVirtualModules = async (options) => {
   ).replace(/\\/g, "\\\\");
   entries.push(configEntryPath);
   for (const [key, value] of Object.entries(virtualModules)) {
-    import_node_fs.default.writeFileSync(key, value);
+    import_node_fs4.default.writeFileSync(key, value);
   }
   return {
     virtualModules,
@@ -287,7 +469,7 @@ function importPipeline() {
 }
 
 // src/preview/iframe-rsbuild.config.ts
-var getAbsolutePath = (input) => (0, import_node_path3.dirname)(require.resolve((0, import_node_path3.join)(input, "package.json")));
+var getAbsolutePath = (input) => (0, import_node_path7.dirname)(require.resolve((0, import_node_path7.join)(input, "package.json")));
 var maybeGetAbsolutePath = (input) => {
   try {
     return getAbsolutePath(input);
@@ -313,7 +495,7 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
   const { rsbuildConfigPath, addonDocs } = await (0, import_common2.getBuilderOptions)(options);
   const appliedDocsWebpack = await (0, import_preset.webpack)({}, { ...options, ...addonDocs });
   const {
-    outputDir = (0, import_node_path3.join)(".", "public"),
+    outputDir = (0, import_node_path7.join)(".", "public"),
     quiet,
     packageJson,
     configType,
@@ -416,8 +598,6 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
   } else {
     contentFromConfig = content;
   }
-  contentFromConfig.source ??= {};
-  contentFromConfig.source.entry = {};
   const resourceFilename = isProd ? "static/media/[name].[contenthash:8][ext]" : "static/media/[path][name][ext]";
   const rsbuildConfig = (0, import_core.mergeRsbuildConfig)(contentFromConfig, {
     output: {
@@ -431,7 +611,7 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
         css: !options.build?.test?.disableSourcemaps
       },
       distPath: {
-        root: (0, import_node_path3.resolve)(process.cwd(), outputDir)
+        root: (0, import_node_path7.resolve)(process.cwd(), outputDir)
       },
       filename: {
         js: isProd ? "[name].[contenthash:8].iframe.bundle.js" : "[name].iframe.bundle.js",
@@ -459,10 +639,6 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
       // TODO: Rspack doesn't support virtual modules yet, use cache dir instead
       // we needed to explicitly set the module in `node_modules` to be compiled
       include: [/[\\/]node_modules[\\/].*[\\/]storybook-config-entry\.js/],
-      entry: {
-        // to avoid `It's not allowed to load an initial chunk on demand. The chunk name "main" is already used by an entrypoint` of
-        main: [...entries ?? [], ...dynamicEntries]
-      },
       define: {
         ...(0, import_common2.stringifyProcessEnvs)(envs),
         NODE_ENV: JSON.stringify(process.env.NODE_ENV)
@@ -486,7 +662,41 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
         removeScriptTypeAttributes: false,
         removeStyleLinkTypeAttributes: true,
         useShortDoctype: true
-      }))
+      })),
+      {
+        name: "storybook-config-entry",
+        setup: (api) => {
+          api.modifyEnvironmentConfig({
+            handler: (config, { mergeEnvironmentConfig }) => {
+              const baseConfig = { ...config };
+              delete baseConfig.source.entry;
+              return mergeEnvironmentConfig(config, {
+                // Reset `config.source.entry` field, do not use provided entry
+                // see https://github.com/rspack-contrib/storybook-rsbuild/issues/43
+                source: {
+                  entry: {
+                    main: [...entries ?? [], ...dynamicEntries]
+                  }
+                },
+                tools: {
+                  rspack: {
+                    experiments: {
+                      outputModule: false
+                    },
+                    externalsType: "var",
+                    output: {
+                      module: false,
+                      chunkFormat: "array-push",
+                      chunkLoading: "jsonp"
+                    }
+                  }
+                }
+              });
+            },
+            order: "post"
+          });
+        }
+      }
     ].filter(Boolean),
     tools: {
       rspack: (config, { addRules, appendPlugins, rspack, mergeConfig }) => {
@@ -584,7 +794,7 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
 
 // src/react-shims.ts
 var import_promises = require("fs/promises");
-var import_node_path4 = require("path");
+var import_node_path8 = require("path");
 var getIsReactVersion18or19 = async (options) => {
   const { legacyRootApi } = await options.presets.apply(
     "frameworkOptions"
@@ -597,12 +807,12 @@ var getIsReactVersion18or19 = async (options) => {
     {}
   );
   let reactDom = "";
-  reactDom = resolvedReact.reactDom || (0, import_node_path4.dirname)(require.resolve("react-dom/package.json"));
-  if (!(0, import_node_path4.isAbsolute)(reactDom)) {
+  reactDom = resolvedReact.reactDom || (0, import_node_path8.dirname)(require.resolve("react-dom/package.json"));
+  if (!(0, import_node_path8.isAbsolute)(reactDom)) {
     return false;
   }
   const { version } = JSON.parse(
-    await (0, import_promises.readFile)((0, import_node_path4.join)(reactDom, "package.json"), "utf-8")
+    await (0, import_promises.readFile)((0, import_node_path8.join)(reactDom, "package.json"), "utf-8")
   );
   return version.startsWith("18") || version.startsWith("19") || version.startsWith("0.0.0");
 };
@@ -621,7 +831,7 @@ var applyReactShims = async (config, options) => {
 };
 
 // src/index.ts
-var corePath = (0, import_node_path5.dirname)(require.resolve("storybook/package.json"));
+var corePath = (0, import_node_path9.dirname)(require.resolve("storybook/package.json"));
 var printDuration = (startTime) => (0, import_pretty_hrtime.default)(process.hrtime(startTime)).replace(" ms", " milliseconds").replace(" s", " seconds").replace(" m", " minutes");
 var executor = {
   get: async (options) => {
@@ -664,18 +874,18 @@ var rsbuild = async (_, options) => {
     },
     options
   );
-  let defaultConfig = await iframe_rsbuild_config_default(options, webpackAddonsConfig);
-  const shimsConfig = await applyReactShims(defaultConfig, options);
-  defaultConfig = rsbuildReal.mergeRsbuildConfig(
-    defaultConfig,
+  let intrinsicRsbuildConfig = await iframe_rsbuild_config_default(options, webpackAddonsConfig);
+  const shimsConfig = await applyReactShims(intrinsicRsbuildConfig, options);
+  intrinsicRsbuildConfig = rsbuildReal.mergeRsbuildConfig(
+    intrinsicRsbuildConfig,
     shimsConfig
   );
-  const finalDefaultConfig = await presets.apply(
+  const finalConfig = await presets.apply(
     "rsbuildFinal",
-    defaultConfig,
+    intrinsicRsbuildConfig,
     options
   );
-  return finalDefaultConfig;
+  return finalConfig;
 };
 var getConfig = async (options) => {
   const { presets } = options;
@@ -729,7 +939,7 @@ var start = async ({
       error: new Error("Missing Rsbuild build instance at runtime!")
     });
   }
-  const previewResolvedDir = (0, import_node_path5.join)(corePath, "dist/preview");
+  const previewResolvedDir = (0, import_node_path9.join)(corePath, "dist/preview");
   const previewDirOrigin = previewResolvedDir;
   router.use(
     "/sb-preview",
@@ -752,16 +962,16 @@ var build = async ({ options }) => {
     cwd: process.cwd(),
     rsbuildConfig: config
   });
-  const previewResolvedDir = (0, import_node_path5.join)(corePath, "dist/preview");
+  const previewResolvedDir = (0, import_node_path9.join)(corePath, "dist/preview");
   const previewDirOrigin = previewResolvedDir;
-  const previewDirTarget = (0, import_node_path5.join)(options.outputDir || "", "sb-preview");
+  const previewDirTarget = (0, import_node_path9.join)(options.outputDir || "", "sb-preview");
   let stats;
   rsbuildBuild.onAfterBuild((params) => {
     stats = params.stats;
   });
   const previewFiles = import_fs_extra.default.copy(previewDirOrigin, previewDirTarget, {
     filter: (src) => {
-      const { ext } = (0, import_node_path5.parse)(src);
+      const { ext } = (0, import_node_path9.parse)(src);
       if (ext) {
         return ext === ".js";
       }
@@ -775,7 +985,7 @@ var build = async ({ options }) => {
   await close();
   return stats;
 };
-var corePresets = [(0, import_node_path5.join)(__dirname, "./preview-preset.js")];
+var corePresets = [(0, import_node_path9.join)(__dirname, "./preview-preset.js")];
 var previewMainTemplate = () => require.resolve("storybook-builder-rsbuild/templates/preview.ejs");
 function getRandomPort(host) {
   return new Promise((resolve3, reject) => {

package/dist/index.mjs

@@ -1,9 +1,9 @@
-import { __commonJS, __toESM, __require } from './chunk-TTFRSOOU.mjs';
+import { __commonJS, __require, __toESM } from './chunk-TTFRSOOU.mjs';
 import { createServer } from 'net';
-import path, { dirname, join, resolve, parse, isAbsolute } from 'path';
+import path4, { dirname, join, resolve, parse, isAbsolute } from 'path';
 import * as rsbuildReal from '@rsbuild/core';
 import { loadConfig, mergeRsbuildConfig } from '@rsbuild/core';
-import fs2 from 'fs-extra';
+import fs4 from 'fs-extra';
 import sirv from 'sirv';
 import { normalizeStories, loadPreviewOrConfigFile, getBuilderOptions, readTemplate, resolveAddonName, getPresets, stringifyProcessEnvs, isPreservingSymlinks } from 'storybook/internal/common';
 import { WebpackInvocationError } from 'storybook/internal/server-errors';
@@ -13,9 +13,10 @@ import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import { pluginHtmlMinifierTerser } from 'rsbuild-plugin-html-minifier-terser';
 import { globalsNameReferenceMap } from 'storybook/internal/preview/globals';
 import { dedent } from 'ts-dedent';
-import fs from 'fs';
+import fs2 from 'fs';
 import { webpackIncludeRegexp } from '@storybook/core-webpack';
-import findCacheDirectory from 'find-cache-dir';
+import process2 from 'process';
+import { fileURLToPath } from 'url';
 import { readFile } from 'fs/promises';
 
 // ../../node_modules/.pnpm/pretty-hrtime@1.0.3/node_modules/pretty-hrtime/index.js
@@ -89,20 +90,183 @@ var require_pretty_hrtime = __commonJS({
   }
 });
 
+// ../../node_modules/.pnpm/common-path-prefix@3.0.0/node_modules/common-path-prefix/index.js
+var require_common_path_prefix = __commonJS({
+  "../../node_modules/.pnpm/common-path-prefix@3.0.0/node_modules/common-path-prefix/index.js"(exports, module) {
+    var { sep: DEFAULT_SEPARATOR } = __require("path");
+    var determineSeparator = (paths) => {
+      for (const path6 of paths) {
+        const match = /(\/|\\)/.exec(path6);
+        if (match !== null)
+          return match[0];
+      }
+      return DEFAULT_SEPARATOR;
+    };
+    module.exports = function commonPathPrefix2(paths, sep = determineSeparator(paths)) {
+      const [first = "", ...remaining] = paths;
+      if (first === "" || remaining.length === 0)
+        return "";
+      const parts = first.split(sep);
+      let endOfPrefix = parts.length;
+      for (const path6 of remaining) {
+        const compare = path6.split(sep);
+        for (let i = 0; i < endOfPrefix; i++) {
+          if (compare[i] !== parts[i]) {
+            endOfPrefix = i;
+          }
+        }
+        if (endOfPrefix === 0)
+          return "";
+      }
+      const prefix = parts.slice(0, endOfPrefix).join(sep);
+      return prefix.endsWith(sep) ? prefix : prefix + sep;
+    };
+  }
+});
+
 // src/index.ts
 var import_pretty_hrtime = __toESM(require_pretty_hrtime());
 
+// ../../node_modules/.pnpm/find-cache-dir@5.0.0/node_modules/find-cache-dir/index.js
+var import_common_path_prefix = __toESM(require_common_path_prefix(), 1);
+var typeMappings = {
+  directory: "isDirectory",
+  file: "isFile"
+};
+function checkType(type) {
+  if (Object.hasOwnProperty.call(typeMappings, type)) {
+    return;
+  }
+  throw new Error(`Invalid type specified: ${type}`);
+}
+var matchType = (type, stat) => stat[typeMappings[type]]();
+var toPath = (urlOrPath) => urlOrPath instanceof URL ? fileURLToPath(urlOrPath) : urlOrPath;
+function locatePathSync(paths, {
+  cwd: cwd2 = process2.cwd(),
+  type = "file",
+  allowSymlinks = true
+} = {}) {
+  checkType(type);
+  cwd2 = toPath(cwd2);
+  const statFunction = allowSymlinks ? fs2.statSync : fs2.lstatSync;
+  for (const path_ of paths) {
+    try {
+      const stat = statFunction(path4.resolve(cwd2, path_), {
+        throwIfNoEntry: false
+      });
+      if (!stat) {
+        continue;
+      }
+      if (matchType(type, stat)) {
+        return path_;
+      }
+    } catch {
+    }
+  }
+}
+
+// ../../node_modules/.pnpm/find-up@6.3.0/node_modules/find-up/index.js
+var toPath2 = (urlOrPath) => urlOrPath instanceof URL ? fileURLToPath(urlOrPath) : urlOrPath;
+var findUpStop = Symbol("findUpStop");
+function findUpMultipleSync(name, options = {}) {
+  let directory = path4.resolve(toPath2(options.cwd) || "");
+  const { root } = path4.parse(directory);
+  const stopAt = options.stopAt || root;
+  const limit = options.limit || Number.POSITIVE_INFINITY;
+  const paths = [name].flat();
+  const runMatcher = (locateOptions) => {
+    if (typeof name !== "function") {
+      return locatePathSync(paths, locateOptions);
+    }
+    const foundPath = name(locateOptions.cwd);
+    if (typeof foundPath === "string") {
+      return locatePathSync([foundPath], locateOptions);
+    }
+    return foundPath;
+  };
+  const matches = [];
+  while (true) {
+    const foundPath = runMatcher({ ...options, cwd: directory });
+    if (foundPath === findUpStop) {
+      break;
+    }
+    if (foundPath) {
+      matches.push(path4.resolve(directory, foundPath));
+    }
+    if (directory === stopAt || matches.length >= limit) {
+      break;
+    }
+    directory = path4.dirname(directory);
+  }
+  return matches;
+}
+function findUpSync(name, options = {}) {
+  const matches = findUpMultipleSync(name, { ...options, limit: 1 });
+  return matches[0];
+}
+
+// ../../node_modules/.pnpm/pkg-dir@7.0.0/node_modules/pkg-dir/index.js
+function packageDirectorySync({ cwd: cwd2 } = {}) {
+  const filePath = findUpSync("package.json", { cwd: cwd2 });
+  return filePath && path4.dirname(filePath);
+}
+
+// ../../node_modules/.pnpm/find-cache-dir@5.0.0/node_modules/find-cache-dir/index.js
+var { env, cwd } = process2;
+var isWritable = (path6) => {
+  try {
+    fs2.accessSync(path6, fs2.constants.W_OK);
+    return true;
+  } catch {
+    return false;
+  }
+};
+function useDirectory(directory, options) {
+  if (options.create) {
+    fs2.mkdirSync(directory, { recursive: true });
+  }
+  return directory;
+}
+function getNodeModuleDirectory(directory) {
+  const nodeModules = path4.join(directory, "node_modules");
+  if (!isWritable(nodeModules) && (fs2.existsSync(nodeModules) || !isWritable(path4.join(directory)))) {
+    return;
+  }
+  return nodeModules;
+}
+function findCacheDirectory(options = {}) {
+  if (env.CACHE_DIR && !["true", "false", "1", "0"].includes(env.CACHE_DIR)) {
+    return useDirectory(path4.join(env.CACHE_DIR, options.name), options);
+  }
+  let { cwd: directory = cwd(), files } = options;
+  if (files) {
+    if (!Array.isArray(files)) {
+      throw new TypeError(`Expected \`files\` option to be an array, got \`${typeof files}\`.`);
+    }
+    directory = (0, import_common_path_prefix.default)(files.map((file) => path4.resolve(directory, file)));
+  }
+  directory = packageDirectorySync({ cwd: directory });
+  if (!directory) {
+    return;
+  }
+  const nodeModules = getNodeModuleDirectory(directory);
+  if (!nodeModules) {
+    return;
+  }
+  return useDirectory(path4.join(directory, "node_modules", ".cache", options.name), options);
+}
+
 // ../../node_modules/.pnpm/slash@5.1.0/node_modules/slash/index.js
-function slash(path2) {
-  const isExtendedLengthPath = path2.startsWith("\\\\?\\");
+function slash(path6) {
+  const isExtendedLengthPath = path6.startsWith("\\\\?\\");
   if (isExtendedLengthPath) {
-    return path2;
+    return path6;
   }
-  return path2.replace(/\\/g, "/");
+  return path6.replace(/\\/g, "/");
 }
 var getVirtualModules = async (options) => {
   const virtualModules = {};
-  const cwd = process.cwd();
+  const cwd2 = process.cwd();
   const workingDir = options.cache ? (
     // TODO: This is a hard code cache dir, as Rspack doesn't support virtual modules now.
     // Remove this when Rspack supports virtual modules.
@@ -111,8 +275,8 @@ var getVirtualModules = async (options) => {
       create: true
     })
   ) : process.cwd();
-  if (!fs.existsSync(workingDir)) {
-    fs.mkdirSync(workingDir, { recursive: true });
+  if (!fs2.existsSync(workingDir)) {
+    fs2.mkdirSync(workingDir, { recursive: true });
   }
   const isProd = options.configType === "PRODUCTION";
   const nonNormalizedStories = await options.presets.apply("stories", []);
@@ -121,7 +285,7 @@ var getVirtualModules = async (options) => {
     configDir: options.configDir,
     workingDir
   });
-  const realPathRelativeToCwd = path.relative(workingDir, cwd).split(path.sep).join(path.posix.sep);
+  const realPathRelativeToCwd = path4.relative(workingDir, cwd2).split(path4.sep).join(path4.posix.sep);
   const previewAnnotations = [
     ...(await options.presets.apply(
       "previewAnnotations",
@@ -156,7 +320,7 @@ var getVirtualModules = async (options) => {
   ).replace(/\\/g, "\\\\");
   entries.push(configEntryPath);
   for (const [key, value] of Object.entries(virtualModules)) {
-    fs.writeFileSync(key, value);
+    fs2.writeFileSync(key, value);
   }
   return {
     virtualModules,
@@ -360,8 +524,6 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
   } else {
     contentFromConfig = content;
   }
-  contentFromConfig.source ??= {};
-  contentFromConfig.source.entry = {};
   const resourceFilename = isProd ? "static/media/[name].[contenthash:8][ext]" : "static/media/[path][name][ext]";
   const rsbuildConfig = mergeRsbuildConfig(contentFromConfig, {
     output: {
@@ -403,10 +565,6 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
       // TODO: Rspack doesn't support virtual modules yet, use cache dir instead
       // we needed to explicitly set the module in `node_modules` to be compiled
       include: [/[\\/]node_modules[\\/].*[\\/]storybook-config-entry\.js/],
-      entry: {
-        // to avoid `It's not allowed to load an initial chunk on demand. The chunk name "main" is already used by an entrypoint` of
-        main: [...entries ?? [], ...dynamicEntries]
-      },
       define: {
         ...stringifyProcessEnvs(envs),
         NODE_ENV: JSON.stringify(process.env.NODE_ENV)
@@ -430,7 +588,41 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
         removeScriptTypeAttributes: false,
         removeStyleLinkTypeAttributes: true,
         useShortDoctype: true
-      }))
+      })),
+      {
+        name: "storybook-config-entry",
+        setup: (api) => {
+          api.modifyEnvironmentConfig({
+            handler: (config, { mergeEnvironmentConfig }) => {
+              const baseConfig = { ...config };
+              delete baseConfig.source.entry;
+              return mergeEnvironmentConfig(config, {
+                // Reset `config.source.entry` field, do not use provided entry
+                // see https://github.com/rspack-contrib/storybook-rsbuild/issues/43
+                source: {
+                  entry: {
+                    main: [...entries ?? [], ...dynamicEntries]
+                  }
+                },
+                tools: {
+                  rspack: {
+                    experiments: {
+                      outputModule: false
+                    },
+                    externalsType: "var",
+                    output: {
+                      module: false,
+                      chunkFormat: "array-push",
+                      chunkLoading: "jsonp"
+                    }
+                  }
+                }
+              });
+            },
+            order: "post"
+          });
+        }
+      }
     ].filter(Boolean),
     tools: {
       rspack: (config, { addRules, appendPlugins, rspack, mergeConfig }) => {
@@ -606,18 +798,18 @@ var rsbuild = async (_, options) => {
     },
     options
   );
-  let defaultConfig = await iframe_rsbuild_config_default(options, webpackAddonsConfig);
-  const shimsConfig = await applyReactShims(defaultConfig, options);
-  defaultConfig = rsbuildReal.mergeRsbuildConfig(
-    defaultConfig,
+  let intrinsicRsbuildConfig = await iframe_rsbuild_config_default(options, webpackAddonsConfig);
+  const shimsConfig = await applyReactShims(intrinsicRsbuildConfig, options);
+  intrinsicRsbuildConfig = rsbuildReal.mergeRsbuildConfig(
+    intrinsicRsbuildConfig,
     shimsConfig
   );
-  const finalDefaultConfig = await presets.apply(
+  const finalConfig = await presets.apply(
     "rsbuildFinal",
-    defaultConfig,
+    intrinsicRsbuildConfig,
     options
   );
-  return finalDefaultConfig;
+  return finalConfig;
 };
 var getConfig = async (options) => {
   const { presets } = options;
@@ -701,7 +893,7 @@ var build = async ({ options }) => {
   rsbuildBuild.onAfterBuild((params) => {
     stats = params.stats;
   });
-  const previewFiles = fs2.copy(previewDirOrigin, previewDirTarget, {
+  const previewFiles = fs4.copy(previewDirOrigin, previewDirTarget, {
     filter: (src) => {
       const { ext } = parse(src);
       if (ext) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-builder-rsbuild",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Rsbuild builder for Storybook",
   "keywords": [
     "storybook",
@@ -57,15 +57,14 @@
     "!src/**/*"
   ],
   "dependencies": {
-    "@rsbuild/plugin-type-check": "^1.2.2",
-    "@storybook/addon-docs": "^9.0.11",
-    "@storybook/core-webpack": "^9.0.11",
+    "@rsbuild/plugin-type-check": "^1.2.3",
+    "@storybook/addon-docs": "^9.0.18",
+    "@storybook/core-webpack": "^9.0.18",
     "browser-assert": "^1.2.1",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
     "cjs-module-lexer": "^1.4.3",
     "constants-browserify": "^1.0.0",
     "es-module-lexer": "^1.7.0",
-    "find-cache-dir": "^5.0.0",
     "fs-extra": "^11.3.0",
     "magic-string": "^0.30.17",
     "path-browserify": "^1.0.1",
@@ -78,14 +77,15 @@
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@rsbuild/core": "^1.3.22",
+    "@rsbuild/core": "^1.4.11",
     "@types/find-cache-dir": "^5.0.2",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^18.19.110",
     "@types/pretty-hrtime": "^1.0.3",
+    "find-cache-dir": "^5.0.0",
     "pretty-hrtime": "^1.0.3",
     "slash": "^5.1.0",
-    "storybook": "9.0.11",
+    "storybook": "9.1.2",
     "typescript": "^5.8.3"
   },
   "peerDependencies": {