Skip to content

Commit 063be09

Browse files
authored
fix(compat): update patch for [email protected] (#5448)
**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 db1600b commit 063be09

File tree

14 files changed

+2474
-39
lines changed

14 files changed

+2474
-39
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.

.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.0-beta-sdk",
3+
"version": "5.1.1-rc-sdk",
44
"main": "./lib/typescript.js",
55
"type": "commonjs"
66
}

.yarn/versions/085a24f3.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
@@ -25,7 +25,7 @@
2525
"jest": "^29.2.1",
2626
"pirates": "^4.0.5",
2727
"tslib": "^2.4.0",
28-
"typescript": "5.1.0-beta"
28+
"typescript": "5.1.1-rc"
2929
},
3030
"resolutions": {
3131
"ink": "patch:ink@npm%3A3.0.8#~/.yarn/patches/ink-npm-3.0.8-3a8005f59f.patch",

packages/gatsby/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"typedoc": "patch:typedoc@npm%3A0.17.0-3#~/.yarn/patches/typedoc-npm-0.17.0-3-0ce05847cf.patch",
9090
"typedoc-neo-theme": "^1.0.7",
9191
"typedoc-plugin-yarn": "portal:./typedoc-plugin-yarn",
92-
"typescript": "5.1.0-beta",
92+
"typescript": "5.1.1-rc",
9393
"unescape-html": "^1.1.0",
9494
"unfetch": "^4.1.0",
9595
"unified": "^7.1.0",

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,19 @@ const SLICES = [
162162
onto: `89515ce7e31d0bfaef776ac25929a78015cceb82`,
163163
range: `>=5.0.1-rc <5.1.0-beta`,
164164
},
165-
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-5.1
165+
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-5.1-beta
166166
{
167167
from: `a6ef895fb06014c416cce2f80969912ec5ea47d5`,
168168
to: `a6ef895fb06014c416cce2f80969912ec5ea47d5`,
169169
onto: `1c5cc6152322cd5b131b6e617e0947bcb068fc4a`,
170-
range: `>=5.1.0-beta`,
170+
range: `>=5.1.0-beta <5.1.1-rc`,
171+
},
172+
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-5.1
173+
{
174+
from: `20514ce182c598568e4a9c7ed60a4ce84740cecd`,
175+
to: `20514ce182c598568e4a9c7ed60a4ce84740cecd`,
176+
onto: `5c47c6ab567cace50ab5f331a7381b9f0edb56ca`,
177+
range: `>=5.1.1-rc`,
171178
},
172179
];
173180

0 commit comments

Comments
 (0)