fix(compat): update patch for [email protected] (#4339)

yarnpkg · Apr 11, 2022 · c1744ef · c1744ef
1 parent 24b5417
commit c1744ef
Show file tree

Hide file tree

Showing 18 changed files with 3,276 additions and 51 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/typescript-npm-4.6.1-rc-942474d1a3-f222509795.zip b/.yarn/cache/typescript-npm-4.6.1-rc-942474d1a3-f222509795.zip
diff --git a/.yarn/cache/typescript-npm-4.7.0-beta-899519b94a-cebef22a4a.zip b/.yarn/cache/typescript-npm-4.7.0-beta-899519b94a-cebef22a4a.zip
diff --git a/...ypescript-patch-f16b0e83cb-060f1bcb5c.zip → ...ypescript-patch-5b340b6a68-060f1bcb5c.zip b/...ypescript-patch-f16b0e83cb-060f1bcb5c.zip → ...ypescript-patch-5b340b6a68-060f1bcb5c.zip
diff --git a/.yarn/cache/typescript-patch-837e16e609-8c1dfb967c.zip b/.yarn/cache/typescript-patch-837e16e609-8c1dfb967c.zip
diff --git a/...ypescript-patch-5d1bc9f9fc-3af69ac96e.zip → ...ypescript-patch-d43a45b201-3af69ac96e.zip b/...ypescript-patch-5d1bc9f9fc-3af69ac96e.zip → ...ypescript-patch-d43a45b201-3af69ac96e.zip
diff --git a/.yarn/cache/typescript-patch-f9ea81cdec-56fb68e55b.zip b/.yarn/cache/typescript-patch-f9ea81cdec-56fb68e55b.zip
diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json
@@ -1,6 +1,6 @@
 {
  "name": "typescript",
- "version": "4.6.1-rc-sdk",
+ "version": "4.7.0-beta-sdk",
  "main": "./lib/typescript.js",
  "type": "commonjs"
 }
diff --git a/.yarn/versions/76d52f09.yml b/.yarn/versions/76d52f09.yml
@@ -0,0 +1,24 @@
+releases:
+ "@yarnpkg/builder": patch
+ "@yarnpkg/cli": patch
+ "@yarnpkg/doctor": patch
+ "@yarnpkg/plugin-compat": patch
+
+declined:
+ - "@yarnpkg/plugin-constraints"
+ - "@yarnpkg/plugin-dlx"
+ - "@yarnpkg/plugin-essentials"
+ - "@yarnpkg/plugin-exec"
+ - "@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/core"
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
  "eslint": "^8.2.0",
  "jest": "^26.0.1",
  "tslib": "^1.13.0",
- "typescript": "4.6.1-rc"
+ "typescript": "4.7.0-beta"
  },
  "resolutions": {
  "ink": "patch:ink@npm%3A3.0.8#~/.yarn/patches/ink-npm-3.0.8-3a8005f59f.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.6.1-rc",
+ "typescript": "4.7.0-beta",
  "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
@@ -90,7 +90,14 @@ const SLICES = [
  from: `fbec717ef33fc2db5791f2a1d5f9a315e293a50a`,
  to: `fbec717ef33fc2db5791f2a1d5f9a315e293a50a`,
  onto: `83efc9f0d646bf86a3469e00c5ef5e4f7ab7cb95`,
- range: `>=4.6.1-rc`,
+ range: `>=4.6.1-rc <4.7`,
+ },
+ // https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.7
+ {
+ from: `cd8d000510ed2d2910e0ebaa903a51adda546a0a`,
+ to: `cd8d000510ed2d2910e0ebaa903a51adda546a0a`,
+ onto: `6e62273fa1e7469b89b589667c2c233789c62176`,
+ range: `>=4.7.0-beta`,
  },
 ];