storybook-builder-rsbuild 1.0.0 → 2.0.0-alpha.1

package/dist/index.js

@@ -125,7 +125,6 @@ var rsbuildReal = __toESM(require("@rsbuild/core"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_pretty_hrtime = __toESM(require_pretty_hrtime());
 var import_sirv = __toESM(require("sirv"));
-var import_core_path = require("storybook/core-path");
 var import_common3 = require("storybook/internal/common");
 var import_server_errors = require("storybook/internal/server-errors");
 
@@ -296,19 +295,19 @@ var maybeGetAbsolutePath = (input) => {
     return false;
   }
 };
-var managerAPIPath = maybeGetAbsolutePath("@storybook/manager-api");
-var componentsPath = maybeGetAbsolutePath("@storybook/components");
+var builtInResolveExtensions = [
+  ".mjs",
+  ".js",
+  ".jsx",
+  ".ts",
+  ".tsx",
+  ".json",
+  ".cjs"
+];
 var globalPath = maybeGetAbsolutePath("@storybook/global");
-var routerPath = maybeGetAbsolutePath("@storybook/router");
-var themingPath = maybeGetAbsolutePath("@storybook/theming");
 var storybookPaths = {
-  ...managerAPIPath ? {
-    "@storybook/manager-api": managerAPIPath
-  } : {},
-  ...componentsPath ? { "@storybook/components": componentsPath } : {},
-  ...globalPath ? { "@storybook/global": globalPath } : {},
-  ...routerPath ? { "@storybook/router": routerPath } : {},
-  ...themingPath ? { "@storybook/theming": themingPath } : {}
+  // biome-ignore lint/complexity/useLiteralKeys: <explanation>
+  ...globalPath ? { ["@storybook/global"]: globalPath } : {}
 };
 var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
   const { rsbuildConfigPath, addonDocs } = await (0, import_common2.getBuilderOptions)(options);
@@ -499,15 +498,12 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
         });
         config.resolve ??= {};
         config.resolve.symlinks = !(0, import_common2.isPreservingSymlinks)();
-        config.resolve.extensions = [
-          ".mjs",
-          ".js",
-          ".jsx",
-          ".ts",
-          ".tsx",
-          ".json",
-          ".cjs"
-        ];
+        config.resolve.extensions = Array.from(
+          /* @__PURE__ */ new Set([
+            ...config.resolve.extensions ?? [],
+            ...builtInResolveExtensions
+          ])
+        );
         config.watchOptions = {
           ignored: /node_modules/
         };
@@ -596,7 +592,8 @@ var getIsReactVersion18or19 = async (options) => {
     "resolvedReact",
     {}
   );
-  const reactDom = resolvedReact.reactDom || (0, import_node_path4.dirname)(require.resolve("react-dom/package.json"));
+  let reactDom = "";
+  reactDom = resolvedReact.reactDom || (0, import_node_path4.dirname)(require.resolve("react-dom/package.json"));
   if (!(0, import_node_path4.isAbsolute)(reactDom)) {
     return false;
   }
@@ -620,6 +617,7 @@ var applyReactShims = async (config, options) => {
 };
 
 // src/index.ts
+var corePath = (0, import_node_path5.dirname)(require.resolve("storybook/package.json"));
 var printDuration = (startTime) => (0, import_pretty_hrtime.default)(process.hrtime(startTime)).replace(" ms", " milliseconds").replace(" s", " seconds").replace(" m", " minutes");
 var executor = {
   get: async (options) => {
@@ -635,22 +633,23 @@ var rsbuild = async (_, options) => {
   const { presets } = options;
   const webpackAddons = await presets.apply("webpackAddons");
   const resolvedWebpackAddons = (webpackAddons ?? []).map((preset) => {
-    const options2 = isObject(preset) ? preset.options || void 0 : void 0;
+    const addonOptions = isObject(preset) ? preset.options || void 0 : void 0;
     const name = isObject(preset) ? preset.name : preset;
-    return (0, import_common3.resolveAddonName)(options2.configDir, name, options2);
+    return (0, import_common3.resolveAddonName)(options.configDir, name, addonOptions);
   }).filter(nonNullables);
   const { apply } = await (0, import_common3.getPresets)(resolvedWebpackAddons, options);
   const webpackAddonsConfig = await apply(
     "webpackFinal",
     // TODO: using empty webpack config as base for now. It's better to using the composed rspack
     // config in `iframe-rsbuild.config.ts` as base config. But when `tools.rspack` is an async function,
-    // the following `tools.rspack` raise an ` Promises are not supported` error.
+    // the following `tools.rspack` raise an `Promises are not supported` error.
     {
       output: {},
       module: {},
       plugins: [],
       resolve: {},
-      devServer: {},
+      // https://github.com/web-infra-dev/rsbuild/blob/8dc35dc1d1500d2f119875d46b6a07e27986d532/packages/core/src/provider/rspackConfig.ts#L167
+      devServer: void 0,
       optimization: {},
       performance: {},
       externals: {},
@@ -726,7 +725,7 @@ var start = async ({
       error: new Error("Missing Rsbuild build instance at runtime!")
     });
   }
-  const previewResolvedDir = (0, import_node_path5.join)(import_core_path.corePath, "dist/preview");
+  const previewResolvedDir = (0, import_node_path5.join)(corePath, "dist/preview");
   const previewDirOrigin = previewResolvedDir;
   router.use(
     "/sb-preview",
@@ -749,7 +748,7 @@ var build = async ({ options }) => {
     cwd: process.cwd(),
     rsbuildConfig: config
   });
-  const previewResolvedDir = (0, import_node_path5.join)(import_core_path.corePath, "dist/preview");
+  const previewResolvedDir = (0, import_node_path5.join)(corePath, "dist/preview");
   const previewDirOrigin = previewResolvedDir;
   const previewDirTarget = (0, import_node_path5.join)(options.outputDir || "", "sb-preview");
   let stats;

package/dist/index.mjs

@@ -1,11 +1,10 @@
 import { __commonJS, __toESM, __require } from './chunk-TTFRSOOU.mjs';
 import { createServer } from 'net';
-import path, { join, resolve, parse, dirname, isAbsolute } from 'path';
+import path, { dirname, join, resolve, parse, isAbsolute } from 'path';
 import * as rsbuildReal from '@rsbuild/core';
 import { loadConfig, mergeRsbuildConfig } from '@rsbuild/core';
 import fs2 from 'fs-extra';
 import sirv from 'sirv';
-import { corePath } from 'storybook/core-path';
 import { normalizeStories, loadPreviewOrConfigFile, getBuilderOptions, readTemplate, resolveAddonName, getPresets, stringifyProcessEnvs, isPreservingSymlinks } from 'storybook/internal/common';
 import { WebpackInvocationError } from 'storybook/internal/server-errors';
 import { pluginTypeCheck } from '@rsbuild/plugin-type-check';
@@ -240,19 +239,19 @@ var maybeGetAbsolutePath = (input) => {
     return false;
   }
 };
-var managerAPIPath = maybeGetAbsolutePath("@storybook/manager-api");
-var componentsPath = maybeGetAbsolutePath("@storybook/components");
+var builtInResolveExtensions = [
+  ".mjs",
+  ".js",
+  ".jsx",
+  ".ts",
+  ".tsx",
+  ".json",
+  ".cjs"
+];
 var globalPath = maybeGetAbsolutePath("@storybook/global");
-var routerPath = maybeGetAbsolutePath("@storybook/router");
-var themingPath = maybeGetAbsolutePath("@storybook/theming");
 var storybookPaths = {
-  ...managerAPIPath ? {
-    "@storybook/manager-api": managerAPIPath
-  } : {},
-  ...componentsPath ? { "@storybook/components": componentsPath } : {},
-  ...globalPath ? { "@storybook/global": globalPath } : {},
-  ...routerPath ? { "@storybook/router": routerPath } : {},
-  ...themingPath ? { "@storybook/theming": themingPath } : {}
+  // biome-ignore lint/complexity/useLiteralKeys: <explanation>
+  ...globalPath ? { ["@storybook/global"]: globalPath } : {}
 };
 var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
   const { rsbuildConfigPath, addonDocs } = await getBuilderOptions(options);
@@ -445,15 +444,12 @@ var iframe_rsbuild_config_default = async (options, extraWebpackConfig) => {
         });
         config.resolve ??= {};
         config.resolve.symlinks = !isPreservingSymlinks();
-        config.resolve.extensions = [
-          ".mjs",
-          ".js",
-          ".jsx",
-          ".ts",
-          ".tsx",
-          ".json",
-          ".cjs"
-        ];
+        config.resolve.extensions = Array.from(
+          /* @__PURE__ */ new Set([
+            ...config.resolve.extensions ?? [],
+            ...builtInResolveExtensions
+          ])
+        );
         config.watchOptions = {
           ignored: /node_modules/
         };
@@ -538,7 +534,8 @@ var getIsReactVersion18or19 = async (options) => {
     "resolvedReact",
     {}
   );
-  const reactDom = resolvedReact.reactDom || dirname(__require.resolve("react-dom/package.json"));
+  let reactDom = "";
+  reactDom = resolvedReact.reactDom || dirname(__require.resolve("react-dom/package.json"));
   if (!isAbsolute(reactDom)) {
     return false;
   }
@@ -562,6 +559,7 @@ var applyReactShims = async (config, options) => {
 };
 
 // src/index.ts
+var corePath = dirname(__require.resolve("storybook/package.json"));
 var printDuration = (startTime) => (0, import_pretty_hrtime.default)(process.hrtime(startTime)).replace(" ms", " milliseconds").replace(" s", " seconds").replace(" m", " minutes");
 var executor = {
   get: async (options) => {
@@ -577,22 +575,23 @@ var rsbuild = async (_, options) => {
   const { presets } = options;
   const webpackAddons = await presets.apply("webpackAddons");
   const resolvedWebpackAddons = (webpackAddons ?? []).map((preset) => {
-    const options2 = isObject(preset) ? preset.options || void 0 : void 0;
+    const addonOptions = isObject(preset) ? preset.options || void 0 : void 0;
     const name = isObject(preset) ? preset.name : preset;
-    return resolveAddonName(options2.configDir, name, options2);
+    return resolveAddonName(options.configDir, name, addonOptions);
   }).filter(nonNullables);
   const { apply } = await getPresets(resolvedWebpackAddons, options);
   const webpackAddonsConfig = await apply(
     "webpackFinal",
     // TODO: using empty webpack config as base for now. It's better to using the composed rspack
     // config in `iframe-rsbuild.config.ts` as base config. But when `tools.rspack` is an async function,
-    // the following `tools.rspack` raise an ` Promises are not supported` error.
+    // the following `tools.rspack` raise an `Promises are not supported` error.
     {
       output: {},
       module: {},
       plugins: [],
       resolve: {},
-      devServer: {},
+      // https://github.com/web-infra-dev/rsbuild/blob/8dc35dc1d1500d2f119875d46b6a07e27986d532/packages/core/src/provider/rspackConfig.ts#L167
+      devServer: void 0,
       optimization: {},
       performance: {},
       externals: {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-builder-rsbuild",
-  "version": "1.0.0",
+  "version": "2.0.0-alpha.1",
   "description": "Rsbuild builder for Storybook",
   "keywords": [
     "storybook",
@@ -58,8 +58,8 @@
   ],
   "dependencies": {
     "@rsbuild/plugin-type-check": "^1.2.1",
-    "@storybook/addon-docs": "^8.2.1",
-    "@storybook/core-webpack": "^8.2.1",
+    "@storybook/addon-docs": "^9.0.0-alpha.17",
+    "@storybook/core-webpack": "^9.0.0-alpha.17",
     "browser-assert": "^1.2.1",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
     "cjs-module-lexer": "^1.4.3",
@@ -78,19 +78,19 @@
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@rsbuild/core": "^1.1.13",
+    "@rsbuild/core": "^1.2.19",
     "@types/find-cache-dir": "^5.0.2",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^18.0.0",
     "@types/pretty-hrtime": "^1.0.3",
     "pretty-hrtime": "^1.0.3",
     "slash": "^5.1.0",
-    "storybook": "8.5.8",
+    "storybook": "9.0.0-alpha.17",
     "typescript": "^5.7.3"
   },
   "peerDependencies": {
     "@rsbuild/core": "^1.0.1",
-    "storybook": "^8.2.1"
+    "storybook": "^9.0.0-alpha.17"
   },
   "peerDependenciesMeta": {
     "typescript": {
@@ -110,7 +110,7 @@
   },
   "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"
+    "check": "jiti ../../scripts/prepare/check.ts",
+    "prep": "jiti ../../scripts/prepare/bundle.ts"
   }
 }