@modern-js/utils 2.26.0 → 2.27.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @modern-js/utils
 
+## 2.27.0
+
+### Patch Changes
+
+- 91d14b8: fix(utils): using universal build config and fix compatibility issue
+
+  fix(utils): 使用 universal 构建配置，修复兼容性问题
+
+- 6d7104d: fix(builder): should not strip error stacks
+
+  fix(builder): 不应该移除错误堆栈
+
 ## 2.26.0
 
 ## 2.25.2

package/dist/cjs/universal/formatWebpack.js

@@ -48,10 +48,6 @@ ${stats.stack}` : "";
   if (lines[1] && lines[1].indexOf("Module not found:") !== -1) {
     lines[1] = lines[1].replace("Error: ", "");
   }
-  message = lines.join("\n");
-  message = message.replace(/^\s*at\s((?!webpack:).)*:\d+:\d+[\s)]*(\n|$)/gm, "");
-  message = message.replace(/^\s*at\s<anonymous>(\n|$)/gm, "");
-  lines = message.split("\n");
   lines = lines.filter((line, index, arr) => index === 0 || line.trim() !== "" || line.trim() !== arr[index - 1].trim());
   message = lines.join("\n");
   return message.trim();

package/dist/esm/cli/alias.js

@@ -1,51 +1,55 @@
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import fs from "fs";
 import path from "path";
 import { chalk } from "../compiled";
 import { readTsConfigByFile } from "./get";
 import { applyOptionsChain } from "./applyOptionsChain";
-export const validAlias = (modernConfig, { tsconfigPath }) => {
-  const { source: { alias } } = modernConfig;
+export var validAlias = function(modernConfig, param) {
+  var tsconfigPath = param.tsconfigPath;
+  var alias = modernConfig.source.alias;
   if (!alias) {
     return null;
   }
-  const isTsProject = fs.existsSync(tsconfigPath);
+  var isTsProject = fs.existsSync(tsconfigPath);
   if (!isTsProject) {
     return null;
   }
-  const userAlias = getUserAlias(alias);
+  var userAlias = getUserAlias(alias);
   if (Object.keys(userAlias).length > 0) {
     return chalk.red('Note: Please use `compilerOptions.paths` in "tsconfig.json" file replace `source.alias` config in "modern.config.js/ts" when project is typescript');
   }
   return null;
 };
-export const mergeAlias = (alias) => applyOptionsChain({}, alias);
-export const getAliasConfig = (aliasOption, option) => {
+export var mergeAlias = function(alias) {
+  return applyOptionsChain({}, alias);
+};
+export var getAliasConfig = function(aliasOption, option) {
   var _tsconfig_compilerOptions, _tsconfig_compilerOptions1;
-  const isTsProject = fs.existsSync(option.tsconfigPath);
-  const alias = mergeAlias(aliasOption);
+  var isTsProject = fs.existsSync(option.tsconfigPath);
+  var alias = mergeAlias(aliasOption);
   if (!isTsProject) {
     return {
       absoluteBaseUrl: option.appDirectory,
       paths: alias,
       isTsPath: false,
-      isTsProject
+      isTsProject: isTsProject
     };
   }
-  const tsconfig = readTsConfigByFile(option.tsconfigPath);
-  const baseUrl = tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions = tsconfig.compilerOptions) === null || _tsconfig_compilerOptions === void 0 ? void 0 : _tsconfig_compilerOptions.baseUrl;
+  var tsconfig = readTsConfigByFile(option.tsconfigPath);
+  var baseUrl = tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions = tsconfig.compilerOptions) === null || _tsconfig_compilerOptions === void 0 ? void 0 : _tsconfig_compilerOptions.baseUrl;
   return {
     absoluteBaseUrl: baseUrl ? path.join(option.appDirectory, baseUrl) : option.appDirectory,
-    paths: {
-      ...alias,
-      ...tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions1 = tsconfig.compilerOptions) === null || _tsconfig_compilerOptions1 === void 0 ? void 0 : _tsconfig_compilerOptions1.paths
-    },
+    paths: _object_spread({}, alias, tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions1 = tsconfig.compilerOptions) === null || _tsconfig_compilerOptions1 === void 0 ? void 0 : _tsconfig_compilerOptions1.paths),
     isTsPath: true,
-    isTsProject
+    isTsProject: isTsProject
   };
 };
-export const getUserAlias = (alias = {}) => Object.keys(alias).reduce((o, k) => {
-  if (Array.isArray(alias[k])) {
-    o[k] = alias[k];
-  }
-  return o;
-}, {});
+export var getUserAlias = function() {
+  var alias = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+  return Object.keys(alias).reduce(function(o, k) {
+    if (Array.isArray(alias[k])) {
+      o[k] = alias[k];
+    }
+    return o;
+  }, {});
+};

package/dist/esm/cli/applyOptionsChain.js

@@ -1,24 +1,26 @@
 import { isFunction, isPlainObject } from "./is";
 import { logger } from "./logger";
-export function applyOptionsChain(defaults, options, utils, mergeFn = Object.assign) {
+export function applyOptionsChain(defaults, options, utils) {
+  var mergeFn = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : Object.assign;
   if (!options) {
     return defaults;
   }
   if (isPlainObject(options)) {
     return mergeFn(defaults, options);
   } else if (isFunction(options)) {
-    const ret = options(defaults, utils);
+    var ret = options(defaults, utils);
     if (ret) {
       if (!isPlainObject(ret)) {
-        logger.warn(`${options.name}: Function should mutate the config and return nothing, Or return a cloned or merged version of config object.`);
+        logger.warn("".concat(options.name, ": Function should mutate the config and return nothing, Or return a cloned or merged version of config object."));
       }
       return ret;
     }
   } else if (Array.isArray(options)) {
-    return options.reduce((memo, cur) => applyOptionsChain(memo, cur, utils, mergeFn), defaults);
+    return options.reduce(function(memo, cur) {
+      return applyOptionsChain(memo, cur, utils, mergeFn);
+    }, defaults);
   } else {
-    throw new Error(`applyOptionsChain error:
-default options is: ${JSON.stringify(defaults)}`);
+    throw new Error("applyOptionsChain error:\ndefault options is: ".concat(JSON.stringify(defaults)));
   }
   return defaults;
 }

package/dist/esm/cli/babel.js

@@ -1,14 +1,16 @@
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { isAbsolute, sep } from "path";
 import { applyOptionsChain } from "./applyOptionsChain";
 import { ensureArray } from "./ensure";
 import { normalizeToPosixPath } from "./path";
-const formatPath = (originPath) => {
+var formatPath = function(originPath) {
   if (isAbsolute(originPath)) {
     return originPath.split(sep).join("/");
   }
   return originPath;
 };
-const getPluginItemName = (item) => {
+var getPluginItemName = function(item) {
   if (typeof item === "string") {
     return formatPath(item);
   }
@@ -17,54 +19,58 @@ const getPluginItemName = (item) => {
   }
   return null;
 };
-const addPlugins = (plugins, config) => {
+var addPlugins = function(plugins, config) {
   if (config.plugins) {
-    config.plugins.push(...plugins);
+    var _config_plugins;
+    (_config_plugins = config.plugins).push.apply(_config_plugins, _to_consumable_array(plugins));
   } else {
     config.plugins = plugins;
   }
 };
-const addPresets = (presets, config) => {
+var addPresets = function(presets, config) {
   if (config.presets) {
-    config.presets.push(...presets);
+    var _config_presets;
+    (_config_presets = config.presets).push.apply(_config_presets, _to_consumable_array(presets));
   } else {
     config.presets = presets;
   }
 };
-const removePlugins = (plugins, config) => {
+var removePlugins = function(plugins, config) {
   if (!config.plugins) {
     return;
   }
-  const removeList = ensureArray(plugins);
-  config.plugins = config.plugins.filter((item) => {
-    const name = getPluginItemName(item);
+  var removeList = ensureArray(plugins);
+  config.plugins = config.plugins.filter(function(item) {
+    var name = getPluginItemName(item);
     if (name) {
-      return !removeList.find((removeItem) => name.includes(removeItem));
+      return !removeList.find(function(removeItem) {
+        return name.includes(removeItem);
+      });
     }
     return true;
   });
 };
-const removePresets = (presets, config) => {
+var removePresets = function(presets, config) {
   if (!config.presets) {
     return;
   }
-  const removeList = ensureArray(presets);
-  config.presets = config.presets.filter((item) => {
-    const name = getPluginItemName(item);
+  var removeList = ensureArray(presets);
+  config.presets = config.presets.filter(function(item) {
+    var name = getPluginItemName(item);
     if (name) {
-      return !removeList.find((removeItem) => name.includes(removeItem));
+      return !removeList.find(function(removeItem) {
+        return name.includes(removeItem);
+      });
     }
     return true;
   });
 };
-const modifyPresetOptions = (presetName, options, presets = []) => {
-  presets.forEach((preset, index) => {
+var modifyPresetOptions = function(presetName, options) {
+  var presets = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : [];
+  presets.forEach(function(preset, index) {
     if (Array.isArray(preset)) {
       if (typeof preset[0] === "string" && normalizeToPosixPath(preset[0]).includes(presetName)) {
-        preset[1] = {
-          ...preset[1] || {},
-          ...options
-        };
+        preset[1] = _object_spread({}, preset[1] || {}, options);
       }
     } else if (typeof preset === "string" && normalizeToPosixPath(preset).includes(presetName)) {
       presets[index] = [
@@ -74,29 +80,38 @@ const modifyPresetOptions = (presetName, options, presets = []) => {
     }
   });
 };
-export const getBabelUtils = (config) => {
-  const noop = () => {
+export var getBabelUtils = function(config) {
+  var noop = function() {
   };
   return {
-    addPlugins: (plugins) => addPlugins(plugins, config),
-    addPresets: (presets) => addPresets(presets, config),
-    removePlugins: (plugins) => removePlugins(plugins, config),
-    removePresets: (presets) => removePresets(presets, config),
+    addPlugins: function(plugins) {
+      return addPlugins(plugins, config);
+    },
+    addPresets: function(presets) {
+      return addPresets(presets, config);
+    },
+    removePlugins: function(plugins) {
+      return removePlugins(plugins, config);
+    },
+    removePresets: function(presets) {
+      return removePresets(presets, config);
+    },
     // `addIncludes` and `addExcludes` are noop functions by default,
     // It can be overridden by `extraBabelUtils`.
     addIncludes: noop,
     addExcludes: noop,
     // Compat `presetEnvOptions` and `presetReactOptions` in Eden.
-    modifyPresetEnvOptions: (options) => modifyPresetOptions("@babel/preset-env", options, config.presets || []),
-    modifyPresetReactOptions: (options) => modifyPresetOptions("@babel/preset-react", options, config.presets || [])
+    modifyPresetEnvOptions: function(options) {
+      return modifyPresetOptions("@babel/preset-env", options, config.presets || []);
+    },
+    modifyPresetReactOptions: function(options) {
+      return modifyPresetOptions("@babel/preset-react", options, config.presets || []);
+    }
   };
 };
-export const applyUserBabelConfig = (defaultOptions, userBabelConfig, extraBabelUtils) => {
+export var applyUserBabelConfig = function(defaultOptions, userBabelConfig, extraBabelUtils) {
   if (userBabelConfig) {
-    const babelUtils = {
-      ...getBabelUtils(defaultOptions),
-      ...extraBabelUtils
-    };
+    var babelUtils = _object_spread({}, getBabelUtils(defaultOptions), extraBabelUtils);
     return applyOptionsChain(defaultOptions, userBabelConfig || {}, babelUtils);
   }
   return defaultOptions;

package/dist/esm/cli/commands.js

@@ -1,16 +1,16 @@
-export const getFullArgv = () => {
+export var getFullArgv = function() {
   var _process_env_MODERN_ARGV;
   return ((_process_env_MODERN_ARGV = process.env.MODERN_ARGV) === null || _process_env_MODERN_ARGV === void 0 ? void 0 : _process_env_MODERN_ARGV.split(" ")) || process.argv;
 };
-export const getArgv = () => {
+export var getArgv = function() {
   return getFullArgv().slice(2);
 };
-export const getCommand = () => {
-  const args = getArgv();
-  const command = args[0];
+export var getCommand = function() {
+  var args = getArgv();
+  var command = args[0];
   return command;
 };
-export const isDevCommand = () => {
-  const command = getCommand();
+export var isDevCommand = function() {
+  var command = getCommand();
   return command === "dev" || command === "start";
 };

package/dist/esm/cli/common.js

@@ -1,10 +1,15 @@
 import { debug } from "../../compiled/debug";
-export const createDebugger = (scope) => debug(`modern-js:${scope}`);
-export const clearConsole = () => {
+export var createDebugger = function(scope) {
+  return debug("modern-js:".concat(scope));
+};
+export var clearConsole = function() {
   if (process.stdout.isTTY && !process.env.DEBUG) {
     process.stdout.write("\x1B[H\x1B[2J");
   }
 };
-export const wait = (time = 0) => new Promise((resolve) => {
-  setTimeout(resolve, time);
-});
+export var wait = function() {
+  var time = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 0;
+  return new Promise(function(resolve) {
+    setTimeout(resolve, time);
+  });
+};

package/dist/esm/cli/constants/chainId.js

@@ -1,4 +1,4 @@
-export const CHAIN_ID = {
+export var CHAIN_ID = {
   /** Predefined rules */
   RULE: {
     /** Rule for .mjs */

package/dist/esm/cli/constants/index.js

@@ -1,26 +1,27 @@
-export const ROUTE_SPEC_FILE = "route.json";
-export const NESTED_ROUTE_SPEC_FILE = "nestedRoutes.json";
-export const MAIN_ENTRY_NAME = "main";
-export const SERVER_BUNDLE_DIRECTORY = "bundles";
-export const SERVER_WORKER_BUNDLE_DIRECTORY = "worker";
-export const ENTRY_NAME_PATTERN = "^[a-zA-Z0-9_-]+$";
-export const SERVER_RENDER_FUNCTION_NAME = "serverRender";
-export const LOADABLE_STATS_FILE = "loadable-stats.json";
-export const API_DIR = "api";
-export const SERVER_DIR = "server";
-export const SHARED_DIR = "shared";
-export const CONFIG_CACHE_DIR = "./node_modules/.cache/node-bundle-require";
-export const CONFIG_FILE_EXTENSIONS = [
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
+export var ROUTE_SPEC_FILE = "route.json";
+export var NESTED_ROUTE_SPEC_FILE = "nestedRoutes.json";
+export var MAIN_ENTRY_NAME = "main";
+export var SERVER_BUNDLE_DIRECTORY = "bundles";
+export var SERVER_WORKER_BUNDLE_DIRECTORY = "worker";
+export var ENTRY_NAME_PATTERN = "^[a-zA-Z0-9_-]+$";
+export var SERVER_RENDER_FUNCTION_NAME = "serverRender";
+export var LOADABLE_STATS_FILE = "loadable-stats.json";
+export var API_DIR = "api";
+export var SERVER_DIR = "server";
+export var SHARED_DIR = "shared";
+export var CONFIG_CACHE_DIR = "./node_modules/.cache/node-bundle-require";
+export var CONFIG_FILE_EXTENSIONS = [
   ".js",
   ".ts",
   ".mjs"
 ];
-export const OUTPUT_CONFIG_FILE = "modern.config.json";
-export const DEFAULT_SERVER_CONFIG = "modern.server-runtime.config";
-export const ROUTE_MANIFEST_FILE = "routes-manifest.json";
-export const LOADER_ROUTES_DIR = `loader-routes`;
-export const DEFAULT_DEV_HOST = "0.0.0.0";
-export const INTERNAL_APP_TOOLS_PLUGINS = {
+export var OUTPUT_CONFIG_FILE = "modern.config.json";
+export var DEFAULT_SERVER_CONFIG = "modern.server-runtime.config";
+export var ROUTE_MANIFEST_FILE = "routes-manifest.json";
+export var LOADER_ROUTES_DIR = "loader-routes";
+export var DEFAULT_DEV_HOST = "0.0.0.0";
+export var INTERNAL_APP_TOOLS_PLUGINS = {
   "@modern-js/app-tools": "@modern-js/app-tools/cli",
   "@modern-js/plugin-proxy": "@modern-js/plugin-proxy/cli",
   "@modern-js/plugin-ssg": "@modern-js/plugin-ssg/cli",
@@ -36,10 +37,10 @@ export const INTERNAL_APP_TOOLS_PLUGINS = {
   // legacy router (inner react-router-dom v5)
   "@modern-js/plugin-router-v5": "@modern-js/plugin-router-v5/cli"
 };
-export const INTERNAL_APP_TOOLS_RUNTIME_PLUGINS = {
+export var INTERNAL_APP_TOOLS_RUNTIME_PLUGINS = {
   "@modern-js/runtime": "@modern-js/runtime/cli"
 };
-export const INTERNAL_MODULE_TOOLS_PLUGINS = {
+export var INTERNAL_MODULE_TOOLS_PLUGINS = {
   "@modern-js/module-tools": "@modern-js/module-tools",
   "@modern-js/doc-tools": "@modern-js/doc-tools",
   "@modern-js/runtime": "@modern-js/runtime/cli",
@@ -49,16 +50,16 @@ export const INTERNAL_MODULE_TOOLS_PLUGINS = {
   // legacy router (inner react-router-dom v5)
   "@modern-js/plugin-router-legacy": "@modern-js/plugin-router-legacy/cli"
 };
-export const INTERNAL_MONOREPO_TOOLS_PLUGINS = {
+export var INTERNAL_MONOREPO_TOOLS_PLUGINS = {
   "@modern-js/monorepo-tools": "@modern-js/monorepo-tools/cli",
   "@modern-js/plugin-testing": "@modern-js/plugin-testing/cli"
 };
-export const INTERNAL_DOC_TOOLS_PLUGINS = {
+export var INTERNAL_DOC_TOOLS_PLUGINS = {
   "@modern-js/doc-tools": "@modern-js/doc-tools",
   "@modern-js/runtime": "@modern-js/runtime/cli",
   "@modern-js/plugin-testing": "@modern-js/plugin-testing/cli"
 };
-export const INTERNAL_CLI_PLUGINS = {
+export var INTERNAL_CLI_PLUGINS = {
   "@modern-js/app-tools": "@modern-js/app-tools/cli",
   "@modern-js/monorepo-tools": "@modern-js/monorepo-tools/cli",
   "@modern-js/module-tools": "@modern-js/module-tools",
@@ -79,19 +80,14 @@ export const INTERNAL_CLI_PLUGINS = {
   // legacy router (inner react-router-dom v5)
   "@modern-js/plugin-router-v5": "@modern-js/plugin-router-v5/cli"
 };
-export const SERVER_PLUGIN_BFF = "@modern-js/plugin-bff";
-export const SERVER_PLUGIN_EXPRESS = "@modern-js/plugin-express";
-export const SERVER_PLUGIN_KOA = "@modern-js/plugin-koa";
-export const SERVER_PLUGIN_SERVER = "@modern-js/plugin-server";
-export const SERVER_PLUGIN_POLYFILL = "@modern-js/plugin-polyfill";
-export const INTERNAL_SERVER_PLUGINS = {
-  [SERVER_PLUGIN_BFF]: "@modern-js/plugin-bff/server",
-  [SERVER_PLUGIN_EXPRESS]: "@modern-js/plugin-express/server",
-  [SERVER_PLUGIN_KOA]: "@modern-js/plugin-koa/server",
-  [SERVER_PLUGIN_SERVER]: "@modern-js/plugin-server/server",
-  [SERVER_PLUGIN_POLYFILL]: "@modern-js/plugin-polyfill/server"
-};
-export const DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
+export var SERVER_PLUGIN_BFF = "@modern-js/plugin-bff";
+export var SERVER_PLUGIN_EXPRESS = "@modern-js/plugin-express";
+export var SERVER_PLUGIN_KOA = "@modern-js/plugin-koa";
+export var SERVER_PLUGIN_SERVER = "@modern-js/plugin-server";
+export var SERVER_PLUGIN_POLYFILL = "@modern-js/plugin-polyfill";
+var _obj;
+export var INTERNAL_SERVER_PLUGINS = (_obj = {}, _define_property(_obj, SERVER_PLUGIN_BFF, "@modern-js/plugin-bff/server"), _define_property(_obj, SERVER_PLUGIN_EXPRESS, "@modern-js/plugin-express/server"), _define_property(_obj, SERVER_PLUGIN_KOA, "@modern-js/plugin-koa/server"), _define_property(_obj, SERVER_PLUGIN_SERVER, "@modern-js/plugin-server/server"), _define_property(_obj, SERVER_PLUGIN_POLYFILL, "@modern-js/plugin-polyfill/server"), _obj);
+export var DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
   allowNamespaces: true,
   allExtensions: true,
   allowDeclareFields: true,

package/dist/esm/cli/ensure.js

@@ -1,6 +1,8 @@
 import path from "path";
-export const ensureAbsolutePath = (base, filePath) => path.isAbsolute(filePath) ? filePath : path.resolve(base, filePath);
-export const ensureArray = (params) => {
+export var ensureAbsolutePath = function(base, filePath) {
+  return path.isAbsolute(filePath) ? filePath : path.resolve(base, filePath);
+};
+export var ensureArray = function(params) {
   if (Array.isArray(params)) {
     return params;
   }

package/dist/esm/cli/fs.js

@@ -1,14 +1,61 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { fs } from "../compiled";
-export const findExists = (files) => {
-  for (const file of files) {
-    if (fs.existsSync(file) && fs.statSync(file).isFile()) {
-      return file;
+export var findExists = function(files) {
+  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+  try {
+    for (var _iterator = files[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var file = _step.value;
+      if (fs.existsSync(file) && fs.statSync(file).isFile()) {
+        return file;
+      }
+    }
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
     }
   }
   return false;
 };
-export const emptyDir = async (dir) => {
-  if (await fs.pathExists(dir)) {
-    await fs.emptyDir(dir);
-  }
-};
+export var emptyDir = function() {
+  var _ref = _async_to_generator(function(dir) {
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          return [
+            4,
+            fs.pathExists(dir)
+          ];
+        case 1:
+          if (!_state.sent())
+            return [
+              3,
+              3
+            ];
+          return [
+            4,
+            fs.emptyDir(dir)
+          ];
+        case 2:
+          _state.sent();
+          _state.label = 3;
+        case 3:
+          return [
+            2
+          ];
+      }
+    });
+  });
+  return function emptyDir2(dir) {
+    return _ref.apply(this, arguments);
+  };
+}();

package/dist/esm/cli/get/config.js

@@ -1,16 +1,16 @@
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { isPlainObject } from "../is";
-export const getEntryOptions = (name, isMainEntry, baseOptions, optionsByEntries, packageName) => {
+export var getEntryOptions = function(name, isMainEntry, baseOptions, optionsByEntries, packageName) {
   if (optionsByEntries) {
-    let optionsByEntry = getOptionsByEntryName(name, optionsByEntries);
+    var optionsByEntry = getOptionsByEntryName(name, optionsByEntries);
     if (optionsByEntry === void 0 && isMainEntry && packageName) {
       optionsByEntry = getOptionsByEntryName(packageName, optionsByEntries);
     }
-    return optionsByEntry !== void 0 ? isPlainObject(optionsByEntry) && isPlainObject(baseOptions) ? {
-      ...baseOptions,
-      ...optionsByEntry
-    } : optionsByEntry : baseOptions;
+    return optionsByEntry !== void 0 ? isPlainObject(optionsByEntry) && isPlainObject(baseOptions) ? _object_spread({}, baseOptions, optionsByEntry) : optionsByEntry : baseOptions;
   } else {
     return baseOptions;
   }
 };
-const getOptionsByEntryName = (name, optionsByEntries) => optionsByEntries.hasOwnProperty(name) ? optionsByEntries[name] : void 0;
+var getOptionsByEntryName = function(name, optionsByEntries) {
+  return optionsByEntries.hasOwnProperty(name) ? optionsByEntries[name] : void 0;
+};