storybook-builder-rsbuild 0.0.6 → 0.0.8

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as rsbuildReal from '@rsbuild/core';
 import { RsbuildConfig } from '@rsbuild/core';
-import { TypescriptOptions as TypescriptOptions$1, Builder, Options, BuilderResult as BuilderResult$1, NormalizedStoriesSpecifier } from '@storybook/types';
+import { TypescriptOptions as TypescriptOptions$1, Builder, Options, BuilderResult as BuilderResult$1, NormalizedStoriesSpecifier } from 'storybook/internal/types';
 import { PluginTypeCheckerOptions } from '@rsbuild/plugin-type-check';
 
 type RsbuildStats = {
@@ -25,6 +25,10 @@ type BuilderOptions = {
      * Path to rsbuild.config file, relative to CWD.
      */
     rsbuildConfigPath?: string;
+    /**
+     * Enable Rspack's lazy compilation (experimental).
+     */
+    lazyCompilation?: boolean;
 };
 interface BuilderResult extends BuilderResult$1 {
     stats?: Stats;
@@ -58,7 +62,7 @@ declare const rsbuild: (_: unknown, options: RsbuildBuilderOptions) => Promise<r
 declare const getConfig: RsbuildBuilder['getConfig'];
 declare function bail(): Promise<void>;
 declare const start: RsbuildBuilder['start'];
-declare const build: ({ options, }: BuilderStartOptions) => Promise<Stats>;
+declare const build: ({ options }: BuilderStartOptions) => Promise<Stats>;
 declare const corePresets: string[];
 declare const previewMainTemplate: () => string;
 

package/dist/index.js

@@ -120,24 +120,32 @@ __export(src_exports, {
   toImportFnPart: () => toImportFnPart
 });
 module.exports = __toCommonJS(src_exports);
+var import_node_net = require("net");
+var import_node_path5 = require("path");
 var rsbuildReal = __toESM(require("@rsbuild/core"));
-var import_path4 = require("path");
+var import_core2 = require("@rsbuild/core");
 var import_express = __toESM(require("express"));
 var import_fs_extra = __toESM(require("fs-extra"));
-var import_server_errors = require("@storybook/core-events/server-errors");
+var import_pretty_hrtime = __toESM(require_pretty_hrtime());
+var import_core_path = require("storybook/core-path");
+var import_server_errors = require("storybook/internal/server-errors");
 
 // src/preview/iframe-rsbuild.config.ts
-var import_path3 = require("path");
+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_case_sensitive_paths_webpack_plugin = __toESM(require("case-sensitive-paths-webpack-plugin"));
-var import_globals = require("@storybook/preview/globals");
-var import_core_common2 = require("@storybook/core-common");
+var import_rsbuild_plugin_html_minifier_terser = require("rsbuild-plugin-html-minifier-terser");
+var import_common2 = require("storybook/internal/common");
+var import_globals = require("storybook/internal/preview/globals");
 var import_ts_dedent2 = require("ts-dedent");
 
 // src/preview/virtual-module-mapping.ts
-var import_path = __toESM(require("path"));
-var import_fs = __toESM(require("fs"));
-var import_path2 = require("path");
-var import_core_common = require("@storybook/core-common");
+var import_node_fs = __toESM(require("fs"));
+var import_node_path = __toESM(require("path"));
+var import_node_path2 = require("path");
+var import_core_webpack = require("@storybook/core-webpack");
 
 // ../../node_modules/.pnpm/slash@5.1.0/node_modules/slash/index.js
 function slash(path2) {
@@ -149,7 +157,7 @@ function slash(path2) {
 }
 
 // src/preview/virtual-module-mapping.ts
-var import_core_webpack = require("@storybook/core-webpack");
+var import_common = require("storybook/internal/common");
 var import_ts_dedent = require("ts-dedent");
 var getVirtualModules = async (options) => {
   const virtualModules = {};
@@ -158,11 +166,11 @@ var getVirtualModules = async (options) => {
   const isProd = options.configType === "PRODUCTION";
   const nonNormalizedStories = await options.presets.apply("stories", []);
   const entries = [];
-  const stories = (0, import_core_common.normalizeStories)(nonNormalizedStories, {
+  const stories = (0, import_common.normalizeStories)(nonNormalizedStories, {
     configDir: options.configDir,
     workingDir
   });
-  const realPathRelativeToCwd = import_path.default.relative(workingDir, cwd).split(import_path.default.sep).join(import_path.default.posix.sep);
+  const realPathRelativeToCwd = import_node_path.default.relative(workingDir, cwd).split(import_node_path.default.sep).join(import_node_path.default.posix.sep);
   const previewAnnotations = [
     ...(await options.presets.apply(
       "previewAnnotations",
@@ -174,17 +182,18 @@ var getVirtualModules = async (options) => {
       }
       return slash(entry);
     }),
-    (0, import_core_common.loadPreviewOrConfigFile)(options)
+    (0, import_common.loadPreviewOrConfigFile)(options)
   ].filter(Boolean);
   const storiesFilename = "storybook-stories.js";
-  const storiesPath = (0, import_path2.resolve)((0, import_path2.join)(workingDir, storiesFilename));
-  const needPipelinedImport = !isProd;
+  const storiesPath = (0, import_node_path2.resolve)((0, import_node_path2.join)(workingDir, storiesFilename));
+  const builderOptions = await (0, import_common.getBuilderOptions)(options);
+  const needPipelinedImport = !!builderOptions.lazyCompilation && !isProd;
   virtualModules[storiesPath] = toImportFn(stories, realPathRelativeToCwd, {
     needPipelinedImport
   });
-  const configEntryPath = (0, import_path2.resolve)((0, import_path2.join)(workingDir, "storybook-config-entry.js"));
-  virtualModules[configEntryPath] = (0, import_core_common.handlebars)(
-    await (0, import_core_common.readTemplate)(
+  const configEntryPath = (0, import_node_path2.resolve)((0, import_node_path2.join)(workingDir, "storybook-config-entry.js"));
+  virtualModules[configEntryPath] = (0, import_common.handlebars)(
+    await (0, import_common.readTemplate)(
       require.resolve("storybook-builder-rsbuild/templates/virtualModuleModernEntry.js.handlebars")
     ),
     {
@@ -194,9 +203,9 @@ var getVirtualModules = async (options) => {
     // We need to double escape `\` for webpack. We may have some in windows paths
   ).replace(/\\/g, "\\\\");
   entries.push(configEntryPath);
-  Object.entries(virtualModules).forEach(([key, value]) => {
-    import_fs.default.writeFileSync(key, value);
-  });
+  for (const [key, value] of Object.entries(virtualModules)) {
+    import_node_fs.default.writeFileSync(key, value);
+  }
   return {
     virtualModules,
     entries
@@ -221,7 +230,7 @@ function toImportFnPart(specifier) {
   `;
 }
 function toImportFn(stories, relativeOffset, { needPipelinedImport } = {}) {
-  let pipelinedImport = `const pipeline = (x) => x();`;
+  let pipelinedImport = "const pipeline = (x) => x();";
   if (needPipelinedImport) {
     pipelinedImport = `
       const importPipeline = ${importPipeline};
@@ -270,10 +279,7 @@ function importPipeline() {
 }
 
 // src/preview/iframe-rsbuild.config.ts
-var import_core = require("@rsbuild/core");
-var import_preset = require("@storybook/addon-docs/dist/preset");
-var import_plugin_type_check = require("@rsbuild/plugin-type-check");
-var getAbsolutePath = (input) => (0, import_path3.dirname)(require.resolve((0, import_path3.join)(input, "package.json")));
+var getAbsolutePath = (input) => (0, import_node_path3.dirname)(require.resolve((0, import_node_path3.join)(input, "package.json")));
 var maybeGetAbsolutePath = (input) => {
   try {
     return getAbsolutePath(input);
@@ -281,24 +287,24 @@ var maybeGetAbsolutePath = (input) => {
     return false;
   }
 };
-var managerAPIPath = maybeGetAbsolutePath(`@storybook/manager-api`);
-var componentsPath = maybeGetAbsolutePath(`@storybook/components`);
-var globalPath = maybeGetAbsolutePath(`@storybook/global`);
-var routerPath = maybeGetAbsolutePath(`@storybook/router`);
-var themingPath = maybeGetAbsolutePath(`@storybook/theming`);
+var managerAPIPath = maybeGetAbsolutePath("@storybook/manager-api");
+var componentsPath = maybeGetAbsolutePath("@storybook/components");
+var globalPath = maybeGetAbsolutePath("@storybook/global");
+var routerPath = maybeGetAbsolutePath("@storybook/router");
+var themingPath = maybeGetAbsolutePath("@storybook/theming");
 var storybookPaths = {
   ...managerAPIPath ? {
-    [`@storybook/manager-api`]: managerAPIPath
+    "@storybook/manager-api": managerAPIPath
   } : {},
-  ...componentsPath ? { [`@storybook/components`]: componentsPath } : {},
-  ...globalPath ? { [`@storybook/global`]: globalPath } : {},
-  ...routerPath ? { [`@storybook/router`]: routerPath } : {},
-  ...themingPath ? { [`@storybook/theming`]: themingPath } : {}
+  ...componentsPath ? { "@storybook/components": componentsPath } : {},
+  ...globalPath ? { "@storybook/global": globalPath } : {},
+  ...routerPath ? { "@storybook/router": routerPath } : {},
+  ...themingPath ? { "@storybook/theming": themingPath } : {}
 };
 var iframe_rsbuild_config_default = async (options) => {
   const appliedDocsWebpack = await (0, import_preset.webpack)({}, options);
   const {
-    outputDir = (0, import_path3.join)(".", "public"),
+    outputDir = (0, import_node_path3.join)(".", "public"),
     quiet,
     packageJson,
     configType,
@@ -339,13 +345,17 @@ var iframe_rsbuild_config_default = async (options) => {
     options.presets.apply("build"),
     presets.apply("tags", {})
   ]);
-  const { rsbuildConfigPath } = await (0, import_core_common2.getBuilderOptions)(options);
-  const stories = (0, import_core_common2.normalizeStories)(nonNormalizedStories, {
+  const { rsbuildConfigPath } = await (0, import_common2.getBuilderOptions)(options);
+  const stories = (0, import_common2.normalizeStories)(nonNormalizedStories, {
     configDir: options.configDir,
     workingDir
   });
   const shouldCheckTs = typescriptOptions.check && !typescriptOptions.skipCompiler;
   const tsCheckOptions = typescriptOptions.checkOptions || {};
+  const builderOptions = await (0, import_common2.getBuilderOptions)(options);
+  const lazyCompilationConfig = builderOptions.lazyCompilation && !isProd ? {
+    lazyCompilation: { entries: false }
+  } : {};
   if (!template) {
     throw new Error(import_ts_dedent2.dedent`
       Storybook's Webpack5 builder requires a template to be specified.
@@ -375,10 +385,10 @@ var iframe_rsbuild_config_default = async (options) => {
       },
       sourceMap: {
         js: options.build?.test?.disableSourcemaps ? false : "cheap-module-source-map",
-        css: options.build?.test?.disableSourcemaps ? false : true
+        css: !options.build?.test?.disableSourcemaps
       },
       distPath: {
-        root: (0, import_path3.resolve)(process.cwd(), outputDir)
+        root: (0, import_node_path3.resolve)(process.cwd(), outputDir)
       },
       filename: {
         js: isProd ? "[name].[contenthash:8].iframe.bundle.js" : "[name].iframe.bundle.js",
@@ -405,7 +415,7 @@ var iframe_rsbuild_config_default = async (options) => {
         main: [...entries ?? [], ...dynamicEntries]
       },
       define: {
-        ...(0, import_core_common2.stringifyProcessEnvs)(envs),
+        ...(0, import_common2.stringifyProcessEnvs)(envs),
         NODE_ENV: JSON.stringify(process.env.NODE_ENV)
       }
     },
@@ -417,9 +427,17 @@ var iframe_rsbuild_config_default = async (options) => {
         }
       }
     },
-    plugins: [shouldCheckTs ? (0, import_plugin_type_check.pluginTypeCheck)(tsCheckOptions) : null].filter(
-      Boolean
-    ),
+    plugins: [
+      shouldCheckTs ? (0, import_plugin_type_check.pluginTypeCheck)(tsCheckOptions) : null,
+      (0, import_rsbuild_plugin_html_minifier_terser.pluginHtmlMinifierTerser)({
+        collapseWhitespace: true,
+        removeComments: true,
+        removeRedundantAttributes: true,
+        removeScriptTypeAttributes: false,
+        removeStyleLinkTypeAttributes: true,
+        useShortDoctype: true
+      })
+    ].filter(Boolean),
     tools: {
       rspack: (config, { addRules, appendPlugins, rspack, mergeConfig }) => {
         addRules({
@@ -433,7 +451,7 @@ var iframe_rsbuild_config_default = async (options) => {
           ]
         });
         config.resolve ??= {};
-        config.resolve.symlinks = !(0, import_core_common2.isPreservingSymlinks)();
+        config.resolve.symlinks = !(0, import_common2.isPreservingSymlinks)();
         config.watchOptions = {
           ignored: /node_modules/
         };
@@ -458,6 +476,10 @@ var iframe_rsbuild_config_default = async (options) => {
         config.optimization.runtimeChunk = true;
         config.optimization.usedExports = options.build?.test?.disableTreeShaking ? false : isProd;
         config.optimization.moduleIds = "named";
+        config.module ??= {};
+        config.module.parser ??= {};
+        config.module.parser.javascript ??= {};
+        config.module.parser.javascript.exportsPresence = false;
         appendPlugins(
           [
             new rspack.ProvidePlugin({
@@ -466,10 +488,15 @@ var iframe_rsbuild_config_default = async (options) => {
             new import_case_sensitive_paths_webpack_plugin.default()
           ].filter(Boolean)
         );
+        config.experiments ??= {};
+        config.experiments = {
+          ...config.experiments,
+          ...lazyCompilationConfig
+        };
         return mergeConfig(config, appliedDocsWebpack);
       },
       htmlPlugin: {
-        filename: `iframe.html`,
+        filename: "iframe.html",
         // FIXME: `none` isn't a known option
         chunksSortMode: "none",
         alwaysWriteToDisk: true,
@@ -494,14 +521,6 @@ var iframe_rsbuild_config_default = async (options) => {
           },
           headHtmlSnippet,
           bodyHtmlSnippet
-        },
-        minify: {
-          collapseWhitespace: true,
-          removeComments: true,
-          removeRedundantAttributes: true,
-          removeScriptTypeAttributes: false,
-          removeStyleLinkTypeAttributes: true,
-          useShortDoctype: true
         }
       }
     }
@@ -509,10 +528,45 @@ var iframe_rsbuild_config_default = async (options) => {
   return merged;
 };
 
+// src/react-shims.ts
+var import_promises = require("fs/promises");
+var import_node_path4 = require("path");
+var getIsReactVersion18or19 = async (options) => {
+  const { legacyRootApi } = await options.presets.apply(
+    "frameworkOptions"
+  ) || {};
+  if (legacyRootApi) {
+    return false;
+  }
+  const resolvedReact = await options.presets.apply(
+    "resolvedReact",
+    {}
+  );
+  const reactDom = resolvedReact.reactDom || (0, import_node_path4.dirname)(require.resolve("react-dom/package.json"));
+  if (!(0, import_node_path4.isAbsolute)(reactDom)) {
+    return false;
+  }
+  const { version } = JSON.parse(
+    await (0, import_promises.readFile)((0, import_node_path4.join)(reactDom, "package.json"), "utf-8")
+  );
+  return version.startsWith("18") || version.startsWith("19") || version.startsWith("0.0.0");
+};
+var applyReactShims = async (config, options) => {
+  const isReactVersion18 = await getIsReactVersion18or19(options);
+  if (isReactVersion18) {
+    return void 0;
+  }
+  return {
+    source: {
+      alias: {
+        "@storybook/react-dom-shim": "@storybook/react-dom-shim/dist/react-16"
+      }
+    }
+  };
+};
+
 // src/index.ts
-var import_pretty_hrtime = __toESM(require_pretty_hrtime());
 var printDuration = (startTime) => (0, import_pretty_hrtime.default)(process.hrtime(startTime)).replace(" ms", " milliseconds").replace(" s", " seconds").replace(" m", " minutes");
-var getAbsolutePath2 = (input) => (0, import_path4.dirname)(require.resolve((0, import_path4.join)(input, "package.json")));
 var executor = {
   get: async (options) => {
     const rsbuildInstance = await options.presets.apply("rsbuildInstance") || rsbuildReal;
@@ -520,14 +574,19 @@ var executor = {
   }
 };
 var rsbuild = async (_, options) => {
-  const defaultConfig = await iframe_rsbuild_config_default(options);
   const { presets } = options;
+  let defaultConfig = await iframe_rsbuild_config_default(options);
+  const shimsConfig = await applyReactShims(defaultConfig, options);
+  defaultConfig = (0, import_core2.mergeRsbuildConfig)(
+    defaultConfig,
+    shimsConfig
+  );
   const finalDefaultConfig = await presets.apply(
     "rsbuildFinal",
     defaultConfig,
     options
   );
-  return finalDefaultConfig;
+  return (0, import_core2.mergeRsbuildConfig)(finalDefaultConfig);
 };
 var getConfig = async (options) => {
   const { presets } = options;
@@ -558,10 +617,9 @@ var start = async ({
       ...config,
       server: {
         ...config.server,
-        port: options.port,
-        host: "localhost",
+        port: await getRandomPort(options.host),
+        host: options.host,
         htmlFallback: false,
-        strictPort: true,
         printUrls: false
       },
       dev: {
@@ -582,13 +640,13 @@ var start = async ({
   if (!rsbuildBuild) {
     throw new import_server_errors.WebpackInvocationError({
       // eslint-disable-next-line local-rules/no-uncategorized-errors
-      error: new Error(`Missing Rsbuild build instance at runtime!`)
+      error: new Error("Missing Rsbuild build instance at runtime!")
     });
   }
-  const previewResolvedDir = getAbsolutePath2("@storybook/preview");
-  const previewDirOrigin = (0, import_path4.join)(previewResolvedDir, "dist");
+  const previewResolvedDir = (0, import_node_path5.join)(import_core_path.corePath, "dist/preview");
+  const previewDirOrigin = previewResolvedDir;
   router.use(
-    `/sb-preview`,
+    "/sb-preview",
     import_express.default.static(previewDirOrigin, { immutable: true, maxAge: "5m" })
   );
   router.use(rsbuildServer.middlewares);
@@ -607,16 +665,16 @@ var build = async ({ options }) => {
     cwd: process.cwd(),
     rsbuildConfig: config
   });
-  const previewResolvedDir = getAbsolutePath2("@storybook/preview");
-  const previewDirOrigin = (0, import_path4.join)(previewResolvedDir, "dist");
-  const previewDirTarget = (0, import_path4.join)(options.outputDir || "", `sb-preview`);
+  const previewResolvedDir = (0, import_node_path5.join)(import_core_path.corePath, "dist/preview");
+  const previewDirOrigin = previewResolvedDir;
+  const previewDirTarget = (0, import_node_path5.join)(options.outputDir || "", "sb-preview");
   let stats;
   rsbuildBuild.onAfterBuild((params) => {
     stats = params.stats;
   });
   const previewFiles = import_fs_extra.default.copy(previewDirOrigin, previewDirTarget, {
     filter: (src) => {
-      const { ext } = (0, import_path4.parse)(src);
+      const { ext } = (0, import_node_path5.parse)(src);
       if (ext) {
         return ext === ".js";
       }
@@ -629,8 +687,21 @@ var build = async ({ options }) => {
   await Promise.all([rsbuildBuild.build(), previewFiles]);
   return stats;
 };
-var corePresets = [(0, import_path4.join)(__dirname, "./preview-preset.js")];
+var corePresets = [(0, import_node_path5.join)(__dirname, "./preview-preset.js")];
 var previewMainTemplate = () => require.resolve("storybook-builder-rsbuild/templates/preview.ejs");
+function getRandomPort(host) {
+  return new Promise((resolve3, reject) => {
+    const server2 = (0, import_node_net.createServer)();
+    server2.unref();
+    server2.on("error", reject);
+    server2.listen({ port: 0, host }, () => {
+      const { port } = server2.address();
+      server2.close(() => {
+        resolve3(port);
+      });
+    });
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   bail,

package/dist/index.mjs

@@ -1,18 +1,22 @@
 import { __commonJS, __toESM, __require } from './chunk-TTFRSOOU.mjs';
+import { createServer } from 'net';
+import path, { join, resolve, parse, dirname, isAbsolute } from 'path';
 import * as rsbuildReal from '@rsbuild/core';
-import { loadConfig, mergeRsbuildConfig } from '@rsbuild/core';
-import path, { join, resolve, parse, dirname } from 'path';
+import { mergeRsbuildConfig, loadConfig } from '@rsbuild/core';
 import express from 'express';
 import fs2 from 'fs-extra';
-import { WebpackInvocationError } from '@storybook/core-events/server-errors';
+import { corePath } from 'storybook/core-path';
+import { WebpackInvocationError } from 'storybook/internal/server-errors';
+import { pluginTypeCheck } from '@rsbuild/plugin-type-check';
+import { webpack } from '@storybook/addon-docs/dist/preset';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
-import { globalsNameReferenceMap } from '@storybook/preview/globals';
-import { normalizeStories, loadPreviewOrConfigFile, handlebars, readTemplate, getBuilderOptions, stringifyProcessEnvs, isPreservingSymlinks } from '@storybook/core-common';
+import { pluginHtmlMinifierTerser } from 'rsbuild-plugin-html-minifier-terser';
+import { normalizeStories, loadPreviewOrConfigFile, getBuilderOptions, handlebars, readTemplate, stringifyProcessEnvs, isPreservingSymlinks } from 'storybook/internal/common';
+import { globalsNameReferenceMap } from 'storybook/internal/preview/globals';
 import { dedent } from 'ts-dedent';
 import fs from 'fs';
 import { webpackIncludeRegexp } from '@storybook/core-webpack';
-import { webpack } from '@storybook/addon-docs/dist/preset';
-import { pluginTypeCheck } from '@rsbuild/plugin-type-check';
+import { readFile } from 'fs/promises';
 
 // ../../node_modules/.pnpm/pretty-hrtime@1.0.3/node_modules/pretty-hrtime/index.js
 var require_pretty_hrtime = __commonJS({
@@ -85,6 +89,9 @@ var require_pretty_hrtime = __commonJS({
   }
 });
 
+// src/index.ts
+var import_pretty_hrtime = __toESM(require_pretty_hrtime());
+
 // ../../node_modules/.pnpm/slash@5.1.0/node_modules/slash/index.js
 function slash(path2) {
   const isExtendedLengthPath = path2.startsWith("\\\\?\\");
@@ -120,7 +127,8 @@ var getVirtualModules = async (options) => {
   ].filter(Boolean);
   const storiesFilename = "storybook-stories.js";
   const storiesPath = resolve(join(workingDir, storiesFilename));
-  const needPipelinedImport = !isProd;
+  const builderOptions = await getBuilderOptions(options);
+  const needPipelinedImport = !!builderOptions.lazyCompilation && !isProd;
   virtualModules[storiesPath] = toImportFn(stories, realPathRelativeToCwd, {
     needPipelinedImport
   });
@@ -138,9 +146,9 @@ var getVirtualModules = async (options) => {
     // We need to double escape `\` for webpack. We may have some in windows paths
   ).replace(/\\/g, "\\\\");
   entries.push(configEntryPath);
-  Object.entries(virtualModules).forEach(([key, value]) => {
+  for (const [key, value] of Object.entries(virtualModules)) {
     fs.writeFileSync(key, value);
-  });
+  }
   return {
     virtualModules,
     entries
@@ -165,7 +173,7 @@ function toImportFnPart(specifier) {
   `;
 }
 function toImportFn(stories, relativeOffset, { needPipelinedImport } = {}) {
-  let pipelinedImport = `const pipeline = (x) => x();`;
+  let pipelinedImport = "const pipeline = (x) => x();";
   if (needPipelinedImport) {
     pipelinedImport = `
       const importPipeline = ${importPipeline};
@@ -212,6 +220,8 @@ function importPipeline() {
     return moduleExportsPromise;
   };
 }
+
+// src/preview/iframe-rsbuild.config.ts
 var getAbsolutePath = (input) => dirname(__require.resolve(join(input, "package.json")));
 var maybeGetAbsolutePath = (input) => {
   try {
@@ -220,19 +230,19 @@ var maybeGetAbsolutePath = (input) => {
     return false;
   }
 };
-var managerAPIPath = maybeGetAbsolutePath(`@storybook/manager-api`);
-var componentsPath = maybeGetAbsolutePath(`@storybook/components`);
-var globalPath = maybeGetAbsolutePath(`@storybook/global`);
-var routerPath = maybeGetAbsolutePath(`@storybook/router`);
-var themingPath = maybeGetAbsolutePath(`@storybook/theming`);
+var managerAPIPath = maybeGetAbsolutePath("@storybook/manager-api");
+var componentsPath = maybeGetAbsolutePath("@storybook/components");
+var globalPath = maybeGetAbsolutePath("@storybook/global");
+var routerPath = maybeGetAbsolutePath("@storybook/router");
+var themingPath = maybeGetAbsolutePath("@storybook/theming");
 var storybookPaths = {
   ...managerAPIPath ? {
-    [`@storybook/manager-api`]: managerAPIPath
+    "@storybook/manager-api": managerAPIPath
   } : {},
-  ...componentsPath ? { [`@storybook/components`]: componentsPath } : {},
-  ...globalPath ? { [`@storybook/global`]: globalPath } : {},
-  ...routerPath ? { [`@storybook/router`]: routerPath } : {},
-  ...themingPath ? { [`@storybook/theming`]: themingPath } : {}
+  ...componentsPath ? { "@storybook/components": componentsPath } : {},
+  ...globalPath ? { "@storybook/global": globalPath } : {},
+  ...routerPath ? { "@storybook/router": routerPath } : {},
+  ...themingPath ? { "@storybook/theming": themingPath } : {}
 };
 var iframe_rsbuild_config_default = async (options) => {
   const appliedDocsWebpack = await webpack({}, options);
@@ -285,6 +295,10 @@ var iframe_rsbuild_config_default = async (options) => {
   });
   const shouldCheckTs = typescriptOptions.check && !typescriptOptions.skipCompiler;
   const tsCheckOptions = typescriptOptions.checkOptions || {};
+  const builderOptions = await getBuilderOptions(options);
+  const lazyCompilationConfig = builderOptions.lazyCompilation && !isProd ? {
+    lazyCompilation: { entries: false }
+  } : {};
   if (!template) {
     throw new Error(dedent`
       Storybook's Webpack5 builder requires a template to be specified.
@@ -314,7 +328,7 @@ var iframe_rsbuild_config_default = async (options) => {
       },
       sourceMap: {
         js: options.build?.test?.disableSourcemaps ? false : "cheap-module-source-map",
-        css: options.build?.test?.disableSourcemaps ? false : true
+        css: !options.build?.test?.disableSourcemaps
       },
       distPath: {
         root: resolve(process.cwd(), outputDir)
@@ -356,9 +370,17 @@ var iframe_rsbuild_config_default = async (options) => {
         }
       }
     },
-    plugins: [shouldCheckTs ? pluginTypeCheck(tsCheckOptions) : null].filter(
-      Boolean
-    ),
+    plugins: [
+      shouldCheckTs ? pluginTypeCheck(tsCheckOptions) : null,
+      pluginHtmlMinifierTerser({
+        collapseWhitespace: true,
+        removeComments: true,
+        removeRedundantAttributes: true,
+        removeScriptTypeAttributes: false,
+        removeStyleLinkTypeAttributes: true,
+        useShortDoctype: true
+      })
+    ].filter(Boolean),
     tools: {
       rspack: (config, { addRules, appendPlugins, rspack, mergeConfig }) => {
         addRules({
@@ -399,6 +421,10 @@ var iframe_rsbuild_config_default = async (options) => {
         config.optimization.runtimeChunk = true;
         config.optimization.usedExports = options.build?.test?.disableTreeShaking ? false : isProd;
         config.optimization.moduleIds = "named";
+        config.module ??= {};
+        config.module.parser ??= {};
+        config.module.parser.javascript ??= {};
+        config.module.parser.javascript.exportsPresence = false;
         appendPlugins(
           [
             new rspack.ProvidePlugin({
@@ -407,10 +433,15 @@ var iframe_rsbuild_config_default = async (options) => {
             new CaseSensitivePathsPlugin()
           ].filter(Boolean)
         );
+        config.experiments ??= {};
+        config.experiments = {
+          ...config.experiments,
+          ...lazyCompilationConfig
+        };
         return mergeConfig(config, appliedDocsWebpack);
       },
       htmlPlugin: {
-        filename: `iframe.html`,
+        filename: "iframe.html",
         // FIXME: `none` isn't a known option
         chunksSortMode: "none",
         alwaysWriteToDisk: true,
@@ -435,25 +466,48 @@ var iframe_rsbuild_config_default = async (options) => {
           },
           headHtmlSnippet,
           bodyHtmlSnippet
-        },
-        minify: {
-          collapseWhitespace: true,
-          removeComments: true,
-          removeRedundantAttributes: true,
-          removeScriptTypeAttributes: false,
-          removeStyleLinkTypeAttributes: true,
-          useShortDoctype: true
         }
       }
     }
   });
   return merged;
 };
+var getIsReactVersion18or19 = async (options) => {
+  const { legacyRootApi } = await options.presets.apply(
+    "frameworkOptions"
+  ) || {};
+  if (legacyRootApi) {
+    return false;
+  }
+  const resolvedReact = await options.presets.apply(
+    "resolvedReact",
+    {}
+  );
+  const reactDom = resolvedReact.reactDom || dirname(__require.resolve("react-dom/package.json"));
+  if (!isAbsolute(reactDom)) {
+    return false;
+  }
+  const { version } = JSON.parse(
+    await readFile(join(reactDom, "package.json"), "utf-8")
+  );
+  return version.startsWith("18") || version.startsWith("19") || version.startsWith("0.0.0");
+};
+var applyReactShims = async (config, options) => {
+  const isReactVersion18 = await getIsReactVersion18or19(options);
+  if (isReactVersion18) {
+    return void 0;
+  }
+  return {
+    source: {
+      alias: {
+        "@storybook/react-dom-shim": "@storybook/react-dom-shim/dist/react-16"
+      }
+    }
+  };
+};
 
 // src/index.ts
-var import_pretty_hrtime = __toESM(require_pretty_hrtime());
 var printDuration = (startTime) => (0, import_pretty_hrtime.default)(process.hrtime(startTime)).replace(" ms", " milliseconds").replace(" s", " seconds").replace(" m", " minutes");
-var getAbsolutePath2 = (input) => dirname(__require.resolve(join(input, "package.json")));
 var executor = {
   get: async (options) => {
     const rsbuildInstance = await options.presets.apply("rsbuildInstance") || rsbuildReal;
@@ -461,14 +515,19 @@ var executor = {
   }
 };
 var rsbuild = async (_, options) => {
-  const defaultConfig = await iframe_rsbuild_config_default(options);
   const { presets } = options;
+  let defaultConfig = await iframe_rsbuild_config_default(options);
+  const shimsConfig = await applyReactShims(defaultConfig, options);
+  defaultConfig = mergeRsbuildConfig(
+    defaultConfig,
+    shimsConfig
+  );
   const finalDefaultConfig = await presets.apply(
     "rsbuildFinal",
     defaultConfig,
     options
   );
-  return finalDefaultConfig;
+  return mergeRsbuildConfig(finalDefaultConfig);
 };
 var getConfig = async (options) => {
   const { presets } = options;
@@ -499,10 +558,9 @@ var start = async ({
       ...config,
       server: {
         ...config.server,
-        port: options.port,
-        host: "localhost",
+        port: await getRandomPort(options.host),
+        host: options.host,
         htmlFallback: false,
-        strictPort: true,
         printUrls: false
       },
       dev: {
@@ -523,13 +581,13 @@ var start = async ({
   if (!rsbuildBuild) {
     throw new WebpackInvocationError({
       // eslint-disable-next-line local-rules/no-uncategorized-errors
-      error: new Error(`Missing Rsbuild build instance at runtime!`)
+      error: new Error("Missing Rsbuild build instance at runtime!")
     });
   }
-  const previewResolvedDir = getAbsolutePath2("@storybook/preview");
-  const previewDirOrigin = join(previewResolvedDir, "dist");
+  const previewResolvedDir = join(corePath, "dist/preview");
+  const previewDirOrigin = previewResolvedDir;
   router.use(
-    `/sb-preview`,
+    "/sb-preview",
     express.static(previewDirOrigin, { immutable: true, maxAge: "5m" })
   );
   router.use(rsbuildServer.middlewares);
@@ -548,9 +606,9 @@ var build = async ({ options }) => {
     cwd: process.cwd(),
     rsbuildConfig: config
   });
-  const previewResolvedDir = getAbsolutePath2("@storybook/preview");
-  const previewDirOrigin = join(previewResolvedDir, "dist");
-  const previewDirTarget = join(options.outputDir || "", `sb-preview`);
+  const previewResolvedDir = join(corePath, "dist/preview");
+  const previewDirOrigin = previewResolvedDir;
+  const previewDirTarget = join(options.outputDir || "", "sb-preview");
   let stats;
   rsbuildBuild.onAfterBuild((params) => {
     stats = params.stats;
@@ -572,5 +630,18 @@ var build = async ({ options }) => {
 };
 var corePresets = [join(__dirname, "./preview-preset.js")];
 var previewMainTemplate = () => __require.resolve("storybook-builder-rsbuild/templates/preview.ejs");
+function getRandomPort(host) {
+  return new Promise((resolve3, reject) => {
+    const server2 = createServer();
+    server2.unref();
+    server2.on("error", reject);
+    server2.listen({ port: 0, host }, () => {
+      const { port } = server2.address();
+      server2.close(() => {
+        resolve3(port);
+      });
+    });
+  });
+}
 
 export { bail, build, corePresets, executor, getConfig, getVirtualModules, importPipeline, previewMainTemplate, printDuration, rsbuild, start, toImportFn, toImportFnPart };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-builder-rsbuild",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Rsbuild builder for Storybook",
   "keywords": [
     "storybook",
@@ -56,18 +56,9 @@
     "!src/**/*"
   ],
   "dependencies": {
-    "@rsbuild/plugin-type-check": "0.7.9",
-    "@storybook/addon-docs": "^8.0.10",
-    "@storybook/channels": "^8.0.10",
-    "@storybook/client-logger": "^8.0.10",
-    "@storybook/core-common": "^8.0.10",
-    "@storybook/core-events": "^8.0.10",
-    "@storybook/core-webpack": "^8.0.10",
-    "@storybook/node-logger": "^8.0.10",
-    "@storybook/preview": "^8.0.10",
-    "@storybook/preview-api": "^8.0.10",
-    "@storybook/react-dom-shim": "^8.0.10",
-    "@storybook/types": "^8.0.10",
+    "@rsbuild/plugin-type-check": "1.0.1-beta.0",
+    "@storybook/addon-docs": "^8.2.1",
+    "@storybook/core-webpack": "^8.2.1",
     "browser-assert": "^1.2.1",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
     "cjs-module-lexer": "^1.2.3",
@@ -79,6 +70,7 @@
     "magic-string": "^0.30.5",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
+    "rsbuild-plugin-html-minifier-terser": "^1.1.0",
     "style-loader": "^3.3.1",
     "ts-dedent": "^2.2.0",
     "url": "^0.11.0",
@@ -86,7 +78,7 @@
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@rsbuild/core": "0.7.9",
+    "@rsbuild/core": "1.0.1-beta.0",
     "@types/express": "^4.17.21",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^18.0.0",
@@ -94,10 +86,12 @@
     "add": "^2.0.6",
     "pretty-hrtime": "^1.0.3",
     "slash": "^5.0.0",
+    "storybook": "8.2.1",
     "typescript": "^5.3.2"
   },
   "peerDependencies": {
-    "@rsbuild/core": ">= 0.7.0"
+    "@rsbuild/core": ">= 1.0.0-alpha.9",
+    "storybook": "^8.2.1"
   },
   "peerDependenciesMeta": {
     "typescript": {
@@ -116,6 +110,7 @@
     "platform": "node"
   },
   "scripts": {
+    "build": "pnpm run prep --optimized",
     "check": "node --loader ../../scripts/node_modules/esbuild-register/loader.js -r ../../scripts/node_modules/esbuild-register/register.js ../../scripts/prepare/check.ts",
     "prep": "node --loader ../../scripts/node_modules/esbuild-register/loader.js -r ../../scripts/node_modules/esbuild-register/register.js ../../scripts/prepare/bundle.ts"
   }

package/templates/virtualModuleModernEntry.js.handlebars

@@ -1,7 +1,7 @@
 import { global } from '@storybook/global';
 
-import { ClientApi, PreviewWeb, addons, composeConfigs } from '@storybook/preview-api';
-import { createBrowserChannel } from '@storybook/channels';
+import { ClientApi, PreviewWeb, addons, composeConfigs } from 'storybook/internal/preview-api';
+import { createBrowserChannel } from 'storybook/internal/channels';
 
 import { importFn } from './{{storiesFilename}}';