@modern-js/plugin 3.0.3 → 3.0.5

package/dist/cjs/cli/index.js

@@ -27,6 +27,7 @@ __webpack_require__.d(__webpack_exports__, {
     cli: ()=>index_js_namespaceObject.cli,
     mergeConfig: ()=>mergeConfig_js_namespaceObject.mergeConfig,
     createContext: ()=>external_context_js_namespaceObject.createContext,
+    createConfigOptions: ()=>create_js_namespaceObject.createConfigOptions,
     createStorybookOptions: ()=>create_js_namespaceObject.createStorybookOptions,
     createCli: ()=>index_js_namespaceObject.createCli,
     initAppContext: ()=>external_context_js_namespaceObject.initAppContext,
@@ -43,6 +44,7 @@ const create_js_namespaceObject = require("./run/create.js");
 const mergeConfig_js_namespaceObject = require("./run/utils/mergeConfig.js");
 exports.cli = __webpack_exports__.cli;
 exports.createCli = __webpack_exports__.createCli;
+exports.createConfigOptions = __webpack_exports__.createConfigOptions;
 exports.createContext = __webpack_exports__.createContext;
 exports.createLoadedConfig = __webpack_exports__.createLoadedConfig;
 exports.createStorybookOptions = __webpack_exports__.createStorybookOptions;
@@ -54,6 +56,7 @@ exports.mergeConfig = __webpack_exports__.mergeConfig;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "cli",
     "createCli",
+    "createConfigOptions",
     "createContext",
     "createLoadedConfig",
     "createStorybookOptions",

package/dist/cjs/cli/run/create.js

@@ -24,6 +24,7 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
+    createConfigOptions: ()=>createConfigOptions,
     createStorybookOptions: ()=>createStorybookOptions,
     createCli: ()=>createCli
 });
@@ -142,20 +143,21 @@ const createCli = ()=>{
         getPrevInitOptions: ()=>initOptions
     };
 };
-const createStorybookOptions = async (options)=>{
+const createConfigOptions = async (options)=>{
     const pluginManager = (0, external_manager_js_namespaceObject.createPluginManager)();
     pluginManager.clear();
-    const { configFile, cwd, metaName = 'modern-js' } = options;
+    const { configFile, cwd, metaName = 'modern-js', command } = options;
     const appDirectory = await (0, initAppDir_js_namespaceObject.initAppDir)(cwd);
-    const loaded = await (0, createLoadedConfig_js_namespaceObject.createLoadedConfig)(appDirectory, configFile);
+    const loaded = await (0, createLoadedConfig_js_namespaceObject.createLoadedConfig)(appDirectory, configFile, options.config);
+    loaded.config = options.modifyModernConfig ? await options.modifyModernConfig(loaded.config || {}) : loaded.config;
     pluginManager.addPlugins(loaded.config.plugins || []);
     const plugins = await pluginManager.getPlugins();
     const context = await (0, external_context_js_namespaceObject.createContext)({
         appContext: (0, external_context_js_namespaceObject.initAppContext)({
             packageName: loaded.packageName,
             configFile: loaded.configFile,
-            command: 'storybook',
             appDirectory,
+            command,
             plugins,
             metaName
         }),
@@ -171,15 +173,24 @@ const createStorybookOptions = async (options)=>{
     const extraConfigs = await context.hooks.config.call();
     const normalizedConfig = await (0, createResolvedConfig_js_namespaceObject.createResolveConfig)(loaded, extraConfigs);
     const resolved = await context.hooks.modifyResolvedConfig.call(normalizedConfig);
+    const finalConfig = resolved || normalizedConfig;
+    context.normalizedConfig = finalConfig;
+    await pluginAPI.updateAppContext(context);
     return {
-        config: resolved || normalizedConfig,
+        config: finalConfig,
         getAppContext: ()=>pluginAPI.getAppContext()
     };
 };
+const createStorybookOptions = (options)=>createConfigOptions({
+        ...options,
+        command: 'storybook'
+    });
 exports.createCli = __webpack_exports__.createCli;
+exports.createConfigOptions = __webpack_exports__.createConfigOptions;
 exports.createStorybookOptions = __webpack_exports__.createStorybookOptions;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createCli",
+    "createConfigOptions",
     "createStorybookOptions"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/esm/cli/index.mjs

@@ -2,6 +2,6 @@ import { initPluginAPI } from "./api.mjs";
 import { createContext, initAppContext } from "./context.mjs";
 import { initHooks } from "./hooks.mjs";
 import { cli, createCli, createLoadedConfig, initAppDir } from "./run/index.mjs";
-import { createStorybookOptions } from "./run/create.mjs";
+import { createConfigOptions, createStorybookOptions } from "./run/create.mjs";
 import { mergeConfig } from "./run/utils/mergeConfig.mjs";
-export { cli, createCli, createContext, createLoadedConfig, createStorybookOptions, initAppContext, initAppDir, initHooks, initPluginAPI, mergeConfig };
+export { cli, createCli, createConfigOptions, createContext, createLoadedConfig, createStorybookOptions, initAppContext, initAppDir, initHooks, initPluginAPI, mergeConfig };

package/dist/esm/cli/run/create.mjs

@@ -113,20 +113,21 @@ const createCli = ()=>{
         getPrevInitOptions: ()=>initOptions
     };
 };
-const createStorybookOptions = async (options)=>{
+const createConfigOptions = async (options)=>{
     const pluginManager = createPluginManager();
     pluginManager.clear();
-    const { configFile, cwd, metaName = 'modern-js' } = options;
+    const { configFile, cwd, metaName = 'modern-js', command } = options;
     const appDirectory = await initAppDir(cwd);
-    const loaded = await createLoadedConfig(appDirectory, configFile);
+    const loaded = await createLoadedConfig(appDirectory, configFile, options.config);
+    loaded.config = options.modifyModernConfig ? await options.modifyModernConfig(loaded.config || {}) : loaded.config;
     pluginManager.addPlugins(loaded.config.plugins || []);
     const plugins = await pluginManager.getPlugins();
     const context = await createContext({
         appContext: initAppContext({
             packageName: loaded.packageName,
             configFile: loaded.configFile,
-            command: 'storybook',
             appDirectory,
+            command,
             plugins,
             metaName
         }),
@@ -142,9 +143,16 @@ const createStorybookOptions = async (options)=>{
     const extraConfigs = await context.hooks.config.call();
     const normalizedConfig = await createResolveConfig(loaded, extraConfigs);
     const resolved = await context.hooks.modifyResolvedConfig.call(normalizedConfig);
+    const finalConfig = resolved || normalizedConfig;
+    context.normalizedConfig = finalConfig;
+    await pluginAPI.updateAppContext(context);
     return {
-        config: resolved || normalizedConfig,
+        config: finalConfig,
         getAppContext: ()=>pluginAPI.getAppContext()
     };
 };
-export { createCli, createStorybookOptions };
+const createStorybookOptions = (options)=>createConfigOptions({
+        ...options,
+        command: 'storybook'
+    });
+export { createCli, createConfigOptions, createStorybookOptions };

package/dist/esm-node/cli/index.mjs

@@ -3,6 +3,6 @@ import { initPluginAPI } from "./api.mjs";
 import { createContext, initAppContext } from "./context.mjs";
 import { initHooks } from "./hooks.mjs";
 import { cli, createCli, createLoadedConfig, initAppDir } from "./run/index.mjs";
-import { createStorybookOptions } from "./run/create.mjs";
+import { createConfigOptions, createStorybookOptions } from "./run/create.mjs";
 import { mergeConfig } from "./run/utils/mergeConfig.mjs";
-export { cli, createCli, createContext, createLoadedConfig, createStorybookOptions, initAppContext, initAppDir, initHooks, initPluginAPI, mergeConfig };
+export { cli, createCli, createConfigOptions, createContext, createLoadedConfig, createStorybookOptions, initAppContext, initAppDir, initHooks, initPluginAPI, mergeConfig };

package/dist/esm-node/cli/run/create.mjs

@@ -114,20 +114,21 @@ const createCli = ()=>{
         getPrevInitOptions: ()=>initOptions
     };
 };
-const createStorybookOptions = async (options)=>{
+const createConfigOptions = async (options)=>{
     const pluginManager = createPluginManager();
     pluginManager.clear();
-    const { configFile, cwd, metaName = 'modern-js' } = options;
+    const { configFile, cwd, metaName = 'modern-js', command } = options;
     const appDirectory = await initAppDir(cwd);
-    const loaded = await createLoadedConfig(appDirectory, configFile);
+    const loaded = await createLoadedConfig(appDirectory, configFile, options.config);
+    loaded.config = options.modifyModernConfig ? await options.modifyModernConfig(loaded.config || {}) : loaded.config;
     pluginManager.addPlugins(loaded.config.plugins || []);
     const plugins = await pluginManager.getPlugins();
     const context = await createContext({
         appContext: initAppContext({
             packageName: loaded.packageName,
             configFile: loaded.configFile,
-            command: 'storybook',
             appDirectory,
+            command,
             plugins,
             metaName
         }),
@@ -143,9 +144,16 @@ const createStorybookOptions = async (options)=>{
     const extraConfigs = await context.hooks.config.call();
     const normalizedConfig = await createResolveConfig(loaded, extraConfigs);
     const resolved = await context.hooks.modifyResolvedConfig.call(normalizedConfig);
+    const finalConfig = resolved || normalizedConfig;
+    context.normalizedConfig = finalConfig;
+    await pluginAPI.updateAppContext(context);
     return {
-        config: resolved || normalizedConfig,
+        config: finalConfig,
         getAppContext: ()=>pluginAPI.getAppContext()
     };
 };
-export { createCli, createStorybookOptions };
+const createStorybookOptions = (options)=>createConfigOptions({
+        ...options,
+        command: 'storybook'
+    });
+export { createCli, createConfigOptions, createStorybookOptions };

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

@@ -2,5 +2,5 @@ export { initPluginAPI } from './api';
 export { initAppContext, createContext } from './context';
 export { initHooks, type Hooks, type OnAfterBuildFn, type OnAfterCreateCompilerFn, type OnBeforeBuildFn, type OnBeforeCreateCompilerFn, type OnDevCompileDoneFn, type AddCommandFn, type AddWatchFilesFn, type ConfigFn, type ModifyBundlerChainFn, type ModifyConfigFn, type ModifyHtmlPartialsFn, type ModifyResolvedConfigFn, type ModifyRsbuildConfigFn, type ModifyRspackConfigFn, type OnAfterDeployFn, type OnBeforeDeployFn, type OnBeforeDevFn, type OnAfterDevFn, type OnBeforeExitFn, type OnBeforeRestartFn, type OnFileChangedFn, type OnPrepareFn, type InternalRuntimePluginsFn, type InternalServerPluginsFn, type ModifyServerRoutesFn, type RuntimePluginConfig, type ServerPluginConfig, } from './hooks';
 export { cli, createLoadedConfig, initAppDir, createCli } from './run';
-export { createStorybookOptions } from './run/create';
+export { createConfigOptions, createStorybookOptions } from './run/create';
 export { mergeConfig } from './run/utils/mergeConfig';

package/dist/types/cli/run/create.d.ts

@@ -9,7 +9,15 @@ export declare const createCli: <Extends extends CLIPluginExtends>() => {
     getPrevInitOptions: () => CLIRunOptions<Extends>;
 };
 type UselessOptions = 'handleSetupResult' | 'command' | 'internalPlugins';
-export declare const createStorybookOptions: <Extends extends CLIPluginExtends>(options: Omit<CLIRunOptions<Extends>, UselessOptions>) => Promise<{
+type CreateConfigOption<Extends extends CLIPluginExtends> = Omit<CLIRunOptions<Extends>, UselessOptions> & {
+    command: string;
+    modifyModernConfig?: (config: Extends['config']) => Extends['config'] | Promise<Extends['config']>;
+};
+export declare const createConfigOptions: <Extends extends CLIPluginExtends>(options: CreateConfigOption<Extends>) => Promise<{
+    config: Awaited<Extends["normalizedConfig"]> | NonNullable<Awaited<import("../../types/utils").UnwrapPromise<Extends["normalizedConfig"]>>>;
+    getAppContext: () => Readonly<import("../../types/cli/context").AppContext<Extends> & Extends["extendContext"]>;
+}>;
+export declare const createStorybookOptions: <Extends extends CLIPluginExtends>(options: Omit<CreateConfigOption<Extends>, "command">) => Promise<{
     config: Awaited<Extends["normalizedConfig"]> | NonNullable<Awaited<import("../../types/utils").UnwrapPromise<Extends["normalizedConfig"]>>>;
     getAppContext: () => Readonly<import("../../types/cli/context").AppContext<Extends> & Extends["extendContext"]>;
 }>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.3",
+  "version": "3.0.5",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -85,16 +85,16 @@
     "@rsbuild/core": "2.0.0-beta.4",
     "@swc/helpers": "^0.5.17",
     "jiti": "^2.6.1",
-    "@modern-js/runtime-utils": "3.0.3",
-    "@modern-js/types": "3.0.3",
-    "@modern-js/utils": "3.0.3"
+    "@modern-js/runtime-utils": "3.0.5",
+    "@modern-js/types": "3.0.5",
+    "@modern-js/utils": "3.0.5"
   },
   "devDependencies": {
     "@rslib/core": "0.19.6",
     "@types/node": "^20",
     "@types/react": "^19.2.14",
     "typescript": "^5",
-    "@modern-js/builder": "3.0.3",
+    "@modern-js/builder": "3.0.5",
     "@modern-js/rslib": "2.68.10"
   },
   "sideEffects": false,