storybook-react-rsbuild 0.0.2 → 0.0.4

package/dist/{index-8cba017d.d.ts → index-0d1103e1.d.ts}

@@ -1,4 +1,4 @@
-import { BuilderOptions as BuilderOptions$1, StorybookConfigRsbuild } from 'storybook-builder-rsbuild';
+import { BuilderOptions as BuilderOptions$1, StorybookConfigRsbuild, TypescriptOptions as TypescriptOptions$1 } from 'storybook-builder-rsbuild';
 import { FileSystemCache } from 'file-system-cache';
 import { Server } from 'http';
 import { PluginOptions } from '@storybook/react-docgen-typescript-plugin';
@@ -801,8 +801,6 @@ type BaseIndexInput = {
     metaId?: MetaId;
     /** Tags for filtering entries in Storybook and its tools. */
     tags?: Tag$1[];
-    /** Tags from the meta for filtering entries in Storybook and its tools. */
-    metaTags?: Tag$1[];
     /**
      * The id of the entry, auto-generated from {@link title}/{@link metaId} and {@link exportName} if unspecified.
      * If specified, the story in the CSF file _must_ have a matching id set at `parameters.__id`, to be correctly matched.
@@ -871,7 +869,7 @@ interface DirectoryMapping {
     to: string;
 }
 interface Presets {
-    apply(extension: 'typescript', config: TypescriptOptions$1, args?: Options): Promise<TypescriptOptions$1>;
+    apply(extension: 'typescript', config: TypescriptOptions, args?: Options): Promise<TypescriptOptions>;
     apply(extension: 'framework', config?: {}, args?: any): Promise<Preset>;
     apply(extension: 'babel', config?: {}, args?: any): Promise<any>;
     apply(extension: 'swc', config?: {}, args?: any): Promise<any>;
@@ -958,7 +956,7 @@ type Options = LoadOptions & StorybookConfigOptions & CLIOptions & BuilderOption
 /**
  * Options for TypeScript usage within Storybook.
  */
-interface TypescriptOptions$1 {
+interface TypescriptOptions {
     /**
      * Enables type checking within Storybook.
      *
@@ -997,6 +995,8 @@ type DocsOptions = {
      * Should we generate a docs entry per CSF file?
      * Set to 'tag' (the default) to generate an entry for every CSF file with the
      * 'autodocs' tag.
+     *
+     * @deprecated Use `tags: ['autodocs']` in `.storybook/preview.js` instead
      */
     autodocs?: boolean | 'tag';
     /**
@@ -1084,7 +1084,7 @@ interface StorybookConfigRaw {
     build?: TestBuildConfig;
     stories: StoriesEntry[];
     framework?: Preset;
-    typescript?: Partial<TypescriptOptions$1>;
+    typescript?: Partial<TypescriptOptions>;
     refs?: CoreCommon_StorybookRefs;
     babel?: any;
     swc?: any;
@@ -1212,19 +1212,7 @@ type FrameworkOptions = {
      */
     legacyRootApi?: boolean;
 };
-type StorybookConfigFramework = {
-    framework: FrameworkName | {
-        name: FrameworkName;
-        options: FrameworkOptions;
-    };
-    core?: StorybookConfig$1['core'] & {
-        builder?: BuilderName | {
-            name: BuilderName;
-            options: BuilderOptions$1;
-        };
-    };
-};
-type TypescriptOptions = StorybookConfig$1['typescript'] & {
+type TypescriptOptionsReact = {
     /**
      * Sets the type of Docgen when working with React and TypeScript
      *
@@ -1239,11 +1227,22 @@ type TypescriptOptions = StorybookConfig$1['typescript'] & {
      */
     reactDocgenTypescriptOptions: PluginOptions;
 };
+type StorybookConfigFramework = {
+    framework: FrameworkName | {
+        name: FrameworkName;
+        options: FrameworkOptions;
+    };
+    core?: StorybookConfig$1['core'] & {
+        builder?: BuilderName | {
+            name: BuilderName;
+            options: BuilderOptions$1;
+        };
+    };
+    typescript?: Partial<TypescriptOptions & TypescriptOptions$1 & TypescriptOptionsReact>;
+};
 /**
  * The interface for Storybook configuration in `main.ts` files.
  */
-type StorybookConfig = Omit<StorybookConfig$1, keyof StorybookConfigRsbuild | keyof StorybookConfigFramework> & StorybookConfigRsbuild & StorybookConfigFramework & {
-    typescript?: Partial<TypescriptOptions>;
-};
+type StorybookConfig = Omit<StorybookConfig$1, keyof StorybookConfigRsbuild | keyof StorybookConfigFramework> & StorybookConfigRsbuild & StorybookConfigFramework;
 
 export { FrameworkOptions as F, PresetProperty as P, StorybookConfig as S };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { F as FrameworkOptions, S as StorybookConfig } from './index-8cba017d.js';
+export { F as FrameworkOptions, S as StorybookConfig } from './index-0d1103e1.js';
 import 'storybook-builder-rsbuild';
 import 'file-system-cache';
 import 'http';

package/dist/loaders/react-docgen-loader.js

@@ -103,6 +103,7 @@ function defaultLookupModule(filename, basedir) {
 // src/loaders/react-docgen-loader.ts
 var { getNameOrValue, isReactForwardRefCall } = import_react_docgen.utils;
 var actualNameHandler = function actualNameHandler2(documentation, componentDefinition) {
+  documentation.set("definedInFile", componentDefinition.hub.file.opts.filename);
   if ((componentDefinition.isClassDeclaration() || componentDefinition.isFunctionDeclaration()) && componentDefinition.has("id")) {
     documentation.set(
       "actualName",
@@ -133,13 +134,22 @@ var actualNameHandler = function actualNameHandler2(documentation, componentDefi
 var defaultHandlers = Object.values(import_react_docgen.builtinHandlers).map((handler) => handler);
 var defaultResolver = new import_react_docgen.builtinResolvers.FindExportedDefinitionsResolver();
 var handlers = [...defaultHandlers, actualNameHandler];
-var tsconfigPathsInitialized = false;
+var tsconfigPathsInitializeStatus = "uninitialized";
+var resolveTsconfigPathsInitialingPromise;
+var tsconfigPathsInitialingPromise = new Promise((resolve2) => {
+  resolveTsconfigPathsInitialingPromise = resolve2;
+});
+var finishInitialization = () => {
+  resolveTsconfigPathsInitialingPromise();
+  tsconfigPathsInitializeStatus = "initialized";
+};
 var matchPath;
 async function reactDocgenLoader(source) {
   const callback = this.async();
   const options = this.getOptions() || {};
   const { debug = false } = options;
-  if (!tsconfigPathsInitialized) {
+  if (tsconfigPathsInitializeStatus === "uninitialized") {
+    tsconfigPathsInitializeStatus = "initializing";
     const tsconfigPath = await (0, import_find_up.default)("tsconfig.json", { cwd: process.cwd() });
     const tsconfig = TsconfigPaths.loadConfig(tsconfigPath);
     if (tsconfig.resultType === "success") {
@@ -150,7 +160,10 @@ async function reactDocgenLoader(source) {
         ["browser", "module", "main"]
       );
     }
-    tsconfigPathsInitialized = true;
+    finishInitialization();
+  }
+  if (tsconfigPathsInitializeStatus === "initializing") {
+    await tsconfigPathsInitialingPromise;
   }
   try {
     const docgenResults = (0, import_react_docgen.parse)(source, {
@@ -165,8 +178,8 @@ async function reactDocgenLoader(source) {
     });
     const magicString = new import_magic_string.default(source);
     docgenResults.forEach((info) => {
-      const { actualName, ...docgenInfo } = info;
-      if (actualName) {
+      const { actualName, definedInFile, ...docgenInfo } = info;
+      if (actualName && definedInFile === this.resourcePath) {
         const docNode = JSON.stringify(docgenInfo);
         magicString.append(`;${actualName}.__docgenInfo=${docNode}`);
       }

package/dist/loaders/react-docgen-loader.mjs

@@ -67,6 +67,7 @@ function defaultLookupModule(filename, basedir) {
 // src/loaders/react-docgen-loader.ts
 var { getNameOrValue, isReactForwardRefCall } = utils;
 var actualNameHandler = function actualNameHandler2(documentation, componentDefinition) {
+  documentation.set("definedInFile", componentDefinition.hub.file.opts.filename);
   if ((componentDefinition.isClassDeclaration() || componentDefinition.isFunctionDeclaration()) && componentDefinition.has("id")) {
     documentation.set(
       "actualName",
@@ -97,13 +98,22 @@ var actualNameHandler = function actualNameHandler2(documentation, componentDefi
 var defaultHandlers = Object.values(builtinHandlers).map((handler) => handler);
 var defaultResolver = new builtinResolvers.FindExportedDefinitionsResolver();
 var handlers = [...defaultHandlers, actualNameHandler];
-var tsconfigPathsInitialized = false;
+var tsconfigPathsInitializeStatus = "uninitialized";
+var resolveTsconfigPathsInitialingPromise;
+var tsconfigPathsInitialingPromise = new Promise((resolve2) => {
+  resolveTsconfigPathsInitialingPromise = resolve2;
+});
+var finishInitialization = () => {
+  resolveTsconfigPathsInitialingPromise();
+  tsconfigPathsInitializeStatus = "initialized";
+};
 var matchPath;
 async function reactDocgenLoader(source) {
   const callback = this.async();
   const options = this.getOptions() || {};
   const { debug = false } = options;
-  if (!tsconfigPathsInitialized) {
+  if (tsconfigPathsInitializeStatus === "uninitialized") {
+    tsconfigPathsInitializeStatus = "initializing";
     const tsconfigPath = await findUp("tsconfig.json", { cwd: process.cwd() });
     const tsconfig = TsconfigPaths.loadConfig(tsconfigPath);
     if (tsconfig.resultType === "success") {
@@ -114,7 +124,10 @@ async function reactDocgenLoader(source) {
         ["browser", "module", "main"]
       );
     }
-    tsconfigPathsInitialized = true;
+    finishInitialization();
+  }
+  if (tsconfigPathsInitializeStatus === "initializing") {
+    await tsconfigPathsInitialingPromise;
   }
   try {
     const docgenResults = parse(source, {
@@ -129,8 +142,8 @@ async function reactDocgenLoader(source) {
     });
     const magicString = new MagicString(source);
     docgenResults.forEach((info) => {
-      const { actualName, ...docgenInfo } = info;
-      if (actualName) {
+      const { actualName, definedInFile, ...docgenInfo } = info;
+      if (actualName && definedInFile === this.resourcePath) {
         const docNode = JSON.stringify(docgenInfo);
         magicString.append(`;${actualName}.__docgenInfo=${docNode}`);
       }

package/dist/preset.d.ts

@@ -1,4 +1,4 @@
-import { S as StorybookConfig, P as PresetProperty } from './index-8cba017d.js';
+import { S as StorybookConfig, P as PresetProperty } from './index-0d1103e1.js';
 import 'storybook-builder-rsbuild';
 import 'file-system-cache';
 import 'http';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-react-rsbuild",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Storybook for React and Rsbuild: Develop React components in isolation with Hot Reloading.",
   "keywords": [
     "storybook",
@@ -8,7 +8,6 @@
     "rspack",
     "react"
   ],
-  "license": "MIT",
   "bugs": {
     "url": "https://github.com/rspack-contrib/storybook-rsbuild/issues"
   },
@@ -17,6 +16,7 @@
     "url": "https://github.com/rspack-contrib/storybook-rsbuild",
     "directory": "packages/builder-react"
   },
+  "license": "MIT",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -50,17 +50,22 @@
   ],
   "dependencies": {
     "@rsbuild/core": "0.6.15",
-    "@storybook/docs-tools": "8.0.10",
-    "@storybook/node-logger": "8.0.10",
-    "@storybook/react": "8.0.10",
-    "@storybook/react-docgen-typescript-plugin": "1.0.1",
+    "@storybook/docs-tools": "^8.0.10",
+    "@storybook/node-logger": "^8.0.10",
+    "@storybook/react": "^8.0.10",
+    "@storybook/react-docgen-typescript-plugin": "^1.0.1",
     "@types/node": "^18.0.0",
     "find-up": "^5.0.0",
     "magic-string": "^0.30.10",
     "react-docgen": "^7.0.3",
     "resolve": "^1.22.8",
     "tsconfig-paths": "^4.2.0",
-    "storybook-builder-rsbuild": "0.0.2"
+    "storybook-builder-rsbuild": "0.0.4"
+  },
+  "devDependencies": {
+    "@storybook/types": "^8.0.10",
+    "add": "^2.0.6",
+    "typescript": "^5.3.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
@@ -86,11 +91,6 @@
     ],
     "platform": "node"
   },
-  "devDependencies": {
-    "@storybook/types": "8.0.10",
-    "add": "^2.0.6",
-    "typescript": "^5.3.2"
-  },
   "scripts": {
     "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"