@modern-js/plugin-v2 2.67.1-alpha.5 → 2.67.1

package/dist/cjs/cli/api.js

@@ -22,7 +22,6 @@ __export(api_exports, {
 });
 module.exports = __toCommonJS(api_exports);
 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;
@@ -53,7 +52,7 @@ function initPluginAPI({ context, pluginManager }) {
   plugins.forEach((plugin) => {
     const { _registryApi } = plugin;
     if (_registryApi) {
-      const apis = _registryApi(getAppContext, updateAppContext, _internal_resetAppContext);
+      const apis = _registryApi(getAppContext, updateAppContext);
       Object.keys(apis).forEach((apiName) => {
         extendsPluginApi[apiName] = apis[apiName];
       });
@@ -67,21 +66,6 @@ function initPluginAPI({ context, pluginManager }) {
   function updateAppContext(updateContext) {
     context = (0, import_lodash.assign)(context, updateContext);
   }
-  function _internal_resetAppContext({ appContext, config, normalizedConfig }) {
-    const { packageName, configFile, command, appDirectory, metaName } = context;
-    context = (0, import_context.createContext)({
-      appContext: (0, import_lodash.assign)({}, (0, import_context.initAppContext)({
-        packageName,
-        configFile,
-        command,
-        appDirectory,
-        plugins,
-        metaName
-      }), appContext),
-      config,
-      normalizedConfig
-    });
-  }
   const pluginAPI = {
     isPluginExists: pluginManager.isPluginExists,
     getAppContext,
@@ -89,7 +73,6 @@ function initPluginAPI({ context, pluginManager }) {
     getNormalizedConfig,
     getHooks,
     updateAppContext,
-    _internal_resetAppContext,
     config: hooks.config.tap,
     modifyConfig: hooks.modifyConfig.tap,
     modifyResolvedConfig: hooks.modifyResolvedConfig.tap,

package/dist/cjs/cli/context.js

@@ -49,7 +49,7 @@ function initAppContext(params) {
     plugins: params.plugins
   };
 }
-function createContext({ appContext, config, normalizedConfig }) {
+async 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 = (0, import_context.createContext)({
+    const context = await (0, import_context.createContext)({
       appContext: (0, import_context.initAppContext)({
         packageName: loaded.packageName,
         configFile: loaded.configFile,

package/dist/esm/cli/api.js

@@ -1,7 +1,6 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 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;
@@ -39,7 +38,7 @@ function initPluginAPI(param) {
   plugins.forEach(function(plugin) {
     var _registryApi = plugin._registryApi;
     if (_registryApi) {
-      var apis = _registryApi(getAppContext, updateAppContext, _internal_resetAppContext);
+      var apis = _registryApi(getAppContext, updateAppContext);
       Object.keys(apis).forEach(function(apiName) {
         extendsPluginApi[apiName] = apis[apiName];
       });
@@ -53,22 +52,6 @@ function initPluginAPI(param) {
   function updateAppContext(updateContext) {
     context = assign(context, updateContext);
   }
-  function _internal_resetAppContext(param2) {
-    var appContext = param2.appContext, config = param2.config, normalizedConfig = param2.normalizedConfig;
-    var packageName = context.packageName, configFile = context.configFile, command = context.command, appDirectory = context.appDirectory, metaName = context.metaName;
-    context = createContext({
-      appContext: assign({}, initAppContext({
-        packageName,
-        configFile,
-        command,
-        appDirectory,
-        plugins,
-        metaName
-      }), appContext),
-      config,
-      normalizedConfig
-    });
-  }
   var pluginAPI = _object_spread({
     isPluginExists: pluginManager.isPluginExists,
     getAppContext,
@@ -76,7 +59,6 @@ function initPluginAPI(param) {
     getNormalizedConfig,
     getHooks,
     updateAppContext,
-    _internal_resetAppContext,
     config: hooks.config.tap,
     modifyConfig: hooks.modifyConfig.tap,
     modifyResolvedConfig: hooks.modifyResolvedConfig.tap,

package/dist/esm/cli/context.js

@@ -1,5 +1,7 @@
+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) {
@@ -17,22 +19,34 @@ function initAppContext(params) {
     plugins: params.plugins
   };
 }
-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];
+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
+        })
+      ];
     });
   });
-  return _object_spread_props(_object_spread({}, appContext), {
-    hooks: _object_spread({}, initHooks(), extendsHooks),
-    extendsHooks,
-    config,
-    normalizedConfig
-  });
+  return _createContext.apply(this, arguments);
 }
 export {
   createContext,

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

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

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

@@ -1,5 +1,4 @@
 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;
@@ -30,7 +29,7 @@ function initPluginAPI({ context, pluginManager }) {
   plugins.forEach((plugin) => {
     const { _registryApi } = plugin;
     if (_registryApi) {
-      const apis = _registryApi(getAppContext, updateAppContext, _internal_resetAppContext);
+      const apis = _registryApi(getAppContext, updateAppContext);
       Object.keys(apis).forEach((apiName) => {
         extendsPluginApi[apiName] = apis[apiName];
       });
@@ -44,21 +43,6 @@ function initPluginAPI({ context, pluginManager }) {
   function updateAppContext(updateContext) {
     context = assign(context, updateContext);
   }
-  function _internal_resetAppContext({ appContext, config, normalizedConfig }) {
-    const { packageName, configFile, command, appDirectory, metaName } = context;
-    context = createContext({
-      appContext: assign({}, initAppContext({
-        packageName,
-        configFile,
-        command,
-        appDirectory,
-        plugins,
-        metaName
-      }), appContext),
-      config,
-      normalizedConfig
-    });
-  }
   const pluginAPI = {
     isPluginExists: pluginManager.isPluginExists,
     getAppContext,
@@ -66,7 +50,6 @@ function initPluginAPI({ context, pluginManager }) {
     getNormalizedConfig,
     getHooks,
     updateAppContext,
-    _internal_resetAppContext,
     config: hooks.config.tap,
     modifyConfig: hooks.modifyConfig.tap,
     modifyResolvedConfig: hooks.modifyResolvedConfig.tap,

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

@@ -15,7 +15,7 @@ function initAppContext(params) {
     plugins: params.plugins
   };
 }
-function createContext({ appContext, config, normalizedConfig }) {
+async 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 = createContext({
+    const context = await createContext({
       appContext: initAppContext({
         packageName: loaded.packageName,
         configFile: loaded.configFile,

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

@@ -1,6 +1,6 @@
 import type { AppContext, InternalContext } from '../types/cli/context';
 import type { CLIPlugin, CLIPluginExtends } from '../types/cli/plugin';
-export interface ContextParams<Extends extends CLIPluginExtends> {
+interface ContextParams<Extends extends CLIPluginExtends> {
     appContext: AppContext<Extends>;
     config: Extends['config'];
     normalizedConfig: Extends['normalizedConfig'];
@@ -15,4 +15,5 @@ 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>): InternalContext<Extends>;
+export declare function createContext<Extends extends CLIPluginExtends>({ appContext, config, normalizedConfig, }: ContextParams<Extends>): Promise<InternalContext<Extends>>;
+export {};

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

@@ -15,7 +15,6 @@ export type CLIPluginAPI<Extends extends CLIPluginExtends> = Readonly<{
     getNormalizedConfig: () => Readonly<Extends['normalizedConfig']>;
     getHooks: () => Readonly<Hooks<Extends['config'], Extends['normalizedConfig'], Extends['extendBuildUtils'], Extends['extendConfigUtils']> & Extends['extendHooks']>;
     updateAppContext: (appContext: DeepPartial<AppContext<Extends> & Extends['extendContext']>) => void;
-    _internal_resetAppContext: (appContext: AppContext<Extends> & Extends['extendContext']) => void;
     config: PluginHookTap<ConfigFn<DeepPartial<Extends['config']>>>;
     modifyConfig: PluginHookTap<ModifyConfigFn<Extends['config'], Extends['extendConfigUtils']>>;
     modifyResolvedConfig: PluginHookTap<ModifyResolvedConfigFn<Extends['normalizedConfig'], Extends['extendConfigUtils']>>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.67.1-alpha.5",
+  "version": "2.67.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -81,19 +81,19 @@
   "dependencies": {
     "@swc/helpers": "0.5.13",
     "jiti": "1.21.7",
-    "@modern-js/runtime-utils": "2.67.0",
-    "@modern-js/utils": "2.67.0"
+    "@modern-js/runtime-utils": "2.67.1",
+    "@modern-js/utils": "2.67.1"
   },
   "devDependencies": {
-    "@rsbuild/core": "1.3.2",
+    "@rsbuild/core": "1.3.5",
     "@types/jest": "^29",
     "@types/node": "^14",
     "@types/react": "^18.3.11",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/types": "2.67.0",
+    "@modern-js/types": "2.67.1",
+    "@modern-js/uni-builder": "2.67.1",
     "@scripts/build": "2.66.0",
-    "@modern-js/uni-builder": "2.67.0",
     "@scripts/jest-config": "2.66.0"
   },
   "sideEffects": false,