storybook-builder-rsbuild 2.0.2 → 2.0.3

package/dist/index.js

@@ -416,8 +416,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: {
@@ -459,10 +457,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 +480,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 }) => {
@@ -664,18 +692,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;

package/dist/index.mjs

@@ -360,8 +360,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 +401,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 +424,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 +634,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-builder-rsbuild",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Rsbuild builder for Storybook",
   "keywords": [
     "storybook",
@@ -57,9 +57,9 @@
     "!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",
@@ -78,14 +78,14 @@
     "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",
     "pretty-hrtime": "^1.0.3",
     "slash": "^5.1.0",
-    "storybook": "9.0.11",
+    "storybook": "9.0.18",
     "typescript": "^5.8.3"
   },
   "peerDependencies": {