@yarnpkg/plugin-pnp 4.0.0-rc.2 → 4.0.0-rc.20

package/lib/PnpLinker.d.ts

@@ -6,6 +6,7 @@ import { PnpSettings } from '@yarnpkg/pnp';
 export declare class PnpLinker implements Linker {
     protected mode: string;
     private pnpCache;
+    getCustomDataKey(): string;
     supportsPackage(pkg: Package, opts: MinimalLinkOptions): boolean;
     findPackageLocation(locator: Locator, opts: LinkOptions): Promise<PortablePath>;
     findPackageLocator(location: PortablePath, opts: LinkOptions): Promise<Locator | null>;
@@ -20,7 +21,6 @@ export declare class PnpInstaller implements Installer {
     private readonly virtualTemplates;
     private isESMLoaderRequired;
     constructor(opts: LinkOptions);
-    getCustomDataKey(): string;
     private customData;
     attachCustomData(customData: any): void;
     installPackage(pkg: Package, fetchResult: FetchResult, api: InstallPackageExtraApi): Promise<{

package/lib/PnpLinker.js

@@ -18,12 +18,21 @@ const FORCED_UNPLUG_PACKAGES = new Set([
     core_1.structUtils.makeIdent(null, `node-addon-api`).identHash,
     // Those ones contain native builds (*.node), and Node loads them through dlopen
     core_1.structUtils.makeIdent(null, `fsevents`).identHash,
+    // Contains native binaries
+    core_1.structUtils.makeIdent(null, `open`).identHash,
+    core_1.structUtils.makeIdent(null, `opn`).identHash,
 ]);
 class PnpLinker {
     constructor() {
         this.mode = `strict`;
         this.pnpCache = new Map();
     }
+    getCustomDataKey() {
+        return JSON.stringify({
+            name: `PnpLinker`,
+            version: 2,
+        });
+    }
     supportsPackage(pkg, opts) {
         return this.isEnabled(opts);
     }
@@ -82,12 +91,6 @@ class PnpInstaller {
         this.unpluggedPaths = new Set();
         this.opts = opts;
     }
-    getCustomDataKey() {
-        return JSON.stringify({
-            name: `PnpInstaller`,
-            version: 2,
-        });
-    }
     attachCustomData(customData) {
         this.customData = customData;
     }
@@ -186,16 +189,13 @@ class PnpInstaller {
         if (this.opts.project.configuration.get(`pnpMode`) !== this.mode)
             return undefined;
         const pnpPath = (0, index_1.getPnpPath)(this.opts.project);
-        if (fslib_1.xfs.existsSync(pnpPath.cjsLegacy)) {
-            this.opts.report.reportWarning(core_2.MessageName.UNNAMED, `Removing the old ${core_1.formatUtils.pretty(this.opts.project.configuration, fslib_1.Filename.pnpJs, core_1.formatUtils.Type.PATH)} file. You might need to manually update existing references to reference the new ${core_1.formatUtils.pretty(this.opts.project.configuration, fslib_1.Filename.pnpCjs, core_1.formatUtils.Type.PATH)} file. If you use Editor SDKs, you'll have to rerun ${core_1.formatUtils.pretty(this.opts.project.configuration, `yarn sdks`, core_1.formatUtils.Type.CODE)}.`);
-            await fslib_1.xfs.removePromise(pnpPath.cjsLegacy);
-        }
         if (!this.isEsmEnabled())
             await fslib_1.xfs.removePromise(pnpPath.esmLoader);
         if (this.opts.project.configuration.get(`nodeLinker`) !== `pnp`) {
             await fslib_1.xfs.removePromise(pnpPath.cjs);
-            await fslib_1.xfs.removePromise(this.opts.project.configuration.get(`pnpDataPath`));
+            await fslib_1.xfs.removePromise(pnpPath.data);
             await fslib_1.xfs.removePromise(pnpPath.esmLoader);
+            await fslib_1.xfs.removePromise(this.opts.project.configuration.get(`pnpUnpluggedFolder`));
             return undefined;
         }
         for (const { locator, location } of this.virtualTemplates.values()) {
@@ -253,7 +253,6 @@ class PnpInstaller {
     }
     async finalizeInstallWithPnp(pnpSettings) {
         const pnpPath = (0, index_1.getPnpPath)(this.opts.project);
-        const pnpDataPath = this.opts.project.configuration.get(`pnpDataPath`);
         const nodeModules = await this.locateNodeModules(pnpSettings.ignorePattern);
         if (nodeModules.length > 0) {
             this.opts.report.reportWarning(core_2.MessageName.DANGEROUS_NODE_MODULES, `One or more node_modules have been detected and will be removed. This operation may take some time.`);
@@ -268,16 +267,15 @@ class PnpInstaller {
                 automaticNewlines: true,
                 mode: 0o755,
             });
-            await fslib_1.xfs.removePromise(pnpDataPath);
+            await fslib_1.xfs.removePromise(pnpPath.data);
         }
         else {
-            const dataLocation = fslib_1.ppath.relative(fslib_1.ppath.dirname(pnpPath.cjs), pnpDataPath);
-            const { dataFile, loaderFile } = (0, pnp_1.generateSplitScript)({ ...pnpSettings, dataLocation });
+            const { dataFile, loaderFile } = (0, pnp_1.generateSplitScript)(pnpSettings);
             await fslib_1.xfs.changeFilePromise(pnpPath.cjs, loaderFile, {
                 automaticNewlines: true,
                 mode: 0o755,
             });
-            await fslib_1.xfs.changeFilePromise(pnpDataPath, dataFile, {
+            await fslib_1.xfs.changeFilePromise(pnpPath.data, dataFile, {
                 automaticNewlines: true,
                 mode: 0o644,
             });

package/lib/index.d.ts

@@ -1,13 +1,15 @@
 import { Hooks as CoreHooks, Plugin, Project } from '@yarnpkg/core';
 import { PortablePath } from '@yarnpkg/fslib';
 import { Hooks as StageHooks } from '@yarnpkg/plugin-stage';
+import UnplugCommand from './commands/unplug';
 import * as jsInstallUtils from './jsInstallUtils';
 import * as pnpUtils from './pnpUtils';
+export { UnplugCommand };
 export { jsInstallUtils };
 export { pnpUtils };
 export declare const getPnpPath: (project: Project) => {
     cjs: PortablePath;
-    cjsLegacy: PortablePath;
+    data: PortablePath;
     esmLoader: PortablePath;
 };
 export declare const quotePathIfNeeded: (path: string) => string;
@@ -21,7 +23,6 @@ declare module '@yarnpkg/core' {
         pnpEnableInlining: boolean;
         pnpFallbackMode: string;
         pnpUnpluggedFolder: PortablePath;
-        pnpDataPath: PortablePath;
     }
 }
 declare const plugin: Plugin<CoreHooks & StageHooks>;

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 = void 0;
+exports.PnpLinker = exports.PnpInstaller = exports.quotePathIfNeeded = exports.getPnpPath = 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");
@@ -8,6 +8,7 @@ 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"));
+exports.UnplugCommand = unplug_1.default;
 const jsInstallUtils = tslib_1.__importStar(require("./jsInstallUtils"));
 exports.jsInstallUtils = jsInstallUtils;
 const pnpUtils = tslib_1.__importStar(require("./pnpUtils"));
@@ -15,8 +16,8 @@ exports.pnpUtils = pnpUtils;
 const getPnpPath = (project) => {
     return {
         cjs: fslib_1.ppath.join(project.cwd, fslib_1.Filename.pnpCjs),
-        cjsLegacy: fslib_1.ppath.join(project.cwd, fslib_1.Filename.pnpJs),
-        esmLoader: fslib_1.ppath.join(project.cwd, `.pnp.loader.mjs`),
+        data: fslib_1.ppath.join(project.cwd, fslib_1.Filename.pnpData),
+        esmLoader: fslib_1.ppath.join(project.cwd, fslib_1.Filename.pnpEsmLoader),
     };
 };
 exports.getPnpPath = getPnpPath;
@@ -45,8 +46,8 @@ async function setupScriptEnvironment(project, env, makePathWrapper) {
 async function populateYarnPaths(project, definePath) {
     const pnpPath = (0, exports.getPnpPath)(project);
     definePath(pnpPath.cjs);
+    definePath(pnpPath.data);
     definePath(pnpPath.esmLoader);
-    definePath(project.configuration.get(`pnpDataPath`));
     definePath(project.configuration.get(`pnpUnpluggedFolder`));
 }
 const plugin = {
@@ -96,11 +97,6 @@ const plugin = {
             type: core_1.SettingsType.ABSOLUTE_PATH,
             default: `./.yarn/unplugged`,
         },
-        pnpDataPath: {
-            description: `Path of the file where the PnP data (used by the loader) must be written`,
-            type: core_1.SettingsType.ABSOLUTE_PATH,
-            default: `./.pnp.data.json`,
-        },
     },
     linkers: [
         PnpLinker_1.PnpLinker,

package/package.json

@@ -1,26 +1,31 @@
 {
   "name": "@yarnpkg/plugin-pnp",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0-rc.20",
+  "stableVersion": "3.2.2",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./package.json": "./package.json"
+  },
   "dependencies": {
     "@types/semver": "^7.1.0",
-    "@yarnpkg/fslib": "^3.0.0-rc.2",
-    "@yarnpkg/plugin-stage": "^4.0.0-rc.2",
-    "@yarnpkg/pnp": "^4.0.0-rc.2",
+    "@yarnpkg/fslib": "^3.0.0-rc.20",
+    "@yarnpkg/plugin-stage": "^4.0.0-rc.20",
+    "@yarnpkg/pnp": "^4.0.0-rc.20",
     "clipanion": "^3.2.0-rc.10",
     "micromatch": "^4.0.2",
     "semver": "^7.1.2",
-    "tslib": "^1.13.0"
+    "tslib": "^2.4.0"
   },
   "peerDependencies": {
-    "@yarnpkg/cli": "^4.0.0-rc.2",
-    "@yarnpkg/core": "^4.0.0-rc.2"
+    "@yarnpkg/cli": "^4.0.0-rc.20",
+    "@yarnpkg/core": "^4.0.0-rc.20"
   },
   "devDependencies": {
     "@types/micromatch": "^4.0.1",
-    "@yarnpkg/cli": "^4.0.0-rc.2",
-    "@yarnpkg/core": "^4.0.0-rc.2"
+    "@yarnpkg/cli": "^4.0.0-rc.20",
+    "@yarnpkg/core": "^4.0.0-rc.20"
   },
   "repository": {
     "type": "git",
@@ -33,14 +38,15 @@
   },
   "publishConfig": {
     "main": "./lib/index.js",
-    "typings": "./lib/index.d.ts"
+    "exports": {
+      ".": "./lib/index.js",
+      "./package.json": "./package.json"
+    }
   },
   "files": [
     "/lib/**/*"
   ],
   "engines": {
     "node": ">=14.15.0"
-  },
-  "stableVersion": "3.2.0",
-  "typings": "./lib/index.d.ts"
+  }
 }