fyn 1.1.15 → 1.1.19

package/dist/fyn.js

@@ -973,7 +973,9 @@ class FynCli {
       } // run npm scripts from fynpo, with lifecycle scripts added
 
 
-      const fynpoNpmScripts = addNpmLifecycle(_.without(this.fyn._runNpm, ...npmInstallScripts), pkgScripts);
+      const _runNpm = this.fyn._runNpm.map(s => Array.isArray(s) ? s.find(s1 => pkgScripts[s1] !== undefined) : s);
+
+      const fynpoNpmScripts = addNpmLifecycle(_.without(_runNpm, ...npmInstallScripts), pkgScripts);
 
       if (fynpoNpmScripts.length > 0) {
         await runNpmScript({
@@ -2921,7 +2923,7 @@ const semverUtil = __webpack_require__("./lib/util/semver.js");
 
 const Fs = __webpack_require__("./lib/util/file-ops.js");
 
-const fyntil = __webpack_require__("./lib/util/fyntil.js");
+const fynTil = __webpack_require__("./lib/util/fyntil.js");
 
 const FynCentral = __webpack_require__("./lib/fyn-central.js");
 
@@ -2978,7 +2980,7 @@ class Fyn {
     const options = this._options = fynConfig(opts);
     this._layout = options.layout;
     this._cwd = options.cwd || process.cwd();
-    logger.debug(`fyn options`, JSON.stringify(fyntil.removeAuthInfo(options)));
+    logger.debug(`fyn options`, JSON.stringify(fynTil.removeAuthInfo(options)));
     this.localPkgWithNestedDep = [];
 
     if (options.lockTime) {
@@ -3069,13 +3071,21 @@ class Fyn {
     if (this._installConfig.centralDir) {
       centralDir = this._installConfig.centralDir;
       logger.debug(`Enabling central store using dir from install config ${centralDir}`);
-    } else if (process.env.FYN_CENTRAL_DIR) {
+    } else if (centralDir = process.env.FYN_CENTRAL_DIR) {
       // env wins
-      centralDir = process.env.FYN_CENTRAL_DIR;
-      logger.debug(`Enabling central store using dir from env FYN_CENTRAL_DIR ${centralDir}`);
+      if (fynTil.strToBool(centralDir) === false) {
+        logger.debug(`Disabling central store by env FYN_CENTRAL_DIR set to ${centralDir}`);
+        return this._central = false;
+      }
+
+      if (fynTil.isTrueStr(centralDir)) {
+        centralDir = Path.join(this.fynDir, "_central-storage");
+      }
+
+      logger.debug(`Enabling central store by env FYN_CENTRAL_DIR using dir ${centralDir}`);
     } else if (options.centralStore) {
       centralDir = Path.join(this.fynDir, "_central-storage");
-      logger.debug(`Enabling central store for flag using dir ${centralDir}`);
+      logger.debug(`Enabling central store by CLI flag using dir ${centralDir}`);
     } else if (!this._fynpo.config) {
       return this._central = false;
     } else {
@@ -3085,7 +3095,7 @@ class Fyn {
         centralDir = Path.join(this._fynpo.dir, ".fynpo", "_store");
       }
 
-      logger.info(`fynpo monorepo: enabling central dir ${centralDir}`);
+      logger.info(`Enabling central store by fynpo monorepo using dir ${centralDir}`);
     }
 
     return this._central = new FynCentral({
@@ -3142,7 +3152,7 @@ class Fyn {
 
   async _initializePkg() {
     if (!this._fynpo) {
-      this._fynpo = await fyntil.loadFynpo(this._cwd); // TODO: options from CLI should not be override by fynpo config options
+      this._fynpo = await fynTil.loadFynpo(this._cwd); // TODO: options from CLI should not be override by fynpo config options
 
       _.merge(this._options, _.get(this, "_fynpo.fyn.options"));
 
@@ -3187,6 +3197,11 @@ class Fyn {
 
       if (this._fynpo.config) {
         if (this._fynpo.graph.getPackageAtDir(this._cwd)) {
+          // the command.bootstrap.npmRunScripts can be
+          // - a string
+          // - an array of strings
+          // - an array of strings and/or array of strings - each sub array indicates a list of
+          //   script names and fyn will run only the first one that exist
           fynpoNpmRun = _.get(this, "_fynpo.config.command.bootstrap.npmRunScripts", undefined);
 
           if (_.isArray(fynpoNpmRun) && !_.isEmpty(fynpoNpmRun)) {
@@ -3235,7 +3250,7 @@ class Fyn {
         retryWait: 500
       });
       const path = posixify(Path.relative(this._fynpo.dir, this.cwd));
-      const fynpoData = await fyntil.readJson(dataFile, {
+      const fynpoData = await fynTil.readJson(dataFile, {
         indirects: {
           [path]: []
         }
@@ -3325,7 +3340,7 @@ class Fyn {
   }
 
   async loadPkgFyn() {
-    this._pkgFyn = await xaa.try(() => fyntil.readJson(Path.resolve(this._cwd, PACKAGE_FYN_JSON)));
+    this._pkgFyn = await xaa.try(() => fynTil.readJson(Path.resolve(this._cwd, PACKAGE_FYN_JSON)));
     return this._pkgFyn;
   }
 
@@ -3346,11 +3361,11 @@ class Fyn {
       this._pkgFile = pkgFile;
 
       try {
-        this._pkg = await fyntil.readPkgJson(pkgFile, true);
+        this._pkg = await fynTil.readPkgJson(pkgFile, true);
       } catch (err) {
         logger.error("failed to read package.json file", pkgFile);
         logger.error(err.message);
-        fyntil.exit(err);
+        fynTil.exit(err);
       }
 
       const pkgFyn = await this.loadPkgFyn(options);
@@ -3789,14 +3804,23 @@ class Fyn {
     }
   }
 
-  async moveToBackup(dir, reason) {
-    // TODO: create backup dir and move
-    logger.warn("Removing", dir, "due to", reason);
-    return await Fs.$.rimraf(dir);
+  async moveToFv(dir, pkg, pkgJson) {
+    const toDir = this.getInstalledPkgDir(pkgJson.name, pkgJson.version, {});
+
+    try {
+      await Fs.access(toDir); // a copy already exist in FV dir, so remove it
+
+      logger.warn(`Removing ${dir} because its version ${pkgJson.version} is different from ${pkg.version}`);
+      await Fs.$.rimraf(dir);
+    } catch (err) {
+      logger.debug(`Moving ${dir} to ${toDir} to replace with version ${pkg.version}`);
+      await Fs.$.mkdirp(Path.dirname(toDir));
+      await Fs.rename(dir, toDir);
+    }
   }
 
-  async unlinkLocalPackage(pkg, dir) {
-    logger.warn("Removing symlink", dir);
+  async unlinkLocalPackage(dir, reason) {
+    logger.warn(`Removing ${dir} because it's ${reason}`);
     return await Fs.$.rimraf(dir);
   } //
   // A pkg that's to be extracted must:
@@ -3822,21 +3846,21 @@ class Fyn {
     }
 
     if (ostat.isSymbolicLink()) {
-      await this.unlinkLocalPackage(pkg, fullOutDir);
+      await this.unlinkLocalPackage(fullOutDir, "a symlink");
     } else if (!ostat.isDirectory()) {
-      await this.moveToBackup(fullOutDir, "not a directory");
+      await this.unlinkLocalPackage(fullOutDir, "not a directory");
     } else {
       try {
         const pkgJson = await this.loadJsonForPkg(pkg, fullOutDir);
 
         if (!pkgJson._invalid) {
           return pkgJson;
-        } // no valid package.json found
-
+        }
 
-        const id = pkgJson._id ? ` (id ${pkgJson._id})` : "";
-        await this.moveToBackup(fullOutDir, `invalid existing package${id}`);
-      } catch (err) {}
+        await this.moveToFv(fullOutDir, pkg, pkgJson);
+      } catch (err) {
+        logger.warn(`ensureProperPkgdir:`, err);
+      }
     }
 
     return null;
@@ -3844,7 +3868,7 @@ class Fyn {
 
   async loadJsonForPkg(pkg, dir) {
     const fullOutDir = dir || this.getInstalledPkgDir(pkg.name, pkg.version, pkg);
-    const json = await fyntil.readPkgJson(fullOutDir, true);
+    const json = await fynTil.readPkgJson(fullOutDir, true);
     const pkgId = `${pkg.name}@${pkg.version}`;
     const id = `${json.name}@${json.version}`;
 
@@ -3940,7 +3964,7 @@ const logger = __webpack_require__("./lib/logger.js");
 
 const logFormat = __webpack_require__("./lib/util/log-format.js");
 
-const VisualExec = __webpack_require__("./node_modules/.f/_/visual-exec/0.1.13/visual-exec/lib/visual-exec.js");
+const VisualExec = __webpack_require__("./node_modules/.f/_/visual-exec/0.1.14/visual-exec/lib/visual-exec.js");
 
 const fyntil = __webpack_require__("./lib/util/fyntil.js");
 
@@ -4179,7 +4203,7 @@ const logger = __webpack_require__("./lib/logger.js");
 
 const PromiseQueue = __webpack_require__("./lib/util/promise-queue.js");
 
-const VisualExec = __webpack_require__("./node_modules/.f/_/visual-exec/0.1.13/visual-exec/lib/visual-exec.js");
+const VisualExec = __webpack_require__("./node_modules/.f/_/visual-exec/0.1.14/visual-exec/lib/visual-exec.js");
 
 const xaa = __webpack_require__("./node_modules/.f/_/xaa/1.7.0/xaa/dist/xaa.js");
 
@@ -4346,7 +4370,7 @@ class LocalPkgBuilder {
   Build local dep package - running npm script 'prepublish' at ${dispPath}
 
   ==NOTE== While fyn will run 'prepublish' as part of installing this local package as a dependency,
-  ==NOTE== Please note that npm depreated this script and recommend other npm lifecycle script
+  ==NOTE== Please note that npm deprecated this script and recommend other npm lifecycle script
   ==NOTE== such as 'prepare'.  See docs here https://docs.npmjs.com/cli/v7/using-npm/scripts#prepare-and-prepublish
   ==NOTE== If you want to use 'prepublishOnly', please note that fyn won't execute it as part of
   ==NOTE== installing local packages.
@@ -5756,7 +5780,7 @@ const {
 const {
   getDepSection,
   makeDepStep
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/index.js");
 
 const xaa = __webpack_require__("./lib/util/xaa.js");
 
@@ -6108,6 +6132,32 @@ class PkgDepResolver {
       this._promiseQ.addItem(PromiseQueue.pauseItem, true);
     }
   }
+
+  getAutoSemver(semver) {
+    const autoSemver = _.get(this._fyn._fynpo, "config.localDepAutoSemver");
+
+    if (autoSemver) {
+      const parsedSv = Semver.coerce(semver);
+
+      if (parsedSv && parsedSv.raw) {
+        switch (autoSemver) {
+          case "patch":
+            semver = `~${parsedSv.raw}`;
+            break;
+
+          case "minor":
+            semver = `^${parsedSv.raw}`;
+            break;
+
+          case "major":
+            semver = "*";
+            break;
+        }
+      }
+    }
+
+    return semver;
+  }
   /**
    * create the dep relation items for a package
    *
@@ -6203,26 +6253,26 @@ class PkgDepResolver {
         const fynpo = this._fyn._fynpo;
 
         if (!fromDir) {
-          // this case means an downstream pkg has a dep on a monorepo package
-          // TODO: should make sure monorepo local copy's version satisfies
-          // downstream pkg's semver
+          // this case means a downstream pkg has a dep on a monorepo package
           fromDir = this._fyn.cwd;
         }
 
         for (const name in deps) {
-          if (this._fyn.checkNoFynLocal(name)) {
+          if (this._fyn.checkNoFynLocal(name) || !fynpo.graph.getPackageByName(name)) {
             continue;
-          } // is pkg 'name@semver' a fynpo package?
+          } //
+          // Check if there is a fynpo package that match 'name@semver'?
+          //
 
 
-          const semver = deps[name];
+          const semver = this.getAutoSemver(deps[name]);
           const fynpoPkg = fynpo.graph.resolvePackage(name, semver, false);
 
           if (fynpoPkg) {
             locals.push(fynpoPkg);
             const fullPkgDir = Path.join(fynpo.dir, fynpoPkg.path);
             fynDeps[name] = relativePath(fromDir, fullPkgDir, true);
-          } else if (fynpo.graph.getPackageByName(name)) {
+          } else {
             const dispName = logFormat.pkgId(name);
             const versions = fynpo.graph.packages.byName[name].map(x => x.version).join(", ");
             logger.info(`No version of package in fynpo match semver: ${semver} name: ${dispName} versions: ${versions}`);
@@ -6816,7 +6866,7 @@ ${item.depPath.join(" > ")}`);
       return false;
     }
 
-    const force = this._lockOnly && isOpt; // check if an already resolved local package satisfies item
+    const force = this._lockOnly && !isOpt; // check if an already resolved local package satisfies item
     // before trying to resolve with lock data
 
     if (!this._fyn.preferLock) {
@@ -7660,7 +7710,7 @@ class PkgInstaller {
         const vdir = this._fyn.getInstalledPkgDir(depInfo.name, depInfo.version, depInfo);
 
         pkgJsonFp = Path.join(vdir, "package.json");
-        await Fs.unlink(pkgJsonFp);
+        await xaa.try(() => Fs.unlink(pkgJsonFp));
       } else {
         pkgJsonFp = Path.join(depInfo.dir, "package.json");
       }
@@ -8037,13 +8087,17 @@ class PkgInstaller {
 
     if (scope) await xaa.try(() => Fs.rmdir(Path.join(outDir, scope))); // get rid of potentially empty FV_DIR dir
 
-    await xaa.try(() => Fs.rmdir(this._fyn.getFvDir()));
+    await xaa.try(() => Fs.rmdir(this._fyn.getFvDir("_")));
   }
   /**
    * Process detail layout for node_modules.
    *
-   * Make links under node_modules for packages that exist app's package.json and
-   * flattened packages under node_modules/${FV_DIR}/node_modules
+   * Real copies of packages are store under FV_DIR.
+   *
+   * 1. For top level packages that exist in app's package.json, make symlinks under node_modules.
+   * 2. For packages that could be promoted to the top level:
+   * - If flattenTop enabled, make symlinks under node_modules
+   * - flattenTop disabled, make symlinks under FV_Dir/node_modules
    *
    * @returns {*} none
    */
@@ -8673,7 +8727,7 @@ const {
 
 const PkgPreper = __webpack_require__("./node_modules/.f/_/pkg-preper/0.1.0/pkg-preper/lib/pkg-preper.js");
 
-const VisualExec = __webpack_require__("./node_modules/.f/_/visual-exec/0.1.13/visual-exec/lib/visual-exec.js");
+const VisualExec = __webpack_require__("./node_modules/.f/_/visual-exec/0.1.14/visual-exec/lib/visual-exec.js");
 
 const {
   readPkgJson,
@@ -8692,11 +8746,11 @@ const {
 
 const {
   prePackObj
-} = __webpack_require__("./node_modules/.f/_/publish-util/1.3.3/publish-util/lib/index.js");
+} = __webpack_require__("./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/index.js");
 
 const {
   PackageRef
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/index.js");
 
 const WATCH_TIME = 5000; // consider meta cache stale after this much time (30 minutes)
 
@@ -8883,7 +8937,7 @@ class PkgSrcManager {
       const publishUtilConfig = this.getPublishUtil(json, fullPath);
 
       if (publishUtilConfig) {
-        logger.info(`processing local package.json at ${fullPath} with https://www.npmjs.com/package/publish-util prePackObj`);
+        logger.debug(`processing local package.json at ${fullPath} with https://www.npmjs.com/package/publish-util prePackObj`);
         prePackObj(json, _objectSpread(_objectSpread({}, publishUtilConfig), {}, {
           silent: true
         }));
@@ -9712,7 +9766,7 @@ const {
 const {
   FynpoConfigManager,
   FynpoDepGraph
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/index.js");
 /* eslint-disable no-magic-numbers, max-statements, no-empty, complexity, no-eval */
 
 
@@ -9975,6 +10029,46 @@ const fyntil = {
 
     return true;
   },
+
+  /**
+   * Convert a string to a bool value.  Considering 0, off, false, no to be `false`, else true.
+   *
+   * @param {*} v
+   * @returns true or false
+   */
+  strToBool: v => {
+    if (!v) {
+      return false;
+    }
+
+    const lv = v.toLowerCase();
+
+    if (lv === "0" || lv === "off" || lv === "false" || lv === "no") {
+      return false;
+    }
+
+    return true;
+  },
+
+  /**
+   * Check if a string looks like a true bool value, considering 1, on, true, yes to be `true`, else `false`
+   *
+   * @param {*} v
+   * @returns true or false
+   */
+  isTrueStr: v => {
+    if (!v) {
+      return false;
+    }
+
+    const lv = v.toLowerCase();
+
+    if (lv === "1" || lv === "on" || lv === "true" || lv === "yes") {
+      return true;
+    }
+
+    return false;
+  },
   posixify
 };
 module.exports = fyntil;
@@ -10012,6 +10106,18 @@ const {
 } = __webpack_require__("./node_modules/.f/_/source-map/0.7.3/source-map/source-map.js");
 
 const ci = __webpack_require__("./node_modules/.f/_/ci-info/2.0.0/ci-info/index.js");
+/**
+ * Hard link a file
+ *
+ * - if the link exist and is link to a different file, then remove it
+ *   and create a new link that points to the new file.
+ *
+ * @param {*} srcFp
+ * @param {*} destFp
+ * @param {*} srcStat
+ * @returns
+ */
+
 
 async function linkFile(srcFp, destFp, srcStat) {
   try {
@@ -10034,6 +10140,13 @@ async function linkFile(srcFp, destFp, srcStat) {
 
   return undefined;
 }
+/**
+ * Copy a file
+ * @param {*} srcFp
+ * @param {*} destFp
+ * @returns
+ */
+
 
 async function copyFile(srcFp, destFp) {
   if (Fs.copyFile) {
@@ -10074,10 +10187,17 @@ async function cleanExtraDest(dest, destFiles) {
 }
 
 const FILES = Symbol("files");
+/**
+ * Generate a tree of files using npm-pack that a package would publish with.
+ *
+ * @param {*} path
+ * @returns
+ */
 
 async function generatePackTree(path) {
   const files = await npmPacklist({
-    path
+    path,
+    includeSymlinks: fynTil.strToBool(process.env.FYN_LOCAL_PACK_SYMLINKS)
   });
   logger.debug(`local package linking - pack tree returned ${files.length} files to link`, JSON.stringify(files, null, 2));
 
@@ -10135,7 +10255,9 @@ function getSourceMapConfig(content, sig = SOURCE_MAP_URL_SIG) {
   return lastMatch && lastMatch[1];
 }
 /**
- * process or generate source map back to original file
+ * process or generate source map back to original file.
+ *
+ * - Do nothing if in CI mode
  *
  * @param {*} param0
  */
@@ -10252,6 +10374,8 @@ async function handleSourceMap({
 /**
  * Link tree of files generated from npm pack
  *
+ * - if env `FYN_LOCAL_COPY_MODE` is defined, then copy file instead  of linking
+ *
  * @param {*} tree
  * @param {*} src
  * @param {*} dest
@@ -10281,7 +10405,13 @@ async function linkPackTree({
     destFiles[file] = true;
     const srcFp = Path.join(src, file);
     const destFp = Path.join(dest, file);
-    await linkFile(srcFp, destFp);
+
+    if (fynTil.strToBool(process.env.FYN_LOCAL_COPY_MODE)) {
+      await copyFile(srcFp, destFp);
+    } else {
+      await linkFile(srcFp, destFp);
+    }
+
     await handleSourceMap({
       file,
       destFiles,
@@ -10969,7 +11099,7 @@ module.exports = __webpack_require__("./node_modules/.f/_/xaa/1.7.0/xaa/dist/xaa
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11119,7 +11249,7 @@ exports.FynpoConfigManager = FynpoConfigManager;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11148,9 +11278,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.5-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 
-const util_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/util.js");
+const util_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-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 = {
@@ -11870,7 +12000,7 @@ exports.FynpoDepGraph = FynpoDepGraph;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/index.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/index.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11891,11 +12021,11 @@ const filter_scan_dir_1 = (0, tslib_1.__importDefault)(__webpack_require__("./no
 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.5-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js"), exports);
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/fynpo-config.js"), exports);
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/util.js"), exports);
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js"), exports);
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/fynpo-config.js"), exports);
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/util.js"), exports);
 /**
  * Take an array of packages and figure out their dependencies on each other
  *
@@ -12150,7 +12280,7 @@ exports.makePkgDeps = makePkgDeps;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
@@ -12196,7 +12326,7 @@ exports.groupMM = groupMM;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/util.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/util.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -54979,6 +55109,14 @@ const npmWalker = Class => class Walker extends Class {
       this.bundledScopes = [];
       this.packageJsonCache = this.parent.packageJsonCache;
     }
+
+    this.includeSymlinks = opt.includeSymlinks;
+  }
+
+  walkerOpt(entry) {
+    const opt = super.walkerOpt(entry);
+    opt.includeSymlinks = this.includeSymlinks;
+    return opt;
   }
 
   onReaddir(entries) {
@@ -55055,7 +55193,7 @@ const npmWalker = Class => class Walker extends Class {
 
 
   onstat(st, entry, file, dir, then) {
-    if (st.isSymbolicLink()) then();else super.onstat(st, entry, file, dir, then);
+    if (!this.includeSymlinks && st.isSymbolicLink()) then();else super.onstat(st, entry, file, dir, then);
   }
 
   onReadIgnoreFile(file, data, then) {
@@ -60710,23 +60848,23 @@ function set(data, k, v) {
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/publish-util/1.3.3/publish-util/lib/index.js":
+/***/ "./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/index.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 const {
   prePackObj,
   prePack
-} = __webpack_require__("./node_modules/.f/_/publish-util/1.3.3/publish-util/lib/prepack.js");
+} = __webpack_require__("./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/prepack.js");
 
 const {
   postPack
-} = __webpack_require__("./node_modules/.f/_/publish-util/1.3.3/publish-util/lib/postpack.js");
+} = __webpack_require__("./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/postpack.js");
 
 const {
   npmPublish
-} = __webpack_require__("./node_modules/.f/_/publish-util/1.3.3/publish-util/lib/npm-publish.js");
+} = __webpack_require__("./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/npm-publish.js");
 
-const utils = __webpack_require__("./node_modules/.f/_/publish-util/1.3.3/publish-util/lib/utils.js");
+const utils = __webpack_require__("./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/utils.js");
 
 exports.npmPublish = npmPublish;
 exports.prePackObj = prePackObj;
@@ -60736,7 +60874,7 @@ exports.utils = utils;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/publish-util/1.3.3/publish-util/lib/npm-publish.js":
+/***/ "./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/npm-publish.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -60746,7 +60884,7 @@ const execa = __webpack_require__("./node_modules/.f/_/execa/5.1.1/execa/index.j
 
 const {
   getInfo
-} = __webpack_require__("./node_modules/.f/_/publish-util/1.3.3/publish-util/lib/utils.js");
+} = __webpack_require__("./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/utils.js");
 
 const assert = __webpack_require__("assert");
 
@@ -60754,19 +60892,32 @@ const Fs = __webpack_require__("fs").promises;
 
 const Path = __webpack_require__("path");
 
-function getArg(opt, msg, valids = []) {
-  const tagIx = process.argv.indexOf(opt);
+function getArg({
+  opt,
+  msg,
+  argv,
+  value = true,
+  valids = []
+}) {
+  const tagIx = argv.indexOf(opt);
 
-  if (tagIx > 0) {
-    const val = process.argv[tagIx + 1];
+  if (tagIx >= 0) {
+    if (value) {
+      const val = argv[tagIx + 1];
 
-    if (valids.length > 0) {
-      assert(valids.includes(val), `${opt} must specify a valid ${msg}: ${valids.join(",")}`);
+      if (valids.length > 0) {
+        assert(valids.includes(val), `${opt} has a value ${val} but it must be one of: ${valids.join(", ")}`);
+      } else {
+        assert(val, `${opt} must specify a ${msg}`);
+      }
+
+      argv.splice(tagIx, 2);
+      return [opt, val];
     } else {
-      assert(val, `${opt} must specify a ${msg}`);
+      argv.splice(tagIx, 1);
     }
 
-    return [opt, val];
+    return [opt];
   }
 
   return [];
@@ -60780,17 +60931,36 @@ async function removeFile(name) {
   } catch (_unused) {}
 }
 
-exports.npmPublish = async function npmPublish() {
-  process.on("SIGINT", () => {});
+exports.npmPublish = async function npmPublish({
+  exit = true,
+  silent = false
+} = {}) {
+  const noop = () => {};
+
+  process.on("SIGINT", noop);
+  const argv = [].concat(process.argv.slice(2));
   const {
     pkgDir,
     pkgFile,
     pkg,
     pkgData
   } = await getInfo();
-  const dryRun = process.argv.indexOf("--dry-run") > 0;
-  const tag = getArg("--tag", "tag");
-  const access = getArg("--access", "access", ["public", "restricted"]);
+  const dryRun = getArg({
+    opt: "--dry-run",
+    value: false,
+    argv
+  }).length > 0;
+  const tag = getArg({
+    opt: "--tag",
+    msg: "tag",
+    argv
+  });
+  const access = getArg({
+    opt: "--access",
+    msg: "access",
+    argv,
+    valids: ["public", "restricted"]
+  });
   let changedPkg = false;
   let exitCode = 0;
   const tgzName = pkg.name.replace(/@/g, "").replace(/\//g, "-");
@@ -60801,7 +60971,10 @@ exports.npmPublish = async function npmPublish() {
   const restore = async () => {
     try {
       if (changedPkg) {
-        console.log("Restoring", pkgFile);
+        if (!silent) {
+          console.log("Restoring", pkgFile);
+        }
+
         await Fs.writeFile(pkgFile, pkgData);
       }
     } catch (_unused2) {}
@@ -60809,6 +60982,8 @@ exports.npmPublish = async function npmPublish() {
     try {
       process.chdir(saveDir);
     } catch (_unused3) {}
+
+    process.removeListener("SIGINT", noop);
   };
 
   try {
@@ -60848,11 +61023,15 @@ exports.npmPublish = async function npmPublish() {
     }
 
     if (!dryRun) {
-      const publishArgs = [`publish`].concat(tag, access, fullTgzFile);
-      console.log("publishing args:", publishArgs.join(" "));
+      const publishArgs = [`publish`].concat(tag, access, fullTgzFile, argv);
+
+      if (!silent) {
+        console.log("publishing args:", publishArgs.join(" "));
+      }
+
       await execa(`npm`, publishArgs, execaOpts);
     } else {
-      console.log(tgzFile);
+      console.log("dry-run", tgzFile, "args:", [].concat(tag, access, argv));
     }
   } catch (err) {
     if (err.message.includes("SIGINT")) {
@@ -60865,13 +61044,18 @@ exports.npmPublish = async function npmPublish() {
   } finally {
     await restore();
     await removeFile(fullTgzFile);
-    process.exit(exitCode);
+
+    if (exit) {
+      process.exit(exitCode);
+    }
   }
+
+  return exitCode;
 };
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/publish-util/1.3.3/publish-util/lib/postpack.js":
+/***/ "./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/postpack.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -60883,7 +61067,7 @@ const Fs = __webpack_require__("fs").promises;
 
 const {
   getInfo
-} = __webpack_require__("./node_modules/.f/_/publish-util/1.3.3/publish-util/lib/utils.js");
+} = __webpack_require__("./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/utils.js");
 
 exports.postPack = async function postPack() {
   const {
@@ -60905,7 +61089,7 @@ exports.postPack = async function postPack() {
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/publish-util/1.3.3/publish-util/lib/prepack.js":
+/***/ "./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/prepack.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -60921,7 +61105,7 @@ const {
   removeFromObj,
   keepStandardFields,
   renameFromObj
-} = __webpack_require__("./node_modules/.f/_/publish-util/1.3.3/publish-util/lib/utils.js");
+} = __webpack_require__("./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/utils.js");
 
 const _ = __webpack_require__("./node_modules/.f/_/lodash/4.17.21/lodash/lodash.min.js");
 
@@ -60955,8 +61139,8 @@ function prePackObj(pkg, config = {}) {
     _.set(pkg, "scripts.postpack", "publish-util-postpack");
   }
 
-  if (pkg.scripts.prepublishOnly === "publish-util-prepublishonly" || pkg.scripts.prepublishOnly === "publish-util-prepack") {
-    delete pkg.scripts.prepublishOnly;
+  if (pkg.scripts.prepack === "publish-util-prepack") {
+    delete pkg.scripts.prepack;
   }
 
   if (keepObj) {
@@ -60993,7 +61177,7 @@ exports.prePack = async function prePack() {
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/publish-util/1.3.3/publish-util/lib/utils.js":
+/***/ "./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/utils.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -90789,7 +90973,7 @@ var done = function (warnings, errors) {
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/visual-exec/0.1.13/visual-exec/lib/get-default-logger.js":
+/***/ "./node_modules/.f/_/visual-exec/0.1.14/visual-exec/lib/get-default-logger.js":
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 "use strict";
@@ -90820,7 +91004,7 @@ module.exports = getLogger;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/visual-exec/0.1.13/visual-exec/lib/visual-exec.js":
+/***/ "./node_modules/.f/_/visual-exec/0.1.14/visual-exec/lib/visual-exec.js":
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 "use strict";
@@ -90831,7 +91015,7 @@ const xsh = __webpack_require__("./node_modules/.f/_/xsh/0.4.5/xsh/lib/index.js"
 
 const chalk = __webpack_require__("./node_modules/.f/_/chalk/4.1.2/chalk/source/index.js");
 
-const getDefaultLogger = __webpack_require__("./node_modules/.f/_/visual-exec/0.1.13/visual-exec/lib/get-default-logger.js");
+const getDefaultLogger = __webpack_require__("./node_modules/.f/_/visual-exec/0.1.14/visual-exec/lib/get-default-logger.js");
 
 const VisualLogger = __webpack_require__("./node_modules/.f/_/visual-logger/1.1.3/visual-logger/lib/visual-logger.js");
 
@@ -90868,6 +91052,7 @@ class VisualExec {
     this._maxBuffer = maxBuffer;
     this._forceStderr = forceStderr;
     this._checkStdoutError = checkStdoutError === true ? /error|warn|fatal|unhandled|reject|exception|failure|fail|failed/i : checkStdoutError;
+    this._startTime = Date.now();
   }
 
   _makeTitle(command) {
@@ -90985,7 +91170,10 @@ class VisualExec {
 
       output = err.output;
     } else {
-      this._logger.info(`Done ${this._logLabel} ${chalk.green("exit code 0")}`);
+      const time = ((Date.now() - this._startTime) / 1000).toFixed(2);
+      const dispTime = `${chalk.magenta(time)}secs`;
+
+      this._logger.info(`Done ${this._logLabel} ${dispTime} ${chalk.green("exit code 0")}`);
     }
 
     this.logFinalOutput(err, output);
@@ -91022,6 +91210,7 @@ class VisualExec {
   }
 
   execute(command) {
+    this._startTime = Date.now();
     const child = xsh.exec({
       silent: true,
       cwd: this._cwd,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fyn",
-  "version": "1.1.15",
+  "version": "1.1.19",
   "description": "A node package manager, fast, workspace, and better productivity and efficiency",
   "main": "./bin/fyn.js",
   "homepage": "https://www.electrode.io/fynpo/",
@@ -13,7 +13,7 @@
     "coverage": "xrun xarc/check",
     "ci:check": "xrun xarc/check",
     "coveralls": "cat coverage/lcov.info | coveralls",
-    "prepublishOnly": "xrun xarc/check compile-yarn bundle && publish-util-prepublishonly",
+    "prepublishOnly": "xrun build",
     "postpack": "publish-util-postpack"
   },
   "bin": {