feat(compat): update patch for typescript 4.3.2

yarnpkg · May 26, 2021 · b442b9b · b442b9b
1 parent 50a7a1e
commit b442b9b
Show file tree

Hide file tree

Showing 27 changed files with 3,001 additions and 123 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/typescript-npm-4.3.0-beta-d5555c96df-c165f915ad.zip b/.yarn/cache/typescript-npm-4.3.0-beta-d5555c96df-c165f915ad.zip
diff --git a/.yarn/cache/typescript-npm-4.3.2-d108b26f78-c2a86fa03c.zip b/.yarn/cache/typescript-npm-4.3.2-d108b26f78-c2a86fa03c.zip
diff --git a/...ypescript-patch-1bfd6f21e9-fb62f24bfd.zip → ...ypescript-patch-27393e5d9e-fb62f24bfd.zip b/...ypescript-patch-1bfd6f21e9-fb62f24bfd.zip → ...ypescript-patch-27393e5d9e-fb62f24bfd.zip
diff --git a/.yarn/cache/typescript-patch-4079614479-ca7a161bc6.zip b/.yarn/cache/typescript-patch-4079614479-ca7a161bc6.zip
diff --git a/.yarn/cache/typescript-patch-4ee61fd2fa-3d3dec06ba.zip b/.yarn/cache/typescript-patch-4ee61fd2fa-3d3dec06ba.zip
diff --git a/...ypescript-patch-c1e370d24c-ac6b67d951.zip → ...ypescript-patch-e8a55c01a3-ac6b67d951.zip b/...ypescript-patch-c1e370d24c-ac6b67d951.zip → ...ypescript-patch-e8a55c01a3-ac6b67d951.zip
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": "beta"
+    "typescript": "^4.3.2"
   },
   "resolutions": {
     "yoga-layout-prebuilt": "patch:[email protected]#./.yarn/patches/yoga-layout-prebuilt.patch"

diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
@@ -78,7 +78,7 @@
     "typedoc": "next",
     "typedoc-neo-theme": "^1.0.7",
     "typedoc-plugin-yarn": "portal:./typedoc-plugin-yarn",
-    "typescript": "beta",
+    "typescript": "^4.3.2",
     "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
@@ -58,7 +58,12 @@ const SLICES = [{
   from: `320a959`,
   to: `508e98b`,
   onto: `f9b35cd`,
-  range: `>=4.3`,
+  range: `>=4.3 <4.3.1-rc`,
+}, {
+  from: `530aad19e4ac19d35cb6b200168c91ce86cb0050`,
+  to: `5d8917857cf32d06824f97320c878f08a532e2d0`,
+  onto: `28e3e6ff2f49f1dbf06d31809ec73dbe42f1aa63`,
+  range: `>=4.3.1-rc`,
 }];
 
 async function fetch(url) {
@@ -183,6 +188,7 @@ async function cloneRepository() {
 
   await execFile(`git`, [`fetch`, `origin`], TS_REPO_SPAWN);
   await execFile(`git`, [`fetch`, `upstream`], TS_REPO_SPAWN);
+  await execFile(`git`, [`fetch`, `upstream2`], TS_REPO_SPAWN);
 }
 
 async function resetGit(hash) {

diff --git a/packages/plugin-compat/extra/typescript/patch-0e534e9202b290be0c54938a4711a8e2.diff b/packages/plugin-compat/extra/typescript/patch-0e534e9202b290be0c54938a4711a8e2.diff
diff --git a/...tch-98f5e425be004a406efe4231fdfb46c7.diff → ...tch-8620acf99aada088fa89332ce2fe8f64.diff b/...tch-98f5e425be004a406efe4231fdfb46c7.diff → ...tch-8620acf99aada088fa89332ce2fe8f64.diff
@@ -1,6 +1,6 @@
 diff --git a/lib/tsc.js b/lib/tsc.js
 index 8e68a1124..4fd64540e 100644
-semver exclusivity >=4.3
+semver exclusivity >=4.3 <4.3.1-rc
 --- a/lib/tsc.js
 +++ b/lib/tsc.js
 @@ -4692,6 +4692,9 @@ var ts;
@@ -300,7 +300,7 @@ semver exclusivity >=4.3
                      synchronizeProgram();
 diff --git a/lib/tsserver.js b/lib/tsserver.js
 index 0d581ad61..c1dbea5bc 100644
-semver exclusivity >=4.3
+semver exclusivity >=4.3 <4.3.1-rc
 --- a/lib/tsserver.js
 +++ b/lib/tsserver.js
 @@ -7326,6 +7326,11 @@ var ts;
@@ -915,7 +915,7 @@ semver exclusivity >=4.3
                      // We have to schedule this event to the next tick
 diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts
 index a2ff8fc1e..e32bcee85 100644
-semver exclusivity >=4.3
+semver exclusivity >=4.3 <4.3.1-rc
 --- a/lib/tsserverlibrary.d.ts
 +++ b/lib/tsserverlibrary.d.ts
 @@ -4709,6 +4709,7 @@ declare namespace ts {
@@ -928,7 +928,7 @@ semver exclusivity >=4.3
       * 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 e33bc9110..3d92b0d0c 100644
-semver exclusivity >=4.3
+semver exclusivity >=4.3 <4.3.1-rc
 --- a/lib/tsserverlibrary.js
 +++ b/lib/tsserverlibrary.js
 @@ -7520,6 +7520,11 @@ var ts;
@@ -1523,7 +1523,7 @@ semver exclusivity >=4.3
                  var watchers = this.packageJsonFilesMap || (this.packageJsonFilesMap = new ts.Map());
 diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
 index 0b2d291ee..050fb9cf1 100644
-semver exclusivity >=4.3
+semver exclusivity >=4.3 <4.3.1-rc
 --- a/lib/typescript.d.ts
 +++ b/lib/typescript.d.ts
 @@ -4709,6 +4709,7 @@ declare namespace ts {
@@ -1536,7 +1536,7 @@ semver exclusivity >=4.3
       * 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 07337021a..d65d71c25 100644
-semver exclusivity >=4.3
+semver exclusivity >=4.3 <4.3.1-rc
 --- a/lib/typescript.js
 +++ b/lib/typescript.js
 @@ -7520,6 +7520,11 @@ var ts;
@@ -2032,7 +2032,7 @@ semver exclusivity >=4.3
              });
 diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts
 index 56e1d342d..09de6de0e 100644
-semver exclusivity >=4.3
+semver exclusivity >=4.3 <4.3.1-rc
 --- a/lib/typescriptServices.d.ts
 +++ b/lib/typescriptServices.d.ts
 @@ -4709,6 +4709,7 @@ declare namespace ts {
@@ -2045,7 +2045,7 @@ semver exclusivity >=4.3
       * 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 f81ca89a1..1a0d25685 100644
-semver exclusivity >=4.3
+semver exclusivity >=4.3 <4.3.1-rc
 --- a/lib/typescriptServices.js
 +++ b/lib/typescriptServices.js
 @@ -7520,6 +7520,11 @@ var ts;
@@ -2541,7 +2541,7 @@ semver exclusivity >=4.3
              });
 diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
 index ef8ee6dd2..ee3d9b719 100644
-semver exclusivity >=4.3
+semver exclusivity >=4.3 <4.3.1-rc
 --- a/lib/typingsInstaller.js
 +++ b/lib/typingsInstaller.js
 @@ -7315,6 +7315,11 @@ var ts;

diff --git a/packages/plugin-compat/sources/patches/typescript.patch.ts b/packages/plugin-compat/sources/patches/typescript.patch.ts
diff --git a/packages/plugin-constraints/package.json b/packages/plugin-constraints/package.json
@@ -25,7 +25,7 @@
     "@yarnpkg/builder": "workspace:*",
     "@yarnpkg/cli": "workspace:*",
     "@yarnpkg/core": "workspace:*",
-    "typescript": "beta"
+    "typescript": "^4.3.2"
   },
   "scripts": {
     "build:plugin-constraints": "builder build plugin",

diff --git a/packages/plugin-exec/package.json b/packages/plugin-exec/package.json
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@yarnpkg/core": "workspace:*",
-    "typescript": "beta"
+    "typescript": "^4.3.2"
   },
   "scripts": {
     "build:plugin-exec": "builder build plugin",

diff --git a/packages/plugin-interactive-tools/package.json b/packages/plugin-interactive-tools/package.json
@@ -27,7 +27,7 @@
     "@yarnpkg/cli": "workspace:*",
     "@yarnpkg/core": "workspace:*",
     "@yarnpkg/plugin-essentials": "workspace:*",
-    "typescript": "beta"
+    "typescript": "^4.3.2"
   },
   "repository": {
     "type": "git",

diff --git a/packages/plugin-stage/package.json b/packages/plugin-stage/package.json
@@ -16,7 +16,7 @@
     "@yarnpkg/builder": "workspace:*",
     "@yarnpkg/cli": "workspace:*",
     "@yarnpkg/core": "workspace:*",
-    "typescript": "beta"
+    "typescript": "^4.3.2"
   },
   "scripts": {
     "build:plugin-stage": "builder build plugin",

diff --git a/packages/plugin-typescript/package.json b/packages/plugin-typescript/package.json
@@ -21,7 +21,7 @@
     "@yarnpkg/cli": "workspace:*",
     "@yarnpkg/core": "workspace:*",
     "@yarnpkg/plugin-essentials": "workspace:*",
-    "typescript": "beta"
+    "typescript": "^4.3.2"
   },
   "scripts": {
     "build:plugin-typescript": "builder build plugin",

diff --git a/packages/plugin-version/package.json b/packages/plugin-version/package.json
@@ -25,7 +25,7 @@
     "@yarnpkg/cli": "workspace:*",
     "@yarnpkg/core": "workspace:*",
     "@yarnpkg/plugin-pack": "workspace:*",
-    "typescript": "beta"
+    "typescript": "^4.3.2"
   },
   "scripts": {
     "build:plugin-version": "builder build plugin",

diff --git a/packages/plugin-workspace-tools/package.json b/packages/plugin-workspace-tools/package.json
@@ -20,7 +20,7 @@
     "@yarnpkg/builder": "workspace:*",
     "@yarnpkg/cli": "workspace:*",
     "@yarnpkg/core": "workspace:*",
-    "typescript": "beta"
+    "typescript": "^4.3.2"
   },
   "scripts": {
     "build:plugin-workspace-tools": "builder build plugin",

diff --git a/packages/vscode-zipfs/package.json b/packages/vscode-zipfs/package.json
@@ -75,7 +75,7 @@
     "@yarnpkg/libzip": "workspace:*",
     "@yarnpkg/pnpify": "workspace:*",
     "ts-loader": "^7.0.5",
-    "typescript": "beta",
+    "typescript": "^4.3.2",
     "vsce": "^1.85.1",
     "webpack": "^5.1.1",
     "webpack-cli": "^4.0.0-beta.8"

diff --git a/packages/yarnpkg-builder/package.json b/packages/yarnpkg-builder/package.json
@@ -31,7 +31,7 @@
     "@types/terser-webpack-plugin": "^3.0.0",
     "@types/webpack-merge": "^4.1.5",
     "@yarnpkg/monorepo": "workspace:*",
-    "typescript": "beta"
+    "typescript": "^4.3.2"
   },
   "peerDependencies": {
     "typescript": "*"

diff --git a/packages/yarnpkg-cli/package.json b/packages/yarnpkg-cli/package.json
@@ -40,7 +40,7 @@
     "@yarnpkg/monorepo": "workspace:*",
     "@yarnpkg/pnpify": "workspace:*",
     "micromatch": "^4.0.2",
-    "typescript": "beta"
+    "typescript": "^4.3.2"
   },
   "peerDependencies": {
     "@yarnpkg/core": "^3.0.0-rc.2"

diff --git a/packages/yarnpkg-doctor/package.json b/packages/yarnpkg-doctor/package.json
@@ -12,7 +12,7 @@
     "micromatch": "^4.0.2",
     "p-limit": "^2.2.0",
     "tslib": "^1.13.0",
-    "typescript": "beta"
+    "typescript": "^4.3.2"
   },
   "devDependencies": {
     "@types/micromatch": "^4.0.1",

diff --git a/packages/yarnpkg-pnp/package.json b/packages/yarnpkg-pnp/package.json
@@ -13,7 +13,7 @@
     "@yarnpkg/builder": "workspace:*",
     "@yarnpkg/libzip": "workspace:*",
     "@yarnpkg/monorepo": "workspace:*",
-    "typescript": "beta",
+    "typescript": "^4.3.2",
     "webpack": "^5.1.1",
     "webpack-cli": "^4.0.0-beta.8"
   },

diff --git a/packages/yarnpkg-pnpify/package.json b/packages/yarnpkg-pnpify/package.json
@@ -22,7 +22,7 @@
     "@yarnpkg/monorepo": "workspace:*",
     "@yarnpkg/pnp": "workspace:*",
     "eslint": "^6.8.0",
-    "typescript": "beta"
+    "typescript": "^4.3.2"
   },
   "peerDependencies": {
     "eslint": "*",