storybook-builder-rsbuild 0.0.6-beta.2 → 0.0.6-beta.3

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import * as _storybook_core_webpack from '@storybook/core-webpack';
 import * as rsbuildReal from '@rsbuild/core';
 import { RsbuildConfig } from '@rsbuild/core';
 import { TypescriptOptions as TypescriptOptions$1, Builder, Options, BuilderResult as BuilderResult$1, NormalizedStoriesSpecifier } from 'storybook/internal/types';
@@ -55,7 +54,7 @@ type BuilderStartOptions = Parameters<RsbuildBuilder['start']>['0'];
 declare const executor: {
     get: (options: Options) => Promise<typeof rsbuildReal>;
 };
-declare const rsbuild: (_: unknown, options: RsbuildBuilderOptions) => Promise<_storybook_core_webpack.WebpackConfiguration>;
+declare const rsbuild: (_: unknown, options: RsbuildBuilderOptions) => Promise<rsbuildReal.RsbuildConfig>;
 declare const getConfig: RsbuildBuilder['getConfig'];
 declare function bail(): Promise<void>;
 declare const start: RsbuildBuilder['start'];

package/dist/index.js

@@ -460,6 +460,10 @@ var iframe_rsbuild_config_default = async (options) => {
         config.optimization.runtimeChunk = true;
         config.optimization.usedExports = options.build?.test?.disableTreeShaking ? false : isProd;
         config.optimization.moduleIds = "named";
+        config.module ??= {};
+        config.module.parser ??= {};
+        config.module.parser.javascript ??= {};
+        config.module.parser.javascript.exportsPresence = false;
         appendPlugins(
           [
             new rspack.ProvidePlugin({
@@ -555,7 +559,7 @@ var applyReactShims = async (config, options) => {
 
 // src/index.ts
 var import_pretty_hrtime = __toESM(require_pretty_hrtime());
-var import_core_webpack2 = require("@storybook/core-webpack");
+var import_core2 = require("@rsbuild/core");
 var printDuration = (startTime) => (0, import_pretty_hrtime.default)(process.hrtime(startTime)).replace(" ms", " milliseconds").replace(" s", " seconds").replace(" m", " minutes");
 var executor = {
   get: async (options) => {
@@ -567,13 +571,13 @@ var rsbuild = async (_, options) => {
   const { presets } = options;
   let defaultConfig = await iframe_rsbuild_config_default(options);
   const shimsConfig = await applyReactShims(defaultConfig, options);
-  defaultConfig = (0, import_core_webpack2.mergeConfigs)(defaultConfig, shimsConfig);
+  defaultConfig = (0, import_core2.mergeRsbuildConfig)(defaultConfig, shimsConfig);
   const finalDefaultConfig = await presets.apply(
     "rsbuildFinal",
     defaultConfig,
     options
   );
-  return (0, import_core_webpack2.mergeConfigs)(finalDefaultConfig, shimsConfig);
+  return (0, import_core2.mergeRsbuildConfig)(finalDefaultConfig);
 };
 var getConfig = async (options) => {
   const { presets } = options;

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { __commonJS, __toESM, __require } from './chunk-TTFRSOOU.mjs';
 import * as rsbuildReal from '@rsbuild/core';
-import { loadConfig, mergeRsbuildConfig } from '@rsbuild/core';
+import { mergeRsbuildConfig, loadConfig } from '@rsbuild/core';
 import path, { join, resolve, parse, dirname, isAbsolute } from 'path';
 import express from 'express';
 import fs2 from 'fs-extra';
@@ -10,7 +10,7 @@ import { globalsNameReferenceMap } from 'storybook/internal/preview/globals';
 import { normalizeStories, loadPreviewOrConfigFile, handlebars, readTemplate, getBuilderOptions, stringifyProcessEnvs, isPreservingSymlinks } from 'storybook/internal/common';
 import { dedent } from 'ts-dedent';
 import fs from 'fs';
-import { webpackIncludeRegexp, mergeConfigs } from '@storybook/core-webpack';
+import { webpackIncludeRegexp } from '@storybook/core-webpack';
 import { webpack } from '@storybook/addon-docs/dist/preset';
 import { pluginTypeCheck } from '@rsbuild/plugin-type-check';
 import { pluginHtmlMinifierTerser } from 'rsbuild-plugin-html-minifier-terser';
@@ -403,6 +403,10 @@ var iframe_rsbuild_config_default = async (options) => {
         config.optimization.runtimeChunk = true;
         config.optimization.usedExports = options.build?.test?.disableTreeShaking ? false : isProd;
         config.optimization.moduleIds = "named";
+        config.module ??= {};
+        config.module.parser ??= {};
+        config.module.parser.javascript ??= {};
+        config.module.parser.javascript.exportsPresence = false;
         appendPlugins(
           [
             new rspack.ProvidePlugin({
@@ -502,13 +506,13 @@ var rsbuild = async (_, options) => {
   const { presets } = options;
   let defaultConfig = await iframe_rsbuild_config_default(options);
   const shimsConfig = await applyReactShims(defaultConfig, options);
-  defaultConfig = mergeConfigs(defaultConfig, shimsConfig);
+  defaultConfig = mergeRsbuildConfig(defaultConfig, shimsConfig);
   const finalDefaultConfig = await presets.apply(
     "rsbuildFinal",
     defaultConfig,
     options
   );
-  return mergeConfigs(finalDefaultConfig, shimsConfig);
+  return mergeRsbuildConfig(finalDefaultConfig);
 };
 var getConfig = async (options) => {
   const { presets } = options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-builder-rsbuild",
-  "version": "0.0.6-beta.2",
+  "version": "0.0.6-beta.3",
   "description": "Rsbuild builder for Storybook",
   "keywords": [
     "storybook",