storybook-builder-rsbuild 2.0.0-alpha.1 → 2.0.0-alpha.3

package/dist/index.d.ts

@@ -29,7 +29,12 @@ type BuilderOptions = {
     /**
      * Enable Rspack's lazy compilation (experimental).
      */
-    lazyCompilation?: boolean;
+    lazyCompilation?: NonNullable<RsbuildConfig['performance']>['buildCache'];
+    /**
+     * Enable Rspack's [persistent cache(experimental)](https://rspack.dev/config/experiments#experimentscache).
+     * We continue to use the name `fsCache` here to maintain better compatibility with the webpack builder.
+     */
+    fsCache?: boolean;
     /**
      * Which environment to use from the Rsbuild config.
      */

package/dist/index.js

@@ -132,7 +132,7 @@ var import_server_errors = require("storybook/internal/server-errors");
 var import_node_path3 = 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/dist/preset");
+var import_preset = require("@storybook/addon-docs/preset");
 var import_case_sensitive_paths_webpack_plugin = __toESM(require("case-sensitive-paths-webpack-plugin"));
 var import_rsbuild_plugin_html_minifier_terser = require("rsbuild-plugin-html-minifier-terser");
 var import_common2 = require("storybook/internal/common");
@@ -360,6 +360,7 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
   const shouldCheckTs = typescriptOptions.check && !typescriptOptions.skipCompiler;
   const tsCheckOptions = typescriptOptions.checkOptions || {};
   const builderOptions = await (0, import_common2.getBuilderOptions)(options);
+  const cacheConfig = builderOptions.fsCache ? true : void 0;
   const lazyCompilationConfig = builderOptions.lazyCompilation && !isProd ? {
     lazyCompilation: { entries: false }
   } : {};
@@ -449,13 +450,15 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
       assetPrefix: "/",
       progressBar: !quiet
     },
+    resolve: {
+      alias: {
+        ...storybookPaths
+      }
+    },
     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/],
-      alias: {
-        ...storybookPaths
-      },
       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]
@@ -471,7 +474,8 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
         splitChunks: {
           chunks: "all"
         }
-      }
+      },
+      buildCache: cacheConfig
     },
     plugins: [
       shouldCheckTs ? (0, import_plugin_type_check.pluginTypeCheck)(tsCheckOptions) : null,
@@ -543,7 +547,7 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
           ...config.experiments,
           ...lazyCompilationConfig
         };
-        return mergeConfig(config, extraWebpackConfig, appliedDocsWebpack);
+        return mergeConfig(config, extraWebpackConfig || {}, appliedDocsWebpack);
       },
       htmlPlugin: {
         filename: "iframe.html",
@@ -608,7 +612,7 @@ var applyReactShims = async (config, options) => {
     return void 0;
   }
   return {
-    source: {
+    resolve: {
       alias: {
         "@storybook/react-dom-shim": "@storybook/react-dom-shim/dist/react-16"
       }

package/dist/index.mjs

@@ -8,7 +8,7 @@ import sirv from 'sirv';
 import { normalizeStories, loadPreviewOrConfigFile, getBuilderOptions, readTemplate, resolveAddonName, getPresets, stringifyProcessEnvs, isPreservingSymlinks } from 'storybook/internal/common';
 import { WebpackInvocationError } from 'storybook/internal/server-errors';
 import { pluginTypeCheck } from '@rsbuild/plugin-type-check';
-import { webpack } from '@storybook/addon-docs/dist/preset';
+import { webpack } from '@storybook/addon-docs/preset';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import { pluginHtmlMinifierTerser } from 'rsbuild-plugin-html-minifier-terser';
 import { globalsNameReferenceMap } from 'storybook/internal/preview/globals';
@@ -304,6 +304,7 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
   const shouldCheckTs = typescriptOptions.check && !typescriptOptions.skipCompiler;
   const tsCheckOptions = typescriptOptions.checkOptions || {};
   const builderOptions = await getBuilderOptions(options);
+  const cacheConfig = builderOptions.fsCache ? true : void 0;
   const lazyCompilationConfig = builderOptions.lazyCompilation && !isProd ? {
     lazyCompilation: { entries: false }
   } : {};
@@ -393,13 +394,15 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
       assetPrefix: "/",
       progressBar: !quiet
     },
+    resolve: {
+      alias: {
+        ...storybookPaths
+      }
+    },
     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/],
-      alias: {
-        ...storybookPaths
-      },
       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]
@@ -415,7 +418,8 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
         splitChunks: {
           chunks: "all"
         }
-      }
+      },
+      buildCache: cacheConfig
     },
     plugins: [
       shouldCheckTs ? pluginTypeCheck(tsCheckOptions) : null,
@@ -489,7 +493,7 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
           ...config.experiments,
           ...lazyCompilationConfig
         };
-        return mergeConfig(config, extraWebpackConfig, appliedDocsWebpack);
+        return mergeConfig(config, extraWebpackConfig || {}, appliedDocsWebpack);
       },
       htmlPlugin: {
         filename: "iframe.html",
@@ -550,7 +554,7 @@ var applyReactShims = async (config, options) => {
     return void 0;
   }
   return {
-    source: {
+    resolve: {
       alias: {
         "@storybook/react-dom-shim": "@storybook/react-dom-shim/dist/react-16"
       }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "storybook-builder-rsbuild",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.3",
   "description": "Rsbuild builder for Storybook",
   "keywords": [
     "storybook",
     "rsbuild",
     "rspack"
   ],
-  "homepage": "https://storybook-rsbuild.netlify.app",
+  "homepage": "https://storybook.rsbuild.dev",
   "bugs": {
     "url": "https://github.com/rspack-contrib/storybook-rsbuild/issues"
   },
@@ -57,14 +57,14 @@
     "!src/**/*"
   ],
   "dependencies": {
-    "@rsbuild/plugin-type-check": "^1.2.1",
-    "@storybook/addon-docs": "^9.0.0-alpha.17",
-    "@storybook/core-webpack": "^9.0.0-alpha.17",
+    "@rsbuild/plugin-type-check": "^1.2.2",
+    "@storybook/addon-docs": "^9.0.4",
+    "@storybook/core-webpack": "^9.0.4",
     "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.6.0",
+    "es-module-lexer": "^1.7.0",
     "find-cache-dir": "^5.0.0",
     "fs-extra": "^11.3.0",
     "magic-string": "^0.30.17",
@@ -78,21 +78,29 @@
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@rsbuild/core": "^1.2.19",
+    "@rsbuild/core": "^1.3.22",
     "@types/find-cache-dir": "^5.0.2",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^18.0.0",
+    "@types/node": "^18.19.110",
     "@types/pretty-hrtime": "^1.0.3",
     "pretty-hrtime": "^1.0.3",
     "slash": "^5.1.0",
-    "storybook": "9.0.0-alpha.17",
-    "typescript": "^5.7.3"
+    "storybook": "9.0.4",
+    "typescript": "^5.8.3"
   },
   "peerDependencies": {
     "@rsbuild/core": "^1.0.1",
-    "storybook": "^9.0.0-alpha.17"
+    "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+    "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+    "storybook": "^9.0.0"
   },
   "peerDependenciesMeta": {
+    "react": {
+      "optional": true
+    },
+    "react-dom": {
+      "optional": true
+    },
     "typescript": {
       "optional": true
     }