Skip to content

Commit

Permalink
fix(compat): update patch for [email protected] (#5759)
Browse files Browse the repository at this point in the history
**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.
  • Loading branch information
merceyz committed Oct 3, 2023
1 parent fdfc784 commit 36a66b6
Show file tree
Hide file tree
Showing 15 changed files with 1,873 additions and 35 deletions.
26 changes: 13 additions & 13 deletions .pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion .yarn/sdks/typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "typescript",
"version": "5.2.1-rc-sdk",
"version": "5.3.0-beta-sdk",
"main": "./lib/typescript.js",
"type": "commonjs"
}
23 changes: 23 additions & 0 deletions .yarn/versions/2e12e567.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
releases:
"@yarnpkg/cli": patch
"@yarnpkg/plugin-compat": patch

declined:
- "@yarnpkg/plugin-constraints"
- "@yarnpkg/plugin-dlx"
- "@yarnpkg/plugin-essentials"
- "@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/builder"
- "@yarnpkg/core"
- "@yarnpkg/doctor"
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"jest": "^29.2.1",
"pirates": "^4.0.5",
"tslib": "^2.4.0",
"typescript": "5.2.1-rc"
"typescript": "5.3.0-beta"
},
"resolutions": {
"ink": "patch:ink@npm%3A3.0.8#~/.yarn/patches/ink-npm-3.0.8-3a8005f59f.patch",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,14 @@ const SLICES = [
from: `8c288a316928c9c161215fdf91ef015caa610d5b`,
to: `8c288a316928c9c161215fdf91ef015caa610d5b`,
onto: `6074b9d12b70757fe68ab2b4da059ea363c4df04`,
range: `>=5.2.1-rc`,
range: `>=5.2.1-rc <5.3.0-beta`,
},
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-5.3
{
from: `2b564c684dc5338c59c31f4658b737912ad46336`,
to: `2b564c684dc5338c59c31f4658b737912ad46336`,
onto: `c5de6b57b7f09a6d17eb4a5dab91ecf8f5b25f29`,
range: `>=5.3.0-beta`,
},
];

Expand Down
Loading

0 comments on commit 36a66b6

Please sign in to comment.