storybook-react-rsbuild 0.0.3 → 0.0.5

package/dist/{index-8df66448.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';
@@ -869,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>;
@@ -956,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.
      *
@@ -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-8df66448.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.d.ts

@@ -4,7 +4,7 @@ import { LoaderContext } from 'webpack';
 
 declare function reactDocgenLoader(this: LoaderContext<{
     debug: boolean;
-}>, source: string): Promise<void>;
+}>, source: string, map: any): Promise<void>;
 declare function getReactDocgenImporter(matchingPath: TsconfigPaths.MatchPath | undefined): react_docgen.Importer;
 
 export { reactDocgenLoader as default, getReactDocgenImporter };

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",
@@ -143,7 +144,7 @@ var finishInitialization = () => {
   tsconfigPathsInitializeStatus = "initialized";
 };
 var matchPath;
-async function reactDocgenLoader(source) {
+async function reactDocgenLoader(source, map) {
   const callback = this.async();
   const options = this.getOptions() || {};
   const { debug = false } = options;
@@ -177,17 +178,21 @@ 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}`);
       }
     });
-    const map = magicString.generateMap({
-      includeContent: true,
-      source: this.resourcePath
-    });
-    callback(null, magicString.toString(), map);
+    callback(
+      null,
+      magicString.toString(),
+      map ?? magicString.generateMap({
+        hires: true,
+        source: this.resourcePath,
+        includeContent: true
+      })
+    );
   } catch (error) {
     if (error.code === import_react_docgen.ERROR_CODES.MISSING_DEFINITION) {
       callback(null, source);

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",
@@ -107,7 +108,7 @@ var finishInitialization = () => {
   tsconfigPathsInitializeStatus = "initialized";
 };
 var matchPath;
-async function reactDocgenLoader(source) {
+async function reactDocgenLoader(source, map) {
   const callback = this.async();
   const options = this.getOptions() || {};
   const { debug = false } = options;
@@ -141,17 +142,21 @@ 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}`);
       }
     });
-    const map = magicString.generateMap({
-      includeContent: true,
-      source: this.resourcePath
-    });
-    callback(null, magicString.toString(), map);
+    callback(
+      null,
+      magicString.toString(),
+      map ?? magicString.generateMap({
+        hires: true,
+        source: this.resourcePath,
+        includeContent: true
+      })
+    );
   } catch (error) {
     if (error.code === ERROR_CODES.MISSING_DEFINITION) {
       callback(null, source);

package/dist/preset.d.ts

@@ -1,4 +1,4 @@
-import { S as StorybookConfig, P as PresetProperty } from './index-8df66448.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.3",
+  "version": "0.0.5",
   "description": "Storybook for React and Rsbuild: Develop React components in isolation with Hot Reloading.",
   "keywords": [
     "storybook",
@@ -60,10 +60,11 @@
     "react-docgen": "^7.0.3",
     "resolve": "^1.22.8",
     "tsconfig-paths": "^4.2.0",
-    "storybook-builder-rsbuild": "0.0.3"
+    "storybook-builder-rsbuild": "0.0.5"
   },
   "devDependencies": {
     "@storybook/types": "^8.0.10",
+    "@types/resolve": "^1.20.6",
     "add": "^2.0.6",
     "typescript": "^5.3.2"
   },