@yarnpkg/plugin-pnp 4.0.0-rc.46 → 4.0.0-rc.48

package/lib/PnpLinker.d.ts

@@ -25,7 +25,7 @@ export declare class PnpInstaller implements Installer {
     attachCustomData(customData: any): void;
     installPackage(pkg: Package, fetchResult: FetchResult, api: InstallPackageExtraApi): Promise<{
         packageLocation: PortablePath;
-        buildDirective: import("@yarnpkg/core").BuildDirective[] | null;
+        buildRequest: import("@yarnpkg/core").BuildRequest | null;
     }>;
     attachInternalDependencies(locator: Locator, dependencies: Array<[Descriptor, Locator]>): Promise<void>;
     attachExternalDependents(locator: Locator, dependentPaths: Array<PortablePath>): Promise<void>;

package/lib/PnpLinker.js

@@ -122,9 +122,9 @@ class PnpInstaller {
                 this.isESMLoaderRequired = true;
             dependencyMeta = this.opts.project.getDependencyMeta(devirtualizedLocator, pkg.version);
         }
-        const buildScripts = mayNeedToBeBuilt
-            ? jsInstallUtils.extractBuildScripts(pkg, customPackageData, dependencyMeta, { configuration: this.opts.project.configuration, report: this.opts.report })
-            : [];
+        const buildRequest = mayNeedToBeBuilt
+            ? jsInstallUtils.extractBuildRequest(pkg, customPackageData, dependencyMeta, { configuration: this.opts.project.configuration })
+            : null;
         const packageFs = mayNeedToBeUnplugged
             ? await this.unplugPackageIfNeeded(pkg, customPackageData, fetchResult, dependencyMeta, api)
             : fetchResult.packageFs;
@@ -160,7 +160,7 @@ class PnpInstaller {
         });
         return {
             packageLocation: packageRawLocation,
-            buildDirective: buildScripts.length > 0 ? buildScripts : null,
+            buildRequest,
         };
     }
     async attachInternalDependencies(locator, dependencies) {
@@ -334,7 +334,8 @@ class PnpInstaller {
             return true;
         if (customPackageData.manifest.preferUnplugged !== null)
             return customPackageData.manifest.preferUnplugged;
-        if (jsInstallUtils.extractBuildScripts(pkg, customPackageData, dependencyMeta, { configuration: this.opts.project.configuration }).length > 0 || customPackageData.misc.extractHint)
+        const buildRequest = jsInstallUtils.extractBuildRequest(pkg, customPackageData, dependencyMeta, { configuration: this.opts.project.configuration });
+        if ((buildRequest === null || buildRequest === void 0 ? void 0 : buildRequest.skipped) === false || customPackageData.misc.extractHint)
             return true;
         return false;
     }

package/lib/commands/unplug.js

@@ -109,7 +109,7 @@ class UnplugCommand extends cli_1.BaseCommand {
         selection = core_1.miscUtils.sortMap(selection, pkg => {
             return core_2.structUtils.stringifyLocator(pkg);
         });
-        const report = await core_1.StreamReport.start({
+        const unplugReport = await core_1.StreamReport.start({
             configuration,
             stdout: this.context.stdout,
             json: this.json,
@@ -126,10 +126,18 @@ class UnplugCommand extends cli_1.BaseCommand {
                 });
             }
             await project.topLevelWorkspace.persistManifest();
-            report.reportSeparator();
-            await project.install({ cache, report });
+            if (!this.json) {
+                report.reportSeparator();
+            }
+        });
+        if (unplugReport.hasErrors())
+            return unplugReport.exitCode();
+        return await project.installWithNewReport({
+            json: this.json,
+            stdout: this.context.stdout,
+        }, {
+            cache,
         });
-        return report.exitCode();
     }
 }
 UnplugCommand.paths = [

package/lib/jsInstallUtils.d.ts

@@ -1,18 +1,13 @@
-import { BuildDirective, Configuration, DependencyMeta, FetchResult, Manifest, Package, Report } from '@yarnpkg/core';
+import { Configuration, DependencyMeta, FetchResult, Manifest, Package, BuildRequest } from '@yarnpkg/core';
 export declare function checkManifestCompatibility(pkg: Package): boolean;
-export declare function checkAndReportManifestCompatibility(pkg: Package, label: string, { configuration, report }: {
-    configuration: Configuration;
-    report?: Report | null;
-}): boolean;
 export type ExtractBuildScriptDataRequirements = {
     manifest: Pick<Manifest, 'scripts'>;
     misc: {
         hasBindingGyp: boolean;
     };
 };
-export declare function extractBuildScripts(pkg: Package, requirements: ExtractBuildScriptDataRequirements, dependencyMeta: DependencyMeta, { configuration, report }: {
+export declare function extractBuildRequest(pkg: Package, requirements: ExtractBuildScriptDataRequirements, dependencyMeta: DependencyMeta, { configuration }: {
     configuration: Configuration;
-    report?: Report | null;
-}): BuildDirective[];
+}): BuildRequest | null;
 export declare function getExtractHint(fetchResult: FetchResult): boolean;
 export declare function hasBindingGyp(fetchResult: FetchResult): boolean;

package/lib/jsInstallUtils.js

@@ -1,48 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasBindingGyp = exports.getExtractHint = exports.extractBuildScripts = exports.checkAndReportManifestCompatibility = exports.checkManifestCompatibility = void 0;
+exports.hasBindingGyp = exports.getExtractHint = exports.extractBuildRequest = exports.checkManifestCompatibility = void 0;
 const core_1 = require("@yarnpkg/core");
 const fslib_1 = require("@yarnpkg/fslib");
 function checkManifestCompatibility(pkg) {
     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 ${core_1.nodeUtils.getArchitectureName()} architecture is incompatible with this package, ${label} skipped.`);
-        return false;
-    }
-    return true;
-}
-exports.checkAndReportManifestCompatibility = checkAndReportManifestCompatibility;
-function extractBuildScripts(pkg, requirements, dependencyMeta, { configuration, report }) {
-    const buildScripts = [];
+function extractBuildRequest(pkg, requirements, dependencyMeta, { configuration }) {
+    const directives = [];
     for (const scriptName of [`preinstall`, `install`, `postinstall`])
         if (requirements.manifest.scripts.has(scriptName))
-            buildScripts.push([core_1.BuildType.SCRIPT, scriptName]);
+            directives.push({ type: core_1.BuildDirectiveType.SCRIPT, script: scriptName });
     // Detect cases where a package has a binding.gyp but no install script
     if (!requirements.manifest.scripts.has(`install`) && requirements.misc.hasBindingGyp)
-        buildScripts.push([core_1.BuildType.SHELLCODE, `node-gyp rebuild`]);
-    if (buildScripts.length === 0)
-        return [];
-    if (pkg.linkType !== core_1.LinkType.HARD) {
-        report === null || report === void 0 ? void 0 : report.reportWarningOnce(core_1.MessageName.SOFT_LINK_BUILD, `${core_1.structUtils.prettyLocator(configuration, pkg)} lists build scripts, but is referenced through a soft link. Soft links don't support build scripts, so they'll be ignored.`);
-        return [];
-    }
-    if (dependencyMeta && dependencyMeta.built === false) {
-        report === null || report === void 0 ? void 0 : report.reportInfoOnce(core_1.MessageName.BUILD_DISABLED, `${core_1.structUtils.prettyLocator(configuration, pkg)} lists build scripts, but its build has been explicitly disabled through configuration.`);
-        return [];
-    }
-    if (!configuration.get(`enableScripts`) && !dependencyMeta.built) {
-        report === null || report === void 0 ? void 0 : report.reportWarningOnce(core_1.MessageName.DISABLED_BUILD_SCRIPTS, `${core_1.structUtils.prettyLocator(configuration, pkg)} lists build scripts, but all build scripts have been disabled.`);
-        return [];
-    }
-    const isManifestCompatible = checkAndReportManifestCompatibility(pkg, `build`, { configuration, report });
-    if (!isManifestCompatible)
-        return [];
-    return buildScripts;
+        directives.push({ type: core_1.BuildDirectiveType.SHELLCODE, script: `node-gyp rebuild` });
+    if (directives.length === 0)
+        return null;
+    if (pkg.linkType !== core_1.LinkType.HARD)
+        return { skipped: true, explain: report => report.reportWarningOnce(core_1.MessageName.SOFT_LINK_BUILD, `${core_1.structUtils.prettyLocator(configuration, pkg)} lists build scripts, but is referenced through a soft link. Soft links don't support build scripts, so they'll be ignored.`) };
+    if (dependencyMeta && dependencyMeta.built === false)
+        return { skipped: true, explain: report => report.reportInfoOnce(core_1.MessageName.BUILD_DISABLED, `${core_1.structUtils.prettyLocator(configuration, pkg)} lists build scripts, but its build has been explicitly disabled through configuration.`) };
+    if (!configuration.get(`enableScripts`) && !dependencyMeta.built)
+        return { skipped: true, explain: report => report.reportWarningOnce(core_1.MessageName.DISABLED_BUILD_SCRIPTS, `${core_1.structUtils.prettyLocator(configuration, pkg)} lists build scripts, but all build scripts have been disabled.`) };
+    if (!checkManifestCompatibility(pkg))
+        return { skipped: true, explain: report => report.reportWarningOnce(core_1.MessageName.INCOMPATIBLE_ARCHITECTURE, `${core_1.structUtils.prettyLocator(configuration, pkg)} The ${core_1.nodeUtils.getArchitectureName()} architecture is incompatible with this package, build skipped.`) };
+    return { skipped: false, directives };
 }
-exports.extractBuildScripts = extractBuildScripts;
+exports.extractBuildRequest = extractBuildRequest;
 const FORCED_EXTRACT_FILETYPES = new Set([
     // Windows can't execute exe files inside zip archives
     `.exe`,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yarnpkg/plugin-pnp",
-  "version": "4.0.0-rc.46",
-  "stableVersion": "3.2.10",
+  "version": "4.0.0-rc.48",
+  "stableVersion": "3.2.11",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "exports": {
@@ -10,22 +10,22 @@
   },
   "dependencies": {
     "@types/semver": "^7.1.0",
-    "@yarnpkg/fslib": "^3.0.0-rc.46",
-    "@yarnpkg/plugin-stage": "^4.0.0-rc.46",
-    "@yarnpkg/pnp": "^4.0.0-rc.46",
+    "@yarnpkg/fslib": "^3.0.0-rc.48",
+    "@yarnpkg/plugin-stage": "^4.0.0-rc.48",
+    "@yarnpkg/pnp": "^4.0.0-rc.48",
     "clipanion": "^3.2.1",
     "micromatch": "^4.0.2",
     "semver": "^7.1.2",
     "tslib": "^2.4.0"
   },
   "peerDependencies": {
-    "@yarnpkg/cli": "^4.0.0-rc.46",
-    "@yarnpkg/core": "^4.0.0-rc.46"
+    "@yarnpkg/cli": "^4.0.0-rc.48",
+    "@yarnpkg/core": "^4.0.0-rc.48"
   },
   "devDependencies": {
     "@types/micromatch": "^4.0.1",
-    "@yarnpkg/cli": "^4.0.0-rc.46",
-    "@yarnpkg/core": "^4.0.0-rc.46"
+    "@yarnpkg/cli": "^4.0.0-rc.48",
+    "@yarnpkg/core": "^4.0.0-rc.48"
   },
   "repository": {
     "type": "git",
@@ -47,6 +47,6 @@
     "/lib/**/*"
   ],
   "engines": {
-    "node": ">=14.15.0"
+    "node": ">=18.12.0"
   }
 }