Skip to content

Commit 6e83a63

Browse files
committed
fix(compat): update patch for [email protected] (#5537)
**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 0e9e3ab commit 6e83a63

File tree

14 files changed

+2473
-38
lines changed

14 files changed

+2473
-38
lines changed

.pnp.cjs

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
6.89 MB
Binary file not shown.
6.88 MB
Binary file not shown.

.yarn/sdks/typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "typescript",
3-
"version": "5.1.1-rc-sdk",
3+
"version": "5.2.0-beta-sdk",
44
"main": "./lib/typescript.js",
55
"type": "commonjs"
66
}

.yarn/versions/a3cf0228.yml

Lines changed: 23 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"jest-junit": "^10.0.0",
3737
"micromatch": "^4.0.2",
3838
"tslib": "^1.13.0",
39-
"typescript": "5.1.1-rc"
39+
"typescript": "5.2.0-beta"
4040
},
4141
"resolutions": {
4242
"yoga-layout-prebuilt": "patch:[email protected]#./.yarn/patches/yoga-layout-prebuilt.patch"

packages/gatsby/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"typedoc": "next",
8888
"typedoc-neo-theme": "^1.0.7",
8989
"typedoc-plugin-yarn": "portal:./typedoc-plugin-yarn",
90-
"typescript": "5.1.1-rc",
90+
"typescript": "5.2.0-beta",
9191
"unescape-html": "^1.1.0",
9292
"unfetch": "^4.1.0",
9393
"unified": "^7.1.0",

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,14 @@ const SLICES = [
174174
from: `20514ce182c598568e4a9c7ed60a4ce84740cecd`,
175175
to: `20514ce182c598568e4a9c7ed60a4ce84740cecd`,
176176
onto: `5c47c6ab567cace50ab5f331a7381b9f0edb56ca`,
177-
range: `>=5.1.1-rc`,
177+
range: `>=5.1.1-rc <5.2.0-beta`,
178+
},
179+
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-5.2
180+
{
181+
from: `8781702c1b45bd2d5d437c0a138dd62b57b9b284`,
182+
to: `8781702c1b45bd2d5d437c0a138dd62b57b9b284`,
183+
onto: `d6e7eb6cf08a1cc8fb6d9888f74b0e694cc2a7b0`,
184+
range: `>=5.2.0-beta`,
178185
},
179186
];
180187

packages/plugin-compat/extra/typescript/patch-03c1ee97fa010722cf442756059d02bf.diff

Lines changed: 5 additions & 5 deletions
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 80de55fe3..867742baa 100644
3-
semver exclusivity >=5.1.1-rc
3+
semver exclusivity >=5.1.1-rc <5.2.0-beta
44
--- a/lib/tsc.js
55
+++ b/lib/tsc.js
66
@@ -5051,6 +5051,9 @@ var sys = (() => {
@@ -345,7 +345,7 @@ semver exclusivity >=5.1.1-rc
345345
function reloadFileNamesFromConfigFile() {
346346
diff --git a/lib/tsserver.js b/lib/tsserver.js
347347
index ec8709520..e61459b87 100644
348-
semver exclusivity >=5.1.1-rc
348+
semver exclusivity >=5.1.1-rc <5.2.0-beta
349349
--- a/lib/tsserver.js
350350
+++ b/lib/tsserver.js
351351
@@ -8547,6 +8547,9 @@ var sys = (() => {
@@ -998,7 +998,7 @@ semver exclusivity >=5.1.1-rc
998998
this.installer.on("message", (m) => this.handleMessage(m));
999999
diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
10001000
index 22e446c17..a81409276 100644
1001-
semver exclusivity >=5.1.1-rc
1001+
semver exclusivity >=5.1.1-rc <5.2.0-beta
10021002
--- a/lib/tsserverlibrary.js
10031003
+++ b/lib/tsserverlibrary.js
10041004
@@ -6342,6 +6342,9 @@ ${lanes.join("\n")}
@@ -1697,7 +1697,7 @@ semver exclusivity >=5.1.1-rc
16971697
if (!watchers.has(path)) {
16981698
diff --git a/lib/typescript.js b/lib/typescript.js
16991699
index 87906a6eb..192bb763f 100644
1700-
semver exclusivity >=5.1.1-rc
1700+
semver exclusivity >=5.1.1-rc <5.2.0-beta
17011701
--- a/lib/typescript.js
17021702
+++ b/lib/typescript.js
17031703
@@ -6342,6 +6342,9 @@ ${lanes.join("\n")}
@@ -2294,7 +2294,7 @@ semver exclusivity >=5.1.1-rc
22942294
kindPrecedence = {
22952295
diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
22962296
index 5f70f8de5..a39cfe0cf 100644
2297-
semver exclusivity >=5.1.1-rc
2297+
semver exclusivity >=5.1.1-rc <5.2.0-beta
22982298
--- a/lib/typingsInstaller.js
22992299
+++ b/lib/typingsInstaller.js
23002300
@@ -4461,6 +4461,9 @@ var sys = (() => {

0 commit comments

Comments
 (0)