@yarnpkg/plugin-pnp 3.1.0-rc.6 → 3.1.2-rc.10

package/lib/PnpLinker.d.ts

@@ -10,6 +10,7 @@ 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;

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,6 +59,13 @@ 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 {
@@ -231,8 +238,8 @@ class PnpInstaller {
         // Nothing to transform
     }
     isEsmEnabled() {
-        if (this.opts.project.configuration.sources.has(`pnpEnableExperimentalEsm`))
-            return this.opts.project.configuration.get(`pnpEnableExperimentalEsm`);
+        if (this.opts.project.configuration.sources.has(`pnpEnableEsmLoader`))
+            return this.opts.project.configuration.get(`pnpEnableEsmLoader`);
         if (this.isESMLoaderRequired)
             return true;
         for (const workspace of this.opts.project.workspaces) {

package/lib/index.d.ts

@@ -17,7 +17,7 @@ declare module '@yarnpkg/core' {
         pnpMode: string;
         pnpShebang: string;
         pnpIgnorePatterns: Array<string>;
-        pnpEnableExperimentalEsm: boolean;
+        pnpEnableEsmLoader: boolean;
         pnpEnableInlining: boolean;
         pnpFallbackMode: string;
         pnpUnpluggedFolder: PortablePath;

package/lib/index.js

@@ -76,7 +76,7 @@ const plugin = {
             default: [],
             isArray: true,
         },
-        pnpEnableExperimentalEsm: {
+        pnpEnableEsmLoader: {
             description: `If true, Yarn will generate an ESM loader (\`.pnp.loader.mjs\`). If this is not explicitly set Yarn tries to automatically detect whether ESM support is required.`,
             type: core_1.SettingsType.BOOLEAN,
             default: false,

package/lib/jsInstallUtils.d.ts

@@ -1,4 +1,5 @@
 import { BuildDirective, Configuration, DependencyMeta, FetchResult, Manifest, Package, Report } 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;

package/lib/jsInstallUtils.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasBindingGyp = exports.getExtractHint = exports.extractBuildScripts = exports.checkAndReportManifestCompatibility = void 0;
+exports.hasBindingGyp = exports.getExtractHint = exports.extractBuildScripts = exports.checkAndReportManifestCompatibility = 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, { os: [process.platform], cpu: [process.arch] });
+}
+exports.checkManifestCompatibility = checkManifestCompatibility;
 function checkAndReportManifestCompatibility(pkg, label, { configuration, report }) {
-    if (!core_1.structUtils.isPackageCompatible(pkg, { os: [process.platform], cpu: [process.arch] })) {
+    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.`);
         return false;
     }

package/package.json

@@ -1,26 +1,26 @@
 {
   "name": "@yarnpkg/plugin-pnp",
-  "version": "3.1.0-rc.6",
+  "version": "3.1.2-rc.10",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "dependencies": {
     "@types/semver": "^7.1.0",
-    "@yarnpkg/fslib": "^2.6.0-rc.13",
-    "@yarnpkg/plugin-stage": "^3.1.0-rc.3",
-    "@yarnpkg/pnp": "^3.1.0-rc.10",
-    "clipanion": "^3.0.1",
+    "@yarnpkg/fslib": "^2.6.1-rc.5",
+    "@yarnpkg/plugin-stage": "^3.1.1",
+    "@yarnpkg/pnp": "^3.1.1-rc.10",
+    "clipanion": "^3.2.0-rc.4",
     "micromatch": "^4.0.2",
     "semver": "^7.1.2",
     "tslib": "^1.13.0"
   },
   "peerDependencies": {
-    "@yarnpkg/cli": "^3.1.0-rc.13",
-    "@yarnpkg/core": "^3.1.0-rc.14"
+    "@yarnpkg/cli": "^3.2.0-rc.10",
+    "@yarnpkg/core": "^3.2.0-rc.10"
   },
   "devDependencies": {
     "@types/micromatch": "^4.0.1",
-    "@yarnpkg/cli": "^3.1.0-rc.13",
-    "@yarnpkg/core": "^3.1.0-rc.14"
+    "@yarnpkg/cli": "^3.2.0-rc.10",
+    "@yarnpkg/core": "^3.2.0-rc.10"
   },
   "repository": {
     "type": "git",
@@ -41,6 +41,6 @@
   "engines": {
     "node": ">=12 <14 || 14.2 - 14.9 || >14.10.0"
   },
-  "stableVersion": "3.0.0",
+  "stableVersion": "3.1.1",
   "typings": "./lib/index.d.ts"
 }