storybook-react-rsbuild 0.0.9 → 0.0.11

package/dist/preset.js

@@ -1,8 +1,13 @@
 "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 });
@@ -15,8 +20,225 @@ var __copyProps = (to, from, except, desc) => {
   }
   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/docgen-handlers/actualNameHandler.ts
+var import_react_docgen, getNameOrValue, isReactForwardRefCall, actualNameHandler, actualNameHandler_default;
+var init_actualNameHandler = __esm({
+  "src/plugins/docgen-handlers/actualNameHandler.ts"() {
+    "use strict";
+    import_react_docgen = require("react-docgen");
+    ({ getNameOrValue, isReactForwardRefCall } = import_react_docgen.utils);
+    actualNameHandler = function actualNameHandler2(documentation, componentDefinition) {
+      documentation.set("definedInFile", componentDefinition.hub.file.opts.filename);
+      if ((componentDefinition.isClassDeclaration() || componentDefinition.isFunctionDeclaration()) && componentDefinition.has("id")) {
+        documentation.set(
+          "actualName",
+          getNameOrValue(componentDefinition.get("id"))
+        );
+      } else if (componentDefinition.isArrowFunctionExpression() || componentDefinition.isFunctionExpression() || isReactForwardRefCall(componentDefinition)) {
+        let currentPath = componentDefinition;
+        while (currentPath.parentPath) {
+          if (currentPath.parentPath.isVariableDeclarator()) {
+            documentation.set(
+              "actualName",
+              getNameOrValue(currentPath.parentPath.get("id"))
+            );
+            return;
+          }
+          if (currentPath.parentPath.isAssignmentExpression()) {
+            const leftPath = currentPath.parentPath.get("left");
+            if (leftPath.isIdentifier() || leftPath.isLiteral()) {
+              documentation.set("actualName", getNameOrValue(leftPath));
+              return;
+            }
+          }
+          currentPath = currentPath.parentPath;
+        }
+        documentation.set("actualName", "");
+      }
+    };
+    actualNameHandler_default = actualNameHandler;
+  }
+});
+
+// src/plugins/docgen-resolver.ts
+function defaultLookupModule(filename, basedir) {
+  const resolveOptions = {
+    basedir,
+    extensions: RESOLVE_EXTENSIONS,
+    // we do not need to check core modules as we cannot import them anyway
+    includeCoreModules: false
+  };
+  try {
+    return import_resolve.default.sync(filename, resolveOptions);
+  } catch (error) {
+    const ext = (0, import_node_path.extname)(filename);
+    let newFilename;
+    switch (ext) {
+      case ".js":
+      case ".mjs":
+      case ".cjs":
+        newFilename = `${filename.slice(0, -2)}ts`;
+        break;
+      case ".jsx":
+        newFilename = `${filename.slice(0, -3)}tsx`;
+        break;
+      default:
+        throw error;
+    }
+    return import_resolve.default.sync(newFilename, {
+      ...resolveOptions,
+      // we already know that there is an extension at this point, so no need to check other extensions
+      extensions: []
+    });
+  }
+}
+var import_node_path, import_resolve, ReactDocgenResolveError, RESOLVE_EXTENSIONS;
+var init_docgen_resolver = __esm({
+  "src/plugins/docgen-resolver.ts"() {
+    "use strict";
+    import_node_path = require("path");
+    import_resolve = __toESM(require("resolve"));
+    ReactDocgenResolveError = class extends Error {
+      constructor(filename) {
+        super(`'${filename}' was ignored by react-docgen.`);
+        // the magic string that react-docgen uses to check if a module is ignored
+        this.code = "MODULE_NOT_FOUND";
+      }
+    };
+    RESOLVE_EXTENSIONS = [
+      ".js",
+      ".cts",
+      // These were originally not in the code, I added them
+      ".mts",
+      // These were originally not in the code, I added them
+      ".ctsx",
+      // These were originally not in the code, I added them
+      ".mtsx",
+      // These were originally not in the code, I added them
+      ".ts",
+      ".tsx",
+      ".mjs",
+      ".cjs",
+      ".mts",
+      ".cts",
+      ".jsx"
+    ];
+  }
+});
+
+// src/plugins/react-docgen.ts
+var react_docgen_exports = {};
+__export(react_docgen_exports, {
+  getReactDocgenImporter: () => getReactDocgenImporter,
+  reactDocgen: () => reactDocgen
+});
+async function reactDocgen({
+  include = /\.(mjs|tsx?|jsx?)$/,
+  exclude = [/node_modules\/.*/]
+} = {}) {
+  const cwd = process.cwd();
+  const filter = (0, import_pluginutils.createFilter)(include, exclude);
+  const tsconfigPath = await (0, import_find_up.default)("tsconfig.json", { cwd });
+  const tsconfig = TsconfigPaths.loadConfig(tsconfigPath);
+  let matchPath;
+  if (tsconfig.resultType === "success") {
+    import_node_logger.logger.info("Using tsconfig paths for react-docgen");
+    matchPath = TsconfigPaths.createMatchPath(
+      tsconfig.absoluteBaseUrl,
+      tsconfig.paths,
+      ["browser", "module", "main"]
+    );
+  }
+  return {
+    name: "storybook:react-docgen-plugin",
+    // enforce: 'pre',
+    setup(api) {
+      api.transform(
+        {
+          test: (id) => {
+            if (!filter(import_node_path2.default.relative(cwd, id))) {
+              return false;
+            }
+            return true;
+          }
+        },
+        async ({ code: src, resource: id }) => {
+          try {
+            const docgenResults = (0, import_react_docgen2.parse)(src, {
+              resolver: defaultResolver,
+              handlers,
+              importer: getReactDocgenImporter(matchPath),
+              filename: id
+            });
+            const s = new import_magic_string.default(src);
+            docgenResults.forEach((info) => {
+              const { actualName, definedInFile, ...docgenInfo } = info;
+              if (actualName && definedInFile == id) {
+                const docNode = JSON.stringify(docgenInfo);
+                s.append(`;${actualName}.__docgenInfo=${docNode}`);
+              }
+            });
+            return {
+              code: s.toString(),
+              map: s.generateMap({ hires: true, source: id }).toString()
+            };
+          } catch (e) {
+            if (e.code === import_react_docgen2.ERROR_CODES.MISSING_DEFINITION) {
+              return src;
+            }
+            throw e;
+          }
+        }
+      );
+    }
+  };
+}
+function getReactDocgenImporter(matchPath) {
+  return (0, import_react_docgen2.makeFsImporter)((filename, basedir) => {
+    const mappedFilenameByPaths = (() => {
+      if (matchPath) {
+        const match = matchPath(filename);
+        return match || filename;
+      } else {
+        return filename;
+      }
+    })();
+    const result = defaultLookupModule(mappedFilenameByPaths, basedir);
+    if (RESOLVE_EXTENSIONS.find((ext) => result.endsWith(ext))) {
+      return result;
+    }
+    throw new ReactDocgenResolveError(filename);
+  });
+}
+var import_node_path2, import_pluginutils, import_find_up, import_magic_string, import_react_docgen2, import_node_logger, TsconfigPaths, defaultHandlers, defaultResolver, handlers;
+var init_react_docgen = __esm({
+  "src/plugins/react-docgen.ts"() {
+    "use strict";
+    import_node_path2 = __toESM(require("path"));
+    import_pluginutils = require("@rollup/pluginutils");
+    import_find_up = __toESM(require("find-up"));
+    import_magic_string = __toESM(require("magic-string"));
+    import_react_docgen2 = require("react-docgen");
+    import_node_logger = require("storybook/internal/node-logger");
+    TsconfigPaths = __toESM(require("tsconfig-paths"));
+    init_actualNameHandler();
+    init_docgen_resolver();
+    defaultHandlers = Object.values(import_react_docgen2.builtinHandlers).map((handler) => handler);
+    defaultResolver = new import_react_docgen2.builtinResolvers.FindExportedDefinitionsResolver();
+    handlers = [...defaultHandlers, actualNameHandler_default];
+  }
+});
+
 // src/preset.ts
 var preset_exports = {};
 __export(preset_exports, {
@@ -24,15 +246,15 @@ __export(preset_exports, {
   rsbuildFinal: () => rsbuildFinal
 });
 module.exports = __toCommonJS(preset_exports);
-var import_node_path = require("path");
+var import_node_path3 = require("path");
 
 // src/react-docs.ts
 var import_core = require("@rsbuild/core");
 var import_docs_tools = require("storybook/internal/docs-tools");
 
 // src/requirer.ts
-function requirer(resolver, path) {
-  return resolver(path);
+function requirer(resolver, path2) {
+  return resolver(path2);
 }
 
 // src/react-docs.ts
@@ -41,11 +263,11 @@ var rsbuildFinalDocs = async (config, options) => {
     return config;
   const typescriptOptions = await options.presets.apply("typescript", {});
   const debug = options.loglevel === "debug";
-  const { reactDocgen } = typescriptOptions || {};
-  if (typeof reactDocgen !== "string") {
+  const { reactDocgen: reactDocgen2 } = typescriptOptions || {};
+  if (typeof reactDocgen2 !== "string") {
     return config;
   }
-  if (reactDocgen !== "react-docgen-typescript") {
+  if (reactDocgen2 !== "react-docgen-typescript") {
     return (0, import_core.mergeRsbuildConfig)(config, {
       tools: {
         rspack: {
@@ -69,13 +291,18 @@ var rsbuildFinalDocs = async (config, options) => {
       }
     });
   }
-  throw new Error(
-    "Rspack didn't support the hooks `react-docgen-typescript`' required"
-  );
+  const { reactDocgen: reactDocGenPlugin } = await Promise.resolve().then(() => (init_react_docgen(), react_docgen_exports));
+  return (0, import_core.mergeRsbuildConfig)(config, {
+    plugins: [
+      await reactDocGenPlugin({
+        include: reactDocgen2 === "react-docgen-typescript" ? /\.(mjs|tsx?|jsx?)$/ : /\.(mjs|jsx?)$/
+      })
+    ]
+  });
 };
 
 // src/preset.ts
-var getAbsolutePath = (input) => (0, import_node_path.dirname)(require.resolve((0, import_node_path.join)(input, "package.json")));
+var getAbsolutePath = (input) => (0, import_node_path3.dirname)(require.resolve((0, import_node_path3.join)(input, "package.json")));
 var rsbuildFinal = async (config, options) => {
   const finalConfig = rsbuildFinalDocs(config, options);
   return finalConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-react-rsbuild",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "Storybook for React and Rsbuild: Develop React components in isolation with Hot Reloading.",
   "keywords": [
     "storybook",
@@ -49,6 +49,7 @@
     "!src/**/*"
   ],
   "dependencies": {
+    "@rollup/pluginutils": "^5.1.0",
     "@storybook/react": "^8.2.1",
     "@storybook/react-docgen-typescript-plugin": "^1.0.1",
     "@types/node": "^18.0.0",
@@ -57,10 +58,10 @@
     "react-docgen": "^7.0.3",
     "resolve": "^1.22.8",
     "tsconfig-paths": "^4.2.0",
-    "storybook-builder-rsbuild": "0.0.9"
+    "storybook-builder-rsbuild": "0.0.11"
   },
   "devDependencies": {
-    "@rsbuild/core": "1.0.1-beta.0",
+    "@rsbuild/core": "1.0.1-beta.10",
     "@storybook/types": "^8.2.1",
     "@types/resolve": "^1.20.6",
     "add": "^2.0.6",
@@ -68,7 +69,7 @@
     "typescript": "^5.3.2"
   },
   "peerDependencies": {
-    "@rsbuild/core": ">= 1.0.0-alpha.9",
+    "@rsbuild/core": ">= 1.0.0-alpha.9 || >= 1.0.1-beta || 1.x",
     "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": "^8.2.1",