storybook-builder-rsbuild 2.1.5 → 2.1.6

package/dist/index.mjs

@@ -8,12 +8,10 @@ import sirv from 'sirv';
 import { getBuilderOptions, normalizeStories, loadPreviewOrConfigFile, 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/preset';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import { pluginHtmlMinifierTerser } from 'rsbuild-plugin-html-minifier-terser';
 import { globalsNameReferenceMap } from 'storybook/internal/preview/globals';
 import { dedent } from 'ts-dedent';
-import { toImportFn } from '@storybook/core-webpack';
 import { readFile } from 'fs/promises';
 
 // ../../node_modules/.pnpm/pretty-hrtime@1.0.3/node_modules/pretty-hrtime/index.js
@@ -87,6 +85,276 @@ var require_pretty_hrtime = __commonJS({
   }
 });
 
+// compiled/@storybook/core-webpack/index.js
+var require_core_webpack = __commonJS({
+  "compiled/@storybook/core-webpack/index.js"(exports, module) {
+    (() => {
+      var __webpack_modules__ = {
+        830: (module2, __unused_webpack_exports, __nccwpck_require__2) => {
+          var __defProp = Object.defineProperty;
+          var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+          var __getOwnPropNames = Object.getOwnPropertyNames;
+          var __hasOwnProp = Object.prototype.hasOwnProperty;
+          var __export = (target, all) => {
+            for (var name in all)
+              __defProp(target, name, { get: all[name], enumerable: true });
+          }, __copyProps = (to, from, except, desc) => {
+            if (from && typeof from == "object" || typeof from == "function")
+              for (let key of __getOwnPropNames(from))
+                !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+                  get: () => from[key],
+                  enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+                });
+            return to;
+          };
+          var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+          var index_exports = {};
+          __export(index_exports, {
+            checkWebpackVersion: () => checkWebpackVersion,
+            loadCustomWebpackConfig: () => loadCustomWebpackConfig,
+            mergeConfigs: () => mergeConfigs,
+            toImportFn: () => toImportFn2,
+            toImportFnPart: () => toImportFnPart,
+            toRequireContext: () => toRequireContext,
+            toRequireContextString: () => toRequireContextString,
+            webpackIncludeRegexp: () => webpackIncludeRegexp
+          });
+          module2.exports = __toCommonJS(index_exports);
+          var import_node_path5 = __nccwpck_require__2(928), import_common4 = __nccwpck_require__2(253), webpackConfigs = ["webpack.config", "webpackfile"], loadCustomWebpackConfig = (configDir) => (0, import_common4.serverRequire)(
+            webpackConfigs.map(
+              (configName) => (0, import_node_path5.resolve)(configDir, configName)
+            )
+          );
+          var import_node_logger = __nccwpck_require__2(519), import_ts_dedent2 = __nccwpck_require__2(980), checkWebpackVersion = (webpack, specifier, caption) => {
+            if (!webpack.version) {
+              import_node_logger.logger.info(
+                "Skipping webpack version check, no version available"
+              );
+              return;
+            }
+            webpack.version !== specifier && import_node_logger.logger.warn(import_ts_dedent2.dedent`
+      Unexpected webpack version in ${caption}:
+      - Received '${webpack.version}'
+      - Expected '${specifier}'
+
+      If you're using Webpack 5 in SB6.2 and upgrading, consider: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#webpack-5-manager-build
+
+      For more info about Webpack 5 support: https://gist.github.com/shilman/8856ea1786dcd247139b47b270912324#troubleshooting
+    `);
+          };
+          function mergePluginsField(defaultPlugins = [], customPlugins = []) {
+            return [...defaultPlugins, ...customPlugins];
+          }
+          function mergeRulesField(defaultRules = [], customRules = []) {
+            return [...defaultRules, ...customRules];
+          }
+          function mergeExtensionsField({ extensions: defaultExtensions = [] }, { extensions: customExtensions = [] }) {
+            return [...defaultExtensions, ...customExtensions];
+          }
+          function mergeAliasField({ alias: defaultAlias = {} }, { alias: customAlias = {} }) {
+            return { ...defaultAlias, ...customAlias };
+          }
+          function mergeModuleField(a, b) {
+            return {
+              ...a,
+              ...b,
+              rules: mergeRulesField(a.rules || [], b.rules || [])
+            };
+          }
+          function mergeResolveField({ resolve: defaultResolve = {} }, { resolve: customResolve = {} }) {
+            return {
+              ...defaultResolve,
+              ...customResolve,
+              alias: mergeAliasField(defaultResolve, customResolve),
+              extensions: mergeExtensionsField(defaultResolve, customResolve)
+            };
+          }
+          function mergeOptimizationField({ optimization: defaultOptimization = {} }, { optimization: customOptimization = {} }) {
+            return { ...defaultOptimization, ...customOptimization };
+          }
+          function mergeConfigs(config, customConfig) {
+            return {
+              ...customConfig,
+              ...config,
+              devtool: customConfig.devtool || config.devtool,
+              plugins: mergePluginsField(config.plugins, customConfig.plugins),
+              module: mergeModuleField(
+                config.module || {},
+                customConfig.module || {}
+              ),
+              resolve: mergeResolveField(config, customConfig),
+              optimization: mergeOptimizationField(config, customConfig)
+            };
+          }
+          var import_common22 = __nccwpck_require__2(253), import_ts_dedent22 = __nccwpck_require__2(980);
+          function importPipeline() {
+            let importGate = Promise.resolve();
+            return async (importFn) => {
+              await importGate;
+              let moduleExportsPromise = importFn();
+              return importGate = importGate.then(async () => {
+                await moduleExportsPromise;
+              }), moduleExportsPromise;
+            };
+          }
+          function adjustRegexToExcludeNodeModules(originalRegex) {
+            let originalRegexString = originalRegex.source, startsWithCaret = originalRegexString.startsWith("^"), excludeNodeModulesPattern = startsWithCaret ? "(?!.*node_modules)" : "^(?!.*node_modules)", adjustedRegexString = startsWithCaret ? `^${excludeNodeModulesPattern}${originalRegexString.substring(1)}` : excludeNodeModulesPattern + originalRegexString;
+            return new RegExp(adjustedRegexString);
+          }
+          function webpackIncludeRegexp(specifier) {
+            let { directory, files } = specifier, directoryWithoutLeadingDots = directory.replace(/^(\.+\/)+/, "/"), webpackIncludeGlob = [".", ".."].includes(directory) ? files : `${directoryWithoutLeadingDots}/${files}`, webpackIncludeRegexpWithCaret = webpackIncludeGlob.includes(
+              "node_modules"
+            ) ? (0, import_common22.globToRegexp)(webpackIncludeGlob) : adjustRegexToExcludeNodeModules(
+              (0, import_common22.globToRegexp)(webpackIncludeGlob)
+            );
+            return new RegExp(
+              webpackIncludeRegexpWithCaret.source.replace(/^\^/, "")
+            );
+          }
+          function toImportFnPart(specifier) {
+            let { directory, importPathMatcher } = specifier;
+            return import_ts_dedent22.dedent`
+      async (path) => {
+        if (!${importPathMatcher}.exec(path)) {
+          return;
+        }
+
+        const pathRemainder = path.substring(${directory.length + 1});
+        return import(
+          /* webpackChunkName: "[request]" */
+          /* webpackInclude: ${webpackIncludeRegexp(specifier)} */
+          '${directory}/' + pathRemainder
+        );
+      }
+
+  `;
+          }
+          function toImportFn2(stories, { needPipelinedImport } = {}) {
+            let pipelinedImport = "const pipeline = (x) => x();";
+            return needPipelinedImport && (pipelinedImport = `
+      const importPipeline = ${importPipeline};
+      const pipeline = importPipeline();
+    `), import_ts_dedent22.dedent`
+    ${pipelinedImport}
+
+    const importers = [
+      ${stories.map(toImportFnPart).join(`,
+`)}
+    ];
+
+    export async function importFn(path) {
+      for (let i = 0; i < importers.length; i++) {
+        const moduleExports = await pipeline(() => importers[i](path));
+        if (moduleExports) {
+          return moduleExports;
+        }
+      }
+    }
+  `;
+          }
+          var import_common32 = __nccwpck_require__2(253), toRequireContext = (specifier) => {
+            let { directory, files } = specifier, match = (0, import_common32.globToRegexp)(`./${files}`);
+            return {
+              path: directory,
+              recursive: files.includes("**") || files.split("/").length > 1,
+              match
+            };
+          }, toRequireContextString = (specifier) => {
+            let { path: p, recursive: r, match: m } = toRequireContext(specifier);
+            return `require.context('${p}', ${r}, ${m})`;
+          };
+        },
+        980: (__unused_webpack_module, exports2) => {
+          Object.defineProperty(exports2, "__esModule", { value: true });
+          exports2.dedent = void 0;
+          function dedent2(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[	 ]{" + 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, i2) {
+                  return i2 === 0 ? str : "" + endentation + str;
+                }).join("\n");
+              }
+              string += indentedValue + strings[i + 1];
+            });
+            return string;
+          }
+          exports2.dedent = dedent2;
+          exports2["default"] = dedent2;
+        },
+        928: (module2) => {
+          module2.exports = __require("path");
+        },
+        253: (module2) => {
+          module2.exports = __require("storybook/internal/common");
+        },
+        519: (module2) => {
+          module2.exports = __require("storybook/internal/node-logger");
+        }
+      };
+      var __webpack_module_cache__ = {};
+      function __nccwpck_require__(moduleId) {
+        var cachedModule = __webpack_module_cache__[moduleId];
+        if (cachedModule !== void 0) {
+          return cachedModule.exports;
+        }
+        var module2 = __webpack_module_cache__[moduleId] = { exports: {} };
+        var threw = true;
+        try {
+          __webpack_modules__[moduleId](
+            module2,
+            module2.exports,
+            __nccwpck_require__
+          );
+          threw = false;
+        } finally {
+          if (threw)
+            delete __webpack_module_cache__[moduleId];
+        }
+        return module2.exports;
+      }
+      if (typeof __nccwpck_require__ !== "undefined")
+        __nccwpck_require__.ab = __dirname + "/";
+      var __webpack_exports__ = __nccwpck_require__(830);
+      module.exports = __webpack_exports__;
+    })();
+  }
+});
+
 // src/index.ts
 var import_pretty_hrtime = __toESM(require_pretty_hrtime());
 
@@ -98,6 +366,9 @@ function slash(path) {
   }
   return path.replace(/\\/g, "/");
 }
+
+// src/preview/virtual-module-mapping.ts
+var import_core_webpack = __toESM(require_core_webpack());
 var getVirtualModules = async (options) => {
   const virtualModules = {};
   const builderOptions = await getBuilderOptions(options);
@@ -125,7 +396,7 @@ var getVirtualModules = async (options) => {
   const storiesFilename = "storybook-stories.js";
   const storiesPath = resolve(join(workingDir, storiesFilename));
   const needPipelinedImport = !!builderOptions.lazyCompilation && !isProd;
-  virtualModules[storiesPath] = toImportFn(stories, {
+  virtualModules[storiesPath] = (0, import_core_webpack.toImportFn)(stories, {
     needPipelinedImport
   });
   const configEntryPath = resolve(join(workingDir, "storybook-config-entry.js"));
@@ -172,7 +443,12 @@ var storybookPaths = {
 };
 var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
   const { rsbuildConfigPath, addonDocs } = await getBuilderOptions(options);
-  const appliedDocsWebpack = await webpack({}, { ...options, ...addonDocs });
+  const webpackConfigFromPresets = await options.presets.apply("webpack", {}, options);
+  if (addonDocs) {
+    console.warn(
+      "`addonDocs` option is deprecated and will be removed in future versions. Please use `@storybook/addon-docs` option instead."
+    );
+  }
   const {
     outputDir = join(".", "public"),
     quiet,
@@ -420,7 +696,11 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
           ...config.experiments,
           ...lazyCompilationConfig
         };
-        return mergeConfig(config, extraWebpackConfig || {}, appliedDocsWebpack);
+        return mergeConfig(
+          config,
+          extraWebpackConfig || {},
+          webpackConfigFromPresets
+        );
       },
       htmlPlugin: {
         filename: "iframe.html",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-builder-rsbuild",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "Rsbuild builder for Storybook",
   "keywords": [
     "storybook",
@@ -50,6 +50,7 @@
   "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
+    "compiled/**/*",
     "templates/**/*",
     "README.md",
     "*.js",
@@ -58,8 +59,6 @@
   ],
   "dependencies": {
     "@rsbuild/plugin-type-check": "^1.2.4",
-    "@storybook/addon-docs": "^9.1.15 || ^10.0.0",
-    "@storybook/core-webpack": "^9.1.15 || ^10.0.0",
     "browser-assert": "^1.2.1",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
     "cjs-module-lexer": "^1.4.3",
@@ -78,11 +77,13 @@
   },
   "devDependencies": {
     "@rsbuild/core": "^1.5.17",
+    "@storybook/core-webpack": "^9.1.15 || ^10.0.0",
     "@types/find-cache-dir": "^5.0.2",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^18.19.110",
     "@types/pretty-hrtime": "^1.0.3",
     "find-cache-dir": "^5.0.0",
+    "prebundle": "^1.5.0",
     "pretty-hrtime": "^1.0.3",
     "slash": "^5.1.0",
     "storybook": "9.1.10",
@@ -119,6 +120,6 @@
   "scripts": {
     "build": "pnpm run prep --optimized",
     "check": "jiti ../../scripts/prepare/check.ts",
-    "prep": "jiti ../../scripts/prepare/bundle.ts"
+    "prep": "prebundle && jiti ../../scripts/prepare/bundle.ts"
   }
 }