storybook-builder-rsbuild 0.0.4 → 0.0.6

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as rsbuildReal from '@rsbuild/core';
 import { RsbuildConfig } from '@rsbuild/core';
-import { TypescriptOptions as TypescriptOptions$1, Builder, Options, NormalizedStoriesSpecifier } from '@storybook/types';
-import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
+import { TypescriptOptions as TypescriptOptions$1, Builder, Options, BuilderResult as BuilderResult$1, NormalizedStoriesSpecifier } from '@storybook/types';
+import { PluginTypeCheckerOptions } from '@rsbuild/plugin-type-check';
 
 type RsbuildStats = {
     toJson: () => any;
@@ -11,9 +11,9 @@ type RsbuildStats = {
  */
 interface TypescriptOptions extends TypescriptOptions$1 {
     /**
-     * Configures `fork-ts-checker-webpack-plugin`
+     * Configures `@rsbuild/plugin-type-check`, using `fork-ts-checker-webpack-plugin` under the hood.
      */
-    checkOptions?: ConstructorParameters<typeof ForkTsCheckerWebpackPlugin>[0];
+    checkOptions?: PluginTypeCheckerOptions;
 }
 type RsbuildBuilder = Builder<RsbuildConfig, RsbuildStats>;
 type RsbuildFinal = (config: RsbuildConfig, options: Options) => RsbuildConfig | Promise<RsbuildConfig>;
@@ -26,6 +26,13 @@ type BuilderOptions = {
      */
     rsbuildConfigPath?: string;
 };
+interface BuilderResult extends BuilderResult$1 {
+    stats?: Stats;
+}
+
+type RsbuildBuilderOptions = Options & {
+    typescriptOptions: TypescriptOptions;
+};
 
 declare const getVirtualModules: (options: Options) => Promise<{
     virtualModules: Record<string, string>;
@@ -38,17 +45,21 @@ declare function toImportFn(stories: NormalizedStoriesSpecifier[], relativeOffse
 type ModuleExports = Record<string, any>;
 declare function importPipeline(): (importFn: () => Promise<ModuleExports>) => Promise<ModuleExports>;
 
+type StatsOrMultiStats = Parameters<rsbuildReal.OnAfterBuildFn>[0]['stats'];
+type Stats = NonNullable<Exclude<StatsOrMultiStats, {
+    stats: unknown[];
+}>>;
 declare const printDuration: (startTime: [number, number]) => string;
 type BuilderStartOptions = Parameters<RsbuildBuilder['start']>['0'];
 declare const executor: {
     get: (options: Options) => Promise<typeof rsbuildReal>;
 };
-declare const rsbuild: (_: unknown, options: Options) => Promise<rsbuildReal.RsbuildConfig>;
+declare const rsbuild: (_: unknown, options: RsbuildBuilderOptions) => Promise<rsbuildReal.RsbuildConfig>;
 declare const getConfig: RsbuildBuilder['getConfig'];
 declare function bail(): Promise<void>;
 declare const start: RsbuildBuilder['start'];
-declare const build: ({ options }: BuilderStartOptions) => Promise<void>;
+declare const build: ({ options, }: BuilderStartOptions) => Promise<Stats>;
 declare const corePresets: string[];
 declare const previewMainTemplate: () => string;
 
-export { BuilderOptions, RsbuildBuilder, RsbuildFinal, StorybookConfigRsbuild, TypescriptOptions, bail, build, corePresets, executor, getConfig, getVirtualModules, importPipeline, previewMainTemplate, printDuration, rsbuild, start, toImportFn, toImportFnPart };
+export { BuilderOptions, BuilderResult, RsbuildBuilder, RsbuildFinal, Stats, StorybookConfigRsbuild, TypescriptOptions, bail, build, corePresets, executor, getConfig, getVirtualModules, importPipeline, previewMainTemplate, printDuration, rsbuild, start, toImportFn, toImportFnPart };

package/dist/index.js

@@ -162,7 +162,7 @@ var getVirtualModules = async (options) => {
     configDir: options.configDir,
     workingDir
   });
-  const realPathRelativeToCwd = import_path.default.relative(workingDir, cwd);
+  const realPathRelativeToCwd = import_path.default.relative(workingDir, cwd).split(import_path.default.sep).join(import_path.default.posix.sep);
   const previewAnnotations = [
     ...(await options.presets.apply(
       "previewAnnotations",
@@ -272,7 +272,7 @@ function importPipeline() {
 // src/preview/iframe-rsbuild.config.ts
 var import_core = require("@rsbuild/core");
 var import_preset = require("@storybook/addon-docs/dist/preset");
-var import_fork_ts_checker_webpack_plugin = __toESM(require("fork-ts-checker-webpack-plugin"));
+var import_plugin_type_check = require("@rsbuild/plugin-type-check");
 var getAbsolutePath = (input) => (0, import_path3.dirname)(require.resolve((0, import_path3.join)(input, "package.json")));
 var maybeGetAbsolutePath = (input) => {
   try {
@@ -394,6 +394,9 @@ var iframe_rsbuild_config_default = async (options) => {
       progressBar: !quiet
     },
     source: {
+      // TODO: Rspack doesn't support virtual modules yet, use cache dir instead
+      // we needed to explicitly set the module in `node_modules` to be compiled
+      include: [/[\\/]node_modules[\\/].*[\\/]storybook-config-entry\.js/],
       alias: {
         ...storybookPaths
       },
@@ -414,6 +417,9 @@ var iframe_rsbuild_config_default = async (options) => {
         }
       }
     },
+    plugins: [shouldCheckTs ? (0, import_plugin_type_check.pluginTypeCheck)(tsCheckOptions) : null].filter(
+      Boolean
+    ),
     tools: {
       rspack: (config, { addRules, appendPlugins, rspack, mergeConfig }) => {
         addRules({
@@ -457,8 +463,7 @@ var iframe_rsbuild_config_default = async (options) => {
             new rspack.ProvidePlugin({
               process: require.resolve("process/browser.js")
             }),
-            new import_case_sensitive_paths_webpack_plugin.default(),
-            shouldCheckTs ? new import_fork_ts_checker_webpack_plugin.default(tsCheckOptions) : null
+            new import_case_sensitive_paths_webpack_plugin.default()
           ].filter(Boolean)
         );
         return mergeConfig(config, appliedDocsWebpack);
@@ -565,6 +570,14 @@ var start = async ({
     }
   });
   const rsbuildServer = await rsbuildBuild.createDevServer();
+  const waitFirstCompileDone = new Promise((resolve3) => {
+    rsbuildBuild.onDevCompileDone(({ stats: stats2, isFirstCompile }) => {
+      if (!isFirstCompile) {
+        return;
+      }
+      resolve3(stats2);
+    });
+  });
   server = rsbuildServer;
   if (!rsbuildBuild) {
     throw new import_server_errors.WebpackInvocationError({
@@ -580,13 +593,10 @@ var start = async ({
   );
   router.use(rsbuildServer.middlewares);
   storybookServer.on("upgrade", rsbuildServer.onHTTPUpgrade);
+  const stats = await waitFirstCompileDone;
   return {
     bail,
-    stats: {
-      toJson: () => {
-        throw new import_server_errors.NoStatsForViteDevError();
-      }
-    },
+    stats,
     totalTime: process.hrtime(startTime)
   };
 };
@@ -600,6 +610,10 @@ var build = async ({ options }) => {
   const previewResolvedDir = getAbsolutePath2("@storybook/preview");
   const previewDirOrigin = (0, import_path4.join)(previewResolvedDir, "dist");
   const previewDirTarget = (0, import_path4.join)(options.outputDir || "", `sb-preview`);
+  let stats;
+  rsbuildBuild.onAfterBuild((params) => {
+    stats = params.stats;
+  });
   const previewFiles = import_fs_extra.default.copy(previewDirOrigin, previewDirTarget, {
     filter: (src) => {
       const { ext } = (0, import_path4.parse)(src);
@@ -609,7 +623,11 @@ var build = async ({ options }) => {
       return true;
     }
   });
+  rsbuildBuild.onAfterBuild((params) => {
+    stats = params.stats;
+  });
   await Promise.all([rsbuildBuild.build(), previewFiles]);
+  return stats;
 };
 var corePresets = [(0, import_path4.join)(__dirname, "./preview-preset.js")];
 var previewMainTemplate = () => require.resolve("storybook-builder-rsbuild/templates/preview.ejs");

package/dist/index.mjs

@@ -4,7 +4,7 @@ import { loadConfig, mergeRsbuildConfig } from '@rsbuild/core';
 import path, { join, resolve, parse, dirname } from 'path';
 import express from 'express';
 import fs2 from 'fs-extra';
-import { WebpackInvocationError, NoStatsForViteDevError } from '@storybook/core-events/server-errors';
+import { WebpackInvocationError } from '@storybook/core-events/server-errors';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import { globalsNameReferenceMap } from '@storybook/preview/globals';
 import { normalizeStories, loadPreviewOrConfigFile, handlebars, readTemplate, getBuilderOptions, stringifyProcessEnvs, isPreservingSymlinks } from '@storybook/core-common';
@@ -12,7 +12,7 @@ import { dedent } from 'ts-dedent';
 import fs from 'fs';
 import { webpackIncludeRegexp } from '@storybook/core-webpack';
 import { webpack } from '@storybook/addon-docs/dist/preset';
-import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
+import { pluginTypeCheck } from '@rsbuild/plugin-type-check';
 
 // ../../node_modules/.pnpm/pretty-hrtime@1.0.3/node_modules/pretty-hrtime/index.js
 var require_pretty_hrtime = __commonJS({
@@ -104,7 +104,7 @@ var getVirtualModules = async (options) => {
     configDir: options.configDir,
     workingDir
   });
-  const realPathRelativeToCwd = path.relative(workingDir, cwd);
+  const realPathRelativeToCwd = path.relative(workingDir, cwd).split(path.sep).join(path.posix.sep);
   const previewAnnotations = [
     ...(await options.presets.apply(
       "previewAnnotations",
@@ -333,6 +333,9 @@ var iframe_rsbuild_config_default = async (options) => {
       progressBar: !quiet
     },
     source: {
+      // TODO: Rspack doesn't support virtual modules yet, use cache dir instead
+      // we needed to explicitly set the module in `node_modules` to be compiled
+      include: [/[\\/]node_modules[\\/].*[\\/]storybook-config-entry\.js/],
       alias: {
         ...storybookPaths
       },
@@ -353,6 +356,9 @@ var iframe_rsbuild_config_default = async (options) => {
         }
       }
     },
+    plugins: [shouldCheckTs ? pluginTypeCheck(tsCheckOptions) : null].filter(
+      Boolean
+    ),
     tools: {
       rspack: (config, { addRules, appendPlugins, rspack, mergeConfig }) => {
         addRules({
@@ -398,8 +404,7 @@ var iframe_rsbuild_config_default = async (options) => {
             new rspack.ProvidePlugin({
               process: __require.resolve("process/browser.js")
             }),
-            new CaseSensitivePathsPlugin(),
-            shouldCheckTs ? new ForkTsCheckerWebpackPlugin(tsCheckOptions) : null
+            new CaseSensitivePathsPlugin()
           ].filter(Boolean)
         );
         return mergeConfig(config, appliedDocsWebpack);
@@ -506,6 +511,14 @@ var start = async ({
     }
   });
   const rsbuildServer = await rsbuildBuild.createDevServer();
+  const waitFirstCompileDone = new Promise((resolve3) => {
+    rsbuildBuild.onDevCompileDone(({ stats: stats2, isFirstCompile }) => {
+      if (!isFirstCompile) {
+        return;
+      }
+      resolve3(stats2);
+    });
+  });
   server = rsbuildServer;
   if (!rsbuildBuild) {
     throw new WebpackInvocationError({
@@ -521,13 +534,10 @@ var start = async ({
   );
   router.use(rsbuildServer.middlewares);
   storybookServer.on("upgrade", rsbuildServer.onHTTPUpgrade);
+  const stats = await waitFirstCompileDone;
   return {
     bail,
-    stats: {
-      toJson: () => {
-        throw new NoStatsForViteDevError();
-      }
-    },
+    stats,
     totalTime: process.hrtime(startTime)
   };
 };
@@ -541,6 +551,10 @@ var build = async ({ options }) => {
   const previewResolvedDir = getAbsolutePath2("@storybook/preview");
   const previewDirOrigin = join(previewResolvedDir, "dist");
   const previewDirTarget = join(options.outputDir || "", `sb-preview`);
+  let stats;
+  rsbuildBuild.onAfterBuild((params) => {
+    stats = params.stats;
+  });
   const previewFiles = fs2.copy(previewDirOrigin, previewDirTarget, {
     filter: (src) => {
       const { ext } = parse(src);
@@ -550,7 +564,11 @@ var build = async ({ options }) => {
       return true;
     }
   });
+  rsbuildBuild.onAfterBuild((params) => {
+    stats = params.stats;
+  });
   await Promise.all([rsbuildBuild.build(), previewFiles]);
+  return stats;
 };
 var corePresets = [join(__dirname, "./preview-preset.js")];
 var previewMainTemplate = () => __require.resolve("storybook-builder-rsbuild/templates/preview.ejs");

package/dist/loaders/export-order-loader.js

@@ -64,8 +64,16 @@ async function loader(source, map, meta) {
         `;module.exports.__namedExportsOrder = ${JSON.stringify(namedExportsOrder)};`
       );
     }
-    const generatedMap = magicString.generateMap({ hires: true });
-    return callback(null, magicString.toString(), generatedMap, meta);
+    return callback(
+      null,
+      magicString.toString(),
+      map ?? magicString.generateMap({
+        hires: true,
+        includeContent: true,
+        source: this.resourcePath
+      }),
+      meta
+    );
   } catch (err) {
     return callback(null, source, map, meta);
   }

package/dist/loaders/export-order-loader.mjs

@@ -31,8 +31,16 @@ async function loader(source, map, meta) {
         `;module.exports.__namedExportsOrder = ${JSON.stringify(namedExportsOrder)};`
       );
     }
-    const generatedMap = magicString.generateMap({ hires: true });
-    return callback(null, magicString.toString(), generatedMap, meta);
+    return callback(
+      null,
+      magicString.toString(),
+      map ?? magicString.generateMap({
+        hires: true,
+        includeContent: true,
+        source: this.resourcePath
+      }),
+      meta
+    );
   } catch (err) {
     return callback(null, source, map, meta);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-builder-rsbuild",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "Rsbuild builder for Storybook",
   "keywords": [
     "storybook",
@@ -56,6 +56,7 @@
     "!src/**/*"
   ],
   "dependencies": {
+    "@rsbuild/plugin-type-check": "0.7.9",
     "@storybook/addon-docs": "^8.0.10",
     "@storybook/channels": "^8.0.10",
     "@storybook/client-logger": "^8.0.10",
@@ -74,7 +75,6 @@
     "css-loader": "^6.7.1",
     "es-module-lexer": "^1.5.0",
     "express": "^4.17.3",
-    "fork-ts-checker-webpack-plugin": "^8.0.0",
     "fs-extra": "^11.1.0",
     "magic-string": "^0.30.5",
     "path-browserify": "^1.0.1",
@@ -86,7 +86,7 @@
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@rsbuild/core": "0.6.15",
+    "@rsbuild/core": "0.7.9",
     "@types/express": "^4.17.21",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^18.0.0",
@@ -97,7 +97,7 @@
     "typescript": "^5.3.2"
   },
   "peerDependencies": {
-    "@rsbuild/core": ">= 0.6.15"
+    "@rsbuild/core": ">= 0.7.0"
   },
   "peerDependenciesMeta": {
     "typescript": {