Skip to content

Commit aa2eebd

Browse files
authored
fix(compat): update patch for [email protected] (#6134)
**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 580f593 commit aa2eebd

14 files changed

+1900
-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/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.4.0-beta-sdk",
3+
"version": "5.4.1-rc-sdk",
44
"main": "./lib/typescript.js",
55
"type": "commonjs",
66
"bin": {

.yarn/versions/266d3a2c.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.4.0-beta"
31+
"typescript": "5.4.1-rc"
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.4.0-beta"
99+
"typescript": "5.4.1-rc"
100100
},
101101
"browserslist": {
102102
"production": [

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

+8-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,14 @@ const SLICES = [
209209
from: `9420c380b6f1f072ff66372cbf776fafd6eeed1c`,
210210
to: `9420c380b6f1f072ff66372cbf776fafd6eeed1c`,
211211
onto: `e80675868dff622d0870939e7c9930c68904e7e7`,
212-
range: `>=5.4.0-beta`,
212+
range: `>=5.4.0-beta <5.4.1-rc`,
213+
},
214+
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-5.4-rc
215+
{
216+
from: `786e26825dad9dcc0eff79610bffd8bb121e7e8a`,
217+
to: `786e26825dad9dcc0eff79610bffd8bb121e7e8a`,
218+
onto: `db6b2a980280a9c87799b9c1edd6d71e92bb255b`,
219+
range: `>=5.4.1-rc`,
213220
},
214221
];
215222

0 commit comments

Comments
 (0)