storybook-builder-rsbuild 0.0.5 → 0.0.6

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as rsbuildReal from '@rsbuild/core';
 import { RsbuildConfig } from '@rsbuild/core';
-import { TypescriptOptions as TypescriptOptions$1, Builder, Options, NormalizedStoriesSpecifier } from '@storybook/types';
+import { TypescriptOptions as TypescriptOptions$1, Builder, Options, BuilderResult as BuilderResult$1, NormalizedStoriesSpecifier } from '@storybook/types';
 import { PluginTypeCheckerOptions } from '@rsbuild/plugin-type-check';
 
 type RsbuildStats = {
@@ -26,6 +26,9 @@ type BuilderOptions = {
      */
     rsbuildConfigPath?: string;
 };
+interface BuilderResult extends BuilderResult$1 {
+    stats?: Stats;
+}
 
 type RsbuildBuilderOptions = Options & {
     typescriptOptions: TypescriptOptions;
@@ -42,6 +45,10 @@ 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: {
@@ -51,8 +58,8 @@ declare const rsbuild: (_: unknown, options: RsbuildBuilderOptions) => Promise<r
 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

@@ -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
       },
@@ -567,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({
@@ -582,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)
   };
 };
@@ -602,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);
@@ -611,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';
@@ -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
       },
@@ -508,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({
@@ -523,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)
   };
 };
@@ -543,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);
@@ -552,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-builder-rsbuild",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Rsbuild builder for Storybook",
   "keywords": [
     "storybook",
@@ -56,7 +56,7 @@
     "!src/**/*"
   ],
   "dependencies": {
-    "@rsbuild/plugin-type-check": "0.6.15",
+    "@rsbuild/plugin-type-check": "0.7.9",
     "@storybook/addon-docs": "^8.0.10",
     "@storybook/channels": "^8.0.10",
     "@storybook/client-logger": "^8.0.10",
@@ -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": {