@yarnpkg/plugin-pnpm 1.1.0-rc.1 → 1.1.0-rc.13

package/lib/PnpmLinker.d.ts

@@ -9,10 +9,11 @@ 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;
-    private asyncActions;
+    private readonly asyncActions;
     constructor(opts: LinkOptions);
     getCustomDataKey(): string;
     private customData;

package/lib/PnpmLinker.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PnpmLinker = void 0;
-const tslib_1 = require("tslib");
 const core_1 = require("@yarnpkg/core");
 const fslib_1 = require("@yarnpkg/fslib");
 const plugin_pnp_1 = require("@yarnpkg/plugin-pnp");
 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 +22,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,12 +50,15 @@ class PnpmLinker {
     makeInstaller(opts) {
         return new PnpmInstaller(opts);
     }
+    isEnabled(opts) {
+        return opts.project.configuration.get(`nodeLinker`) === `pnpm`;
+    }
 }
 exports.PnpmLinker = PnpmLinker;
 class PnpmInstaller {
     constructor(opts) {
         this.opts = opts;
-        this.asyncActions = new AsyncActions();
+        this.asyncActions = new core_1.miscUtils.AsyncActions(10);
         this.customData = {
             pathByLocator: new Map(),
             locatorByPath: new Map(),
@@ -216,11 +221,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,
         };
@@ -319,44 +324,3 @@ async function removeIfEmpty(dir) {
         }
     }
 }
-function makeDeferred() {
-    let resolve;
-    let reject;
-    const promise = new Promise((resolveFn, rejectFn) => {
-        resolve = resolveFn;
-        reject = rejectFn;
-    });
-    return { promise, resolve: resolve, reject: reject };
-}
-class AsyncActions {
-    constructor() {
-        this.deferred = new Map();
-        this.promises = new Map();
-        this.limit = (0, p_limit_1.default)(10);
-    }
-    set(key, factory) {
-        let deferred = this.deferred.get(key);
-        if (typeof deferred === `undefined`)
-            this.deferred.set(key, deferred = makeDeferred());
-        const promise = this.limit(() => factory());
-        this.promises.set(key, promise);
-        promise.then(() => {
-            if (this.promises.get(key) === promise) {
-                deferred.resolve();
-            }
-        }, err => {
-            if (this.promises.get(key) === promise) {
-                deferred.reject(err);
-            }
-        });
-        return deferred.promise;
-    }
-    reduce(key, factory) {
-        var _a;
-        const promise = (_a = this.promises.get(key)) !== null && _a !== void 0 ? _a : Promise.resolve();
-        this.set(key, () => factory(promise));
-    }
-    async wait() {
-        await Promise.all(this.promises.values());
-    }
-}

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "@yarnpkg/plugin-pnpm",
-  "version": "1.1.0-rc.1",
+  "version": "1.1.0-rc.13",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "dependencies": {
-    "@yarnpkg/fslib": "^2.6.0",
-    "@yarnpkg/plugin-pnp": "^3.1.2-rc.3",
+    "@yarnpkg/fslib": "^2.6.1-rc.10",
+    "@yarnpkg/plugin-pnp": "^3.2.0-rc.5",
     "@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.3",
-    "@yarnpkg/core": "^3.2.0-rc.3"
+    "@yarnpkg/cli": "^3.2.0-rc.15",
+    "@yarnpkg/core": "^3.2.0-rc.15"
   },
   "devDependencies": {
-    "@yarnpkg/cli": "^3.2.0-rc.3",
-    "@yarnpkg/core": "^3.2.0-rc.3"
+    "@yarnpkg/cli": "^3.2.0-rc.15",
+    "@yarnpkg/core": "^3.2.0-rc.15"
   },
   "repository": {
     "type": "git",