fyn 1.1.31 → 1.1.32

package/dist/fyn.js

@@ -1073,13 +1073,21 @@ class FynCli {
       }
     }));
 
-    const env = npmLifecycle.initEnv(process.env, this.fyn.production);
+    const env = npmLifecycle.initEnv(process.env, this.fyn.production); // add fynpo top dir node_modules/.bin to PATH
+
+    if (this._config._fynpo.config) {
+      xsh.envPath.addToFront(Path.join(this._config._fynpo.dir, "node_modules/.bin"), env);
+    }
+
     setupNodeGypEnv(env);
     return Promise.each(_scripts, s => _.get(pkg, ["scripts", s]) && this.runScript(pkg, s, Object.assign({}, env)));
   }
 
   async run(argv, script = "") {
-    this._config._fynpo = false;
+    if (!this._config._fynpo) {
+      this._config._fynpo = {};
+    }
+
     script = script || argv.args.script;
 
     if (argv.opts.list || !script) {
@@ -1313,7 +1321,8 @@ const pickOptions = async (argv, nixClap, checkFynpo = true) => {
   return {
     opts: argv.opts,
     rcData,
-    _cliSource: argv.source
+    _cliSource: argv.source,
+    _fynpo: fynpo
   };
 };
 
@@ -1600,7 +1609,8 @@ const commands = {
     usage: "$0 $1 <command> [-- <args>...]",
     exec: async (argv, parsed) => {
       try {
-        return await new FynCli(await pickOptions(argv, parsed.nixClap, !argv.opts.list)).run(argv);
+        const options = await pickOptions(argv, parsed.nixClap, !argv.opts.list);
+        return await new FynCli(options).run(argv);
       } catch (err) {
         if (err.errno !== undefined) {
           process.exit(err.errno);
@@ -4076,7 +4086,11 @@ class LifecycleScripts {
     // this._addNpmPackageConfig(this._appPkg.config, env);
     // this._addNpmPackageConfig(this._pkg.config, env);
     const env = Object.assign({}, npmConfigEnv(this._pkg, this._fyn.allrc || {}), override);
-    setupNodeGypEnv(env);
+    setupNodeGypEnv(env); // add fynpo node_modules/.bin to PATH
+
+    if (this._fyn.isFynpo) {
+      xsh.envPath.addToFront(Path.join(this._fyn._fynpo.dir, "node_modules/.bin"), env);
+    }
 
     if (this._appDir) {
       xsh.envPath.addToFront(Path.join(this._appDir, "node_modules/.bin"), env);
@@ -5762,7 +5776,7 @@ const {
 const {
   getDepSection,
   makeDepStep
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/index.js");
 
 const xaa = __webpack_require__("./lib/util/xaa.js");
 
@@ -8730,7 +8744,7 @@ const {
 
 const {
   PackageRef
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/index.js");
 
 const WATCH_TIME = 5000; // consider meta cache stale after this much time (30 minutes)
 
@@ -9748,7 +9762,7 @@ const {
 const {
   FynpoConfigManager,
   FynpoDepGraph
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/index.js");
 /* eslint-disable no-magic-numbers, max-statements, no-empty, complexity, no-eval */
 
 
@@ -11246,7 +11260,7 @@ module.exports = __webpack_require__("./node_modules/.f/_/xaa/1.7.0/xaa/dist/xaa
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/caching.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/caching.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11267,7 +11281,7 @@ const fs_1 = (0, tslib_1.__importDefault)(__webpack_require__("fs"));
 const path_1 = (0, tslib_1.__importDefault)(__webpack_require__("path"));
 const crypto_1 = (0, tslib_1.__importDefault)(__webpack_require__("crypto"));
 
-const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 /**
  * create a sha256 hash for some data
  *
@@ -11521,12 +11535,13 @@ async function processOutput({
   } //
 
 
+  const now = Date.now();
   return {
     files: allFiles,
     data,
     hash,
-    access: Date.now(),
-    create: Date.now()
+    access: now,
+    create: now
   };
 }
 
@@ -11534,7 +11549,7 @@ exports.processOutput = processOutput;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11684,7 +11699,7 @@ exports.FynpoConfigManager = FynpoConfigManager;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11714,9 +11729,9 @@ const minimatch_1 = (0, tslib_1.__importDefault)(__webpack_require__("./node_mod
 const lodash_1 = (0, tslib_1.__importDefault)(__webpack_require__("./node_modules/.f/_/lodash/4.17.21/lodash/lodash.min.js"));
 const semver_1 = (0, tslib_1.__importDefault)(__webpack_require__("./node_modules/.f/_/semver/7.3.5/semver/index.js"));
 
-const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 
-const util_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/util.js");
+const util_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/util.js");
 
 const is_path_inside_1 = (0, tslib_1.__importDefault)(__webpack_require__("./node_modules/.f/_/is-path-inside/3.0.3/is-path-inside/index.js"));
 const DepSectionMap = {
@@ -12437,7 +12452,7 @@ exports.FynpoDepGraph = FynpoDepGraph;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/index.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/index.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -12459,12 +12474,12 @@ const filter_scan_dir_1 = __webpack_require__("./node_modules/.f/_/filter-scan-d
 const minimatch_1 = (0, tslib_1.__importDefault)(__webpack_require__("./node_modules/.f/_/minimatch/3.0.4/minimatch/minimatch.js"));
 const lodash_1 = (0, tslib_1.__importDefault)(__webpack_require__("./node_modules/.f/_/lodash/4.17.21/lodash/lodash.min.js"));
 
-const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js"), exports);
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/fynpo-config.js"), exports);
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/util.js"), exports);
-exports.caching = (0, tslib_1.__importStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/caching.js"));
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js"), exports);
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/fynpo-config.js"), exports);
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/util.js"), exports);
+exports.caching = (0, tslib_1.__importStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/caching.js"));
 /**
  * Take an array of packages and figure out their dependencies on each other
  *
@@ -12720,7 +12735,7 @@ exports.makePkgDeps = makePkgDeps;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -12772,7 +12787,7 @@ exports.groupMM = groupMM;
  * process a minimatch pattern to group them for matching directories
  *
  * - needs to create a new pattern at every non-string part
- * @param pattern
+ * @param m0 minimatch pattern
  */
 
 function deconstructMM(m0) {
@@ -12845,20 +12860,21 @@ function unrollMmMatch(path, mms) {
 
   for (let i = 0; i < parts.length - 1; i++) {
     rp = rp !== undefined ? rp + "/" + parts[i] : parts[i];
+    const m1 = checkMmMatch(`${rp}/`, mms);
 
-    if (checkMmMatch(`${rp}/`, mms)) {
-      return true;
+    if (m1) {
+      return m1;
     }
   }
 
-  return !!checkMmMatch(path, mms);
+  return checkMmMatch(path, mms);
 }
 
 exports.unrollMmMatch = unrollMmMatch;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/util.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/util.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fyn",
-  "version": "1.1.31",
+  "version": "1.1.32",
   "description": "The package manager for fynpo, a zero setup monorepo manager",
   "main": "./bin/fyn.js",
   "homepage": "https://jchip.github.io/fynpo/",