@umijs/core 4.0.20 → 4.0.22

package/dist/config/config.js

@@ -140,6 +140,9 @@ var Config = class {
         try {
           config = import_utils.lodash.merge(config, require(configFile).default);
         } catch (e) {
+          if (import_utils.semver.lt(import_utils.semver.clean(process.version), "16.9.0")) {
+            throw e;
+          }
           throw new Error(`Parse config file failed: [${configFile}]`, {
             cause: e
           });

package/dist/route/routesConfig.js

@@ -1,38 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -78,20 +49,21 @@ function transformRoutes(opts) {
 function transformRoute(opts) {
   (0, import_assert.default)(!opts.route.children, "children is not allowed in route props, use routes instead.");
   const id = String(opts.memo.id++);
-  const _a = opts.route, { routes, component, wrappers } = _a, routeProps = __objRest(_a, ["routes", "component", "wrappers"]);
+  const { routes, component, wrappers, ...routeProps } = opts.route;
   let absPath = opts.route.path;
   if ((absPath == null ? void 0 : absPath.charAt(0)) !== "/") {
     const parentAbsPath = opts.parentId ? opts.memo.ret[opts.parentId].absPath.replace(/\/+$/, "/") : "/";
     absPath = `${parentAbsPath}${endsWithStar(parentAbsPath) ? "" : absPath}`;
   }
-  opts.memo.ret[id] = __spreadProps(__spreadValues(__spreadProps(__spreadValues({}, routeProps), {
-    path: opts.route.path
-  }), component ? {
-    file: opts.onResolveComponent ? opts.onResolveComponent(component) : component
-  } : {}), {
+  opts.memo.ret[id] = {
+    ...routeProps,
+    path: opts.route.path,
+    ...component ? {
+      file: opts.onResolveComponent ? opts.onResolveComponent(component) : component
+    } : {},
     parentId: opts.parentId,
     id
-  });
+  };
   if (absPath) {
     opts.memo.ret[id].absPath = absPath;
   }
@@ -101,11 +73,12 @@ function transformRoute(opts) {
     let layout = opts.route.layout;
     wrappers.forEach((wrapper) => {
       const { id: id2 } = transformRoute({
-        route: __spreadValues({
+        route: {
           path,
           component: wrapper,
-          isWrapper: true
-        }, layout === false ? { layout: false } : {}),
+          isWrapper: true,
+          ...layout === false ? { layout: false } : {}
+        },
         parentId,
         memo: opts.memo,
         onResolveComponent: opts.onResolveComponent

package/dist/route/routesConvention.js

@@ -1,24 +1,7 @@
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -80,7 +63,7 @@ function visitFiles(opts) {
     let file = (0, import_path.resolve)(opts.dir, filename);
     let stat = (0, import_fs.lstatSync)(file);
     if (stat.isDirectory()) {
-      visitFiles(__spreadProps(__spreadValues({}, opts), { dir: file }));
+      visitFiles({ ...opts, dir: file });
     } else if (stat.isFile() && [".tsx", ".ts", ".js", ".jsx", ".md", ".mdx", ".vue"].includes((0, import_path.extname)(file))) {
       opts.visitor((0, import_path.relative)(opts.baseDir, file));
     }

package/dist/service/generator.js

@@ -1,21 +1,7 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -43,7 +29,9 @@ var GeneratorType = /* @__PURE__ */ ((GeneratorType2) => {
   return GeneratorType2;
 })(GeneratorType || {});
 function makeGenerator(opts) {
-  return __spreadValues({}, opts);
+  return {
+    ...opts
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/service/pluginAPI.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -86,15 +69,16 @@ var PluginAPI = class {
       const { name, configResolveMode } = commandOpts;
       (0, import_assert.default)(!configResolveMode || resolveConfigModes.indexOf(configResolveMode) >= 0, `configResolveMode must be one of ${resolveConfigModes.join(",")}, but got ${configResolveMode}`);
       (0, import_assert.default)(!this.service.commands[name], `api.registerCommand() failed, the command ${name} is exists from ${(_a = this.service.commands[name]) == null ? void 0 : _a.plugin.id}.`);
-      this.service.commands[name] = new import_command.Command(__spreadProps(__spreadValues({}, commandOpts), {
+      this.service.commands[name] = new import_command.Command({
+        ...commandOpts,
         plugin: this.plugin
-      }));
+      });
     };
     registerCommand(opts);
     if (alias) {
       const aliases = (0, import_utils2.makeArray)(alias);
       aliases.forEach((alias2) => {
-        registerCommand(__spreadProps(__spreadValues({}, opts), { name: alias2 }));
+        registerCommand({ ...opts, name: alias2 });
       });
     }
   }
@@ -102,24 +86,26 @@ var PluginAPI = class {
     var _a;
     const { key } = opts;
     (0, import_assert.default)(!this.service.generators[key], `api.registerGenerator() failed, the generator ${key} is exists from ${(_a = this.service.generators[key]) == null ? void 0 : _a.plugin.id}.`);
-    this.service.generators[key] = (0, import_generator.makeGenerator)(__spreadProps(__spreadValues({}, opts), {
+    this.service.generators[key] = (0, import_generator.makeGenerator)({
+      ...opts,
       plugin: this.plugin
-    }));
+    });
   }
   register(opts) {
     var _a, _b;
     (0, import_assert.default)(this.service.stage <= import_types.ServiceStage.initPlugins, "api.register() should not be called after plugin register stage.");
     (_a = this.service.hooks)[_b = opts.key] || (_a[_b] = []);
-    this.service.hooks[opts.key].push(new import_hook.Hook(__spreadProps(__spreadValues({}, opts), { plugin: this.plugin })));
+    this.service.hooks[opts.key].push(new import_hook.Hook({ ...opts, plugin: this.plugin }));
   }
   registerMethod(opts) {
     (0, import_assert.default)(!this.service.pluginMethods[opts.name], `api.registerMethod() failed, method ${opts.name} is already exist.`);
     this.service.pluginMethods[opts.name] = {
       plugin: this.plugin,
       fn: opts.fn || function(fn) {
-        this.register(__spreadValues({
-          key: opts.name
-        }, import_utils.lodash.isPlainObject(fn) ? fn : { fn }));
+        this.register({
+          key: opts.name,
+          ...import_utils.lodash.isPlainObject(fn) ? fn : { fn }
+        });
       }
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.0.20",
+  "version": "4.0.22",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/core#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
@@ -21,8 +21,8 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.20",
-    "@umijs/utils": "4.0.20"
+    "@umijs/bundler-utils": "4.0.22",
+    "@umijs/utils": "4.0.22"
   },
   "devDependencies": {
     "dotenv": "16.0.0",