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

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

@@ -35,8 +35,8 @@ __export(loadConfig_exports, {
 });
 module.exports = __toCommonJS(loadConfig_exports);
 var import_path = __toESM(require("path"));
-var import_node_bundle_require = require("@modern-js/node-bundle-require");
 var import_utils = require("@modern-js/utils");
+var import_jiti = __toESM(require("jiti"));
 const getPackageConfig = (appDirectory, packageJsonConfig) => {
   const json = JSON.parse(import_utils.fs.readFileSync(import_path.default.resolve(appDirectory, "./package.json"), "utf8"));
   return json[packageJsonConfig];
@@ -64,19 +64,19 @@ const clearFilesOverTime = async (targetDir, overtime) => {
   } catch (err) {
   }
 };
-const bundleRequireWithCatch = async (configFile, { appDirectory }) => {
+function loadConfigContent(configFile) {
+  const _require = (0, import_jiti.default)(__filename, {
+    esmResolve: true,
+    // disable require cache to support restart CLI and read the new config
+    requireCache: false,
+    interopDefault: true
+  });
+  if (!import_utils.fs.existsSync(configFile)) {
+    throw new Error(`Configuration file does not exist: ${configFile}`);
+  }
   try {
-    const mod = await (0, import_node_bundle_require.bundleRequire)(configFile, {
-      autoClear: false,
-      getOutputFile: async (filePath) => {
-        const defaultOutputFileName = import_path.default.basename(await (0, import_node_bundle_require.defaultGetOutputFile)(filePath));
-        const outputPath = import_path.default.join(appDirectory, import_utils.CONFIG_CACHE_DIR);
-        const timeLimit = 10 * 60;
-        await clearFilesOverTime(outputPath, timeLimit);
-        return import_path.default.join(outputPath, defaultOutputFileName);
-      }
-    });
-    return mod;
+    const config = _require(configFile);
+    return config.default || config;
   } catch (e) {
     if (e instanceof Error) {
       e.message = `Get Error while loading config file: ${configFile}, please check it and retry.
@@ -84,7 +84,7 @@ ${e.message || ""}`;
     }
     throw e;
   }
-};
+}
 const loadConfig = async (appDirectory, configFile, packageJsonConfig) => {
   let pkgConfig;
   if (packageJsonConfig) {
@@ -93,11 +93,7 @@ const loadConfig = async (appDirectory, configFile, packageJsonConfig) => {
   const packageName = require(import_path.default.resolve(appDirectory, "./package.json")).name;
   let config;
   if (configFile) {
-    delete require.cache[configFile];
-    const mod = await bundleRequireWithCatch(configFile, {
-      appDirectory
-    });
-    config = mod.default || mod;
+    config = loadConfigContent(configFile);
   }
   return {
     packageName,

package/dist/cjs/runtime/api.js

@@ -26,7 +26,7 @@ function initPluginAPI({ context, plugins }) {
   const { hooks, extendsHooks } = context;
   function getRuntimeContext() {
     if (context) {
-      const { hooks: hooks2, extendsHooks: extendsHooks2, config, pluginAPI, ...runtimeContext } = context;
+      const { hooks: hooks2, extendsHooks: extendsHooks2, config, pluginAPI: pluginAPI2, ...runtimeContext } = context;
       runtimeContext._internalContext = context;
       return runtimeContext;
     }
@@ -62,7 +62,7 @@ function initPluginAPI({ context, plugins }) {
       extendsPluginApi[hookName] = extendsHooks[hookName].tap;
     });
   }
-  return {
+  const pluginAPI = {
     updateRuntimeContext,
     getHooks,
     getRuntimeConfig,
@@ -72,6 +72,19 @@ function initPluginAPI({ context, plugins }) {
     pickContext: hooks.pickContext.tap,
     ...extendsPluginApi
   };
+  return new Proxy(pluginAPI, {
+    get(target, prop) {
+      if (prop === "then") {
+        return void 0;
+      }
+      if (prop in target) {
+        return target[prop];
+      }
+      return () => {
+        console.warn(`api.${prop.toString()} not exist`);
+      };
+    }
+  });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/esm/cli/run/config/loadConfig.js

@@ -2,8 +2,8 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { bundleRequire, defaultGetOutputFile } from "@modern-js/node-bundle-require";
-import { fs, CONFIG_CACHE_DIR, globby } from "@modern-js/utils";
+import { fs, globby } from "@modern-js/utils";
+import jiti from "jiti";
 var getPackageConfig = function(appDirectory, packageJsonConfig) {
   var json = JSON.parse(fs.readFileSync(path.resolve(appDirectory, "./package.json"), "utf8"));
   return json[packageJsonConfig];
@@ -81,121 +81,46 @@ var clearFilesOverTime = function() {
     return _ref.apply(this, arguments);
   };
 }();
-var bundleRequireWithCatch = function() {
-  var _ref = _async_to_generator(function(configFile, param) {
-    var appDirectory, mod, e;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          appDirectory = param.appDirectory;
-          _state.label = 1;
-        case 1:
-          _state.trys.push([
-            1,
-            3,
-            ,
-            4
-          ]);
-          return [
-            4,
-            bundleRequire(configFile, {
-              autoClear: false,
-              getOutputFile: function() {
-                var _ref2 = _async_to_generator(function(filePath) {
-                  var defaultOutputFileName, _, outputPath, timeLimit;
-                  return _ts_generator(this, function(_state2) {
-                    switch (_state2.label) {
-                      case 0:
-                        _ = path.basename;
-                        return [
-                          4,
-                          defaultGetOutputFile(filePath)
-                        ];
-                      case 1:
-                        defaultOutputFileName = _.apply(path, [
-                          _state2.sent()
-                        ]);
-                        outputPath = path.join(appDirectory, CONFIG_CACHE_DIR);
-                        timeLimit = 10 * 60;
-                        return [
-                          4,
-                          clearFilesOverTime(outputPath, timeLimit)
-                        ];
-                      case 2:
-                        _state2.sent();
-                        return [
-                          2,
-                          path.join(outputPath, defaultOutputFileName)
-                        ];
-                    }
-                  });
-                });
-                return function(filePath) {
-                  return _ref2.apply(this, arguments);
-                };
-              }()
-            })
-          ];
-        case 2:
-          mod = _state.sent();
-          return [
-            2,
-            mod
-          ];
-        case 3:
-          e = _state.sent();
-          if (_instanceof(e, Error)) {
-            e.message = "Get Error while loading config file: ".concat(configFile, ", please check it and retry.\n").concat(e.message || "");
-          }
-          throw e;
-        case 4:
-          return [
-            2
-          ];
-      }
-    });
+function loadConfigContent(configFile) {
+  var _require = jiti(__filename, {
+    esmResolve: true,
+    // disable require cache to support restart CLI and read the new config
+    requireCache: false,
+    interopDefault: true
   });
-  return function bundleRequireWithCatch2(configFile, _) {
-    return _ref.apply(this, arguments);
-  };
-}();
+  if (!fs.existsSync(configFile)) {
+    throw new Error("Configuration file does not exist: ".concat(configFile));
+  }
+  try {
+    var config = _require(configFile);
+    return config.default || config;
+  } catch (e) {
+    if (_instanceof(e, Error)) {
+      e.message = "Get Error while loading config file: ".concat(configFile, ", please check it and retry.\n").concat(e.message || "");
+    }
+    throw e;
+  }
+}
 var loadConfig = function() {
   var _ref = _async_to_generator(function(appDirectory, configFile, packageJsonConfig) {
-    var pkgConfig, packageName, config, mod;
+    var pkgConfig, packageName, config;
     return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          if (packageJsonConfig) {
-            pkgConfig = getPackageConfig(appDirectory, packageJsonConfig);
-          }
-          packageName = require(path.resolve(appDirectory, "./package.json")).name;
-          if (!configFile)
-            return [
-              3,
-              2
-            ];
-          delete require.cache[configFile];
-          return [
-            4,
-            bundleRequireWithCatch(configFile, {
-              appDirectory
-            })
-          ];
-        case 1:
-          mod = _state.sent();
-          config = mod.default || mod;
-          _state.label = 2;
-        case 2:
-          return [
-            2,
-            {
-              packageName,
-              configFile,
-              config,
-              pkgConfig
-            }
-          ];
+      if (packageJsonConfig) {
+        pkgConfig = getPackageConfig(appDirectory, packageJsonConfig);
+      }
+      packageName = require(path.resolve(appDirectory, "./package.json")).name;
+      if (configFile) {
+        config = loadConfigContent(configFile);
       }
+      return [
+        2,
+        {
+          packageName,
+          configFile,
+          config,
+          pkgConfig
+        }
+      ];
     });
   });
   return function loadConfig2(appDirectory, configFile, packageJsonConfig) {

package/dist/esm/runtime/api.js

@@ -6,7 +6,7 @@ function initPluginAPI(param) {
   var hooks = context.hooks, extendsHooks = context.extendsHooks;
   function getRuntimeContext() {
     if (context) {
-      var hooks2 = context.hooks, extendsHooks2 = context.extendsHooks, config = context.config, pluginAPI = context.pluginAPI, runtimeContext = _object_without_properties(context, [
+      var hooks2 = context.hooks, extendsHooks2 = context.extendsHooks, config = context.config, pluginAPI2 = context.pluginAPI, runtimeContext = _object_without_properties(context, [
         "hooks",
         "extendsHooks",
         "config",
@@ -44,7 +44,7 @@ function initPluginAPI(param) {
       extendsPluginApi[hookName] = extendsHooks[hookName].tap;
     });
   }
-  return _object_spread({
+  var pluginAPI = _object_spread({
     updateRuntimeContext,
     getHooks,
     getRuntimeConfig,
@@ -53,6 +53,19 @@ function initPluginAPI(param) {
     wrapRoot: hooks.wrapRoot.tap,
     pickContext: hooks.pickContext.tap
   }, extendsPluginApi);
+  return new Proxy(pluginAPI, {
+    get: function get(target, prop) {
+      if (prop === "then") {
+        return void 0;
+      }
+      if (prop in target) {
+        return target[prop];
+      }
+      return function() {
+        console.warn("api.".concat(prop.toString(), " not exist"));
+      };
+    }
+  });
 }
 export {
   initPluginAPI

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

@@ -1,6 +1,6 @@
 import path from "path";
-import { bundleRequire, defaultGetOutputFile } from "@modern-js/node-bundle-require";
-import { fs, CONFIG_CACHE_DIR, globby } from "@modern-js/utils";
+import { fs, globby } from "@modern-js/utils";
+import jiti from "jiti";
 const getPackageConfig = (appDirectory, packageJsonConfig) => {
   const json = JSON.parse(fs.readFileSync(path.resolve(appDirectory, "./package.json"), "utf8"));
   return json[packageJsonConfig];
@@ -28,19 +28,19 @@ const clearFilesOverTime = async (targetDir, overtime) => {
   } catch (err) {
   }
 };
-const bundleRequireWithCatch = async (configFile, { appDirectory }) => {
+function loadConfigContent(configFile) {
+  const _require = jiti(__filename, {
+    esmResolve: true,
+    // disable require cache to support restart CLI and read the new config
+    requireCache: false,
+    interopDefault: true
+  });
+  if (!fs.existsSync(configFile)) {
+    throw new Error(`Configuration file does not exist: ${configFile}`);
+  }
   try {
-    const mod = await bundleRequire(configFile, {
-      autoClear: false,
-      getOutputFile: async (filePath) => {
-        const defaultOutputFileName = path.basename(await defaultGetOutputFile(filePath));
-        const outputPath = path.join(appDirectory, CONFIG_CACHE_DIR);
-        const timeLimit = 10 * 60;
-        await clearFilesOverTime(outputPath, timeLimit);
-        return path.join(outputPath, defaultOutputFileName);
-      }
-    });
-    return mod;
+    const config = _require(configFile);
+    return config.default || config;
   } catch (e) {
     if (e instanceof Error) {
       e.message = `Get Error while loading config file: ${configFile}, please check it and retry.
@@ -48,7 +48,7 @@ ${e.message || ""}`;
     }
     throw e;
   }
-};
+}
 const loadConfig = async (appDirectory, configFile, packageJsonConfig) => {
   let pkgConfig;
   if (packageJsonConfig) {
@@ -57,11 +57,7 @@ const loadConfig = async (appDirectory, configFile, packageJsonConfig) => {
   const packageName = require(path.resolve(appDirectory, "./package.json")).name;
   let config;
   if (configFile) {
-    delete require.cache[configFile];
-    const mod = await bundleRequireWithCatch(configFile, {
-      appDirectory
-    });
-    config = mod.default || mod;
+    config = loadConfigContent(configFile);
   }
   return {
     packageName,

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

@@ -3,7 +3,7 @@ function initPluginAPI({ context, plugins }) {
   const { hooks, extendsHooks } = context;
   function getRuntimeContext() {
     if (context) {
-      const { hooks: hooks2, extendsHooks: extendsHooks2, config, pluginAPI, ...runtimeContext } = context;
+      const { hooks: hooks2, extendsHooks: extendsHooks2, config, pluginAPI: pluginAPI2, ...runtimeContext } = context;
       runtimeContext._internalContext = context;
       return runtimeContext;
     }
@@ -39,7 +39,7 @@ function initPluginAPI({ context, plugins }) {
       extendsPluginApi[hookName] = extendsHooks[hookName].tap;
     });
   }
-  return {
+  const pluginAPI = {
     updateRuntimeContext,
     getHooks,
     getRuntimeConfig,
@@ -49,6 +49,19 @@ function initPluginAPI({ context, plugins }) {
     pickContext: hooks.pickContext.tap,
     ...extendsPluginApi
   };
+  return new Proxy(pluginAPI, {
+    get(target, prop) {
+      if (prop === "then") {
+        return void 0;
+      }
+      if (prop in target) {
+        return target[prop];
+      }
+      return () => {
+        console.warn(`api.${prop.toString()} not exist`);
+      };
+    }
+  });
 }
 export {
   initPluginAPI

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

@@ -1,6 +1,6 @@
 import type { OnAfterBuildFn, OnAfterCreateCompilerFn, OnBeforeBuildFn, OnBeforeCreateCompilerFn, OnDevCompileDoneFn } from '@rsbuild/core';
 import type { Hooks } from '../../cli/hooks';
-import type { PluginHookTap } from '../hooks';
+import type { PluginHook, PluginHookTap } from '../hooks';
 import type { DeepPartial } from '../utils';
 import type { AppContext } from './context';
 import type { AddCommandFn, AddWatchFilesFn, ConfigFn, ModifyBundlerChainFn, ModifyConfigFn, ModifyHtmlPartialsFn, ModifyResolvedConfigFn, ModifyRsbuildConfigFn, ModifyRspackConfigFn, ModifyWebpackChainFn, ModifyWebpackConfigFn, OnAfterDeployFn, OnAfterDevFn, OnBeforeDeployFn, OnBeforeDevFn, OnBeforeExitFn, OnBeforeRestartFn, OnFileChangedFn, OnPrepareFn } from './hooks';
@@ -42,4 +42,9 @@ export type CLIPluginAPI<Extends extends CLIPluginExtends> = Readonly<{
     onBeforeDeploy: PluginHookTap<OnBeforeDeployFn>;
     onAfterDeploy: PluginHookTap<OnAfterDeployFn>;
     onBeforeExit: PluginHookTap<OnBeforeExitFn>;
-}>;
+} & CLIPluginExtendsAPI<Extends>>;
+export type CLIPluginExtendsAPI<Extends extends CLIPluginExtends> = {
+    [K in keyof Extends['extendHooks']]: PluginHookTap<Extends['extendHooks'][K] extends PluginHook<infer Args> ? Args extends (...args: any[]) => any ? Args : (...args: any[]) => any : (...args: any[]) => any>;
+} & Extends['extendApi'];
+export type AllKeysForCLIPluginExtendsAPI<Extends extends CLIPluginExtends> = keyof CLIPluginExtendsAPI<Extends>;
+export type AllValueForCLIPluginExtendsAPI<Extends extends CLIPluginExtends> = CLIPluginExtendsAPI<Extends>[AllKeysForCLIPluginExtendsAPI<Extends>];

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

@@ -5,11 +5,11 @@ export type SyncHook<Callback extends (...args: any[]) => any> = {
 };
 export type AsyncHook<Callback extends (...args: any[]) => any> = {
     tap: (cb: Callback) => void;
-    call: (...args: Parameters<Callback>) => Promise<ReturnType<Callback>>;
+    call: (...args: Parameters<Callback>) => Promise<ReturnType<UnwrapPromise<Callback>>>;
 };
 export type AsyncInterruptHook<Callback extends (...args: any[]) => any> = {
     tap: (cb: Callback) => void;
-    call: (...args: Tail<Parameters<Callback>>) => Promise<ReturnType<Callback>>;
+    call: (...args: Tail<Parameters<Callback>>) => Promise<ReturnType<UnwrapPromise<Callback>>>;
 };
 export type CollectAsyncHook<Callback extends (...params: any[]) => any> = {
     tap: (cb: Callback) => void;

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

@@ -1,4 +1,4 @@
-import type { PluginHookTap } from '../hooks';
+import type { PluginHook, PluginHookTap } from '../hooks';
 import type { DeepPartial } from '../utils';
 import type { RuntimeContext } from './context';
 import type { Hooks } from './hooks';
@@ -12,4 +12,9 @@ export type RuntimePluginAPI<Extends extends RuntimePluginExtends> = Readonly<{
     wrapRoot: PluginHookTap<WrapRootFn>;
     pickContext: PluginHookTap<PickContextFn<RuntimeContext>>;
     modifyRuntimeConfig: PluginHookTap<ModifyRuntimeConfigFn<Extends['config']>>;
-}>;
+} & RuntimePluginExtendsAPI<Extends>>;
+export type RuntimePluginExtendsAPI<Extends extends RuntimePluginExtends> = {
+    [K in keyof Extends['extendHooks']]: PluginHookTap<Extends['extendHooks'][K] extends PluginHook<infer Args> ? Args extends (...args: any[]) => any ? Args : (...args: any[]) => any : (...args: any[]) => any>;
+} & Extends['extendApi'];
+export type AllKeysForRuntimePluginExtendsAPI<Extends extends RuntimePluginExtends> = keyof RuntimePluginExtendsAPI<Extends>;
+export type AllValueForRuntimePluginExtendsAPI<Extends extends RuntimePluginExtends> = RuntimePluginExtendsAPI<Extends>[AllKeysForRuntimePluginExtendsAPI<Extends>];

package/package.json

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