storybook-builder-rsbuild 3.0.0-beta.4 → 3.0.0-beta.6

package/dist/_node-chunks/{chunk-YJZARK5B.js → chunk-B3T3OBDC.js}

@@ -1,10 +1,10 @@
-import CJS_COMPAT_NODE_URL_134f5ab7b24026fd from 'node:url';
-import CJS_COMPAT_NODE_PATH_134f5ab7b24026fd from 'node:path';
-import CJS_COMPAT_NODE_MODULE_134f5ab7b24026fd from "node:module";
+import CJS_COMPAT_NODE_URL_fce6c4dfb22448c4 from 'node:url';
+import CJS_COMPAT_NODE_PATH_fce6c4dfb22448c4 from 'node:path';
+import CJS_COMPAT_NODE_MODULE_fce6c4dfb22448c4 from "node:module";
 
-var __filename = CJS_COMPAT_NODE_URL_134f5ab7b24026fd.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_134f5ab7b24026fd.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_134f5ab7b24026fd.createRequire(import.meta.url);
+var __filename = CJS_COMPAT_NODE_URL_fce6c4dfb22448c4.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_fce6c4dfb22448c4.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_fce6c4dfb22448c4.createRequire(import.meta.url);
 
 // ------------------------------------------------------------
 // end of CJS compatibility banner, injected by Storybook's esbuild configuration

package/dist/index.js

@@ -1,10 +1,10 @@
-import CJS_COMPAT_NODE_URL_134f5ab7b24026fd from 'node:url';
-import CJS_COMPAT_NODE_PATH_134f5ab7b24026fd from 'node:path';
-import CJS_COMPAT_NODE_MODULE_134f5ab7b24026fd from "node:module";
+import CJS_COMPAT_NODE_URL_fce6c4dfb22448c4 from 'node:url';
+import CJS_COMPAT_NODE_PATH_fce6c4dfb22448c4 from 'node:path';
+import CJS_COMPAT_NODE_MODULE_fce6c4dfb22448c4 from "node:module";
 
-var __filename = CJS_COMPAT_NODE_URL_134f5ab7b24026fd.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_134f5ab7b24026fd.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_134f5ab7b24026fd.createRequire(import.meta.url);
+var __filename = CJS_COMPAT_NODE_URL_fce6c4dfb22448c4.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_fce6c4dfb22448c4.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_fce6c4dfb22448c4.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-YJZARK5B.js";
+} from "./_node-chunks/chunk-B3T3OBDC.js";
 
 // ../../node_modules/.pnpm/pretty-hrtime@1.0.3/node_modules/pretty-hrtime/index.js
 var require_pretty_hrtime = __commonJS({
@@ -34,15 +34,35 @@ var require_pretty_hrtime = __commonJS({
 // src/index.ts
 var import_pretty_hrtime = __toESM(require_pretty_hrtime(), 1);
 import { createServer } from "node:net";
-import { dirname as dirname3, join as join4, parse } from "node:path";
+import { dirname as dirname2, join as join4, parse } from "node:path";
 import * as rsbuildReal from "@rsbuild/core";
 import fs from "fs-extra";
 import sirv from "sirv";
 import { getPresets, resolveAddonName } from "storybook/internal/common";
 import { WebpackInvocationError } from "storybook/internal/server-errors";
 
+// src/logger.ts
+import { logger as rsbuildLogger } from "@rsbuild/core";
+import picocolors from "picocolors";
+import { logger } from "storybook/internal/node-logger";
+function overrideRsbuildLogger() {
+  let logWithPrefix = (fn) => (msg) => fn(`${picocolors.bgCyanBright(" Rsbuild ")} ${String(msg)}`);
+  rsbuildLogger.override({
+    error: logWithPrefix(logger.error),
+    warn: logWithPrefix(logger.warn),
+    info: logWithPrefix(logger.info),
+    success: logWithPrefix(logger.info),
+    debug: logWithPrefix(logger.info),
+    log: logWithPrefix(logger.info),
+    ready: logWithPrefix(logger.info),
+    start: logWithPrefix(logger.info)
+  });
+}
+
 // src/preview/iframe-rsbuild.config.ts
+import { createRequire } from "node:module";
 import { dirname, join as join2, resolve as resolve2 } from "node:path";
+import { fileURLToPath } from "node:url";
 import { loadConfig, mergeRsbuildConfig } from "@rsbuild/core";
 import { pluginTypeCheck } from "@rsbuild/plugin-type-check";
 import CaseSensitivePathsPlugin from "case-sensitive-paths-webpack-plugin";
@@ -364,7 +384,16 @@ var getVirtualModules = async (options) => {
 };
 
 // src/preview/iframe-rsbuild.config.ts
-var getAbsolutePath = (input) => dirname(__require.resolve(join2(input, "package.json"))), maybeGetAbsolutePath = (input) => {
+var require2 = createRequire(import.meta.url), getAbsolutePath = (input) => {
+  let storybookPath = fileURLToPath(
+    import.meta.resolve("storybook/package.json")
+  );
+  return dirname(
+    require2.resolve(join2(input, "package.json"), {
+      paths: [dirname(storybookPath)]
+    })
+  );
+}, maybeGetAbsolutePath = (input) => {
   try {
     return getAbsolutePath(input);
   } catch {
@@ -427,8 +456,8 @@ var getAbsolutePath = (input) => dirname(__require.resolve(join2(input, "package
     configDir: options.configDir,
     workingDir
   }), shouldCheckTs = typescriptOptions.check && !typescriptOptions.skipCompiler, tsCheckOptions = typescriptOptions.checkOptions || {}, builderOptions = await getBuilderOptions2(options), cacheConfig = builderOptions.fsCache ? !0 : void 0, lazyCompilationConfig = builderOptions.lazyCompilation && !isProd ? {
-    lazyCompilation: { entries: !1 }
-  } : {};
+    entries: !1
+  } : void 0;
   if (!template)
     throw new Error(dedent`
       Storybook's Webpack5 builder requires a template to be specified.
@@ -535,6 +564,9 @@ var getAbsolutePath = (input) => dirname(__require.resolve(join2(input, "package
       }))
     ].filter(Boolean),
     tools: {
+      swc: (config) => {
+        config.env ??= {}, config.env.bugfixes = !0;
+      },
       rspack: (config, { addRules, rspack: rspack2, mergeConfig }) => {
         if (addRules({
           test: /\.stories\.([tj])sx?$|(stories|story)\.mdx$/,
@@ -542,7 +574,7 @@ var getAbsolutePath = (input) => dirname(__require.resolve(join2(input, "package
           enforce: "post",
           use: [
             {
-              loader: __require.resolve(
+              loader: require2.resolve(
                 "storybook-builder-rsbuild/loaders/export-order-loader"
               )
             }
@@ -560,12 +592,12 @@ var getAbsolutePath = (input) => dirname(__require.resolve(join2(input, "package
           /export '\S+' was not found in '@storybook\/global'/
         ], config.resolve ??= {}, config.resolve.fallback ??= {
           stream: !1,
-          path: __require.resolve("path-browserify"),
-          assert: __require.resolve("browser-assert"),
-          util: __require.resolve("util"),
-          url: __require.resolve("url"),
+          path: require2.resolve("path-browserify"),
+          assert: require2.resolve("browser-assert"),
+          util: require2.resolve("util"),
+          url: require2.resolve("url"),
           fs: !1,
-          constants: __require.resolve("constants-browserify")
+          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, !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."
@@ -576,14 +608,11 @@ var getAbsolutePath = (input) => dirname(__require.resolve(join2(input, "package
               virtualModuleMapping
             ) : null,
             new rspack2.ProvidePlugin({
-              process: __require.resolve("process/browser.js")
+              process: require2.resolve("process/browser.js")
             }),
             new CaseSensitivePathsPlugin()
           ].filter(Boolean)
-        ), config.experiments ??= {}, config.experiments.outputModule = !1, config.externalsType = "var", config.output ??= {}, config.output.module = !1, config.output.chunkFormat = "array-push", config.output.chunkLoading = "jsonp", config.experiments = {
-          ...config.experiments,
-          ...lazyCompilationConfig
-        }, mergeConfig(
+        ), config.experiments ??= {}, config.experiments.outputModule = !1, config.externalsType = "var", config.output ??= {}, config.output.module = !1, config.output.chunkFormat = "array-push", config.output.chunkLoading = "jsonp", lazyCompilationConfig !== void 0 && (config.lazyCompilation = lazyCompilationConfig), mergeConfig(
           config,
           extraWebpackConfig || {},
           webpackConfigFromPresets
@@ -626,18 +655,19 @@ var getAbsolutePath = (input) => dirname(__require.resolve(join2(input, "package
 
 // src/react-shims.ts
 import { readFile } from "node:fs/promises";
-import { dirname as dirname2, isAbsolute, join as join3 } from "node:path";
+import { isAbsolute, join as join3 } from "node:path";
+import { resolvePackageDir } from "storybook/internal/common";
 var getIsReactVersion18or19 = async (options) => {
   let { legacyRootApi } = await options.presets.apply(
     "frameworkOptions"
   ) || {};
   if (legacyRootApi)
     return !1;
-  let resolvedReact = await options.presets.apply(
+  let reactDom = (await options.presets.apply(
     "resolvedReact",
     {}
-  ), reactDom = "";
-  if (reactDom = resolvedReact.reactDom || dirname2(__require.resolve("react-dom/package.json")), !isAbsolute(reactDom))
+  )).reactDom || resolvePackageDir("react-dom");
+  if (!isAbsolute(reactDom))
     return !1;
   let { version } = JSON.parse(
     await readFile(join3(reactDom, "package.json"), "utf-8")
@@ -652,7 +682,7 @@ var getIsReactVersion18or19 = async (options) => {
 };
 
 // src/index.ts
-var corePath = dirname3(__require.resolve("storybook/package.json")), printDuration = (startTime) => (0, import_pretty_hrtime.default)(process.hrtime(startTime)).replace(" ms", " milliseconds").replace(" s", " seconds").replace(" m", " minutes"), executor = {
+var corePath = dirname2(__require.resolve("storybook/package.json")), printDuration = (startTime) => (0, import_pretty_hrtime.default)(process.hrtime(startTime)).replace(" ms", " milliseconds").replace(" s", " seconds").replace(" m", " minutes"), executor = {
   get: async (options) => await options.presets.apply("rsbuildInstance") || rsbuildReal
 }, isObject = (val) => val != null && typeof val == "object" && Array.isArray(val) === !1;
 function nonNullables(value) {
@@ -710,6 +740,7 @@ var start = async ({
   server: storybookServer,
   channel
 }) => {
+  overrideRsbuildLogger();
   let { createRsbuild } = await executor.get(options), config = await getConfig(options), rsbuildBuild = await createRsbuild({
     cwd: process.cwd(),
     rsbuildConfig: {
@@ -744,6 +775,7 @@ var start = async ({
     totalTime: process.hrtime(startTime)
   };
 }, build = async ({ options }) => {
+  overrideRsbuildLogger();
   let { createRsbuild } = await executor.get(options), config = await getConfig(options), rsbuildBuild = await createRsbuild({
     cwd: process.cwd(),
     rsbuildConfig: config

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

@@ -1,15 +1,15 @@
-import CJS_COMPAT_NODE_URL_134f5ab7b24026fd from 'node:url';
-import CJS_COMPAT_NODE_PATH_134f5ab7b24026fd from 'node:path';
-import CJS_COMPAT_NODE_MODULE_134f5ab7b24026fd from "node:module";
+import CJS_COMPAT_NODE_URL_fce6c4dfb22448c4 from 'node:url';
+import CJS_COMPAT_NODE_PATH_fce6c4dfb22448c4 from 'node:path';
+import CJS_COMPAT_NODE_MODULE_fce6c4dfb22448c4 from "node:module";
 
-var __filename = CJS_COMPAT_NODE_URL_134f5ab7b24026fd.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_134f5ab7b24026fd.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_134f5ab7b24026fd.createRequire(import.meta.url);
+var __filename = CJS_COMPAT_NODE_URL_fce6c4dfb22448c4.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_fce6c4dfb22448c4.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_fce6c4dfb22448c4.createRequire(import.meta.url);
 
 // ------------------------------------------------------------
 // end of CJS compatibility banner, injected by Storybook's esbuild configuration
 // ------------------------------------------------------------
-import "../_node-chunks/chunk-YJZARK5B.js";
+import "../_node-chunks/chunk-B3T3OBDC.js";
 
 // src/loaders/export-order-loader.ts
 import assert from "node:assert";

package/dist/preview-preset.js

@@ -1,17 +1,17 @@
-import CJS_COMPAT_NODE_URL_134f5ab7b24026fd from 'node:url';
-import CJS_COMPAT_NODE_PATH_134f5ab7b24026fd from 'node:path';
-import CJS_COMPAT_NODE_MODULE_134f5ab7b24026fd from "node:module";
+import CJS_COMPAT_NODE_URL_fce6c4dfb22448c4 from 'node:url';
+import CJS_COMPAT_NODE_PATH_fce6c4dfb22448c4 from 'node:path';
+import CJS_COMPAT_NODE_MODULE_fce6c4dfb22448c4 from "node:module";
 
-var __filename = CJS_COMPAT_NODE_URL_134f5ab7b24026fd.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_134f5ab7b24026fd.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_134f5ab7b24026fd.createRequire(import.meta.url);
+var __filename = CJS_COMPAT_NODE_URL_fce6c4dfb22448c4.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_fce6c4dfb22448c4.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_fce6c4dfb22448c4.createRequire(import.meta.url);
 
 // ------------------------------------------------------------
 // end of CJS compatibility banner, injected by Storybook's esbuild configuration
 // ------------------------------------------------------------
 import {
   __require
-} from "./_node-chunks/chunk-YJZARK5B.js";
+} from "./_node-chunks/chunk-B3T3OBDC.js";
 
 // src/preview-preset.ts
 var previewMainTemplate = () => __require.resolve("storybook-builder-rsbuild/templates/preview.ejs");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-builder-rsbuild",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.6",
   "description": "Rsbuild builder for Storybook",
   "keywords": [
     "storybook",
@@ -31,9 +31,6 @@
     "./templates/virtualModuleModernEntry.js": "./templates/virtualModuleModernEntry.js",
     "./templates/virtualModuleStory.template.js": "./templates/virtualModuleStory.template.js"
   },
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
     "compiled/**/*",
@@ -53,6 +50,7 @@
     "fs-extra": "^11.3.2",
     "magic-string": "^0.30.21",
     "path-browserify": "^1.0.1",
+    "picocolors": "^1.1.0",
     "process": "^0.11.10",
     "rsbuild-plugin-html-minifier-terser": "^1.1.2",
     "sirv": "^2.0.4",
@@ -62,7 +60,7 @@
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@rsbuild/core": "^1.5.17",
+    "@rsbuild/core": "^1.6.7",
     "@storybook/core-webpack": "^10.0.0",
     "@types/find-cache-dir": "^5.0.2",
     "@types/fs-extra": "^11.0.4",
@@ -72,7 +70,7 @@
     "prebundle": "^1.6.0",
     "pretty-hrtime": "^1.0.3",
     "slash": "^5.1.0",
-    "storybook": "10.0.7",
+    "storybook": "10.0.8",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {