storybook-addon-modernjs 2.1.6 → 3.0.0-beta.2

package/dist/index.d.ts

@@ -1,9 +1,3 @@
-interface AddonOptions {
-    /**
-     *  `path` of Modern.js config file
-     * @default "modern.config.ts"
-     */
-    configPath?: string;
-}
-
-export { AddonOptions };
+// auto generated file from file:///Users/bytedance/Projects/storybook-rsbuild/scripts/build/utils/generate-type-mappers.ts, do not edit
+export * from '../src/index.ts';
+export type * from '../src/index.ts';

package/dist/index.js

@@ -1,18 +1,11 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+import CJS_COMPAT_NODE_URL_6843cb1ad00e6c48 from 'node:url';
+import CJS_COMPAT_NODE_PATH_6843cb1ad00e6c48 from 'node:path';
+import CJS_COMPAT_NODE_MODULE_6843cb1ad00e6c48 from "node:module";
 
-// src/index.ts
-var src_exports = {};
-module.exports = __toCommonJS(src_exports);
+var __filename = CJS_COMPAT_NODE_URL_6843cb1ad00e6c48.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_6843cb1ad00e6c48.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_6843cb1ad00e6c48.createRequire(import.meta.url);
+
+// ------------------------------------------------------------
+// end of CJS compatibility banner, injected by Storybook's esbuild configuration
+// ------------------------------------------------------------

package/dist/preset.js

@@ -1,105 +1,72 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+import CJS_COMPAT_NODE_URL_6843cb1ad00e6c48 from 'node:url';
+import CJS_COMPAT_NODE_PATH_6843cb1ad00e6c48 from 'node:path';
+import CJS_COMPAT_NODE_MODULE_6843cb1ad00e6c48 from "node:module";
 
-// src/preset.ts
-var preset_exports = {};
-__export(preset_exports, {
-  rsbuildFinal: () => rsbuildFinal
+var __filename = CJS_COMPAT_NODE_URL_6843cb1ad00e6c48.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_6843cb1ad00e6c48.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_6843cb1ad00e6c48.createRequire(import.meta.url);
+
+// ------------------------------------------------------------
+// end of CJS compatibility banner, injected by Storybook's esbuild configuration
+// ------------------------------------------------------------
+var __require = /* @__PURE__ */ ((x) => typeof require < "u" ? require : typeof Proxy < "u" ? new Proxy(x, {
+  get: (a, b) => (typeof require < "u" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require < "u") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
 });
-module.exports = __toCommonJS(preset_exports);
-var import_builder = require("@modern-js/app-tools/builder");
-var import_cli = require("@modern-js/plugin-v2/cli");
-var import_core = require("@rsbuild/core");
-var import_find_up = __toESM(require("find-up"));
-var import_rslog = require("rslog");
-var MODERN_META_NAME = "modern-js";
-var MODERN_CONFIG_FILE = "modern.config.ts";
-var PKG_NAME = "@rsbuild/core";
-var getVersion = async (cwd) => {
-  const pkgPath = await (0, import_find_up.default)("package.json", { cwd });
-  const pkg = require(pkgPath);
-  if (pkg.name === PKG_NAME) {
-    return pkg.version;
-  }
-  return pkg.dependencies[PKG_NAME] || pkg.devDependencies[PKG_NAME];
-};
-var checkDependency = async () => {
-  const projectVersion = await getVersion(process.cwd());
-  const recommandVersion = await getVersion(
-    require.resolve("@modern-js/app-tools")
-  );
-  const installedVersion = await getVersion(require.resolve("@rsbuild/core"));
+
+// src/preset.ts
+import {
+  builderPluginAdapterBasic,
+  builderPluginAdapterHooks,
+  parseRspackConfig as parseToRsbuildConfig
+} from "@modern-js/app-tools/builder";
+import { createStorybookOptions } from "@modern-js/plugin-v2/cli";
+import { mergeRsbuildConfig } from "@rsbuild/core";
+import findUp from "find-up";
+import { logger } from "rslog";
+var MODERN_META_NAME = "modern-js", MODERN_CONFIG_FILE = "modern.config.ts", PKG_NAME = "@rsbuild/core", getVersion = async (cwd) => {
+  let pkgPath = await findUp("package.json", { cwd }), pkg = __require(pkgPath);
+  return pkg.name === PKG_NAME ? pkg.version : pkg.dependencies[PKG_NAME] || pkg.devDependencies[PKG_NAME];
+}, checkDependency = async () => {
+  let projectVersion = await getVersion(process.cwd()), recommandVersion = await getVersion(
+    __require.resolve("@modern-js/app-tools")
+  ), installedVersion = await getVersion(__require.resolve("@rsbuild/core"));
   if (!projectVersion) {
-    import_rslog.logger.error(
+    logger.error(
       `Missing required dependency @rsbuild/core, please install @rsbuild/core@${recommandVersion}`
     );
     return;
   }
-  if (recommandVersion !== installedVersion) {
-    import_rslog.logger.warn(
-      `@rsbuild/core version mismatch: expected ${recommandVersion}, got ${installedVersion}. Please install @rsbuild/core@${recommandVersion}`
-    );
-  }
-};
-var rsbuildFinal = async (config, options) => {
+  recommandVersion !== installedVersion && logger.warn(
+    `@rsbuild/core version mismatch: expected ${recommandVersion}, got ${installedVersion}. Please install @rsbuild/core@${recommandVersion}`
+  );
+}, rsbuildFinal = async (config, options) => {
   await checkDependency();
-  const cwd = process.cwd();
-  const { config: resolveConfig, getAppContext } = await (0, import_cli.createStorybookOptions)({
+  let cwd = process.cwd(), { config: resolveConfig, getAppContext } = await createStorybookOptions({
     cwd,
     configFile: options.configPath || MODERN_CONFIG_FILE,
     metaName: MODERN_META_NAME
-  });
-  const nonStandardConfig = {
+  }), nonStandardConfig = {
     ...resolveConfig,
     plugins: [resolveConfig.builderPlugins]
-  };
-  const { rsbuildConfig, rsbuildPlugins } = await (0, import_builder.parseRspackConfig)(
+  }, { rsbuildConfig, rsbuildPlugins } = await parseToRsbuildConfig(
     nonStandardConfig,
     {
       cwd
     }
-  );
-  const appContext = getAppContext();
-  const adapterParams = {
-    appContext,
+  ), adapterParams = {
+    appContext: getAppContext(),
     normalizedConfig: resolveConfig
   };
-  rsbuildConfig.plugins = [
+  return rsbuildConfig.plugins = [
     ...rsbuildPlugins,
     ...rsbuildConfig.plugins || [],
-    (0, import_builder.builderPluginAdapterBasic)(adapterParams),
-    (0, import_builder.builderPluginAdapterHooks)(adapterParams)
-  ];
-  const finalConfig = (0, import_core.mergeRsbuildConfig)(config, rsbuildConfig);
-  return finalConfig;
+    builderPluginAdapterBasic(adapterParams),
+    builderPluginAdapterHooks(adapterParams)
+  ], mergeRsbuildConfig(config, rsbuildConfig);
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   rsbuildFinal
-});
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-addon-modernjs",
-  "version": "2.1.6",
+  "version": "3.0.0-beta.2",
   "description": "Storybook addon for loading configuration of Modern.js",
   "keywords": [
     "storybook",
@@ -19,15 +19,14 @@
     "directory": "packages/addon-modernjs"
   },
   "license": "MIT",
+  "type": "module",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "node": "./dist/index.js",
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
+      "default": "./dist/index.js"
     },
-    "./preset": "./dist/preset.js",
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./preset": "./dist/preset.js"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -46,10 +45,10 @@
   "devDependencies": {
     "@modern-js/app-tools": "^2.68.18",
     "@rsbuild/core": "^1.5.17",
-    "@types/node": "^18.19.110",
-    "storybook": "9.1.10",
+    "@types/node": "^22.0.0",
+    "storybook": "10.0.7",
     "typescript": "^5.9.3",
-    "storybook-builder-rsbuild": "2.1.6"
+    "storybook-builder-rsbuild": "3.0.0-beta.2"
   },
   "peerDependencies": {
     "@modern-js/app-tools": "^2.67.9",
@@ -72,8 +71,8 @@
     "platform": "node"
   },
   "scripts": {
-    "build": "pnpm run prep --optimized",
-    "check": "jiti ../../scripts/prepare/check.ts",
-    "prep": "jiti ../../scripts/prepare/bundle.ts"
+    "build": "pnpm run prep",
+    "check": "jiti ../../scripts/check/check-package.ts",
+    "prep": "jiti ../../scripts/build/build-package.ts"
   }
 }

package/preset.js

@@ -1 +1 @@
-module.exports = require('./dist/preset')
+export * from './dist/preset.js'

package/dist/index.mjs

@@ -1 +0,0 @@
-

package/dist/preset.d.ts

@@ -1,8 +0,0 @@
-import { StorybookConfigRsbuild } from 'storybook-builder-rsbuild';
-
-/**
- * Storybook addon for Modern.js, only support bundler `rspack`.
- */
-declare const rsbuildFinal: StorybookConfigRsbuild['rsbuildFinal'];
-
-export { rsbuildFinal };