fix(plugin-compat): fix fsevents plugin when pnpapi isn't available (#1772)

Author: bgotink

.pnp.js

@@ -0,0 +1,22 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/plugin-compat": patch
+
+declined:
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-node-modules"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"

.yarn/cache/fsevents-patch-9eca6216ec-a5e86a41b3.zip renamed to .yarn/cache/fsevents-patch-89f12f5290-82ff6a255f.zip

@@ -1,10 +1,9 @@
 const path = require(`path`);
 
-let pnpApi;
+let pnpApi = null;
 try {
   pnpApi = require(`pnpapi`);
 } catch {
-  pnpApi = {resolveVirtual: () => null};
 }
 
 function getVirtualLookupFn(pnpApi) {
@@ -74,27 +73,39 @@ function getVirtualLookupFn(pnpApi) {
   };
 }
 
-const resolveVirtualAliases = getVirtualLookupFn(pnpApi);
+if (pnpApi != null) {
+  const resolveVirtualAliases = getVirtualLookupFn(pnpApi);
 
-module.exports = class FsePnp {
-  constructor(p) {
-    this.normalizedPath = path.resolve(p);
-    this.resolvedPath = pnpApi.resolveVirtual(this.normalizedPath) || this.normalizedPath;
-  }
-
-  transpose(p) {
-    if (this.resolvedPath !== null) {
-      return this.normalizedPath + p.substr(this.resolvedPath.length);
-    } else {
-      return p;
+  module.exports = class FsePnp {
+    constructor(p) {
+      this.normalizedPath = path.resolve(p);
+      this.resolvedPath = pnpApi.resolveVirtual(this.normalizedPath) || this.normalizedPath;
     }
-  }
 
-  wrap(fn) {
-    return (path, ...args) => {
-      for (const entry of resolveVirtualAliases(path)) {
-        fn(this.transpose(entry), ...args);
+    transpose(p) {
+      if (this.resolvedPath !== null) {
+        return this.normalizedPath + p.substr(this.resolvedPath.length);
+      } else {
+        return p;
       }
-    };
-  }
-};
+    }
+
+    wrap(fn) {
+      return (path, ...args) => {
+        for (const entry of resolveVirtualAliases(path)) {
+          fn(this.transpose(entry), ...args);
+        }
+      };
+    }
+  };
+} else {
+  module.exports = class FsePnp {
+    constructor(p) {
+      this.resolvedPath = p;
+    }
+
+    wrap(fn) {
+      return fn;
+    }
+  };
+}

.yarn/cache/fsevents-patch-43d7acab0c-26277607d2.zip renamed to .yarn/cache/fsevents-patch-fd7e8c5233-d8ae862048.zip

@@ -2,7 +2,7 @@ let patch: string;
 
 export function getPatch() {
   if (typeof patch === `undefined`)
-    patch = require(`zlib`).brotliDecompressSync(Buffer.from(`G0wbUZRQERSAzgPbmPrQIqiTaRlz5YXjmukksNmGP9AMngyrbWruXia27zxI1E8rw5gxdwhJacVO+pZO9yyTypJBvuvY3BcAptB/GhkCb5laDoUE6fHx+/b+tGhQIC3C4dzeaZz9y/60WmZnX0gvEodLaRabE+ljo0SEjFAxJo+h1u2uFREQEDHd/v+MC1Wz2dzcTaYlOk5fZu9HQ4fRQPcXMBVr71mQfc7MwEFLqVqk5hYpM/ZYtaei1lJqsQfkiIytppRT6YWxUSytC0AoPmJp2XjnUghDI0+f8m7uunDJ3fRjrv0Q7wPOVg2rz4i7FY6PTYx5Hc3q3OpsJkGD17CovJsD5T1oR5lmQm3//zfCyFZsuHnawT1w6yTaPJf4WQu/scG6XRvR9LrLl/89cVzVCBiH4zszipj5/OKrhHmnr85fxFK+M5/x9lPHGUiawqgB3MOqmz4TCYGMJ0LmN4iKqfJi0+ucl/Q7AZTnzIvV3TTJ+0BybNVRksUPg8LTewYBqwfD/MkX8sACmjoYvyqQDeRRuKM/WMuFpOYSwYsm4ogUXAWGBI5ZM/Ye1DvWYhmrEv7LW2dFf8SiGsTpbu3Myq/36XPD0BE+9D6iZ6eKbKdlu16xFy6lBfV6pMWa/Bakzoc227xfTGkhfjCCXvhVh/wr9pwJCczAaf7/BkGzs+2ZtLC4GeCxTs89IiuEmVkXL7j9zqn606WCXwqmVV1d1J6jZeHMqqJxaOKWiFvoJOKPyOmCQLLkd6SX5kxabNQ23XOQsm7UP3gEszU1olUoj05id9yyyVB3/xcZXlDkMceLtBDsmTfyDcZyc6yswUwHDyjLjcD+Iv1GkADBj4rxUaQ+FRU/E/+O6hjqIovuvZUfL8LfVsIsJAEoA81gGLYW0oiPMqXfjbVnjLeWr+Vva1s7wbod5uNvMIrjOV0Lxuw6Os4L8SgrJgaGQnsK8R7m3DUIvI4oTX2EcKSLrKTE+sG3PNCebwtDIvICQOWJrli42+1r/gq9mtbdBSzWUD3LEhuhbTmegqrYqEjhm5LHuNatGSGaFPq1rLccQowXJOAZxzNNoXHe5jLlwX353V1ZP0+Tj6BUMLBK6v19gCTx5lfSgorUMAPkT1543M8EU8oKt2wg7vSLHlBlWzHJoIXHhNZAPPfFQpOGshmmSRZxY1jbBiwHc6iGQOFXubW21ihl+r1RsKr+B4F6dReiJb1qrrv/1cnhoK7UU5HkRlcyy/KHrhjCLorMAOO1LrWENG3MBxzhFuvrGhTHMK77Hg197vcaA2Z2ykjZgjQa/5dl6NamrkLCgToN+bfH4C5yMZmKwd5bvQzPTxsZDjAALRYCI0PR8bnATdhdaiUpu8DXsB0sNiS/l3VMS8FAR55hS9NNbcG/nOaCqKQgRMoQhA0dgx8jXjltiayEPh8n5pCUWgZjtka+dVCyqUeN69CWn8rCL9ZVZpeOzOzCc84befTKkPUDD5Y1qiegvh4H+euKn3gQokhn1SOmDOP+TxA5DvOePczU/PfSsNFa4p6Za10jTJp6O8TN3YbC7hdqHOq2gy5Ss3WEAsxVQTzHFDG/K/VUETI+4MqHmNm9Z01Naesx3aS7r3XuRxh6yl98AZygCM2YyHExaCEMq3zThcXrsf2F9lGaEQNBwa5A4j00QnbQK4N4raSsoUe1FthzTiTsXUPgRLlShAZVqTdRB0VLqtg/XhHYxSTAFEC372V9KciPxJE36IshXNcZgMWMYwD7lSArbSlLvwtmIMEn4UH6cGqL0/Miw69rmM4maPO6/KRHQ/M4trONqfR79mz+rp7+t72zggb47zv8vxUA2OUF`, `base64`)).toString();
+    patch = require(`zlib`).brotliDecompressSync(Buffer.from(`G8AcICwLeENqnk8o74LOyiZCqCn+nfkoHoOW2Wy/ZaLbawoJug0vEah6g6y0zM2VGKAGUXjpuyyX/35emYdTZ6IKvYYekxabWJ1MJUiPj18N39noRCXSRrg4d2/37WX2X0qjlXq3R++KiYujNAsyg/RYlEBIhMIYluF015kiMUIInfP/zLRSUC4vdAA5Hz54RWXtId4PIrS/APSpqXY7WSjFrGFx1NpG7a1wkmKkqQ3t1AEgHU4ayRIZccu55KrViKVdWamBsYZElYvL+xzjdHr7IAf3XDhHh294rE87BITNRj4i4r7zsis3y1dyzswVF4ICvCQhRQ44dvdWLhSmQW3++3Oy8IrUcOu0vcNk1UWyjgI/icHvNAC6WXkq6MXNs3+eOK1pkhb7wwvev2j5JPssZR293ExF+QYuwPyu/EKKFKCQkbYH1NZ9GlJ+DieCJ+8PFYF8renTSEr6GSJZTtzYrUIgN44cG5WnWJphIHh8mD5A6UGvfPC8RxSgpYPus/yoHw+idviDBeCWy+hxN5v2A2dDSuiz+tpLphJ01JO3IduKMVtNfr1qq/BLCqkP59S+vFP/Cof0sWbqkffhPFcl4SLIxWq1qFcKYDKzclwBBzVFiPWC7LlvMk9m8xGjaQ2R2P+BZR3anFJoyXATv0PvZnP/tioMsJJFC7f5gI9Fmy4U/LRUVo3N/OxY2a6kykxjwVvchhI5t5BdDPjYONcUTtkrzMtXFhSASbtzx7uIxYfhvs4/3mW6hKqwLBaipralUhPdfo5h4SiOic7o+oOUwl5/Aff6cyh3wEeDB4tVA79bq29MEeRfTV+Oe3fr/UhZQtkY0iE8vqSle2b58SXY0mkGmBiRjoPIkAFs1OSlJ3nSz9raEeB1ZWvJ2xiclGu1xTT6NRw3NaHU0k4R+4t0SIlltXJAW4kHj92+lB7TLjIWZfWfBNncDSYqP8jmg+jV7VyIgy/uk09ipbLdLM6Xr76rabkrZyQ3Qk8S71SEqlWRxEjWsKaELHnDeAxqaYrL0ITQr2S9xbXg0rnId4wtsQgZw21lye/up1/dTfXT+MkD5AP0i4YCh99d1V3sdxTAEDlI0nFBTjPoJwJnctqtFkgcP+Xakk36SgMSHuOZh/KUlex2NIizXmbBwicMK9s1LK6dQOqBuFZlX9lanWTwnVGuVvr3olrdhlClWC3T7S9NdfVsaYZKBDfYEZnTL7pZcKnE60KSutBZSaSgM+0BQbg1+qJHaVwb0X2Dhv70O7k7ALDJiNiA7GdsX1Ygf4ktBZv66did31wGeUm5JBJLemdjZHRa2YATgMFlye4t0hcz9ha4eXoVOc2EXHVqDdjeItztOwm7tBzcHR8Mwwb/HqtC/VKZC0IiH8TE/FE7x9SHWGUnTUNEBlucGudFTKYYlQaIjoANOgXsGLVtemCeplca3Wv1CMijvkZXTiUd8KmEZ2z6frw/kpo7gG/nDo2VkG6e+veL+scVhKDSObOXKcdtw+/Wbbw269oDLe5BLyqsR9VTc631RKspQYcCMx9M2xRKn7uZog504EXqMOPmUCHwW0yqiHxxoN+sMqYhjo/A8r4KAJ9TX7siey+38u6rhHYtDIMBKBk/lewEzgzDqFxxnqmvRK+XjeObr1axojyQobCerDLaHtzU1fwLHasuURSspKMhvR6QpWketRn2MJqMRLU0DQC0YCVLT+qeCS1LaZKQsQ0ZS1I1rKPmRjp7QQ2YDzdwpIHdTmPuBEIyIgXXiUQ/w6ZcFj4AA2ozg5zYaI5+3zGniD4ABtHXjuwGdRlRW6dngE5mECYu/0QnYwo5I6Z3KfM7BmZ/l4//i25lwXry79v/jxsAaMAc`, `base64`)).toString();
 
   return patch;
 }

.yarn/versions/c87cff1d.yml

@@ -12636,20 +12636,20 @@ fsevents@^1.2.7:
 
 "fsevents@patch:fsevents@^1.2.7#builtin<compat/fsevents>":
   version: 1.2.7
-  resolution: "fsevents@patch:fsevents@npm%3A1.2.7#builtin<compat/fsevents>::version=1.2.7&hash=9a3812"
+  resolution: "fsevents@patch:fsevents@npm%3A1.2.7#builtin<compat/fsevents>::version=1.2.7&hash=87eb42"
   dependencies:
     nan: ^2.9.2
     node-pre-gyp: ^0.10.0
-  checksum: a5e86a41b3c0d94f70783600bcf5f5c358b73036d5dcbc3c50521bcc5298cfd88e48103d05200544961f751d1356b0f8b7f59bdb00300fa0566ac99ace72d1da
+  checksum: 82ff6a255f36c3ed41e02aef0a99c996914c16514c15b881bca62fa4f236cafaceb5850c8b21a387ed93719fae9d706aca5287416aadcabfae06cc810f3e3d5e
   languageName: node
   linkType: hard
 
 "fsevents@patch:fsevents@^2.1.2#builtin<compat/fsevents>, fsevents@patch:fsevents@~2.1.2#builtin<compat/fsevents>":
   version: 2.1.3
-  resolution: "fsevents@patch:fsevents@npm%3A2.1.3#builtin<compat/fsevents>::version=2.1.3&hash=9a3812"
+  resolution: "fsevents@patch:fsevents@npm%3A2.1.3#builtin<compat/fsevents>::version=2.1.3&hash=87eb42"
   dependencies:
     node-gyp: latest
-  checksum: 26277607d28562cf1bf99aa16944520b5d06db8e2181337a7ec23d4332c3b0045565a83914d8cd17b8063d32fccc67919a1313ff216132c454843ba3ebd75f5f
+  checksum: d8ae862048fc127cdbd00d02b2feb7c25946c3ce4cbc44e958134be87e239577a16dafafa1c270d010b8624e1b1e0372e23f7865c55c6f83e83fc9f68b0a30d2
   languageName: node
   linkType: hard