@yarnpkg/plugin-pnpm 1.1.0-rc.4 → 1.1.0-rc.8

package/lib/PnpmLinker.d.ts

@@ -9,6 +9,7 @@ export declare class PnpmLinker implements Linker {
     findPackageLocation(locator: Locator, opts: LinkOptions): Promise<PortablePath>;
     findPackageLocator(location: PortablePath, opts: LinkOptions): Promise<Locator | null>;
     makeInstaller(opts: LinkOptions): PnpmInstaller;
+    private isEnabled;
 }
 declare class PnpmInstaller implements Installer {
     private opts;

package/lib/PnpmLinker.js

@@ -9,9 +9,11 @@ const clipanion_1 = require("clipanion");
 const p_limit_1 = (0, tslib_1.__importDefault)(require("p-limit"));
 class PnpmLinker {
     supportsPackage(pkg, opts) {
-        return opts.project.configuration.get(`nodeLinker`) === `pnpm`;
+        return this.isEnabled(opts);
     }
     async findPackageLocation(locator, opts) {
+        if (!this.isEnabled(opts))
+            throw new Error(`Assertion failed: Expected the pnpm linker to be enabled`);
         const customDataKey = getCustomDataKey();
         const customData = opts.project.installersCustomData.get(customDataKey);
         if (!customData)
@@ -22,6 +24,8 @@ class PnpmLinker {
         return packageLocation;
     }
     async findPackageLocator(location, opts) {
+        if (!this.isEnabled(opts))
+            return null;
         const customDataKey = getCustomDataKey();
         const customData = opts.project.installersCustomData.get(customDataKey);
         if (!customData)
@@ -48,6 +52,9 @@ class PnpmLinker {
     makeInstaller(opts) {
         return new PnpmInstaller(opts);
     }
+    isEnabled(opts) {
+        return opts.project.configuration.get(`nodeLinker`) === `pnpm`;
+    }
 }
 exports.PnpmLinker = PnpmLinker;
 class PnpmInstaller {
@@ -216,11 +223,11 @@ class PnpmInstaller {
                 if (!expectedEntries.has(record))
                     removals.push(fslib_1.xfs.removePromise(fslib_1.ppath.join(storeLocation, record)));
             await Promise.all(removals);
-            await removeIfEmpty(storeLocation);
         }
         // Wait for the package installs to catch up
         await this.asyncActions.wait(),
-            await removeIfEmpty(getNodeModulesLocation(this.opts.project));
+            await removeIfEmpty(storeLocation);
+        await removeIfEmpty(getNodeModulesLocation(this.opts.project));
         return {
             customData: this.customData,
         };

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "@yarnpkg/plugin-pnpm",
-  "version": "1.1.0-rc.4",
+  "version": "1.1.0-rc.8",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "dependencies": {
-    "@yarnpkg/fslib": "^2.6.1-rc.1",
-    "@yarnpkg/plugin-pnp": "^3.1.2-rc.6",
+    "@yarnpkg/fslib": "^2.6.1-rc.5",
+    "@yarnpkg/plugin-pnp": "^3.1.2-rc.10",
     "@yarnpkg/plugin-stage": "^3.1.1",
-    "clipanion": "^3.0.1",
+    "clipanion": "^3.2.0-rc.4",
     "p-limit": "^2.2.0",
     "tslib": "^1.13.0"
   },
   "peerDependencies": {
-    "@yarnpkg/cli": "^3.2.0-rc.6",
-    "@yarnpkg/core": "^3.2.0-rc.6"
+    "@yarnpkg/cli": "^3.2.0-rc.10",
+    "@yarnpkg/core": "^3.2.0-rc.10"
   },
   "devDependencies": {
-    "@yarnpkg/cli": "^3.2.0-rc.6",
-    "@yarnpkg/core": "^3.2.0-rc.6"
+    "@yarnpkg/cli": "^3.2.0-rc.10",
+    "@yarnpkg/core": "^3.2.0-rc.10"
   },
   "repository": {
     "type": "git",