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

package/dist/cjs/cli/api.js

@@ -22,11 +22,12 @@ __export(api_exports, {
 });
 module.exports = __toCommonJS(api_exports);
 var import_lodash = require("@modern-js/utils/lodash");
+var import_debug = require("./run/utils/debug");
 function initPluginAPI({ context, pluginManager }) {
   const { hooks, extendsHooks, plugins } = context;
   function getAppContext() {
     if (context) {
-      const { hooks: hooks2, extendsHooks: extendsHooks2, config, normalizedConfig, pluginAPI, ...appContext } = context;
+      const { hooks: hooks2, extendsHooks: extendsHooks2, config, normalizedConfig, pluginAPI: pluginAPI2, ...appContext } = context;
       appContext._internalContext = context;
       return appContext;
     }
@@ -65,7 +66,7 @@ function initPluginAPI({ context, pluginManager }) {
   function updateAppContext(updateContext) {
     context = (0, import_lodash.merge)(context, updateContext);
   }
-  return {
+  const pluginAPI = {
     isPluginExists: pluginManager.isPluginExists,
     getAppContext,
     getConfig,
@@ -98,6 +99,16 @@ function initPluginAPI({ context, pluginManager }) {
     onBeforeExit: hooks.onBeforeExit.tap,
     ...extendsPluginApi
   };
+  return new Proxy(pluginAPI, {
+    get(target, prop) {
+      if (prop in target) {
+        return target[prop];
+      }
+      return () => {
+        (0, import_debug.debug)(`api.${prop.toString()} not exist`);
+      };
+    }
+  });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/cli/run/config/createLoadedConfig.js

@@ -63,7 +63,7 @@ function assignPkgConfig(userConfig, pkgConfig) {
     return void 0;
   });
 }
-async function createLoadedConfig(appDirectory, configFilePath, packageJsonConfig) {
+async function createLoadedConfig(appDirectory, configFilePath, packageJsonConfig, otherConfig) {
   const configFile = (0, import_loadConfig.getConfigFilePath)(appDirectory, configFilePath);
   const loaded = await (0, import_loadConfig.loadConfig)(appDirectory, configFile, packageJsonConfig);
   if (!loaded.config && !loaded.pkgConfig) {
@@ -84,6 +84,12 @@ async function createLoadedConfig(appDirectory, configFilePath, packageJsonConfi
       ]);
     }
   }
+  if (otherConfig) {
+    mergedConfig = (0, import_mergeConfig.mergeConfig)([
+      mergedConfig,
+      otherConfig
+    ]);
+  }
   return {
     packageName: loaded.packageName,
     config: mergedConfig,

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

@@ -40,12 +40,12 @@ const createCli = () => {
     var _context_hooks_onAfterPrepare, _context_hooks;
     pluginManager.clear();
     initOptions = options;
-    const { metaName = "MODERN", configFile, command, version, packageJsonConfig, internalPlugins, handleSetupResult } = options;
+    const { metaName = "MODERN", configFile, config, command, version, packageJsonConfig, internalPlugins, handleSetupResult } = options;
     const appDirectory = await (0, import_initAppDir.initAppDir)(options === null || options === void 0 ? void 0 : options.cwd);
     (0, import_commander2.initCommandsMap)();
     (0, import_commander2.setProgramVersion)(version);
     (0, import_loadEnv.loadEnv)(appDirectory, process.env[`${metaName.toUpperCase()}_ENV`]);
-    const loaded = await (0, import_createLoadedConfig.createLoadedConfig)(appDirectory, configFile, packageJsonConfig);
+    const loaded = await (0, import_createLoadedConfig.createLoadedConfig)(appDirectory, configFile, packageJsonConfig, config);
     const allPlugins = [
       ...internalPlugins || [],
       ...loaded.config.plugins || []

package/dist/cjs/cli/run/utils/debug.js

@@ -0,0 +1,29 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var debug_exports = {};
+__export(debug_exports, {
+  debug: () => debug
+});
+module.exports = __toCommonJS(debug_exports);
+var import_utils = require("@modern-js/utils");
+const debug = (0, import_utils.createDebugger)("plugin-v2");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  debug
+});

package/dist/cjs/manager.js

@@ -22,7 +22,7 @@ __export(manager_exports, {
 });
 module.exports = __toCommonJS(manager_exports);
 var import_utils = require("@modern-js/utils");
-const debug = (0, import_utils.createDebugger)("plugin-v2");
+var import_debug = require("./cli/run/utils/debug");
 function validatePlugin(plugin) {
   const type = typeof plugin;
   if (type !== "object" || plugin === null) {
@@ -135,7 +135,7 @@ function createPluginManager() {
       visit(name);
     });
     result = result.filter((result2) => result2);
-    debug("CLI Plugins:", result.map((p) => p.name));
+    (0, import_debug.debug)("CLI Plugins:", result.map((p) => p.name));
     return result;
   };
   const clear = () => {

package/dist/esm/index.js

@@ -1,7 +1,12 @@
 // src/manager.ts
 import { _ as _type_of } from "@swc/helpers/_/_type_of";
-import { createDebugger, isFunction, logger } from "@modern-js/utils";
+import { isFunction, logger } from "@modern-js/utils";
+
+// src/cli/run/utils/debug.ts
+import { createDebugger } from "@modern-js/utils";
 var debug = createDebugger("plugin-v2");
+
+// src/manager.ts
 function validatePlugin(plugin) {
   var type = typeof plugin === "undefined" ? "undefined" : _type_of(plugin);
   if (type !== "object" || plugin === null) {

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

@@ -1,9 +1,10 @@
 import { merge } from "@modern-js/utils/lodash";
+import { debug } from "./run/utils/debug";
 function initPluginAPI({ context, pluginManager }) {
   const { hooks, extendsHooks, plugins } = context;
   function getAppContext() {
     if (context) {
-      const { hooks: hooks2, extendsHooks: extendsHooks2, config, normalizedConfig, pluginAPI, ...appContext } = context;
+      const { hooks: hooks2, extendsHooks: extendsHooks2, config, normalizedConfig, pluginAPI: pluginAPI2, ...appContext } = context;
       appContext._internalContext = context;
       return appContext;
     }
@@ -42,7 +43,7 @@ function initPluginAPI({ context, pluginManager }) {
   function updateAppContext(updateContext) {
     context = merge(context, updateContext);
   }
-  return {
+  const pluginAPI = {
     isPluginExists: pluginManager.isPluginExists,
     getAppContext,
     getConfig,
@@ -75,6 +76,16 @@ function initPluginAPI({ context, pluginManager }) {
     onBeforeExit: hooks.onBeforeExit.tap,
     ...extendsPluginApi
   };
+  return new Proxy(pluginAPI, {
+    get(target, prop) {
+      if (prop in target) {
+        return target[prop];
+      }
+      return () => {
+        debug(`api.${prop.toString()} not exist`);
+      };
+    }
+  });
 }
 export {
   initPluginAPI

package/dist/esm-node/cli/run/config/createLoadedConfig.js

@@ -39,7 +39,7 @@ function assignPkgConfig(userConfig, pkgConfig) {
     return void 0;
   });
 }
-async function createLoadedConfig(appDirectory, configFilePath, packageJsonConfig) {
+async function createLoadedConfig(appDirectory, configFilePath, packageJsonConfig, otherConfig) {
   const configFile = getConfigFilePath(appDirectory, configFilePath);
   const loaded = await loadConfig(appDirectory, configFile, packageJsonConfig);
   if (!loaded.config && !loaded.pkgConfig) {
@@ -60,6 +60,12 @@ async function createLoadedConfig(appDirectory, configFilePath, packageJsonConfi
       ]);
     }
   }
+  if (otherConfig) {
+    mergedConfig = mergeConfig([
+      mergedConfig,
+      otherConfig
+    ]);
+  }
   return {
     packageName: loaded.packageName,
     config: mergedConfig,

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

@@ -17,12 +17,12 @@ const createCli = () => {
     var _context_hooks_onAfterPrepare, _context_hooks;
     pluginManager.clear();
     initOptions = options;
-    const { metaName = "MODERN", configFile, command, version, packageJsonConfig, internalPlugins, handleSetupResult } = options;
+    const { metaName = "MODERN", configFile, config, command, version, packageJsonConfig, internalPlugins, handleSetupResult } = options;
     const appDirectory = await initAppDir(options === null || options === void 0 ? void 0 : options.cwd);
     initCommandsMap();
     setProgramVersion(version);
     loadEnv(appDirectory, process.env[`${metaName.toUpperCase()}_ENV`]);
-    const loaded = await createLoadedConfig(appDirectory, configFile, packageJsonConfig);
+    const loaded = await createLoadedConfig(appDirectory, configFile, packageJsonConfig, config);
     const allPlugins = [
       ...internalPlugins || [],
       ...loaded.config.plugins || []

package/dist/esm-node/cli/run/utils/debug.js

@@ -0,0 +1,5 @@
+import { createDebugger } from "@modern-js/utils";
+const debug = createDebugger("plugin-v2");
+export {
+  debug
+};

package/dist/esm-node/manager.js

@@ -1,5 +1,5 @@
-import { createDebugger, isFunction, logger } from "@modern-js/utils";
-const debug = createDebugger("plugin-v2");
+import { isFunction, logger } from "@modern-js/utils";
+import { debug } from "./cli/run/utils/debug";
 function validatePlugin(plugin) {
   const type = typeof plugin;
   if (type !== "object" || plugin === null) {

package/dist/types/cli/run/config/createLoadedConfig.d.ts

@@ -3,4 +3,4 @@ import type { LoadedConfig } from '../types';
  * Assign the pkg config into the user config.
  */
 export declare function assignPkgConfig<T>(userConfig: T, pkgConfig: T): {} & T;
-export declare function createLoadedConfig<T>(appDirectory: string, configFilePath: string, packageJsonConfig?: string): Promise<LoadedConfig<T>>;
+export declare function createLoadedConfig<T>(appDirectory: string, configFilePath: string, packageJsonConfig?: string, otherConfig?: T): Promise<LoadedConfig<T>>;

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

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

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) => Promise<{
+    init: (options: import("./types").CLIRunOptions<import("../..").CLIPluginExtends<{}, {}, {}, {}, {}, {}>>) => Promise<{
         appContext: import("../..").InternalContext<import("../..").CLIPluginExtends<{}, {}, {}, {}, {}, {}>>;
     }>;
-    run: (options: import("./types").CLIRunOptions) => Promise<void>;
-    getPrevInitOptions: () => import("./types").CLIRunOptions;
+    run: (options: import("./types").CLIRunOptions<import("../..").CLIPluginExtends<{}, {}, {}, {}, {}, {}>>) => Promise<void>;
+    getPrevInitOptions: () => import("./types").CLIRunOptions<import("../..").CLIPluginExtends<{}, {}, {}, {}, {}, {}>>;
 };

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

@@ -1,5 +1,8 @@
+import type { CLIPluginExtends } from '../../types/cli';
 import type { Plugin } from '../../types/plugin';
-export interface CLIOptions {
+export interface CLIOptions<Extends extends CLIPluginExtends = {
+    config: {};
+}> {
     cwd?: string;
     version?: string;
     metaName?: string;
@@ -7,6 +10,10 @@ export interface CLIOptions {
      * The initial log message when CLI started
      */
     initialLog?: string;
+    /**
+     * other config, overrides config file content
+     */
+    config?: Extends['config'];
     configFile: string;
     /**
      * @deprecated
@@ -23,6 +30,8 @@ export type LoadedConfig<T> = {
     pkgConfig?: T;
     jsConfig?: T;
 };
-export interface CLIRunOptions extends CLIOptions {
+export interface CLIRunOptions<Extends extends CLIPluginExtends = {
+    config: {};
+}> extends CLIOptions<Extends> {
     command: string;
 }

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

@@ -0,0 +1 @@
+export declare const debug: import("@modern-js/utils/compiled/debug").Debugger;

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

@@ -42,7 +42,7 @@ export type OnFileChangedFn = (params: {
 export type OnBeforeRestartFn = () => Promise<void> | void;
 export type OnBeforeDevFn = () => Promise<void> | void;
 export type OnAfterDevFn = (params: {
-    isFirstCompile: boolean;
+    port: number;
 }) => Promise<void> | void;
 export type OnBeforeDeployFn = (options: Record<string, any>) => Promise<void> | void;
 export type OnAfterDeployFn = (options: Record<string, any>) => Promise<void> | void;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.63.7-alpha.0",
+  "version": "2.63.7-alpha.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -70,9 +70,9 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@scripts/build": "2.63.6",
     "@modern-js/types": "2.63.6",
     "@modern-js/uni-builder": "2.63.6",
+    "@scripts/build": "2.63.6",
     "@scripts/jest-config": "2.63.6"
   },
   "sideEffects": false,