@yarnpkg/plugin-pnp 3.1.2-rc.8 → 3.2.0-rc.3

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';
@@ -15,6 +15,7 @@ export declare class PnpLinker implements Linker {
 export declare class PnpInstaller implements Installer {
     protected opts: LinkOptions;
     protected mode: string;
+    private readonly asyncActions;
     private readonly packageRegistry;
     private readonly virtualTemplates;
     private isESMLoaderRequired;
@@ -22,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

@@ -8,8 +8,8 @@ const fslib_1 = require("@yarnpkg/fslib");
 const pnp_1 = require("@yarnpkg/pnp");
 const clipanion_1 = require("clipanion");
 const index_1 = require("./index");
-const jsInstallUtils = (0, tslib_1.__importStar)(require("./jsInstallUtils"));
-const pnpUtils = (0, tslib_1.__importStar)(require("./pnpUtils"));
+const jsInstallUtils = tslib_1.__importStar(require("./jsInstallUtils"));
+const pnpUtils = tslib_1.__importStar(require("./pnpUtils"));
 const FORCED_UNPLUG_PACKAGES = new Set([
     // Some packages do weird stuff and MUST be unplugged. I don't like them.
     core_1.structUtils.makeIdent(null, `nan`).identHash,
@@ -72,6 +72,7 @@ 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;
@@ -90,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);
@@ -129,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`);
@@ -230,6 +231,7 @@ class PnpInstaller {
             packageRegistry,
             shebang,
         });
+        await this.asyncActions.wait();
         return {
             customData: this.customData,
         };
@@ -324,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;
@@ -345,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/lib/commands/unplug.js

@@ -5,8 +5,8 @@ const cli_1 = require("@yarnpkg/cli");
 const core_1 = require("@yarnpkg/core");
 const core_2 = require("@yarnpkg/core");
 const clipanion_1 = require("clipanion");
-const micromatch_1 = (0, tslib_1.__importDefault)(require("micromatch"));
-const pnpUtils = (0, tslib_1.__importStar)(require("../pnpUtils"));
+const micromatch_1 = tslib_1.__importDefault(require("micromatch"));
+const pnpUtils = tslib_1.__importStar(require("../pnpUtils"));
 // eslint-disable-next-line arca/no-default-export
 class UnplugCommand extends cli_1.BaseCommand {
     constructor() {

package/lib/index.js

@@ -4,13 +4,13 @@ exports.PnpLinker = exports.PnpInstaller = exports.quotePathIfNeeded = exports.g
 const tslib_1 = require("tslib");
 const core_1 = require("@yarnpkg/core");
 const fslib_1 = require("@yarnpkg/fslib");
-const semver_1 = (0, tslib_1.__importDefault)(require("semver"));
+const semver_1 = tslib_1.__importDefault(require("semver"));
 const url_1 = require("url");
 const PnpLinker_1 = require("./PnpLinker");
-const unplug_1 = (0, tslib_1.__importDefault)(require("./commands/unplug"));
-const jsInstallUtils = (0, tslib_1.__importStar)(require("./jsInstallUtils"));
+const unplug_1 = tslib_1.__importDefault(require("./commands/unplug"));
+const jsInstallUtils = tslib_1.__importStar(require("./jsInstallUtils"));
 exports.jsInstallUtils = jsInstallUtils;
-const pnpUtils = (0, tslib_1.__importStar)(require("./pnpUtils"));
+const pnpUtils = tslib_1.__importStar(require("./pnpUtils"));
 exports.pnpUtils = pnpUtils;
 const getPnpPath = (project) => {
     return {

package/lib/jsInstallUtils.js

@@ -4,12 +4,12 @@ exports.hasBindingGyp = exports.getExtractHint = exports.extractBuildScripts = e
 const core_1 = require("@yarnpkg/core");
 const fslib_1 = require("@yarnpkg/fslib");
 function checkManifestCompatibility(pkg) {
-    return core_1.structUtils.isPackageCompatible(pkg, { os: [process.platform], cpu: [process.arch] });
+    return core_1.structUtils.isPackageCompatible(pkg, core_1.nodeUtils.getArchitectureSet());
 }
 exports.checkManifestCompatibility = checkManifestCompatibility;
 function checkAndReportManifestCompatibility(pkg, label, { configuration, report }) {
     if (!checkManifestCompatibility(pkg)) {
-        report === null || report === void 0 ? void 0 : report.reportWarningOnce(core_1.MessageName.INCOMPATIBLE_ARCHITECTURE, `${core_1.structUtils.prettyLocator(configuration, pkg)} The ${process.platform}-${process.arch} architecture is incompatible with this module, ${label} skipped.`);
+        report === null || report === void 0 ? void 0 : report.reportWarningOnce(core_1.MessageName.INCOMPATIBLE_ARCHITECTURE, `${core_1.structUtils.prettyLocator(configuration, pkg)} The ${core_1.nodeUtils.getArchitectureName()} architecture is incompatible with this package, ${label} skipped.`);
         return false;
     }
     return true;

package/package.json

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