@modern-js/plugin-v2 0.0.0-nightly-20241126170728 → 2.63.0

package/dist/cjs/cli/api.js

@@ -26,7 +26,7 @@ function initPluginAPI({ context }) {
   const { hooks, extendsHooks, plugins } = context;
   function getAppContext() {
     if (context) {
-      const { hooks: hooks2, config, normalizedConfig, pluginAPI, ...appContext } = context;
+      const { hooks: hooks2, extendsHooks: extendsHooks2, config, normalizedConfig, pluginAPI, ...appContext } = context;
       appContext._internalContext = context;
       return appContext;
     }
@@ -57,9 +57,11 @@ function initPluginAPI({ context }) {
       });
     }
   });
-  Object.keys(extendsHooks).forEach((hookName) => {
-    extendsPluginApi[hookName] = extendsHooks[hookName].tap;
-  });
+  if (extendsHooks) {
+    Object.keys(extendsHooks).forEach((hookName) => {
+      extendsPluginApi[hookName] = extendsHooks[hookName].tap;
+    });
+  }
   function updateAppContext(updateContext) {
     context = (0, import_lodash.merge)(context, updateContext);
   }

package/dist/cjs/cli/index.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var cli_exports = {};
 __export(cli_exports, {
   cli: () => import_run.cli,
+  createContext: () => import_context.createContext,
   createLoadedConfig: () => import_run.createLoadedConfig,
   initAppContext: () => import_context.initAppContext,
   initAppDir: () => import_run.initAppDir,
@@ -33,6 +34,7 @@ var import_run = require("./run");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   cli,
+  createContext,
   createLoadedConfig,
   initAppContext,
   initAppDir,

package/dist/esm-node/cli/api.js

@@ -3,7 +3,7 @@ function initPluginAPI({ context }) {
   const { hooks, extendsHooks, plugins } = context;
   function getAppContext() {
     if (context) {
-      const { hooks: hooks2, config, normalizedConfig, pluginAPI, ...appContext } = context;
+      const { hooks: hooks2, extendsHooks: extendsHooks2, config, normalizedConfig, pluginAPI, ...appContext } = context;
       appContext._internalContext = context;
       return appContext;
     }
@@ -34,9 +34,11 @@ function initPluginAPI({ context }) {
       });
     }
   });
-  Object.keys(extendsHooks).forEach((hookName) => {
-    extendsPluginApi[hookName] = extendsHooks[hookName].tap;
-  });
+  if (extendsHooks) {
+    Object.keys(extendsHooks).forEach((hookName) => {
+      extendsPluginApi[hookName] = extendsHooks[hookName].tap;
+    });
+  }
   function updateAppContext(updateContext) {
     context = merge(context, updateContext);
   }

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

@@ -1,9 +1,10 @@
 import { initPluginAPI } from "./api";
-import { initAppContext } from "./context";
+import { initAppContext, createContext } from "./context";
 import { initHooks } from "./hooks";
 import { cli, createLoadedConfig, initAppDir } from "./run";
 export {
   cli,
+  createContext,
   createLoadedConfig,
   initAppContext,
   initAppDir,

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

@@ -1,7 +1,8 @@
 import type { CLIPluginAPI } from '../types/cli/api';
 import type { InternalContext } from '../types/cli/context';
+import type { CLIPluginExtends } from '../types/cli/plugin';
 import type { PluginManager } from '../types/plugin';
-export declare function initPluginAPI<Config, NormalizedConfig, ExtendsHooksKey extends string>({ context, }: {
-    context: InternalContext<Config, NormalizedConfig, ExtendsHooksKey>;
+export declare function initPluginAPI<Extends extends CLIPluginExtends>({ context, }: {
+    context: InternalContext<Extends>;
     pluginManager: PluginManager;
-}): CLIPluginAPI<Config, NormalizedConfig>;
+}): CLIPluginAPI<Extends>;

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

@@ -1,18 +1,18 @@
 import type { AppContext, InternalContext } from '../types/cli/context';
-import type { CLIPlugin } from '../types/cli/plugin';
-interface ContextParams<Config, NormalizedConfig> {
-    appContext: AppContext<Config, NormalizedConfig>;
-    config: Config;
-    normalizedConfig: NormalizedConfig;
+import type { CLIPlugin, CLIPluginExtends } from '../types/cli/plugin';
+interface ContextParams<Extends extends CLIPluginExtends> {
+    appContext: AppContext<Extends>;
+    config: Extends['config'];
+    normalizedConfig: Extends['normalizedConfig'];
 }
-export declare function initAppContext<Config, NormalizedConfig>(params: {
+export declare function initAppContext<Extends extends CLIPluginExtends>(params: {
     packageName: string;
     configFile: string;
     command: string;
     appDirectory: string;
-    plugins: CLIPlugin<Config, NormalizedConfig>[];
+    plugins: CLIPlugin<Extends>[];
     srcDir?: string;
     distDir?: string;
-}): AppContext<Config, NormalizedConfig>;
-export declare function createContext<Config, NormalizedConfig, ExtendsHooksKey extends string>({ appContext, config, normalizedConfig, }: ContextParams<Config, NormalizedConfig>): Promise<InternalContext<Config, NormalizedConfig, ExtendsHooksKey>>;
+}): AppContext<Extends>;
+export declare function createContext<Extends extends CLIPluginExtends>({ appContext, config, normalizedConfig, }: ContextParams<Extends>): Promise<InternalContext<Extends>>;
 export {};

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

@@ -5,35 +5,35 @@ export declare function initHooks<Config, NormalizedConfig>(): {
     /**
      * add config for this cli plugin
      */
-    config: import("../types").CollectAsyncHook<ConfigFn<DeepPartial<Config>>>;
+    config: import("..").CollectAsyncHook<ConfigFn<DeepPartial<Config>>>;
     /**
      * @private
      * modify config for this cli plugin
      */
-    modifyConfig: import("../types").AsyncHook<ModifyConfigFn<Config>>;
+    modifyConfig: import("..").AsyncHook<ModifyConfigFn<Config>>;
     /**
      * modify final config
      */
-    modifyResolvedConfig: import("../types").AsyncHook<ModifyResolvedConfigFn<NormalizedConfig>>;
-    modifyRsbuildConfig: import("../types").AsyncHook<ModifyRsbuildConfigFn>;
-    modifyBundlerChain: import("../types").AsyncHook<ModifyBundlerChainFn>;
-    modifyRspackConfig: import("../types").AsyncHook<ModifyRspackConfigFn>;
-    modifyWebpackChain: import("../types").AsyncHook<ModifyWebpackChainFn>;
-    modifyWebpackConfig: import("../types").AsyncHook<ModifyWebpackConfigFn>;
-    modifyHtmlPartials: import("../types").AsyncHook<ModifyHtmlPartialsFn>;
-    addCommand: import("../types").AsyncHook<AddCommandFn>;
-    addWatchFiles: import("../types").CollectAsyncHook<AddWatchFilesFn>;
-    onPrepare: import("../types").AsyncHook<OnPrepareFn>;
-    onFileChanged: import("../types").AsyncHook<OnFileChangedFn>;
-    onBeforeRestart: import("../types").AsyncHook<OnBeforeRestartFn>;
-    onBeforeCreateCompiler: import("../types").AsyncHook<OnBeforeCreateCompilerFn>;
-    onAfterCreateCompiler: import("../types").AsyncHook<OnAfterCreateCompilerFn>;
-    onBeforeBuild: import("../types").AsyncHook<OnBeforeBuildFn>;
-    onAfterBuild: import("../types").AsyncHook<OnAfterBuildFn>;
-    onBeforeDev: import("../types").AsyncHook<OnBeforeDevFn>;
-    onAfterDev: import("../types").AsyncHook<OnAfterDevFn>;
-    onBeforeDeploy: import("../types").AsyncHook<OnBeforeDeployFn>;
-    onAfterDeploy: import("../types").AsyncHook<OnAfterDeployFn>;
-    onBeforeExit: import("../types").AsyncHook<OnBeforeExitFn>;
+    modifyResolvedConfig: import("..").AsyncHook<ModifyResolvedConfigFn<NormalizedConfig>>;
+    modifyRsbuildConfig: import("..").AsyncHook<ModifyRsbuildConfigFn>;
+    modifyBundlerChain: import("..").AsyncHook<ModifyBundlerChainFn>;
+    modifyRspackConfig: import("..").AsyncHook<ModifyRspackConfigFn>;
+    modifyWebpackChain: import("..").AsyncHook<ModifyWebpackChainFn>;
+    modifyWebpackConfig: import("..").AsyncHook<ModifyWebpackConfigFn>;
+    modifyHtmlPartials: import("..").AsyncHook<ModifyHtmlPartialsFn>;
+    addCommand: import("..").AsyncHook<AddCommandFn>;
+    addWatchFiles: import("..").CollectAsyncHook<AddWatchFilesFn>;
+    onPrepare: import("..").AsyncHook<OnPrepareFn>;
+    onFileChanged: import("..").AsyncHook<OnFileChangedFn>;
+    onBeforeRestart: import("..").AsyncHook<OnBeforeRestartFn>;
+    onBeforeCreateCompiler: import("..").AsyncHook<OnBeforeCreateCompilerFn>;
+    onAfterCreateCompiler: import("..").AsyncHook<OnAfterCreateCompilerFn>;
+    onBeforeBuild: import("..").AsyncHook<OnBeforeBuildFn>;
+    onAfterBuild: import("..").AsyncHook<OnAfterBuildFn>;
+    onBeforeDev: import("..").AsyncHook<OnBeforeDevFn>;
+    onAfterDev: import("..").AsyncHook<OnAfterDevFn>;
+    onBeforeDeploy: import("..").AsyncHook<OnBeforeDeployFn>;
+    onAfterDeploy: import("..").AsyncHook<OnAfterDeployFn>;
+    onBeforeExit: import("..").AsyncHook<OnBeforeExitFn>;
 };
 export type Hooks<Config, NormalizedConfig> = ReturnType<typeof initHooks<Config, NormalizedConfig>>;

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

@@ -1,4 +1,4 @@
 export { initPluginAPI } from './api';
-export { initAppContext } from './context';
+export { initAppContext, createContext } from './context';
 export { initHooks } from './hooks';
 export { cli, createLoadedConfig, initAppDir } from './run';

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

@@ -1,7 +1,8 @@
+import type { CLIPluginExtends } from '../../types/cli/plugin';
 import type { CLIRunOptions } from './types';
-export declare const createCli: <Config, NormalizedConfig, ExtendsHooksKey extends string>() => {
+export declare const createCli: <Extends extends CLIPluginExtends>() => {
     init: (options: CLIRunOptions) => Promise<{
-        appContext: import("../../types").InternalContext<Config, NormalizedConfig, ExtendsHooksKey>;
+        appContext: import("../..").InternalContext<Extends>;
     }>;
     run: (options: CLIRunOptions) => Promise<void>;
     getPrevInitOptions: () => CLIRunOptions;

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

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

package/dist/types/cli/run/utils/createFileWatcher.d.ts

@@ -1,2 +1,3 @@
 import type { InternalContext } from '../../../types';
-export declare const createFileWatcher: <Config, NormalizedConfig, ExtendsHooksKey extends string>(appContext: InternalContext<Config, NormalizedConfig, ExtendsHooksKey>) => Promise<import("@modern-js/utils").FSWatcher | undefined>;
+import type { CLIPluginExtends } from '../../../types/cli/plugin';
+export declare const createFileWatcher: <Extends extends CLIPluginExtends>(appContext: InternalContext<Extends>) => Promise<import("@modern-js/utils").FSWatcher | undefined>;

package/dist/types/index.d.ts

@@ -1,2 +1,5 @@
 export { createPluginManager } from './manager';
 export { createAsyncHook, createCollectAsyncHook } from './hooks';
+export type { Plugin, PluginManager, TransformFunction, } from './types/plugin';
+export type { CLIPluginAPI, AppContext, InternalContext, Entrypoint, CLIPlugin, CLIPluginExtends, } from './types/cli';
+export type { AsyncHook, CollectAsyncHook, PluginHook, PluginHookTap, } from './types/hooks';

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

@@ -1,21 +1,22 @@
 import type { ModifyBundlerChainFn, ModifyRsbuildConfigFn, ModifyRspackConfigFn, ModifyWebpackChainFn, ModifyWebpackConfigFn, OnAfterBuildFn, OnAfterCreateCompilerFn, OnBeforeBuildFn, OnBeforeCreateCompilerFn } from '@rsbuild/core';
 import type { Hooks } from '../../cli/hooks';
-import type { PluginHook, PluginHookTap } from '../hooks';
+import type { PluginHookTap } from '../hooks';
 import type { DeepPartial } from '../utils';
 import type { AppContext } from './context';
 import type { AddCommandFn, AddWatchFilesFn, ConfigFn, ModifyConfigFn, ModifyHtmlPartialsFn, ModifyResolvedConfigFn, OnAfterDeployFn, OnAfterDevFn, OnBeforeDeployFn, OnBeforeDevFn, OnBeforeExitFn, OnBeforeRestartFn, OnFileChangedFn, OnPrepareFn } from './hooks';
+import type { CLIPluginExtends } from './plugin';
 /**
  * Define a generic CLI plugin API that provider can extend as needed.
  */
-export type CLIPluginAPI<Config, NormalizedConfig> = Readonly<{
-    getAppContext: () => Readonly<AppContext<Config, NormalizedConfig>>;
-    getConfig: () => Readonly<Config>;
-    getNormalizedConfig: () => Readonly<NormalizedConfig>;
-    getHooks: () => Readonly<Hooks<Config, NormalizedConfig> & Record<string, PluginHook<(...args: any[]) => any>>>;
-    updateAppContext: (appContext: DeepPartial<AppContext<Config, NormalizedConfig>>) => void;
-    config: PluginHookTap<ConfigFn<DeepPartial<Config>>>;
-    modifyConfig: PluginHookTap<ModifyConfigFn<Config>>;
-    modifyResolvedConfig: PluginHookTap<ModifyResolvedConfigFn<NormalizedConfig>>;
+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['extendHooks']>;
+    updateAppContext: (appContext: DeepPartial<AppContext<Extends>>) => void;
+    config: PluginHookTap<ConfigFn<DeepPartial<Extends['config']>>>;
+    modifyConfig: PluginHookTap<ModifyConfigFn<Extends['config']>>;
+    modifyResolvedConfig: PluginHookTap<ModifyResolvedConfigFn<Extends['normalizedConfig']>>;
     modifyRsbuildConfig: PluginHookTap<ModifyRsbuildConfigFn>;
     modifyBundlerChain: PluginHookTap<ModifyBundlerChainFn>;
     /** Only works when bundler is Rspack */

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

@@ -1,15 +1,14 @@
 import type { ServerRoute } from '@modern-js/types';
 import type { UniBuilderInstance, UniBuilderWebpackInstance } from '@modern-js/uni-builder';
 import type { Hooks } from '../../cli/hooks';
-import type { PluginHook } from '../hooks';
 import type { CLIPluginAPI } from './api';
-import type { CLIPlugin } from './plugin';
+import type { CLIPlugin, CLIPluginExtends } from './plugin';
 export interface Entrypoint {
     name: string;
     entry: string;
 }
 /** The public context */
-export type AppContext<Config, NormalizedConfig> = {
+export type AppContext<Extends extends CLIPluginExtends> = {
     packageName: string;
     configFile: string;
     command: string;
@@ -18,7 +17,7 @@ export type AppContext<Config, NormalizedConfig> = {
     srcDirectory?: string;
     distDirectory?: string;
     nodeModulesDirectory?: string;
-    plugins: CLIPlugin<Config, NormalizedConfig>[];
+    plugins: CLIPlugin<Extends>[];
     bundlerType?: 'webpack' | 'rspack' | 'esbuild';
     builder?: UniBuilderInstance | UniBuilderWebpackInstance;
     port?: number;
@@ -27,15 +26,15 @@ export type AppContext<Config, NormalizedConfig> = {
     serverRoutes?: ServerRoute[];
 };
 /** The inner context. */
-export type InternalContext<Config, NormalizedConfig, ExtendsHooksKey extends string> = AppContext<Config, NormalizedConfig> & {
+export type InternalContext<Extends extends CLIPluginExtends> = AppContext<Extends> & {
     /** All hooks. */
-    hooks: Hooks<Config, NormalizedConfig> & Record<ExtendsHooksKey, PluginHook<(...args: any[]) => any>>;
+    hooks: Hooks<Extends['config'], Extends['normalizedConfig']> & Extends['extendHooks'];
     /** All plugin registry hooks */
-    extendsHooks: Record<ExtendsHooksKey, PluginHook<(...args: any[]) => any>>;
+    extendsHooks: Extends['extendHooks'];
     /** Current App config. */
-    config: Readonly<Config>;
+    config: Readonly<Extends['config']>;
     /** The normalized Rsbuild config. */
-    normalizedConfig?: NormalizedConfig;
-    pluginAPI?: CLIPluginAPI<Config, NormalizedConfig> & Record<string, (...args: any[]) => any>;
-    _internalContext?: InternalContext<Config, NormalizedConfig, ExtendsHooksKey>;
+    normalizedConfig?: Extends['normalizedConfig'];
+    pluginAPI?: CLIPluginAPI<Extends> & Record<string, (...args: any[]) => any>;
+    _internalContext?: InternalContext<Extends>;
 };

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

@@ -1,3 +1,3 @@
 export type { CLIPluginAPI } from './api';
 export type { AppContext, InternalContext, Entrypoint } from './context';
-export type { CLIPlugin } from './plugin';
+export type { CLIPlugin, CLIPluginExtends } from './plugin';

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

@@ -1,6 +1,15 @@
+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>> = {}> {
+    config?: Config;
+    normalizedConfig?: NormalizedConfig;
+    extendContext?: ExtendContext;
+    extendApi?: ExtendAPI;
+    extendHooks?: ExtendHook;
+}
 /**
  * The type of the CLI plugin object.
  */
-export type CLIPlugin<Config, NormalizedConfig> = Plugin<CLIPluginAPI<Config, NormalizedConfig>>;
+export type CLIPlugin<Extends extends CLIPluginExtends> = Plugin<CLIPluginAPI<Extends> & Extends['extendApi'], AppContext<Extends> & Extends['extendContext']>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-nightly-20241126170728",
+  "version": "2.63.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -51,9 +51,6 @@
       ".": [
         "./dist/index.d.ts"
       ],
-      "types": [
-        "./dist/types/types/index.d.ts"
-      ],
       "run": [
         "./dist/types/cli/run/run.d.ts"
       ],
@@ -64,8 +61,8 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.13",
-    "@modern-js/utils": "0.0.0-nightly-20241126170728",
-    "@modern-js/node-bundle-require": "0.0.0-nightly-20241126170728"
+    "@modern-js/utils": "2.63.0",
+    "@modern-js/node-bundle-require": "2.63.0"
   },
   "devDependencies": {
     "@rsbuild/core": "~1.1.5",
@@ -73,10 +70,10 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/uni-builder": "0.0.0-nightly-20241126170728",
-    "@modern-js/types": "0.0.0-nightly-20241126170728",
-    "@scripts/build": "0.0.0-nightly-20241126170728",
-    "@scripts/jest-config": "0.0.0-nightly-20241126170728"
+    "@modern-js/uni-builder": "2.63.0",
+    "@modern-js/types": "2.63.0",
+    "@scripts/build": "2.63.0",
+    "@scripts/jest-config": "2.63.0"
   },
   "sideEffects": false,
   "publishConfig": {