storybook-builder-rsbuild 1.0.0 → 1.0.2

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

@@ -133,7 +133,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");
@@ -296,6 +296,15 @@ var maybeGetAbsolutePath = (input) => {
     return false;
   }
 };
+var builtInResolveExtensions = [
+  ".mjs",
+  ".js",
+  ".jsx",
+  ".ts",
+  ".tsx",
+  ".json",
+  ".cjs"
+];
 var managerAPIPath = maybeGetAbsolutePath("@storybook/manager-api");
 var componentsPath = maybeGetAbsolutePath("@storybook/components");
 var globalPath = maybeGetAbsolutePath("@storybook/global");
@@ -361,6 +370,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 }
   } : {};
@@ -472,7 +482,8 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
         splitChunks: {
           chunks: "all"
         }
-      }
+      },
+      buildCache: cacheConfig
     },
     plugins: [
       shouldCheckTs ? (0, import_plugin_type_check.pluginTypeCheck)(tsCheckOptions) : null,
@@ -499,15 +510,12 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
         });
         config.resolve ??= {};
         config.resolve.symlinks = !(0, import_common2.isPreservingSymlinks)();
-        config.resolve.extensions = [
-          ".mjs",
-          ".js",
-          ".jsx",
-          ".ts",
-          ".tsx",
-          ".json",
-          ".cjs"
-        ];
+        config.resolve.extensions = Array.from(
+          /* @__PURE__ */ new Set([
+            ...config.resolve.extensions ?? [],
+            ...builtInResolveExtensions
+          ])
+        );
         config.watchOptions = {
           ignored: /node_modules/
         };
@@ -547,7 +555,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",
@@ -635,22 +643,23 @@ var rsbuild = async (_, options) => {
   const { presets } = options;
   const webpackAddons = await presets.apply("webpackAddons");
   const resolvedWebpackAddons = (webpackAddons ?? []).map((preset) => {
-    const options2 = isObject(preset) ? preset.options || void 0 : void 0;
+    const addonOptions = isObject(preset) ? preset.options || void 0 : void 0;
     const name = isObject(preset) ? preset.name : preset;
-    return (0, import_common3.resolveAddonName)(options2.configDir, name, options2);
+    return (0, import_common3.resolveAddonName)(options.configDir, name, addonOptions);
   }).filter(nonNullables);
   const { apply } = await (0, import_common3.getPresets)(resolvedWebpackAddons, options);
   const webpackAddonsConfig = await apply(
     "webpackFinal",
     // TODO: using empty webpack config as base for now. It's better to using the composed rspack
     // config in `iframe-rsbuild.config.ts` as base config. But when `tools.rspack` is an async function,
-    // the following `tools.rspack` raise an ` Promises are not supported` error.
+    // the following `tools.rspack` raise an `Promises are not supported` error.
     {
       output: {},
       module: {},
       plugins: [],
       resolve: {},
-      devServer: {},
+      // https://github.com/web-infra-dev/rsbuild/blob/8dc35dc1d1500d2f119875d46b6a07e27986d532/packages/core/src/provider/rspackConfig.ts#L167
+      devServer: void 0,
       optimization: {},
       performance: {},
       externals: {},

package/dist/index.mjs

@@ -9,7 +9,7 @@ import { corePath } from 'storybook/core-path';
 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';
@@ -240,6 +240,15 @@ var maybeGetAbsolutePath = (input) => {
     return false;
   }
 };
+var builtInResolveExtensions = [
+  ".mjs",
+  ".js",
+  ".jsx",
+  ".ts",
+  ".tsx",
+  ".json",
+  ".cjs"
+];
 var managerAPIPath = maybeGetAbsolutePath("@storybook/manager-api");
 var componentsPath = maybeGetAbsolutePath("@storybook/components");
 var globalPath = maybeGetAbsolutePath("@storybook/global");
@@ -305,6 +314,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 }
   } : {};
@@ -416,7 +426,8 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
         splitChunks: {
           chunks: "all"
         }
-      }
+      },
+      buildCache: cacheConfig
     },
     plugins: [
       shouldCheckTs ? pluginTypeCheck(tsCheckOptions) : null,
@@ -445,15 +456,12 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
         });
         config.resolve ??= {};
         config.resolve.symlinks = !isPreservingSymlinks();
-        config.resolve.extensions = [
-          ".mjs",
-          ".js",
-          ".jsx",
-          ".ts",
-          ".tsx",
-          ".json",
-          ".cjs"
-        ];
+        config.resolve.extensions = Array.from(
+          /* @__PURE__ */ new Set([
+            ...config.resolve.extensions ?? [],
+            ...builtInResolveExtensions
+          ])
+        );
         config.watchOptions = {
           ignored: /node_modules/
         };
@@ -493,7 +501,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",
@@ -577,22 +585,23 @@ var rsbuild = async (_, options) => {
   const { presets } = options;
   const webpackAddons = await presets.apply("webpackAddons");
   const resolvedWebpackAddons = (webpackAddons ?? []).map((preset) => {
-    const options2 = isObject(preset) ? preset.options || void 0 : void 0;
+    const addonOptions = isObject(preset) ? preset.options || void 0 : void 0;
     const name = isObject(preset) ? preset.name : preset;
-    return resolveAddonName(options2.configDir, name, options2);
+    return resolveAddonName(options.configDir, name, addonOptions);
   }).filter(nonNullables);
   const { apply } = await getPresets(resolvedWebpackAddons, options);
   const webpackAddonsConfig = await apply(
     "webpackFinal",
     // TODO: using empty webpack config as base for now. It's better to using the composed rspack
     // config in `iframe-rsbuild.config.ts` as base config. But when `tools.rspack` is an async function,
-    // the following `tools.rspack` raise an ` Promises are not supported` error.
+    // the following `tools.rspack` raise an `Promises are not supported` error.
     {
       output: {},
       module: {},
       plugins: [],
       resolve: {},
-      devServer: {},
+      // https://github.com/web-infra-dev/rsbuild/blob/8dc35dc1d1500d2f119875d46b6a07e27986d532/packages/core/src/provider/rspackConfig.ts#L167
+      devServer: void 0,
       optimization: {},
       performance: {},
       externals: {},

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "storybook-builder-rsbuild",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "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,9 +57,9 @@
     "!src/**/*"
   ],
   "dependencies": {
-    "@rsbuild/plugin-type-check": "^1.2.1",
-    "@storybook/addon-docs": "^8.2.1",
-    "@storybook/core-webpack": "^8.2.1",
+    "@rsbuild/plugin-type-check": "^1.2.2",
+    "@storybook/addon-docs": "^8.6.14",
+    "@storybook/core-webpack": "^8.6.14",
     "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.1.13",
+    "@rsbuild/core": "^1.3.22",
     "@types/find-cache-dir": "^5.0.2",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^18.0.0",
     "@types/pretty-hrtime": "^1.0.3",
     "pretty-hrtime": "^1.0.3",
     "slash": "^5.1.0",
-    "storybook": "8.5.8",
+    "storybook": "8.6.14",
     "typescript": "^5.7.3"
   },
   "peerDependencies": {