storybook-react-rsbuild 2.1.6 → 3.0.0-beta.2

package/dist/preset.js

@@ -1,411 +1,23 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-};
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/plugins/react-docgen-typescript/utils/filter.ts
-var defaultPropFilter;
-var init_filter = __esm({
-  "src/plugins/react-docgen-typescript/utils/filter.ts"() {
-    "use strict";
-    defaultPropFilter = (prop) => {
-      return !prop.parent?.fileName.includes("node_modules");
-    };
-  }
-});
-
-// src/plugins/react-docgen-typescript/utils/typescript.ts
-var typescript_exports = {};
-__export(typescript_exports, {
-  getTSConfigFile: () => getTSConfigFile
-});
-function getTSConfigFile(tsconfigPath) {
-  try {
-    const basePath = (0, import_node_path.dirname)(tsconfigPath);
-    const configFile = import_typescript.default.readConfigFile(tsconfigPath, import_typescript.default.sys.readFile);
-    return import_typescript.default.parseJsonConfigFileContent(
-      configFile.config,
-      import_typescript.default.sys,
-      basePath,
-      {},
-      tsconfigPath
-    );
-  } catch (error) {
-    return {};
-  }
-}
-var import_node_path, import_typescript;
-var init_typescript = __esm({
-  "src/plugins/react-docgen-typescript/utils/typescript.ts"() {
-    "use strict";
-    import_node_path = require("path");
-    import_typescript = __toESM(require("typescript"));
-  }
-});
-
-// src/plugins/react-docgen-typescript/utils/options.ts
-var options_exports = {};
-__export(options_exports, {
-  getGenerateOptions: () => getGenerateOptions
-});
-function getGenerateOptions(options) {
-  const { setDisplayName: setDisplayName2 = true, typePropName = "type" } = options;
-  return {
-    setDisplayName: setDisplayName2,
-    typePropName
-  };
-}
-var init_options = __esm({
-  "src/plugins/react-docgen-typescript/utils/options.ts"() {
-    "use strict";
-  }
-});
+import CJS_COMPAT_NODE_URL_5eb028538d2fa676 from 'node:url';
+import CJS_COMPAT_NODE_PATH_5eb028538d2fa676 from 'node:path';
+import CJS_COMPAT_NODE_MODULE_5eb028538d2fa676 from "node:module";
 
-// src/plugins/react-docgen-typescript/utils/generate.ts
-var generate_exports = {};
-__export(generate_exports, {
-  generateDocgenCodeBlock: () => generateDocgenCodeBlock
-});
-function createLiteral(value) {
-  switch (typeof value) {
-    case "string":
-      return import_typescript2.default.factory.createStringLiteral(value);
-    case "number":
-      return import_typescript2.default.factory.createNumericLiteral(value);
-    case "boolean":
-      return value ? import_typescript2.default.factory.createTrue() : import_typescript2.default.factory.createFalse();
-  }
-}
-function insertTsIgnoreBeforeStatement(statement) {
-  import_typescript2.default.setSyntheticLeadingComments(statement, [
-    {
-      text: " @ts-ignore",
-      // Leading space is important here
-      kind: import_typescript2.default.SyntaxKind.SingleLineCommentTrivia,
-      pos: -1,
-      end: -1
-    }
-  ]);
-  return statement;
-}
-function setDisplayName(d) {
-  return insertTsIgnoreBeforeStatement(
-    import_typescript2.default.factory.createExpressionStatement(
-      import_typescript2.default.factory.createBinaryExpression(
-        import_typescript2.default.factory.createPropertyAccessExpression(
-          import_typescript2.default.factory.createIdentifier(d.displayName),
-          import_typescript2.default.factory.createIdentifier("displayName")
-        ),
-        import_typescript2.default.SyntaxKind.EqualsToken,
-        import_typescript2.default.factory.createStringLiteral(d.displayName)
-      )
-    )
-  );
-}
-function createPropDefinition(propName, prop, options) {
-  const setDefaultValue = (defaultValue) => import_typescript2.default.factory.createPropertyAssignment(
-    import_typescript2.default.factory.createStringLiteral("defaultValue"),
-    // Use a more extensive check on defaultValue. Sometimes the parser
-    // returns an empty object.
-    defaultValue?.value !== void 0 && (typeof defaultValue.value === "string" || typeof defaultValue.value === "number" || typeof defaultValue.value === "boolean") ? import_typescript2.default.factory.createObjectLiteralExpression([
-      import_typescript2.default.factory.createPropertyAssignment(
-        import_typescript2.default.factory.createIdentifier("value"),
-        createLiteral(defaultValue.value)
-      )
-    ]) : import_typescript2.default.factory.createNull()
-  );
-  const setStringLiteralField = (fieldName, fieldValue) => import_typescript2.default.factory.createPropertyAssignment(
-    import_typescript2.default.factory.createStringLiteral(fieldName),
-    import_typescript2.default.factory.createStringLiteral(fieldValue)
-  );
-  const setDescription = (description) => setStringLiteralField("description", description);
-  const setName = (name) => setStringLiteralField("name", name);
-  const setRequired = (required) => import_typescript2.default.factory.createPropertyAssignment(
-    import_typescript2.default.factory.createStringLiteral("required"),
-    required ? import_typescript2.default.factory.createTrue() : import_typescript2.default.factory.createFalse()
-  );
-  const setValue = (typeValue) => Array.isArray(typeValue) && typeValue.every((value) => typeof value.value === "string") ? import_typescript2.default.factory.createPropertyAssignment(
-    import_typescript2.default.factory.createStringLiteral("value"),
-    import_typescript2.default.factory.createArrayLiteralExpression(
-      typeValue.map(
-        (value) => import_typescript2.default.factory.createObjectLiteralExpression([
-          setStringLiteralField("value", value.value)
-        ])
-      )
-    )
-  ) : void 0;
-  const setType = (typeName, typeValue) => {
-    const objectFields = [setStringLiteralField("name", typeName)];
-    const valueField = setValue(typeValue);
-    if (valueField) {
-      objectFields.push(valueField);
-    }
-    return import_typescript2.default.factory.createPropertyAssignment(
-      import_typescript2.default.factory.createStringLiteral(options.typePropName),
-      import_typescript2.default.factory.createObjectLiteralExpression(objectFields)
-    );
-  };
-  return import_typescript2.default.factory.createPropertyAssignment(
-    import_typescript2.default.factory.createStringLiteral(propName),
-    import_typescript2.default.factory.createObjectLiteralExpression([
-      setDefaultValue(prop.defaultValue),
-      setDescription(prop.description),
-      setName(prop.name),
-      setRequired(prop.required),
-      setType(prop.type.name, prop.type.value)
-    ])
-  );
-}
-function setComponentDocGen(d, options) {
-  return insertTsIgnoreBeforeStatement(
-    import_typescript2.default.factory.createExpressionStatement(
-      import_typescript2.default.factory.createBinaryExpression(
-        // SimpleComponent.__docgenInfo
-        import_typescript2.default.factory.createPropertyAccessExpression(
-          import_typescript2.default.factory.createIdentifier(d.displayName),
-          import_typescript2.default.factory.createIdentifier("__docgenInfo")
-        ),
-        import_typescript2.default.SyntaxKind.EqualsToken,
-        import_typescript2.default.factory.createObjectLiteralExpression([
-          // SimpleComponent.__docgenInfo.description
-          import_typescript2.default.factory.createPropertyAssignment(
-            import_typescript2.default.factory.createStringLiteral("description"),
-            import_typescript2.default.factory.createStringLiteral(d.description)
-          ),
-          // SimpleComponent.__docgenInfo.displayName
-          import_typescript2.default.factory.createPropertyAssignment(
-            import_typescript2.default.factory.createStringLiteral("displayName"),
-            import_typescript2.default.factory.createStringLiteral(d.displayName)
-          ),
-          // SimpleComponent.__docgenInfo.props
-          import_typescript2.default.factory.createPropertyAssignment(
-            import_typescript2.default.factory.createStringLiteral("props"),
-            import_typescript2.default.factory.createObjectLiteralExpression(
-              Object.entries(d.props).map(
-                ([propName, prop]) => createPropDefinition(propName, prop, options)
-              )
-            )
-          )
-        ])
-      )
-    )
-  );
-}
-function generateDocgenCodeBlock(options) {
-  const sourceFile = import_typescript2.default.createSourceFile(
-    options.filename,
-    options.source,
-    import_typescript2.default.ScriptTarget.ESNext
-  );
-  const wrapInTryStatement = (statements) => import_typescript2.default.factory.createTryStatement(
-    import_typescript2.default.factory.createBlock(statements, true),
-    import_typescript2.default.factory.createCatchClause(
-      import_typescript2.default.factory.createVariableDeclaration(
-        import_typescript2.default.factory.createIdentifier("__react_docgen_typescript_loader_error")
-      ),
-      import_typescript2.default.factory.createBlock([])
-    ),
-    void 0
-  );
-  const codeBlocks = options.componentDocs.map(
-    (d) => wrapInTryStatement(
-      [
-        options.setDisplayName ? setDisplayName(d) : null,
-        setComponentDocGen(d, options)
-      ].filter((s2) => s2 !== null)
-    )
-  );
-  const printer = import_typescript2.default.createPrinter({ newLine: import_typescript2.default.NewLineKind.LineFeed });
-  const printNode = (sourceNode) => printer.printNode(import_typescript2.default.EmitHint.Unspecified, sourceNode, sourceFile);
-  const s = new import_magic_string.default(options.source);
-  for (const node of codeBlocks) {
-    s.append(printNode(node));
-  }
-  return {
-    code: s.toString(),
-    map: s.generateMap()
-  };
-}
-var import_magic_string, import_typescript2;
-var init_generate = __esm({
-  "src/plugins/react-docgen-typescript/utils/generate.ts"() {
-    "use strict";
-    import_magic_string = __toESM(require("magic-string"));
-    import_typescript2 = __toESM(require("typescript"));
-  }
-});
+var __filename = CJS_COMPAT_NODE_URL_5eb028538d2fa676.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_5eb028538d2fa676.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_5eb028538d2fa676.createRequire(import.meta.url);
 
-// src/plugins/react-docgen-typescript/index.ts
-var react_docgen_typescript_exports = {};
-__export(react_docgen_typescript_exports, {
-  default: () => react_docgen_typescript_default
-});
-var import_pluginutils, getDocgen, startWatch, react_docgen_typescript_default;
-var init_react_docgen_typescript = __esm({
-  "src/plugins/react-docgen-typescript/index.ts"() {
-    "use strict";
-    import_pluginutils = require("@rollup/pluginutils");
-    init_filter();
-    getDocgen = async (config) => {
-      const docGen = await import("react-docgen-typescript");
-      const {
-        tsconfigPath,
-        compilerOptions,
-        propFilter = defaultPropFilter,
-        setDisplayName: setDisplayName2,
-        typePropName,
-        ...rest
-      } = config;
-      const docgenOptions = {
-        propFilter,
-        ...rest
-      };
-      return docGen.withCompilerOptions(
-        // Compiler Options are passed in to the custom program.
-        {},
-        docgenOptions
-      );
-    };
-    startWatch = async (config, onProgramCreatedOrUpdated) => {
-      const { default: ts3 } = await import("typescript");
-      const { getTSConfigFile: getTSConfigFile2 } = await Promise.resolve().then(() => (init_typescript(), typescript_exports));
-      let compilerOptions = {
-        jsx: ts3.JsxEmit.React,
-        module: ts3.ModuleKind.CommonJS,
-        target: ts3.ScriptTarget.Latest
-      };
-      const tsconfigPath = config.tsconfigPath ?? "./tsconfig.json";
-      if (config.compilerOptions) {
-        compilerOptions = {
-          ...compilerOptions,
-          ...config.compilerOptions
-        };
-      } else {
-        const { options: tsOptions } = getTSConfigFile2(tsconfigPath);
-        compilerOptions = { ...compilerOptions, ...tsOptions };
-      }
-      const host = ts3.createWatchCompilerHost(
-        tsconfigPath,
-        compilerOptions,
-        ts3.sys,
-        ts3.createSemanticDiagnosticsBuilderProgram,
-        void 0,
-        () => {
-        }
-      );
-      host.afterProgramCreate = (program) => {
-        onProgramCreatedOrUpdated(program.getProgram());
-      };
-      return new Promise((resolve) => {
-        const watch = ts3.createWatchProgram(host);
-        resolve([watch.getProgram().getProgram(), watch.close]);
-      });
-    };
-    react_docgen_typescript_default = (config = {}) => {
-      let tsProgram;
-      let docGenParser;
-      let generateDocgenCodeBlock2;
-      let generateOptions;
-      let filter;
-      const moduleInvalidationQueue = /* @__PURE__ */ new Map();
-      let closeWatch;
-      return {
-        name: "rsbuild-plugin-react-docgen-typescript",
-        setup(api) {
-          api.modifyRsbuildConfig(async () => {
-            const { getGenerateOptions: getGenerateOptions2 } = await Promise.resolve().then(() => (init_options(), options_exports));
-            generateDocgenCodeBlock2 = (await Promise.resolve().then(() => (init_generate(), generate_exports))).generateDocgenCodeBlock;
-            docGenParser = await getDocgen(config);
-            generateOptions = getGenerateOptions2(config);
-            [tsProgram, closeWatch] = await startWatch(config, (program) => {
-              tsProgram = program;
-              for (const [
-                filepath,
-                invalidateModule
-              ] of moduleInvalidationQueue.entries()) {
-                invalidateModule();
-                moduleInvalidationQueue.delete(filepath);
-              }
-            });
-            filter = (0, import_pluginutils.createFilter)(
-              config.include ?? ["**/**.tsx"],
-              config.exclude ?? ["**/**.stories.tsx"]
-            );
-          });
-          api.transform(
-            {
-              test: (id) => {
-                return filter(id);
-              }
-            },
-            async ({ code: src, resource: id }) => {
-              try {
-                const componentDocs = docGenParser.parseWithProgramProvider(
-                  id,
-                  () => tsProgram
-                );
-                if (!componentDocs.length) {
-                  return { code: src };
-                }
-                const res = generateDocgenCodeBlock2({
-                  filename: id,
-                  source: src,
-                  componentDocs,
-                  ...generateOptions
-                });
-                return res;
-              } catch (e) {
-                return src;
-              }
-            }
-          );
-          api.onCloseBuild(() => {
-            closeWatch();
-          });
-        }
-      };
-    };
-  }
-});
+// ------------------------------------------------------------
+// end of CJS compatibility banner, injected by Storybook's esbuild configuration
+// ------------------------------------------------------------
+import {
+  __require
+} from "./_node-chunks/chunk-XTOIKKJD.js";
 
 // src/preset.ts
-var preset_exports = {};
-__export(preset_exports, {
-  core: () => core,
-  rsbuildFinal: () => rsbuildFinal
-});
-module.exports = __toCommonJS(preset_exports);
-var import_node_path2 = require("path");
+import { dirname, join } from "node:path";
 
 // src/react-docs.ts
-var import_core = require("@rsbuild/core");
+import { mergeRsbuildConfig } from "@rsbuild/core";
 
 // src/requirer.ts
 function requirer(resolver, path) {
@@ -414,14 +26,11 @@ function requirer(resolver, path) {
 
 // src/react-docs.ts
 var rsbuildFinalDocs = async (config, options) => {
-  const typescriptOptions = await options.presets.apply("typescript", {});
-  const debug = options.loglevel === "debug";
-  const { reactDocgen, reactDocgenTypescriptOptions } = typescriptOptions || {};
-  if (typeof reactDocgen !== "string") {
+  let typescriptOptions = await options.presets.apply("typescript", {}), debug = options.loglevel === "debug", { reactDocgen, reactDocgenTypescriptOptions } = typescriptOptions || {};
+  if (typeof reactDocgen != "string")
     return config;
-  }
-  if (reactDocgen !== "react-docgen-typescript") {
-    return (0, import_core.mergeRsbuildConfig)(config, {
+  if (reactDocgen !== "react-docgen-typescript")
+    return mergeRsbuildConfig(config, {
       tools: {
         rspack: {
           module: {
@@ -430,7 +39,7 @@ var rsbuildFinalDocs = async (config, options) => {
                 test: /\.(cjs|mjs|tsx?|jsx?)$/,
                 enforce: "pre",
                 loader: requirer(
-                  require.resolve,
+                  __require.resolve,
                   "storybook-react-rsbuild/loaders/react-docgen-loader"
                 ),
                 options: {
@@ -443,47 +52,37 @@ var rsbuildFinalDocs = async (config, options) => {
         }
       }
     });
-  }
   let typescriptPresent;
   try {
-    require.resolve("typescript");
-    typescriptPresent = true;
-  } catch (e) {
-    typescriptPresent = false;
-  }
-  if (reactDocgen === "react-docgen-typescript" && typescriptPresent) {
+    __require.resolve("typescript"), typescriptPresent = !0;
+  } catch {
+    typescriptPresent = !1;
   }
-  const reactDocGenTsPlugin = await Promise.resolve().then(() => (init_react_docgen_typescript(), react_docgen_typescript_exports));
-  return (0, import_core.mergeRsbuildConfig)(config, {
+  let reactDocGenTsPlugin = await import("./_node-chunks/react-docgen-typescript-OXGUSE5K.js");
+  return mergeRsbuildConfig(config, {
     plugins: [
       await reactDocGenTsPlugin.default({
         ...reactDocgenTypescriptOptions,
         // We *need* this set so that RDT returns default values in the same format as react-docgen
-        savePropValueAsString: true
+        savePropValueAsString: !0
       })
     ]
   });
 };
 
 // src/preset.ts
-var getAbsolutePath = (input) => (0, import_node_path2.dirname)(require.resolve((0, import_node_path2.join)(input, "package.json")));
-var rsbuildFinal = async (config, options) => {
-  const finalConfig = rsbuildFinalDocs(config, options);
-  return finalConfig;
-};
-var core = async (config, options) => {
-  const framework = await options.presets.apply("framework");
+var getAbsolutePath = (input) => dirname(__require.resolve(join(input, "package.json"))), rsbuildFinal = async (config, options) => rsbuildFinalDocs(config, options), core = async (config, options) => {
+  let framework = await options.presets.apply("framework");
   return {
     ...config,
     builder: {
       name: getAbsolutePath("storybook-builder-rsbuild"),
-      options: typeof framework === "string" ? {} : framework.options.builder || {}
+      options: typeof framework == "string" ? {} : framework.options.builder || {}
     },
     renderer: getAbsolutePath("@storybook/react")
   };
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   core,
   rsbuildFinal
-});
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-react-rsbuild",
-  "version": "2.1.6",
+  "version": "3.0.0-beta.2",
   "description": "Storybook for React and Rsbuild: Develop React components in isolation with Hot Reloading.",
   "keywords": [
     "storybook",
@@ -18,34 +18,24 @@
     "directory": "packages/framework-react"
   },
   "license": "MIT",
+  "type": "module",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "node": "./dist/index.js",
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
-    },
-    "./preset": {
-      "types": "./dist/preset.d.ts",
-      "require": "./dist/preset.js"
-    },
-    "./react-docs": {
-      "types": "./dist/react-docs.d.ts",
-      "require": "./dist/react-docs.js"
+      "default": "./dist/index.js"
     },
     "./loaders/react-docgen-loader": {
       "types": "./dist/loaders/react-docgen-loader.d.ts",
-      "require": "./dist/loaders/react-docgen-loader.js"
+      "default": "./dist/loaders/react-docgen-loader.js"
     },
     "./node": {
       "types": "./dist/node/index.d.ts",
-      "node": "./dist/node/index.js",
-      "import": "./dist/node/index.mjs",
-      "require": "./dist/node/index.js"
+      "default": "./dist/node/index.js"
     },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./preset": "./dist/preset.js"
   },
-  "main": "dist/index.js",
+  "main": "dist/index.mjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "files": [
@@ -57,31 +47,31 @@
   ],
   "dependencies": {
     "@rollup/pluginutils": "^5.3.0",
-    "@storybook/react": "^9.1.15 || ^10.0.0",
+    "@storybook/react": "^10.0.0",
     "@storybook/react-docgen-typescript-plugin": "^1.0.1",
     "find-up": "^5.0.0",
     "magic-string": "^0.30.21",
-    "react-docgen": "^7.1.1",
+    "react-docgen": "^8.0.2",
     "react-docgen-typescript": "^2.4.0",
     "resolve": "^1.22.11",
     "tsconfig-paths": "^4.2.0",
-    "storybook-builder-rsbuild": "2.1.6"
+    "storybook-builder-rsbuild": "3.0.0-beta.2"
   },
   "devDependencies": {
     "@rsbuild/core": "^1.5.17",
-    "@types/node": "^18.19.110",
+    "@types/node": "^22.0.0",
     "@types/react": "^18.3.26",
     "@types/resolve": "^1.20.6",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "storybook": "9.1.10",
+    "storybook": "10.0.7",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
     "@rsbuild/core": "^1.5.0",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
-    "storybook": "^9.0.0 || ^10.0.0",
+    "storybook": "^10.0.0",
     "typescript": ">= 4.2.x"
   },
   "peerDependenciesMeta": {
@@ -105,8 +95,8 @@
     "platform": "node"
   },
   "scripts": {
-    "build": "pnpm run prep --optimized",
-    "check": "jiti ../../scripts/prepare/check.ts",
-    "prep": "jiti ../../scripts/prepare/bundle.ts"
+    "build": "pnpm run prep",
+    "check": "jiti ../../scripts/check/check-package.ts",
+    "prep": "jiti ../../scripts/build/build-package.ts"
   }
 }

package/preset.js

@@ -1 +1 @@
-module.exports = require('./dist/preset')
+export * from './dist/preset.js'

package/dist/index.mjs

@@ -1,2 +0,0 @@
-export * from '@storybook/react';
-export { __definePreview as definePreview } from '@storybook/react';