@modern-js/storybook-builder 2.54.6 → 2.56.0

package/dist/cjs/core.js

@@ -27,6 +27,7 @@ var import_core2 = require("@modern-js/core");
 var import_utils = require("./utils");
 var import_plugin_storybook = require("./plugin-storybook");
 async function createBuilder(cwd, builderOptions, options) {
+  var _uniBuilderConfig;
   const { bundler } = builderOptions;
   const { presets } = options;
   const entries = await presets.apply("entries", []);
@@ -34,16 +35,17 @@ async function createBuilder(cwd, builderOptions, options) {
   const loadedConfig = res ? res.config : {};
   const finalConfig = await presets.apply("modern", loadedConfig) || loadedConfig;
   const uniBuilderConfig = builderOptions.builderConfig ? (0, import_core.mergeRsbuildConfig)(finalConfig, builderOptions.builderConfig) : finalConfig || {};
+  var _source;
+  (_source = (_uniBuilderConfig = uniBuilderConfig).source) !== null && _source !== void 0 ? _source : _uniBuilderConfig.source = {};
+  uniBuilderConfig.source.entry = {
+    main: entries
+  };
   const bundlerType = bundler || "webpack";
   const builder = await (0, import_uni_builder.createUniBuilder)({
     bundlerType,
     cwd,
-    target: "web",
     frameworkConfigPath: (res === null || res === void 0 ? void 0 : res.path) ? res.path : void 0,
-    config: bundlerType === "webpack" ? await (0, import_plugin_storybook.addonBabelAdapter)(uniBuilderConfig, options) : uniBuilderConfig,
-    entry: {
-      main: entries
-    }
+    config: bundlerType === "webpack" ? await (0, import_plugin_storybook.addonBabelAdapter)(uniBuilderConfig, options) : uniBuilderConfig
   });
   builder.addPlugins([
     (0, import_plugin_storybook.pluginStorybook)(cwd, options),

package/dist/cjs/docgen/index.js

@@ -33,8 +33,7 @@ __export(docgen_exports, {
 });
 module.exports = __toCommonJS(docgen_exports);
 var import_utils = require("@modern-js/utils");
-var import_shared = require("@rsbuild/shared");
-async function applyDocgenWebpack(chain, options) {
+async function applyDocgenWebpack(chain, CHAIN_ID, options) {
   const typescriptOptions = await options.presets.apply("typescript", {});
   const { reactDocgen, reactDocgenTypescriptOptions } = typescriptOptions || {};
   if (typeof reactDocgen !== "string") {
@@ -51,14 +50,14 @@ async function applyDocgenWebpack(chain, options) {
   } else if (reactDocgen === "react-docgen") {
     const loader = require.resolve("./loader");
     const resolveOptions = chain.toConfig().resolve;
-    chain.module.rule(import_shared.CHAIN_ID.RULE.JS).use("react-docgen").loader(loader).options({
+    chain.module.rule(CHAIN_ID.RULE.JS).use("react-docgen").loader(loader).options({
       resolveOptions
-    }).after(import_shared.CHAIN_ID.USE.BABEL).after("esbuild").after(import_shared.CHAIN_ID.USE.SWC).end();
-    const tsRuls = chain.module.rule(import_shared.CHAIN_ID.RULE.TS);
+    }).after(CHAIN_ID.USE.BABEL).after("esbuild").after(CHAIN_ID.USE.SWC).end();
+    const tsRuls = chain.module.rule(CHAIN_ID.RULE.TS);
     if (tsRuls.uses.values().length !== 0) {
       tsRuls.use("react-docgen").loader(loader).options({
         resolveOptions
-      }).after(import_shared.CHAIN_ID.USE.TS).after("esbuild").after(import_shared.CHAIN_ID.USE.SWC).end();
+      }).after(CHAIN_ID.USE.TS).after("esbuild").after(CHAIN_ID.USE.SWC).end();
     }
   }
 }

package/dist/cjs/plugin-storybook.js

@@ -88,8 +88,8 @@ const pluginStorybook = (cwd, options) => {
       if (api.context.bundlerType === "webpack") {
         addonAdapter(api, options);
         api.modifyWebpackConfig(modifyConfig);
-        api.modifyWebpackChain(async (chain) => {
-          await (0, import_docgen.applyDocgenWebpack)(chain, options);
+        api.modifyWebpackChain(async (chain, { CHAIN_ID }) => {
+          await (0, import_docgen.applyDocgenWebpack)(chain, CHAIN_ID, options);
         });
       } else {
         api.modifyRspackConfig(async (config) => {

package/dist/esm/core.js

@@ -4,6 +4,7 @@ import { loadConfig } from "@modern-js/core";
 import { getConfigFileName, runWithErrorMsg } from "./utils";
 import { pluginStorybook, addonBabelAdapter } from "./plugin-storybook";
 async function createBuilder(cwd, builderOptions, options) {
+  var _a;
   const { bundler } = builderOptions;
   const { presets } = options;
   const entries = await presets.apply("entries", []);
@@ -17,16 +18,16 @@ async function createBuilder(cwd, builderOptions, options) {
     finalConfig,
     builderOptions.builderConfig
   ) : finalConfig || {};
+  (_a = uniBuilderConfig.source) != null ? _a : uniBuilderConfig.source = {};
+  uniBuilderConfig.source.entry = {
+    main: entries
+  };
   const bundlerType = bundler || "webpack";
   const builder = await createUniBuilder({
     bundlerType,
     cwd,
-    target: "web",
     frameworkConfigPath: (res == null ? void 0 : res.path) ? res.path : void 0,
-    config: bundlerType === "webpack" ? await addonBabelAdapter(uniBuilderConfig, options) : uniBuilderConfig,
-    entry: {
-      main: entries
-    }
+    config: bundlerType === "webpack" ? await addonBabelAdapter(uniBuilderConfig, options) : uniBuilderConfig
   });
   builder.addPlugins([
     pluginStorybook(cwd, options),

package/dist/esm/docgen/index.js

@@ -1,6 +1,5 @@
 import { logger } from "@modern-js/utils";
-import { CHAIN_ID } from "@rsbuild/shared";
-async function applyDocgenWebpack(chain, options) {
+async function applyDocgenWebpack(chain, CHAIN_ID, options) {
   const typescriptOptions = await options.presets.apply(
     "typescript",
     {}

package/dist/esm/plugin-storybook.js

@@ -14,7 +14,9 @@ import {
   loadPreviewOrConfigFile
 } from "@storybook/core-common";
 import { globalsNameReferenceMap } from "@storybook/preview/globals";
-import { mergeRsbuildConfig } from "@rsbuild/core";
+import {
+  mergeRsbuildConfig
+} from "@rsbuild/core";
 import { unplugin as csfPlugin } from "@storybook/csf-plugin";
 import { minimatch } from "minimatch";
 import {
@@ -75,8 +77,8 @@ const pluginStorybook = (cwd, options) => {
       if (api.context.bundlerType === "webpack") {
         addonAdapter(api, options);
         api.modifyWebpackConfig(modifyConfig);
-        api.modifyWebpackChain(async (chain) => {
-          await applyDocgenWebpack(chain, options);
+        api.modifyWebpackChain(async (chain, { CHAIN_ID }) => {
+          await applyDocgenWebpack(chain, CHAIN_ID, options);
         });
       } else {
         api.modifyRspackConfig(async (config) => {

package/dist/types/docgen/index.d.ts

@@ -1,8 +1,8 @@
 import type { Options } from '@storybook/types';
-import type { RspackConfig, RspackChain } from '@rsbuild/shared';
+import type { Rspack, RspackChain, ChainIdentifier } from '@rsbuild/core';
 export type DocgenOptions = {
     reactDocgen?: 'react-docgen' | 'react-docgen-typescript' | false;
     reactDocgenTypescriptOptions?: any;
 };
-export declare function applyDocgenWebpack(chain: RspackChain, options: Options): Promise<void>;
-export declare function applyDocgenRspack(config: RspackConfig, options: Options): Promise<void>;
+export declare function applyDocgenWebpack(chain: RspackChain, CHAIN_ID: ChainIdentifier, options: Options): Promise<void>;
+export declare function applyDocgenRspack(config: Rspack.Configuration, options: Options): Promise<void>;

package/dist/types/plugin-storybook.d.ts

@@ -1,5 +1,5 @@
 import type { Options } from '@storybook/types';
-import { type RsbuildPlugin } from '@rsbuild/shared';
+import { type RsbuildPlugin } from '@rsbuild/core';
 import { BuilderConfig } from './types';
 export declare function finalize(): Promise<void>;
 export declare const pluginStorybook: (cwd: string, options: Options) => RsbuildPlugin;

package/dist/types/types.d.ts

@@ -1,4 +1,4 @@
-import type { RsbuildPlugin } from '@rsbuild/shared';
+import type { RsbuildPlugin } from '@rsbuild/core';
 import type { UniBuilderConfig } from '@modern-js/uni-builder';
 export type BundlerType = 'webpack' | 'rspack';
 export type BuilderOptions = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/storybook-builder",
-  "version": "2.54.6",
+  "version": "2.56.0",
   "description": "modern.js support for storybook",
   "repository": {
     "type": "git",
@@ -51,8 +51,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@rsbuild/shared": "0.7.10",
-    "@rsbuild/core": "0.7.10",
+    "@rsbuild/core": "1.0.1-beta.3",
     "@storybook/components": "~7.6.12",
     "@storybook/core-common": "~7.6.12",
     "@storybook/csf-plugin": "~7.6.12",
@@ -71,18 +70,18 @@
     "remark-slug": "^7.0.1",
     "serve-static": "^1.14.1",
     "tinypool": "^0.8.0",
-    "@modern-js/core": "2.54.6",
-    "@modern-js/runtime": "2.54.6",
-    "@modern-js/uni-builder": "2.54.6",
-    "@modern-js/utils": "2.54.6"
+    "@modern-js/uni-builder": "2.56.0",
+    "@modern-js/core": "2.56.0",
+    "@modern-js/runtime": "2.56.0",
+    "@modern-js/utils": "2.56.0"
   },
   "devDependencies": {
     "@storybook/types": "~7.6.12",
-    "@types/babel__core": "^7.20.1",
+    "@types/babel__core": "^7.20.5",
     "@types/serve-static": "^1.13.10",
     "typescript": "^5.2.2",
-    "@scripts/build": "2.54.6",
-    "@modern-js/core": "2.54.6"
+    "@modern-js/core": "2.56.0",
+    "@scripts/build": "2.56.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",