@yarnpkg/plugin-pnp 4.0.0-rc.11 → 4.0.0-rc.15

package/lib/PnpLinker.js

@@ -18,6 +18,9 @@ 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() {
@@ -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

@@ -7,7 +7,7 @@ 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 +21,6 @@ declare module '@yarnpkg/core' {
         pnpEnableInlining: boolean;
         pnpFallbackMode: string;
         pnpUnpluggedFolder: PortablePath;
-        pnpDataPath: PortablePath;
     }
 }
 declare const plugin: Plugin<CoreHooks & StageHooks>;

package/lib/index.js

@@ -15,8 +15,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 +45,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 +96,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,27 @@
 {
   "name": "@yarnpkg/plugin-pnp",
-  "version": "4.0.0-rc.11",
+  "version": "4.0.0-rc.15",
+  "stableVersion": "3.2.2",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "dependencies": {
     "@types/semver": "^7.1.0",
-    "@yarnpkg/fslib": "^3.0.0-rc.11",
-    "@yarnpkg/plugin-stage": "^4.0.0-rc.11",
-    "@yarnpkg/pnp": "^4.0.0-rc.11",
+    "@yarnpkg/fslib": "^3.0.0-rc.15",
+    "@yarnpkg/plugin-stage": "^4.0.0-rc.15",
+    "@yarnpkg/pnp": "^4.0.0-rc.15",
     "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.11",
-    "@yarnpkg/core": "^4.0.0-rc.11"
+    "@yarnpkg/cli": "^4.0.0-rc.15",
+    "@yarnpkg/core": "^4.0.0-rc.15"
   },
   "devDependencies": {
     "@types/micromatch": "^4.0.1",
-    "@yarnpkg/cli": "^4.0.0-rc.11",
-    "@yarnpkg/core": "^4.0.0-rc.11"
+    "@yarnpkg/cli": "^4.0.0-rc.15",
+    "@yarnpkg/core": "^4.0.0-rc.15"
   },
   "repository": {
     "type": "git",
@@ -41,6 +42,5 @@
   "engines": {
     "node": ">=14.15.0"
   },
-  "stableVersion": "3.2.0",
   "typings": "./lib/index.d.ts"
 }