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

package/lib/PnpLinker.js

@@ -335,7 +335,7 @@ class PnpInstaller {
         if (customPackageData.manifest.preferUnplugged !== null)
             return customPackageData.manifest.preferUnplugged;
         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)
+        if (buildRequest?.skipped === false || customPackageData.misc.extractHint)
             return true;
         return false;
     }
@@ -389,8 +389,7 @@ function normalizeDirectoryPath(root, folder) {
     return relativeFolder.replace(/\/?$/, `/`);
 }
 async function extractCustomPackageData(fetchResult) {
-    var _a;
-    const manifest = (_a = await core_2.Manifest.tryFind(fetchResult.prefixPath, { baseFs: fetchResult.packageFs })) !== null && _a !== void 0 ? _a : new core_2.Manifest();
+    const manifest = await core_2.Manifest.tryFind(fetchResult.prefixPath, { baseFs: fetchResult.packageFs }) ?? new core_2.Manifest();
     const preservedScripts = new Set([`preinstall`, `install`, `postinstall`]);
     for (const scriptName of manifest.scripts.keys())
         if (!preservedScripts.has(scriptName))

package/lib/commands/unplug.js

@@ -114,9 +114,8 @@ class UnplugCommand extends cli_1.BaseCommand {
             stdout: this.context.stdout,
             json: this.json,
         }, async (report) => {
-            var _a;
             for (const pkg of selection) {
-                const version = (_a = pkg.version) !== null && _a !== void 0 ? _a : `unknown`;
+                const version = pkg.version ?? `unknown`;
                 const dependencyMeta = project.topLevelWorkspace.manifest.ensureDependencyMeta(core_2.structUtils.makeDescriptor(pkg, version));
                 dependencyMeta.unplugged = true;
                 report.reportInfo(core_1.MessageName.UNNAMED, `Will unpack ${core_2.structUtils.prettyLocator(configuration, pkg)} to ${core_1.formatUtils.pretty(configuration, pnpUtils.getUnpluggedPath(pkg, { configuration }), core_1.formatUtils.Type.PATH)}`);

package/lib/index.js

@@ -4,7 +4,6 @@ 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 = tslib_1.__importDefault(require("semver"));
 const url_1 = require("url");
 const PnpLinker_1 = require("./PnpLinker");
 const unplug_1 = tslib_1.__importDefault(require("./commands/unplug"));
@@ -26,21 +25,27 @@ const quotePathIfNeeded = (path) => {
 };
 exports.quotePathIfNeeded = quotePathIfNeeded;
 async function setupScriptEnvironment(project, env, makePathWrapper) {
+    // We still support .pnp.js files to improve multi-project compatibility.
+    // TODO: Drop the question mark in the RegExp after .pnp.js files stop being used.
+    // TODO: Support `-r` as an alias for `--require` (in all packages)
+    const pnpRegularExpression = /\s*--require\s+\S*\.pnp\.c?js\s*/g;
+    const esmLoaderExpression = /\s*--experimental-loader\s+\S*\.pnp\.loader\.mjs\s*/;
+    const nodeOptions = (env.NODE_OPTIONS ?? ``)
+        .replace(pnpRegularExpression, ` `)
+        .replace(esmLoaderExpression, ` `)
+        .trim();
+    // We remove the PnP hook from NODE_OPTIONS because the process can have
+    // NODE_OPTIONS set while changing linkers, which affects build scripts.
+    if (project.configuration.get(`nodeLinker`) !== `pnp`) {
+        env.NODE_OPTIONS = nodeOptions;
+        return;
+    }
     const pnpPath = (0, exports.getPnpPath)(project);
     let pnpRequire = `--require ${(0, exports.quotePathIfNeeded)(fslib_1.npath.fromPortablePath(pnpPath.cjs))}`;
     if (fslib_1.xfs.existsSync(pnpPath.esmLoader))
         pnpRequire = `${pnpRequire} --experimental-loader ${(0, url_1.pathToFileURL)(fslib_1.npath.fromPortablePath(pnpPath.esmLoader)).href}`;
-    if (pnpPath.cjs.includes(` `) && semver_1.default.lt(process.versions.node, `12.0.0`))
-        throw new Error(`Expected the build location to not include spaces when using Node < 12.0.0 (${process.versions.node})`);
     if (fslib_1.xfs.existsSync(pnpPath.cjs)) {
-        let nodeOptions = env.NODE_OPTIONS || ``;
-        // We still support .pnp.js files to improve multi-project compatibility.
-        // TODO: Drop the question mark in the RegExp after .pnp.js files stop being used.
-        const pnpRegularExpression = /\s*--require\s+\S*\.pnp\.c?js\s*/g;
-        const esmLoaderExpression = /\s*--experimental-loader\s+\S*\.pnp\.loader\.mjs\s*/;
-        nodeOptions = nodeOptions.replace(pnpRegularExpression, ` `).replace(esmLoaderExpression, ` `).trim();
-        nodeOptions = nodeOptions ? `${pnpRequire} ${nodeOptions}` : pnpRequire;
-        env.NODE_OPTIONS = nodeOptions;
+        env.NODE_OPTIONS = nodeOptions ? `${pnpRequire} ${nodeOptions}` : pnpRequire;
     }
 }
 async function populateYarnPaths(project, definePath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/plugin-pnp",
-  "version": "4.0.0-rc.48",
+  "version": "4.0.0-rc.49",
   "stableVersion": "3.2.11",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
@@ -9,23 +9,21 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@types/semver": "^7.1.0",
-    "@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",
+    "@yarnpkg/fslib": "^3.0.0-rc.49",
+    "@yarnpkg/plugin-stage": "^4.0.0-rc.49",
+    "@yarnpkg/pnp": "^4.0.0-rc.49",
+    "clipanion": "^4.0.0-rc.2",
     "micromatch": "^4.0.2",
-    "semver": "^7.1.2",
     "tslib": "^2.4.0"
   },
   "peerDependencies": {
-    "@yarnpkg/cli": "^4.0.0-rc.48",
-    "@yarnpkg/core": "^4.0.0-rc.48"
+    "@yarnpkg/cli": "^4.0.0-rc.49",
+    "@yarnpkg/core": "^4.0.0-rc.49"
   },
   "devDependencies": {
     "@types/micromatch": "^4.0.1",
-    "@yarnpkg/cli": "^4.0.0-rc.48",
-    "@yarnpkg/core": "^4.0.0-rc.48"
+    "@yarnpkg/cli": "^4.0.0-rc.49",
+    "@yarnpkg/core": "^4.0.0-rc.49"
   },
   "repository": {
     "type": "git",