fyn 1.1.37 → 1.1.38

package/dist/fyn.js

@@ -3366,12 +3366,15 @@ class Fyn {
 
       if (!_.isEmpty(resData)) {
         this._resolutions = resData;
-        this._resolutionsMatchers = Object.keys(resData).map(x => {
-          const pts = x.split("/");
-          const x2 = pts.length === 1 || pts[0][0] === "@" && pts.length === 2 ? `**/${x}` : x;
+        this._resolutionsMatchers = Object.keys(resData).map(depPath => {
+          const unslashedPath = fynTil.unSlashNpmScope(depPath);
+          const pts = unslashedPath.split("/"); // spec can only contain ** between slashes
+
+          assert(!pts.find(x => !(!x.includes("*") || x === "**")), `resolution path '${depPath}' can only contain '**' for wildcard matching`);
+          const finalPath = pts.length === 1 ? `**/${unslashedPath}` : unslashedPath;
           return {
-            mm: new mm.Minimatch(x2),
-            res: resData[x]
+            mm: new mm.Minimatch(finalPath),
+            res: resData[depPath]
           };
         });
       }
@@ -5885,7 +5888,8 @@ const {
 
 const {
   checkPkgOsCpu,
-  relativePath
+  relativePath,
+  unSlashNpmScope
 } = __webpack_require__("./lib/util/fyntil.js");
 
 const {
@@ -6968,7 +6972,8 @@ ${item.depPath.join(" > ")}`);
     };
   }
   /**
-   * Match a nested dep to user's resolutions data
+   * Match a nested dep to user's resolutions data, or nested and direct dep for packages
+   * inside a fynpo monorepo.
    *
    * spec: https://github.com/yarnpkg/rfcs/blob/master/implemented/0000-selective-versions-resolutions.md
    *
@@ -6978,19 +6983,52 @@ ${item.depPath.join(" > ")}`);
 
 
   _replaceWithResolutionsData(item) {
-    if (item.depth < 2 || !this._fyn._resolutions || item._semver.$$) {
+    if (!this._fyn._resolutions || item._semver.$$) {
       return undefined;
+    } //
+    // this item represent a direct dependency
+    //
+
+
+    if (item.depth < 2) {
+      //
+      // if we have a package within a fynpo monorepo, then we replace its direct
+      // dependencies with resolutions data, vs only its nested dependencies
+      // according to yarn's resolutions spec, because if local package A pull in
+      // another local package B, then B's dependencies would end up being
+      // subjected to resolutions data, so for consistency, we check resolutions
+      // for all fynpo's local packages' direct dependencies.
+      //
+      if (!this._fyn.isFynpo) {
+        // not a fynpo, avoid checking resolutions for direct dependencies
+        return undefined;
+      }
     }
 
-    const depPath = item.nameDepPath;
+    let nameDepPath;
 
-    const found = this._fyn._resolutionsMatchers.find(r => r.mm.match(depPath));
+    if (this._fyn.isFynpo) {
+      nameDepPath = `${this._fyn._pkg.name}/${item.nameDepPath}`;
+    } else {
+      nameDepPath = item.nameDepPath;
+    }
 
-    if (found) {
+    const unslashed = unSlashNpmScope(nameDepPath);
+
+    const found = this._fyn._resolutionsMatchers.find(r => r.mm.match(unslashed));
+
+    if (found && found.res && found.res !== "--no-change" && found.res !== item.semver) {
       const {
         res
       } = found;
-      logger.debug(`${depPath} changed to ${res} from ${item.semver} by resolutions data`);
+      const msg = `${nameDepPath} changed to ${res} from ${item.semver} by resolutions data`;
+
+      if (item.depth < 2) {
+        logger.info(`fynpo: ${msg}`);
+      } else {
+        logger.debug(msg);
+      }
+
       semverUtil.replace(item._semver, res);
     }
 
@@ -10238,6 +10276,17 @@ const fyntil = {
   },
   posixify,
 
+  /**
+   * Take a npm dependency path separated by / and replace the / that's meant for a npm scope with '+'
+   *
+   * @param {*} npmDepPath
+   * @param {string} replacer string to replace the slash with
+   * @returns dep path where npm scope's / replaced with '+'
+   */
+  unSlashNpmScope(npmDepPath, replacer = "+") {
+    return npmDepPath.replace(/(\@[^\/]+)\//g, (_a, b) => `${b}${replacer}`);
+  },
+
   getGlobalNodeModules() {
     const nodeDir = Path.dirname(process.execPath);
 

package/package.json

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