Skip to content

Commit 16c1d99

Browse files
merceyzmerceyz
authored
fix(compat): update patch for [email protected] (#6110)
**What's the problem this PR addresses?** The PnP compatibility patch for TypeScript doesn't apply to `[email protected]`. Ref microsoft/TypeScript#35206 **How did you fix it?** Rebased it. **Checklist** - [x] I have read the [Contributing Guide](https://yarnpkg.com/advanced/contributing). - [x] I have set the packages that need to be released for my changes to be effective. - [x] I will check that all automated PR checks pass before the PR gets reviewed.
1 parent 124e562 commit 16c1d99

14 files changed

+1892
-40
lines changed

‎.pnp.cjs

+16-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.yarn/cache/typescript-npm-5.3.3-6b23a5da18-6e4e6a14a5.zip ‎.yarn/cache/typescript-npm-5.4.0-beta-db25933c00-380556e1a8.zip

5.56 MB
Binary file not shown.

‎.yarn/cache/typescript-patch-4778c7998b-c93786fcc9.zip ‎.yarn/cache/typescript-patch-a52014a3cb-7188bd33c6.zip

5.57 MB
Binary file not shown.

‎.yarn/sdks/typescript/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "typescript",
3-
"version": "5.3.1-rc-sdk",
3+
"version": "5.4.0-beta-sdk",
44
"main": "./lib/typescript.js",
55
"type": "commonjs",
66
"bin": {

‎.yarn/versions/abc251f1.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
releases:
2+
"@yarnpkg/cli": patch
3+
"@yarnpkg/plugin-compat": patch
4+
5+
declined:
6+
- "@yarnpkg/plugin-constraints"
7+
- "@yarnpkg/plugin-dlx"
8+
- "@yarnpkg/plugin-essentials"
9+
- "@yarnpkg/plugin-init"
10+
- "@yarnpkg/plugin-interactive-tools"
11+
- "@yarnpkg/plugin-nm"
12+
- "@yarnpkg/plugin-npm-cli"
13+
- "@yarnpkg/plugin-pack"
14+
- "@yarnpkg/plugin-patch"
15+
- "@yarnpkg/plugin-pnp"
16+
- "@yarnpkg/plugin-pnpm"
17+
- "@yarnpkg/plugin-stage"
18+
- "@yarnpkg/plugin-typescript"
19+
- "@yarnpkg/plugin-version"
20+
- "@yarnpkg/plugin-workspace-tools"
21+
- "@yarnpkg/builder"
22+
- "@yarnpkg/core"
23+
- "@yarnpkg/doctor"

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"jest": "^29.2.1",
2929
"pirates": "^4.0.5",
3030
"tslib": "^2.4.0",
31-
"typescript": "^5.3.3"
31+
"typescript": "5.4.0-beta"
3232
},
3333
"resolutions": {
3434
"ink": "patch:ink@npm%3A3.0.8#~/.yarn/patches/ink-npm-3.0.8-3a8005f59f.patch",

‎packages/docusaurus/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"esbuild-loader": "^2.20.0",
9797
"fast-glob": "^3.2.2",
9898
"typedoc": "^0.25.3",
99-
"typescript": "^5.3.3"
99+
"typescript": "5.4.0-beta"
100100
},
101101
"browserslist": {
102102
"production": [

‎packages/plugin-compat/extra/typescript/gen-typescript-patch.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,14 @@ const SLICES = [
202202
from: `9fb5c1cac14376fe615dfd48ddbe4e97c2e6ac90`,
203203
to: `9fb5c1cac14376fe615dfd48ddbe4e97c2e6ac90`,
204204
onto: `88f80c75e1a4ab6aaec605aa4ec6281b87871ff0`,
205-
range: `>=5.3.1-rc`,
205+
range: `>=5.3.1-rc <5.4.0-beta`,
206+
},
207+
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-5.4-beta
208+
{
209+
from: `9420c380b6f1f072ff66372cbf776fafd6eeed1c`,
210+
to: `9420c380b6f1f072ff66372cbf776fafd6eeed1c`,
211+
onto: `e80675868dff622d0870939e7c9930c68904e7e7`,
212+
range: `>=5.4.0-beta`,
206213
},
207214
];
208215

‎packages/plugin-compat/extra/typescript/patch-787b808f0e4ee81872d9ddabdcb024e1.diff

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff --git a/lib/tsc.js b/lib/tsc.js
22
index f82b0a23b..8d4a85e8b 100644
3-
semver exclusivity >=5.3.1-rc
3+
semver exclusivity >=5.3.1-rc <5.4.0-beta
44
--- a/lib/tsc.js
55
+++ b/lib/tsc.js
66
@@ -5059,6 +5059,9 @@ var sys = (() => {
@@ -345,7 +345,7 @@ semver exclusivity >=5.3.1-rc
345345
function reloadFileNamesFromConfigFile() {
346346
diff --git a/lib/tsserver.js b/lib/tsserver.js
347347
index c4e9b0b40..f48e9267f 100644
348-
semver exclusivity >=5.3.1-rc
348+
semver exclusivity >=5.3.1-rc <5.4.0-beta
349349
--- a/lib/tsserver.js
350350
+++ b/lib/tsserver.js
351351
@@ -8575,6 +8575,9 @@ var sys = (() => {
@@ -998,7 +998,7 @@ semver exclusivity >=5.3.1-rc
998998
this.installer.on("message", (m) => this.handleMessage(m));
999999
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
10001000
index 5ee1d5258..0fbd109c0 100644
1001-
semver exclusivity >=5.3.1-rc
1001+
semver exclusivity >=5.3.1-rc <5.4.0-beta
10021002
--- a/lib/typescript.d.ts
10031003
+++ b/lib/typescript.d.ts
10041004
@@ -9853,6 +9853,8 @@ declare namespace ts {
@@ -1012,7 +1012,7 @@ semver exclusivity >=5.3.1-rc
10121012
function resolveTripleslashReference(moduleName: string, containingFile: string): string;
10131013
diff --git a/lib/typescript.js b/lib/typescript.js
10141014
index 780582944..9865ec301 100644
1015-
semver exclusivity >=5.3.1-rc
1015+
semver exclusivity >=5.3.1-rc <5.4.0-beta
10161016
--- a/lib/typescript.js
10171017
+++ b/lib/typescript.js
10181018
@@ -6346,6 +6346,9 @@ ${lanes.join("\n")}
@@ -1711,7 +1711,7 @@ semver exclusivity >=5.3.1-rc
17111711
if (!watchers.has(path)) {
17121712
diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
17131713
index 6dd57dedd..08a78a158 100644
1714-
semver exclusivity >=5.3.1-rc
1714+
semver exclusivity >=5.3.1-rc <5.4.0-beta
17151715
--- a/lib/typingsInstaller.js
17161716
+++ b/lib/typingsInstaller.js
17171717
@@ -4472,6 +4472,9 @@ var sys = (() => {

0 commit comments

Comments
 (0)