diff --git a/.pnp.cjs b/.pnp.cjs
index c7280a95029e..9b30c6899f72 100755
--- a/.pnp.cjs
+++ b/.pnp.cjs
@@ -285,7 +285,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["jest-junit", "npm:10.0.0"],
             ["micromatch", "npm:4.0.2"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "linkType": "SOFT",
         }]
@@ -8746,7 +8746,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["regexpp", "npm:3.1.0"],
             ["semver", "npm:7.3.5"],
             ["tsutils", "virtual:f9757ae319815ac0f58d42cf0a9c6d8c36be107ea9d2a7c2404a1a7ed67a935a83935258cd26663439e607a4f7f3b48b0bf3ac24d96805420bec678b31011fdd#npm:3.21.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/eslint",
@@ -8896,7 +8896,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@typescript-eslint/typescript-estree", "virtual:e284df35cb54dbfcce36759498ed7ad082403dc825086cd5446a08b29d71ed1215922139a42316fa9353bee746689d467f5ab3f50890a5572764bdcc83192b8e#npm:4.26.1"],
             ["debug", "virtual:5dffae5dceca8d383e37ce1404983ff3eaf566153fb551aede58a16b625356caee63d9240a4386c2b8b44a2ff32b72c5d4444045ea31775b520ccbc9788f7985#npm:4.3.2"],
             ["eslint", "npm:6.8.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/eslint",
@@ -9001,7 +9001,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["is-glob", "npm:4.0.1"],
             ["semver", "npm:7.3.5"],
             ["tsutils", "virtual:f9757ae319815ac0f58d42cf0a9c6d8c36be107ea9d2a7c2404a1a7ed67a935a83935258cd26663439e607a4f7f3b48b0bf3ac24d96805420bec678b31011fdd#npm:3.21.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "typescript"
@@ -9479,7 +9479,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["terser-webpack-plugin", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.4"],
             ["ts-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:7.0.5"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"],
             ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.38.1"],
             ["webpack-merge", "npm:4.2.2"]
@@ -9520,7 +9520,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["terser-webpack-plugin", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.4"],
             ["ts-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:7.0.5"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"],
             ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.38.1"],
             ["webpack-merge", "npm:4.2.2"]
@@ -9561,7 +9561,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["terser-webpack-plugin", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.4"],
             ["ts-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:7.0.5"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"],
             ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.38.1"],
             ["webpack-merge", "npm:4.2.2"]
@@ -9601,7 +9601,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["terser-webpack-plugin", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.4"],
             ["ts-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:7.0.5"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"],
             ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.38.1"],
             ["webpack-merge", "npm:4.2.2"]
@@ -9648,7 +9648,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["semver", "npm:7.3.5"],
             ["tslib", "npm:1.13.0"],
             ["typanion", "npm:3.3.2"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["yup", "npm:0.32.9"]
           ],
           "packagePeers": [
@@ -9695,7 +9695,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["semver", "npm:7.3.5"],
             ["tslib", "npm:1.13.0"],
             ["typanion", "npm:3.3.2"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["yup", "npm:0.32.9"]
           ],
           "packagePeers": [
@@ -9742,7 +9742,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["semver", "npm:7.3.5"],
             ["tslib", "npm:1.13.0"],
             ["typanion", "npm:3.3.2"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["yup", "npm:0.32.9"]
           ],
           "packagePeers": [
@@ -9789,7 +9789,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["semver", "npm:7.3.5"],
             ["tslib", "npm:1.13.0"],
             ["typanion", "npm:3.3.2"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["yup", "npm:0.32.9"]
           ],
           "packagePeers": [
@@ -9836,7 +9836,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["semver", "npm:7.3.5"],
             ["tslib", "npm:1.13.0"],
             ["typanion", "npm:3.3.2"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["yup", "npm:0.32.9"]
           ],
           "packagePeers": [
@@ -9883,7 +9883,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["semver", "npm:7.3.5"],
             ["tslib", "npm:1.13.0"],
             ["typanion", "npm:3.3.2"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["yup", "npm:0.32.9"]
           ],
           "packagePeers": [
@@ -9930,7 +9930,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["semver", "npm:7.3.5"],
             ["tslib", "npm:1.13.0"],
             ["typanion", "npm:3.3.2"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["yup", "npm:0.32.9"]
           ],
           "packagePeers": [
@@ -9977,7 +9977,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["semver", "npm:7.3.5"],
             ["tslib", "npm:1.13.0"],
             ["typanion", "npm:3.3.2"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["yup", "npm:0.32.9"]
           ],
           "packagePeers": [
@@ -10024,7 +10024,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["semver", "npm:7.3.5"],
             ["tslib", "npm:1.13.0"],
             ["typanion", "npm:3.3.2"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["yup", "npm:0.32.9"]
           ],
           "packagePeers": [
@@ -10071,7 +10071,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["semver", "npm:7.3.5"],
             ["tslib", "npm:1.13.0"],
             ["typanion", "npm:3.3.2"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["yup", "npm:0.32.9"]
           ],
           "packagePeers": [
@@ -10118,7 +10118,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["semver", "npm:7.3.5"],
             ["tslib", "npm:1.13.0"],
             ["typanion", "npm:3.3.2"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["yup", "npm:0.32.9"]
           ],
           "packagePeers": [
@@ -10165,7 +10165,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["semver", "npm:7.3.5"],
             ["tslib", "npm:1.13.0"],
             ["typanion", "npm:3.3.2"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["yup", "npm:0.32.9"]
           ],
           "packagePeers": [
@@ -10211,7 +10211,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["semver", "npm:7.3.5"],
             ["tslib", "npm:1.13.0"],
             ["typanion", "npm:3.3.2"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["yup", "npm:0.32.9"]
           ],
           "linkType": "SOFT",
@@ -10293,7 +10293,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["micromatch", "npm:4.0.2"],
             ["p-limit", "npm:2.2.0"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "linkType": "SOFT",
         }]
@@ -10344,7 +10344,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["eslint", "npm:6.8.0"],
             ["eslint-plugin-arca", "npm:0.10.0"],
             ["eslint-plugin-react", "virtual:4b728ee22ccd3ae66b83e3be6d39acfb5b7a775112cc78b6b4322feb849fcfe6e39510452356cb4477dc6089bee57db31d02bbfb03b9fc8e914effa16a4145be#npm:7.24.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/eslint",
@@ -10467,7 +10467,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["typedoc", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:0.17.0-3"],
             ["typedoc-neo-theme", "npm:1.0.7"],
             ["typedoc-plugin-yarn", "portal:./typedoc-plugin-yarn::locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["unescape-html", "npm:1.1.0"],
             ["unfetch", "npm:4.1.0"],
             ["unified", "npm:7.1.0"],
@@ -10570,7 +10570,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["jest-junit", "npm:10.0.0"],
             ["micromatch", "npm:4.0.2"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "linkType": "SOFT",
         }]
@@ -10959,7 +10959,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["node-emoji", "npm:1.10.0"],
             ["tau-prolog", "npm:0.2.66"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "linkType": "SOFT",
         }]
@@ -11717,7 +11717,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/core", "workspace:packages/yarnpkg-core"],
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "linkType": "SOFT",
         }]
@@ -12166,7 +12166,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["react", "npm:16.13.1"],
             ["semver", "npm:7.3.5"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "linkType": "SOFT",
         }]
@@ -14451,7 +14451,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],
             ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/yarnpkg__cli",
@@ -14473,7 +14473,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],
             ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/yarnpkg__cli",
@@ -14495,7 +14495,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],
             ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/yarnpkg__cli",
@@ -14517,7 +14517,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],
             ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/yarnpkg__cli",
@@ -14539,7 +14539,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],
             ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/yarnpkg__cli",
@@ -14561,7 +14561,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],
             ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/yarnpkg__cli",
@@ -14583,7 +14583,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],
             ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/yarnpkg__cli",
@@ -14605,7 +14605,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],
             ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/yarnpkg__cli",
@@ -14627,7 +14627,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],
             ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/yarnpkg__cli",
@@ -14649,7 +14649,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],
             ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/yarnpkg__cli",
@@ -14671,7 +14671,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],
             ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/yarnpkg__cli",
@@ -14693,7 +14693,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],
             ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/yarnpkg__cli",
@@ -14715,7 +14715,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],
             ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/yarnpkg__cli",
@@ -14735,7 +14735,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],
             ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "linkType": "SOFT",
         }]
@@ -14755,7 +14755,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["algoliasearch", "npm:4.2.0"],
             ["semver", "npm:7.3.5"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "linkType": "SOFT",
         }]
@@ -14780,7 +14780,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["react", "npm:16.13.1"],
             ["semver", "npm:7.3.5"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "linkType": "SOFT",
         }]
@@ -14800,7 +14800,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["p-limit", "npm:2.2.0"],
             ["tslib", "npm:1.13.0"],
             ["typanion", "npm:3.3.2"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "linkType": "SOFT",
         }]
@@ -14817,7 +14817,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/monorepo", "workspace:."],
             ["resolve.exports", "npm:1.0.2"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["webpack", "virtual:16110bda3ce959c103b1979c5d750ceb8ac9cfbd2049c118b6278e46e65aa65fd17e71e04a0ce5f75b7ca3203efd8e9c9b03c948a76c7f4bca807539915b5cfc#npm:5.38.1"],
             ["webpack-cli", "virtual:16110bda3ce959c103b1979c5d750ceb8ac9cfbd2049c118b6278e46e65aa65fd17e71e04a0ce5f75b7ca3203efd8e9c9b03c948a76c7f4bca807539915b5cfc#npm:4.0.0-beta.8"]
           ],
@@ -22388,7 +22388,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["schema-utils", "npm:1.0.0"],
             ["semver", "npm:5.7.1"],
             ["tapable", "npm:1.1.3"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["vue-template-compiler", null],
             ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.38.1"]
           ],
@@ -29449,7 +29449,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["react-dom", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:16.13.1"],
             ["react-lifecycles-compat", "npm:3.0.4"],
             ["shallowequal", "npm:1.1.0"],
-            ["typescript", "patch:typescript@npm%3A3.9.5#~builtin<compat/typescript>::version=3.9.5&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A3.9.5#~builtin<compat/typescript>::version=3.9.5&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/react-dom",
@@ -37962,7 +37962,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["loader-utils", "npm:1.4.0"],
             ["micromatch", "npm:4.0.2"],
             ["semver", "npm:6.3.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/typescript",
@@ -38092,7 +38092,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["tsutils", "virtual:f9757ae319815ac0f58d42cf0a9c6d8c36be107ea9d2a7c2404a1a7ed67a935a83935258cd26663439e607a4f7f3b48b0bf3ac24d96805420bec678b31011fdd#npm:3.21.0"],
             ["@types/typescript", null],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@types/typescript",
@@ -38331,7 +38331,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["typedoc-default-themes", "npm:0.8.0-0"],
             ["typedoc-neo-theme", "npm:1.0.7"],
             ["typedoc-plugin-yarn", "portal:./typedoc-plugin-yarn::locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "packagePeers": [
             "@strictsoftware/typedoc-plugin-monorepo",
@@ -38360,7 +38360,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["typedoc-default-themes", "npm:0.8.0-0"],
             ["typedoc-neo-theme", null],
             ["typedoc-plugin-yarn", "portal:./typedoc-plugin-yarn::locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"],
-            ["typescript", "patch:typescript@npm%3A3.9.5#~builtin<compat/typescript>::version=3.9.5&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A3.9.5#~builtin<compat/typescript>::version=3.9.5&hash=beae0b"]
           ],
           "packagePeers": [
             "@strictsoftware/typedoc-plugin-monorepo",
@@ -38388,7 +38388,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["typedoc-default-themes", "npm:0.7.2"],
             ["typedoc-neo-theme", "npm:1.0.7"],
             ["typedoc-plugin-yarn", null],
-            ["typescript", "patch:typescript@npm%3A3.7.5#~builtin<compat/typescript>::version=3.7.5&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A3.7.5#~builtin<compat/typescript>::version=3.7.5&hash=beae0b"]
           ],
           "packagePeers": [
             "@strictsoftware/typedoc-plugin-monorepo",
@@ -38438,30 +38438,30 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "packageDependencies": [
             ["typedoc-plugin-yarn", "portal:./typedoc-plugin-yarn::locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"],
             ["typedoc", "virtual:258c95d7dd1da51c9c624f238593e0bc1c34b7bd8de0b85fefd9552f2220a4555cad458eb72d96f0c7b341784726b6a8e9c8b4e838a9d27aac3796b29de01981#npm:0.17.0-3"],
-            ["typescript", "patch:typescript@npm%3A3.9.5#~builtin<compat/typescript>::version=3.9.5&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A3.9.5#~builtin<compat/typescript>::version=3.9.5&hash=beae0b"]
           ],
           "linkType": "SOFT",
         }]
       ]],
       ["typescript", [
-        ["patch:typescript@npm%3A3.7.5#~builtin<compat/typescript>::version=3.7.5&hash=c34a14", {
-          "packageLocation": "./.yarn/cache/typescript-patch-7fa5ed0439-6a82cb02b2.zip/node_modules/typescript/",
+        ["patch:typescript@npm%3A3.7.5#~builtin<compat/typescript>::version=3.7.5&hash=beae0b", {
+          "packageLocation": "./.yarn/cache/typescript-patch-a334cf3604-6a82cb02b2.zip/node_modules/typescript/",
           "packageDependencies": [
-            ["typescript", "patch:typescript@npm%3A3.7.5#~builtin<compat/typescript>::version=3.7.5&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A3.7.5#~builtin<compat/typescript>::version=3.7.5&hash=beae0b"]
           ],
           "linkType": "HARD",
         }],
-        ["patch:typescript@npm%3A3.9.5#~builtin<compat/typescript>::version=3.9.5&hash=c34a14", {
-          "packageLocation": "./.yarn/cache/typescript-patch-c8b799f2cb-bfea14f536.zip/node_modules/typescript/",
+        ["patch:typescript@npm%3A3.9.5#~builtin<compat/typescript>::version=3.9.5&hash=beae0b", {
+          "packageLocation": "./.yarn/cache/typescript-patch-5a769afab2-bfea14f536.zip/node_modules/typescript/",
           "packageDependencies": [
-            ["typescript", "patch:typescript@npm%3A3.9.5#~builtin<compat/typescript>::version=3.9.5&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A3.9.5#~builtin<compat/typescript>::version=3.9.5&hash=beae0b"]
           ],
           "linkType": "HARD",
         }],
-        ["patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14", {
-          "packageLocation": "./.yarn/cache/typescript-patch-0de759e23a-9067b747c2.zip/node_modules/typescript/",
+        ["patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b", {
+          "packageLocation": "./.yarn/cache/typescript-patch-d0adf3c1b9-c7dfa42499.zip/node_modules/typescript/",
           "packageDependencies": [
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"]
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"]
           ],
           "linkType": "HARD",
         }]
@@ -39459,7 +39459,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/pnpify", "workspace:packages/yarnpkg-pnpify"],
             ["ts-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:7.0.5"],
             ["tslib", "npm:1.13.0"],
-            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"],
+            ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"],
             ["vsce", "npm:1.85.1"],
             ["webpack", "virtual:4bb0e72ae00ec402a28e80560124ee13357b1a5221665b7175877ddc6b8b2b98eebe4584a111245801ecf7cecb9de577d076505c0dbcf9292aaff35440a2302f#npm:5.38.1"],
             ["webpack-cli", "virtual:4bb0e72ae00ec402a28e80560124ee13357b1a5221665b7175877ddc6b8b2b98eebe4584a111245801ecf7cecb9de577d076505c0dbcf9292aaff35440a2302f#npm:4.0.0-beta.8"]
diff --git a/.yarn/cache/typescript-patch-c8b799f2cb-bfea14f536.zip b/.yarn/cache/typescript-patch-5a769afab2-bfea14f536.zip
similarity index 100%
rename from .yarn/cache/typescript-patch-c8b799f2cb-bfea14f536.zip
rename to .yarn/cache/typescript-patch-5a769afab2-bfea14f536.zip
diff --git a/.yarn/cache/typescript-patch-7fa5ed0439-6a82cb02b2.zip b/.yarn/cache/typescript-patch-a334cf3604-6a82cb02b2.zip
similarity index 100%
rename from .yarn/cache/typescript-patch-7fa5ed0439-6a82cb02b2.zip
rename to .yarn/cache/typescript-patch-a334cf3604-6a82cb02b2.zip
diff --git a/.yarn/cache/typescript-patch-0de759e23a-9067b747c2.zip b/.yarn/cache/typescript-patch-d0adf3c1b9-c7dfa42499.zip
similarity index 82%
rename from .yarn/cache/typescript-patch-0de759e23a-9067b747c2.zip
rename to .yarn/cache/typescript-patch-d0adf3c1b9-c7dfa42499.zip
index 9214cbea75d3..c1a5f0d123f6 100644
Binary files a/.yarn/cache/typescript-patch-0de759e23a-9067b747c2.zip and b/.yarn/cache/typescript-patch-d0adf3c1b9-c7dfa42499.zip differ
diff --git a/packages/plugin-compat/extra/typescript/gen-typescript-patch.js b/packages/plugin-compat/extra/typescript/gen-typescript-patch.js
index e36624135dec..bb6d3f796ec4 100644
--- a/packages/plugin-compat/extra/typescript/gen-typescript-patch.js
+++ b/packages/plugin-compat/extra/typescript/gen-typescript-patch.js
@@ -60,21 +60,21 @@ const SLICES = [
   // https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.2
   {
     from: `8e0e8703b9c95013aec7819e4593d099cdf7763a`,
-    to: `d1cd11e8d50d3bab758cc898b46867171c5e33ed`,
+    to: `545d5a8c5409dac447a668d4e7d315702fd115d6`,
     onto: `bfc55b5762443c37ecdef08a3b5a4e057b4d1e85`,
     range: `>=4.2 <4.3`,
   },
   // https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.3
   {
     from: `530aad19e4ac19d35cb6b200168c91ce86cb0050`,
-    to: `8f569da31e6ea242a4bc9cf18f841ad0c122893c`,
+    to: `6d7d4d2ce0df8e65a2c86a20c014c053ef530ea3`,
     onto: `28e3e6ff2f49f1dbf06d31809ec73dbe42f1aa63`,
     range: `>=4.3 <4.4`,
   },
   // https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.4
   {
     from: `0fc83b4d571df33a3c40c20c0eba68965fb52aca`,
-    to: `3f4e1516e0a956e1e0d46d9caf2a1f896fb77aaa`,
+    to: `10a61d069439e79c07890b519caf2cb7f3b6abdf`,
     onto: `55dd850009603aafa6ef8cc88020fa30d217d5b6`,
     range: `>=4.4`,
   },
diff --git a/packages/plugin-compat/extra/typescript/patch-77b8c8e98784f95863d191b15ecdac90.diff b/packages/plugin-compat/extra/typescript/patch-237f109a166d02eca3ed935b5b77dc3a.diff
similarity index 96%
rename from packages/plugin-compat/extra/typescript/patch-77b8c8e98784f95863d191b15ecdac90.diff
rename to packages/plugin-compat/extra/typescript/patch-237f109a166d02eca3ed935b5b77dc3a.diff
index 11d24a3dfe41..4f17c5427a6f 100644
--- a/packages/plugin-compat/extra/typescript/patch-77b8c8e98784f95863d191b15ecdac90.diff
+++ b/packages/plugin-compat/extra/typescript/patch-237f109a166d02eca3ed935b5b77dc3a.diff
@@ -1,5 +1,5 @@
 diff --git a/lib/tsc.js b/lib/tsc.js
-index 7f46cc9d8..32af802d1 100644
+index 7f46cc9d8..7cbce60e4 100644
 semver exclusivity >=4.2 <4.3
 --- a/lib/tsc.js
 +++ b/lib/tsc.js
@@ -181,13 +181,14 @@ semver exclusivity >=4.2 <4.3
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      function updateSharedExtendedConfigFileWatcher(projectPath, parsed, extendedConfigFilesMap, createExtendedConfigFileWatch, toPath) {
          var _a;
-@@ -91848,6 +91940,25 @@ var ts;
+@@ -91848,6 +91940,26 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                if (locator !== null) {
 +                    var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/");
@@ -207,7 +208,7 @@ semver exclusivity >=4.2 <4.3
              if (!parts) {
                  return undefined;
              }
-@@ -91875,14 +91986,18 @@ var ts;
+@@ -91875,14 +91987,18 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -233,7 +234,7 @@ semver exclusivity >=4.2 <4.3
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -92596,6 +92711,10 @@ var ts;
+@@ -92596,6 +92712,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -244,7 +245,7 @@ semver exclusivity >=4.2 <4.3
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          var getNewSourceFile = compilerHost.getSourceFile;
-@@ -92664,6 +92783,10 @@ var ts;
+@@ -92664,6 +92784,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -255,7 +256,7 @@ semver exclusivity >=4.2 <4.3
              if (extendedConfigFilesMap) {
                  ts.clearMap(extendedConfigFilesMap, ts.closeFileWatcher);
                  extendedConfigFilesMap = undefined;
-@@ -92683,7 +92806,8 @@ var ts;
+@@ -92683,7 +92807,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -265,7 +266,7 @@ semver exclusivity >=4.2 <4.3
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -92693,7 +92817,7 @@ var ts;
+@@ -92693,7 +92818,7 @@ var ts;
                      resolutionCache.clear();
                  }
              }
@@ -274,7 +275,7 @@ semver exclusivity >=4.2 <4.3
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(undefined, undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -92869,6 +92993,12 @@ var ts;
+@@ -92869,6 +92994,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -287,7 +288,7 @@ semver exclusivity >=4.2 <4.3
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -92884,6 +93014,10 @@ var ts;
+@@ -92884,6 +93015,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
@@ -299,7 +300,7 @@ semver exclusivity >=4.2 <4.3
                      ts.perfLogger.logStartUpdateProgram("SynchronizeProgram");
                      synchronizeProgram();
 diff --git a/lib/tsserver.js b/lib/tsserver.js
-index a1d0a7a17..e142cf0ca 100644
+index a1d0a7a17..d91fc7268 100644
 semver exclusivity >=4.2 <4.3
 --- a/lib/tsserver.js
 +++ b/lib/tsserver.js
@@ -500,13 +501,14 @@ semver exclusivity >=4.2 <4.3
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      /**
       * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project
-@@ -111679,6 +111786,29 @@ var ts;
+@@ -111679,6 +111786,30 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                // eslint-disable-next-line no-null/no-null
 +                if (locator !== null) {
@@ -530,7 +532,7 @@ semver exclusivity >=4.2 <4.3
              if (!parts) {
                  return undefined;
              }
-@@ -111709,18 +111839,24 @@ var ts;
+@@ -111709,18 +111840,24 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -564,7 +566,7 @@ semver exclusivity >=4.2 <4.3
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -112500,6 +112636,10 @@ var ts;
+@@ -112500,6 +112637,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -575,7 +577,7 @@ semver exclusivity >=4.2 <4.3
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          // Members for CompilerHost
-@@ -112575,6 +112715,10 @@ var ts;
+@@ -112575,6 +112716,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -586,7 +588,7 @@ semver exclusivity >=4.2 <4.3
              if (extendedConfigFilesMap) {
                  ts.clearMap(extendedConfigFilesMap, ts.closeFileWatcher);
                  extendedConfigFilesMap = undefined;
-@@ -112594,7 +112738,8 @@ var ts;
+@@ -112594,7 +112739,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -596,7 +598,7 @@ semver exclusivity >=4.2 <4.3
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -112605,7 +112750,7 @@ var ts;
+@@ -112605,7 +112751,7 @@ var ts;
                  }
              }
              // All resolutions are invalid if user provided resolutions
@@ -605,7 +607,7 @@ semver exclusivity >=4.2 <4.3
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -112803,6 +112948,12 @@ var ts;
+@@ -112803,6 +112949,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -618,7 +620,7 @@ semver exclusivity >=4.2 <4.3
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -112818,6 +112969,10 @@ var ts;
+@@ -112818,6 +112970,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
@@ -629,7 +631,7 @@ semver exclusivity >=4.2 <4.3
                  default:
                      ts.perfLogger.logStartUpdateProgram("SynchronizeProgram");
                      synchronizeProgram();
-@@ -119254,6 +119409,7 @@ var ts;
+@@ -119254,6 +119410,7 @@ var ts;
               *          This includes all files that are found in node_modules/moduleName/ with acceptable file extensions
               */
              function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) {
@@ -637,7 +639,7 @@ semver exclusivity >=4.2 <4.3
                  var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths;
                  var result = [];
                  var extensionOptions = getExtensionOptions(compilerOptions);
-@@ -119266,8 +119422,8 @@ var ts;
+@@ -119266,8 +119423,8 @@ var ts;
                      }
                  }
                  var fragmentDirectory = getFragmentDirectory(fragment);
@@ -648,7 +650,7 @@ semver exclusivity >=4.2 <4.3
                      result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                  }
                  getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result);
-@@ -119282,18 +119438,36 @@ var ts;
+@@ -119282,18 +119439,36 @@ var ts;
                                  result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                              }
                          };
@@ -692,7 +694,7 @@ semver exclusivity >=4.2 <4.3
                      }
                  }
                  return result;
-@@ -119394,6 +119568,7 @@ var ts;
+@@ -119394,6 +119569,7 @@ var ts;
                  return addReplacementSpans(toComplete, range.pos + prefix.length, names);
              }
              function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) {
@@ -700,7 +702,7 @@ semver exclusivity >=4.2 <4.3
                  if (result === void 0) { result = []; }
                  // Check for typings specified in compiler options
                  var seen = new ts.Map();
-@@ -119402,11 +119577,19 @@ var ts;
+@@ -119402,11 +119578,19 @@ var ts;
                      var root = typeRoots_1[_i];
                      getCompletionEntriesFromDirectories(root);
                  }
@@ -725,7 +727,7 @@ semver exclusivity >=4.2 <4.3
                  }
                  return result;
                  function getCompletionEntriesFromDirectories(directory) {
-@@ -138639,11 +138822,27 @@ var ts;
+@@ -138639,11 +138823,27 @@ var ts;
                      isImportablePath(from.fileName, toPath, getCanonicalFileName, globalTypingsCache);
              });
          }
@@ -754,7 +756,7 @@ semver exclusivity >=4.2 <4.3
              // If it's in a `node_modules` but is not reachable from here via a global import, don't bother.
              var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; });
              var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules));
-@@ -138651,6 +138850,26 @@ var ts;
+@@ -138651,6 +138851,26 @@ var ts;
                  || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent)
                  || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent));
          }
@@ -781,7 +783,7 @@ semver exclusivity >=4.2 <4.3
          function moduleSymbolToValidIdentifier(moduleSymbol, target) {
              return moduleSpecifierToValidIdentifier(ts.removeFileExtension(ts.stripQuotes(moduleSymbol.name)), target);
          }
-@@ -146377,9 +146596,9 @@ var ts;
+@@ -146377,9 +146597,9 @@ var ts;
                  if (isTopLevelDeclarationStatement(statement) &&
                      !isExported(sourceFile, statement, useEs6Exports) &&
                      forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.checkDefined(d.symbol)); })) {
@@ -794,7 +796,7 @@ semver exclusivity >=4.2 <4.3
                  }
                  return statement;
              });
-@@ -154903,6 +155122,39 @@ var ts;
+@@ -154903,6 +155123,40 @@ var ts;
                  return this.projectReferences;
              };
              ConfiguredProject.prototype.updateReferences = function (refs) {
@@ -815,14 +817,15 @@ semver exclusivity >=4.2 <4.3
 +                    // user-provided references in our references by directly querying
 +                    // the PnP API. This way users don't have to know the virtual paths,
 +                    // but we still support them just fine even through references.
-+                    var pnpApi_1 = require("pnpapi");
 +                    var basePath_1 = this.getCurrentDirectory();
++                    var findPnpApi_1 = require("module").findPnpApi;
 +                    var getPnpPath_1 = function (path) {
 +                        try {
-+                            var targetLocator = pnpApi_1.findPackageLocator(path + "/");
-+                            var packageLocation = pnpApi_1.getPackageInformation(targetLocator).packageLocation;
++                            var pnpApi = findPnpApi_1(path + "/");
++                            var targetLocator = pnpApi.findPackageLocator(path + "/");
++                            var packageLocation = pnpApi.getPackageInformation(targetLocator).packageLocation;
 +                            var request = ts.combinePaths(targetLocator.name, ts.getRelativePathFromDirectory(packageLocation, path, false));
-+                            return pnpApi_1.resolveToUnqualified(request, basePath_1 + "/");
++                            return pnpApi.resolveToUnqualified(request, basePath_1 + "/");
 +                        }
 +                        catch (_a) {
 +                            // something went wrong with the resolution, try not to fail
@@ -834,7 +837,7 @@ semver exclusivity >=4.2 <4.3
                  this.projectReferences = refs;
                  this.potentialProjectReferences = undefined;
              };
-@@ -155532,6 +155784,7 @@ var ts;
+@@ -155532,6 +155786,7 @@ var ts;
                          watchDirectory: ts.returnNoopFileWatcher,
                      } :
                      ts.getWatchFactory(this.host, watchLogLevel, log, getDetailWatchInfo);
@@ -842,7 +845,7 @@ semver exclusivity >=4.2 <4.3
              }
              ProjectService.prototype.toPath = function (fileName) {
                  return ts.toPath(fileName, this.currentDirectory, this.toCanonicalFileName);
-@@ -157270,7 +157523,7 @@ var ts;
+@@ -157270,7 +157525,7 @@ var ts;
              };
              ProjectService.prototype.setHostConfiguration = function (args) {
                  var _this = this;
@@ -851,7 +854,7 @@ semver exclusivity >=4.2 <4.3
                  if (args.file) {
                      var info = this.getScriptInfoForNormalizedPath(server.toNormalizedPath(args.file));
                      if (info) {
-@@ -157288,7 +157541,7 @@ var ts;
+@@ -157288,7 +157543,7 @@ var ts;
                          this.logger.info("Format host information updated");
                      }
                      if (args.preferences) {
@@ -860,7 +863,7 @@ semver exclusivity >=4.2 <4.3
                          this.hostConfiguration.preferences = __assign(__assign({}, this.hostConfiguration.preferences), args.preferences);
                          if (lazyConfiguredProjectsFromExternalProject && !this.hostConfiguration.preferences.lazyConfiguredProjectsFromExternalProject) {
                              // Load configured projects for external projects that are pending reload
-@@ -157314,6 +157567,8 @@ var ts;
+@@ -157314,6 +157569,8 @@ var ts;
                      if (args.watchOptions) {
                          this.hostConfiguration.watchOptions = (_a = convertWatchOptions(args.watchOptions)) === null || _a === void 0 ? void 0 : _a.watchOptions;
                          this.logger.info("Host watch options changed to " + JSON.stringify(this.hostConfiguration.watchOptions) + ", it will be take effect for next watches.");
@@ -869,7 +872,7 @@ semver exclusivity >=4.2 <4.3
                      }
                  }
              };
-@@ -158293,6 +158548,25 @@ var ts;
+@@ -158293,6 +158550,26 @@ var ts;
                  });
              };
              /*@internal*/
@@ -878,7 +881,8 @@ semver exclusivity >=4.2 <4.3
 +                if (typeof process.versions.pnp === "undefined") {
 +                    return;
 +                }
-+                var pnpFileName = require.resolve("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpFileName = findPnpApi(__filename).resolveRequest('pnpapi', null);
 +                return this.watchFactory.watchFile(pnpFileName, function () {
 +                    _this.forEachProject(function (project) {
 +                        for (var _i = 0, _a = project.getScriptInfos(); _i < _a.length; _i++) {
@@ -895,22 +899,24 @@ semver exclusivity >=4.2 <4.3
              ProjectService.prototype.watchPackageJsonFile = function (path) {
                  var _this = this;
                  var watchers = this.packageJsonFilesMap || (this.packageJsonFilesMap = new ts.Map());
-@@ -163000,6 +163274,9 @@ var ts;
+@@ -163000,6 +163277,10 @@ var ts;
                          }
                          try {
                              var args = [ts.combinePaths(__dirname, "watchGuard.js"), path];
 +                            if (typeof process.versions.pnp !== "undefined") {
-+                                args.unshift('-r', require.resolve('pnpapi'));
++                                var findPnpApi = require("module").findPnpApi;
++                                args.unshift('-r', findPnpApi(__filename).resolveRequest('pnpapi', null));
 +                            }
                              if (logger.hasLevel(server.LogLevel.verbose)) {
                                  logger.info("Starting " + process.execPath + " with args:" + server.stringifyIndented(args));
                              }
-@@ -163329,6 +163606,9 @@ var ts;
+@@ -163329,6 +163610,10 @@ var ts;
                              break;
                          }
                      }
 +                    if (typeof process.versions.pnp !== "undefined") {
-+                        execArgv.unshift('-r', require.resolve('pnpapi'));
++                        var findPnpApi = require("module").findPnpApi;
++                        execArgv.unshift('-r', findPnpApi(__filename).resolveRequest('pnpapi', null));
 +                    }
                      this.installer = childProcess.fork(ts.combinePaths(__dirname, "typingsInstaller.js"), args, { execArgv: execArgv });
                      this.installer.on("message", function (m) { return _this.handleMessage(m); });
@@ -929,7 +935,7 @@ semver exclusivity >=4.2 <4.3
       * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown.
       * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
 diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
-index e8537e466..b7dccf966 100644
+index e8537e466..a9b26d7bc 100644
 semver exclusivity >=4.2 <4.3
 --- a/lib/tsserverlibrary.js
 +++ b/lib/tsserverlibrary.js
@@ -1130,13 +1136,14 @@ semver exclusivity >=4.2 <4.3
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      /**
       * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project
-@@ -111873,6 +111980,29 @@ var ts;
+@@ -111873,6 +111980,30 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                // eslint-disable-next-line no-null/no-null
 +                if (locator !== null) {
@@ -1160,7 +1167,7 @@ semver exclusivity >=4.2 <4.3
              if (!parts) {
                  return undefined;
              }
-@@ -111903,18 +112033,24 @@ var ts;
+@@ -111903,18 +112034,24 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -1194,7 +1201,7 @@ semver exclusivity >=4.2 <4.3
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -112694,6 +112830,10 @@ var ts;
+@@ -112694,6 +112831,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -1205,7 +1212,7 @@ semver exclusivity >=4.2 <4.3
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          // Members for CompilerHost
-@@ -112769,6 +112909,10 @@ var ts;
+@@ -112769,6 +112910,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -1216,7 +1223,7 @@ semver exclusivity >=4.2 <4.3
              if (extendedConfigFilesMap) {
                  ts.clearMap(extendedConfigFilesMap, ts.closeFileWatcher);
                  extendedConfigFilesMap = undefined;
-@@ -112788,7 +112932,8 @@ var ts;
+@@ -112788,7 +112933,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -1226,7 +1233,7 @@ semver exclusivity >=4.2 <4.3
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -112799,7 +112944,7 @@ var ts;
+@@ -112799,7 +112945,7 @@ var ts;
                  }
              }
              // All resolutions are invalid if user provided resolutions
@@ -1235,7 +1242,7 @@ semver exclusivity >=4.2 <4.3
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -112997,6 +113142,12 @@ var ts;
+@@ -112997,6 +113143,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -1248,7 +1255,7 @@ semver exclusivity >=4.2 <4.3
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -113012,6 +113163,10 @@ var ts;
+@@ -113012,6 +113164,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
@@ -1259,7 +1266,7 @@ semver exclusivity >=4.2 <4.3
                  default:
                      ts.perfLogger.logStartUpdateProgram("SynchronizeProgram");
                      synchronizeProgram();
-@@ -119823,6 +119978,7 @@ var ts;
+@@ -119823,6 +119979,7 @@ var ts;
               *          This includes all files that are found in node_modules/moduleName/ with acceptable file extensions
               */
              function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) {
@@ -1267,7 +1274,7 @@ semver exclusivity >=4.2 <4.3
                  var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths;
                  var result = [];
                  var extensionOptions = getExtensionOptions(compilerOptions);
-@@ -119835,8 +119991,8 @@ var ts;
+@@ -119835,8 +119992,8 @@ var ts;
                      }
                  }
                  var fragmentDirectory = getFragmentDirectory(fragment);
@@ -1278,7 +1285,7 @@ semver exclusivity >=4.2 <4.3
                      result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                  }
                  getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result);
-@@ -119851,18 +120007,36 @@ var ts;
+@@ -119851,18 +120008,36 @@ var ts;
                                  result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                              }
                          };
@@ -1322,7 +1329,7 @@ semver exclusivity >=4.2 <4.3
                      }
                  }
                  return result;
-@@ -119963,6 +120137,7 @@ var ts;
+@@ -119963,6 +120138,7 @@ var ts;
                  return addReplacementSpans(toComplete, range.pos + prefix.length, names);
              }
              function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) {
@@ -1330,7 +1337,7 @@ semver exclusivity >=4.2 <4.3
                  if (result === void 0) { result = []; }
                  // Check for typings specified in compiler options
                  var seen = new ts.Map();
-@@ -119971,11 +120146,19 @@ var ts;
+@@ -119971,11 +120147,19 @@ var ts;
                      var root = typeRoots_1[_i];
                      getCompletionEntriesFromDirectories(root);
                  }
@@ -1355,7 +1362,7 @@ semver exclusivity >=4.2 <4.3
                  }
                  return result;
                  function getCompletionEntriesFromDirectories(directory) {
-@@ -139208,11 +139391,27 @@ var ts;
+@@ -139208,11 +139392,27 @@ var ts;
                      isImportablePath(from.fileName, toPath, getCanonicalFileName, globalTypingsCache);
              });
          }
@@ -1384,7 +1391,7 @@ semver exclusivity >=4.2 <4.3
              // If it's in a `node_modules` but is not reachable from here via a global import, don't bother.
              var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; });
              var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules));
-@@ -139220,6 +139419,26 @@ var ts;
+@@ -139220,6 +139420,26 @@ var ts;
                  || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent)
                  || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent));
          }
@@ -1411,7 +1418,7 @@ semver exclusivity >=4.2 <4.3
          function moduleSymbolToValidIdentifier(moduleSymbol, target) {
              return moduleSpecifierToValidIdentifier(ts.removeFileExtension(ts.stripQuotes(moduleSymbol.name)), target);
          }
-@@ -146946,9 +147165,9 @@ var ts;
+@@ -146946,9 +147166,9 @@ var ts;
                  if (isTopLevelDeclarationStatement(statement) &&
                      !isExported(sourceFile, statement, useEs6Exports) &&
                      forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.checkDefined(d.symbol)); })) {
@@ -1424,7 +1431,7 @@ semver exclusivity >=4.2 <4.3
                  }
                  return statement;
              });
-@@ -155097,6 +155316,39 @@ var ts;
+@@ -155097,6 +155317,40 @@ var ts;
                  return this.projectReferences;
              };
              ConfiguredProject.prototype.updateReferences = function (refs) {
@@ -1445,14 +1452,15 @@ semver exclusivity >=4.2 <4.3
 +                    // user-provided references in our references by directly querying
 +                    // the PnP API. This way users don't have to know the virtual paths,
 +                    // but we still support them just fine even through references.
-+                    var pnpApi_1 = require("pnpapi");
 +                    var basePath_1 = this.getCurrentDirectory();
++                    var findPnpApi_1 = require("module").findPnpApi;
 +                    var getPnpPath_1 = function (path) {
 +                        try {
-+                            var targetLocator = pnpApi_1.findPackageLocator(path + "/");
-+                            var packageLocation = pnpApi_1.getPackageInformation(targetLocator).packageLocation;
++                            var pnpApi = findPnpApi_1(path + "/");
++                            var targetLocator = pnpApi.findPackageLocator(path + "/");
++                            var packageLocation = pnpApi.getPackageInformation(targetLocator).packageLocation;
 +                            var request = ts.combinePaths(targetLocator.name, ts.getRelativePathFromDirectory(packageLocation, path, false));
-+                            return pnpApi_1.resolveToUnqualified(request, basePath_1 + "/");
++                            return pnpApi.resolveToUnqualified(request, basePath_1 + "/");
 +                        }
 +                        catch (_a) {
 +                            // something went wrong with the resolution, try not to fail
@@ -1464,7 +1472,7 @@ semver exclusivity >=4.2 <4.3
                  this.projectReferences = refs;
                  this.potentialProjectReferences = undefined;
              };
-@@ -155726,6 +155978,7 @@ var ts;
+@@ -155726,6 +155980,7 @@ var ts;
                          watchDirectory: ts.returnNoopFileWatcher,
                      } :
                      ts.getWatchFactory(this.host, watchLogLevel, log, getDetailWatchInfo);
@@ -1472,7 +1480,7 @@ semver exclusivity >=4.2 <4.3
              }
              ProjectService.prototype.toPath = function (fileName) {
                  return ts.toPath(fileName, this.currentDirectory, this.toCanonicalFileName);
-@@ -157464,7 +157717,7 @@ var ts;
+@@ -157464,7 +157719,7 @@ var ts;
              };
              ProjectService.prototype.setHostConfiguration = function (args) {
                  var _this = this;
@@ -1481,7 +1489,7 @@ semver exclusivity >=4.2 <4.3
                  if (args.file) {
                      var info = this.getScriptInfoForNormalizedPath(server.toNormalizedPath(args.file));
                      if (info) {
-@@ -157482,7 +157735,7 @@ var ts;
+@@ -157482,7 +157737,7 @@ var ts;
                          this.logger.info("Format host information updated");
                      }
                      if (args.preferences) {
@@ -1490,7 +1498,7 @@ semver exclusivity >=4.2 <4.3
                          this.hostConfiguration.preferences = __assign(__assign({}, this.hostConfiguration.preferences), args.preferences);
                          if (lazyConfiguredProjectsFromExternalProject && !this.hostConfiguration.preferences.lazyConfiguredProjectsFromExternalProject) {
                              // Load configured projects for external projects that are pending reload
-@@ -157508,6 +157761,8 @@ var ts;
+@@ -157508,6 +157763,8 @@ var ts;
                      if (args.watchOptions) {
                          this.hostConfiguration.watchOptions = (_a = convertWatchOptions(args.watchOptions)) === null || _a === void 0 ? void 0 : _a.watchOptions;
                          this.logger.info("Host watch options changed to " + JSON.stringify(this.hostConfiguration.watchOptions) + ", it will be take effect for next watches.");
@@ -1499,7 +1507,7 @@ semver exclusivity >=4.2 <4.3
                      }
                  }
              };
-@@ -158487,6 +158742,25 @@ var ts;
+@@ -158487,6 +158744,26 @@ var ts;
                  });
              };
              /*@internal*/
@@ -1508,7 +1516,8 @@ semver exclusivity >=4.2 <4.3
 +                if (typeof process.versions.pnp === "undefined") {
 +                    return;
 +                }
-+                var pnpFileName = require.resolve("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpFileName = findPnpApi(__filename).resolveRequest('pnpapi', null);
 +                return this.watchFactory.watchFile(pnpFileName, function () {
 +                    _this.forEachProject(function (project) {
 +                        for (var _i = 0, _a = project.getScriptInfos(); _i < _a.length; _i++) {
@@ -1539,7 +1548,7 @@ semver exclusivity >=4.2 <4.3
       * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown.
       * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
 diff --git a/lib/typescript.js b/lib/typescript.js
-index 8539f89fd..3687f96a2 100644
+index 8539f89fd..1a23b4f8d 100644
 semver exclusivity >=4.2 <4.3
 --- a/lib/typescript.js
 +++ b/lib/typescript.js
@@ -1740,13 +1749,14 @@ semver exclusivity >=4.2 <4.3
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      /**
       * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project
-@@ -111873,6 +111980,29 @@ var ts;
+@@ -111873,6 +111980,30 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                // eslint-disable-next-line no-null/no-null
 +                if (locator !== null) {
@@ -1770,7 +1780,7 @@ semver exclusivity >=4.2 <4.3
              if (!parts) {
                  return undefined;
              }
-@@ -111903,18 +112033,24 @@ var ts;
+@@ -111903,18 +112034,24 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -1804,7 +1814,7 @@ semver exclusivity >=4.2 <4.3
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -112694,6 +112830,10 @@ var ts;
+@@ -112694,6 +112831,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -1815,7 +1825,7 @@ semver exclusivity >=4.2 <4.3
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          // Members for CompilerHost
-@@ -112769,6 +112909,10 @@ var ts;
+@@ -112769,6 +112910,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -1826,7 +1836,7 @@ semver exclusivity >=4.2 <4.3
              if (extendedConfigFilesMap) {
                  ts.clearMap(extendedConfigFilesMap, ts.closeFileWatcher);
                  extendedConfigFilesMap = undefined;
-@@ -112788,7 +112932,8 @@ var ts;
+@@ -112788,7 +112933,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -1836,7 +1846,7 @@ semver exclusivity >=4.2 <4.3
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -112799,7 +112944,7 @@ var ts;
+@@ -112799,7 +112945,7 @@ var ts;
                  }
              }
              // All resolutions are invalid if user provided resolutions
@@ -1845,7 +1855,7 @@ semver exclusivity >=4.2 <4.3
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -112997,6 +113142,12 @@ var ts;
+@@ -112997,6 +113143,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -1858,7 +1868,7 @@ semver exclusivity >=4.2 <4.3
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -113012,6 +113163,10 @@ var ts;
+@@ -113012,6 +113164,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
@@ -1869,7 +1879,7 @@ semver exclusivity >=4.2 <4.3
                  default:
                      ts.perfLogger.logStartUpdateProgram("SynchronizeProgram");
                      synchronizeProgram();
-@@ -119823,6 +119978,7 @@ var ts;
+@@ -119823,6 +119979,7 @@ var ts;
               *          This includes all files that are found in node_modules/moduleName/ with acceptable file extensions
               */
              function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) {
@@ -1877,7 +1887,7 @@ semver exclusivity >=4.2 <4.3
                  var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths;
                  var result = [];
                  var extensionOptions = getExtensionOptions(compilerOptions);
-@@ -119835,8 +119991,8 @@ var ts;
+@@ -119835,8 +119992,8 @@ var ts;
                      }
                  }
                  var fragmentDirectory = getFragmentDirectory(fragment);
@@ -1888,7 +1898,7 @@ semver exclusivity >=4.2 <4.3
                      result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                  }
                  getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result);
-@@ -119851,18 +120007,36 @@ var ts;
+@@ -119851,18 +120008,36 @@ var ts;
                                  result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                              }
                          };
@@ -1932,7 +1942,7 @@ semver exclusivity >=4.2 <4.3
                      }
                  }
                  return result;
-@@ -119963,6 +120137,7 @@ var ts;
+@@ -119963,6 +120138,7 @@ var ts;
                  return addReplacementSpans(toComplete, range.pos + prefix.length, names);
              }
              function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) {
@@ -1940,7 +1950,7 @@ semver exclusivity >=4.2 <4.3
                  if (result === void 0) { result = []; }
                  // Check for typings specified in compiler options
                  var seen = new ts.Map();
-@@ -119971,11 +120146,19 @@ var ts;
+@@ -119971,11 +120147,19 @@ var ts;
                      var root = typeRoots_1[_i];
                      getCompletionEntriesFromDirectories(root);
                  }
@@ -1965,7 +1975,7 @@ semver exclusivity >=4.2 <4.3
                  }
                  return result;
                  function getCompletionEntriesFromDirectories(directory) {
-@@ -139208,11 +139391,27 @@ var ts;
+@@ -139208,11 +139392,27 @@ var ts;
                      isImportablePath(from.fileName, toPath, getCanonicalFileName, globalTypingsCache);
              });
          }
@@ -1994,7 +2004,7 @@ semver exclusivity >=4.2 <4.3
              // If it's in a `node_modules` but is not reachable from here via a global import, don't bother.
              var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; });
              var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules));
-@@ -139220,6 +139419,26 @@ var ts;
+@@ -139220,6 +139420,26 @@ var ts;
                  || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent)
                  || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent));
          }
@@ -2021,7 +2031,7 @@ semver exclusivity >=4.2 <4.3
          function moduleSymbolToValidIdentifier(moduleSymbol, target) {
              return moduleSpecifierToValidIdentifier(ts.removeFileExtension(ts.stripQuotes(moduleSymbol.name)), target);
          }
-@@ -146946,9 +147165,9 @@ var ts;
+@@ -146946,9 +147166,9 @@ var ts;
                  if (isTopLevelDeclarationStatement(statement) &&
                      !isExported(sourceFile, statement, useEs6Exports) &&
                      forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.checkDefined(d.symbol)); })) {
@@ -2048,7 +2058,7 @@ semver exclusivity >=4.2 <4.3
       * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown.
       * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
 diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
-index 6b08bfe23..94a0bc286 100644
+index 6b08bfe23..26108a400 100644
 semver exclusivity >=4.2 <4.3
 --- a/lib/typescriptServices.js
 +++ b/lib/typescriptServices.js
@@ -2249,13 +2259,14 @@ semver exclusivity >=4.2 <4.3
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      /**
       * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project
-@@ -111873,6 +111980,29 @@ var ts;
+@@ -111873,6 +111980,30 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                // eslint-disable-next-line no-null/no-null
 +                if (locator !== null) {
@@ -2279,7 +2290,7 @@ semver exclusivity >=4.2 <4.3
              if (!parts) {
                  return undefined;
              }
-@@ -111903,18 +112033,24 @@ var ts;
+@@ -111903,18 +112034,24 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -2313,7 +2324,7 @@ semver exclusivity >=4.2 <4.3
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -112694,6 +112830,10 @@ var ts;
+@@ -112694,6 +112831,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -2324,7 +2335,7 @@ semver exclusivity >=4.2 <4.3
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          // Members for CompilerHost
-@@ -112769,6 +112909,10 @@ var ts;
+@@ -112769,6 +112910,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -2335,7 +2346,7 @@ semver exclusivity >=4.2 <4.3
              if (extendedConfigFilesMap) {
                  ts.clearMap(extendedConfigFilesMap, ts.closeFileWatcher);
                  extendedConfigFilesMap = undefined;
-@@ -112788,7 +112932,8 @@ var ts;
+@@ -112788,7 +112933,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -2345,7 +2356,7 @@ semver exclusivity >=4.2 <4.3
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -112799,7 +112944,7 @@ var ts;
+@@ -112799,7 +112945,7 @@ var ts;
                  }
              }
              // All resolutions are invalid if user provided resolutions
@@ -2354,7 +2365,7 @@ semver exclusivity >=4.2 <4.3
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -112997,6 +113142,12 @@ var ts;
+@@ -112997,6 +113143,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -2367,7 +2378,7 @@ semver exclusivity >=4.2 <4.3
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -113012,6 +113163,10 @@ var ts;
+@@ -113012,6 +113164,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
@@ -2378,7 +2389,7 @@ semver exclusivity >=4.2 <4.3
                  default:
                      ts.perfLogger.logStartUpdateProgram("SynchronizeProgram");
                      synchronizeProgram();
-@@ -119823,6 +119978,7 @@ var ts;
+@@ -119823,6 +119979,7 @@ var ts;
               *          This includes all files that are found in node_modules/moduleName/ with acceptable file extensions
               */
              function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) {
@@ -2386,7 +2397,7 @@ semver exclusivity >=4.2 <4.3
                  var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths;
                  var result = [];
                  var extensionOptions = getExtensionOptions(compilerOptions);
-@@ -119835,8 +119991,8 @@ var ts;
+@@ -119835,8 +119992,8 @@ var ts;
                      }
                  }
                  var fragmentDirectory = getFragmentDirectory(fragment);
@@ -2397,7 +2408,7 @@ semver exclusivity >=4.2 <4.3
                      result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                  }
                  getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result);
-@@ -119851,18 +120007,36 @@ var ts;
+@@ -119851,18 +120008,36 @@ var ts;
                                  result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                              }
                          };
@@ -2441,7 +2452,7 @@ semver exclusivity >=4.2 <4.3
                      }
                  }
                  return result;
-@@ -119963,6 +120137,7 @@ var ts;
+@@ -119963,6 +120138,7 @@ var ts;
                  return addReplacementSpans(toComplete, range.pos + prefix.length, names);
              }
              function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) {
@@ -2449,7 +2460,7 @@ semver exclusivity >=4.2 <4.3
                  if (result === void 0) { result = []; }
                  // Check for typings specified in compiler options
                  var seen = new ts.Map();
-@@ -119971,11 +120146,19 @@ var ts;
+@@ -119971,11 +120147,19 @@ var ts;
                      var root = typeRoots_1[_i];
                      getCompletionEntriesFromDirectories(root);
                  }
@@ -2474,7 +2485,7 @@ semver exclusivity >=4.2 <4.3
                  }
                  return result;
                  function getCompletionEntriesFromDirectories(directory) {
-@@ -139208,11 +139391,27 @@ var ts;
+@@ -139208,11 +139392,27 @@ var ts;
                      isImportablePath(from.fileName, toPath, getCanonicalFileName, globalTypingsCache);
              });
          }
@@ -2503,7 +2514,7 @@ semver exclusivity >=4.2 <4.3
              // If it's in a `node_modules` but is not reachable from here via a global import, don't bother.
              var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; });
              var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules));
-@@ -139220,6 +139419,26 @@ var ts;
+@@ -139220,6 +139420,26 @@ var ts;
                  || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent)
                  || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent));
          }
@@ -2530,7 +2541,7 @@ semver exclusivity >=4.2 <4.3
          function moduleSymbolToValidIdentifier(moduleSymbol, target) {
              return moduleSpecifierToValidIdentifier(ts.removeFileExtension(ts.stripQuotes(moduleSymbol.name)), target);
          }
-@@ -146946,9 +147165,9 @@ var ts;
+@@ -146946,9 +147166,9 @@ var ts;
                  if (isTopLevelDeclarationStatement(statement) &&
                      !isExported(sourceFile, statement, useEs6Exports) &&
                      forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.checkDefined(d.symbol)); })) {
@@ -2544,7 +2555,7 @@ semver exclusivity >=4.2 <4.3
                  return statement;
              });
 diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
-index 9fa096358..24d7b79e6 100644
+index 9fa096358..79265c286 100644
 semver exclusivity >=4.2 <4.3
 --- a/lib/typingsInstaller.js
 +++ b/lib/typingsInstaller.js
@@ -2745,13 +2756,14 @@ semver exclusivity >=4.2 <4.3
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      /**
       * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project
-@@ -111668,6 +111775,29 @@ var ts;
+@@ -111668,6 +111775,30 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                // eslint-disable-next-line no-null/no-null
 +                if (locator !== null) {
@@ -2775,7 +2787,7 @@ semver exclusivity >=4.2 <4.3
              if (!parts) {
                  return undefined;
              }
-@@ -111698,18 +111828,24 @@ var ts;
+@@ -111698,18 +111829,24 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -2809,7 +2821,7 @@ semver exclusivity >=4.2 <4.3
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -112489,6 +112625,10 @@ var ts;
+@@ -112489,6 +112626,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -2820,7 +2832,7 @@ semver exclusivity >=4.2 <4.3
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          // Members for CompilerHost
-@@ -112564,6 +112704,10 @@ var ts;
+@@ -112564,6 +112705,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -2831,7 +2843,7 @@ semver exclusivity >=4.2 <4.3
              if (extendedConfigFilesMap) {
                  ts.clearMap(extendedConfigFilesMap, ts.closeFileWatcher);
                  extendedConfigFilesMap = undefined;
-@@ -112583,7 +112727,8 @@ var ts;
+@@ -112583,7 +112728,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -2841,7 +2853,7 @@ semver exclusivity >=4.2 <4.3
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -112594,7 +112739,7 @@ var ts;
+@@ -112594,7 +112740,7 @@ var ts;
                  }
              }
              // All resolutions are invalid if user provided resolutions
@@ -2850,7 +2862,7 @@ semver exclusivity >=4.2 <4.3
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -112792,6 +112937,12 @@ var ts;
+@@ -112792,6 +112938,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -2863,7 +2875,7 @@ semver exclusivity >=4.2 <4.3
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -112807,6 +112958,10 @@ var ts;
+@@ -112807,6 +112959,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
diff --git a/packages/plugin-compat/extra/typescript/patch-fbf15c2d88ea2252d5202b32d7396cbe.diff b/packages/plugin-compat/extra/typescript/patch-44ecdba2b3c1d56d858ed0b65eeb37ae.diff
similarity index 96%
rename from packages/plugin-compat/extra/typescript/patch-fbf15c2d88ea2252d5202b32d7396cbe.diff
rename to packages/plugin-compat/extra/typescript/patch-44ecdba2b3c1d56d858ed0b65eeb37ae.diff
index 2e7aab3db0cf..8557fab5b97c 100644
--- a/packages/plugin-compat/extra/typescript/patch-fbf15c2d88ea2252d5202b32d7396cbe.diff
+++ b/packages/plugin-compat/extra/typescript/patch-44ecdba2b3c1d56d858ed0b65eeb37ae.diff
@@ -1,5 +1,5 @@
 diff --git a/lib/tsc.js b/lib/tsc.js
-index 83f54758a..2fce19443 100644
+index 83f54758a..9e8a1c936 100644
 semver exclusivity >=4.3 <4.4
 --- a/lib/tsc.js
 +++ b/lib/tsc.js
@@ -181,13 +181,14 @@ semver exclusivity >=4.3 <4.4
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      function updateSharedExtendedConfigFileWatcher(projectPath, options, extendedConfigFilesMap, createExtendedConfigFileWatch, toPath) {
          var _a;
-@@ -94524,6 +94616,25 @@ var ts;
+@@ -94524,6 +94616,26 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                if (locator !== null) {
 +                    var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/");
@@ -207,7 +208,7 @@ semver exclusivity >=4.3 <4.4
              if (!parts) {
                  return undefined;
              }
-@@ -94551,14 +94662,18 @@ var ts;
+@@ -94551,14 +94663,18 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -233,7 +234,7 @@ semver exclusivity >=4.3 <4.4
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -95280,6 +95395,10 @@ var ts;
+@@ -95280,6 +95396,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -244,7 +245,7 @@ semver exclusivity >=4.3 <4.4
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          var getNewSourceFile = compilerHost.getSourceFile;
-@@ -95351,6 +95470,10 @@ var ts;
+@@ -95351,6 +95471,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -255,7 +256,7 @@ semver exclusivity >=4.3 <4.4
              extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear();
              extendedConfigCache = undefined;
              if (sharedExtendedConfigFileWatchers) {
-@@ -95383,7 +95506,8 @@ var ts;
+@@ -95383,7 +95507,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -265,7 +266,7 @@ semver exclusivity >=4.3 <4.4
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -95393,7 +95517,7 @@ var ts;
+@@ -95393,7 +95518,7 @@ var ts;
                      resolutionCache.clear();
                  }
              }
@@ -274,7 +275,7 @@ semver exclusivity >=4.3 <4.4
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(undefined, undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -95571,6 +95695,12 @@ var ts;
+@@ -95571,6 +95696,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -287,7 +288,7 @@ semver exclusivity >=4.3 <4.4
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -95586,6 +95716,10 @@ var ts;
+@@ -95586,6 +95717,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
@@ -299,7 +300,7 @@ semver exclusivity >=4.3 <4.4
                      ts.perfLogger.logStartUpdateProgram("SynchronizeProgram");
                      synchronizeProgram();
 diff --git a/lib/tsserver.js b/lib/tsserver.js
-index 58028943d..2dd0e1e8b 100644
+index 58028943d..54dee3ec2 100644
 semver exclusivity >=4.3 <4.4
 --- a/lib/tsserver.js
 +++ b/lib/tsserver.js
@@ -500,13 +501,14 @@ semver exclusivity >=4.3 <4.4
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      /**
       * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project
-@@ -114695,6 +114802,29 @@ var ts;
+@@ -114695,6 +114802,30 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                // eslint-disable-next-line no-null/no-null
 +                if (locator !== null) {
@@ -530,7 +532,7 @@ semver exclusivity >=4.3 <4.4
              if (!parts) {
                  return undefined;
              }
-@@ -114725,18 +114855,24 @@ var ts;
+@@ -114725,18 +114856,24 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -564,7 +566,7 @@ semver exclusivity >=4.3 <4.4
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -115524,6 +115660,10 @@ var ts;
+@@ -115524,6 +115661,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -575,7 +577,7 @@ semver exclusivity >=4.3 <4.4
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          // Members for CompilerHost
-@@ -115602,6 +115742,10 @@ var ts;
+@@ -115602,6 +115743,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -586,7 +588,7 @@ semver exclusivity >=4.3 <4.4
              extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear();
              extendedConfigCache = undefined;
              if (sharedExtendedConfigFileWatchers) {
-@@ -115634,7 +115778,8 @@ var ts;
+@@ -115634,7 +115779,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -596,7 +598,7 @@ semver exclusivity >=4.3 <4.4
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -115645,7 +115790,7 @@ var ts;
+@@ -115645,7 +115791,7 @@ var ts;
                  }
              }
              // All resolutions are invalid if user provided resolutions
@@ -605,7 +607,7 @@ semver exclusivity >=4.3 <4.4
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -115845,6 +115990,12 @@ var ts;
+@@ -115845,6 +115991,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -618,7 +620,7 @@ semver exclusivity >=4.3 <4.4
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -115860,6 +116011,10 @@ var ts;
+@@ -115860,6 +116012,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
@@ -629,7 +631,7 @@ semver exclusivity >=4.3 <4.4
                  default:
                      ts.perfLogger.logStartUpdateProgram("SynchronizeProgram");
                      synchronizeProgram();
-@@ -121132,11 +121287,27 @@ var ts;
+@@ -121132,11 +121288,27 @@ var ts;
          return hasImportablePath;
      }
      ts.isImportableFile = isImportableFile;
@@ -658,7 +660,7 @@ semver exclusivity >=4.3 <4.4
          // If it's in a `node_modules` but is not reachable from here via a global import, don't bother.
          var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; });
          var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules));
-@@ -121144,6 +121315,26 @@ var ts;
+@@ -121144,6 +121316,26 @@ var ts;
              || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent)
              || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent));
      }
@@ -685,7 +687,7 @@ semver exclusivity >=4.3 <4.4
      // #endregion
  })(ts || (ts = {}));
  var ts;
-@@ -122815,6 +123006,7 @@ var ts;
+@@ -122815,6 +123007,7 @@ var ts;
               *          This includes all files that are found in node_modules/moduleName/ with acceptable file extensions
               */
              function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) {
@@ -693,7 +695,7 @@ semver exclusivity >=4.3 <4.4
                  var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths;
                  var result = [];
                  var extensionOptions = getExtensionOptions(compilerOptions);
-@@ -122827,8 +123019,8 @@ var ts;
+@@ -122827,8 +123020,8 @@ var ts;
                      }
                  }
                  var fragmentDirectory = getFragmentDirectory(fragment);
@@ -704,7 +706,7 @@ semver exclusivity >=4.3 <4.4
                      result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                  }
                  getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result);
-@@ -122843,18 +123035,36 @@ var ts;
+@@ -122843,18 +123036,36 @@ var ts;
                                  result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                              }
                          };
@@ -748,7 +750,7 @@ semver exclusivity >=4.3 <4.4
                      }
                  }
                  return result;
-@@ -122955,6 +123165,7 @@ var ts;
+@@ -122955,6 +123166,7 @@ var ts;
                  return addReplacementSpans(toComplete, range.pos + prefix.length, names);
              }
              function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) {
@@ -756,7 +758,7 @@ semver exclusivity >=4.3 <4.4
                  if (result === void 0) { result = []; }
                  // Check for typings specified in compiler options
                  var seen = new ts.Map();
-@@ -122963,11 +123174,19 @@ var ts;
+@@ -122963,11 +123175,19 @@ var ts;
                      var root = typeRoots_1[_i];
                      getCompletionEntriesFromDirectories(root);
                  }
@@ -781,7 +783,7 @@ semver exclusivity >=4.3 <4.4
                  }
                  return result;
                  function getCompletionEntriesFromDirectories(directory) {
-@@ -150455,9 +150674,9 @@ var ts;
+@@ -150455,9 +150675,9 @@ var ts;
                  if (isTopLevelDeclarationStatement(statement) &&
                      !isExported(sourceFile, statement, useEs6Exports) &&
                      forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.checkDefined(d.symbol)); })) {
@@ -794,7 +796,7 @@ semver exclusivity >=4.3 <4.4
                  }
                  return statement;
              });
-@@ -159155,6 +159374,39 @@ var ts;
+@@ -159155,6 +159375,40 @@ var ts;
                  return this.projectReferences;
              };
              ConfiguredProject.prototype.updateReferences = function (refs) {
@@ -815,14 +817,15 @@ semver exclusivity >=4.3 <4.4
 +                    // user-provided references in our references by directly querying
 +                    // the PnP API. This way users don't have to know the virtual paths,
 +                    // but we still support them just fine even through references.
-+                    var pnpApi_1 = require("pnpapi");
 +                    var basePath_1 = this.getCurrentDirectory();
++                    var findPnpApi_1 = require("module").findPnpApi;
 +                    var getPnpPath_1 = function (path) {
 +                        try {
-+                            var targetLocator = pnpApi_1.findPackageLocator(path + "/");
-+                            var packageLocation = pnpApi_1.getPackageInformation(targetLocator).packageLocation;
++                            var pnpApi = findPnpApi_1(path + "/");
++                            var targetLocator = pnpApi.findPackageLocator(path + "/");
++                            var packageLocation = pnpApi.getPackageInformation(targetLocator).packageLocation;
 +                            var request = ts.combinePaths(targetLocator.name, ts.getRelativePathFromDirectory(packageLocation, path, false));
-+                            return pnpApi_1.resolveToUnqualified(request, basePath_1 + "/");
++                            return pnpApi.resolveToUnqualified(request, basePath_1 + "/");
 +                        }
 +                        catch (_a) {
 +                            // something went wrong with the resolution, try not to fail
@@ -834,7 +837,7 @@ semver exclusivity >=4.3 <4.4
                  this.projectReferences = refs;
                  this.potentialProjectReferences = undefined;
              };
-@@ -159762,6 +160014,7 @@ var ts;
+@@ -159762,6 +160016,7 @@ var ts;
                          watchDirectory: ts.returnNoopFileWatcher,
                      } :
                      ts.getWatchFactory(this.host, watchLogLevel, log, getDetailWatchInfo);
@@ -842,7 +845,7 @@ semver exclusivity >=4.3 <4.4
              }
              ProjectService.prototype.toPath = function (fileName) {
                  return ts.toPath(fileName, this.currentDirectory, this.toCanonicalFileName);
-@@ -161586,7 +161839,7 @@ var ts;
+@@ -161586,7 +161841,7 @@ var ts;
              };
              ProjectService.prototype.setHostConfiguration = function (args) {
                  var _this = this;
@@ -851,7 +854,7 @@ semver exclusivity >=4.3 <4.4
                  if (args.file) {
                      var info = this.getScriptInfoForNormalizedPath(server.toNormalizedPath(args.file));
                      if (info) {
-@@ -161604,7 +161857,7 @@ var ts;
+@@ -161604,7 +161859,7 @@ var ts;
                          this.logger.info("Format host information updated");
                      }
                      if (args.preferences) {
@@ -860,7 +863,7 @@ semver exclusivity >=4.3 <4.4
                          this.hostConfiguration.preferences = __assign(__assign({}, this.hostConfiguration.preferences), args.preferences);
                          if (lazyConfiguredProjectsFromExternalProject && !this.hostConfiguration.preferences.lazyConfiguredProjectsFromExternalProject) {
                              // Load configured projects for external projects that are pending reload
-@@ -161630,6 +161883,8 @@ var ts;
+@@ -161630,6 +161885,8 @@ var ts;
                      if (args.watchOptions) {
                          this.hostConfiguration.watchOptions = (_a = convertWatchOptions(args.watchOptions)) === null || _a === void 0 ? void 0 : _a.watchOptions;
                          this.logger.info("Host watch options changed to " + JSON.stringify(this.hostConfiguration.watchOptions) + ", it will be take effect for next watches.");
@@ -869,7 +872,7 @@ semver exclusivity >=4.3 <4.4
                      }
                  }
              };
-@@ -162607,6 +162862,25 @@ var ts;
+@@ -162607,6 +162864,26 @@ var ts;
                  });
              };
              /*@internal*/
@@ -878,7 +881,8 @@ semver exclusivity >=4.3 <4.4
 +                if (typeof process.versions.pnp === "undefined") {
 +                    return;
 +                }
-+                var pnpFileName = require.resolve("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpFileName = findPnpApi(__filename).resolveRequest('pnpapi', null);
 +                return this.watchFactory.watchFile(pnpFileName, function () {
 +                    _this.forEachProject(function (project) {
 +                        for (var _i = 0, _a = project.getScriptInfos(); _i < _a.length; _i++) {
@@ -895,22 +899,24 @@ semver exclusivity >=4.3 <4.4
              ProjectService.prototype.watchPackageJsonFile = function (path) {
                  var _this = this;
                  var watchers = this.packageJsonFilesMap || (this.packageJsonFilesMap = new ts.Map());
-@@ -167357,6 +167631,9 @@ var ts;
+@@ -167357,6 +167634,10 @@ var ts;
                          }
                          try {
                              var args = [ts.combinePaths(__dirname, "watchGuard.js"), path];
 +                            if (typeof process.versions.pnp !== "undefined") {
-+                                args.unshift('-r', require.resolve('pnpapi'));
++                                var findPnpApi = require("module").findPnpApi;
++                                args.unshift('-r', findPnpApi(__filename).resolveRequest('pnpapi', null));
 +                            }
                              if (logger.hasLevel(server.LogLevel.verbose)) {
                                  logger.info("Starting " + process.execPath + " with args:" + server.stringifyIndented(args));
                              }
-@@ -167617,6 +167894,9 @@ var ts;
+@@ -167617,6 +167898,10 @@ var ts;
                              break;
                          }
                      }
 +                    if (typeof process.versions.pnp !== "undefined") {
-+                        execArgv.unshift('-r', require.resolve('pnpapi'));
++                        var findPnpApi = require("module").findPnpApi;
++                        execArgv.unshift('-r', findPnpApi(__filename).resolveRequest('pnpapi', null));
 +                    }
                      this.installer = childProcess.fork(ts.combinePaths(__dirname, "typingsInstaller.js"), args, { execArgv: execArgv });
                      this.installer.on("message", function (m) { return _this.handleMessage(m); });
@@ -929,7 +935,7 @@ semver exclusivity >=4.3 <4.4
       * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown.
       * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
 diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
-index ee78ce982..a6637815c 100644
+index ee78ce982..a28cb6882 100644
 semver exclusivity >=4.3 <4.4
 --- a/lib/tsserverlibrary.js
 +++ b/lib/tsserverlibrary.js
@@ -1130,13 +1136,14 @@ semver exclusivity >=4.3 <4.4
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      /**
       * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project
-@@ -114889,6 +114996,29 @@ var ts;
+@@ -114889,6 +114996,30 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                // eslint-disable-next-line no-null/no-null
 +                if (locator !== null) {
@@ -1160,7 +1167,7 @@ semver exclusivity >=4.3 <4.4
              if (!parts) {
                  return undefined;
              }
-@@ -114919,18 +115049,24 @@ var ts;
+@@ -114919,18 +115050,24 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -1194,7 +1201,7 @@ semver exclusivity >=4.3 <4.4
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -115718,6 +115854,10 @@ var ts;
+@@ -115718,6 +115855,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -1205,7 +1212,7 @@ semver exclusivity >=4.3 <4.4
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          // Members for CompilerHost
-@@ -115796,6 +115936,10 @@ var ts;
+@@ -115796,6 +115937,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -1216,7 +1223,7 @@ semver exclusivity >=4.3 <4.4
              extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear();
              extendedConfigCache = undefined;
              if (sharedExtendedConfigFileWatchers) {
-@@ -115828,7 +115972,8 @@ var ts;
+@@ -115828,7 +115973,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -1226,7 +1233,7 @@ semver exclusivity >=4.3 <4.4
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -115839,7 +115984,7 @@ var ts;
+@@ -115839,7 +115985,7 @@ var ts;
                  }
              }
              // All resolutions are invalid if user provided resolutions
@@ -1235,7 +1242,7 @@ semver exclusivity >=4.3 <4.4
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -116039,6 +116184,12 @@ var ts;
+@@ -116039,6 +116185,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -1248,7 +1255,7 @@ semver exclusivity >=4.3 <4.4
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -116054,6 +116205,10 @@ var ts;
+@@ -116054,6 +116206,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
@@ -1259,7 +1266,7 @@ semver exclusivity >=4.3 <4.4
                  default:
                      ts.perfLogger.logStartUpdateProgram("SynchronizeProgram");
                      synchronizeProgram();
-@@ -121701,11 +121856,27 @@ var ts;
+@@ -121701,11 +121857,27 @@ var ts;
          return hasImportablePath;
      }
      ts.isImportableFile = isImportableFile;
@@ -1288,7 +1295,7 @@ semver exclusivity >=4.3 <4.4
          // If it's in a `node_modules` but is not reachable from here via a global import, don't bother.
          var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; });
          var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules));
-@@ -121713,6 +121884,26 @@ var ts;
+@@ -121713,6 +121885,26 @@ var ts;
              || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent)
              || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent));
      }
@@ -1315,7 +1322,7 @@ semver exclusivity >=4.3 <4.4
      // #endregion
  })(ts || (ts = {}));
  var ts;
-@@ -123384,6 +123575,7 @@ var ts;
+@@ -123384,6 +123576,7 @@ var ts;
               *          This includes all files that are found in node_modules/moduleName/ with acceptable file extensions
               */
              function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) {
@@ -1323,7 +1330,7 @@ semver exclusivity >=4.3 <4.4
                  var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths;
                  var result = [];
                  var extensionOptions = getExtensionOptions(compilerOptions);
-@@ -123396,8 +123588,8 @@ var ts;
+@@ -123396,8 +123589,8 @@ var ts;
                      }
                  }
                  var fragmentDirectory = getFragmentDirectory(fragment);
@@ -1334,7 +1341,7 @@ semver exclusivity >=4.3 <4.4
                      result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                  }
                  getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result);
-@@ -123412,18 +123604,36 @@ var ts;
+@@ -123412,18 +123605,36 @@ var ts;
                                  result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                              }
                          };
@@ -1378,7 +1385,7 @@ semver exclusivity >=4.3 <4.4
                      }
                  }
                  return result;
-@@ -123524,6 +123734,7 @@ var ts;
+@@ -123524,6 +123735,7 @@ var ts;
                  return addReplacementSpans(toComplete, range.pos + prefix.length, names);
              }
              function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) {
@@ -1386,7 +1393,7 @@ semver exclusivity >=4.3 <4.4
                  if (result === void 0) { result = []; }
                  // Check for typings specified in compiler options
                  var seen = new ts.Map();
-@@ -123532,11 +123743,19 @@ var ts;
+@@ -123532,11 +123744,19 @@ var ts;
                      var root = typeRoots_1[_i];
                      getCompletionEntriesFromDirectories(root);
                  }
@@ -1411,7 +1418,7 @@ semver exclusivity >=4.3 <4.4
                  }
                  return result;
                  function getCompletionEntriesFromDirectories(directory) {
-@@ -151024,9 +151243,9 @@ var ts;
+@@ -151024,9 +151244,9 @@ var ts;
                  if (isTopLevelDeclarationStatement(statement) &&
                      !isExported(sourceFile, statement, useEs6Exports) &&
                      forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.checkDefined(d.symbol)); })) {
@@ -1424,7 +1431,7 @@ semver exclusivity >=4.3 <4.4
                  }
                  return statement;
              });
-@@ -159349,6 +159568,39 @@ var ts;
+@@ -159349,6 +159569,40 @@ var ts;
                  return this.projectReferences;
              };
              ConfiguredProject.prototype.updateReferences = function (refs) {
@@ -1445,14 +1452,15 @@ semver exclusivity >=4.3 <4.4
 +                    // user-provided references in our references by directly querying
 +                    // the PnP API. This way users don't have to know the virtual paths,
 +                    // but we still support them just fine even through references.
-+                    var pnpApi_1 = require("pnpapi");
 +                    var basePath_1 = this.getCurrentDirectory();
++                    var findPnpApi_1 = require("module").findPnpApi;
 +                    var getPnpPath_1 = function (path) {
 +                        try {
-+                            var targetLocator = pnpApi_1.findPackageLocator(path + "/");
-+                            var packageLocation = pnpApi_1.getPackageInformation(targetLocator).packageLocation;
++                            var pnpApi = findPnpApi_1(path + "/");
++                            var targetLocator = pnpApi.findPackageLocator(path + "/");
++                            var packageLocation = pnpApi.getPackageInformation(targetLocator).packageLocation;
 +                            var request = ts.combinePaths(targetLocator.name, ts.getRelativePathFromDirectory(packageLocation, path, false));
-+                            return pnpApi_1.resolveToUnqualified(request, basePath_1 + "/");
++                            return pnpApi.resolveToUnqualified(request, basePath_1 + "/");
 +                        }
 +                        catch (_a) {
 +                            // something went wrong with the resolution, try not to fail
@@ -1464,7 +1472,7 @@ semver exclusivity >=4.3 <4.4
                  this.projectReferences = refs;
                  this.potentialProjectReferences = undefined;
              };
-@@ -159956,6 +160208,7 @@ var ts;
+@@ -159956,6 +160210,7 @@ var ts;
                          watchDirectory: ts.returnNoopFileWatcher,
                      } :
                      ts.getWatchFactory(this.host, watchLogLevel, log, getDetailWatchInfo);
@@ -1472,7 +1480,7 @@ semver exclusivity >=4.3 <4.4
              }
              ProjectService.prototype.toPath = function (fileName) {
                  return ts.toPath(fileName, this.currentDirectory, this.toCanonicalFileName);
-@@ -161780,7 +162033,7 @@ var ts;
+@@ -161780,7 +162035,7 @@ var ts;
              };
              ProjectService.prototype.setHostConfiguration = function (args) {
                  var _this = this;
@@ -1481,7 +1489,7 @@ semver exclusivity >=4.3 <4.4
                  if (args.file) {
                      var info = this.getScriptInfoForNormalizedPath(server.toNormalizedPath(args.file));
                      if (info) {
-@@ -161798,7 +162051,7 @@ var ts;
+@@ -161798,7 +162053,7 @@ var ts;
                          this.logger.info("Format host information updated");
                      }
                      if (args.preferences) {
@@ -1490,7 +1498,7 @@ semver exclusivity >=4.3 <4.4
                          this.hostConfiguration.preferences = __assign(__assign({}, this.hostConfiguration.preferences), args.preferences);
                          if (lazyConfiguredProjectsFromExternalProject && !this.hostConfiguration.preferences.lazyConfiguredProjectsFromExternalProject) {
                              // Load configured projects for external projects that are pending reload
-@@ -161824,6 +162077,8 @@ var ts;
+@@ -161824,6 +162079,8 @@ var ts;
                      if (args.watchOptions) {
                          this.hostConfiguration.watchOptions = (_a = convertWatchOptions(args.watchOptions)) === null || _a === void 0 ? void 0 : _a.watchOptions;
                          this.logger.info("Host watch options changed to " + JSON.stringify(this.hostConfiguration.watchOptions) + ", it will be take effect for next watches.");
@@ -1499,7 +1507,7 @@ semver exclusivity >=4.3 <4.4
                      }
                  }
              };
-@@ -162801,6 +163056,25 @@ var ts;
+@@ -162801,6 +163058,26 @@ var ts;
                  });
              };
              /*@internal*/
@@ -1508,7 +1516,8 @@ semver exclusivity >=4.3 <4.4
 +                if (typeof process.versions.pnp === "undefined") {
 +                    return;
 +                }
-+                var pnpFileName = require.resolve("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpFileName = findPnpApi(__filename).resolveRequest('pnpapi', null);
 +                return this.watchFactory.watchFile(pnpFileName, function () {
 +                    _this.forEachProject(function (project) {
 +                        for (var _i = 0, _a = project.getScriptInfos(); _i < _a.length; _i++) {
@@ -1539,7 +1548,7 @@ semver exclusivity >=4.3 <4.4
       * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown.
       * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
 diff --git a/lib/typescript.js b/lib/typescript.js
-index 615ad27f3..0cb122531 100644
+index 615ad27f3..2d8faf3fa 100644
 semver exclusivity >=4.3 <4.4
 --- a/lib/typescript.js
 +++ b/lib/typescript.js
@@ -1740,13 +1749,14 @@ semver exclusivity >=4.3 <4.4
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      /**
       * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project
-@@ -114889,6 +114996,29 @@ var ts;
+@@ -114889,6 +114996,30 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                // eslint-disable-next-line no-null/no-null
 +                if (locator !== null) {
@@ -1770,7 +1780,7 @@ semver exclusivity >=4.3 <4.4
              if (!parts) {
                  return undefined;
              }
-@@ -114919,18 +115049,24 @@ var ts;
+@@ -114919,18 +115050,24 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -1804,7 +1814,7 @@ semver exclusivity >=4.3 <4.4
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -115718,6 +115854,10 @@ var ts;
+@@ -115718,6 +115855,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -1815,7 +1825,7 @@ semver exclusivity >=4.3 <4.4
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          // Members for CompilerHost
-@@ -115796,6 +115936,10 @@ var ts;
+@@ -115796,6 +115937,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -1826,7 +1836,7 @@ semver exclusivity >=4.3 <4.4
              extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear();
              extendedConfigCache = undefined;
              if (sharedExtendedConfigFileWatchers) {
-@@ -115828,7 +115972,8 @@ var ts;
+@@ -115828,7 +115973,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -1836,7 +1846,7 @@ semver exclusivity >=4.3 <4.4
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -115839,7 +115984,7 @@ var ts;
+@@ -115839,7 +115985,7 @@ var ts;
                  }
              }
              // All resolutions are invalid if user provided resolutions
@@ -1845,7 +1855,7 @@ semver exclusivity >=4.3 <4.4
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -116039,6 +116184,12 @@ var ts;
+@@ -116039,6 +116185,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -1858,7 +1868,7 @@ semver exclusivity >=4.3 <4.4
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -116054,6 +116205,10 @@ var ts;
+@@ -116054,6 +116206,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
@@ -1869,7 +1879,7 @@ semver exclusivity >=4.3 <4.4
                  default:
                      ts.perfLogger.logStartUpdateProgram("SynchronizeProgram");
                      synchronizeProgram();
-@@ -121701,11 +121856,27 @@ var ts;
+@@ -121701,11 +121857,27 @@ var ts;
          return hasImportablePath;
      }
      ts.isImportableFile = isImportableFile;
@@ -1898,7 +1908,7 @@ semver exclusivity >=4.3 <4.4
          // If it's in a `node_modules` but is not reachable from here via a global import, don't bother.
          var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; });
          var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules));
-@@ -121713,6 +121884,26 @@ var ts;
+@@ -121713,6 +121885,26 @@ var ts;
              || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent)
              || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent));
      }
@@ -1925,7 +1935,7 @@ semver exclusivity >=4.3 <4.4
      // #endregion
  })(ts || (ts = {}));
  var ts;
-@@ -123384,6 +123575,7 @@ var ts;
+@@ -123384,6 +123576,7 @@ var ts;
               *          This includes all files that are found in node_modules/moduleName/ with acceptable file extensions
               */
              function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) {
@@ -1933,7 +1943,7 @@ semver exclusivity >=4.3 <4.4
                  var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths;
                  var result = [];
                  var extensionOptions = getExtensionOptions(compilerOptions);
-@@ -123396,8 +123588,8 @@ var ts;
+@@ -123396,8 +123589,8 @@ var ts;
                      }
                  }
                  var fragmentDirectory = getFragmentDirectory(fragment);
@@ -1944,7 +1954,7 @@ semver exclusivity >=4.3 <4.4
                      result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                  }
                  getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result);
-@@ -123412,18 +123604,36 @@ var ts;
+@@ -123412,18 +123605,36 @@ var ts;
                                  result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                              }
                          };
@@ -1988,7 +1998,7 @@ semver exclusivity >=4.3 <4.4
                      }
                  }
                  return result;
-@@ -123524,6 +123734,7 @@ var ts;
+@@ -123524,6 +123735,7 @@ var ts;
                  return addReplacementSpans(toComplete, range.pos + prefix.length, names);
              }
              function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) {
@@ -1996,7 +2006,7 @@ semver exclusivity >=4.3 <4.4
                  if (result === void 0) { result = []; }
                  // Check for typings specified in compiler options
                  var seen = new ts.Map();
-@@ -123532,11 +123743,19 @@ var ts;
+@@ -123532,11 +123744,19 @@ var ts;
                      var root = typeRoots_1[_i];
                      getCompletionEntriesFromDirectories(root);
                  }
@@ -2021,7 +2031,7 @@ semver exclusivity >=4.3 <4.4
                  }
                  return result;
                  function getCompletionEntriesFromDirectories(directory) {
-@@ -151024,9 +151243,9 @@ var ts;
+@@ -151024,9 +151244,9 @@ var ts;
                  if (isTopLevelDeclarationStatement(statement) &&
                      !isExported(sourceFile, statement, useEs6Exports) &&
                      forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.checkDefined(d.symbol)); })) {
@@ -2048,7 +2058,7 @@ semver exclusivity >=4.3 <4.4
       * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown.
       * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
 diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
-index 59f7d01b5..a80fd092e 100644
+index 59f7d01b5..2626ac05c 100644
 semver exclusivity >=4.3 <4.4
 --- a/lib/typescriptServices.js
 +++ b/lib/typescriptServices.js
@@ -2249,13 +2259,14 @@ semver exclusivity >=4.3 <4.4
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      /**
       * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project
-@@ -114889,6 +114996,29 @@ var ts;
+@@ -114889,6 +114996,30 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                // eslint-disable-next-line no-null/no-null
 +                if (locator !== null) {
@@ -2279,7 +2290,7 @@ semver exclusivity >=4.3 <4.4
              if (!parts) {
                  return undefined;
              }
-@@ -114919,18 +115049,24 @@ var ts;
+@@ -114919,18 +115050,24 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -2313,7 +2324,7 @@ semver exclusivity >=4.3 <4.4
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -115718,6 +115854,10 @@ var ts;
+@@ -115718,6 +115855,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -2324,7 +2335,7 @@ semver exclusivity >=4.3 <4.4
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          // Members for CompilerHost
-@@ -115796,6 +115936,10 @@ var ts;
+@@ -115796,6 +115937,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -2335,7 +2346,7 @@ semver exclusivity >=4.3 <4.4
              extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear();
              extendedConfigCache = undefined;
              if (sharedExtendedConfigFileWatchers) {
-@@ -115828,7 +115972,8 @@ var ts;
+@@ -115828,7 +115973,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -2345,7 +2356,7 @@ semver exclusivity >=4.3 <4.4
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -115839,7 +115984,7 @@ var ts;
+@@ -115839,7 +115985,7 @@ var ts;
                  }
              }
              // All resolutions are invalid if user provided resolutions
@@ -2354,7 +2365,7 @@ semver exclusivity >=4.3 <4.4
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -116039,6 +116184,12 @@ var ts;
+@@ -116039,6 +116185,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -2367,7 +2378,7 @@ semver exclusivity >=4.3 <4.4
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -116054,6 +116205,10 @@ var ts;
+@@ -116054,6 +116206,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
@@ -2378,7 +2389,7 @@ semver exclusivity >=4.3 <4.4
                  default:
                      ts.perfLogger.logStartUpdateProgram("SynchronizeProgram");
                      synchronizeProgram();
-@@ -121701,11 +121856,27 @@ var ts;
+@@ -121701,11 +121857,27 @@ var ts;
          return hasImportablePath;
      }
      ts.isImportableFile = isImportableFile;
@@ -2407,7 +2418,7 @@ semver exclusivity >=4.3 <4.4
          // If it's in a `node_modules` but is not reachable from here via a global import, don't bother.
          var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; });
          var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules));
-@@ -121713,6 +121884,26 @@ var ts;
+@@ -121713,6 +121885,26 @@ var ts;
              || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent)
              || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent));
      }
@@ -2434,7 +2445,7 @@ semver exclusivity >=4.3 <4.4
      // #endregion
  })(ts || (ts = {}));
  var ts;
-@@ -123384,6 +123575,7 @@ var ts;
+@@ -123384,6 +123576,7 @@ var ts;
               *          This includes all files that are found in node_modules/moduleName/ with acceptable file extensions
               */
              function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) {
@@ -2442,7 +2453,7 @@ semver exclusivity >=4.3 <4.4
                  var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths;
                  var result = [];
                  var extensionOptions = getExtensionOptions(compilerOptions);
-@@ -123396,8 +123588,8 @@ var ts;
+@@ -123396,8 +123589,8 @@ var ts;
                      }
                  }
                  var fragmentDirectory = getFragmentDirectory(fragment);
@@ -2453,7 +2464,7 @@ semver exclusivity >=4.3 <4.4
                      result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                  }
                  getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result);
-@@ -123412,18 +123604,36 @@ var ts;
+@@ -123412,18 +123605,36 @@ var ts;
                                  result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                              }
                          };
@@ -2497,7 +2508,7 @@ semver exclusivity >=4.3 <4.4
                      }
                  }
                  return result;
-@@ -123524,6 +123734,7 @@ var ts;
+@@ -123524,6 +123735,7 @@ var ts;
                  return addReplacementSpans(toComplete, range.pos + prefix.length, names);
              }
              function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) {
@@ -2505,7 +2516,7 @@ semver exclusivity >=4.3 <4.4
                  if (result === void 0) { result = []; }
                  // Check for typings specified in compiler options
                  var seen = new ts.Map();
-@@ -123532,11 +123743,19 @@ var ts;
+@@ -123532,11 +123744,19 @@ var ts;
                      var root = typeRoots_1[_i];
                      getCompletionEntriesFromDirectories(root);
                  }
@@ -2530,7 +2541,7 @@ semver exclusivity >=4.3 <4.4
                  }
                  return result;
                  function getCompletionEntriesFromDirectories(directory) {
-@@ -151024,9 +151243,9 @@ var ts;
+@@ -151024,9 +151244,9 @@ var ts;
                  if (isTopLevelDeclarationStatement(statement) &&
                      !isExported(sourceFile, statement, useEs6Exports) &&
                      forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.checkDefined(d.symbol)); })) {
@@ -2544,7 +2555,7 @@ semver exclusivity >=4.3 <4.4
                  return statement;
              });
 diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
-index 6810860b9..90b10123d 100644
+index 6810860b9..f2a0436f1 100644
 semver exclusivity >=4.3 <4.4
 --- a/lib/typingsInstaller.js
 +++ b/lib/typingsInstaller.js
@@ -2745,13 +2756,14 @@ semver exclusivity >=4.3 <4.4
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      /**
       * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project
-@@ -114684,6 +114791,29 @@ var ts;
+@@ -114684,6 +114791,30 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                // eslint-disable-next-line no-null/no-null
 +                if (locator !== null) {
@@ -2775,7 +2787,7 @@ semver exclusivity >=4.3 <4.4
              if (!parts) {
                  return undefined;
              }
-@@ -114714,18 +114844,24 @@ var ts;
+@@ -114714,18 +114845,24 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -2809,7 +2821,7 @@ semver exclusivity >=4.3 <4.4
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -115513,6 +115649,10 @@ var ts;
+@@ -115513,6 +115650,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -2820,7 +2832,7 @@ semver exclusivity >=4.3 <4.4
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          // Members for CompilerHost
-@@ -115591,6 +115731,10 @@ var ts;
+@@ -115591,6 +115732,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -2831,7 +2843,7 @@ semver exclusivity >=4.3 <4.4
              extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear();
              extendedConfigCache = undefined;
              if (sharedExtendedConfigFileWatchers) {
-@@ -115623,7 +115767,8 @@ var ts;
+@@ -115623,7 +115768,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -2841,7 +2853,7 @@ semver exclusivity >=4.3 <4.4
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -115634,7 +115779,7 @@ var ts;
+@@ -115634,7 +115780,7 @@ var ts;
                  }
              }
              // All resolutions are invalid if user provided resolutions
@@ -2850,7 +2862,7 @@ semver exclusivity >=4.3 <4.4
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -115834,6 +115979,12 @@ var ts;
+@@ -115834,6 +115980,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -2863,7 +2875,7 @@ semver exclusivity >=4.3 <4.4
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -115849,6 +116000,10 @@ var ts;
+@@ -115849,6 +116001,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
diff --git a/packages/plugin-compat/extra/typescript/patch-023d9d9ee3758d8e0037e22568aeb21e.diff b/packages/plugin-compat/extra/typescript/patch-4c1688ff6a2fa247d2e2e3d508cdab9d.diff
similarity index 96%
rename from packages/plugin-compat/extra/typescript/patch-023d9d9ee3758d8e0037e22568aeb21e.diff
rename to packages/plugin-compat/extra/typescript/patch-4c1688ff6a2fa247d2e2e3d508cdab9d.diff
index eb3d0c79a212..02d578040c1f 100644
--- a/packages/plugin-compat/extra/typescript/patch-023d9d9ee3758d8e0037e22568aeb21e.diff
+++ b/packages/plugin-compat/extra/typescript/patch-4c1688ff6a2fa247d2e2e3d508cdab9d.diff
@@ -1,5 +1,5 @@
 diff --git a/lib/tsc.js b/lib/tsc.js
-index 1b1811b4d..42c785d3d 100644
+index 1b1811b4d..32a67e3c7 100644
 semver exclusivity >=4.4
 --- a/lib/tsc.js
 +++ b/lib/tsc.js
@@ -181,13 +181,14 @@ semver exclusivity >=4.4
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      function updateSharedExtendedConfigFileWatcher(projectPath, options, extendedConfigFilesMap, createExtendedConfigFileWatch, toPath) {
          var _a;
-@@ -96667,6 +96759,25 @@ var ts;
+@@ -96667,6 +96759,26 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                if (locator !== null) {
 +                    var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/");
@@ -207,7 +208,7 @@ semver exclusivity >=4.4
              if (!parts) {
                  return undefined;
              }
-@@ -96694,14 +96805,18 @@ var ts;
+@@ -96694,14 +96806,18 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -233,7 +234,7 @@ semver exclusivity >=4.4
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -97429,6 +97544,10 @@ var ts;
+@@ -97429,6 +97545,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -244,7 +245,7 @@ semver exclusivity >=4.4
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          var getNewSourceFile = compilerHost.getSourceFile;
-@@ -97500,6 +97619,10 @@ var ts;
+@@ -97500,6 +97620,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -255,7 +256,7 @@ semver exclusivity >=4.4
              extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear();
              extendedConfigCache = undefined;
              if (sharedExtendedConfigFileWatchers) {
-@@ -97532,7 +97655,8 @@ var ts;
+@@ -97532,7 +97656,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -265,7 +266,7 @@ semver exclusivity >=4.4
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -97542,7 +97666,7 @@ var ts;
+@@ -97542,7 +97667,7 @@ var ts;
                      resolutionCache.clear();
                  }
              }
@@ -274,7 +275,7 @@ semver exclusivity >=4.4
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(undefined, undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -97726,6 +97850,12 @@ var ts;
+@@ -97726,6 +97851,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -287,7 +288,7 @@ semver exclusivity >=4.4
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -97741,6 +97871,10 @@ var ts;
+@@ -97741,6 +97872,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
@@ -299,7 +300,7 @@ semver exclusivity >=4.4
                      ts.perfLogger.logStartUpdateProgram("SynchronizeProgram");
                      synchronizeProgram();
 diff --git a/lib/tsserver.js b/lib/tsserver.js
-index ac49ace7b..d60ad05ba 100644
+index ac49ace7b..18aba7a22 100644
 semver exclusivity >=4.4
 --- a/lib/tsserver.js
 +++ b/lib/tsserver.js
@@ -500,13 +501,14 @@ semver exclusivity >=4.4
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      /**
       * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project
-@@ -117087,6 +117194,29 @@ var ts;
+@@ -117087,6 +117194,30 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                // eslint-disable-next-line no-null/no-null
 +                if (locator !== null) {
@@ -530,7 +532,7 @@ semver exclusivity >=4.4
              if (!parts) {
                  return undefined;
              }
-@@ -117117,18 +117247,24 @@ var ts;
+@@ -117117,18 +117248,24 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -564,7 +566,7 @@ semver exclusivity >=4.4
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -117922,6 +118058,10 @@ var ts;
+@@ -117922,6 +118059,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -575,7 +577,7 @@ semver exclusivity >=4.4
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          // Members for CompilerHost
-@@ -118000,6 +118140,10 @@ var ts;
+@@ -118000,6 +118141,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -586,7 +588,7 @@ semver exclusivity >=4.4
              extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear();
              extendedConfigCache = undefined;
              if (sharedExtendedConfigFileWatchers) {
-@@ -118032,7 +118176,8 @@ var ts;
+@@ -118032,7 +118177,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -596,7 +598,7 @@ semver exclusivity >=4.4
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -118043,7 +118188,7 @@ var ts;
+@@ -118043,7 +118189,7 @@ var ts;
                  }
              }
              // All resolutions are invalid if user provided resolutions
@@ -605,7 +607,7 @@ semver exclusivity >=4.4
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -118250,6 +118395,12 @@ var ts;
+@@ -118250,6 +118396,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -618,7 +620,7 @@ semver exclusivity >=4.4
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -118265,6 +118416,10 @@ var ts;
+@@ -118265,6 +118417,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
@@ -629,7 +631,7 @@ semver exclusivity >=4.4
                  default:
                      ts.perfLogger.logStartUpdateProgram("SynchronizeProgram");
                      synchronizeProgram();
-@@ -123686,7 +123841,7 @@ var ts;
+@@ -123686,7 +123842,7 @@ var ts;
       * Don't include something from a `node_modules` that isn't actually reachable by a global import.
       * A relative import to node_modules is usually a bad idea.
       */
@@ -638,7 +640,7 @@ semver exclusivity >=4.4
          // If it's in a `node_modules` but is not reachable from here via a global import, don't bother.
          var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; });
          var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules));
-@@ -123694,6 +123849,33 @@ var ts;
+@@ -123694,6 +123850,33 @@ var ts;
              || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent)
              || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent));
      }
@@ -672,7 +674,7 @@ semver exclusivity >=4.4
      function forEachExternalModuleToImportFrom(program, host, useAutoImportProvider, cb) {
          var _a, _b;
          forEachExternalModule(program.getTypeChecker(), program.getSourceFiles(), function (module, file) { return cb(module, file, program, /*isFromPackageJson*/ false); });
-@@ -125507,6 +125689,7 @@ var ts;
+@@ -125507,6 +125690,7 @@ var ts;
               *          This includes all files that are found in node_modules/moduleName/ with acceptable file extensions
               */
              function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) {
@@ -680,7 +682,7 @@ semver exclusivity >=4.4
                  var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths;
                  var result = [];
                  var extensionOptions = getExtensionOptions(compilerOptions);
-@@ -125519,8 +125702,8 @@ var ts;
+@@ -125519,8 +125703,8 @@ var ts;
                      }
                  }
                  var fragmentDirectory = getFragmentDirectory(fragment);
@@ -691,7 +693,7 @@ semver exclusivity >=4.4
                      result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                  }
                  getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result);
-@@ -125535,18 +125718,36 @@ var ts;
+@@ -125535,18 +125719,36 @@ var ts;
                                  result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                              }
                          };
@@ -735,7 +737,7 @@ semver exclusivity >=4.4
                      }
                  }
                  return result;
-@@ -125647,6 +125848,7 @@ var ts;
+@@ -125647,6 +125849,7 @@ var ts;
                  return addReplacementSpans(toComplete, range.pos + prefix.length, names);
              }
              function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) {
@@ -743,7 +745,7 @@ semver exclusivity >=4.4
                  if (result === void 0) { result = []; }
                  // Check for typings specified in compiler options
                  var seen = new ts.Map();
-@@ -125655,11 +125857,19 @@ var ts;
+@@ -125655,11 +125858,19 @@ var ts;
                      var root = typeRoots_1[_i];
                      getCompletionEntriesFromDirectories(root);
                  }
@@ -768,7 +770,7 @@ semver exclusivity >=4.4
                  }
                  return result;
                  function getCompletionEntriesFromDirectories(directory) {
-@@ -153846,9 +154056,9 @@ var ts;
+@@ -153846,9 +154057,9 @@ var ts;
                  if (isTopLevelDeclarationStatement(statement) &&
                      !isExported(sourceFile, statement, useEs6Exports) &&
                      forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.checkDefined(d.symbol)); })) {
@@ -781,7 +783,7 @@ semver exclusivity >=4.4
                  }
                  return statement;
              });
-@@ -162653,6 +162863,39 @@ var ts;
+@@ -162653,6 +162864,40 @@ var ts;
                  return this.projectReferences;
              };
              ConfiguredProject.prototype.updateReferences = function (refs) {
@@ -802,14 +804,15 @@ semver exclusivity >=4.4
 +                    // user-provided references in our references by directly querying
 +                    // the PnP API. This way users don't have to know the virtual paths,
 +                    // but we still support them just fine even through references.
-+                    var pnpApi_1 = require("pnpapi");
 +                    var basePath_1 = this.getCurrentDirectory();
++                    var findPnpApi_1 = require("module").findPnpApi;
 +                    var getPnpPath_1 = function (path) {
 +                        try {
-+                            var targetLocator = pnpApi_1.findPackageLocator(path + "/");
-+                            var packageLocation = pnpApi_1.getPackageInformation(targetLocator).packageLocation;
++                            var pnpApi = findPnpApi_1(path + "/");
++                            var targetLocator = pnpApi.findPackageLocator(path + "/");
++                            var packageLocation = pnpApi.getPackageInformation(targetLocator).packageLocation;
 +                            var request = ts.combinePaths(targetLocator.name, ts.getRelativePathFromDirectory(packageLocation, path, false));
-+                            return pnpApi_1.resolveToUnqualified(request, basePath_1 + "/");
++                            return pnpApi.resolveToUnqualified(request, basePath_1 + "/");
 +                        }
 +                        catch (_a) {
 +                            // something went wrong with the resolution, try not to fail
@@ -821,7 +824,7 @@ semver exclusivity >=4.4
                  this.projectReferences = refs;
                  this.potentialProjectReferences = undefined;
              };
-@@ -163269,6 +163512,7 @@ var ts;
+@@ -163269,6 +163514,7 @@ var ts;
                          watchDirectory: ts.returnNoopFileWatcher,
                      } :
                      ts.getWatchFactory(this.host, watchLogLevel, log, getDetailWatchInfo);
@@ -829,7 +832,7 @@ semver exclusivity >=4.4
              }
              ProjectService.prototype.toPath = function (fileName) {
                  return ts.toPath(fileName, this.currentDirectory, this.toCanonicalFileName);
-@@ -165121,7 +165365,7 @@ var ts;
+@@ -165121,7 +165367,7 @@ var ts;
              };
              ProjectService.prototype.setHostConfiguration = function (args) {
                  var _this = this;
@@ -838,7 +841,7 @@ semver exclusivity >=4.4
                  if (args.file) {
                      var info = this.getScriptInfoForNormalizedPath(server.toNormalizedPath(args.file));
                      if (info) {
-@@ -165139,7 +165383,7 @@ var ts;
+@@ -165139,7 +165385,7 @@ var ts;
                          this.logger.info("Format host information updated");
                      }
                      if (args.preferences) {
@@ -847,7 +850,7 @@ semver exclusivity >=4.4
                          this.hostConfiguration.preferences = __assign(__assign({}, this.hostConfiguration.preferences), args.preferences);
                          if (lazyConfiguredProjectsFromExternalProject && !this.hostConfiguration.preferences.lazyConfiguredProjectsFromExternalProject) {
                              // Load configured projects for external projects that are pending reload
-@@ -165165,6 +165409,8 @@ var ts;
+@@ -165165,6 +165411,8 @@ var ts;
                      if (args.watchOptions) {
                          this.hostConfiguration.watchOptions = (_a = convertWatchOptions(args.watchOptions)) === null || _a === void 0 ? void 0 : _a.watchOptions;
                          this.logger.info("Host watch options changed to " + JSON.stringify(this.hostConfiguration.watchOptions) + ", it will be take effect for next watches.");
@@ -856,7 +859,7 @@ semver exclusivity >=4.4
                      }
                  }
              };
-@@ -166159,6 +166405,25 @@ var ts;
+@@ -166159,6 +166407,26 @@ var ts;
                  });
              };
              /*@internal*/
@@ -865,7 +868,8 @@ semver exclusivity >=4.4
 +                if (typeof process.versions.pnp === "undefined") {
 +                    return;
 +                }
-+                var pnpFileName = require.resolve("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpFileName = findPnpApi(__filename).resolveRequest('pnpapi', null);
 +                return this.watchFactory.watchFile(pnpFileName, function () {
 +                    _this.forEachProject(function (project) {
 +                        for (var _i = 0, _a = project.getScriptInfos(); _i < _a.length; _i++) {
@@ -882,22 +886,24 @@ semver exclusivity >=4.4
              ProjectService.prototype.watchPackageJsonFile = function (path) {
                  var _this = this;
                  var watchers = this.packageJsonFilesMap || (this.packageJsonFilesMap = new ts.Map());
-@@ -171030,6 +171295,9 @@ var ts;
+@@ -171030,6 +171298,10 @@ var ts;
                          }
                          try {
                              var args = [ts.combinePaths(__dirname, "watchGuard.js"), path];
 +                            if (typeof process.versions.pnp !== "undefined") {
-+                                args.unshift('-r', require.resolve('pnpapi'));
++                                var findPnpApi = require("module").findPnpApi;
++                                args.unshift('-r', findPnpApi(__filename).resolveRequest('pnpapi', null));
 +                            }
                              if (logger.hasLevel(server.LogLevel.verbose)) {
                                  logger.info("Starting " + process.execPath + " with args:" + server.stringifyIndented(args));
                              }
-@@ -171290,6 +171558,9 @@ var ts;
+@@ -171290,6 +171562,10 @@ var ts;
                              break;
                          }
                      }
 +                    if (typeof process.versions.pnp !== "undefined") {
-+                        execArgv.unshift('-r', require.resolve('pnpapi'));
++                        var findPnpApi = require("module").findPnpApi;
++                        execArgv.unshift('-r', findPnpApi(__filename).resolveRequest('pnpapi', null));
 +                    }
                      this.installer = childProcess.fork(ts.combinePaths(__dirname, "typingsInstaller.js"), args, { execArgv: execArgv });
                      this.installer.on("message", function (m) { return _this.handleMessage(m); });
@@ -916,7 +922,7 @@ semver exclusivity >=4.4
       * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown.
       * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
 diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
-index 47d329d5e..701859def 100644
+index 47d329d5e..89ada4526 100644
 semver exclusivity >=4.4
 --- a/lib/tsserverlibrary.js
 +++ b/lib/tsserverlibrary.js
@@ -1117,13 +1123,14 @@ semver exclusivity >=4.4
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      /**
       * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project
-@@ -117281,6 +117388,29 @@ var ts;
+@@ -117281,6 +117388,30 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                // eslint-disable-next-line no-null/no-null
 +                if (locator !== null) {
@@ -1147,7 +1154,7 @@ semver exclusivity >=4.4
              if (!parts) {
                  return undefined;
              }
-@@ -117311,18 +117441,24 @@ var ts;
+@@ -117311,18 +117442,24 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -1181,7 +1188,7 @@ semver exclusivity >=4.4
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -118116,6 +118252,10 @@ var ts;
+@@ -118116,6 +118253,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -1192,7 +1199,7 @@ semver exclusivity >=4.4
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          // Members for CompilerHost
-@@ -118194,6 +118334,10 @@ var ts;
+@@ -118194,6 +118335,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -1203,7 +1210,7 @@ semver exclusivity >=4.4
              extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear();
              extendedConfigCache = undefined;
              if (sharedExtendedConfigFileWatchers) {
-@@ -118226,7 +118370,8 @@ var ts;
+@@ -118226,7 +118371,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -1213,7 +1220,7 @@ semver exclusivity >=4.4
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -118237,7 +118382,7 @@ var ts;
+@@ -118237,7 +118383,7 @@ var ts;
                  }
              }
              // All resolutions are invalid if user provided resolutions
@@ -1222,7 +1229,7 @@ semver exclusivity >=4.4
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -118444,6 +118589,12 @@ var ts;
+@@ -118444,6 +118590,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -1235,7 +1242,7 @@ semver exclusivity >=4.4
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -118459,6 +118610,10 @@ var ts;
+@@ -118459,6 +118611,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
@@ -1246,7 +1253,7 @@ semver exclusivity >=4.4
                  default:
                      ts.perfLogger.logStartUpdateProgram("SynchronizeProgram");
                      synchronizeProgram();
-@@ -124268,7 +124423,7 @@ var ts;
+@@ -124268,7 +124424,7 @@ var ts;
       * Don't include something from a `node_modules` that isn't actually reachable by a global import.
       * A relative import to node_modules is usually a bad idea.
       */
@@ -1255,7 +1262,7 @@ semver exclusivity >=4.4
          // If it's in a `node_modules` but is not reachable from here via a global import, don't bother.
          var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; });
          var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules));
-@@ -124276,6 +124431,33 @@ var ts;
+@@ -124276,6 +124432,33 @@ var ts;
              || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent)
              || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent));
      }
@@ -1289,7 +1296,7 @@ semver exclusivity >=4.4
      function forEachExternalModuleToImportFrom(program, host, useAutoImportProvider, cb) {
          var _a, _b;
          forEachExternalModule(program.getTypeChecker(), program.getSourceFiles(), function (module, file) { return cb(module, file, program, /*isFromPackageJson*/ false); });
-@@ -126089,6 +126271,7 @@ var ts;
+@@ -126089,6 +126272,7 @@ var ts;
               *          This includes all files that are found in node_modules/moduleName/ with acceptable file extensions
               */
              function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) {
@@ -1297,7 +1304,7 @@ semver exclusivity >=4.4
                  var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths;
                  var result = [];
                  var extensionOptions = getExtensionOptions(compilerOptions);
-@@ -126101,8 +126284,8 @@ var ts;
+@@ -126101,8 +126285,8 @@ var ts;
                      }
                  }
                  var fragmentDirectory = getFragmentDirectory(fragment);
@@ -1308,7 +1315,7 @@ semver exclusivity >=4.4
                      result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                  }
                  getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result);
-@@ -126117,18 +126300,36 @@ var ts;
+@@ -126117,18 +126301,36 @@ var ts;
                                  result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                              }
                          };
@@ -1352,7 +1359,7 @@ semver exclusivity >=4.4
                      }
                  }
                  return result;
-@@ -126229,6 +126430,7 @@ var ts;
+@@ -126229,6 +126431,7 @@ var ts;
                  return addReplacementSpans(toComplete, range.pos + prefix.length, names);
              }
              function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) {
@@ -1360,7 +1367,7 @@ semver exclusivity >=4.4
                  if (result === void 0) { result = []; }
                  // Check for typings specified in compiler options
                  var seen = new ts.Map();
-@@ -126237,11 +126439,19 @@ var ts;
+@@ -126237,11 +126440,19 @@ var ts;
                      var root = typeRoots_1[_i];
                      getCompletionEntriesFromDirectories(root);
                  }
@@ -1385,7 +1392,7 @@ semver exclusivity >=4.4
                  }
                  return result;
                  function getCompletionEntriesFromDirectories(directory) {
-@@ -154428,9 +154638,9 @@ var ts;
+@@ -154428,9 +154639,9 @@ var ts;
                  if (isTopLevelDeclarationStatement(statement) &&
                      !isExported(sourceFile, statement, useEs6Exports) &&
                      forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.checkDefined(d.symbol)); })) {
@@ -1398,7 +1405,7 @@ semver exclusivity >=4.4
                  }
                  return statement;
              });
-@@ -162847,6 +163057,39 @@ var ts;
+@@ -162847,6 +163058,40 @@ var ts;
                  return this.projectReferences;
              };
              ConfiguredProject.prototype.updateReferences = function (refs) {
@@ -1419,14 +1426,15 @@ semver exclusivity >=4.4
 +                    // user-provided references in our references by directly querying
 +                    // the PnP API. This way users don't have to know the virtual paths,
 +                    // but we still support them just fine even through references.
-+                    var pnpApi_1 = require("pnpapi");
 +                    var basePath_1 = this.getCurrentDirectory();
++                    var findPnpApi_1 = require("module").findPnpApi;
 +                    var getPnpPath_1 = function (path) {
 +                        try {
-+                            var targetLocator = pnpApi_1.findPackageLocator(path + "/");
-+                            var packageLocation = pnpApi_1.getPackageInformation(targetLocator).packageLocation;
++                            var pnpApi = findPnpApi_1(path + "/");
++                            var targetLocator = pnpApi.findPackageLocator(path + "/");
++                            var packageLocation = pnpApi.getPackageInformation(targetLocator).packageLocation;
 +                            var request = ts.combinePaths(targetLocator.name, ts.getRelativePathFromDirectory(packageLocation, path, false));
-+                            return pnpApi_1.resolveToUnqualified(request, basePath_1 + "/");
++                            return pnpApi.resolveToUnqualified(request, basePath_1 + "/");
 +                        }
 +                        catch (_a) {
 +                            // something went wrong with the resolution, try not to fail
@@ -1438,7 +1446,7 @@ semver exclusivity >=4.4
                  this.projectReferences = refs;
                  this.potentialProjectReferences = undefined;
              };
-@@ -163463,6 +163706,7 @@ var ts;
+@@ -163463,6 +163708,7 @@ var ts;
                          watchDirectory: ts.returnNoopFileWatcher,
                      } :
                      ts.getWatchFactory(this.host, watchLogLevel, log, getDetailWatchInfo);
@@ -1446,7 +1454,7 @@ semver exclusivity >=4.4
              }
              ProjectService.prototype.toPath = function (fileName) {
                  return ts.toPath(fileName, this.currentDirectory, this.toCanonicalFileName);
-@@ -165315,7 +165559,7 @@ var ts;
+@@ -165315,7 +165561,7 @@ var ts;
              };
              ProjectService.prototype.setHostConfiguration = function (args) {
                  var _this = this;
@@ -1455,7 +1463,7 @@ semver exclusivity >=4.4
                  if (args.file) {
                      var info = this.getScriptInfoForNormalizedPath(server.toNormalizedPath(args.file));
                      if (info) {
-@@ -165333,7 +165577,7 @@ var ts;
+@@ -165333,7 +165579,7 @@ var ts;
                          this.logger.info("Format host information updated");
                      }
                      if (args.preferences) {
@@ -1464,7 +1472,7 @@ semver exclusivity >=4.4
                          this.hostConfiguration.preferences = __assign(__assign({}, this.hostConfiguration.preferences), args.preferences);
                          if (lazyConfiguredProjectsFromExternalProject && !this.hostConfiguration.preferences.lazyConfiguredProjectsFromExternalProject) {
                              // Load configured projects for external projects that are pending reload
-@@ -165359,6 +165603,8 @@ var ts;
+@@ -165359,6 +165605,8 @@ var ts;
                      if (args.watchOptions) {
                          this.hostConfiguration.watchOptions = (_a = convertWatchOptions(args.watchOptions)) === null || _a === void 0 ? void 0 : _a.watchOptions;
                          this.logger.info("Host watch options changed to " + JSON.stringify(this.hostConfiguration.watchOptions) + ", it will be take effect for next watches.");
@@ -1473,7 +1481,7 @@ semver exclusivity >=4.4
                      }
                  }
              };
-@@ -166353,6 +166599,25 @@ var ts;
+@@ -166353,6 +166601,26 @@ var ts;
                  });
              };
              /*@internal*/
@@ -1482,7 +1490,8 @@ semver exclusivity >=4.4
 +                if (typeof process.versions.pnp === "undefined") {
 +                    return;
 +                }
-+                var pnpFileName = require.resolve("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpFileName = findPnpApi(__filename).resolveRequest('pnpapi', null);
 +                return this.watchFactory.watchFile(pnpFileName, function () {
 +                    _this.forEachProject(function (project) {
 +                        for (var _i = 0, _a = project.getScriptInfos(); _i < _a.length; _i++) {
@@ -1513,7 +1522,7 @@ semver exclusivity >=4.4
       * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown.
       * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
 diff --git a/lib/typescript.js b/lib/typescript.js
-index 189df310e..eb34ff0b5 100644
+index 189df310e..c6c61d091 100644
 semver exclusivity >=4.4
 --- a/lib/typescript.js
 +++ b/lib/typescript.js
@@ -1714,13 +1723,14 @@ semver exclusivity >=4.4
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      /**
       * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project
-@@ -117281,6 +117388,29 @@ var ts;
+@@ -117281,6 +117388,30 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                // eslint-disable-next-line no-null/no-null
 +                if (locator !== null) {
@@ -1744,7 +1754,7 @@ semver exclusivity >=4.4
              if (!parts) {
                  return undefined;
              }
-@@ -117311,18 +117441,24 @@ var ts;
+@@ -117311,18 +117442,24 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -1778,7 +1788,7 @@ semver exclusivity >=4.4
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -118116,6 +118252,10 @@ var ts;
+@@ -118116,6 +118253,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -1789,7 +1799,7 @@ semver exclusivity >=4.4
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          // Members for CompilerHost
-@@ -118194,6 +118334,10 @@ var ts;
+@@ -118194,6 +118335,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -1800,7 +1810,7 @@ semver exclusivity >=4.4
              extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear();
              extendedConfigCache = undefined;
              if (sharedExtendedConfigFileWatchers) {
-@@ -118226,7 +118370,8 @@ var ts;
+@@ -118226,7 +118371,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -1810,7 +1820,7 @@ semver exclusivity >=4.4
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -118237,7 +118382,7 @@ var ts;
+@@ -118237,7 +118383,7 @@ var ts;
                  }
              }
              // All resolutions are invalid if user provided resolutions
@@ -1819,7 +1829,7 @@ semver exclusivity >=4.4
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -118444,6 +118589,12 @@ var ts;
+@@ -118444,6 +118590,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -1832,7 +1842,7 @@ semver exclusivity >=4.4
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -118459,6 +118610,10 @@ var ts;
+@@ -118459,6 +118611,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
@@ -1843,7 +1853,7 @@ semver exclusivity >=4.4
                  default:
                      ts.perfLogger.logStartUpdateProgram("SynchronizeProgram");
                      synchronizeProgram();
-@@ -124268,7 +124423,7 @@ var ts;
+@@ -124268,7 +124424,7 @@ var ts;
       * Don't include something from a `node_modules` that isn't actually reachable by a global import.
       * A relative import to node_modules is usually a bad idea.
       */
@@ -1852,7 +1862,7 @@ semver exclusivity >=4.4
          // If it's in a `node_modules` but is not reachable from here via a global import, don't bother.
          var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; });
          var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules));
-@@ -124276,6 +124431,33 @@ var ts;
+@@ -124276,6 +124432,33 @@ var ts;
              || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent)
              || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent));
      }
@@ -1886,7 +1896,7 @@ semver exclusivity >=4.4
      function forEachExternalModuleToImportFrom(program, host, useAutoImportProvider, cb) {
          var _a, _b;
          forEachExternalModule(program.getTypeChecker(), program.getSourceFiles(), function (module, file) { return cb(module, file, program, /*isFromPackageJson*/ false); });
-@@ -126089,6 +126271,7 @@ var ts;
+@@ -126089,6 +126272,7 @@ var ts;
               *          This includes all files that are found in node_modules/moduleName/ with acceptable file extensions
               */
              function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) {
@@ -1894,7 +1904,7 @@ semver exclusivity >=4.4
                  var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths;
                  var result = [];
                  var extensionOptions = getExtensionOptions(compilerOptions);
-@@ -126101,8 +126284,8 @@ var ts;
+@@ -126101,8 +126285,8 @@ var ts;
                      }
                  }
                  var fragmentDirectory = getFragmentDirectory(fragment);
@@ -1905,7 +1915,7 @@ semver exclusivity >=4.4
                      result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                  }
                  getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result);
-@@ -126117,18 +126300,36 @@ var ts;
+@@ -126117,18 +126301,36 @@ var ts;
                                  result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                              }
                          };
@@ -1949,7 +1959,7 @@ semver exclusivity >=4.4
                      }
                  }
                  return result;
-@@ -126229,6 +126430,7 @@ var ts;
+@@ -126229,6 +126431,7 @@ var ts;
                  return addReplacementSpans(toComplete, range.pos + prefix.length, names);
              }
              function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) {
@@ -1957,7 +1967,7 @@ semver exclusivity >=4.4
                  if (result === void 0) { result = []; }
                  // Check for typings specified in compiler options
                  var seen = new ts.Map();
-@@ -126237,11 +126439,19 @@ var ts;
+@@ -126237,11 +126440,19 @@ var ts;
                      var root = typeRoots_1[_i];
                      getCompletionEntriesFromDirectories(root);
                  }
@@ -1982,7 +1992,7 @@ semver exclusivity >=4.4
                  }
                  return result;
                  function getCompletionEntriesFromDirectories(directory) {
-@@ -154428,9 +154638,9 @@ var ts;
+@@ -154428,9 +154639,9 @@ var ts;
                  if (isTopLevelDeclarationStatement(statement) &&
                      !isExported(sourceFile, statement, useEs6Exports) &&
                      forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.checkDefined(d.symbol)); })) {
@@ -2009,7 +2019,7 @@ semver exclusivity >=4.4
       * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown.
       * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
 diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
-index 43e2dcfb4..b9203780c 100644
+index 43e2dcfb4..ccbbc0a59 100644
 semver exclusivity >=4.4
 --- a/lib/typescriptServices.js
 +++ b/lib/typescriptServices.js
@@ -2210,13 +2220,14 @@ semver exclusivity >=4.4
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      /**
       * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project
-@@ -117281,6 +117388,29 @@ var ts;
+@@ -117281,6 +117388,30 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                // eslint-disable-next-line no-null/no-null
 +                if (locator !== null) {
@@ -2240,7 +2251,7 @@ semver exclusivity >=4.4
              if (!parts) {
                  return undefined;
              }
-@@ -117311,18 +117441,24 @@ var ts;
+@@ -117311,18 +117442,24 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -2274,7 +2285,7 @@ semver exclusivity >=4.4
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -118116,6 +118252,10 @@ var ts;
+@@ -118116,6 +118253,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -2285,7 +2296,7 @@ semver exclusivity >=4.4
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          // Members for CompilerHost
-@@ -118194,6 +118334,10 @@ var ts;
+@@ -118194,6 +118335,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -2296,7 +2307,7 @@ semver exclusivity >=4.4
              extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear();
              extendedConfigCache = undefined;
              if (sharedExtendedConfigFileWatchers) {
-@@ -118226,7 +118370,8 @@ var ts;
+@@ -118226,7 +118371,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -2306,7 +2317,7 @@ semver exclusivity >=4.4
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -118237,7 +118382,7 @@ var ts;
+@@ -118237,7 +118383,7 @@ var ts;
                  }
              }
              // All resolutions are invalid if user provided resolutions
@@ -2315,7 +2326,7 @@ semver exclusivity >=4.4
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -118444,6 +118589,12 @@ var ts;
+@@ -118444,6 +118590,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -2328,7 +2339,7 @@ semver exclusivity >=4.4
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -118459,6 +118610,10 @@ var ts;
+@@ -118459,6 +118611,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
@@ -2339,7 +2350,7 @@ semver exclusivity >=4.4
                  default:
                      ts.perfLogger.logStartUpdateProgram("SynchronizeProgram");
                      synchronizeProgram();
-@@ -124268,7 +124423,7 @@ var ts;
+@@ -124268,7 +124424,7 @@ var ts;
       * Don't include something from a `node_modules` that isn't actually reachable by a global import.
       * A relative import to node_modules is usually a bad idea.
       */
@@ -2348,7 +2359,7 @@ semver exclusivity >=4.4
          // If it's in a `node_modules` but is not reachable from here via a global import, don't bother.
          var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; });
          var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules));
-@@ -124276,6 +124431,33 @@ var ts;
+@@ -124276,6 +124432,33 @@ var ts;
              || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent)
              || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent));
      }
@@ -2382,7 +2393,7 @@ semver exclusivity >=4.4
      function forEachExternalModuleToImportFrom(program, host, useAutoImportProvider, cb) {
          var _a, _b;
          forEachExternalModule(program.getTypeChecker(), program.getSourceFiles(), function (module, file) { return cb(module, file, program, /*isFromPackageJson*/ false); });
-@@ -126089,6 +126271,7 @@ var ts;
+@@ -126089,6 +126272,7 @@ var ts;
               *          This includes all files that are found in node_modules/moduleName/ with acceptable file extensions
               */
              function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) {
@@ -2390,7 +2401,7 @@ semver exclusivity >=4.4
                  var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths;
                  var result = [];
                  var extensionOptions = getExtensionOptions(compilerOptions);
-@@ -126101,8 +126284,8 @@ var ts;
+@@ -126101,8 +126285,8 @@ var ts;
                      }
                  }
                  var fragmentDirectory = getFragmentDirectory(fragment);
@@ -2401,7 +2412,7 @@ semver exclusivity >=4.4
                      result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                  }
                  getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result);
-@@ -126117,18 +126300,36 @@ var ts;
+@@ -126117,18 +126301,36 @@ var ts;
                                  result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                              }
                          };
@@ -2445,7 +2456,7 @@ semver exclusivity >=4.4
                      }
                  }
                  return result;
-@@ -126229,6 +126430,7 @@ var ts;
+@@ -126229,6 +126431,7 @@ var ts;
                  return addReplacementSpans(toComplete, range.pos + prefix.length, names);
              }
              function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) {
@@ -2453,7 +2464,7 @@ semver exclusivity >=4.4
                  if (result === void 0) { result = []; }
                  // Check for typings specified in compiler options
                  var seen = new ts.Map();
-@@ -126237,11 +126439,19 @@ var ts;
+@@ -126237,11 +126440,19 @@ var ts;
                      var root = typeRoots_1[_i];
                      getCompletionEntriesFromDirectories(root);
                  }
@@ -2478,7 +2489,7 @@ semver exclusivity >=4.4
                  }
                  return result;
                  function getCompletionEntriesFromDirectories(directory) {
-@@ -154428,9 +154638,9 @@ var ts;
+@@ -154428,9 +154639,9 @@ var ts;
                  if (isTopLevelDeclarationStatement(statement) &&
                      !isExported(sourceFile, statement, useEs6Exports) &&
                      forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.checkDefined(d.symbol)); })) {
@@ -2492,7 +2503,7 @@ semver exclusivity >=4.4
                  return statement;
              });
 diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
-index a987e972d..02a82a38a 100644
+index a987e972d..cfd278ad9 100644
 semver exclusivity >=4.4
 --- a/lib/typingsInstaller.js
 +++ b/lib/typingsInstaller.js
@@ -2693,13 +2704,14 @@ semver exclusivity >=4.4
      })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
      /**
       * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project
-@@ -117076,6 +117183,29 @@ var ts;
+@@ -117076,6 +117183,30 @@ var ts;
                  return undefined;
              }
              var parts = getNodeModulePathParts(path);
 +            var packageName;
 +            if (!parts && typeof process.versions.pnp !== "undefined") {
-+                var pnpApi = require("pnpapi");
++                var findPnpApi = require("module").findPnpApi;
++                var pnpApi = findPnpApi(path);
 +                var locator = pnpApi.findPackageLocator(path);
 +                // eslint-disable-next-line no-null/no-null
 +                if (locator !== null) {
@@ -2723,7 +2735,7 @@ semver exclusivity >=4.4
              if (!parts) {
                  return undefined;
              }
-@@ -117106,18 +117236,24 @@ var ts;
+@@ -117106,18 +117237,24 @@ var ts;
              if (isRedirect && !isPackageRootPath) {
                  return undefined;
              }
@@ -2757,7 +2769,7 @@ semver exclusivity >=4.4
              function tryDirectoryWithPackageJson(packageRootIndex) {
                  var packageRootPath = path.substring(0, packageRootIndex);
                  var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-@@ -117911,6 +118047,10 @@ var ts;
+@@ -117911,6 +118048,10 @@ var ts;
          if (configFileName) {
              configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
          }
@@ -2768,7 +2780,7 @@ semver exclusivity >=4.4
          var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
          ts.setGetSourceFileAsHashVersioned(compilerHost, host);
          // Members for CompilerHost
-@@ -117989,6 +118129,10 @@ var ts;
+@@ -117989,6 +118130,10 @@ var ts;
                  configFileWatcher.close();
                  configFileWatcher = undefined;
              }
@@ -2779,7 +2791,7 @@ semver exclusivity >=4.4
              extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear();
              extendedConfigCache = undefined;
              if (sharedExtendedConfigFileWatchers) {
-@@ -118021,7 +118165,8 @@ var ts;
+@@ -118021,7 +118166,8 @@ var ts;
          function getCurrentProgram() {
              return builderProgram && builderProgram.getProgramOrUndefined();
          }
@@ -2789,7 +2801,7 @@ semver exclusivity >=4.4
              writeLog("Synchronizing program");
              clearInvalidateResolutionsOfFailedLookupLocations();
              var program = getCurrentBuilderProgram();
-@@ -118032,7 +118177,7 @@ var ts;
+@@ -118032,7 +118178,7 @@ var ts;
                  }
              }
              // All resolutions are invalid if user provided resolutions
@@ -2798,7 +2810,7 @@ semver exclusivity >=4.4
              if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                  if (hasChangedConfigFileParsingErrors) {
                      builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-@@ -118239,6 +118384,12 @@ var ts;
+@@ -118239,6 +118385,12 @@ var ts;
              reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
              scheduleProgramUpdate();
          }
@@ -2811,7 +2823,7 @@ semver exclusivity >=4.4
          function updateProgramWithWatchStatus() {
              timerToUpdateProgram = undefined;
              reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-@@ -118254,6 +118405,10 @@ var ts;
+@@ -118254,6 +118406,10 @@ var ts;
                      ts.perfLogger.logStartUpdateProgram("FullConfigReload");
                      reloadConfigFile();
                      break;
diff --git a/packages/plugin-compat/sources/patches/typescript.patch.ts b/packages/plugin-compat/sources/patches/typescript.patch.ts
index 53b1e3faf52d..58d3d128300a 100644
--- a/packages/plugin-compat/sources/patches/typescript.patch.ts
+++ b/packages/plugin-compat/sources/patches/typescript.patch.ts
@@ -2,7 +2,7 @@ let patch: string;
 
 export function getPatch() {
   if (typeof patch === `undefined`)
-    patch = require(`zlib`).brotliDecompressSync(Buffer.from(`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`, `base64`)).toString();
+    patch = require(`zlib`).brotliDecompressSync(Buffer.from(`mzhaECMRultVNEbB3gy4w24b9HL29vKvqmDHXsTtBHpH69MG1MMBN4ZgH6a9Iq0LWA4Qwac3Qh2PbfsToCXi4L2otz/6jRK/J/Am5fpwp8XhrbAmwoKoh3oZUMbNC0cysnLf+LKuDUMZDYo8poIKaBVe+Ty6xjdXQFqsTLX++rx680AeghuieIlOkZsiFQBQ2KMg1gxkl1x3FtpWT1MNYgnHoNqUYrtJMP3vyLZUX++oi+yhjrmICI5LBvhspfTOdYP0zChUbZj8CToVLevrZFtFdA1CqkJlkylb12CqCGiErmwQC9mkm7Q/5I+Kt8WqlOYqAfoDJ2c/v3+Z9pV2ewgg+kHo0989QJBONmzdV/Wqv8gztmyfLzcMcMMiVdWrJ8mS7N+42+4BgGwBKIk2STcIl7NYbvgcbUYQ7dl4w/nftdIWgDMtP3+vQrIRZ3Rhf+ZnjnZLwG6STCYFoudbBSS0HsgcUGmvxHuqQK4VQvX/ppZ0n1KaNVc0/9qM9+XJd3yWEBuwhIYA625mvHuCYaWx20v1pcCgrRJLwQmi6wDCwvA6kk4pVpQyI5EZOcWS0woN8Ww/5FShmY7Ry/rbMqb1w1v7hSSELBC07asxpuHPjWVrKblD7Eew2WzNxJhD6Ev+GfaM6Zfe3+xVt6RJaQLCEyHgHBiYs6TsAfV3yDWO46zJmFZ/ToUdIWjAStvzr34SAsrJMRlU9pmXuRb2d0G9tUZY/0Kgn/dK9PuSr9eve9WCn08bdbIzL+rVtRdMPfhrjHmL7T9/9TNqXutSJAmGzzCy1mL5I2YzlBte03A79qdrc88W6uMEV7U+nRJH3/6Iv7Kd8ygo8B3DvD6bAq0DsLkzO5GQlVfuO8RRmX6K+vqKBmlKfoyVo10sbVlhSEEgv830GrnwC7TfKJtyFegmPfTxV7cYAoaCFRGNWHpadYl2qvnJu84/EV8VVyZb936gDxiZ2/2ADC7r12lhzZcE/zW0TyK2Em9J9Jeumb+2JIotBTZEtIn+CwL9nV6XVxbF5eKySpQHBNz+/GmkxILP8P+DYEjPGJuRoQj31G95dFPbZXKsZjE9puIku6Q1tScQ6cNnTZmVTUjZa1d3R+8y4J8dFHKZrIx/jE0bZFu0QqT6nWd9SW5cvE4+lV9cCNftjcQfXSxUgkM69GZzCAiYJ8Y/JWrDbIjAQnzGeoiULM2RaqzGSRlwaSl4d3Ht8/U+qu8YRUCZQUgZ/1L7jnxyPi2iV8gggp711URlAs5kbP64RkqCdAthI1VTFvYH1nCkAA9ej1uApASfT02Qft5Uea8ZHRKQfGZ53tmpsoRkjzaO93yX55/TTRu3rtWt1tS8y54uV4zWyRTJQD66YR5w2/UliWPW0B74UvhkAPZz40YiCFEuYV1dtM62xizf+d8TdkupqcBSRWY3X1WJLgVSnQKl0jyQ8xIBS8LtAeqa31Zb5Megabit2ytwvYFV/27l3aG5RbFBndPwDNI/lrRYgFUZojHVwmTksLW/jZo1J6B2Vcg+9eQu9kv61FWYSwxmgjFfbIWFi2yw8C6tBXr56vHaE6/CXi9UiIsrlMyhHHEK4pxjbAEiflQqHKEmjxH9UmT0wz92CKiw3mprAAUHaB/pIWb56q2BlrKPE+poA1QTe/Mm1DKTIznxVzbqKHUSIjAoj9iP8rDs14UEipm77whB0E0YMGQe8w1O8Sq3KsJRtzxkf/+vV585XJEcy2dVPnJIPB4fY/4PbgaelavG6Kfr6CxhgP5RZK6yWK4Llkf/U38KJihzIc1daLyviNodBY8SerM5qKfiIlJvKwsOz/xbulw29aqE3mjWyicKZkCN8LWPw/wF2mWsA7TlaksJ22Ry/jguux/q0lpzXKjd9yyHj/328VuwsamNKFfa0Ehut23Oa9uQR1ETq+0TlnINqBob+X5Yv8mGDxMXfraynzjXPtHmOwRCk2d6tXNK+81JLf+A+UWDsmjFFIWQ8HgR6jW3XmsHXcAIupvsgKv7xQpvvCU1gUAtOJ5BoxCKepYJ07cxx6qXyxrdGTpdNt6PVXcNlN3Cxz9uzt3li5+EGFCKVw5TGw8l+ij9GAKFFDlQsKreqezFo3MH/QaXCVkSv5zPvLdPtyFNnPA6rUSwLlvMDu4gfe5Mkjwiw4A0WW3I6aoA8O0LX3blfBiRQ0MbqtiFKM2+IjA+X7fb8HE2d807dKBxctis9Yyj9JicG8RQ2nKcaSnt2oDxEE/puLYfR/QOl7RHDzPSQdxpfuChmHRr6Zkz08xO23B3ip2QO33kBYLZYfFDCh9lbi90n8VI88cgmWzuIlU4c9bSa+1Qkzt1ohuqBSCedRFSK3qzZRqsKq3CT4GOBUV2Yw5JLgMIMEfUIvERO+LbmvYwKd6u7o6oPGE3fPV7nXzoxIKeYXkV54DOa88vWRsykeX22oDlErrtPQEgRfcyBfSnHYZA6AJ/KbAEoBBk2oKApmcorQSq5V6XiaxyP5dAjZy+QuZLRJkQA6ZeMgqlLkiIvA9WSuKSImIhSMKiURaPWOb6vhmgzwADHQ6+x5Us5X6Gw9FQ3/RKYW9f6CRSrtzRou8gwhJK+A6BRArkkb8K0nPV1g+99J+Je/22zJofeuz6EJcF7rE2VDH5yTMiPI/97ZTy12EgPHMdpDG/HIXBvfUl0Il+guXNhZd22SC2hLEIA67vEOShZriQHe2DFEHkvIFcDydvg3OLjPAT5ct7ib2URKsmS9SnDk//Hxpm0y0tXLVM9uW99riqDULfN4sWYZUD3eADBGVeSt+tlQ73+h1IBNrHlIuOGJuFdEazkMPqWwpsq1P+fKUWYGbqaa1dYdh2KqY98l+lGvc/KtZHGSMt41t03iCil13d3H861q2qrqJpV8m9VaMM6cqhEnG4vBGVRXQJUO1ZoYznRLyXri2O/maGrUFgj6D72FMt1N1Z/QvjPBERztYCk8j15o2ke4TiHH6WyM2YSeV9M/VBY76AhazROks1JljnW06GGc4ji2wu+7LWkN24w1494oqB6lxTPqA0X7Yum3Rufuhta6Y/8P8oGqUqVFa1O88ENJ6Le/QfbGLlihWHwfDB8f7nSiosm8TOClu/l02+I8F7cVLL+Bs3fkNmyaC0hUv7VtUzthpIeg18QX7d270TmvQoB00rS+Iy/vdbxPVGMcjGvo47CasBOuPFlFvSEuC0ktj+FHEO8H4kw/bXIv45+HhJWgbiIPw0szW+XfUcKp7Zl3VjT9jdVWTIf90u4rQ/lMTuXxWjSrrcAt9yPnDfk/+XYKABd0dZTBt/0MtziO9y1aynaePkvH30nTouYT7MmMUauNig8+vfq57HJUAcW6FKmnjywSvbsHJ5NDh5R/8wRJUPtgzBZfbNoLg8RJ4boY8XlJjQgxBjPnyGEGpGxzpcAOBovC2KUBTO5Gq0dsl4VyOUNQIAmmST1kQyMESZ9/09BJhZlX3vVtr1m/PG1GMYuh1iywfbhbAymqvFBQDmjAvowm7jdvR2xritukcAgGvCEZodBi+H9iHMzCbQb7uEGwd+MC/j/UI/jgI3h/PkghUAsPPur3/9/NkZvXAbzIfahpAz6+6HFiqv177CDeEd7EP4dvgc4RtK6nABgMQxcHZt4Vzjwlo7Dm/XIpQ1AgDn0UY4Zu890l0zmPidbMA3NySu3hUXaQmTLpcBAPDmEMj/zS3+/qvr/y+jG5M20/5sh5Cpdpt9ioIMXd31wxvYSPvuqzXbAUP3gkh4jl/EKk26/C0AwIOCsnRiZGNi15kJG39Ok62QpPba7Ok+SLRZlwkAxFOwvJDIw28WhMDPWi5UjrFkxIyKtbYAQJH7tzBs7t9M+6jGwn0uuwQAWuZpjeQ9M0HofN72ObQxFDEPky7HFgCIk0EXXXiEmxTa6xJTzo3KGgGAMo4RjVnAH1D0o1lw4c5oxMvxVZ5XARA3Rzua8Qa/imZy1/J10J9JeuvGVHtj5geYZwsAHI6NdIXh4f5k21dlxd2f/EYAwCONZMzS0TETn3F3wej4FW8b5m0oIVO4SZfLAACYSBdqjBuwP9vFi6OazFhvF3BPFfa3sIv0MNVLZ3cul3Q/EPQc/yOp9KTL3wIATFn2aYw7soOnwIuxBjTW2r142xKhNBMAONllmvPM56T9q5PcuGw53nUao0odLgBQAadjCWcKL5aohfbV25ZQcgkArFvRH3lyTSf84ofxw86X43hRqQ4XACjhpS1qQfj0YgqF9uhtUyjZBAAi6wVbYfM78df6prSvP43vzQUrAFLnaN1i+ipoujfXOs0+89hP3Ls09solu3xcAODE7PusDfdxPwvu4X6WNQIA4dhsRoWKYA6truxzMpRb2qTLuCTgZ0+NYHyWLpHL+gaMpp7lhUjfxPh7ocA9CU7YDgZJalMDA6ik4xwIT3zDLpdh0isLTXoCPhPPrW/8rtA5vjDiasDIrzeGm6RndJOpYrtzeik3cr0g7yNvupCRz6KeAqHMoGdY99WGV7PoC1z1500j5C3wuDSNATh36WE1xQz9y5xPbjZbJNshYvfUwqtapg1KJDiN9CG5th0lSwvXEnST98dMl14pfKW8keECKg9derbt+rx6pr6Sc9pTkoSJvvBGnRz1qn5qQ5IP80dx/uKzzcdpjkcKkAnG8ebg/Io+AbuJH9ZRRKjQXFvfN0Z9RxhuNdKeZ5x3ZObdyXqtmph5TOYIOq2816TU1aQ5Rq+F84K9zw6Fzvy9WZn1DspZQ9G2zewVk5oCze5ZUKKVgK5WSOhe1CJDf4e8GLxQpeOOstvMq6bFwIISovN+xxUvKMB4XwA7SKwdGGgiXb+SjH9/71XndFN4gvGeqDvW/qBxnPiIpdWUEDu8TXk047luFu4nku+olx/9wCMRh7C0cu6ZgVk6jlJKs5tmpYaDJGpCdjEtZVicx5+hjWn6KPWKwJQcyqbJ++nDhHGcL8cp6MjUxn+PWBYhwAoBuWjHsq43rSASWcIQJd68cgiWJ+dJX92jaTJtPoqoV71E6LiPPz+L56ufiZyH+jSrzdmfBPrzY8dM5OO6JB53vz95JYY0caDgNbVQR0QOCCVowyZOAoGg8iPFz9IiS4+IV0pzQu6IlVQIlUaRceCjQULVYiRj5sRvSjEYCLyLVB/VE9gdr8TGVEe+bVp0akSuiUgpslImr88SqLwO0In7V0Rn9l+XWJu4XhTbJd6g5JCdv1w+93eTO9lX4z8xg1pRgePqh9OJxoT8NiZmw8nhOMq6H069BA6I3T6MCVPx9NC6SJtmXFrzX3tOOq97X4DJLJok+48os/BjTHMf918tTLbya0dJnIULe4fOChIS6vxk9lt+xPtRfywCYDSZZqpypkkds9kRzozf+qbJ5PkDCd5RXJgVrekc8qbxEqQkWS5hBfAkY+kgMV0C10Fpz5aZbMhMpTAEJK8BE6Kb1i7/IKt7aBJmx9Y9OQFfqlBNjmcTsqnH2SIZzIy1i8zUZh/xPDP3s7X5RzwP/r7UViI2Nz3WEejXyjaUej+DTSy6tEsRn1/zML+Zh3JC1vodhPH6tjMltCROlgkmliiuByLodyiiBoqd82aLb2nPpXMS37Ork3e6r+TO4D0CJBV2dbdOQOI19cmiABRa9pjvywEQ05uMIJIK5+MYYJCGhaVoEjdMfhSO+DxfVtcCXdasBn6chmvYNu1xvcMa3FKn9FgpRjmVGVMfvyQhuXxqjktH0h02SIWPxo0e2VUSwOqUaNw6A8sOYwdJ7NEN0V1WQzGd14RjcA37PX+3MGXvZ3Oj2ZOdyXu30cs9jb7ghhuudLQiJmc0XJLJBvSFRDotNQPy6pIziNe2jGrF/cJNGxZRFG9E3AJrSQp49hz6mlzvjUrwFuGcM3PP9M7M4C6N3IzZio+9Lg5q8rmCfV2p98A4LM29AGPkLHFbQsDFPWUBhyoOzufzUDe1hotSq4xdWef4tNm3zVIlrpcOv9bLdrTCZIN/HMvwHUWcmnLPAhlXOvtjVz5wVjkePXE+5RksmyhFh8/ftsgVRnVnvxQARjpfko06KHE41WYtWhKyrsFujdAsrSroMS8M5hrwTt7n6TgZ2cmsNL0ZxTrDvozP5DIDAO4NDU1ReN1jod3utUQTALCuT5XncIMqgR02yU1Dn9b0ybuGJreIOMhGwVD77Yp3ORn2yWwzvTrFWgeaq2cGAED2hCKpcHwU2jWYfHut0QQA5Ad3o8q3cKcrBXo5E1f2RaDdqqci8QR1K5ipGeY3nZPRXS6mAnC3mtiCCBdMneFv/czJaC68O02vpFhLoKSWGQDIsi/UcllhQ7V2lnus0QQArnQFVW7gKtUANlGNLctWtv6K5BeBgH/wErFxjwX/1RWwRt5PQyS4nEi1ZgDAjoQVmAl2zTtzeq5L6u0khLvuzOcNed6s7rH8H9iaSyBE3uIeGBNEoLpghV9zMzWzg4mFXmPZFyPvKSq0X5IdaDazuskf2xxVkVUsa9rqYv8g434RF7Np4bPJKFbzvuBWt4hFqiP97BV2yx50rFKOGnDxSwgh5i19i52Sp4r+6AxY5EkBjy72PjKgSWgx6sdQj77ovGOLbIIWXK4frJ+wBJ116vByu8eCu2EiaiRmbu0Kh0I17rmAWhbAk2MHpUw00/tz5RBSEM6P7hg5l3eseJbdrUvCrbneNO+NmlsPPm3nKRPIUiUY3uKMYpInK2W/rPeqTVLDjVmq8WnRWbyzk8RBrpvLtmyt2Fc0blJR0S4dHJ0A9ohvmrWrJwoP4TXijttfGaW94w3VAgm7cx6ds6vn0zu4NJAwHcYC3F3Z1Trl1HrQSUDIia4ddm+Hv9LBKuaLFYZHzmJX5jZN2gX1RYVNGwGtU0bYOrrxViy8RnYi4hQMtFZw4Z3D84Ex9BC5qTiJ44cQMmKEZUKcqnFiGuYp3QfH4yndFvbID2tRTM51eTebrhSyg7jJcA4NvhSfZ/chBmOb9iZbaqmWPgjKC0zPDljvvp+pf1kjOPLA6sV2tiZ1bVQlxxroHsQMAERyKr8hfOLSi3vdbXLZUTVnbQ5Acfm9TAAApRFLurhvzP7wD3cX9w4O+TPCskZMIftYvbtP8wkIczo9hpcVxnMW8511+PRLbRkuUQOCQYZEsAnEQnHqmZOp24u8GttjcdNc4YZz583JUL8UtVk4fN+HFlH5PyaT9XOD/f6Vp/XodL1Ke1CaxO6FhXrviV15YTdmQbx63zu/Pxt73WsNHJNDBTwK/91jYHtsnalauJYAEoeuGMlkcrLZ2AXhT/sBQgFKWynexPC6NyWk28+aqRw7UVtbUhGZ5SiIzm4jGw6n15zlngrA2UrEhBxZ4cjrJNaKOcfE/a3T1cGFuZq5cmw4Lfi2LKOBXRdXtBg3/FuiL5+ZOcv/RUM+PTVETTfsUYYC729WXltLma/UCdQLzs9vSMW1wyq7Gs5UFe7lo2ZObqKqsrLjZQ2+IcyDJ8+Pv74CKCkiVr2tUaxb5UYgqZ4ZAJBwrYKwJ0ppF9VQb+/gGnWaAIADOjXdqwi6XY4SAKiLC2E1TG4GiKah6aqJYnT52ISpeWPr7MH2y592lxZxfHOrHIAyIiIcSk12PH4vd+rkccjLZ6LMiPjMn3IAypCIdtxw2bQ8NbJ38vmW7SJS+RExe95seT9dHc8IwPVSZgAAZ4CngjCiosi5sd7exA1qNAGAJhdzqrrf5cy43iQAYIhqNKvZDbrXsXv82tbNL+Y8/9VQ+rzZ8n4K4gAlUy5lZgBA9FHWipFShIw7NT98dM2KorEb+mimucZ81fk8pib9RZTcnMUiC3/k2aNkNAQ3GCG1CFv7kgTb9Bp+V9AE2O7+yE+g2h80agZMZ1AATK+3qfPYWfgGnHbjbq6BUfh6alOU3FJL5ppmCvsCkRp+o9W6YVVMEPFPRS2GcyPIkGNQ9ku6MUMmALJnIJIcWSrhA3jRjkn3mnmqf0M7GrM0HUTLXxC4cu3uEK/76N66+MDeRj9jr4tS9Qyn2gODcV2R+U2CDiOAvlt+BnVlUedc/w8EZdSrDRzrbZh30PU7Nte/7sN2COce+4mXj/uL+tacT/E7ntm1GS53WCxyX4dRH3mXurZhiLF/+bmPrIk9OrhrxbmPSRsXgChyPULpsMz0+QwZK5Fy6IYAcbINoxnYtBxjugwMbrZInFp/eWDDou92hykA4Gt1MpP74j4pTdYhjdLla3/nYW1xTTvSk2oZVnmQDY/6nsuHuT1wtXaEA8KmerPxPY/9yt2az3hgCUNokcHo3jSk/hw3GMV+sbAtxom820v6n1LJeEMLgoR0MMnED2poHnM+MsPEGL6Wa8W1OsZpsR3ekVtdcRppmOK8S3tTTgV68BTbWZGp/j7KfaViZZy0E4Cjs2OqZoNo4cRnKx1CKnOOrMx1TpVi+1VX4koUtliBEHYfWMzEZYpnEX0pDBS05/hc5UKRdpAquVm77YxXISiDBjl+4Qh9SAfmwITJ+2bE7hhdyJi6p6ENZiSIgFv1ohS8hzMWxMX/rl/JgQvApj+lS/XyUDISWlOecutdsWWKE+yQrdT9RvVOaK0nCTbJJrrtQkW1gHViLPjCjBxWzPUTPEpJQAz3I84JCd67FU1nMzTCujGbaEQZrpez9q4CICWS0JaAt13g6lDJETKKcbl5N2aglSnj9vPKNzE25sVVqX4+ETU+Br0g4JQfhaNZf+daxSnvNMeajtNKvUCCop7Es/zusRdLsaM0WOqW0IQmYBw17/k45PURMqA0DzYZGeQyWzBez+LLOkvGGb87VWeHTse+T1MZ5xMF/PCQS9qOKlpTRnEzhTdmpat3G/tLmaqX5i8rXkxOMK0YEpxxk5QeiokcEp5MIv9rc0DPGKjwnKG6GKjsM547nkyWQn/M3pRo27bPWo6mXTfjGOIyeHT086zZtesYR8RpZTkhau3hPrKid77WwFfP5tcRn+vEjM2qCQCfLSuu8WF9qDmd8krCi0U/uwKGzB2UD5jPb0GugzDtL5mqyGUcnXc8eHalXRC6gota5yyonGlhNC/TYnfltVc+5VnfovyZi77adh7TGnOF7MMOgyWcE3Zm9XS28Z4qptV+dkzYwc/nMJL4c0Xa3pBiivxzogEG2OiCb/HeaOK/z7jMk4vzvX1HxPhDyh5cFfeN14IeHmJ4EKJhU/X7Axw+ItLSSfN5S/nwfA3A916/jyvNJ9VcfR46Hyqrerh2m1kRD/xXFjMAMJBIJjUMxe01LlFxNyB2SqlSo52VqsmmZqxnZQIAxP1GVp2qR/hvdyedGvzK98iw2gBc64LW4jl9C/TqY7ihaCNxHyDqMCCeIxVPcst5gq8DXcef94QLVJeL1BGxpikAbtGxLX+TUUxpxir8GGl48E5A1AdEuGDlFVMMQwQlLEbHQoCSRBK2ovOvYnz9h67mL+LTA9oCgHfLEpubS5zGR3zQdXDXWPQyC1GcgYYkknYJY/oGyYopbHtOTrYz5ra3AJnGlOlNNPZI2DXAdIrqjonnuZ1gNYiRmOvN+CrBJ4PREkfipwfnV9eOZjnU769F7q+7fRKe/zJ5zZbM4SPQh51rc4XRfVeMXudRaaEEotRi/SUrHH8CbbRTH37308/Cxal1368ec8EkN20ZA7JIaNdjCn6PnGLz34DJJjQf1rlFFWGnPSOjj5OC2rTJYqvVYyq9QeD1O1BYW/O1dyqflHbWABz0J2P9klDqZIFQvUjQ3YmmvwN5PGLl8+I5iwHtEmhJ8/lMC4J0d1yqiluHNA3L2k2JNh83OmcD+DCunKzbOCc8eBUcWKREuoSUtUk15EzLZ/ljZY/yP7LCjcYmQ9vNqq6t0JVmnfFOkmE0XHA2ly4ekJOBjxMPq/78db2sW3S02WFuK1c8aTH6+U3OOB9TZuJXL4upyGN/bUf12FfnJWIWGTatNz83kU4vhM2mdDUHtB8jrGyy7Gs0GZ4KmMaGsrwxf4NUqIQHCvjgIfEltgqmIOZWNE+TmaYt49gvOwl3cA0H9mOdg3lWFT4Btvu2S2FkjwCiRbE+zkpOM358b90IpvpBp6BieoIKBvqRkMNw7DKyjVlrDKLQs5JV76imqRIFGZobeTxtsHgwWlZZeUdfzp9oG5uh4DSZGFbG5BX05Y1OTzcePe2Xhh5qPQc7ujv8V16ifz7eNLL2CxsGUYXcw0Q4mJBJ+zJd6YwBBXUssdAMZ/uy0lk2sQtUNe4Ez2pKbomwh+hyF+YF1pISPCQC/fppwsZnUi2WgfeBxrAxA++MBpajn6eU7Bpc8oSUn/L1Vbh7xqbsPqB4OB4hQZzPN4YtubZpttnJoK/cVMiVS/iXj/pAfKSnDbQ1zUOnlHbZPH2x8I7fpFptUCXblFg703+uGWxGt1HCdzHmYPDVBHIm/VC3so/LI0q2zCXwPsDX5OLrNEvTuApiXQZvfWgzdl7gVZmpD7gfM7Y7/VhTY8QXV2JZ0NjmjcKXJK7EPDOcNAIGKyrfxHZticMOAwY5S04cJyOkl9OcmBHBbmhg3Q7/c85Kew8RZ6ty05tbqPRkJ7hrxCfFrao0GkISVqQGdkxMxKO4bC0w7bpZS5iedd7Oy8xPcbj3ToIm/irr5bURwbhMQIhN4MbLZvcPiTE0FZ6crC6aHGX0PrZzfE482K1pccqwQE+hNCvipxCIwEGw/VcXp/Hromm4Y9979ELR21RCAWMr5h5u3Ph4KW/QbeRjckt+xmT+vGov0z/f8E/rV0uv5+fiCXkb/taKxcKPZSXpc6NfVe5Of+ODcU4UZfbUeWPwNZlwKtJVCAnES8co68LAGJovSC6GX+WMBcc/X5YtpogFYTB2dEJHf53618WeWa7xlVoNGqUJiTMZy3sP/P3ZN86lk4r8IOBl2l8LHVgBPLos8S5eabk3wYMcMAHTSg4Fx4b5BrQzfBQkueqHBfZG9yX86qwkfecZ0En924Z7aAQ43f8BaWpXlgbINuVSwgwAnD5yvWIsJnTeFMpY1PqAcaezE2tsj8N7rs0EAA55RhZgj5bNbYBcNejtigvbWtYPABwEkLahFADqM3xWAwJNsVOAKOvPO0AInWC3OZsCRKu+r247wl11S7IRKKumS4ltA941ZpsBsDQW8gGstrO1ATgx324AoJqKBBDFxLexb3ltsHwG3zvsI6jn4fjmGkgAJfefjuUx8Y5y+14O1sxm4OSrI34Xn7kLEkARidFOWyqL3u/d4Z6BlucqaUSPY9a7PqV6vdRhKOISqYwZAGgJkhajGEx9bB85nX2wPXJMsb4e4eMaTQAAwwXv6TY7oFWV3hZnumr7AQAUiK1FeUFN1UeD5pSxBWLpfwkIqxlEuILx9pmoZuWYbQ/GH8RgrpB/sBNOD2OukDviOg1ZX04UPRSr1AwAkAQNilH8jD46bUFjV+tjWidU5l/c9Gw60xyc48JwZ+WYXMwP65YAfOLxYy6OQXIJiKXx5OP9xsFsRthcEK3ey/W8G+d7uyeoEyr949/Dg5sAneBCcFcSDZ+Z9JaqP0vH9LdY4W06jJ1fvYLrGw/WEz1zc+xfcSKaygP0r8jhjLA03r6ivmdoY4b+lWd5sAiCc3pl4vuXnuCS9fPuLuZHwe+Od/l9Z9fjeyWlW7BmkcIOsOyRj/KYAYCgWhKsWoyCsCRXVVyRHct20cfxllueCQAI9/AUMLi/7RpQXXs/vUnoITNfd/ZPjnX2S2XJli2/rtM4D8fJtdSFO12HWrQbl46Tz6tuucUAwFwdz3kZJbtdd/Wy8m4/lVWH/6CrunlXes1ySqSW0vFfFsO+SbOBEM0vrMN/0DUQ7xYBMkoThlTK++Dk+84U0ni+Brol5QAqYSuSlNNx08SBeuXfyzTFgkLKqgLhQKGwlY24oHDVyhtZQ6mZriKmi+hn6JjVaOfL58EUL2inP06PfM5bkfdTK1lP7U9p8/FkRctpfz85vlcygvxKVaXrMl91zABAt2TTZSY2bA5ftkJyfSy4X68NN+6e2bgcTQAgk0UU0rRsYKruB2C6UU42F1S9vCAA8DTXuhqjQY2SWcTBlNQeIAczpYghORi07gfLAee0AlkOSKpyrRdc1zDpIeCuBiWPmWpKpTEbEIjaWBwMxGtnnwjkaL5vC0i7qeiKRDFPx+zcLermF5AE8+krp4c3OQgSQPn9p2O2jlmtjMZXKxjzO/TFp06PbnIaJICCEiPe1iGYfFSffjxDp6+LKWOEEN/rWynuyB8rVi6ouowZAKhlhiu4pWIwnWJvz0L75LOcczd1mgDALIjRbVggu1LOzcU51xoEAG3QRIsSQVWqDwNqKWM1aKz/GaChZuAG4ZT3DlHN3DHrJ/bunAjG36/X4CvODAU9jxrxADmczbkwO4B42WsklObFt0RA2hBsSyRmcBwVDc/+JXGav7J/cE6ErI4Rq/xVwaJ2Q8/M/diwPJ/sDDf+cZfdyU7IaV5om3nvgJowDAS1i0iA5RcDmu7NVKi205iJ77LVsjy8iYOr4uaAplcxhTfa9FrBsuTh8Qp+ldFuyeBuxXRHhVdU5A2ZkYL3R2Bux+lRVImbzqfIhREa0bIzxmZg8v1PdbIaejl3WJI13gVo00IFiwDGCZ20uJDTXav4U0eA+RlS57K60HVspKiKEERB3hXquBu1v17wpEflrg6VHQfJlsWbF3Va/XhhlPjZWk5YbgBC82AtpymWMTWAplVPesGq2UCFwm7Xgzuhc2trCm0IgrWPv+QnsKnJWXkRU6GiArMmGRWGT04/ZaovgIF0R3wVJtOSLI9RaW1RRvwYBXnKiVN+6tHlR+rkKoTTlg9YFT9ul9DEwJcXdKdV7Ug+6Xy/MZVElxXCCmJvbh3u0kksCd/Ee1ZvQ6zAeLZ8F9guK4T8MhOCmV+lW+ByPEAnwcq43pyHmrMyMb7Z+lQkkHNwGP/+754KJACZKJNQgnX0neaUJdlvfiEy3YtG7Fs8e2PWDYyBlTVe3HK0I7OcRWybyn73k3UqsXhRuTBXKBT18V0M1syxgq1HV3uUgXnjLWPm38tsl33PsNaX/wHjVcZAybjc9tmks/LzclfWZMOiGYatVHa7d8JUWMEgdjYyO0BzeceCVaA6O1g/hfbCIDc2C++mUBw2bSlB0Ms99z7WJXv0N3u2Bs+1AnUkob84gdlq2gOvN/q+DgBwfZuJjM7P6aQnxb7CGDPaS9s4VDyjlpbSJmPzU3OynDxEOCn1Xmgvq8p7LrT0uwcmZG2jTcaLz8OzlWnu+ExG3bHemcz6cgnmjhOZXeYmoFpT3sKB8kIfRZP4ayc3mhGMNsPs6nCyrtA9ruDaEDzpJM4SouKUmGEqL6bu0lZjxMjDxPGClnS5RrbuGgFsmB3SNJUkxx9Ccu7L3p3RwUbCgngNuePkCN8tp0lsSHjgAygF6VYEa83eIe3jNAYnjfiTfb9VGViXc0n57kd1ainjoGvVowb6kt4iOeRqsEUCi+CVRXdhFB5EFXlAHTRLx4W10UNOsbtdnCJyw5faYDYBoMXLSjgB4JUh52rpguiJym7pxCWWDGCjA0DNB5He2Tok19wJdHI5UXJAPUmwBrPvqx0oOR8NIm6Yx5xaKjzgPPXIP6u7kd+E6FS5low6zaREAtYoSSSSWVIpkJIllt8kkLoZ2jc7awABvd6wrGmYA0N26o4767t8lbRW4gdg3hqOrSkEcFyIR+bs2s6fWJ31H4oyU3JrvEc0L0VWGtSdun7dy6pJzan08F6jHfbWaB/Uo6rcljFC/U2x0EnWKPq8NmkTegNNtI5/yQrjFthGTS2Zjbp+6mImWbOFNwnm+NnZARPWrrf6JMtR0tQx3Ut5TAx6D7bRsm7EDsf26hMYZxagWsDQytAi86K+BxTKwrbBXz02T5A6hnC7TPShkFsPGNGgO8Hl/+5M+fXqp3BrEWNup9QZmDv2MuyW41qWCOIh9VidR1FI3t9iIpBEB/NLsJHnLL3Uw//XIkxqpAISqXzFj9IDeenYVykud5K+Kb22leq8Vc7mY/MuUUZmkqmqea+MI461kXhoN/aT7oHxiSOLLmuCxP6Q8MYeviS6lcuDW1cD/2Dqh9SrefQpxk4ZC633BUFYvY60jGn8PF7axDFMtelDxZUCv1G5ad/uKWHOxekNUHGQQNpoo07uoBKamSMMmmyB7HjCS1BIezg+qFaed6PAyq4YVEv0ALdK81S29kg/ynvNqGSPBcttbH5BYX2702EF0Lbj/euw29cVQvStXjlJ3Wb4n1qVLR+nPmiW52snQCtXJ2e/O4qB5lPvAwmaSV+0NsDs7kunUgtXvvyGaSO8V7dI3LfzT60w5+eF2/qnoD1hrw+v+PNgd2M9tE8T/kd/bG/sOdKt9GaaEpIElL6W7iIpUKxG3cpMB3cClmLeM3Pj+IqlVNw8lJrp6EK5bzPskc4angNpH+odHq0ceUsmrrflp+jEkGBgi5NXyvwn7k/UbFt6hxtip/cmyuE3zc3rMs8L0qbCzMBTpFiCsJCg6DRX2InCQeiDieISSOc6rCB5MZZVAvwHwssK9zKtOUluBTlSt+TXq4EteDTLQ31usDgnhL+O/ryoui1N0yspbl/F8j1Zrdfc/Lf+Wbz4fat/Nfg/TQdr/nJlQ+k3ma223OysWf77wYGyX6QpVe9/5ftUx/j5isH6JwyB1FjZgDGm/FFiNNoT1qYS06JnAxbaGYFifc/3+gtn2YWxibzrE9R4qfgdWRU0QJ1oW7kYAg53xvjWFz2gWhG1gAqKN3Q3hOfxXK4Ty/1MOSqFVLyVb6t5y0KuVPOc93DvgYRTL9KKdomZqY3bnNncwM03/I3cnIvphq5et8VUDdl7tLXYJ6s5NLAWijZ5/mrFWDmfnENgSUClSR9QYuA8Y8J3h8cGFEU06kweTaIpux16XScbRADpunQBowHHi8DM0vrOqM9hYzUi126yhN+z+JRMlwAYonJoL8tsmhFhxNP51GgZoqc/KOkwu33tszDdMqugUNEg5GHPsn0Smo7pjS4icJMYrcU/PbLTbXGA6RQFR0WMEzUScBTFoF/IFi9+RPMdjmi5nbTVCYNnUtPL2KxuJYwXwklzMk9vK3PXpL9BAGmP7pXYKpAtEuSVHNXoJzoQPGwyjm1OG8YBiqHoWxZRiLbcbvCdi6UMauft3G29S1zdCevOuXl+nquyE8el36Tz4w3ROtRnMcpPV/gCZtQGVSn97cJ2HWzRXJh32Bx0oN4m7Tl0g0bsHtt0O8O3UcPfcNMLxQ1mrbDswSJom/HY2A59V5bY9YDPYN5bIvMz1BJcDL54RBWEVI35rS0qkUFy7mpaNTC2yz4DxG4N1pxs3UTDhRhBYuqM20/qFC/KjqE/jPdGulMpPhPVgZzZU8NLJwF3k93kC+2hHoh9aqbPYJcGJGbOjk7lm5XVfxJbqT/Ql++cUlnjGPOSoJRYbDvU6wpneZ+1d5ycsEspDYniCeKW5b/aGisX4jylp88Gj1tGEkrvR+QYn45kRXE8ZTXuhLeVvlmnLnOKpUJYPyvtkz/3Bx3uoX75hLVPnoLH8uXGLEsrdj00xfjsZR4j4VKk4ZbcNNJVnZHeb6cq/ZPS7SrmbMdEf9DHQWf6egMHNoG1qoAaIpfTDKMAZX9jJ6Z9BEJD+vTIXl6PMXucxAMQ1xGOCbjj7gRwtyvTekvUbhk35fMKUxlm1efRRmH8t7Tvm8CeUYKeTFikrMTAgEwxdtcYaPwmYKUptFZQHcHvCI1MjWOAXLcYHCvJGyiNKFQ0xKZVaaDjqQJDy30Px5E2K4WNsZsVXCtny4ch0053oGwmDW6T2MAfwF5QswktnCHVwvr4Y6JbUxh+hhiS3uMqWOLyHQt7lWTWecEXcCuguMwBa8vKI2ApCbJNlMxdTPFE1LXxhzalnGqVaW7HGEbpC1aL4TYCFHe1w23k2TU1QEwSEPERDGyIbTN+OXLUz4bXlse2BgsZtTPhGGtGAiT46Zh1UBmXcbLNoNSp9orSODZQNNQ9MBA70tIgdY8lA4aP7eT2SZfFH7d3PNJNdAtGzICd2qW8kB+SRFPu2e3XkdQ6NnxkxWwjayrZIW9T7WeXo57tmhN1X1ithVI6SfdaPjnJUTFaPTMvQZIOxy7k1Op4ry0Q6TgSA6UbZ+hdIQV4rfElsJzLiWZYxKNsXgvKW7vDpYZqdNnmqVYVBJRVSiBuzRlhLVpsFhlh/i0DaOtVLXWo1oAlMk1cDf6NFeBdu6+OniwvePlL7UoD+Vq0p3gK0Unzj8Y3RiqBzRPLe/BWFivbzjzI9Rc+uoinjCUzRbWOAEa0Cc3KQaJq2fP4sJUS5p+XrNutznTr+kvTgQXgnpnM5Z+XaKaFXJEq5aI66gBAJ+6+e7PM+aLf+nP1843uPd143tOtbu/poUHzn2rkCT67wYw9AIPpmf921UuJEQtgAVqf0GtXzg/dObxaK9U/YiiiGaYAhk/ms7Yd7GazUJzZd+aUjLMlQfVR2uGQg3YM03vbW1kkVh6xQRvGyAdwJelwB5Bc58d0kPysHT60Beuc/3IE336FDfziLNSoyjG585GYrBY4Hz/16CJx9nfd/ThE1WTzGiKxQPvL8J3e8px8NyubBCYMvwlbxWdmt5hvA9eqrFzsAdpYSqMscmgzR2FA/b72+Vq98e3l2fqmMhUaeJxEO5C4sdPEtlLEHNSjOXkb8y6+KxDXfG/K3vkFa7Ofs5m+X7heIm0UuioDzw99o2AUZ9oIQgP+09bSXRs/Vqmyz5LRknwLge0Ug8b1rzkg/5JrUKoznc7dUeUAcZtZckuTR/BHVovmuF0nAsQ6ZxIazLuTE01owJFx/29nGWU6VXsmGevNZTqq4D5hZ6rFLUBqO+AXKqFAfLxF8nb506T+et6jxn7ds2qgopGP7OjV6my473EGt+To4uhlPpGxvNq32QnvnHHigNDOGSdO1qR9hION9AKHfP8qo4mv5QNiLLmZrIpXZULRPpYODB54bkORr5hv1Ef28dfGXp3o0zrShlRfrZLQm9G6bgDgBtUaMYw5RQcHfiQ9F29D2a2Wb0G2Qp/VsAiVFVmvslqt1Kc6zpdpEKNbi4BP4nF3dRdcpROkgtEy38IGzXO3BVxh7T8AMAUCPlo/iwbiM27XBWRXDR9OklvSbKA77Y868F1aBWgCiuppCaBNYAeG93LAQvbY3YBX/ZftAMBU1eKd8XvfVGPxLi01tdqOsX9T2315uIHeTHU0HafAR7dV0jZ91WVpHgCADpCxibstgKaZSR/AHTs7CKBauyEGwE0DVEiOHPGpD3Ff8/N9rV76RKud1+emf/8WuguwX+z/2I+QZYFMQVuXokixFRuK+0X+Jhh8iF9yMc4MD/leG0C7lo4dEL6P6L7m5/uqVWa5FJ+ashvHpg6p/e7/VI4RE75sQjXLEWbkj7UH8bolDobctY9AOTM65I9tANUwR7zDubz9CtLQ5/Ir8BvrTeGY40faG6jVAeRqSj4q6wYANKUFuIeLur4O0kzPxa5d3PkaSTNboY87tAiVFYE+7mihSuIs7rIW0TpNJNzVXcBJJ1AlvXW+BXub5xIBvl37DwD0zgHcs348BmQat5QALUxxZgEdrb+wwLlpFcxhobOVVf+cjqji3coG/1SifYLJbxR2sh0Mh/fdQuQgo7V8VNYFAJzbWVmfj5S34kk9fhPqXz/x+Dr+xOcETdvz6J2dTh+gToSi8JlsHggYtJyhKQjcs6YAAIA9kCtghX89ZOcf3k7na0INOz/oNpRSr9cBAGgDotmyXIQrjiQWiaD+CSmmKfT+sin9WcS0ca38fsqNXiu970iMVosGv/LoH3or/iINwpOfC98DIixUsZQGV1dQ2hKT/+2y+99n5+J8WqLN7US1p/3snpRfNHUC3yKjf/2k9fcv9Z1+E31GXFmNmj3iE4zys8vb5GDI9IBdrKIpSwNWFeSjcm4AYCWshggLhhRbk8KPncSpLPrGZ3m1smNltgC8bIU+uzAifHVF4uFK2EXhqyRO3FNcGSIAYOmi1iZY9s5BNNdS+tQ5x62hz4zW/QMAXBkqDa0f2aGsoHLN6lIhSomTGk7BvyyKEyVXkGnoleMYhcglvHYwUS1lF+huDQNRrcucuJrEEuuK3elGujYvTc9ubY9zc/5y5XC/1JSO7/ZbQ4l2ju8JS7IWvnWNm29D++b8d6nQ9OtXW59+ueLtAttX1MD24zc0ffiNwP77hu4y/8nqJvNptAM2Hfih67MvOAva+urrWz99tfXRV0//fHX8Zz3lfvmq9MkXlFf7FN8Ha3rv/e6DL8gnuD+nKve7V1Ofe+V3bVD4mPX/nO61cK/N/iP7/WsugdSV6iq2f1LyvXS2tdJFVaII4s/sRBoJXWzKazNLtCBQMGVTAAC4OnPSag9tc23mjE47dMRrKkp5ovijisoR9FpalwcAHCLIxbOCc1Unm3Xg1vr3GPeyueN28VtCx9bpu42SLoHOsHLgcaULyrPOE8W2NFBaPjEIjTvtquwtrOHpY3ZPMPCud/zmHIycXrrk/bjcGeqoeQw46/ZnIKXLOeuW9XhvxgRC8X4WOw5GSk8YpSpcjk0MWH35q24AgDU1LerCmLWbYYE3t7i76/vfrIV4xrrwuCN5iUM87CqJuYiz4mYtQwQAmoKuamyCde3KXvN9wO5Vz90ttqILvF76DwCoBFV6Wz9aScjZaB4C7OyC+PYLWQEWp+hv49CaaKUunFXg3vN497RdoupkygTjhVQ3z60CpNH0sCv6wNLsKqYPnK0x7bEJ9ixrBwBcog8NDV8gNiFMs11IaNewtdJDAuAtzQMA5ANOVnDT6VzlcLaMzBTWCRGHc2tlT0kO79BqmIoc3uoOKJSW+NK5yr6wh4vygilP5DO0DobJDEN7jaLI6iprqGfIfxwMfeLq+MrB8JjHsAG0zej0JEx1K43Ix6CfQH4rfcaPg1EyC1FVcJTnY0omfz6ALw2GPH4a9O1gdMyL2ACqEo74BG26JbrW9cpAqEDgHzoYMT1MjCom0Lubdd0AwN1lQPxxD+zmdoEdKrv0hVhJ1kJc09UV5YCkcrjgKolacfctQwQAegjdudgEy9q2Ouf7AC+b53INpLn2HwDgUoAa1o9VgK6NZjCAB6o4DlMqyDD0ypJopVpQL9BdwDxMW8tzgVImB6OPWCqLD6P7JTN+nsf8y+1RpSvVi9aERAsC6m4AAIDt02/pdsZS972llE0yS1qqC+msEPhUGv3taXSVcIyuDKIGwklazsQQQnbWEwAApIN/XdUiaCw3B7Gdzg9HB7WP63UAAG8ZEs5ZLhEn+TAWSVS1woynIBFGEce7vdPti/g947uCc9xsh/l26QGXPz/cRbDXO83TZymdaTH6vOQzlSRjmyCrCG29dglbc5LNm+QkWy359PoLAPd55UXRRzO1RylWCjhPnSEAcG4/01EKqEkX2tKEu85u7gakzTV27T2Fwmct9O7UXTGFQKa6jPqU8wifZZBMp5cgAgAzEyyJW11q20RdHmhq0zmXPtJPd9b9AwAZLjQ30/bZ0kG3qgzmNoN8z9EtjBnezk2aDUR8I/eObEkJdJ8CLXCiOyqtYJEcfI7uWApleUsg3uzs+4Pee/LE5fwla5W8Bwof/7vAqv4AkkpV0VnNhJ4Gys8m3LVY5xG+yN53vnT4Pxlx/iuPXI7Bef+fPcFR5scTnZfdcygqFm1q+dMb/bK1cY98P8W6AhaGybuav6ptfmb5IvD9O2igX8wui7L5vat8fAhlLp8/crOPaF7w43OZS/FXF2SpVDG78p2hYQcj9bXGRimujgS1IUZp8qcAgECiUpkxfFo6HVmy2U4rXxeW1lZh6TSrSj0WT0vyAIA1fd0Y38MKDmpC1dMrGcGBqnGtbGEFVVutBrEb6tZ1RZkVbqUL8mr3zK2D9FxxdpU8slEBnfvG+E9S+BzTqcgiak+nZ+hgxT9M99Edf9wzJTqOO4aoPStlvYpwfp3dsuvAAYBud+ux8GzsZgzBy1F2u1cyBhkL6fReg8WgwVNU6qM+1mUaxLC0CPZ+BnRXdyHdNtG2gdlunsMuF9C97B8AIIf+dtv6GQHoo9EEBMxYFSNbERDdQVqli4VAUi/Qjd0ULGX81822lONtdZFDKCfuDCQxUNfeateTgbqrW2OeFX13Z107AGBUQz1zKz4TTd+DdNuZLPrkrLViHHiZtXkAAEoL0DBxqQXQUjPyUvahAmBnS4EKOrtBLqghdEDZ1cQXvlOWrD7cABp/vynIVkWcu9MMQ9uEopDFuM8x1nf8bW34gexII3ean6wBtEPo9ATNlJUHZ+dS44c32X59I+aMmWYhqsWNUFb4S9P3ZPzd7zWUZqzxMs131gCqzY02VKVsZeSbPp/x9w35PpPx56m0RypVkgHr1PJRniEAsJXTpiSZkHB3NOc+XKQ4nxxlCe6yumJMv++uUoKH6ypE9DXqz93dReVM0Y5Oy6G4gm7BmXL9PwCAgLp1Hy6bub0FJiIHJmc0vRj27YPdWaEolu6BcBmD05ME2uHSfwE=`, `base64`)).toString();
 
   return patch;
 }
diff --git a/yarn.lock b/yarn.lock
index 1dde8eb03f46..cc6398bcc007 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25767,7 +25767,7 @@ typescript@^4.4.1-rc:
 
 "typescript@patch:typescript@3.7.x#~builtin<compat/typescript>":
   version: 3.7.5
-  resolution: "typescript@patch:typescript@npm%3A3.7.5#~builtin<compat/typescript>::version=3.7.5&hash=c34a14"
+  resolution: "typescript@patch:typescript@npm%3A3.7.5#~builtin<compat/typescript>::version=3.7.5&hash=beae0b"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
@@ -25777,7 +25777,7 @@ typescript@^4.4.1-rc:
 
 "typescript@patch:typescript@^3.8.3#~builtin<compat/typescript>":
   version: 3.9.5
-  resolution: "typescript@patch:typescript@npm%3A3.9.5#~builtin<compat/typescript>::version=3.9.5&hash=c34a14"
+  resolution: "typescript@patch:typescript@npm%3A3.9.5#~builtin<compat/typescript>::version=3.9.5&hash=beae0b"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
@@ -25787,11 +25787,11 @@ typescript@^4.4.1-rc:
 
 "typescript@patch:typescript@^4.4.1-rc#~builtin<compat/typescript>":
   version: 4.4.1-rc
-  resolution: "typescript@patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=c34a14"
+  resolution: "typescript@patch:typescript@npm%3A4.4.1-rc#~builtin<compat/typescript>::version=4.4.1-rc&hash=beae0b"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 9067b747c22c4d5b56d0da8b9d1a583872d060dcccb3ea4ddf869ad57d792c965e80481fedd7948ee38dc68e14f119b8ca4181b017a1d1b1012e8a4353d6332f
+  checksum: c7dfa42499ac0f0af87d1b87dac7ba1f0db120c84d9e13fc036347aaddc8b468d617bb39580546cd040cf16f1c07f4f01917c43fb58ba4eac09bae55a5c41ba6
   languageName: node
   linkType: hard