fyn 1.1.45 → 1.1.46

package/dist/fyn.js

@@ -2553,7 +2553,7 @@ const {
   AggregateError
 } = __webpack_require__("./node_modules/.f/_/@jchip/error/1.0.3/@jchip/error/dist/index.js");
 
-const filterScanDir = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/lib/index.js");
+const filterScanDir = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.6/filter-scan-dir/lib/index.js");
 
 const Crypto = __webpack_require__("crypto");
 
@@ -3149,7 +3149,7 @@ const {
   parseYarnLock
 } = __webpack_require__("./yarn/index.js");
 
-const mm = __webpack_require__("./node_modules/.f/_/minimatch/3.0.4/minimatch/minimatch.js");
+const mm = __webpack_require__("./node_modules/.f/_/minimatch/3.1.2/minimatch/minimatch.js");
 /* eslint-disable no-magic-numbers, max-statements, no-empty, complexity, no-eval */
 
 
@@ -4198,7 +4198,7 @@ module.exports = Fyn;
 
 const Path = __webpack_require__("path");
 
-const optionalRequire = __webpack_require__("./node_modules/.f/_/optional-require/1.1.8/optional-require/index.js")(eval("require"));
+const optionalRequire = __webpack_require__("./node_modules/.f/_/optional-require/1.1.10/optional-require/index.js")(eval("require"));
 
 const assert = __webpack_require__("assert");
 
@@ -8970,7 +8970,7 @@ module.exports = PkgOptResolver;
 // - npm registry
 //
 
-/* eslint-disable no-magic-numbers, prefer-template, max-statements, no-param-reassign */
+/* eslint-disable no-magic-numbers, prefer-template, max-statements, no-param-reassign, no-sequences */
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -9830,6 +9830,9 @@ module.exports = {
 /***/ "./lib/util/aveazul.js":
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
+"use strict";
+
+
 module.exports = __webpack_require__("./node_modules/.f/_/aveazul/1.0.2/aveazul/lib/aveazul.js");
 
 /***/ }),
@@ -11532,9 +11535,9 @@ const Fs = __webpack_require__("./lib/util/file-ops.js");
 
 const Path = __webpack_require__("path");
 
-const mm = __webpack_require__("./node_modules/.f/_/minimatch/3.0.4/minimatch/minimatch.js");
+const mm = __webpack_require__("./node_modules/.f/_/minimatch/3.1.2/minimatch/minimatch.js");
 
-const filterScanDir = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/lib/index.js");
+const filterScanDir = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.6/filter-scan-dir/lib/index.js");
 
 async function _scanFileStats(dir, ignores, baseDir = "") {
   const ignore = fullPath => ignores.find(pattern => mm(fullPath, pattern, {
@@ -11610,13 +11613,16 @@ module.exports = __webpack_require__("./node_modules/.f/_/xaa/1.8.0/xaa/dist/ind
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.processOutput = exports.processLifecycleInput = exports.processInput = exports.readHashDigest = void 0;
+exports.readHashDigest = void 0;
+exports.processInput = processInput;
+exports.processLifecycleInput = processLifecycleInput;
+exports.processOutput = processOutput;
 
 const tslib_1 = __webpack_require__("./node_modules/.f/_/tslib/2.8.1/tslib/tslib.es6.mjs");
 
-const filter_scan_dir_1 = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/lib/index.js");
+const filter_scan_dir_1 = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.6/filter-scan-dir/lib/index.js");
 
-const minimatch_1 = tslib_1.__importDefault(__webpack_require__("./node_modules/.f/_/minimatch/3.0.4/minimatch/minimatch.js"));
+const minimatch_1 = tslib_1.__importDefault(__webpack_require__("./node_modules/.f/_/minimatch/3.1.2/minimatch/minimatch.js"));
 
 const lodash_1 = tslib_1.__importDefault(__webpack_require__("./node_modules/.f/_/lodash/4.17.21/lodash/lodash.min.js"));
 
@@ -11805,8 +11811,6 @@ async function processInput({
     hash
   };
 }
-
-exports.processInput = processInput;
 /**
  * process lifecycle caching input rules
  *
@@ -11814,6 +11818,7 @@ exports.processInput = processInput;
  * @returns
  */
 
+
 async function processLifecycleInput({
   cwd,
   input,
@@ -11834,8 +11839,6 @@ async function processLifecycleInput({
     packageJson
   });
 }
-
-exports.processLifecycleInput = processLifecycleInput;
 /**
  * Process build cache output rules.
  *
@@ -11843,6 +11846,7 @@ exports.processLifecycleInput = processLifecycleInput;
  * @returns
  */
 
+
 async function processOutput({
   cwd,
   inputHash,
@@ -11890,8 +11894,6 @@ async function processOutput({
   };
 }
 
-exports.processOutput = processOutput;
-
 /***/ }),
 
 /***/ "./node_modules/.f/_/@fynpo/base/1.1.17-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
@@ -11917,7 +11919,7 @@ const fs_1 = tslib_1.__importDefault(__webpack_require__("fs"));
 
 const path_1 = tslib_1.__importDefault(__webpack_require__("path"));
 
-const optional_require_1 = __webpack_require__("./node_modules/.f/_/optional-require/1.1.8/optional-require/index.js");
+const optional_require_1 = __webpack_require__("./node_modules/.f/_/optional-require/1.1.10/optional-require/index.js");
 /**
  * manage fynpo config
  */
@@ -12060,7 +12062,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.FynpoDepGraph = exports.pkgInfoId = exports.pkgId = exports.PackageRef = exports.makeDepStep = exports.getDepSection = void 0;
+exports.FynpoDepGraph = exports.PackageRef = void 0;
+exports.getDepSection = getDepSection;
+exports.makeDepStep = makeDepStep;
+exports.pkgId = pkgId;
+exports.pkgInfoId = pkgInfoId;
 
 const tslib_1 = __webpack_require__("./node_modules/.f/_/tslib/2.8.1/tslib/tslib.es6.mjs");
 
@@ -12070,9 +12076,9 @@ const path_1 = tslib_1.__importDefault(__webpack_require__("path"));
 
 const fs_1 = __webpack_require__("fs");
 
-const filter_scan_dir_1 = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/lib/index.js");
+const filter_scan_dir_1 = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.6/filter-scan-dir/lib/index.js");
 
-const minimatch_1 = tslib_1.__importDefault(__webpack_require__("./node_modules/.f/_/minimatch/3.0.4/minimatch/minimatch.js"));
+const minimatch_1 = tslib_1.__importDefault(__webpack_require__("./node_modules/.f/_/minimatch/3.1.2/minimatch/minimatch.js"));
 
 const lodash_1 = tslib_1.__importDefault(__webpack_require__("./node_modules/.f/_/lodash/4.17.21/lodash/lodash.min.js"));
 
@@ -12104,8 +12110,6 @@ const DepSectionMap = {
 function getDepSection(fullName) {
   return DepSectionMap[fullName] || "dep";
 }
-
-exports.getDepSection = getDepSection;
 /**
  * make a indirect dep step string
  *
@@ -12115,17 +12119,17 @@ exports.getDepSection = getDepSection;
  * @returns step string
  */
 
+
 function makeDepStep(name, version, sec) {
   return `${pkgId(name, version)}(${sec})`;
 }
-
-exports.makeDepStep = makeDepStep;
 /**
  * Reference to a package by id, path, or name.
  *
  * Supports RegExp or minimatch (for path)
  */
 
+
 class PackageRef {
   constructor(ref) {
     this.parseRef(ref);
@@ -12205,8 +12209,6 @@ function pkgId(name, version) {
   const ver = version ? `@${version}` : "";
   return `${name}${ver}`;
 }
-
-exports.pkgId = pkgId;
 /**
  * Resolve a package from multiple versions by a semver
  *
@@ -12218,6 +12220,7 @@ exports.pkgId = pkgId;
  * @returns package info
  */
 
+
 function resolvePackage(semver, packages, fallbackToFirst = true) {
   const found = packages.find(pkg => semver_1.default.satisfies(pkg.version, semver));
 
@@ -12242,12 +12245,11 @@ function resolvePackage(semver, packages, fallbackToFirst = true) {
 function pkgInfoId(info) {
   return pkgId(info.name, info.version);
 }
-
-exports.pkgInfoId = pkgInfoId;
 /**
  * fynpo dep graph manager
  */
 
+
 class FynpoDepGraph {
   constructor(options = {}) {
     this._options = _objectSpread({
@@ -12452,12 +12454,14 @@ class FynpoDepGraph {
         cwd,
         prefix,
         concurrency: 500,
-        filter: (file, path) => {
+        filter: (file, path, extras) => {
           if (path && path !== "." && file === "package.json") {
-            if (foundInAutoSearch(path)) {
+            if (extras.files.includes("fynpo.json") || foundInAutoSearch(path)) {
               //
-              // In auto search, if we've found a package.json in a dir, we don't want to
-              // search any other package.json further under that dir
+              // We ignore dir with package.json if:
+              // 1. It's a fynpo root dir, ie: `fynpo.json` exists
+              // 2. In auto search, if we've found a package.json in a dir, we don't want to
+              //    search any other package.json further under that dir
               //
               return false;
             }
@@ -12864,7 +12868,9 @@ exports.FynpoDepGraph = FynpoDepGraph;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.makePkgDeps = exports.readFynpoPackages = exports.caching = void 0;
+exports.caching = void 0;
+exports.readFynpoPackages = readFynpoPackages;
+exports.makePkgDeps = makePkgDeps;
 
 const tslib_1 = __webpack_require__("./node_modules/.f/_/tslib/2.8.1/tslib/tslib.es6.mjs");
 
@@ -12872,9 +12878,9 @@ const path_1 = tslib_1.__importDefault(__webpack_require__("path"));
 
 const fs_1 = __webpack_require__("fs");
 
-const filter_scan_dir_1 = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/lib/index.js");
+const filter_scan_dir_1 = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.6/filter-scan-dir/lib/index.js");
 
-const minimatch_1 = tslib_1.__importDefault(__webpack_require__("./node_modules/.f/_/minimatch/3.0.4/minimatch/minimatch.js"));
+const minimatch_1 = tslib_1.__importDefault(__webpack_require__("./node_modules/.f/_/minimatch/3.1.2/minimatch/minimatch.js"));
 
 const lodash_1 = tslib_1.__importDefault(__webpack_require__("./node_modules/.f/_/lodash/4.17.21/lodash/lodash.min.js"));
 
@@ -13053,8 +13059,6 @@ async function readFynpoPackages({
 
   return allPkgs;
 }
-
-exports.readFynpoPackages = readFynpoPackages;
 /**
  * calculate dep graphs for packages under the mono-repo
  *
@@ -13063,6 +13067,7 @@ exports.readFynpoPackages = readFynpoPackages;
  * @returns
  */
 
+
 function makePkgDeps(packages, opts) {
   const cwd = opts.cwd || process.cwd();
   let circulars = [];
@@ -13138,8 +13143,6 @@ function makePkgDeps(packages, opts) {
   };
 }
 
-exports.makePkgDeps = makePkgDeps;
-
 /***/ }),
 
 /***/ "./node_modules/.f/_/@fynpo/base/1.1.17-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
@@ -13151,11 +13154,14 @@ exports.makePkgDeps = makePkgDeps;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.unrollMmMatch = exports.checkMmMatch = exports.deconstructMM = exports.groupMM = void 0;
+exports.groupMM = groupMM;
+exports.deconstructMM = deconstructMM;
+exports.checkMmMatch = checkMmMatch;
+exports.unrollMmMatch = unrollMmMatch;
 
 const tslib_1 = __webpack_require__("./node_modules/.f/_/tslib/2.8.1/tslib/tslib.es6.mjs");
 
-const minimatch_1 = tslib_1.__importDefault(__webpack_require__("./node_modules/.f/_/minimatch/3.0.4/minimatch/minimatch.js"));
+const minimatch_1 = tslib_1.__importDefault(__webpack_require__("./node_modules/.f/_/minimatch/3.1.2/minimatch/minimatch.js"));
 
 const lodash_1 = tslib_1.__importDefault(__webpack_require__("./node_modules/.f/_/lodash/4.17.21/lodash/lodash.min.js"));
 /**
@@ -13190,8 +13196,6 @@ function groupMM(mms, groups) {
   });
   return groups;
 }
-
-exports.groupMM = groupMM;
 /**
  * process a minimatch pattern to group them for matching directories
  *
@@ -13199,6 +13203,7 @@ exports.groupMM = groupMM;
  * @param m0 minimatch pattern
  */
 
+
 function deconstructMM(m0) {
   const mms = [];
   const patterns = {
@@ -13240,8 +13245,6 @@ function deconstructMM(m0) {
 
   return patterns;
 }
-
-exports.deconstructMM = deconstructMM;
 /**
  * check that a path matches against a list of minimatch patterns
  *
@@ -13250,11 +13253,10 @@ exports.deconstructMM = deconstructMM;
  * @returns the first pattern that match or false
  */
 
+
 function checkMmMatch(fullPath, patterns) {
   return !lodash_1.default.isEmpty(patterns) && patterns.find(patternMm => patternMm.match(fullPath));
 }
-
-exports.checkMmMatch = checkMmMatch;
 /**
  * Take a full path and match each level of it to a list of minimatch patterns
  *
@@ -13263,6 +13265,7 @@ exports.checkMmMatch = checkMmMatch;
  * @returns
  */
 
+
 function unrollMmMatch(path, mms) {
   const parts = path.split("/");
   let rp;
@@ -13279,8 +13282,6 @@ function unrollMmMatch(path, mms) {
   return checkMmMatch(path, mms);
 }
 
-exports.unrollMmMatch = unrollMmMatch;
-
 /***/ }),
 
 /***/ "./node_modules/.f/_/@fynpo/base/1.1.17-fynlocal_h/@fynpo/base/dist/util.js":
@@ -37454,7 +37455,7 @@ function entries(obj) {
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/dist/index.js":
+/***/ "./node_modules/.f/_/filter-scan-dir/1.5.6/filter-scan-dir/dist/index.js":
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -37478,7 +37479,7 @@ const path_1 = __importDefault(__webpack_require__("path"));
 
 const util_1 = __importDefault(__webpack_require__("util"));
 
-const util_2 = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/dist/util.js");
+const util_2 = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.6/filter-scan-dir/dist/util.js");
 /**
  * create a new ExtrasData object
  *
@@ -37491,7 +37492,7 @@ const util_2 = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.5/fi
  */
 
 
-function makeExtrasData(file, fullFile, path, stat, options) {
+function makeExtrasData(file, fullFile, path, stat, files, options) {
   const dirFile = options._join2(path, file);
 
   const ix = file.lastIndexOf(".");
@@ -37504,7 +37505,8 @@ function makeExtrasData(file, fullFile, path, stat, options) {
       fullFile,
       dirFile,
       ext: file.substring(ix),
-      noExt: file.substring(0, ix)
+      noExt: file.substring(0, ix),
+      files
     };
   } else {
     return {
@@ -37514,7 +37516,8 @@ function makeExtrasData(file, fullFile, path, stat, options) {
       fullFile,
       dirFile,
       ext: "",
-      noExt: file
+      noExt: file,
+      files
     };
   }
 }
@@ -37646,11 +37649,11 @@ function walkSync(path, options, level = 0) {
         const fullFile = options._join2(dir, file);
 
         const stat = fs_1.default.lstatSync(fullFile);
-        extras = makeExtrasData(file, fullFile, path, stat, options);
+        extras = makeExtrasData(file, fullFile, path, stat, files, options);
       } else {
         const fullFile = options._join2(dir, file.name);
 
-        extras = makeExtrasData(file.name, fullFile, path, file, options);
+        extras = makeExtrasData(file.name, fullFile, path, file, files, options);
       }
 
       if (extras.stat.isDirectory()) {
@@ -37720,11 +37723,11 @@ async function walk(path, options, level = 0) {
         const fullFile = options._join2(dir, file);
 
         const stat = await asyncLStat(fullFile);
-        extras = makeExtrasData(file, fullFile, path, stat, options);
+        extras = makeExtrasData(file, fullFile, path, stat, files, options);
       } else {
         const fullFile = options._join2(dir, file.name);
 
-        extras = makeExtrasData(file.name, fullFile, path, file, options);
+        extras = makeExtrasData(file.name, fullFile, path, file, files, options);
       }
 
       if (extras.stat.isDirectory()) {
@@ -37861,7 +37864,7 @@ exports.filterScanDirSync = filterScanDirSync;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/dist/util.js":
+/***/ "./node_modules/.f/_/filter-scan-dir/1.5.6/filter-scan-dir/dist/util.js":
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -37930,13 +37933,13 @@ exports.makePathJoin2 = makePathJoin2;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/lib/index.js":
+/***/ "./node_modules/.f/_/filter-scan-dir/1.5.6/filter-scan-dir/lib/index.js":
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 "use strict";
 
 
-const fsd = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/dist/index.js");
+const fsd = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.6/filter-scan-dir/dist/index.js");
 
 const asyncApi = options => fsd.filterScanDir(options);
 
@@ -42941,7 +42944,7 @@ function ownProp(obj, field) {
 
 var path = __webpack_require__("path");
 
-var minimatch = __webpack_require__("./node_modules/.f/_/minimatch/3.0.4/minimatch/minimatch.js");
+var minimatch = __webpack_require__("./node_modules/.f/_/minimatch/3.1.2/minimatch/minimatch.js");
 
 var isAbsolute = __webpack_require__("./node_modules/.f/_/path-is-absolute/1.0.1/path-is-absolute/index.js");
 
@@ -43189,7 +43192,7 @@ var fs = __webpack_require__("fs");
 
 var rp = __webpack_require__("./node_modules/.f/_/fs.realpath/1.0.0/fs.realpath/index.js");
 
-var minimatch = __webpack_require__("./node_modules/.f/_/minimatch/3.0.4/minimatch/minimatch.js");
+var minimatch = __webpack_require__("./node_modules/.f/_/minimatch/3.1.2/minimatch/minimatch.js");
 
 var Minimatch = minimatch.Minimatch;
 
@@ -43856,7 +43859,7 @@ var fs = __webpack_require__("fs");
 
 var rp = __webpack_require__("./node_modules/.f/_/fs.realpath/1.0.0/fs.realpath/index.js");
 
-var minimatch = __webpack_require__("./node_modules/.f/_/minimatch/3.0.4/minimatch/minimatch.js");
+var minimatch = __webpack_require__("./node_modules/.f/_/minimatch/3.1.2/minimatch/minimatch.js");
 
 var Minimatch = minimatch.Minimatch;
 
@@ -48502,7 +48505,7 @@ const path = __webpack_require__("path");
 
 const EE = (__webpack_require__("events").EventEmitter);
 
-const Minimatch = (__webpack_require__("./node_modules/.f/_/minimatch/3.0.4/minimatch/minimatch.js").Minimatch);
+const Minimatch = (__webpack_require__("./node_modules/.f/_/minimatch/3.1.2/minimatch/minimatch.js").Minimatch);
 
 class Walker extends EE {
   constructor(opts) {
@@ -64094,19 +64097,21 @@ module.exports["default"] = mimicFn;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/minimatch/3.0.4/minimatch/minimatch.js":
+/***/ "./node_modules/.f/_/minimatch/3.1.2/minimatch/minimatch.js":
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 module.exports = minimatch;
 minimatch.Minimatch = Minimatch;
-var path = {
+
+var path = function () {
+  try {
+    return __webpack_require__("path");
+  } catch (e) {}
+}() || {
   sep: '/'
 };
 
-try {
-  path = __webpack_require__("path");
-} catch (er) {}
-
+minimatch.sep = path.sep;
 var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {};
 
 var expand = __webpack_require__("./node_modules/.f/_/brace-expansion/1.1.11/brace-expansion/index.js");
@@ -64167,51 +64172,71 @@ function filter(pattern, options) {
 }
 
 function ext(a, b) {
-  a = a || {};
   b = b || {};
   var t = {};
-  Object.keys(b).forEach(function (k) {
-    t[k] = b[k];
-  });
   Object.keys(a).forEach(function (k) {
     t[k] = a[k];
   });
+  Object.keys(b).forEach(function (k) {
+    t[k] = b[k];
+  });
   return t;
 }
 
 minimatch.defaults = function (def) {
-  if (!def || !Object.keys(def).length) return minimatch;
+  if (!def || typeof def !== 'object' || !Object.keys(def).length) {
+    return minimatch;
+  }
+
   var orig = minimatch;
 
   var m = function minimatch(p, pattern, options) {
-    return orig.minimatch(p, pattern, ext(def, options));
+    return orig(p, pattern, ext(def, options));
   };
 
   m.Minimatch = function Minimatch(pattern, options) {
     return new orig.Minimatch(pattern, ext(def, options));
   };
 
+  m.Minimatch.defaults = function defaults(options) {
+    return orig.defaults(ext(def, options)).Minimatch;
+  };
+
+  m.filter = function filter(pattern, options) {
+    return orig.filter(pattern, ext(def, options));
+  };
+
+  m.defaults = function defaults(options) {
+    return orig.defaults(ext(def, options));
+  };
+
+  m.makeRe = function makeRe(pattern, options) {
+    return orig.makeRe(pattern, ext(def, options));
+  };
+
+  m.braceExpand = function braceExpand(pattern, options) {
+    return orig.braceExpand(pattern, ext(def, options));
+  };
+
+  m.match = function (list, pattern, options) {
+    return orig.match(list, pattern, ext(def, options));
+  };
+
   return m;
 };
 
 Minimatch.defaults = function (def) {
-  if (!def || !Object.keys(def).length) return Minimatch;
   return minimatch.defaults(def).Minimatch;
 };
 
 function minimatch(p, pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('glob pattern string required');
-  }
-
+  assertValidPattern(pattern);
   if (!options) options = {}; // shortcut: comments match nothing.
 
   if (!options.nocomment && pattern.charAt(0) === '#') {
     return false;
-  } // "" only matches ""
-
+  }
 
-  if (pattern.trim() === '') return p === '';
   return new Minimatch(pattern, options).match(p);
 }
 
@@ -64220,14 +64245,11 @@ function Minimatch(pattern, options) {
     return new Minimatch(pattern, options);
   }
 
-  if (typeof pattern !== 'string') {
-    throw new TypeError('glob pattern string required');
-  }
-
+  assertValidPattern(pattern);
   if (!options) options = {};
   pattern = pattern.trim(); // windows support: need to use /, not \
 
-  if (path.sep !== '/') {
+  if (!options.allowWindowsEscape && path.sep !== '/') {
     pattern = pattern.split(path.sep).join('/');
   }
 
@@ -64237,7 +64259,8 @@ function Minimatch(pattern, options) {
   this.regexp = null;
   this.negate = false;
   this.comment = false;
-  this.empty = false; // make the set of regexps etc.
+  this.empty = false;
+  this.partial = !!options.partial; // make the set of regexps etc.
 
   this.make();
 }
@@ -64247,8 +64270,6 @@ Minimatch.prototype.debug = function () {};
 Minimatch.prototype.make = make;
 
 function make() {
-  // don't do it more than once.
-  if (this._made) return;
   var pattern = this.pattern;
   var options = this.options; // empty patterns and comments match nothing.
 
@@ -64266,7 +64287,9 @@ function make() {
   this.parseNegate(); // step 2: expand braces
 
   var set = this.globSet = this.braceExpand();
-  if (options.debug) this.debug = console.error;
+  if (options.debug) this.debug = function debug() {
+    console.error.apply(console, arguments);
+  };
   this.debug(this.pattern, set); // step 3: now we have a set, so turn each one into a series of path-portion
   // matching patterns.
   // These will be regexps, except in the case of "**", which is
@@ -64334,18 +64357,28 @@ function braceExpand(pattern, options) {
   }
 
   pattern = typeof pattern === 'undefined' ? this.pattern : pattern;
+  assertValidPattern(pattern); // Thanks to Yeting Li <https://github.com/yetingli> for
+  // improving this regexp to avoid a ReDOS vulnerability.
 
-  if (typeof pattern === 'undefined') {
-    throw new TypeError('undefined pattern');
-  }
-
-  if (options.nobrace || !pattern.match(/\{.*\}/)) {
+  if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) {
     // shortcut. no need to expand.
     return [pattern];
   }
 
   return expand(pattern);
-} // parse a component of the expanded set.
+}
+
+var MAX_PATTERN_LENGTH = 1024 * 64;
+
+var assertValidPattern = function (pattern) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('invalid pattern');
+  }
+
+  if (pattern.length > MAX_PATTERN_LENGTH) {
+    throw new TypeError('pattern is too long');
+  }
+}; // parse a component of the expanded set.
 // At this point, no pattern may contain "/" in it
 // so we're going to return a 2d array, where each entry is the full
 // pattern, split on '/', and then turned into a regular expression.
@@ -64362,13 +64395,13 @@ Minimatch.prototype.parse = parse;
 var SUBPARSE = {};
 
 function parse(pattern, isSub) {
-  if (pattern.length > 1024 * 64) {
-    throw new TypeError('pattern is too long');
-  }
-
+  assertValidPattern(pattern);
   var options = this.options; // shortcuts
 
-  if (!options.noglobstar && pattern === '**') return GLOBSTAR;
+  if (pattern === '**') {
+    if (!options.noglobstar) return GLOBSTAR;else pattern = '*';
+  }
+
   if (pattern === '') return '';
   var re = '';
   var hasMagic = !!options.nocase;
@@ -64422,10 +64455,13 @@ function parse(pattern, isSub) {
     }
 
     switch (c) {
+      /* istanbul ignore next */
       case '/':
-        // completely not allowed, even escaped.
-        // Should already be path-split by now.
-        return false;
+        {
+          // completely not allowed, even escaped.
+          // Should already be path-split by now.
+          return false;
+        }
 
       case '\\':
         clearStateChar();
@@ -64543,28 +64579,26 @@ function parse(pattern, isSub) {
           continue;
         } // handle the case where we left a class open.
         // "[z-a]" is valid, equivalent to "\[z-a\]"
+        // split where the last [ was, make sure we don't have
+        // an invalid re. if so, re-walk the contents of the
+        // would-be class to re-translate any characters that
+        // were passed through as-is
+        // TODO: It would probably be faster to determine this
+        // without a try/catch and a new RegExp, but it's tricky
+        // to do safely.  For now, this is safe and works.
 
 
-        if (inClass) {
-          // split where the last [ was, make sure we don't have
-          // an invalid re. if so, re-walk the contents of the
-          // would-be class to re-translate any characters that
-          // were passed through as-is
-          // TODO: It would probably be faster to determine this
-          // without a try/catch and a new RegExp, but it's tricky
-          // to do safely.  For now, this is safe and works.
-          var cs = pattern.substring(classStart + 1, i);
+        var cs = pattern.substring(classStart + 1, i);
 
-          try {
-            RegExp('[' + cs + ']');
-          } catch (er) {
-            // not a valid class!
-            var sp = this.parse(cs, SUBPARSE);
-            re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]';
-            hasMagic = hasMagic || sp[1];
-            inClass = false;
-            continue;
-          }
+        try {
+          RegExp('[' + cs + ']');
+        } catch (er) {
+          // not a valid class!
+          var sp = this.parse(cs, SUBPARSE);
+          re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]';
+          hasMagic = hasMagic || sp[1];
+          inClass = false;
+          continue;
         } // finish up the class.
 
 
@@ -64646,8 +64680,8 @@ function parse(pattern, isSub) {
   var addPatternStart = false;
 
   switch (re.charAt(0)) {
-    case '.':
     case '[':
+    case '.':
     case '(':
       addPatternStart = true;
   } // Hack to work around lack of negative lookbehind in JS
@@ -64712,7 +64746,9 @@ function parse(pattern, isSub) {
 
   try {
     var regExp = new RegExp('^' + re + '$', flags);
-  } catch (er) {
+  } catch (er)
+  /* istanbul ignore next - should be impossible */
+  {
     // If it was an invalid regular expression, then it can't match
     // anything.  This trick looks for a character after the end of
     // the string, which is of course impossible, except in multi-line
@@ -64762,7 +64798,9 @@ function makeRe() {
 
   try {
     this.regexp = new RegExp(re, flags);
-  } catch (ex) {
+  } catch (ex)
+  /* istanbul ignore next - should be impossible */
+  {
     this.regexp = false;
   }
 
@@ -64783,9 +64821,8 @@ minimatch.match = function (list, pattern, options) {
   return list;
 };
 
-Minimatch.prototype.match = match;
-
-function match(f, partial) {
+Minimatch.prototype.match = function match(f, partial) {
+  if (typeof partial === 'undefined') partial = this.partial;
   this.debug('match', f, this.pattern); // short-circuit in the case of busted things.
   // comments, etc.
 
@@ -64836,7 +64873,7 @@ function match(f, partial) {
 
   if (options.flipNegate) return false;
   return this.negate;
-} // set partial to true to test if, for example,
+}; // set partial to true to test if, for example,
 // "/a/b" matches the start of "/*/b/*/d"
 // Partial means, if you run out of file before you run
 // out of pattern, then that's fine, as long as all
@@ -64859,6 +64896,8 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
     this.debug(pattern, p, f); // should be impossible.
     // some invalid regexp stuff in the set.
 
+    /* istanbul ignore if */
+
     if (p === false) return false;
 
     if (p === GLOBSTAR) {
@@ -64928,6 +64967,8 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
       // However, in partial mode, we can't say this is necessarily over.
       // If there's more *pattern* left, then
 
+      /* istanbul ignore if */
+
 
       if (partial) {
         // ran out of file
@@ -64944,12 +64985,7 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
     var hit;
 
     if (typeof p === 'string') {
-      if (options.nocase) {
-        hit = f.toLowerCase() === p.toLowerCase();
-      } else {
-        hit = f === p;
-      }
-
+      hit = f === p;
       this.debug('string match', p, f, hit);
     } else {
       hit = f.match(p);
@@ -64979,14 +65015,17 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
     // this is ok if we're doing the match as part of
     // a glob fs traversal.
     return partial;
-  } else if (pi === pl) {
-    // ran out of pattern, still have file left.
-    // this is only acceptable if we're on the very last
-    // empty segment of a file with a trailing slash.
-    // a/* should match a/b/
-    var emptyFileEnd = fi === fl - 1 && file[fi] === '';
-    return emptyFileEnd;
-  } // should be unreachable.
+  } else
+    /* istanbul ignore else */
+    if (pi === pl) {
+      // ran out of pattern, still have file left.
+      // this is only acceptable if we're on the very last
+      // empty segment of a file with a trailing slash.
+      // a/* should match a/b/
+      return fi === fl - 1 && file[fi] === '';
+    } // should be unreachable.
+
+  /* istanbul ignore next */
 
 
   throw new Error('wtf?');
@@ -80582,7 +80621,7 @@ module.exports = opfsWrap;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/optional-require/1.1.8/optional-require/dist/index.js":
+/***/ "./node_modules/.f/_/optional-require/1.1.10/optional-require/dist/index.js":
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -80646,35 +80685,39 @@ function getPnpDependencyName(name) {
  * that's not found.
  *
  * @param err - the error
- * @param name - name of the module being required
+ * @param requestPath - request path of the module being required
  * @returns true or false
  */
 
 
-function findModuleNotFound(err, name) {
+function checkSelfModuleNotFoundErrors(err, requestPath) {
   // Check the first line of the error message
   var msg = err.message.split("\n")[0];
-  /* istanbul ignore if */
+  /* istanbul ignore next */
 
   if (!msg) {
+    /* istanbul ignore next */
     return false;
-  } // Check for "Cannot find module 'foo'"
+  } // exception that's not due to the module itself not found
 
 
-  if (msg.includes("'" + name + "'")) {
+  if (err.code === "MODULE_NOT_FOUND" && ( // If the module we are requiring failed because it try to require a
+  // module that's not found, then we have to report this as failed.
+  // - So the error message must contain the module name we are requiring.
+  err.requestPath === requestPath || msg.includes("not find module '".concat(requestPath, "'")) || msg.includes("not find package '".concat(requestPath, "'")))) {
     return true;
   }
 
-  var pnpDependencyName = getPnpDependencyName(name);
+  var pnpDependencyName = getPnpDependencyName(requestPath);
 
   if (pnpDependencyName) {
     return (// Check for "Your application tried to access foo (a peer dependency) ..." (Yarn Berry PnP)
       // https://github.com/yarnpkg/berry/blob/e81dc0d29bb2f41818d9c5c1c74bab1406fb979b/packages/yarnpkg-pnp/sources/loader/makeApi.ts#L680
-      msg.includes(" " + pnpDependencyName + " ") || // Check for "Your application tried to access foo. While ..." (Yarn Berry PnP)
+      msg.includes(" ".concat(pnpDependencyName, " ")) || // Check for "Your application tried to access foo. While ..." (Yarn Berry PnP)
       // https://github.com/yarnpkg/berry/blob/e81dc0d29bb2f41818d9c5c1c74bab1406fb979b/packages/yarnpkg-pnp/sources/loader/makeApi.ts#L704
-      msg.includes(" " + pnpDependencyName + ". ") || // Check for "Your application tried to access foo, but ..." (Yarn Berry PnP)
+      msg.includes(" ".concat(pnpDependencyName, ". ")) || // Check for "Your application tried to access foo, but ..." (Yarn Berry PnP)
       // https://github.com/yarnpkg/berry/blob/e81dc0d29bb2f41818d9c5c1c74bab1406fb979b/packages/yarnpkg-pnp/sources/loader/makeApi.ts#L718
-      msg.includes(" " + pnpDependencyName + ", ")
+      msg.includes(" ".concat(pnpDependencyName, ", "))
     );
   }
 
@@ -80689,7 +80732,7 @@ function findModuleNotFound(err, name) {
 
 
 function defaultLog(message, path) {
-  console.log("Just FYI: " + message + "; Path \"" + path + "\"");
+  console.log("Just FYI: ".concat(message, "; Path \"").concat(path, "\""));
 }
 
 var __defaultLog = defaultLog;
@@ -80733,26 +80776,23 @@ function _getOptions(optsOrMsg, requireFunction, log) {
 function _optionalRequire(path, opts) {
   try {
     return opts.resolve ? opts.require.resolve(path) : opts.require(path);
-  } catch (e) {
-    // exception that's not due to the module itself not found
-    if (e.code !== "MODULE_NOT_FOUND" || !findModuleNotFound(e, path)) {
-      // if the module we are requiring fail because it try to require a
-      // module that's not found, then we have to report this as failed.
+  } catch (err) {
+    if (!checkSelfModuleNotFoundErrors(err, path)) {
       if (typeof opts.fail === "function") {
-        return opts.fail(e);
+        return opts.fail(err);
       }
 
-      throw e;
+      throw err;
     }
 
     if (opts.message) {
-      var message = opts.message === true ? "" : opts.message + " - ";
+      var message = opts.message === true ? "" : "".concat(opts.message, " - ");
       var r = opts.resolve ? "resolved" : "found";
-      opts.log(message + "optional module not " + r, path);
+      opts.log("".concat(message, "optional module not ").concat(r), path);
     }
 
     if (typeof opts.notFound === "function") {
-      return opts.notFound(e);
+      return opts.notFound(err);
     }
 
     return opts.default;
@@ -80846,7 +80886,7 @@ exports.optionalRequireCwd = makeOptionalRequire((0, require_at_1.default)(proce
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/optional-require/1.1.8/optional-require/index.js":
+/***/ "./node_modules/.f/_/optional-require/1.1.10/optional-require/index.js":
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 "use strict";
@@ -80856,7 +80896,7 @@ exports.optionalRequireCwd = makeOptionalRequire((0, require_at_1.default)(proce
  *
  */
 
-const lib = __webpack_require__("./node_modules/.f/_/optional-require/1.1.8/optional-require/dist/index.js");
+const lib = __webpack_require__("./node_modules/.f/_/optional-require/1.1.10/optional-require/dist/index.js");
 
 module.exports = function () {
   return lib.makeOptionalRequire.apply(lib, arguments);
@@ -82431,7 +82471,7 @@ const fetchFromManifest = (__webpack_require__("./node_modules/.f/_/pacote/9.4.0
 
 const finished = __webpack_require__("./node_modules/.f/_/pacote/9.4.0/pacote/lib/util/finished.js");
 
-const minimatch = __webpack_require__("./node_modules/.f/_/minimatch/3.0.4/minimatch/minimatch.js");
+const minimatch = __webpack_require__("./node_modules/.f/_/minimatch/3.1.2/minimatch/minimatch.js");
 
 const normalize = __webpack_require__("./node_modules/.f/_/normalize-package-data/2.5.0/normalize-package-data/lib/normalize.js");
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fyn",
-  "version": "1.1.45",
+  "version": "1.1.46",
   "description": "fyn is the NPM for fynpo -- a zero setup monorepo tool",
   "main": "./bin/fyn.js",
   "homepage": "https://jchip.github.io/fynpo/",