@modern-js/plugin-v2 2.66.0 → 2.67.1-alpha.0

package/dist/cjs/cli/api.js

@@ -21,6 +21,7 @@ __export(api_exports, {
   initPluginAPI: () => initPluginAPI
 });
 module.exports = __toCommonJS(api_exports);
+var import_utils = require("@modern-js/utils");
 var import_lodash = require("@modern-js/utils/lodash");
 var import_debug = require("./run/utils/debug");
 function initPluginAPI({ context, pluginManager }) {
@@ -64,7 +65,20 @@ function initPluginAPI({ context, pluginManager }) {
     });
   }
   function updateAppContext(updateContext) {
-    context = (0, import_lodash.assign)(context, updateContext);
+    context = (0, import_lodash.assignWith)(context, updateContext, (source, target) => {
+      if (Array.isArray(target) || Array.isArray(source)) {
+        if (target === void 0) {
+          return source;
+        }
+        if (source === void 0) {
+          return target;
+        }
+        return [
+          ...(0, import_utils.ensureArray)(target),
+          ...(0, import_utils.ensureArray)(source)
+        ];
+      }
+    });
   }
   const pluginAPI = {
     isPluginExists: pluginManager.isPluginExists,

package/dist/cjs/cli/context.js

@@ -37,6 +37,7 @@ var import_hooks = require("./hooks");
 function initAppContext(params) {
   const { appDirectory, srcDir = "src", distDir = "dist" } = params;
   return {
+    metaName: params.metaName,
     packageName: params.packageName,
     configFile: params.configFile,
     command: params.command,

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

@@ -58,11 +58,12 @@ const createCli = () => {
     var _context_hooks_onAfterPrepare, _context_hooks;
     pluginManager.clear();
     initOptions = options;
-    const { metaName = "MODERN", configFile, config, command, version, packageJsonConfig, internalPlugins, handleSetupResult } = options;
+    const { metaName = "modern-js", 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 envName = metaName === "modern-js" ? "MODERN" : metaName;
+    (0, import_loadEnv.loadEnv)(appDirectory, process.env[`${envName.toUpperCase()}_ENV`]);
     const loaded = await (0, import_createLoadedConfig.createLoadedConfig)(appDirectory, configFile, packageJsonConfig, config);
     const allPlugins = [
       ...internalPlugins || [],
@@ -78,7 +79,8 @@ const createCli = () => {
         configFile: loaded.configFile,
         command,
         appDirectory,
-        plugins
+        plugins,
+        metaName
       }),
       config: loaded.config,
       normalizedConfig: {}

package/dist/esm/cli/api.js

@@ -1,6 +1,8 @@
 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 { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
+import { ensureArray } from "@modern-js/utils";
+import { assignWith } from "@modern-js/utils/lodash";
 import { debug } from "./run/utils/debug";
 function initPluginAPI(param) {
   var context = param.context, pluginManager = param.pluginManager;
@@ -50,7 +52,17 @@ function initPluginAPI(param) {
     });
   }
   function updateAppContext(updateContext) {
-    context = assign(context, updateContext);
+    context = assignWith(context, updateContext, function(source, target) {
+      if (Array.isArray(target) || Array.isArray(source)) {
+        if (target === void 0) {
+          return source;
+        }
+        if (source === void 0) {
+          return target;
+        }
+        return _to_consumable_array(ensureArray(target)).concat(_to_consumable_array(ensureArray(source)));
+      }
+    });
   }
   var pluginAPI = _object_spread({
     isPluginExists: pluginManager.isPluginExists,

package/dist/esm/cli/context.js

@@ -7,6 +7,7 @@ import { initHooks } from "./hooks";
 function initAppContext(params) {
   var appDirectory = params.appDirectory, _params_srcDir = params.srcDir, srcDir = _params_srcDir === void 0 ? "src" : _params_srcDir, _params_distDir = params.distDir, distDir = _params_distDir === void 0 ? "dist" : _params_distDir;
   return {
+    metaName: params.metaName,
     packageName: params.packageName,
     configFile: params.configFile,
     command: params.command,

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

@@ -62,13 +62,13 @@ var createCli = function() {
   var existListenerMap = /* @__PURE__ */ new Map();
   function _init() {
     _init = _async_to_generator(function(options) {
-      var _context_hooks_onAfterPrepare, _context_hooks, _options_metaName, metaName, configFile, config, command, version, packageJsonConfig, internalPlugins, handleSetupResult, appDirectory, loaded, allPlugins, plugins, context, pluginAPI, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, plugin, _plugin_setup, setupResult, err, extraConfigs, normalizedConfig, resolved;
+      var _context_hooks_onAfterPrepare, _context_hooks, _options_metaName, metaName, configFile, config, command, version, packageJsonConfig, internalPlugins, handleSetupResult, appDirectory, envName, loaded, allPlugins, plugins, context, pluginAPI, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, plugin, _plugin_setup, setupResult, err, extraConfigs, normalizedConfig, resolved;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
             pluginManager.clear();
             initOptions = options;
-            _options_metaName = options.metaName, metaName = _options_metaName === void 0 ? "MODERN" : _options_metaName, configFile = options.configFile, config = options.config, command = options.command, version = options.version, packageJsonConfig = options.packageJsonConfig, internalPlugins = options.internalPlugins, handleSetupResult = options.handleSetupResult;
+            _options_metaName = options.metaName, metaName = _options_metaName === void 0 ? "modern-js" : _options_metaName, configFile = options.configFile, config = options.config, command = options.command, version = options.version, packageJsonConfig = options.packageJsonConfig, internalPlugins = options.internalPlugins, handleSetupResult = options.handleSetupResult;
             return [
               4,
               initAppDir(options === null || options === void 0 ? void 0 : options.cwd)
@@ -77,7 +77,8 @@ var createCli = function() {
             appDirectory = _state.sent();
             initCommandsMap();
             setProgramVersion(version);
-            loadEnv(appDirectory, process.env["".concat(metaName.toUpperCase(), "_ENV")]);
+            envName = metaName === "modern-js" ? "MODERN" : metaName;
+            loadEnv(appDirectory, process.env["".concat(envName.toUpperCase(), "_ENV")]);
             return [
               4,
               createLoadedConfig(appDirectory, configFile, packageJsonConfig, config)
@@ -106,7 +107,8 @@ var createCli = function() {
                   configFile: loaded.configFile,
                   command,
                   appDirectory,
-                  plugins
+                  plugins,
+                  metaName
                 }),
                 config: loaded.config,
                 normalizedConfig: {}

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

@@ -1,4 +1,5 @@
-import { assign } from "@modern-js/utils/lodash";
+import { ensureArray } from "@modern-js/utils";
+import { assignWith } from "@modern-js/utils/lodash";
 import { debug } from "./run/utils/debug";
 function initPluginAPI({ context, pluginManager }) {
   const { hooks, extendsHooks, plugins } = context;
@@ -41,7 +42,20 @@ function initPluginAPI({ context, pluginManager }) {
     });
   }
   function updateAppContext(updateContext) {
-    context = assign(context, updateContext);
+    context = assignWith(context, updateContext, (source, target) => {
+      if (Array.isArray(target) || Array.isArray(source)) {
+        if (target === void 0) {
+          return source;
+        }
+        if (source === void 0) {
+          return target;
+        }
+        return [
+          ...ensureArray(target),
+          ...ensureArray(source)
+        ];
+      }
+    });
   }
   const pluginAPI = {
     isPluginExists: pluginManager.isPluginExists,

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

@@ -3,6 +3,7 @@ import { initHooks } from "./hooks";
 function initAppContext(params) {
   const { appDirectory, srcDir = "src", distDir = "dist" } = params;
   return {
+    metaName: params.metaName,
     packageName: params.packageName,
     configFile: params.configFile,
     command: params.command,

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

@@ -35,11 +35,12 @@ const createCli = () => {
     var _context_hooks_onAfterPrepare, _context_hooks;
     pluginManager.clear();
     initOptions = options;
-    const { metaName = "MODERN", configFile, config, command, version, packageJsonConfig, internalPlugins, handleSetupResult } = options;
+    const { metaName = "modern-js", 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 envName = metaName === "modern-js" ? "MODERN" : metaName;
+    loadEnv(appDirectory, process.env[`${envName.toUpperCase()}_ENV`]);
     const loaded = await createLoadedConfig(appDirectory, configFile, packageJsonConfig, config);
     const allPlugins = [
       ...internalPlugins || [],
@@ -55,7 +56,8 @@ const createCli = () => {
         configFile: loaded.configFile,
         command,
         appDirectory,
-        plugins
+        plugins,
+        metaName
       }),
       config: loaded.config,
       normalizedConfig: {}

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

@@ -10,6 +10,7 @@ export declare function initAppContext<Extends extends CLIPluginExtends>(params:
     configFile: string;
     command: string;
     appDirectory: string;
+    metaName: string;
     plugins: CLIPlugin<Extends>[];
     srcDir?: string;
     distDir?: string;

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

@@ -10,6 +10,7 @@ export interface Entrypoint {
 }
 /** The public context */
 export type AppContext<Extends extends CLIPluginExtends> = {
+    metaName: string;
     packageName: string;
     configFile: string;
     command: string;

package/package.json

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