Skip to content

Commit

Permalink
fix(compat): update patch for [email protected] (#5916)
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 Nov 13, 2023
1 parent 13c46e3 commit e6f50ad
Show file tree
Hide file tree
Showing 13 changed files with 1,887 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.
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.3.0-beta-sdk",
"version": "5.3.1-rc-sdk",
"main": "./lib/typescript.js",
"type": "commonjs",
"bin": {
Expand Down
23 changes: 23 additions & 0 deletions .yarn/versions/3527e830.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.3.0-beta"
"typescript": "5.3.1-rc"
},
"resolutions": {
"ink": "patch:ink@npm%3A3.0.8#~/.yarn/patches/ink-npm-3.0.8-3a8005f59f.patch",
Expand Down
11 changes: 9 additions & 2 deletions packages/plugin-compat/extra/typescript/gen-typescript-patch.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,19 @@ const SLICES = [
onto: `6074b9d12b70757fe68ab2b4da059ea363c4df04`,
range: `>=5.2.1-rc <5.3.0-beta`,
},
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-5.3
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-5.3-beta
{
from: `2b564c684dc5338c59c31f4658b737912ad46336`,
to: `2b564c684dc5338c59c31f4658b737912ad46336`,
onto: `c5de6b57b7f09a6d17eb4a5dab91ecf8f5b25f29`,
range: `>=5.3.0-beta`,
range: `>=5.3.0-beta <5.3.1-rc`,
},
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-5.3
{
from: `9fb5c1cac14376fe615dfd48ddbe4e97c2e6ac90`,
to: `9fb5c1cac14376fe615dfd48ddbe4e97c2e6ac90`,
onto: `88f80c75e1a4ab6aaec605aa4ec6281b87871ff0`,
range: `>=5.3.1-rc`,
},
];

Expand Down
Loading

0 comments on commit e6f50ad

Please sign in to comment.