@modern-js/plugin-v2 2.63.8-alpha.0 → 2.63.8-alpha.2

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

@@ -2,7 +2,7 @@ import type { OnAfterBuildFn, OnAfterCreateCompilerFn, OnBeforeBuildFn, OnBefore
 import type { AddCommandFn, AddWatchFilesFn, ConfigFn, ModifyBundlerChainFn, ModifyConfigFn, ModifyHtmlPartialsFn, ModifyResolvedConfigFn, ModifyRsbuildConfigFn, ModifyRspackConfigFn, ModifyWebpackChainFn, ModifyWebpackConfigFn, OnAfterDeployFn, OnAfterDevFn, OnBeforeDeployFn, OnBeforeDevFn, OnBeforeExitFn, OnBeforeRestartFn, OnFileChangedFn, OnPrepareFn } from '../types/cli/hooks';
 import type { DeepPartial } from '../types/utils';
 export type { OnAfterBuildFn, OnAfterCreateCompilerFn, OnBeforeBuildFn, OnBeforeCreateCompilerFn, OnDevCompileDoneFn, AddCommandFn, AddWatchFilesFn, ConfigFn, ModifyBundlerChainFn, ModifyConfigFn, ModifyHtmlPartialsFn, ModifyResolvedConfigFn, ModifyRsbuildConfigFn, ModifyRspackConfigFn, ModifyWebpackChainFn, ModifyWebpackConfigFn, OnAfterDeployFn, OnBeforeDeployFn, OnBeforeDevFn, OnAfterDevFn, OnBeforeExitFn, OnBeforeRestartFn, OnFileChangedFn, OnPrepareFn, };
-export declare function initHooks<Config, NormalizedConfig, ExtendBuildUtils>(): {
+export declare function initHooks<Config, NormalizedConfig, ExtendBuildUtils, ExtendConfigUtils>(): {
     /**
      * add config for this cli plugin
      */
@@ -11,11 +11,11 @@ export declare function initHooks<Config, NormalizedConfig, ExtendBuildUtils>():
      * @private
      * modify config for this cli plugin
      */
-    modifyConfig: import("..").AsyncHook<ModifyConfigFn<Config>>;
+    modifyConfig: import("..").AsyncHook<ModifyConfigFn<Config, ExtendConfigUtils>>;
     /**
      * modify final config
      */
-    modifyResolvedConfig: import("..").AsyncHook<ModifyResolvedConfigFn<NormalizedConfig>>;
+    modifyResolvedConfig: import("..").AsyncHook<ModifyResolvedConfigFn<NormalizedConfig, ExtendConfigUtils>>;
     modifyRsbuildConfig: import("..").AsyncHook<ModifyRsbuildConfigFn<ExtendBuildUtils>>;
     modifyBundlerChain: import("..").AsyncHook<ModifyBundlerChainFn<ExtendBuildUtils>>;
     modifyRspackConfig: import("..").AsyncHook<ModifyRspackConfigFn<ExtendBuildUtils>>;
@@ -38,4 +38,4 @@ export declare function initHooks<Config, NormalizedConfig, ExtendBuildUtils>():
     onAfterDeploy: import("..").AsyncHook<OnAfterDeployFn>;
     onBeforeExit: import("..").AsyncHook<OnBeforeExitFn>;
 };
-export type Hooks<Config, NormalizedConfig, ExtendBuildUtils> = ReturnType<typeof initHooks<Config, NormalizedConfig, ExtendBuildUtils>>;
+export type Hooks<Config, NormalizedConfig, ExtendBuildUtils, ExtendConfigUtils> = ReturnType<typeof initHooks<Config, NormalizedConfig, ExtendBuildUtils, ExtendConfigUtils>>;

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

@@ -3,9 +3,9 @@ export { createLoadedConfig } from './config/createLoadedConfig';
 export { initAppDir } from './utils/initAppDir';
 export { createCli };
 export declare const cli: {
-    init: (options: import("./types").CLIRunOptions<import("../..").CLIPluginExtends<{}, {}, {}, {}, {}, {}>>) => Promise<{
-        appContext: import("../..").InternalContext<import("../..").CLIPluginExtends<{}, {}, {}, {}, {}, {}>>;
+    init: (options: import("./types").CLIRunOptions<import("../..").CLIPluginExtends<{}, {}, {}, {}, {}, {}, {}>>) => Promise<{
+        appContext: import("../..").InternalContext<import("../..").CLIPluginExtends<{}, {}, {}, {}, {}, {}, {}>>;
     }>;
-    run: (options: import("./types").CLIRunOptions<import("../..").CLIPluginExtends<{}, {}, {}, {}, {}, {}>>) => Promise<void>;
-    getPrevInitOptions: () => import("./types").CLIRunOptions<import("../..").CLIPluginExtends<{}, {}, {}, {}, {}, {}>>;
+    run: (options: import("./types").CLIRunOptions<import("../..").CLIPluginExtends<{}, {}, {}, {}, {}, {}, {}>>) => Promise<void>;
+    getPrevInitOptions: () => import("./types").CLIRunOptions<import("../..").CLIPluginExtends<{}, {}, {}, {}, {}, {}, {}>>;
 };

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

@@ -13,11 +13,11 @@ export type CLIPluginAPI<Extends extends CLIPluginExtends> = Readonly<{
     getAppContext: () => Readonly<AppContext<Extends> & Extends['extendContext']>;
     getConfig: () => Readonly<Extends['config']>;
     getNormalizedConfig: () => Readonly<Extends['normalizedConfig']>;
-    getHooks: () => Readonly<Hooks<Extends['config'], Extends['normalizedConfig'], Extends['extendBuildUtils']> & Extends['extendHooks']>;
+    getHooks: () => Readonly<Hooks<Extends['config'], Extends['normalizedConfig'], Extends['extendBuildUtils'], Extends['extendConfigUtils']> & Extends['extendHooks']>;
     updateAppContext: (appContext: DeepPartial<AppContext<Extends> & Extends['extendContext']>) => void;
     config: PluginHookTap<ConfigFn<DeepPartial<Extends['config']>>>;
-    modifyConfig: PluginHookTap<ModifyConfigFn<Extends['config']>>;
-    modifyResolvedConfig: PluginHookTap<ModifyResolvedConfigFn<Extends['normalizedConfig']>>;
+    modifyConfig: PluginHookTap<ModifyConfigFn<Extends['config'], Extends['extendConfigUtils']>>;
+    modifyResolvedConfig: PluginHookTap<ModifyResolvedConfigFn<Extends['normalizedConfig'], Extends['extendConfigUtils']>>;
     modifyRsbuildConfig: PluginHookTap<ModifyRsbuildConfigFn<Extends['extendBuildUtils']>>;
     modifyBundlerChain: PluginHookTap<ModifyBundlerChainFn<Extends['extendBuildUtils']>>;
     /** Only works when bundler is Rspack */

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

@@ -28,7 +28,7 @@ export type AppContext<Extends extends CLIPluginExtends> = {
 /** The inner context. */
 export type InternalContext<Extends extends CLIPluginExtends> = AppContext<Extends> & {
     /** All hooks. */
-    hooks: Hooks<Extends['config'], Extends['normalizedConfig'], Extends['extendBuildUtils']> & Extends['extendHooks'];
+    hooks: Hooks<Extends['config'], Extends['normalizedConfig'], Extends['extendBuildUtils'], Extends['extendConfigUtils']> & Extends['extendHooks'];
     /** All plugin registry hooks */
     extendsHooks: Extends['extendHooks'];
     /** Current App config. */

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

@@ -1,7 +1,6 @@
 import type { WebpackConfig } from '@modern-js/uni-builder';
 import type { Command } from '@modern-js/utils/commander';
 import type { ModifyBundlerChainUtils, ModifyRspackConfigUtils, ModifyWebpackChainUtils, ModifyWebpackConfigUtils, RsbuildConfig, Rspack, RspackChain } from '@rsbuild/core';
-import type { TransformFunction } from '../plugin';
 import type { MaybePromise } from '../utils';
 import type { Entrypoint } from './context';
 declare module '@modern-js/utils/commander' {
@@ -10,8 +9,8 @@ declare module '@modern-js/utils/commander' {
     }
 }
 export type ConfigFn<Config> = () => Config;
-export type ModifyConfigFn<Config> = TransformFunction<Config>;
-export type ModifyResolvedConfigFn<NormalizedConfig> = TransformFunction<NormalizedConfig>;
+export type ModifyConfigFn<Config, ExtendConfigUtils> = (arg: Config, utils?: ExtendConfigUtils) => Config | Promise<Config>;
+export type ModifyResolvedConfigFn<NormalizedConfig, ExtendConfigUtils> = (arg: NormalizedConfig, utils?: ExtendConfigUtils) => NormalizedConfig | Promise<NormalizedConfig>;
 type IPartialMethod = (...script: string[]) => void;
 export interface PartialMethod {
     append: IPartialMethod;

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

@@ -2,13 +2,14 @@ import type { PluginHook } from '../hooks';
 import type { Plugin } from '../plugin';
 import type { CLIPluginAPI } from './api';
 import type { AppContext } from './context';
-export interface CLIPluginExtends<Config extends Record<string, any> = {}, NormalizedConfig extends Record<string, any> = {}, ExtendContext extends Record<string, any> = {}, ExtendAPI extends Record<string, any> = {}, ExtendHook extends Record<string, PluginHook<(...args: any[]) => any>> = {}, ExtendBuildUtils extends Record<string, any> = {}> {
+export interface CLIPluginExtends<Config extends Record<string, any> = {}, NormalizedConfig extends Record<string, any> = {}, ExtendContext extends Record<string, any> = {}, ExtendAPI extends Record<string, any> = {}, ExtendHook extends Record<string, PluginHook<(...args: any[]) => any>> = {}, ExtendBuildUtils extends Record<string, any> = {}, ExtendConfigUtils extends Record<string, any> = {}> {
     config?: Config;
     normalizedConfig?: NormalizedConfig;
     extendContext?: ExtendContext;
     extendApi?: ExtendAPI;
     extendHooks?: ExtendHook;
     extendBuildUtils?: ExtendBuildUtils;
+    extendConfigUtils?: ExtendConfigUtils;
 }
 /**
  * The type of the CLI plugin object.

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.63.8-alpha.0",
+  "version": "2.63.8-alpha.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -65,8 +65,8 @@
   "dependencies": {
     "@swc/helpers": "0.5.13",
     "@modern-js/node-bundle-require": "2.63.7",
-    "@modern-js/runtime-utils": "2.63.7",
-    "@modern-js/utils": "2.63.7"
+    "@modern-js/utils": "2.63.7",
+    "@modern-js/runtime-utils": "2.63.7"
   },
   "devDependencies": {
     "@rsbuild/core": "1.1.13",
@@ -75,10 +75,10 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@scripts/jest-config": "2.63.7",
-    "@scripts/build": "2.63.7",
+    "@modern-js/uni-builder": "2.63.7",
     "@modern-js/types": "2.63.7",
-    "@modern-js/uni-builder": "2.63.7"
+    "@scripts/build": "2.63.7",
+    "@scripts/jest-config": "2.63.7"
   },
   "sideEffects": false,
   "publishConfig": {