storybook-builder-rsbuild 2.1.1 → 2.1.3

package/dist/index.js

@@ -366,9 +366,6 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
       }
     },
     source: {
-      // 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/],
       define: {
         ...(0, import_common2.stringifyProcessEnvs)(envs),
         NODE_ENV: JSON.stringify(process.env.NODE_ENV)
@@ -392,41 +389,7 @@ 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: rspack2, mergeConfig }) => {
@@ -495,6 +458,12 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
           ].filter(Boolean)
         );
         config.experiments ??= {};
+        config.experiments.outputModule = false;
+        config.externalsType = "var";
+        config.output ??= {};
+        config.output.module = false;
+        config.output.chunkFormat = "array-push";
+        config.output.chunkLoading = "jsonp";
         config.experiments = {
           ...config.experiments,
           ...lazyCompilationConfig
@@ -531,6 +500,10 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
       }
     }
   });
+  rsbuildConfig.source ??= {};
+  rsbuildConfig.source.entry = {
+    main: [...entries ?? [], ...dynamicEntries]
+  };
   return rsbuildConfig;
 };
 
@@ -561,7 +534,7 @@ var getIsReactVersion18or19 = async (options) => {
 var applyReactShims = async (config, options) => {
   const isReactVersion18 = await getIsReactVersion18or19(options);
   if (isReactVersion18) {
-    return void 0;
+    return {};
   }
   return {
     resolve: {

package/dist/index.mjs

@@ -315,9 +315,6 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
       }
     },
     source: {
-      // 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/],
       define: {
         ...stringifyProcessEnvs(envs),
         NODE_ENV: JSON.stringify(process.env.NODE_ENV)
@@ -341,41 +338,7 @@ 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: rspack2, mergeConfig }) => {
@@ -446,6 +409,12 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
           ].filter(Boolean)
         );
         config.experiments ??= {};
+        config.experiments.outputModule = false;
+        config.externalsType = "var";
+        config.output ??= {};
+        config.output.module = false;
+        config.output.chunkFormat = "array-push";
+        config.output.chunkLoading = "jsonp";
         config.experiments = {
           ...config.experiments,
           ...lazyCompilationConfig
@@ -482,6 +451,10 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
       }
     }
   });
+  rsbuildConfig.source ??= {};
+  rsbuildConfig.source.entry = {
+    main: [...entries ?? [], ...dynamicEntries]
+  };
   return rsbuildConfig;
 };
 var getIsReactVersion18or19 = async (options) => {
@@ -508,7 +481,7 @@ var getIsReactVersion18or19 = async (options) => {
 var applyReactShims = async (config, options) => {
   const isReactVersion18 = await getIsReactVersion18or19(options);
   if (isReactVersion18) {
-    return void 0;
+    return {};
   }
   return {
     resolve: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-builder-rsbuild",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "Rsbuild builder for Storybook",
   "keywords": [
     "storybook",
@@ -58,15 +58,15 @@
   ],
   "dependencies": {
     "@rsbuild/plugin-type-check": "^1.2.4",
-    "@storybook/addon-docs": "^9.1.5",
-    "@storybook/core-webpack": "^9.1.5",
+    "@storybook/addon-docs": "^9.1.15",
+    "@storybook/core-webpack": "^9.1.15",
     "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",
-    "fs-extra": "^11.3.1",
-    "magic-string": "^0.30.19",
+    "fs-extra": "^11.3.2",
+    "magic-string": "^0.30.21",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
     "rsbuild-plugin-html-minifier-terser": "^1.1.2",
@@ -77,7 +77,7 @@
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@rsbuild/core": "^1.5.6",
+    "@rsbuild/core": "^1.5.17",
     "@types/find-cache-dir": "^5.0.2",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^18.19.110",
@@ -85,8 +85,8 @@
     "find-cache-dir": "^5.0.0",
     "pretty-hrtime": "^1.0.3",
     "slash": "^5.1.0",
-    "storybook": "9.1.5",
-    "typescript": "^5.9.2"
+    "storybook": "9.1.10",
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
     "@rsbuild/core": "^1.5.0",