fix(compat): update patch for typescript@4.9.4 (#5127)

yarnpkg · Dec 9, 2022 · 2e625d5 · 2e625d5
1 parent 97f5ae1
commit 2e625d5
Show file tree

Hide file tree

Showing 15 changed files with 3,126 additions and 40 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/...pt-npm-4.9.2-rc-b775bd0446-0652e08b39.zip → ...cript-npm-4.9.4-51bdca3293-e782fb9e00.zip b/...pt-npm-4.9.2-rc-b775bd0446-0652e08b39.zip → ...cript-npm-4.9.4-51bdca3293-e782fb9e00.zip
diff --git a/...ypescript-patch-5896ebc2c5-4116739056.zip → ...ypescript-patch-7bc527fc0a-1caaea6cb7.zip b/...ypescript-patch-5896ebc2c5-4116739056.zip → ...ypescript-patch-7bc527fc0a-1caaea6cb7.zip
diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "4.9.2-rc-sdk",
+  "version": "4.9.4-sdk",
   "main": "./lib/typescript.js",
   "type": "commonjs"
 }
diff --git a/.yarn/versions/34615a3d.yml b/.yarn/versions/34615a3d.yml
@@ -0,0 +1,23 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/plugin-compat": patch
+
+declined:
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,10 @@ Yarn now accepts sponsorships! Please give a look at our [OpenCollective](https:
 
 - The `pnpm` linker no longer reports duplicate "incompatible virtual" warnings.
 
+### Compatibility
+
+- Updates the PnP compatibility layer for TypeScript v4.9.4.
+
 ## 3.3.0
 
 ### Installs

diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "jest-junit": "^10.0.0",
     "micromatch": "^4.0.2",
     "tslib": "^1.13.0",
-    "typescript": "4.9.2-rc"
+    "typescript": "4.9.4"
   },
   "resolutions": {
     "yoga-layout-prebuilt": "patch:yoga-layout-prebuilt@1.10.0#./.yarn/patches/yoga-layout-prebuilt.patch"

diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
@@ -87,7 +87,7 @@
     "typedoc": "next",
     "typedoc-neo-theme": "^1.0.7",
     "typedoc-plugin-yarn": "portal:./typedoc-plugin-yarn",
-    "typescript": "4.9.2-rc",
+    "typescript": "4.9.4",
     "unescape-html": "^1.1.0",
     "unfetch": "^4.1.0",
     "unified": "^7.1.0",

diff --git a/packages/plugin-compat/extra/typescript/gen-typescript-patch.js b/packages/plugin-compat/extra/typescript/gen-typescript-patch.js
@@ -134,12 +134,19 @@ const SLICES = [
     onto: `549b5429d4837344e8c99657109bb6538fd2dbb5`,
     range: `>=4.9.1-beta <4.9.2-rc`,
   },
-  // https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.9
+  // https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.9-rc
   {
     from: `5613f8d8e30dfa9fb3da15e2b8432ed7e2347a12`,
     to: `5613f8d8e30dfa9fb3da15e2b8432ed7e2347a12`,
     onto: `107f832b80df2dc97748021cb00af2b6813db75b`,
-    range: `>=4.9.2-rc`,
+    range: `>=4.9.2-rc <4.9.4`,
+  },
+  // https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.9
+  {
+    from: `a0859a75a408ec95222a3f0175ba0644d60396f1`,
+    to: `a0859a75a408ec95222a3f0175ba0644d60396f1`,
+    onto: `e2868216f637e875a74c675845625eb15dcfe9a2`,
+    range: `>=4.9.4`,
   },
 ];
 

diff --git a/packages/plugin-compat/extra/typescript/patch-1ce83e2ded83efd369d6977d44c96d9b.diff b/packages/plugin-compat/extra/typescript/patch-1ce83e2ded83efd369d6977d44c96d9b.diff
@@ -1,6 +1,6 @@
 diff --git a/lib/tsc.js b/lib/tsc.js
 index c2c5c03f3..e0fe07b55 100644
-semver exclusivity >=4.9.2-rc
+semver exclusivity >=4.9.2-rc <4.9.4
 --- a/lib/tsc.js
 +++ b/lib/tsc.js
 @@ -4691,6 +4691,9 @@ var ts;
@@ -306,7 +306,7 @@ semver exclusivity >=4.9.2-rc
                      synchronizeProgram();
 diff --git a/lib/tsserver.js b/lib/tsserver.js
 index fc48171a6..cf705f299 100644
-semver exclusivity >=4.9.2-rc
+semver exclusivity >=4.9.2-rc <4.9.4
 --- a/lib/tsserver.js
 +++ b/lib/tsserver.js
 @@ -7303,6 +7303,11 @@ var ts;
@@ -977,7 +977,7 @@ semver exclusivity >=4.9.2-rc
                      // We have to schedule this event to the next tick
 diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
 index ec521e9cc..aed501c4c 100644
-semver exclusivity >=4.9.2-rc
+semver exclusivity >=4.9.2-rc <4.9.4
 --- a/lib/tsserverlibrary.js
 +++ b/lib/tsserverlibrary.js
 @@ -7302,6 +7302,11 @@ var ts;
@@ -1624,7 +1624,7 @@ semver exclusivity >=4.9.2-rc
                  var watchers = this.packageJsonFilesMap || (this.packageJsonFilesMap = new ts.Map());
 diff --git a/lib/typescript.js b/lib/typescript.js
 index 530b87683..78b127f0a 100644
-semver exclusivity >=4.9.2-rc
+semver exclusivity >=4.9.2-rc <4.9.4
 --- a/lib/typescript.js
 +++ b/lib/typescript.js
 @@ -7293,6 +7293,11 @@ var ts;
@@ -2167,7 +2167,7 @@ semver exclusivity >=4.9.2-rc
              });
 diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
 index 59e716a7b..86a522796 100644
-semver exclusivity >=4.9.2-rc
+semver exclusivity >=4.9.2-rc <4.9.4
 --- a/lib/typescriptServices.js
 +++ b/lib/typescriptServices.js
 @@ -7293,6 +7293,11 @@ var ts;
@@ -2710,7 +2710,7 @@ semver exclusivity >=4.9.2-rc
              });
 diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
 index ed96b5050..8d8200f20 100644
-semver exclusivity >=4.9.2-rc
+semver exclusivity >=4.9.2-rc <4.9.4
 --- a/lib/typingsInstaller.js
 +++ b/lib/typingsInstaller.js
 @@ -7283,6 +7283,11 @@ var ts;