@modern-js/plugin-v2 2.67.1-alpha.4 → 2.67.1-alpha.6

package/dist/cjs/cli/api.js

@@ -25,29 +25,30 @@ var import_lodash = require("@modern-js/utils/lodash");
 var import_context = require("./context");
 var import_debug = require("./run/utils/debug");
 function initPluginAPI({ context, pluginManager }) {
-  const { hooks, extendsHooks, plugins } = context;
+  let internalContext = context;
+  const { hooks, extendsHooks, plugins } = internalContext;
   function getAppContext() {
-    if (context) {
-      const { hooks: hooks2, extendsHooks: extendsHooks2, config, normalizedConfig, pluginAPI: pluginAPI2, ...appContext } = context;
-      appContext._internalContext = context;
+    if (internalContext) {
+      const { hooks: hooks2, extendsHooks: extendsHooks2, config, normalizedConfig, pluginAPI: pluginAPI2, ...appContext } = internalContext;
+      appContext._internalContext = internalContext;
       return appContext;
     }
     throw new Error("Cannot access context");
   }
   function getConfig() {
-    if (context.config) {
-      return context.config;
+    if (internalContext.config) {
+      return internalContext.config;
     }
     throw new Error("Cannot access config");
   }
   function getNormalizedConfig() {
-    if (context.normalizedConfig) {
-      return context.normalizedConfig;
+    if (internalContext.normalizedConfig) {
+      return internalContext.normalizedConfig;
     }
     throw new Error("Cannot access normalized config");
   }
   function getHooks() {
-    return context.hooks;
+    return internalContext.hooks;
   }
   const extendsPluginApi = {};
   plugins.forEach((plugin) => {
@@ -65,11 +66,11 @@ function initPluginAPI({ context, pluginManager }) {
     });
   }
   function updateAppContext(updateContext) {
-    context = (0, import_lodash.assign)(context, updateContext);
+    internalContext = (0, import_lodash.assign)(internalContext, updateContext);
   }
-  async function _internal_resetAppContext({ appContext, config, normalizedConfig }) {
-    const { packageName, configFile, command, appDirectory, metaName } = context;
-    context = await (0, import_context.createContext)({
+  function _internal_resetAppContext({ appContext, config, normalizedConfig }) {
+    const { packageName, configFile, command, appDirectory, metaName } = internalContext;
+    internalContext = (0, import_context.createContext)({
       appContext: (0, import_lodash.assign)({}, (0, import_context.initAppContext)({
         packageName,
         configFile,

package/dist/cjs/cli/context.js

@@ -49,7 +49,7 @@ function initAppContext(params) {
     plugins: params.plugins
   };
 }
-async function createContext({ appContext, config, normalizedConfig }) {
+function createContext({ appContext, config, normalizedConfig }) {
   const { plugins } = appContext;
   const extendsHooks = {};
   plugins.forEach((plugin) => {

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

@@ -73,7 +73,7 @@ const createCli = () => {
     pluginManager.addPlugins(allPlugins);
     const plugins = await pluginManager.getPlugins();
     debug("CLI Plugins:", plugins.map((p) => p.name));
-    const context = await (0, import_context.createContext)({
+    const context = (0, import_context.createContext)({
       appContext: (0, import_context.initAppContext)({
         packageName: loaded.packageName,
         configFile: loaded.configFile,

package/dist/esm/cli/api.js

@@ -1,41 +1,40 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { assign } from "@modern-js/utils/lodash";
 import { createContext, initAppContext } from "./context";
 import { debug } from "./run/utils/debug";
 function initPluginAPI(param) {
   var context = param.context, pluginManager = param.pluginManager;
-  var hooks = context.hooks, extendsHooks = context.extendsHooks, plugins = context.plugins;
+  var internalContext = context;
+  var hooks = internalContext.hooks, extendsHooks = internalContext.extendsHooks, plugins = internalContext.plugins;
   function getAppContext() {
-    if (context) {
-      var hooks2 = context.hooks, extendsHooks2 = context.extendsHooks, config = context.config, normalizedConfig = context.normalizedConfig, pluginAPI2 = context.pluginAPI, appContext = _object_without_properties(context, [
+    if (internalContext) {
+      var hooks2 = internalContext.hooks, extendsHooks2 = internalContext.extendsHooks, config = internalContext.config, normalizedConfig = internalContext.normalizedConfig, pluginAPI2 = internalContext.pluginAPI, appContext = _object_without_properties(internalContext, [
         "hooks",
         "extendsHooks",
         "config",
         "normalizedConfig",
         "pluginAPI"
       ]);
-      appContext._internalContext = context;
+      appContext._internalContext = internalContext;
       return appContext;
     }
     throw new Error("Cannot access context");
   }
   function getConfig() {
-    if (context.config) {
-      return context.config;
+    if (internalContext.config) {
+      return internalContext.config;
     }
     throw new Error("Cannot access config");
   }
   function getNormalizedConfig() {
-    if (context.normalizedConfig) {
-      return context.normalizedConfig;
+    if (internalContext.normalizedConfig) {
+      return internalContext.normalizedConfig;
     }
     throw new Error("Cannot access normalized config");
   }
   function getHooks() {
-    return context.hooks;
+    return internalContext.hooks;
   }
   var extendsPluginApi = {};
   plugins.forEach(function(plugin) {
@@ -53,43 +52,23 @@ function initPluginAPI(param) {
     });
   }
   function updateAppContext(updateContext) {
-    context = assign(context, updateContext);
+    internalContext = assign(internalContext, updateContext);
   }
-  function _internal_resetAppContext(_) {
-    return __internal_resetAppContext.apply(this, arguments);
-  }
-  function __internal_resetAppContext() {
-    __internal_resetAppContext = _async_to_generator(function(param2) {
-      var appContext, config, normalizedConfig, packageName, configFile, command, appDirectory, metaName;
-      return _ts_generator(this, function(_state) {
-        switch (_state.label) {
-          case 0:
-            appContext = param2.appContext, config = param2.config, normalizedConfig = param2.normalizedConfig;
-            packageName = context.packageName, configFile = context.configFile, command = context.command, appDirectory = context.appDirectory, metaName = context.metaName;
-            return [
-              4,
-              createContext({
-                appContext: assign({}, initAppContext({
-                  packageName,
-                  configFile,
-                  command,
-                  appDirectory,
-                  plugins,
-                  metaName
-                }), appContext),
-                config,
-                normalizedConfig
-              })
-            ];
-          case 1:
-            context = _state.sent();
-            return [
-              2
-            ];
-        }
-      });
+  function _internal_resetAppContext(param2) {
+    var appContext = param2.appContext, config = param2.config, normalizedConfig = param2.normalizedConfig;
+    var packageName = internalContext.packageName, configFile = internalContext.configFile, command = internalContext.command, appDirectory = internalContext.appDirectory, metaName = internalContext.metaName;
+    internalContext = createContext({
+      appContext: assign({}, initAppContext({
+        packageName,
+        configFile,
+        command,
+        appDirectory,
+        plugins,
+        metaName
+      }), appContext),
+      config,
+      normalizedConfig
     });
-    return __internal_resetAppContext.apply(this, arguments);
   }
   var pluginAPI = _object_spread({
     isPluginExists: pluginManager.isPluginExists,

package/dist/esm/cli/context.js

@@ -1,7 +1,5 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { initHooks } from "./hooks";
 function initAppContext(params) {
@@ -19,34 +17,22 @@ function initAppContext(params) {
     plugins: params.plugins
   };
 }
-function createContext(_) {
-  return _createContext.apply(this, arguments);
-}
-function _createContext() {
-  _createContext = _async_to_generator(function(param) {
-    var appContext, config, normalizedConfig, plugins, extendsHooks;
-    return _ts_generator(this, function(_state) {
-      appContext = param.appContext, config = param.config, normalizedConfig = param.normalizedConfig;
-      plugins = appContext.plugins;
-      extendsHooks = {};
-      plugins.forEach(function(plugin) {
-        var _plugin_registryHooks = plugin.registryHooks, registryHooks = _plugin_registryHooks === void 0 ? {} : _plugin_registryHooks;
-        Object.keys(registryHooks).forEach(function(hookName) {
-          extendsHooks[hookName] = registryHooks[hookName];
-        });
-      });
-      return [
-        2,
-        _object_spread_props(_object_spread({}, appContext), {
-          hooks: _object_spread({}, initHooks(), extendsHooks),
-          extendsHooks,
-          config,
-          normalizedConfig
-        })
-      ];
+function createContext(param) {
+  var appContext = param.appContext, config = param.config, normalizedConfig = param.normalizedConfig;
+  var plugins = appContext.plugins;
+  var extendsHooks = {};
+  plugins.forEach(function(plugin) {
+    var _plugin_registryHooks = plugin.registryHooks, registryHooks = _plugin_registryHooks === void 0 ? {} : _plugin_registryHooks;
+    Object.keys(registryHooks).forEach(function(hookName) {
+      extendsHooks[hookName] = registryHooks[hookName];
     });
   });
-  return _createContext.apply(this, arguments);
+  return _object_spread_props(_object_spread({}, appContext), {
+    hooks: _object_spread({}, initHooks(), extendsHooks),
+    extendsHooks,
+    config,
+    normalizedConfig
+  });
 }
 export {
   createContext,

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

@@ -99,84 +99,79 @@ var createCli = function() {
             debug("CLI Plugins:", plugins.map(function(p) {
               return p.name;
             }));
-            return [
-              4,
-              createContext({
-                appContext: initAppContext({
-                  packageName: loaded.packageName,
-                  configFile: loaded.configFile,
-                  command,
-                  appDirectory,
-                  plugins,
-                  metaName
-                }),
-                config: loaded.config,
-                normalizedConfig: {}
-              })
-            ];
-          case 4:
-            context = _state.sent();
+            context = createContext({
+              appContext: initAppContext({
+                packageName: loaded.packageName,
+                configFile: loaded.configFile,
+                command,
+                appDirectory,
+                plugins,
+                metaName
+              }),
+              config: loaded.config,
+              normalizedConfig: {}
+            });
             pluginAPI = initPluginAPI({
               context,
               pluginManager
             });
             context.pluginAPI = pluginAPI;
             _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-            _state.label = 5;
-          case 5:
+            _state.label = 4;
+          case 4:
             _state.trys.push([
-              5,
+              4,
+              10,
               11,
-              12,
-              13
+              12
             ]);
             _iterator = plugins[Symbol.iterator]();
-            _state.label = 6;
-          case 6:
+            _state.label = 5;
+          case 5:
             if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done))
               return [
                 3,
-                10
+                9
               ];
             plugin = _step.value;
             return [
               4,
               (_plugin_setup = plugin.setup) === null || _plugin_setup === void 0 ? void 0 : _plugin_setup.call(plugin, pluginAPI)
             ];
-          case 7:
+          case 6:
             setupResult = _state.sent();
             if (!handleSetupResult)
               return [
                 3,
-                9
+                8
               ];
             return [
               4,
               handleSetupResult(setupResult, pluginAPI)
             ];
-          case 8:
+          case 7:
             _state.sent();
-            _state.label = 9;
-          case 9:
+            _state.label = 8;
+          case 8:
             _iteratorNormalCompletion = true;
             return [
               3,
-              6
+              5
             ];
-          case 10:
+          case 9:
             return [
               3,
-              13
+              12
             ];
-          case 11:
+          case 10:
             err = _state.sent();
             _didIteratorError = true;
             _iteratorError = err;
             return [
               3,
-              13
+              12
             ];
-          case 12:
+          case 11:
             try {
               if (!_iteratorNormalCompletion && _iterator.return != null) {
                 _iterator.return();
@@ -189,7 +184,7 @@ var createCli = function() {
             return [
               7
             ];
-          case 13:
+          case 12:
             [
               "SIGINT",
               "SIGTERM",
@@ -207,38 +202,38 @@ var createCli = function() {
               4,
               context.hooks.config.call()
             ];
-          case 14:
+          case 13:
             extraConfigs = _state.sent();
             return [
               4,
               createResolveConfig(loaded, extraConfigs)
             ];
-          case 15:
+          case 14:
             normalizedConfig = _state.sent();
             return [
               4,
               context.hooks.modifyResolvedConfig.call(normalizedConfig)
             ];
-          case 16:
+          case 15:
             resolved = _state.sent();
             context.normalizedConfig = resolved || normalizedConfig;
             return [
               4,
               pluginAPI.updateAppContext(context)
             ];
-          case 17:
+          case 16:
             _state.sent();
             return [
               4,
               context.hooks.onPrepare.call()
             ];
-          case 18:
+          case 17:
             _state.sent();
             return [
               4,
               (_context_hooks = context.hooks) === null || _context_hooks === void 0 ? void 0 : (_context_hooks_onAfterPrepare = _context_hooks.onAfterPrepare) === null || _context_hooks_onAfterPrepare === void 0 ? void 0 : _context_hooks_onAfterPrepare.call()
             ];
-          case 19:
+          case 18:
             _state.sent();
             return [
               2,

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

@@ -2,29 +2,30 @@ import { assign } from "@modern-js/utils/lodash";
 import { createContext, initAppContext } from "./context";
 import { debug } from "./run/utils/debug";
 function initPluginAPI({ context, pluginManager }) {
-  const { hooks, extendsHooks, plugins } = context;
+  let internalContext = context;
+  const { hooks, extendsHooks, plugins } = internalContext;
   function getAppContext() {
-    if (context) {
-      const { hooks: hooks2, extendsHooks: extendsHooks2, config, normalizedConfig, pluginAPI: pluginAPI2, ...appContext } = context;
-      appContext._internalContext = context;
+    if (internalContext) {
+      const { hooks: hooks2, extendsHooks: extendsHooks2, config, normalizedConfig, pluginAPI: pluginAPI2, ...appContext } = internalContext;
+      appContext._internalContext = internalContext;
       return appContext;
     }
     throw new Error("Cannot access context");
   }
   function getConfig() {
-    if (context.config) {
-      return context.config;
+    if (internalContext.config) {
+      return internalContext.config;
     }
     throw new Error("Cannot access config");
   }
   function getNormalizedConfig() {
-    if (context.normalizedConfig) {
-      return context.normalizedConfig;
+    if (internalContext.normalizedConfig) {
+      return internalContext.normalizedConfig;
     }
     throw new Error("Cannot access normalized config");
   }
   function getHooks() {
-    return context.hooks;
+    return internalContext.hooks;
   }
   const extendsPluginApi = {};
   plugins.forEach((plugin) => {
@@ -42,11 +43,11 @@ function initPluginAPI({ context, pluginManager }) {
     });
   }
   function updateAppContext(updateContext) {
-    context = assign(context, updateContext);
+    internalContext = assign(internalContext, updateContext);
   }
-  async function _internal_resetAppContext({ appContext, config, normalizedConfig }) {
-    const { packageName, configFile, command, appDirectory, metaName } = context;
-    context = await createContext({
+  function _internal_resetAppContext({ appContext, config, normalizedConfig }) {
+    const { packageName, configFile, command, appDirectory, metaName } = internalContext;
+    internalContext = createContext({
       appContext: assign({}, initAppContext({
         packageName,
         configFile,

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

@@ -15,7 +15,7 @@ function initAppContext(params) {
     plugins: params.plugins
   };
 }
-async function createContext({ appContext, config, normalizedConfig }) {
+function createContext({ appContext, config, normalizedConfig }) {
   const { plugins } = appContext;
   const extendsHooks = {};
   plugins.forEach((plugin) => {

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

@@ -50,7 +50,7 @@ const createCli = () => {
     pluginManager.addPlugins(allPlugins);
     const plugins = await pluginManager.getPlugins();
     debug("CLI Plugins:", plugins.map((p) => p.name));
-    const context = await createContext({
+    const context = createContext({
       appContext: initAppContext({
         packageName: loaded.packageName,
         configFile: loaded.configFile,

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

@@ -15,4 +15,4 @@ export declare function initAppContext<Extends extends CLIPluginExtends>(params:
     srcDir?: string;
     distDir?: string;
 }): AppContext<Extends>;
-export declare function createContext<Extends extends CLIPluginExtends>({ appContext, config, normalizedConfig, }: ContextParams<Extends>): Promise<InternalContext<Extends>>;
+export declare function createContext<Extends extends CLIPluginExtends>({ appContext, config, normalizedConfig, }: ContextParams<Extends>): InternalContext<Extends>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.67.1-alpha.4",
+  "version": "2.67.1-alpha.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -81,8 +81,8 @@
   "dependencies": {
     "@swc/helpers": "0.5.13",
     "jiti": "1.21.7",
-    "@modern-js/utils": "2.67.0",
-    "@modern-js/runtime-utils": "2.67.0"
+    "@modern-js/runtime-utils": "2.67.0",
+    "@modern-js/utils": "2.67.0"
   },
   "devDependencies": {
     "@rsbuild/core": "1.3.2",