@yarnpkg/nm 3.1.0 → 3.1.1

package/lib/buildNodeModulesTree.js

@@ -12,13 +12,13 @@ var LinkType;
 (function (LinkType) {
     LinkType["HARD"] = "HARD";
     LinkType["SOFT"] = "SOFT";
-})(LinkType = exports.LinkType || (exports.LinkType = {}));
+})(LinkType || (exports.LinkType = LinkType = {}));
 var NodeModulesHoistingLimits;
 (function (NodeModulesHoistingLimits) {
     NodeModulesHoistingLimits["WORKSPACES"] = "workspaces";
     NodeModulesHoistingLimits["DEPENDENCIES"] = "dependencies";
     NodeModulesHoistingLimits["NONE"] = "none";
-})(NodeModulesHoistingLimits = exports.NodeModulesHoistingLimits || (exports.NodeModulesHoistingLimits = {}));
+})(NodeModulesHoistingLimits || (exports.NodeModulesHoistingLimits = NodeModulesHoistingLimits = {}));
 /** node_modules path segment */
 const NODE_MODULES = `node_modules`;
 /**
@@ -356,22 +356,14 @@ function getTargetLocatorPath(locator, pnp, options) {
     const info = pnp.getPackageInformation(pkgLocator);
     if (info === null)
         throw new Error(`Assertion failed: Expected the package to be registered`);
-    let linkType;
-    let target;
-    if (options.pnpifyFs) {
+    return options.pnpifyFs
         // In case of pnpifyFs we represent modules as symlinks to archives in NodeModulesFS
         // `/home/user/project/foo` is a symlink to `/home/user/project/.yarn/.cache/foo.zip/node_modules/foo`
         // To make this fs layout work with legacy tools we make
         // `/home/user/project/.yarn/.cache/foo.zip/node_modules/foo/node_modules` (which normally does not exist inside archive) a symlink to:
         // `/home/user/project/node_modules/foo/node_modules`, so that the tools were able to access it
-        target = fslib_1.npath.toPortablePath(info.packageLocation);
-        linkType = LinkType.SOFT;
-    }
-    else {
-        target = getRealPackageLocation(info, locator, pnp);
-        linkType = info.linkType;
-    }
-    return { linkType, target };
+        ? { linkType: LinkType.SOFT, target: fslib_1.npath.toPortablePath(info.packageLocation) }
+        : { linkType: info.linkType, target: getRealPackageLocation(info, locator, pnp) };
 }
 /**
  * Converts hoisted tree to node modules map
@@ -452,8 +444,7 @@ const populateNodeModulesTree = (pnp, hoistedTree, options) => {
                 tree.set(nodeModulesLocation, leafNode);
                 const segments = nodeModulesLocation.split(`/`);
                 const nodeModulesIdx = segments.indexOf(NODE_MODULES);
-                let segCount = segments.length - 1;
-                while (nodeModulesIdx >= 0 && segCount > nodeModulesIdx) {
+                for (let segCount = segments.length - 1; nodeModulesIdx >= 0 && segCount > nodeModulesIdx; segCount--) {
                     const dirPath = fslib_1.npath.toPortablePath(segments.slice(0, segCount).join(fslib_1.ppath.sep));
                     const targetDir = (0, fslib_1.toFilename)(segments[segCount]);
                     const subdirs = tree.get(dirPath);
@@ -468,7 +459,6 @@ const populateNodeModulesTree = (pnp, hoistedTree, options) => {
                             subdirs.dirList.add(targetDir);
                         }
                     }
-                    segCount--;
                 }
             }
             buildTree(dep, leafNode.linkType === LinkType.SOFT ? leafNode.target : nodeModulesLocation, nodePath);

package/lib/hoist.js

@@ -6,7 +6,7 @@ var HoisterDependencyKind;
     HoisterDependencyKind[HoisterDependencyKind["REGULAR"] = 0] = "REGULAR";
     HoisterDependencyKind[HoisterDependencyKind["WORKSPACE"] = 1] = "WORKSPACE";
     HoisterDependencyKind[HoisterDependencyKind["EXTERNAL_SOFT_LINK"] = 2] = "EXTERNAL_SOFT_LINK";
-})(HoisterDependencyKind = exports.HoisterDependencyKind || (exports.HoisterDependencyKind = {}));
+})(HoisterDependencyKind || (exports.HoisterDependencyKind = HoisterDependencyKind = {}));
 var Hoistable;
 (function (Hoistable) {
     Hoistable[Hoistable["YES"] = 0] = "YES";

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@yarnpkg/nm",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "sideEffects": false,
   "dependencies": {
-    "@yarnpkg/core": "^3.3.0",
-    "@yarnpkg/fslib": "^2.9.0",
-    "@yarnpkg/pnp": "^3.2.5"
+    "@yarnpkg/core": "^3.6.0",
+    "@yarnpkg/fslib": "^2.10.3",
+    "@yarnpkg/pnp": "^3.3.6"
   },
   "scripts": {
     "postpack": "rm -rf lib",