storybook-addon-modernjs 3.4.2 → 3.6.0

package/README.md

@@ -7,4 +7,3 @@ Check out [rstackjs/storybook-rsbuild](https://github.com/rstackjs/storybook-rsb
 ## 🤖 Agent Skills
 
 Using an AI coding agent? Install the agent skills for guided setup: `npx skills add rstackjs/agent-skills --skill storybook-rsbuild`
-

package/dist/index.d.ts

@@ -1,9 +1,9 @@
-interface AddonOptions {
-    /**
-     *  `path` of Modern.js config file
-     * @default "modern.config.ts"
-     */
-    configPath?: string;
-}
-
-export type { AddonOptions };
+export declare interface AddonOptions {
+    /**
+     *  `path` of Modern.js config file
+     * @default "modern.config.ts"
+     */
+    configPath?: string;
+}
+
+export { }

package/dist/index.js

@@ -1,11 +1 @@
-import CJS_COMPAT_NODE_URL_bc75b71e0a36bf57 from 'node:url';
-import CJS_COMPAT_NODE_PATH_bc75b71e0a36bf57 from 'node:path';
-import CJS_COMPAT_NODE_MODULE_bc75b71e0a36bf57 from "node:module";
-
-var __filename = CJS_COMPAT_NODE_URL_bc75b71e0a36bf57.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_bc75b71e0a36bf57.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_bc75b71e0a36bf57.createRequire(import.meta.url);
-
-// ------------------------------------------------------------
-// end of CJS compatibility banner, injected by Storybook's esbuild configuration
-// ------------------------------------------------------------
+import "node:module";

package/dist/preset.js

@@ -1,89 +1,72 @@
-import CJS_COMPAT_NODE_URL_bc75b71e0a36bf57 from 'node:url';
-import CJS_COMPAT_NODE_PATH_bc75b71e0a36bf57 from 'node:path';
-import CJS_COMPAT_NODE_MODULE_bc75b71e0a36bf57 from "node:module";
-
-var __filename = CJS_COMPAT_NODE_URL_bc75b71e0a36bf57.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_bc75b71e0a36bf57.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_bc75b71e0a36bf57.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');
-});
-
-// src/preset.ts
-import {
-  builderPluginAdapterBasic,
-  builderPluginAdapterHooks,
-  parseRspackConfig as parseToRsbuildConfig
-} from "@modern-js/app-tools/builder";
+import __rslib_shim_module__ from "node:module";
+const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/ (()=>import.meta.url)());
+import { builderPluginAdapterBasic, builderPluginAdapterHooks, parseRspackConfig } from "@modern-js/app-tools/builder";
 import { mergeRsbuildConfig } from "@rsbuild/core";
-import findUp from "find-up";
+import find_up from "find-up";
 import { logger } from "rslog";
-import {
-  stripInheritedConfig
-} from "storybook-builder-rsbuild";
-var MODERN_META_NAME = "modern-js", MODERN_CONFIG_FILE = "modern.config.ts", loadCreateStorybookOptions = async () => {
-  try {
-    return (await import("@modern-js/plugin/cli")).createStorybookOptions;
-  } catch {
+import { stripInheritedConfig } from "storybook-builder-rsbuild";
+const MODERN_META_NAME = 'modern-js';
+const MODERN_CONFIG_FILE = 'modern.config.ts';
+const loadCreateStorybookOptions = async ()=>{
     try {
-      return (await import("@modern-js/plugin-v2/cli")).createStorybookOptions;
-    } catch {
-      throw new Error(
-        "Cannot resolve Modern.js Storybook plugin entry. Install @modern-js/app-tools@^3 with @modern-js/plugin, or @modern-js/app-tools@^2 with @modern-js/plugin-v2, then retry."
-      );
+        return (await import("@modern-js/plugin/cli")).createStorybookOptions;
+    } catch  {
+        try {
+            return (await import("@modern-js/plugin-v2/cli")).createStorybookOptions;
+        } catch  {
+            throw new Error('Cannot resolve Modern.js Storybook plugin entry. Install @modern-js/app-tools@^3 with @modern-js/plugin, or @modern-js/app-tools@^2 with @modern-js/plugin-v2, then retry.');
+        }
     }
-  }
-}, 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) {
-    logger.error(
-      `Missing required dependency @rsbuild/core, please install @rsbuild/core@${recommandVersion}`
-    );
-    return;
-  }
-  recommandVersion !== installedVersion && logger.warn(
-    `@rsbuild/core version mismatch: expected ${recommandVersion}, got ${installedVersion}. Please install @rsbuild/core@${recommandVersion}`
-  );
-}, rsbuildFinal = async (config, options) => {
-  await checkDependency();
-  let cwd = process.cwd(), createStorybookOptions = await loadCreateStorybookOptions(), { config: resolveConfig, getAppContext } = await createStorybookOptions({
-    cwd,
-    configFile: options.configPath || MODERN_CONFIG_FILE,
-    metaName: MODERN_META_NAME
-  }), nonStandardConfig = {
-    ...resolveConfig,
-    plugins: [resolveConfig.builderPlugins]
-  }, { rsbuildConfig, rsbuildPlugins } = await parseToRsbuildConfig(
-    nonStandardConfig,
-    {
-      cwd
-    }
-  ), adapterParams = {
-    appContext: getAppContext(),
-    normalizedConfig: resolveConfig
-  };
-  return stripInheritedConfig(
-    rsbuildConfig,
-    "the loaded Modern.js config"
-  ), rsbuildConfig.plugins = [
-    ...rsbuildPlugins,
-    ...rsbuildConfig.plugins || [],
-    builderPluginAdapterBasic(adapterParams),
-    builderPluginAdapterHooks(adapterParams)
-  ], mergeRsbuildConfig(config, rsbuildConfig);
 };
-export {
-  rsbuildFinal
+const PKG_NAME = '@rsbuild/core';
+const getVersion = async (cwd)=>{
+    const pkgPath = await find_up('package.json', {
+        cwd
+    });
+    const pkg = require(pkgPath);
+    if (pkg.name === PKG_NAME) return pkg.version;
+    return pkg.dependencies[PKG_NAME] || pkg.devDependencies[PKG_NAME];
+};
+const 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'));
+    if (!projectVersion) return void logger.error(`Missing required dependency @rsbuild/core, please install @rsbuild/core@${recommandVersion}`);
+    if (recommandVersion !== installedVersion) logger.warn(`@rsbuild/core version mismatch: expected ${recommandVersion}, got ${installedVersion}. Please install @rsbuild/core@${recommandVersion}`);
+};
+const rsbuildFinal = async (config, options)=>{
+    await checkDependency();
+    const cwd = process.cwd();
+    const createStorybookOptions = await loadCreateStorybookOptions();
+    const { config: resolveConfig, getAppContext } = await createStorybookOptions({
+        cwd,
+        configFile: options.configPath || MODERN_CONFIG_FILE,
+        metaName: MODERN_META_NAME
+    });
+    const nonStandardConfig = {
+        ...resolveConfig,
+        plugins: [
+            resolveConfig.builderPlugins
+        ]
+    };
+    const { rsbuildConfig, rsbuildPlugins } = await parseRspackConfig(nonStandardConfig, {
+        cwd
+    });
+    const appContext = getAppContext();
+    const adapterParams = {
+        appContext: appContext,
+        normalizedConfig: resolveConfig
+    };
+    const { environments, ...topLevel } = rsbuildConfig;
+    const browserEnvironment = environments?.client ?? environments?.web;
+    const inherited = browserEnvironment ? mergeRsbuildConfig(topLevel, browserEnvironment) : topLevel;
+    stripInheritedConfig(inherited, 'the loaded Modern.js config');
+    inherited.plugins = [
+        ...rsbuildPlugins,
+        ...inherited.plugins || [],
+        builderPluginAdapterBasic(adapterParams),
+        builderPluginAdapterHooks(adapterParams)
+    ];
+    return mergeRsbuildConfig(config, inherited);
 };
+export { rsbuildFinal };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-addon-modernjs",
-  "version": "3.4.2",
+  "version": "3.6.0",
   "description": "Storybook addon for loading configuration of Modern.js",
   "keywords": [
     "storybook",
@@ -40,20 +40,21 @@
     "rslog": "1.3.2"
   },
   "devDependencies": {
-    "@modern-js/app-tools": "^3.8.1",
-    "@modern-js/plugin": "^3.8.1",
-    "@rsbuild/core": "^2.1.10",
+    "@microsoft/api-extractor": "^7.59.1",
+    "@modern-js/app-tools": "^3.9.2",
+    "@modern-js/plugin": "^3.9.2",
+    "@rsbuild/core": "^2.2.6",
     "@types/node": "^22.0.0",
-    "storybook": "10.5.5",
+    "storybook": "10.6.0",
     "typescript": "^5.9.3",
-    "storybook-builder-rsbuild": "3.4.2"
+    "storybook-builder-rsbuild": "3.6.0"
   },
   "peerDependencies": {
     "@modern-js/app-tools": "^2.67.9 || ^3.0.0-0",
     "@modern-js/plugin": "^3.0.0",
     "@modern-js/plugin-v2": "^2.70.4",
     "@rsbuild/core": "^1.5.0 || ^2.0.0-0",
-    "storybook-builder-rsbuild": "^3.4.2"
+    "storybook-builder-rsbuild": "^3.6.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/plugin": {
@@ -77,8 +78,7 @@
     "platform": "node"
   },
   "scripts": {
-    "build": "pnpm run prep --production",
-    "check": "jiti ../../scripts/check/check-package.ts",
-    "prep": "jiti ../../scripts/build/build-package.ts"
+    "build": "rstack lib",
+    "dev": "rstack lib --watch"
   }
 }