@yarnpkg/plugin-pnpm 1.1.0 → 2.0.0-rc.10

package/lib/PnpmLinker.d.ts

@@ -5,6 +5,7 @@ export declare type PnpmCustomData = {
     locatorByPath: Map<PortablePath, string>;
 };
 export declare class PnpmLinker implements Linker {
+    getCustomDataKey(): string;
     supportsPackage(pkg: Package, opts: MinimalLinkOptions): boolean;
     findPackageLocation(locator: Locator, opts: LinkOptions): Promise<PortablePath>;
     findPackageLocator(location: PortablePath, opts: LinkOptions): Promise<Locator | null>;
@@ -15,7 +16,6 @@ declare class PnpmInstaller implements Installer {
     private opts;
     private readonly asyncActions;
     constructor(opts: LinkOptions);
-    getCustomDataKey(): string;
     private customData;
     attachCustomData(customData: any): void;
     installPackage(pkg: Package, fetchResult: FetchResult, api: InstallPackageExtraApi): Promise<{

package/lib/PnpmLinker.js

@@ -6,14 +6,20 @@ const fslib_1 = require("@yarnpkg/fslib");
 const plugin_pnp_1 = require("@yarnpkg/plugin-pnp");
 const clipanion_1 = require("clipanion");
 class PnpmLinker {
+    getCustomDataKey() {
+        return JSON.stringify({
+            name: `PnpmLinker`,
+            version: 2,
+        });
+    }
     supportsPackage(pkg, opts) {
         return this.isEnabled(opts);
     }
     async findPackageLocation(locator, opts) {
         if (!this.isEnabled(opts))
             throw new Error(`Assertion failed: Expected the pnpm linker to be enabled`);
-        const customDataKey = getCustomDataKey();
-        const customData = opts.project.installersCustomData.get(customDataKey);
+        const customDataKey = this.getCustomDataKey();
+        const customData = opts.project.linkersCustomData.get(customDataKey);
         if (!customData)
             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`);
         const packageLocation = customData.pathByLocator.get(locator.locatorHash);
@@ -24,8 +30,8 @@ class PnpmLinker {
     async findPackageLocator(location, opts) {
         if (!this.isEnabled(opts))
             return null;
-        const customDataKey = getCustomDataKey();
-        const customData = opts.project.installersCustomData.get(customDataKey);
+        const customDataKey = this.getCustomDataKey();
+        const customData = opts.project.linkersCustomData.get(customDataKey);
         if (!customData)
             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`);
         const nmRootLocation = location.match(/(^.*\/node_modules\/(@[^/]*\/)?[^/]+)(\/.*$)/);
@@ -65,9 +71,6 @@ class PnpmInstaller {
         };
         // Nothing to do
     }
-    getCustomDataKey() {
-        return getCustomDataKey();
-    }
     attachCustomData(customData) {
         // We don't want to attach the data because it's only used in the Linker and we'll recompute it anyways in the Installer,
         // it needs to be invalidated because otherwise we'll never prune the store or we might run into various issues.
@@ -223,20 +226,15 @@ class PnpmInstaller {
             await Promise.all(removals);
         }
         // Wait for the package installs to catch up
-        await this.asyncActions.wait(),
-            await removeIfEmpty(storeLocation);
-        await removeIfEmpty(getNodeModulesLocation(this.opts.project));
+        await this.asyncActions.wait();
+        await removeIfEmpty(storeLocation);
+        if (this.opts.project.configuration.get(`nodeLinker`) !== `node-modules`)
+            await removeIfEmpty(getNodeModulesLocation(this.opts.project));
         return {
             customData: this.customData,
         };
     }
 }
-function getCustomDataKey() {
-    return JSON.stringify({
-        name: `PnpmInstaller`,
-        version: 2,
-    });
-}
 function getNodeModulesLocation(project) {
     return fslib_1.ppath.join(project.cwd, fslib_1.Filename.nodeModules);
 }

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "@yarnpkg/plugin-pnpm",
-  "version": "1.1.0",
+  "version": "2.0.0-rc.10",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "dependencies": {
-    "@yarnpkg/fslib": "^2.6.1",
-    "@yarnpkg/plugin-pnp": "^3.2.0",
-    "@yarnpkg/plugin-stage": "^3.1.1",
-    "clipanion": "^3.2.0-rc.4",
+    "@yarnpkg/fslib": "^3.0.0-rc.10",
+    "@yarnpkg/plugin-pnp": "^4.0.0-rc.10",
+    "@yarnpkg/plugin-stage": "^4.0.0-rc.10",
+    "clipanion": "^3.2.0-rc.10",
     "p-limit": "^2.2.0",
     "tslib": "^1.13.0"
   },
   "peerDependencies": {
-    "@yarnpkg/cli": "^3.2.0",
-    "@yarnpkg/core": "^3.2.0"
+    "@yarnpkg/cli": "^4.0.0-rc.10",
+    "@yarnpkg/core": "^4.0.0-rc.10"
   },
   "devDependencies": {
-    "@yarnpkg/cli": "^3.2.0",
-    "@yarnpkg/core": "^3.2.0"
+    "@yarnpkg/cli": "^4.0.0-rc.10",
+    "@yarnpkg/core": "^4.0.0-rc.10"
   },
   "repository": {
     "type": "git",
@@ -36,7 +36,8 @@
     "/lib/**/*"
   ],
   "engines": {
-    "node": ">=12 <14 || 14.2 - 14.9 || >14.10.0"
+    "node": ">=14.15.0"
   },
+  "stableVersion": "1.1.0",
   "typings": "./lib/index.d.ts"
 }