@umijs/core 4.0.41 → 4.0.43

package/compiled/just-diff/index.js

@@ -1 +1 @@
-(function(){var e={277:function(e){e.exports={diff:diff,jsonPatchPathConverter:jsonPatchPathConverter};function diff(e,r,t){if(!e||typeof e!="object"||!r||typeof r!="object"){throw new Error("both arguments must be objects or arrays")}t||(t=function(e){return e});function getDiff(e,r,a,n){var o=Object.keys(e);var c=o.length;var i=Object.keys(r);var f=i.length;var u;for(var p=0;p<c;p++){var s=Array.isArray(e)?Number(o[p]):o[p];if(!(s in r)){u=a.concat(s);n.remove.push({op:"remove",path:t(u)})}}for(var p=0;p<f;p++){var s=Array.isArray(r)?Number(i[p]):i[p];var v=e[s];var _=r[s];if(!(s in e)){u=a.concat(s);var h=r[s];n.add.push({op:"add",path:t(u),value:h})}else if(v!==_){if(Object(v)!==v||Object(_)!==_){u=pushReplace(u,a,s,n,t,r)}else{if(!Object.keys(v).length&&!Object.keys(_).length&&String(v)!=String(_)){u=pushReplace(u,a,s,n,t,r)}else{getDiff(e[s],r[s],a.concat(s),n)}}}}return n.remove.reverse().concat(n.replace).concat(n.add)}return getDiff(e,r,[],{remove:[],replace:[],add:[]})}function pushReplace(e,r,t,a,n,o){e=r.concat(t);a.replace.push({op:"replace",path:n(e),value:o[t]});return e}function jsonPatchPathConverter(e){return[""].concat(e).join("/")}}};var r={};function __nccwpck_require__(t){var a=r[t];if(a!==undefined){return a.exports}var n=r[t]={exports:{}};var o=true;try{e[t](n,n.exports,__nccwpck_require__);o=false}finally{if(o)delete r[t]}return n.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var t=__nccwpck_require__(277);module.exports=t})();
+(function(){var e={696:function(e){e.exports={diff:diff,jsonPatchPathConverter:jsonPatchPathConverter};function diff(e,r,t){if(!e||typeof e!="object"||!r||typeof r!="object"){throw new Error("both arguments must be objects or arrays")}t||(t=function(e){return e});function getDiff(e,r,a,n){var o=Object.keys(e);var c=o.length;var i=Object.keys(r);var f=i.length;var u;for(var p=0;p<c;p++){var s=Array.isArray(e)?Number(o[p]):o[p];if(!(s in r)){u=a.concat(s);n.remove.push({op:"remove",path:t(u)})}}for(var p=0;p<f;p++){var s=Array.isArray(r)?Number(i[p]):i[p];var v=e[s];var _=r[s];if(!(s in e)){u=a.concat(s);var h=r[s];n.add.push({op:"add",path:t(u),value:h})}else if(v!==_){if(Object(v)!==v||Object(_)!==_){u=pushReplace(u,a,s,n,t,r)}else{if(!Object.keys(v).length&&!Object.keys(_).length&&String(v)!=String(_)){u=pushReplace(u,a,s,n,t,r)}else{getDiff(e[s],r[s],a.concat(s),n)}}}}return n}const a=getDiff(e,r,[],{remove:[],replace:[],add:[]});return a.remove.reverse().concat(a.replace).concat(a.add)}function pushReplace(e,r,t,a,n,o){e=r.concat(t);a.replace.push({op:"replace",path:n(e),value:o[t]});return e}function jsonPatchPathConverter(e){return[""].concat(e).join("/")}}};var r={};function __nccwpck_require__(t){var a=r[t];if(a!==undefined){return a.exports}var n=r[t]={exports:{}};var o=true;try{e[t](n,n.exports,__nccwpck_require__);o=false}finally{if(o)delete r[t]}return n.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var t=__nccwpck_require__(696);module.exports=t})();

package/compiled/just-diff/package.json

@@ -1 +1 @@
-{"name":"just-diff","author":"Angus Croll","license":"MIT","types":"index.d.ts"}
+{"name":"just-diff","version":"5.2.0","author":"Angus Croll","license":"MIT","types":"index.d.ts"}

package/dist/config/config.d.ts

@@ -1,4 +1,4 @@
-import { Env } from '../types';
+import { Env, type IOnChangeTypes } from '../types';
 interface IOpts {
     cwd: string;
     env: Env;
@@ -6,7 +6,6 @@ interface IOpts {
     defaultConfigFiles?: string[];
 }
 declare type ISchema = Record<string, any>;
-declare type IOnChangeTypes = Record<string, string | Function>;
 export declare class Config {
     opts: IOpts;
     mainConfigFile: string | null;

package/dist/config/config.js

@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/config/config.ts
@@ -65,35 +68,41 @@ var Config = class {
     };
   }
   watch(opts) {
-    const watcher = import_utils.chokidar.watch([
-      ...this.files,
-      ...this.mainConfigFile ? [] : (0, import_utils2.getAbsFiles)({
-        files: this.opts.defaultConfigFiles || import_constants.DEFAULT_CONFIG_FILES,
+    const watcher = import_utils.chokidar.watch(
+      [
+        ...this.files,
+        ...this.mainConfigFile ? [] : (0, import_utils2.getAbsFiles)({
+          files: this.opts.defaultConfigFiles || import_constants.DEFAULT_CONFIG_FILES,
+          cwd: this.opts.cwd
+        })
+      ],
+      {
+        ignoreInitial: true,
         cwd: this.opts.cwd
-      })
-    ], {
-      ignoreInitial: true,
-      cwd: this.opts.cwd
-    });
-    watcher.on("all", import_utils.lodash.debounce((event, path) => {
-      const { config: origin } = this.prevConfig;
-      const { config: updated, files } = this.getConfig({
-        schemas: opts.schemas
-      });
-      watcher.add(files);
-      const data = Config.diffConfigs({
-        origin,
-        updated,
-        onChangeTypes: opts.onChangeTypes
-      });
-      opts.onChange({
-        data,
-        event,
-        path
-      }).catch((e) => {
-        throw new Error(e);
-      });
-    }, import_constants.WATCH_DEBOUNCE_STEP));
+      }
+    );
+    watcher.on(
+      "all",
+      import_utils.lodash.debounce((event, path) => {
+        const { config: origin } = this.prevConfig;
+        const { config: updated, files } = this.getConfig({
+          schemas: opts.schemas
+        });
+        watcher.add(files);
+        const data = Config.diffConfigs({
+          origin,
+          updated,
+          onChangeTypes: opts.onChangeTypes
+        });
+        opts.onChange({
+          data,
+          event,
+          path
+        }).catch((e) => {
+          throw e;
+        });
+      }, import_constants.WATCH_DEBOUNCE_STEP)
+    );
     return () => watcher.close();
   }
   static getMainConfigFile(opts) {
@@ -113,15 +122,17 @@ var Config = class {
     const specifiedEnv = opts.specifiedEnv || "";
     if (mainConfigFile) {
       const env = import_constants.SHORT_ENV[opts.env] || opts.env;
-      ret.push(...[
-        mainConfigFile,
-        specifiedEnv && (0, import_utils2.addExt)({ file: mainConfigFile, ext: `.${specifiedEnv}` }),
-        (0, import_utils2.addExt)({ file: mainConfigFile, ext: `.${env}` }),
-        specifiedEnv && (0, import_utils2.addExt)({
-          file: mainConfigFile,
-          ext: `.${env}.${specifiedEnv}`
-        })
-      ].filter(Boolean));
+      ret.push(
+        ...[
+          mainConfigFile,
+          specifiedEnv && (0, import_utils2.addExt)({ file: mainConfigFile, ext: `.${specifiedEnv}` }),
+          (0, import_utils2.addExt)({ file: mainConfigFile, ext: `.${env}` }),
+          specifiedEnv && (0, import_utils2.addExt)({
+            file: mainConfigFile,
+            ext: `.${env}.${specifiedEnv}`
+          })
+        ].filter(Boolean)
+      );
       if (opts.env === import_types.Env.development) {
         ret.push((0, import_utils2.addExt)({ file: mainConfigFile, ext: import_constants.LOCAL_EXT }));
       }
@@ -174,12 +185,18 @@ var Config = class {
       if (error)
         errors.set(key, error);
     }
-    (0, import_assert.default)(errors.size === 0, `Invalid config values: ${Array.from(errors.keys()).join(", ")}
+    (0, import_assert.default)(
+      errors.size === 0,
+      `Invalid config values: ${Array.from(errors.keys()).join(", ")}
 ${Array.from(errors.keys()).map((key) => {
-      return `Invalid value for ${key}:
+        return `Invalid value for ${key}:
 ${errors.get(key).message}`;
-    })}`);
-    (0, import_assert.default)(configKeys.size === 0, `Invalid config keys: ${Array.from(configKeys).join(", ")}`);
+      })}`
+    );
+    (0, import_assert.default)(
+      configKeys.size === 0,
+      `Invalid config keys: ${Array.from(configKeys).join(", ")}`
+    );
   }
   static diffConfigs(opts) {
     const patch = (0, import_just_diff.diff)(opts.origin, opts.updated);

package/dist/service/plugin.js

@@ -63,7 +63,7 @@ var Plugin = class {
       try {
         ret = require(this.path);
       } catch (e) {
-        throw new Error(`Register ${this.type} ${this.path} failed, since ${e.message}`);
+        throw new Error(`Register ${this.type} ${this.path} failed, since ${e.message}`, { cause: e });
       } finally {
         import_utils.register.restore();
       }
@@ -124,7 +124,9 @@ var Plugin = class {
             extensions: [".tsx", ".ts", ".mjs", ".jsx", ".js"]
           });
         } catch (_e) {
-          throw new Error(`Invalid plugin ${path}, can not be resolved.`);
+          throw new Error(`Invalid plugin ${path}, can not be resolved.`, {
+            cause: _e
+          });
         }
         return new Plugin({
           path: resolved,

package/dist/types.d.ts

@@ -30,6 +30,8 @@ export declare enum ConfigChangeType {
     reload = "reload",
     regenerateTmpFiles = "regenerateTmpFiles"
 }
+export declare type ChangeTypeValue = string | `${ConfigChangeType}` | Function;
+export declare type IOnChangeTypes = Record<string, ChangeTypeValue>;
 export declare enum ApplyPluginsType {
     add = "add",
     modify = "modify",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.0.41",
+  "version": "4.0.43",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/core#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
@@ -21,13 +21,13 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.41",
-    "@umijs/utils": "4.0.41"
+    "@umijs/bundler-utils": "4.0.43",
+    "@umijs/utils": "4.0.43"
   },
   "devDependencies": {
     "dotenv": "16.0.0",
     "dotenv-expand": "8.0.3",
-    "just-diff": "5.0.1"
+    "just-diff": "5.2.0"
   },
   "publishConfig": {
     "access": "public"