@yarnpkg/plugin-pnp 4.1.6 → 4.2.0

package/lib/index.d.ts

@@ -8,15 +8,22 @@ import * as pnpUtils from './pnpUtils';
 export { UnplugCommand };
 export { jsInstallUtils };
 export { pnpUtils };
+export declare enum NodePackageMapType {
+    STANDARD = "standard",
+    LOOSE = "loose"
+}
 export declare const getPnpPath: (project: Project) => {
     cjs: PortablePath;
     data: PortablePath;
     esmLoader: PortablePath;
 };
+export declare const getPackageMapPath: (project: Project) => PortablePath;
 export declare const quotePathIfNeeded: (path: string) => string;
 declare module '@yarnpkg/core' {
     interface ConfigurationValueMap {
         nodeLinker: string;
+        nodeExperimentalPackageMap: boolean;
+        nodePackageMapType: string;
         winLinkType: string;
         pnpMode: string;
         minizip: boolean;

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PnpLinker = exports.PnpInstaller = exports.quotePathIfNeeded = exports.getPnpPath = exports.pnpUtils = exports.jsInstallUtils = exports.UnplugCommand = void 0;
+exports.PnpLinker = exports.PnpInstaller = exports.quotePathIfNeeded = exports.getPackageMapPath = exports.getPnpPath = exports.NodePackageMapType = exports.pnpUtils = exports.jsInstallUtils = exports.UnplugCommand = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@yarnpkg/core");
 const fslib_1 = require("@yarnpkg/fslib");
@@ -12,6 +12,11 @@ const jsInstallUtils = tslib_1.__importStar(require("./jsInstallUtils"));
 exports.jsInstallUtils = jsInstallUtils;
 const pnpUtils = tslib_1.__importStar(require("./pnpUtils"));
 exports.pnpUtils = pnpUtils;
+var NodePackageMapType;
+(function (NodePackageMapType) {
+    NodePackageMapType["STANDARD"] = "standard";
+    NodePackageMapType["LOOSE"] = "loose";
+})(NodePackageMapType || (exports.NodePackageMapType = NodePackageMapType = {}));
 const getPnpPath = (project) => {
     return {
         cjs: fslib_1.ppath.join(project.cwd, fslib_1.Filename.pnpCjs),
@@ -20,6 +25,10 @@ const getPnpPath = (project) => {
     };
 };
 exports.getPnpPath = getPnpPath;
+const getPackageMapPath = (project) => {
+    return fslib_1.ppath.join(project.cwd, fslib_1.Filename.nodeModules, `.package-map.json`);
+};
+exports.getPackageMapPath = getPackageMapPath;
 const quotePathIfNeeded = (path) => {
     return /\s/.test(path) ? JSON.stringify(path) : path;
 };
@@ -30,16 +39,27 @@ async function setupScriptEnvironment(project, env, makePathWrapper) {
     // 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 packageMapExpression = /\s*--experimental-package-map(?:=|\s+)(?:"[^"]*"|'[^']*'|\S+)\s*/g;
     const nodeOptions = (env.NODE_OPTIONS ?? ``)
         .replace(pnpRegularExpression, ` `)
         .replace(esmLoaderExpression, ` `)
+        .replace(packageMapExpression, ` `)
         .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`) {
+    const nodeLinker = project.configuration.get(`nodeLinker`);
+    const extraNodeOptions = [];
+    const packageMapPath = (0, exports.getPackageMapPath)(project);
+    if (project.configuration.get(`nodeExperimentalPackageMap`) && nodeLinker !== `pnp` && fslib_1.xfs.existsSync(packageMapPath))
+        extraNodeOptions.push(`--experimental-package-map=${(0, exports.quotePathIfNeeded)(fslib_1.npath.fromPortablePath(packageMapPath))}`);
+    const applyNodeOptions = () => {
+        const effectiveNodeOptions = [...extraNodeOptions, nodeOptions].filter(Boolean).join(` `);
         // When set to an empty string, some tools consider it as explicitly set
         // to the empty value, and do not set their own value.
-        env.NODE_OPTIONS = nodeOptions ? nodeOptions : undefined;
+        env.NODE_OPTIONS = effectiveNodeOptions ? effectiveNodeOptions : undefined;
+    };
+    // We remove the PnP hook from NODE_OPTIONS because the process can have
+    // NODE_OPTIONS set while changing linkers, which affects build scripts.
+    if (nodeLinker !== `pnp`) {
+        applyNodeOptions();
         return;
     }
     const pnpPath = (0, exports.getPnpPath)(project);
@@ -47,7 +67,8 @@ async function setupScriptEnvironment(project, env, makePathWrapper) {
     if (fslib_1.xfs.existsSync(pnpPath.esmLoader))
         pnpRequire = `${pnpRequire} --experimental-loader ${(0, url_1.pathToFileURL)(fslib_1.npath.fromPortablePath(pnpPath.esmLoader)).href}`;
     if (fslib_1.xfs.existsSync(pnpPath.cjs)) {
-        env.NODE_OPTIONS = nodeOptions ? `${pnpRequire} ${nodeOptions}` : pnpRequire;
+        extraNodeOptions.unshift(pnpRequire);
+        applyNodeOptions();
     }
 }
 async function populateYarnPaths(project, definePath) {
@@ -68,6 +89,20 @@ const plugin = {
             type: core_1.SettingsType.STRING,
             default: `pnp`,
         },
+        nodeExperimentalPackageMap: {
+            description: `If true, Yarn will inject the experimental package map into Node.js processes when using the node-modules or pnpm linkers.`,
+            type: core_1.SettingsType.BOOLEAN,
+            default: false,
+        },
+        nodePackageMapType: {
+            description: `If 'standard', package maps will reflect the dependency graph. If 'loose', they will reflect the hoisted node_modules layout.`,
+            type: core_1.SettingsType.STRING,
+            values: [
+                NodePackageMapType.STANDARD,
+                NodePackageMapType.LOOSE,
+            ],
+            default: NodePackageMapType.STANDARD,
+        },
         minizip: {
             description: `Whether Yarn should use minizip to extract archives`,
             type: core_1.SettingsType.BOOLEAN,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/plugin-pnp",
-  "version": "4.1.6",
+  "version": "4.2.0",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "exports": {
@@ -10,19 +10,19 @@
   "dependencies": {
     "@yarnpkg/fslib": "^3.1.5",
     "@yarnpkg/plugin-stage": "^4.0.2",
-    "@yarnpkg/pnp": "^4.1.6",
+    "@yarnpkg/pnp": "^4.1.7",
     "clipanion": "^4.0.0-rc.2",
     "micromatch": "^4.0.2",
     "tslib": "^2.4.0"
   },
   "peerDependencies": {
-    "@yarnpkg/cli": "^4.15.0",
-    "@yarnpkg/core": "^4.8.0"
+    "@yarnpkg/cli": "^4.17.0",
+    "@yarnpkg/core": "^4.9.0"
   },
   "devDependencies": {
     "@types/micromatch": "^4.0.1",
-    "@yarnpkg/cli": "^4.15.0",
-    "@yarnpkg/core": "^4.8.0"
+    "@yarnpkg/cli": "^4.17.0",
+    "@yarnpkg/core": "^4.9.0"
   },
   "repository": {
     "type": "git",