@yarnpkg/plugin-pnp 3.1.2-rc.6 → 3.2.0-rc.1

package/lib/PnpLinker.d.ts

@@ -1,4 +1,4 @@
-import { Descriptor, LocatorHash } from '@yarnpkg/core';
+import { Descriptor, LocatorHash, InstallPackageExtraApi } from '@yarnpkg/core';
 import { FetchResult, Locator, Package } from '@yarnpkg/core';
 import { Linker, LinkOptions, MinimalLinkOptions, Installer } from '@yarnpkg/core';
 import { PortablePath } from '@yarnpkg/fslib';
@@ -10,10 +10,12 @@ export declare class PnpLinker implements Linker {
     findPackageLocation(locator: Locator, opts: LinkOptions): Promise<PortablePath>;
     findPackageLocator(location: PortablePath, opts: LinkOptions): Promise<Locator | null>;
     makeInstaller(opts: LinkOptions): PnpInstaller;
+    private isEnabled;
 }
 export declare class PnpInstaller implements Installer {
     protected opts: LinkOptions;
     protected mode: string;
+    private readonly asyncActions;
     private readonly packageRegistry;
     private readonly virtualTemplates;
     private isESMLoaderRequired;
@@ -21,7 +23,7 @@ export declare class PnpInstaller implements Installer {
     getCustomDataKey(): string;
     private customData;
     attachCustomData(customData: any): void;
-    installPackage(pkg: Package, fetchResult: FetchResult): Promise<{
+    installPackage(pkg: Package, fetchResult: FetchResult, api: InstallPackageExtraApi): Promise<{
         packageLocation: PortablePath;
         buildDirective: import("@yarnpkg/core").BuildDirective[] | null;
     }>;

package/lib/PnpLinker.js

@@ -25,13 +25,11 @@ class PnpLinker {
         this.pnpCache = new Map();
     }
     supportsPackage(pkg, opts) {
-        if (opts.project.configuration.get(`nodeLinker`) !== `pnp`)
-            return false;
-        if (opts.project.configuration.get(`pnpMode`) !== this.mode)
-            return false;
-        return true;
+        return this.isEnabled(opts);
     }
     async findPackageLocation(locator, opts) {
+        if (!this.isEnabled(opts))
+            throw new Error(`Assertion failed: Expected the PnP linker to be enabled`);
         const pnpPath = (0, index_1.getPnpPath)(opts.project).cjs;
         if (!fslib_1.xfs.existsSync(pnpPath))
             throw new clipanion_1.UsageError(`The project in ${core_1.formatUtils.pretty(opts.project.configuration, `${opts.project.cwd}/package.json`, core_1.formatUtils.Type.PATH)} doesn't seem to have been installed - running an install there might help`);
@@ -45,6 +43,8 @@ class PnpLinker {
         return fslib_1.npath.toPortablePath(packageInformation.packageLocation);
     }
     async findPackageLocator(location, opts) {
+        if (!this.isEnabled(opts))
+            return null;
         const pnpPath = (0, index_1.getPnpPath)(opts.project).cjs;
         if (!fslib_1.xfs.existsSync(pnpPath))
             return null;
@@ -59,12 +59,20 @@ class PnpLinker {
     makeInstaller(opts) {
         return new PnpInstaller(opts);
     }
+    isEnabled(opts) {
+        if (opts.project.configuration.get(`nodeLinker`) !== `pnp`)
+            return false;
+        if (opts.project.configuration.get(`pnpMode`) !== this.mode)
+            return false;
+        return true;
+    }
 }
 exports.PnpLinker = PnpLinker;
 class PnpInstaller {
     constructor(opts) {
         this.opts = opts;
         this.mode = `strict`;
+        this.asyncActions = new core_1.miscUtils.AsyncActions(10);
         this.packageRegistry = new Map();
         this.virtualTemplates = new Map();
         this.isESMLoaderRequired = false;
@@ -83,7 +91,7 @@ class PnpInstaller {
     attachCustomData(customData) {
         this.customData = customData;
     }
-    async installPackage(pkg, fetchResult) {
+    async installPackage(pkg, fetchResult, api) {
         const key1 = core_1.structUtils.stringifyIdent(pkg);
         const key2 = pkg.reference;
         const isWorkspace = !!this.opts.project.tryWorkspaceByLocator(pkg);
@@ -122,7 +130,7 @@ class PnpInstaller {
             ? jsInstallUtils.extractBuildScripts(pkg, customPackageData, dependencyMeta, { configuration: this.opts.project.configuration, report: this.opts.report })
             : [];
         const packageFs = mayNeedToBeUnplugged
-            ? await this.unplugPackageIfNeeded(pkg, customPackageData, fetchResult, dependencyMeta)
+            ? await this.unplugPackageIfNeeded(pkg, customPackageData, fetchResult, dependencyMeta, api)
             : fetchResult.packageFs;
         if (fslib_1.ppath.isAbsolute(fetchResult.prefixPath))
             throw new Error(`Assertion failed: Expected the prefix path (${fetchResult.prefixPath}) to be relative to the parent`);
@@ -223,6 +231,7 @@ class PnpInstaller {
             packageRegistry,
             shebang,
         });
+        await this.asyncActions.wait();
         return {
             customData: this.customData,
         };
@@ -317,9 +326,9 @@ class PnpInstaller {
         }
         return nodeModules;
     }
-    async unplugPackageIfNeeded(pkg, customPackageData, fetchResult, dependencyMeta) {
+    async unplugPackageIfNeeded(pkg, customPackageData, fetchResult, dependencyMeta, api) {
         if (this.shouldBeUnplugged(pkg, customPackageData, dependencyMeta)) {
-            return this.unplugPackage(pkg, fetchResult);
+            return this.unplugPackage(pkg, fetchResult, api);
         }
         else {
             return fetchResult.packageFs;
@@ -338,20 +347,22 @@ class PnpInstaller {
             return true;
         return false;
     }
-    async unplugPackage(locator, fetchResult) {
+    async unplugPackage(locator, fetchResult, api) {
         const unplugPath = pnpUtils.getUnpluggedPath(locator, { configuration: this.opts.project.configuration });
         if (this.opts.project.disabledLocators.has(locator.locatorHash))
             return new fslib_1.AliasFS(unplugPath, { baseFs: fetchResult.packageFs, pathUtils: fslib_1.ppath });
         this.unpluggedPaths.add(unplugPath);
-        const readyFile = fslib_1.ppath.join(unplugPath, fetchResult.prefixPath, `.ready`);
-        if (await fslib_1.xfs.existsPromise(readyFile))
-            return new fslib_1.CwdFS(unplugPath);
-        // Delete any build state for the locator so it can run anew, this allows users
-        // to remove `.yarn/unplugged` and have the builds run again
-        this.opts.project.storedBuildState.delete(locator.locatorHash);
-        await fslib_1.xfs.mkdirPromise(unplugPath, { recursive: true });
-        await fslib_1.xfs.copyPromise(unplugPath, fslib_1.PortablePath.dot, { baseFs: fetchResult.packageFs, overwrite: false });
-        await fslib_1.xfs.writeFilePromise(readyFile, ``);
+        api.holdFetchResult(this.asyncActions.set(locator.locatorHash, async () => {
+            const readyFile = fslib_1.ppath.join(unplugPath, fetchResult.prefixPath, `.ready`);
+            if (await fslib_1.xfs.existsPromise(readyFile))
+                return;
+            // Delete any build state for the locator so it can run anew, this allows users
+            // to remove `.yarn/unplugged` and have the builds run again
+            this.opts.project.storedBuildState.delete(locator.locatorHash);
+            await fslib_1.xfs.mkdirPromise(unplugPath, { recursive: true });
+            await fslib_1.xfs.copyPromise(unplugPath, fslib_1.PortablePath.dot, { baseFs: fetchResult.packageFs, overwrite: false });
+            await fslib_1.xfs.writeFilePromise(readyFile, ``);
+        }));
         return new fslib_1.CwdFS(unplugPath);
     }
     getPackageInformation(locator) {

package/package.json

@@ -1,26 +1,26 @@
 {
   "name": "@yarnpkg/plugin-pnp",
-  "version": "3.1.2-rc.6",
+  "version": "3.2.0-rc.1",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "dependencies": {
     "@types/semver": "^7.1.0",
-    "@yarnpkg/fslib": "^2.6.1-rc.1",
+    "@yarnpkg/fslib": "^2.6.1-rc.6",
     "@yarnpkg/plugin-stage": "^3.1.1",
-    "@yarnpkg/pnp": "^3.1.1-rc.6",
-    "clipanion": "^3.0.1",
+    "@yarnpkg/pnp": "^3.1.1-rc.11",
+    "clipanion": "^3.2.0-rc.4",
     "micromatch": "^4.0.2",
     "semver": "^7.1.2",
     "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.11",
+    "@yarnpkg/core": "^3.2.0-rc.11"
   },
   "devDependencies": {
     "@types/micromatch": "^4.0.1",
-    "@yarnpkg/cli": "^3.2.0-rc.6",
-    "@yarnpkg/core": "^3.2.0-rc.6"
+    "@yarnpkg/cli": "^3.2.0-rc.11",
+    "@yarnpkg/core": "^3.2.0-rc.11"
   },
   "repository": {
     "type": "git",