storybook-builder-rsbuild 3.3.3 → 3.4.0

package/compiled/@storybook/core-webpack/index.d.ts

@@ -15,7 +15,10 @@ interface WebpackConfiguration {
     module?: ModuleConfig;
     resolve?: ResolveConfig;
     optimization?: any;
-    devtool?: false | string;
+    devtool?: false | string | {
+        type: 'all' | 'javascript' | 'css';
+        use: any;
+    }[];
 }
 type BuilderOptions = {
     fsCache?: boolean;

package/compiled/@storybook/core-webpack/index.js

@@ -1,85 +1,7 @@
 import { createRequire as __WEBPACK_EXTERNAL_createRequire } from "module";
 import * as __WEBPACK_EXTERNAL_MODULE_storybook_internal_common_7991bda6__ from "storybook/internal/common";
 import * as __WEBPACK_EXTERNAL_MODULE_storybook_internal_node_logger_87de4309__ from "storybook/internal/node-logger";
-var __webpack_modules__ = {
-  980: (__unused_webpack_module, exports) => {
-    var __webpack_unused_export__;
-    __webpack_unused_export__ = { value: true };
-    exports.TW = void 0;
-    function dedent(templ) {
-      var values = [];
-      for (var _i = 1; _i < arguments.length; _i++) {
-        values[_i - 1] = arguments[_i];
-      }
-      var strings = Array.from(typeof templ === "string" ? [templ] : templ);
-      strings[strings.length - 1] = strings[strings.length - 1].replace(
-        /\r?\n([\t ]*)$/,
-        "",
-      );
-      var indentLengths = strings.reduce(function (arr, str) {
-        var matches = str.match(/\n([\t ]+|(?!\s).)/g);
-        if (matches) {
-          return arr.concat(
-            matches.map(function (match) {
-              var _a, _b;
-              return (_b =
-                (_a = match.match(/[\t ]/g)) === null || _a === void 0
-                  ? void 0
-                  : _a.length) !== null && _b !== void 0
-                ? _b
-                : 0;
-            }),
-          );
-        }
-        return arr;
-      }, []);
-      if (indentLengths.length) {
-        var pattern_1 = new RegExp(
-          "\n[\t ]{" + Math.min.apply(Math, indentLengths) + "}",
-          "g",
-        );
-        strings = strings.map(function (str) {
-          return str.replace(pattern_1, "\n");
-        });
-      }
-      strings[0] = strings[0].replace(/^\r?\n/, "");
-      var string = strings[0];
-      values.forEach(function (value, i) {
-        var endentations = string.match(/(?:^|\n)( *)$/);
-        var endentation = endentations ? endentations[1] : "";
-        var indentedValue = value;
-        if (typeof value === "string" && value.includes("\n")) {
-          indentedValue = String(value)
-            .split("\n")
-            .map(function (str, i) {
-              return i === 0 ? str : "" + endentation + str;
-            })
-            .join("\n");
-        }
-        string += indentedValue + strings[i + 1];
-      });
-      return string;
-    }
-    exports.TW = dedent;
-    __webpack_unused_export__ = dedent;
-  },
-};
-var __webpack_module_cache__ = {};
-function __nccwpck_require__(moduleId) {
-  var cachedModule = __webpack_module_cache__[moduleId];
-  if (cachedModule !== undefined) {
-    return cachedModule.exports;
-  }
-  var module = (__webpack_module_cache__[moduleId] = { exports: {} });
-  var threw = true;
-  try {
-    __webpack_modules__[moduleId](module, module.exports, __nccwpck_require__);
-    threw = false;
-  } finally {
-    if (threw) delete __webpack_module_cache__[moduleId];
-  }
-  return module.exports;
-}
+var __nccwpck_require__ = {};
 (() => {
   __nccwpck_require__.d = (exports, definition) => {
     for (var key in definition) {
@@ -147,7 +69,61 @@ const node_logger_namespaceObject = node_logger_x({
   ["logger"]: () =>
     __WEBPACK_EXTERNAL_MODULE_storybook_internal_node_logger_87de4309__.logger,
 });
-var dist = __nccwpck_require__(980);
+function dedent(templ) {
+  var values = [];
+  for (var _i = 1; _i < arguments.length; _i++) {
+    values[_i - 1] = arguments[_i];
+  }
+  var strings = Array.from(typeof templ === "string" ? [templ] : templ);
+  strings[strings.length - 1] = strings[strings.length - 1].replace(
+    /\r?\n([\t ]*)$/,
+    "",
+  );
+  var indentLengths = strings.reduce(function (arr, str) {
+    var matches = str.match(/\n([\t ]+|(?!\s).)/g);
+    if (matches) {
+      return arr.concat(
+        matches.map(function (match) {
+          var _a, _b;
+          return (_b =
+            (_a = match.match(/[\t ]/g)) === null || _a === void 0
+              ? void 0
+              : _a.length) !== null && _b !== void 0
+            ? _b
+            : 0;
+        }),
+      );
+    }
+    return arr;
+  }, []);
+  if (indentLengths.length) {
+    var pattern_1 = new RegExp(
+      "\n[\t ]{".concat(Math.min.apply(Math, indentLengths), "}"),
+      "g",
+    );
+    strings = strings.map(function (str) {
+      return str.replace(pattern_1, "\n");
+    });
+  }
+  strings[0] = strings[0].replace(/^\r?\n/, "");
+  var string = strings[0];
+  values.forEach(function (value, i) {
+    var endentations = string.match(/(?:^|\n)( *)$/);
+    var endentation = endentations ? endentations[1] : "";
+    var indentedValue = value;
+    if (typeof value === "string" && value.includes("\n")) {
+      indentedValue = String(value)
+        .split("\n")
+        .map(function (str, i) {
+          return i === 0 ? str : "".concat(endentation).concat(str);
+        })
+        .join("\n");
+    }
+    string += indentedValue + strings[i + 1];
+  });
+  return string;
+}
+const esm = null && dedent;
 var dist_filename = external_node_url_namespaceObject.fileURLToPath(
   import.meta.url,
 );
@@ -170,7 +146,7 @@ var checkWebpackVersion = (webpack, specifier, caption) => {
     return;
   }
   webpack.version !== specifier &&
-    node_logger_namespaceObject.logger.warn((0, dist.TW)`
+    node_logger_namespaceObject.logger.warn(dedent`
       Unexpected webpack version in ${caption}:
       - Received '${webpack.version}'
       - Expected '${specifier}'
@@ -268,7 +244,7 @@ function webpackIncludeRegexp(specifier) {
 }
 function toImportFnPart(specifier) {
   let { directory, importPathMatcher } = specifier;
-  return (0, dist.TW)`
+  return dedent`
       async (path) => {
         if (!${importPathMatcher}.exec(path)) {
           return;
@@ -289,7 +265,7 @@ function toImportFn(stories, { needPipelinedImport } = {}) {
   return (
     needPipelinedImport &&
       (pipelinedImport = `\n      const importPipeline = ${importPipeline};\n      const pipeline = importPipeline();\n    `),
-    (0, dist.TW)`
+    dedent`
     ${pipelinedImport}
 
     const importers = [

package/compiled/@storybook/core-webpack/package.json

@@ -1 +1 @@
-{"name":"@storybook/core-webpack","version":"10.3.4","funding":{"type":"opencollective","url":"https://opencollective.com/storybook"},"license":"MIT","types":"index.d.ts","type":"module"}
+{"name":"@storybook/core-webpack","version":"10.5.5","funding":{"type":"opencollective","url":"https://opencollective.com/storybook"},"license":"MIT","types":"index.d.ts","type":"module"}

package/dist/_node-chunks/{chunk-LTM5Q7YC.js → chunk-NXNFA2RX.js}

@@ -1,10 +1,10 @@
-import CJS_COMPAT_NODE_URL_19c268890619b71f from 'node:url';
-import CJS_COMPAT_NODE_PATH_19c268890619b71f from 'node:path';
-import CJS_COMPAT_NODE_MODULE_19c268890619b71f from "node:module";
+import CJS_COMPAT_NODE_URL_95ee734c542e82b6 from 'node:url';
+import CJS_COMPAT_NODE_PATH_95ee734c542e82b6 from 'node:path';
+import CJS_COMPAT_NODE_MODULE_95ee734c542e82b6 from "node:module";
 
-var __filename = CJS_COMPAT_NODE_URL_19c268890619b71f.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_19c268890619b71f.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_19c268890619b71f.createRequire(import.meta.url);
+var __filename = CJS_COMPAT_NODE_URL_95ee734c542e82b6.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_95ee734c542e82b6.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_95ee734c542e82b6.createRequire(import.meta.url);
 
 // ------------------------------------------------------------
 // end of CJS compatibility banner, injected by Storybook's esbuild configuration

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as rsbuildReal from '@rsbuild/core';
 import { DevConfig, RsbuildConfig } from '@rsbuild/core';
-import { BuilderResult as BuilderResult$1, Builder, Options, StorybookConfigRaw, TypescriptOptions as TypescriptOptions$1 } from 'storybook/internal/types';
+import { BuilderResult as BuilderResult$1, Builder, Options, StorybookConfigRaw, TypescriptOptions as TypescriptOptions$1, NormalizedStoriesSpecifier } from 'storybook/internal/types';
 import { PluginTypeCheckerOptions } from '@rsbuild/plugin-type-check';
 
 type RsbuildStats = {
@@ -48,6 +48,19 @@ interface BuilderResult extends BuilderResult$1 {
     stats?: Stats;
 }
 
+/**
+ * Re-assert Storybook core's intent to keep `node_modules` out of the stories
+ * context. Core's `(?!.*node_modules)` guard relies on webpack's context
+ * dropping `node_modules`; Rspack's `ContextModule` enumerates it, so a
+ * dependency shipping `.stories.*` gets swept in. We append a separator-anchored
+ * `webpackExclude` to every generated `webpackInclude`, except specifiers that
+ * intentionally glob into `node_modules` (real segment or alternation branch) —
+ * matching the webpack builder, which surfaces those.
+ *
+ * TODO: remove once the upstream Rspack fix ships in a released `@rspack/core`
+ * — https://github.com/web-infra-dev/rspack/pull/14576.
+ */
+declare const excludeNodeModulesFromStoryContext: (importFnSource: string, stories: NormalizedStoriesSpecifier[]) => string;
 declare const getVirtualModules: (options: Options) => Promise<{
     virtualModules: Record<string, string>;
     entries: string[];
@@ -64,10 +77,18 @@ declare const executor: {
 };
 declare const getConfig: RsbuildBuilder['getConfig'];
 declare function bail(): Promise<void>;
+/**
+ * Returns a {@link ChangeDetectionAdapter} bound to the Rspack compiler created by `start()`.
+ *
+ * Storybook core only invokes this after `start()` has resolved, so `activeCompiler` is populated
+ * in practice. The guard is defensive: it fails loudly on an unexpected call-before-start rather
+ * than silently binding to an undefined compiler.
+ */
+declare const changeDetectionAdapter: NonNullable<RsbuildBuilder['changeDetectionAdapter']>;
 declare const start: RsbuildBuilder['start'];
 declare const build: ({ options }: BuilderStartOptions) => Promise<Stats>;
 declare const corePresets: string[];
 declare const previewMainTemplate: () => string;
 
-export { bail, build, corePresets, executor, getConfig, getVirtualModules, previewMainTemplate, printDuration, start };
+export { bail, build, changeDetectionAdapter, corePresets, excludeNodeModulesFromStoryContext, executor, getConfig, getVirtualModules, previewMainTemplate, printDuration, start };
 export type { BuilderOptions, BuilderResult, RsbuildBuilder, RsbuildFinal, Stats, StorybookConfigRsbuild, TypescriptOptions };

package/dist/index.js

@@ -1,10 +1,10 @@
-import CJS_COMPAT_NODE_URL_19c268890619b71f from 'node:url';
-import CJS_COMPAT_NODE_PATH_19c268890619b71f from 'node:path';
-import CJS_COMPAT_NODE_MODULE_19c268890619b71f from "node:module";
+import CJS_COMPAT_NODE_URL_95ee734c542e82b6 from 'node:url';
+import CJS_COMPAT_NODE_PATH_95ee734c542e82b6 from 'node:path';
+import CJS_COMPAT_NODE_MODULE_95ee734c542e82b6 from "node:module";
 
-var __filename = CJS_COMPAT_NODE_URL_19c268890619b71f.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_19c268890619b71f.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_19c268890619b71f.createRequire(import.meta.url);
+var __filename = CJS_COMPAT_NODE_URL_95ee734c542e82b6.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_95ee734c542e82b6.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_95ee734c542e82b6.createRequire(import.meta.url);
 
 // ------------------------------------------------------------
 // end of CJS compatibility banner, injected by Storybook's esbuild configuration
@@ -13,7 +13,7 @@ import {
   __commonJS,
   __require,
   __toESM
-} from "./_node-chunks/chunk-LTM5Q7YC.js";
+} from "./_node-chunks/chunk-NXNFA2RX.js";
 
 // ../../node_modules/.pnpm/pretty-hrtime@1.0.3/node_modules/pretty-hrtime/index.js
 var require_pretty_hrtime = __commonJS({
@@ -41,6 +41,66 @@ import sirv from "sirv";
 import { getPresets, resolveAddonName } from "storybook/internal/common";
 import { WebpackInvocationError } from "storybook/internal/server-errors";
 
+// src/change-detection-adapter/index.ts
+import { normalize } from "pathe";
+import { logger } from "storybook/internal/node-logger";
+function createRspackChangeDetectionAdapter(compiler) {
+  return {
+    async getResolveConfig() {
+      let resolveOpts = compiler.options.resolve;
+      return {
+        projectRoot: compiler.context,
+        alias: normaliseRspackAlias(resolveOpts.alias),
+        conditions: resolveOpts.conditionNames
+      };
+    },
+    onFileChange(handler) {
+      let active = !0, seeded = !1, seenFiles = /* @__PURE__ */ new Set();
+      return compiler.hooks.afterCompile.tap(
+        "StorybookChangeDetection",
+        (compilation) => {
+          for (let filePath of compilation.fileDependencies)
+            seenFiles.add(normalize(filePath));
+          seeded = !0;
+        }
+      ), compiler.hooks.watchRun.tap(
+        "StorybookChangeDetection",
+        (watchingCompiler) => {
+          if (active) {
+            for (let filePath of watchingCompiler.modifiedFiles ?? []) {
+              let path = normalize(filePath), kind = seeded && !seenFiles.has(path) ? "add" : "change";
+              seenFiles.add(path), handler({ kind, path });
+            }
+            for (let filePath of watchingCompiler.removedFiles ?? []) {
+              let path = normalize(filePath);
+              seenFiles.delete(path), handler({ kind: "unlink", path });
+            }
+          }
+        }
+      ), () => {
+        active = !1;
+      };
+    }
+  };
+}
+function normaliseRspackAlias(alias) {
+  if (!alias) return;
+  let record = {};
+  for (let [key, value] of Object.entries(alias))
+    if (typeof value == "string")
+      record[key] = value;
+    else if (Array.isArray(value)) {
+      let stringValues = value.filter(
+        (item) => typeof item == "string"
+      ), replacement = stringValues[0];
+      if (replacement == null) continue;
+      stringValues.length > 1 && logger.debug(
+        `Change detection: Rspack alias "${key}" has ${stringValues.length} values; using only the first: "${replacement}"`
+      ), record[key] = replacement;
+    }
+  return Object.keys(record).length > 0 ? record : void 0;
+}
+
 // src/chromatic-stats.ts
 import { isAbsolute, relative } from "node:path";
 var isRecord = (val) => val != null && typeof val == "object" && Array.isArray(val) === !1, toPosixPath = (filePath) => filePath.split("\\").join("/"), toNormalizedModulePath = (modulePath) => typeof modulePath != "string" || modulePath.length === 0 ? null : isAbsolute(modulePath) ? toPosixPath(relative(process.cwd(), modulePath)) : toPosixPath(modulePath), toAbsolutePathFromIdentifier = (identifier) => {
@@ -136,28 +196,28 @@ var isRecord = (val) => val != null && typeof val == "object" && Array.isArray(v
 // src/logger.ts
 import { logger as rsbuildLogger } from "@rsbuild/core";
 import picocolors from "picocolors";
-import { logger } from "storybook/internal/node-logger";
+import { logger as logger2 } from "storybook/internal/node-logger";
 function overrideRsbuildLogger() {
   let logWithPrefix = (fn) => (msg) => fn(
     `${picocolors.black(picocolors.bgBlueBright("Rsbuild"))} ${String(msg)}`
   );
   rsbuildLogger.override({
-    error: logWithPrefix(logger.error),
-    warn: logWithPrefix(logger.warn),
-    info: logWithPrefix((msg) => logger.log(msg, { spacing: 0 })),
-    start: logWithPrefix(logger.info),
-    ready: logWithPrefix(logger.info),
-    success: logWithPrefix(logger.info),
-    log: logWithPrefix(logger.info),
-    debug: logWithPrefix(logger.debug)
+    error: logWithPrefix(logger2.error),
+    warn: logWithPrefix(logger2.warn),
+    info: logWithPrefix((msg) => logger2.log(msg, { spacing: 0 })),
+    start: logWithPrefix(logger2.info),
+    ready: logWithPrefix(logger2.info),
+    success: logWithPrefix(logger2.info),
+    log: logWithPrefix(logger2.info),
+    debug: logWithPrefix(logger2.debug)
   });
 }
 
 // src/preview/iframe-rsbuild.config.ts
 import { createRequire } from "node:module";
-import { dirname, join as join2, resolve as resolve2 } from "node:path";
+import { dirname, join as join2, resolve as resolve3 } from "node:path";
 import { fileURLToPath } from "node:url";
-import { loadConfig, mergeRsbuildConfig } from "@rsbuild/core";
+import { loadConfig, mergeRsbuildConfig, rspack } from "@rsbuild/core";
 import { pluginTypeCheck } from "@rsbuild/plugin-type-check";
 import CaseSensitivePathsPlugin from "case-sensitive-paths-webpack-plugin";
 import { pluginHtmlMinifierTerser } from "rsbuild-plugin-html-minifier-terser";
@@ -167,11 +227,26 @@ import {
   normalizeStories as normalizeStories2,
   stringifyProcessEnvs
 } from "storybook/internal/common";
+import { logger as logger4 } from "storybook/internal/node-logger";
 import { globalsNameReferenceMap } from "storybook/internal/preview/globals";
-import { dedent } from "ts-dedent";
+import { dedent as dedent2 } from "ts-dedent";
+
+// src/preview/detect-msw.ts
+import { existsSync } from "node:fs";
+import { isAbsolute as isAbsolute2, resolve } from "node:path";
+var MSW_SW_FILE = "mockServiceWorker.js";
+async function isMswActive(options) {
+  let staticDirs = await options.presets.apply("staticDirs", []);
+  return Array.isArray(staticDirs) ? staticDirs.some((entry) => {
+    let dir = typeof entry == "string" ? entry : entry?.from;
+    if (typeof dir != "string" || dir.length === 0) return !1;
+    let abs = isAbsolute2(dir) ? dir : resolve(options.configDir, dir);
+    return existsSync(resolve(abs, MSW_SW_FILE));
+  }) : !1;
+}
 
 // src/preview/virtual-module-mapping.ts
-import { join, resolve } from "node:path";
+import { join, resolve as resolve2 } from "node:path";
 
 // ../../node_modules/.pnpm/slash@5.1.0/node_modules/slash/index.js
 function slash(path) {
@@ -190,65 +265,7 @@ import {
 import { createRequire as __WEBPACK_EXTERNAL_createRequire } from "module";
 import * as __WEBPACK_EXTERNAL_MODULE_storybook_internal_common_7991bda6__ from "storybook/internal/common";
 import * as __WEBPACK_EXTERNAL_MODULE_storybook_internal_node_logger_87de4309__ from "storybook/internal/node-logger";
-var __webpack_modules__ = {
-  980: (__unused_webpack_module, exports) => {
-    var __webpack_unused_export__;
-    __webpack_unused_export__ = { value: !0 }, exports.TW = void 0;
-    function dedent2(templ) {
-      for (var values = [], _i = 1; _i < arguments.length; _i++)
-        values[_i - 1] = arguments[_i];
-      var strings = Array.from(typeof templ == "string" ? [templ] : templ);
-      strings[strings.length - 1] = strings[strings.length - 1].replace(
-        /\r?\n([\t ]*)$/,
-        ""
-      );
-      var indentLengths = strings.reduce(function(arr, str) {
-        var matches = str.match(/\n([\t ]+|(?!\s).)/g);
-        return matches ? arr.concat(
-          matches.map(function(match) {
-            var _a, _b;
-            return (_b = (_a = match.match(/[\t ]/g)) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
-          })
-        ) : arr;
-      }, []);
-      if (indentLengths.length) {
-        var pattern_1 = new RegExp(
-          `
-[	 ]{` + Math.min.apply(Math, indentLengths) + "}",
-          "g"
-        );
-        strings = strings.map(function(str) {
-          return str.replace(pattern_1, `
-`);
-        });
-      }
-      strings[0] = strings[0].replace(/^\r?\n/, "");
-      var string = strings[0];
-      return values.forEach(function(value, i) {
-        var endentations = string.match(/(?:^|\n)( *)$/), endentation = endentations ? endentations[1] : "", indentedValue = value;
-        typeof value == "string" && value.includes(`
-`) && (indentedValue = String(value).split(`
-`).map(function(str, i2) {
-          return i2 === 0 ? str : "" + endentation + str;
-        }).join(`
-`)), string += indentedValue + strings[i + 1];
-      }), string;
-    }
-    exports.TW = dedent2, __webpack_unused_export__ = dedent2;
-  }
-}, __webpack_module_cache__ = {};
-function __nccwpck_require__(moduleId) {
-  var cachedModule = __webpack_module_cache__[moduleId];
-  if (cachedModule !== void 0)
-    return cachedModule.exports;
-  var module = __webpack_module_cache__[moduleId] = { exports: {} }, threw = !0;
-  try {
-    __webpack_modules__[moduleId](module, module.exports, __nccwpck_require__), threw = !1;
-  } finally {
-    threw && delete __webpack_module_cache__[moduleId];
-  }
-  return module.exports;
-}
+var __nccwpck_require__ = {};
 __nccwpck_require__.d = (exports, definition) => {
   for (var key in definition)
     __nccwpck_require__.o(definition, key) && !__nccwpck_require__.o(exports, key) && Object.defineProperty(exports, key, {
@@ -291,7 +308,48 @@ var common_namespaceObject = x({
 };
 var node_logger_namespaceObject = node_logger_x({
   logger: () => __WEBPACK_EXTERNAL_MODULE_storybook_internal_node_logger_87de4309__.logger
-}), dist = __nccwpck_require__(980), dist_filename = external_node_url_namespaceObject.fileURLToPath(
+});
+function dedent(templ) {
+  for (var values = [], _i = 1; _i < arguments.length; _i++)
+    values[_i - 1] = arguments[_i];
+  var strings = Array.from(typeof templ == "string" ? [templ] : templ);
+  strings[strings.length - 1] = strings[strings.length - 1].replace(
+    /\r?\n([\t ]*)$/,
+    ""
+  );
+  var indentLengths = strings.reduce(function(arr, str) {
+    var matches = str.match(/\n([\t ]+|(?!\s).)/g);
+    return matches ? arr.concat(
+      matches.map(function(match) {
+        var _a, _b;
+        return (_b = (_a = match.match(/[\t ]/g)) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
+      })
+    ) : arr;
+  }, []);
+  if (indentLengths.length) {
+    var pattern_1 = new RegExp(
+      `
+[	 ]{`.concat(Math.min.apply(Math, indentLengths), "}"),
+      "g"
+    );
+    strings = strings.map(function(str) {
+      return str.replace(pattern_1, `
+`);
+    });
+  }
+  strings[0] = strings[0].replace(/^\r?\n/, "");
+  var string = strings[0];
+  return values.forEach(function(value, i) {
+    var endentations = string.match(/(?:^|\n)( *)$/), endentation = endentations ? endentations[1] : "", indentedValue = value;
+    typeof value == "string" && value.includes(`
+`) && (indentedValue = String(value).split(`
+`).map(function(str, i2) {
+      return i2 === 0 ? str : "".concat(endentation).concat(str);
+    }).join(`
+`)), string += indentedValue + strings[i + 1];
+  }), string;
+}
+var dist_filename = external_node_url_namespaceObject.fileURLToPath(
   import.meta.url
 ), dist_dirname = external_node_path_namespaceObject.dirname(dist_filename), dist_require = external_node_module_namespaceObject.createRequire(
   import.meta.url
@@ -306,7 +364,7 @@ var node_logger_namespaceObject = node_logger_x({
     );
     return;
   }
-  webpack.version !== specifier && node_logger_namespaceObject.logger.warn((0, dist.TW)`
+  webpack.version !== specifier && node_logger_namespaceObject.logger.warn(dedent`
       Unexpected webpack version in ${caption}:
       - Received '${webpack.version}'
       - Expected '${specifier}'
@@ -375,7 +433,7 @@ function webpackIncludeRegexp(specifier) {
 }
 function toImportFnPart(specifier) {
   let { directory, importPathMatcher } = specifier;
-  return (0, dist.TW)`
+  return dedent`
       async (path) => {
         if (!${importPathMatcher}.exec(path)) {
           return;
@@ -396,7 +454,7 @@ function toImportFn(stories, { needPipelinedImport } = {}) {
   return needPipelinedImport && (pipelinedImport = `
       const importPipeline = ${importPipeline};
       const pipeline = importPipeline();
-    `), (0, dist.TW)`
+    `), dedent`
     ${pipelinedImport}
 
     const importers = [
@@ -427,7 +485,26 @@ var toRequireContext = (specifier) => {
 }, __webpack_exports__checkWebpackVersion = __webpack_exports__.il, __webpack_exports__loadCustomWebpackConfig = __webpack_exports__.Tu, __webpack_exports__mergeConfigs = __webpack_exports__.SV, __webpack_exports__toImportFn = __webpack_exports__.T1, __webpack_exports__toImportFnPart = __webpack_exports__.i8, __webpack_exports__toRequireContext = __webpack_exports__.sg, __webpack_exports__toRequireContextString = __webpack_exports__.HO, __webpack_exports__webpackIncludeRegexp = __webpack_exports__.hO;
 
 // src/preview/virtual-module-mapping.ts
-var getVirtualModules = async (options) => {
+var NODE_MODULES_GLOB_TOKEN = /(?:^|[\\/(|,{])node_modules(?:$|[\\/)|,}])/, toWebpackIncludeGlob = ({
+  directory,
+  files
+}) => [".", ".."].includes(directory) ? files : `${directory.replace(/^(\.+\/)+/, "/")}/${files}`, targetsNodeModules = (specifier) => NODE_MODULES_GLOB_TOKEN.test(toWebpackIncludeGlob(specifier)), excludeNodeModulesFromStoryContext = (importFnSource, stories) => {
+  let specifierIndex = 0;
+  return importFnSource.split(`
+`).flatMap((line) => {
+    if (!line.includes("webpackInclude:"))
+      return [line];
+    let specifier = stories[specifierIndex++];
+    if (specifier && targetsNodeModules(specifier))
+      return [line];
+    let indent = line.slice(0, line.length - line.trimStart().length);
+    return [
+      line,
+      `${indent}/* webpackExclude: /[\\\\/]node_modules[\\\\/]/ */`
+    ];
+  }).join(`
+`);
+}, getVirtualModules = async (options) => {
   let virtualModules = {}, builderOptions = await getBuilderOptions(options), workingDir = process.cwd(), isProd = options.configType === "PRODUCTION", nonNormalizedStories = await options.presets.apply("stories", []), entries = [], stories = normalizeStories(nonNormalizedStories, {
     configDir: options.configDir,
     workingDir
@@ -438,11 +515,14 @@ var getVirtualModules = async (options) => {
       options
     )).map((entry) => typeof entry == "object" ? entry.absolute : slash(entry)),
     loadPreviewOrConfigFile(options)
-  ].filter(Boolean), storiesFilename = "storybook-stories.js", storiesPath = resolve(join(workingDir, storiesFilename)), needPipelinedImport = builderOptions.lazyCompilation !== !1 && !isProd;
-  virtualModules[storiesPath] = __webpack_exports__toImportFn(stories, {
-    needPipelinedImport
-  });
-  let configEntryPath = resolve(join(workingDir, "storybook-config-entry.js"));
+  ].filter(Boolean), storiesFilename = "storybook-stories.js", storiesPath = resolve2(join(workingDir, storiesFilename)), needPipelinedImport = builderOptions.lazyCompilation !== !1 && !isProd;
+  virtualModules[storiesPath] = excludeNodeModulesFromStoryContext(
+    __webpack_exports__toImportFn(stories, {
+      needPipelinedImport
+    }),
+    stories
+  );
+  let configEntryPath = resolve2(join(workingDir, "storybook-config-entry.js"));
   return virtualModules[configEntryPath] = (await readTemplate(
     __require.resolve(
       "storybook-builder-rsbuild/templates/virtualModuleModernEntry.js"
@@ -488,7 +568,7 @@ var require2 = createRequire(import.meta.url), getAbsolutePath = (input) => {
     return null;
   let major = Number.parseInt(version.split(".")[0] ?? "", 10);
   return Number.isNaN(major) ? null : major;
-}, RAW_QUERY_REGEX = /[?&]raw(?:&|=|$)/, globalPath = maybeGetAbsolutePath("@storybook/global"), storybookPaths = {
+}, rspackMajorVersion = getRspackMajorVersion(rspack.rspackVersion), RAW_QUERY_REGEX = /[?&]raw(?:&|=|$)/, globalPath = maybeGetAbsolutePath("@storybook/global"), storybookPaths = {
   // biome-ignore lint/complexity/useLiteralKeys: dynamic key required for conditional spread
   ...globalPath ? { "@storybook/global": globalPath } : {}
 }, iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
@@ -518,7 +598,8 @@ var require2 = createRequire(import.meta.url), getAbsolutePath = (input) => {
     nonNormalizedStories,
     _modulesCount,
     build2,
-    tagsOptions
+    tagsOptions,
+    htmlLang
   ] = await Promise.all([
     presets.apply("core"),
     presets.apply("frameworkOptions"),
@@ -532,24 +613,30 @@ var require2 = createRequire(import.meta.url), getAbsolutePath = (input) => {
     presets.apply("stories", []),
     options.cache?.get("modulesCount", 1e3),
     options.presets.apply("build"),
-    presets.apply("tags", {})
+    presets.apply("tags", {}),
+    presets.apply("htmlLang", "en")
   ]), stories = normalizeStories2(nonNormalizedStories, {
     configDir: options.configDir,
     workingDir
   }), shouldCheckTs = typescriptOptions.check && !typescriptOptions.skipCompiler, tsCheckOptions = typescriptOptions.checkOptions || {}, builderOptions = await getBuilderOptions2(options), cacheConfig = builderOptions.fsCache ? !0 : void 0, shouldDisableDevFeatures = process.env.SB_RSBUILD_TEST_MINIMAL_DEV === "true", lazyCompilationConfig;
-  isProd || (shouldDisableDevFeatures ? lazyCompilationConfig = !1 : lazyCompilationConfig = builderOptions.lazyCompilation === void 0 ? {
+  isProd || (shouldDisableDevFeatures ? lazyCompilationConfig = !1 : builderOptions.lazyCompilation !== void 0 ? lazyCompilationConfig = builderOptions.lazyCompilation : await isMswActive(options) ? (lazyCompilationConfig = !1, logger4.warn(dedent2`
+        Detected mockServiceWorker.js in staticDirs. Lazy compilation has been disabled
+        automatically to avoid a Service Worker race that can leave the preview iframe
+        blank on cold story loads. Set \`lazyCompilation\` explicitly in your builder
+        options to override.
+      `)) : lazyCompilationConfig = {
     entries: !1
-  } : builderOptions.lazyCompilation);
+  });
   let shouldDisableHmr = shouldDisableDevFeatures;
   if (!template)
-    throw new Error(dedent`
+    throw new Error(dedent2`
       Storybook's Webpack5 builder requires a template to be specified.
       Somehow you've ended up with a falsy value for the template option.
 
       Please file an issue at https://github.com/storybookjs/storybook with a reproduction.
     `);
   let externals = globalsNameReferenceMap;
-  build2?.test?.disableBlocks && (externals["@storybook/blocks"] = "__STORYBOOK_BLOCKS_EMPTY_MODULE__");
+  build2?.test?.disableBlocks && (externals["@storybook/addon-docs/blocks"] = "__STORYBOOK_BLOCKS_EMPTY_MODULE__");
   let { virtualModules: virtualModuleMapping, entries: dynamicEntries } = await getVirtualModules(options), contentFromConfig = {}, { content } = await loadConfig({
     cwd: workingDir,
     path: rsbuildConfigPath
@@ -593,7 +680,28 @@ var require2 = createRequire(import.meta.url), getAbsolutePath = (input) => {
         css: !options.build?.test?.disableSourcemaps
       },
       distPath: {
-        root: resolve2(process.cwd(), outputDir)
+        root: resolve3(process.cwd(), outputDir),
+        // Flat output, matching the official webpack5 builder. With
+        // `assetPrefix: ''` every context resolves relative URLs against
+        // itself, so nesting breaks worker chunks and CSS url(). See the
+        // "Preview Output Layout" docs section (#522).
+        //
+        // Load-bearing — these four carry the relative URLs that break:
+        js: "",
+        jsAsync: "",
+        // does not inherit `js`, must be explicit
+        css: "",
+        cssAsync: "",
+        // does not inherit `css`, must be explicit
+        // Parity with the webpack5 builder's flat layout. `filename` stacks on
+        // top of `distPath`, so image/font/media still land under the
+        // `static/media/` prefix set below.
+        svg: "",
+        font: "",
+        image: "",
+        media: "",
+        wasm: "",
+        assets: ""
       },
       filename: {
         js: isProd ? "[name].[contenthash:8].iframe.bundle.js" : "[name].iframe.bundle.js",
@@ -624,14 +732,25 @@ var require2 = createRequire(import.meta.url), getAbsolutePath = (input) => {
         NODE_ENV: JSON.stringify(process.env.NODE_ENV)
       }
     },
-    performance: {
-      chunkSplit: {
-        strategy: "custom",
-        splitChunks: {
-          chunks: "all"
-        }
+    // Rsbuild v1 compatible: `performance.chunkSplit` is deprecated in Rsbuild v2, use top-level `splitChunks` instead.
+    ...rspackMajorVersion === 1 ? {
+      performance: {
+        chunkSplit: {
+          strategy: "custom",
+          splitChunks: {
+            chunks: "all"
+          }
+        },
+        buildCache: cacheConfig
+      }
+    } : {
+      splitChunks: {
+        preset: "none",
+        chunks: "all"
       },
-      buildCache: cacheConfig
+      performance: {
+        buildCache: cacheConfig
+      }
     },
     plugins: [
       shouldCheckTs ? pluginTypeCheck(tsCheckOptions) : null,
@@ -648,7 +767,7 @@ var require2 = createRequire(import.meta.url), getAbsolutePath = (input) => {
       swc: (config) => {
         config.env ??= {}, config.env.bugfixes = !0;
       },
-      rspack: (config, { addRules, appendRules, rspack, mergeConfig }) => {
+      rspack: (config, { addRules, appendRules, rspack: rspack2, mergeConfig }) => {
         if (addRules({
           test: /\.stories\.([tj])sx?$|(stories|story)\.mdx$/,
           exclude: /node_modules/,
@@ -665,7 +784,13 @@ var require2 = createRequire(import.meta.url), getAbsolutePath = (input) => {
             ...config.resolve.extensions ?? [],
             ...builtInResolveExtensions
           ])
-        ), config.watchOptions = {
+        ), config.resolve.conditionNames = [
+          ...config.resolve.conditionNames ?? [],
+          "storybook",
+          "stories",
+          "test",
+          "..."
+        ], config.watchOptions = {
           ignored: /node_modules/
         }, config.ignoreWarnings = [
           ...config.ignoreWarnings || [],
@@ -679,21 +804,21 @@ var require2 = createRequire(import.meta.url), getAbsolutePath = (input) => {
           url: require2.resolve("url"),
           fs: !1,
           constants: require2.resolve("constants-browserify")
-        }, config.optimization ??= {}, config.optimization.runtimeChunk = !0, config.optimization.usedExports = options.build?.test?.disableTreeShaking ? !1 : isProd, config.optimization.moduleIds = "named", config.module ??= {}, config.module.parser ??= {}, config.module.parser.javascript ??= {}, config.module.parser.javascript.exportsPresence = !1, !rspack.experiments?.VirtualModulesPlugin)
+        }, config.optimization ??= {}, config.optimization.runtimeChunk = !0, config.optimization.usedExports = options.build?.test?.disableTreeShaking ? !1 : isProd, config.optimization.moduleIds = "named", config.module ??= {}, config.module.parser ??= {}, config.module.parser.javascript ??= {}, config.module.parser.javascript.exportsPresence = !1, !rspack2.experiments?.VirtualModulesPlugin)
           throw new Error(
             "rspack.experiments.VirtualModulesPlugin requires at least 1.5.0 version of @rsbuild/core, please upgrade or downgrade storybook-rsbuild-builder to lower version."
           );
         if (config.plugins ??= [], config.plugins.push(
           ...[
-            Object.keys(virtualModuleMapping).length > 0 ? new rspack.experiments.VirtualModulesPlugin(
+            Object.keys(virtualModuleMapping).length > 0 ? new rspack2.experiments.VirtualModulesPlugin(
               virtualModuleMapping
             ) : null,
-            new rspack.ProvidePlugin({
+            new rspack2.ProvidePlugin({
               process: require2.resolve("process/browser.js")
             }),
             new CaseSensitivePathsPlugin()
           ].filter(Boolean)
-        ), getRspackMajorVersion(rspack.version) === 1) {
+        ), rspackMajorVersion === 1) {
           let experiments = config.experiments ??= {};
           experiments.outputModule = !1;
         }
@@ -730,6 +855,7 @@ var require2 = createRequire(import.meta.url), getAbsolutePath = (input) => {
             TAGS_OPTIONS: tagsOptions,
             ...build2?.test?.disableBlocks ? { __STORYBOOK_BLOCKS_EMPTY_MODULE__: {} } : {}
           },
+          htmlLang,
           headHtmlSnippet,
           bodyHtmlSnippet
         }
@@ -743,7 +869,7 @@ var require2 = createRequire(import.meta.url), getAbsolutePath = (input) => {
 
 // src/react-shims.ts
 import { readFile } from "node:fs/promises";
-import { isAbsolute as isAbsolute2, join as join3 } from "node:path";
+import { isAbsolute as isAbsolute3, join as join3 } from "node:path";
 import { resolvePackageDir } from "storybook/internal/common";
 var getIsReactVersion18or19 = async (options) => {
   let { legacyRootApi } = await options.presets.apply(
@@ -755,7 +881,7 @@ var getIsReactVersion18or19 = async (options) => {
     "resolvedReact",
     {}
   )).reactDom || resolvePackageDir("react-dom");
-  if (!isAbsolute2(reactDom))
+  if (!isAbsolute3(reactDom))
     return !1;
   let { version } = JSON.parse(
     await readFile(join3(reactDom, "package.json"), "utf-8")
@@ -817,11 +943,17 @@ var rsbuild = async (_, options) => {
     typescriptOptions,
     frameworkOptions
   });
-}, server;
+}, server, activeCompiler;
 async function bail() {
-  return server?.close();
+  return activeCompiler = void 0, server?.close();
 }
-var start = async ({
+var changeDetectionAdapter = () => {
+  if (!activeCompiler)
+    throw new Error(
+      "builder-rsbuild: changeDetectionAdapter() called before start(); the Rspack compiler is not ready yet."
+    );
+  return createRspackChangeDetectionAdapter(activeCompiler);
+}, start = async ({
   startTime,
   options,
   router,
@@ -840,9 +972,13 @@ var start = async ({
         printUrls: !1
       }
     }
-  }), rsbuildServer = await rsbuildBuild.createDevServer(), waitFirstCompileDone = new Promise((resolve3) => {
+  });
+  rsbuildBuild.onAfterCreateCompiler(({ compiler }) => {
+    activeCompiler = "compilers" in compiler ? compiler.compilers[0] : compiler;
+  });
+  let rsbuildServer = await rsbuildBuild.createDevServer(), waitFirstCompileDone = new Promise((resolve4) => {
     rsbuildBuild.onDevCompileDone(({ stats: stats2, isFirstCompile }) => {
-      isFirstCompile && resolve3(stats2);
+      isFirstCompile && resolve4(stats2);
     });
   });
   if (server = rsbuildServer, !rsbuildBuild)
@@ -879,12 +1015,12 @@ var start = async ({
   return await close(), withStatsJsonCompat(stats);
 }, corePresets = [join4(__dirname, "./preview-preset.js")], previewMainTemplate = () => __require.resolve("storybook-builder-rsbuild/templates/preview.ejs");
 function getRandomPort(host) {
-  return new Promise((resolve3, reject) => {
+  return new Promise((resolve4, reject) => {
     let server2 = createServer();
     server2.unref(), server2.on("error", reject), server2.listen({ port: 0, host }, () => {
       let { port } = server2.address();
       server2.close(() => {
-        resolve3(port);
+        resolve4(port);
       });
     });
   });
@@ -892,7 +1028,9 @@ function getRandomPort(host) {
 export {
   bail,
   build,
+  changeDetectionAdapter,
   corePresets,
+  excludeNodeModulesFromStoryContext,
   executor,
   getConfig,
   getVirtualModules,

package/dist/loaders/export-order-loader.js

@@ -1,15 +1,15 @@
-import CJS_COMPAT_NODE_URL_19c268890619b71f from 'node:url';
-import CJS_COMPAT_NODE_PATH_19c268890619b71f from 'node:path';
-import CJS_COMPAT_NODE_MODULE_19c268890619b71f from "node:module";
+import CJS_COMPAT_NODE_URL_95ee734c542e82b6 from 'node:url';
+import CJS_COMPAT_NODE_PATH_95ee734c542e82b6 from 'node:path';
+import CJS_COMPAT_NODE_MODULE_95ee734c542e82b6 from "node:module";
 
-var __filename = CJS_COMPAT_NODE_URL_19c268890619b71f.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_19c268890619b71f.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_19c268890619b71f.createRequire(import.meta.url);
+var __filename = CJS_COMPAT_NODE_URL_95ee734c542e82b6.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_95ee734c542e82b6.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_95ee734c542e82b6.createRequire(import.meta.url);
 
 // ------------------------------------------------------------
 // end of CJS compatibility banner, injected by Storybook's esbuild configuration
 // ------------------------------------------------------------
-import "../_node-chunks/chunk-LTM5Q7YC.js";
+import "../_node-chunks/chunk-NXNFA2RX.js";
 
 // src/loaders/export-order-loader.ts
 import assert from "node:assert";

package/dist/loaders/rsbuild-automock-loader.js

@@ -1,15 +1,15 @@
-import CJS_COMPAT_NODE_URL_19c268890619b71f from 'node:url';
-import CJS_COMPAT_NODE_PATH_19c268890619b71f from 'node:path';
-import CJS_COMPAT_NODE_MODULE_19c268890619b71f from "node:module";
+import CJS_COMPAT_NODE_URL_95ee734c542e82b6 from 'node:url';
+import CJS_COMPAT_NODE_PATH_95ee734c542e82b6 from 'node:path';
+import CJS_COMPAT_NODE_MODULE_95ee734c542e82b6 from "node:module";
 
-var __filename = CJS_COMPAT_NODE_URL_19c268890619b71f.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_19c268890619b71f.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_19c268890619b71f.createRequire(import.meta.url);
+var __filename = CJS_COMPAT_NODE_URL_95ee734c542e82b6.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_95ee734c542e82b6.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_95ee734c542e82b6.createRequire(import.meta.url);
 
 // ------------------------------------------------------------
 // end of CJS compatibility banner, injected by Storybook's esbuild configuration
 // ------------------------------------------------------------
-import "../_node-chunks/chunk-LTM5Q7YC.js";
+import "../_node-chunks/chunk-NXNFA2RX.js";
 
 // src/loaders/rsbuild-automock-loader.ts
 import { babelParser, getAutomockCode } from "storybook/internal/mocking-utils";

package/dist/loaders/storybook-mock-transform-loader.js

@@ -1,15 +1,15 @@
-import CJS_COMPAT_NODE_URL_19c268890619b71f from 'node:url';
-import CJS_COMPAT_NODE_PATH_19c268890619b71f from 'node:path';
-import CJS_COMPAT_NODE_MODULE_19c268890619b71f from "node:module";
+import CJS_COMPAT_NODE_URL_95ee734c542e82b6 from 'node:url';
+import CJS_COMPAT_NODE_PATH_95ee734c542e82b6 from 'node:path';
+import CJS_COMPAT_NODE_MODULE_95ee734c542e82b6 from "node:module";
 
-var __filename = CJS_COMPAT_NODE_URL_19c268890619b71f.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_19c268890619b71f.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_19c268890619b71f.createRequire(import.meta.url);
+var __filename = CJS_COMPAT_NODE_URL_95ee734c542e82b6.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_95ee734c542e82b6.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_95ee734c542e82b6.createRequire(import.meta.url);
 
 // ------------------------------------------------------------
 // end of CJS compatibility banner, injected by Storybook's esbuild configuration
 // ------------------------------------------------------------
-import "../_node-chunks/chunk-LTM5Q7YC.js";
+import "../_node-chunks/chunk-NXNFA2RX.js";
 
 // src/loaders/storybook-mock-transform-loader.ts
 import { rewriteSbMockImportCalls } from "storybook/internal/mocking-utils";

package/dist/preview-preset.js

@@ -1,15 +1,15 @@
-import CJS_COMPAT_NODE_URL_19c268890619b71f from 'node:url';
-import CJS_COMPAT_NODE_PATH_19c268890619b71f from 'node:path';
-import CJS_COMPAT_NODE_MODULE_19c268890619b71f from "node:module";
+import CJS_COMPAT_NODE_URL_95ee734c542e82b6 from 'node:url';
+import CJS_COMPAT_NODE_PATH_95ee734c542e82b6 from 'node:path';
+import CJS_COMPAT_NODE_MODULE_95ee734c542e82b6 from "node:module";
 
-var __filename = CJS_COMPAT_NODE_URL_19c268890619b71f.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_19c268890619b71f.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_19c268890619b71f.createRequire(import.meta.url);
+var __filename = CJS_COMPAT_NODE_URL_95ee734c542e82b6.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_95ee734c542e82b6.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_95ee734c542e82b6.createRequire(import.meta.url);
 
 // ------------------------------------------------------------
 // end of CJS compatibility banner, injected by Storybook's esbuild configuration
 // ------------------------------------------------------------
-import "./_node-chunks/chunk-LTM5Q7YC.js";
+import "./_node-chunks/chunk-NXNFA2RX.js";
 
 // src/preview-preset.ts
 import { createRequire } from "node:module";
@@ -19,6 +19,9 @@ import { findConfigFile } from "storybook/internal/common";
 // src/plugins/rspack-inject-mocker-runtime-plugin.ts
 import { getMockerRuntime } from "storybook/internal/mocking-utils";
 var PLUGIN_NAME = "RspackInjectMockerRuntimePlugin", RspackInjectMockerRuntimePlugin = class {
+  constructor() {
+    this.cachedRuntime = null;
+  }
   getHtmlPlugin(compiler) {
     try {
       return compiler.options.plugins?.find((plugin) => {
@@ -42,15 +45,15 @@ var PLUGIN_NAME = "RspackInjectMockerRuntimePlugin", RspackInjectMockerRuntimePl
         PLUGIN_NAME,
         (data, cb) => {
           try {
-            let runtimeScriptContent = getMockerRuntime(), runtimeAssetName = "mocker-runtime-injected.js", Sources = compiler.webpack?.sources;
+            let runtimeScriptContent = this.cachedRuntime ?? (this.cachedRuntime = getMockerRuntime()), runtimeAssetName = "mocker-runtime-injected.js", Sources = compiler.webpack?.sources;
             if (!Sources?.RawSource)
               throw new Error(
                 "rspack sources is not available on compiler.webpack"
               );
-            compilation.emitAsset(
+            compilation.getAsset(runtimeAssetName) || (compilation.emitAsset(
               runtimeAssetName,
               new Sources.RawSource(runtimeScriptContent)
-            ), data.assets.js.unshift(runtimeAssetName), cb(null, data);
+            ), data.assets.js.unshift(runtimeAssetName)), cb(null, data);
           } catch (error) {
             cb(error);
           }
@@ -79,22 +82,32 @@ function normalizePath(filePath) {
 var RspackMockPlugin = class {
   constructor(options) {
     this.mockMap = /* @__PURE__ */ new Map();
+    this.candidateSpecifiers = /* @__PURE__ */ new Set();
     if (!options.previewConfigPath)
       throw new Error(`[${PLUGIN_NAME2}] \`previewConfigPath\` is required.`);
     this.options = options;
   }
   apply(compiler) {
     let logger = compiler.getInfrastructureLogger(PLUGIN_NAME2), updateMocks = () => {
+      let mTimePreviewConfig = this.getPreviewConfigMtime(compiler);
+      if (this.lastPreviewMtime !== void 0 && mTimePreviewConfig !== void 0 && mTimePreviewConfig === this.lastPreviewMtime)
+        return;
+      let resolved = this.extractAndResolveMocks(compiler);
       this.mockMap = new Map(
-        this.extractAndResolveMocks(compiler).flatMap((mock) => [
+        resolved.flatMap((mock) => [
           [normalizePath(mock.absolutePath), mock],
           [normalizePath(mock.absolutePath.replace(/\.[^.]+$/, "")), mock]
         ])
-      ), logger.info(`Mock map updated with ${this.mockMap.size / 2} mocks.`);
+      ), this.candidateSpecifiers = new Set(resolved.map((mock) => mock.path)), this.lastPreviewMtime = mTimePreviewConfig, resolved.length > 0 && logger.info(`Mock map updated with ${resolved.length} mocks.`);
     };
     compiler.hooks.beforeRun.tap(PLUGIN_NAME2, updateMocks), compiler.hooks.watchRun.tap(PLUGIN_NAME2, updateMocks), new rspack.NormalModuleReplacementPlugin(/.*/, (resource) => {
       try {
-        let path = resource.request, importer = resource.context, absolutePath = getIsExternal(path, importer) ? resolveExternalModule(path, importer) : resolveWithExtensions(path, importer), normalizedAbsolutePath = normalizePath(absolutePath);
+        if (this.mockMap.size === 0)
+          return;
+        let path = resource.request, importer = resource.context, isExternal = getIsExternal(path, importer);
+        if (isExternal && !this.candidateSpecifiers.has(path))
+          return;
+        let absolutePath = isExternal ? resolveExternalModule(path, importer) : resolveWithExtensions(path, importer), normalizedAbsolutePath = normalizePath(absolutePath);
         this.mockMap.has(normalizedAbsolutePath) && (resource.request = this.mockMap.get(
           normalizedAbsolutePath
         ).replacementResource);
@@ -107,6 +120,13 @@ var RspackMockPlugin = class {
         isAbsolute(mock.replacementResource) && mock.replacementResource.includes("__mocks__") && compilation.contextDependencies.add(dirname(mock.replacementResource));
     });
   }
+  getPreviewConfigMtime(compiler) {
+    try {
+      return compiler.inputFileSystem.statSync?.(this.options.previewConfigPath)?.mtime?.getTime?.();
+    } catch {
+      return;
+    }
+  }
   extractAndResolveMocks(compiler) {
     let { previewConfigPath, configDir } = this.options, logger = compiler.getInfrastructureLogger(PLUGIN_NAME2), mocks = extractMockCalls(
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-builder-rsbuild",
-  "version": "3.3.3",
+  "version": "3.4.0",
   "description": "Rsbuild builder for Storybook",
   "keywords": [
     "storybook",
@@ -43,42 +43,43 @@
     "!src/**/*"
   ],
   "dependencies": {
-    "@rsbuild/plugin-type-check": "^1.3.4",
-    "@vitest/mocker": "3.2.4",
+    "@rsbuild/plugin-type-check": "^1.6.0",
+    "@vitest/mocker": "3.2.7",
     "browser-assert": "^1.2.1",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
     "cjs-module-lexer": "^2.2.0",
     "constants-browserify": "^1.0.0",
     "es-module-lexer": "^1.7.0",
-    "fs-extra": "^11.3.4",
+    "fs-extra": "^11.4.0",
     "magic-string": "^0.30.21",
     "path-browserify": "^1.0.1",
+    "pathe": "^2.0.3",
     "picocolors": "^1.1.1",
     "process": "^0.11.10",
-    "rsbuild-plugin-html-minifier-terser": "^1.1.3",
+    "rsbuild-plugin-html-minifier-terser": "^1.1.5",
     "sirv": "^2.0.4",
-    "ts-dedent": "^2.2.0",
+    "ts-dedent": "^2.3.0",
     "url": "^0.11.4",
     "util": "^0.12.5",
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@rsbuild/core": "^2.0.0-rc.0",
-    "@storybook/core-webpack": "10.3.4",
+    "@rsbuild/core": "^2.1.9",
+    "@storybook/core-webpack": "10.5.5",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^22.0.0",
     "@types/pretty-hrtime": "^1.0.3",
-    "prebundle": "^1.6.4",
+    "prebundle": "^1.6.5",
     "pretty-hrtime": "^1.0.3",
     "slash": "^5.1.0",
-    "storybook": "10.3.4",
+    "storybook": "10.5.5",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
     "@rsbuild/core": "^1.5.0 || ^2.0.0-0",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-    "storybook": "^10.1.0"
+    "storybook": "^10.5.5"
   },
   "peerDependenciesMeta": {
     "react": {

package/templates/preview.ejs

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="<%= htmlLang %>">
   <head>
     <meta charset="utf-8" />
     <title><%= htmlWebpackPlugin.options.title || 'Storybook'%></title>

package/templates/virtualModuleModernEntry.js

@@ -28,7 +28,6 @@ const preview = new PreviewWeb(importFn, getProjectAnnotations)
 
 window.__STORYBOOK_PREVIEW__ = preview
 window.__STORYBOOK_STORY_STORE__ = preview.storyStore
-window.__STORYBOOK_ADDONS_CHANNEL__ = channel
 
 if (import.meta.webpackHot) {
   import.meta.webpackHot.addStatusHandler((status) => {