Skip to content

Commit aa557fe

Browse files
authored
fix(compat): update patch for typescript@5.7.1-rc (#6591)
**What's the problem this PR addresses?** The PnP compatibility patch for TypeScript doesn't apply to `typescript@5.7.1-rc`. 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 fe7c10a commit aa557fe

File tree

5 files changed

+1028
-6
lines changed

5 files changed

+1028
-6
lines changed

.yarn/versions/d5e5a3b6.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"

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

+8-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,14 @@ const SLICES = [
302302
from: `18776a771f795ecc2535ee56705ea9fdb786a569`,
303303
to: `519971751e31f38542a608abf21ba3d61c5c3f93`,
304304
onto: `69fb689edbbce517a4615be9d356c6c812639849`,
305-
range: `>=5.7.0-beta`,
305+
range: `>=5.7.0-beta <5.7.1-rc`,
306+
},
307+
// https://github.com/yarnpkg/TypeScript/tree/merceyz/pnp-5.7-rc
308+
{
309+
from: `99f3e130bbe02473680bfa040d131c1f7f08fcc0`,
310+
to: `99f3e130bbe02473680bfa040d131c1f7f08fcc0`,
311+
onto: `c1216dea1a504da7b89b5221b925abcd1702d7e4`,
312+
range: `>=5.7.1-rc`,
306313
},
307314
];
308315

0 commit comments

Comments
 (0)