storybook-builder-rsbuild 2.1.1 → 2.1.2

package/dist/index.js

@@ -365,7 +365,12 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
         ...storybookPaths
       }
     },
+    // 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]
+      },
       // 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/],
@@ -392,41 +397,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 +466,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

package/dist/index.mjs

@@ -314,7 +314,12 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
         ...storybookPaths
       }
     },
+    // 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]
+      },
       // 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/],
@@ -341,41 +346,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 +417,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-builder-rsbuild",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Rsbuild builder for Storybook",
   "keywords": [
     "storybook",
@@ -58,14 +58,14 @@
   ],
   "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.7",
+    "@storybook/core-webpack": "^9.1.7",
     "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",
+    "fs-extra": "^11.3.2",
     "magic-string": "^0.30.19",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
@@ -77,7 +77,7 @@
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@rsbuild/core": "^1.5.6",
+    "@rsbuild/core": "^1.5.11",
     "@types/find-cache-dir": "^5.0.2",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^18.19.110",