Skip to content

Commit e50e8d0

Browse files
committed
fix(compat): update patch for [email protected] (#6533)
**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 d6df30d commit e50e8d0

File tree

5 files changed

+1076
-6
lines changed

5 files changed

+1076
-6
lines changed

.yarn/versions/ef453d28.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
@@ -295,7 +295,14 @@ const SLICES = [
295295
from: `0102e47303cb33503219740015f711e2fe7d89ab`,
296296
to: `0102e47303cb33503219740015f711e2fe7d89ab`,
297297
onto: `6212132b835145b1a8fd49982680ac668caf3ddc`,
298-
range: `>=5.6.1-rc`,
298+
range: `>=5.6.1-rc <5.7.0-beta`,
299+
},
300+
// https://github.com/yarnpkg/TypeScript/tree/merceyz/pnp-5.7-beta
301+
{
302+
from: `18776a771f795ecc2535ee56705ea9fdb786a569`,
303+
to: `519971751e31f38542a608abf21ba3d61c5c3f93`,
304+
onto: `69fb689edbbce517a4615be9d356c6c812639849`,
305+
range: `>=5.7.0-beta`,
299306
},
300307
];
301308

packages/plugin-compat/extra/typescript/patch-3171c5f0d6ba563d63efef87d42d0baf.diff

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff --git a/lib/tsc.js b/lib/tsc.js
22
index 1af7d4794..74d702d96 100644
3-
semver exclusivity >=5.6.1-rc
3+
semver exclusivity >=5.6.1-rc <5.7.0-beta
44
--- a/lib/tsc.js
55
+++ b/lib/tsc.js
66
@@ -5064,6 +5064,9 @@ var sys = (() => {
@@ -335,7 +335,7 @@ semver exclusivity >=5.6.1-rc
335335
break;
336336
diff --git a/lib/tsserver.js b/lib/tsserver.js
337337
index f38266561..a38dfeb1c 100644
338-
semver exclusivity >=5.6.1-rc
338+
semver exclusivity >=5.6.1-rc <5.7.0-beta
339339
--- a/lib/tsserver.js
340340
+++ b/lib/tsserver.js
341341
@@ -53,6 +53,25 @@ var import_net = __toESM(require("net"));
@@ -388,7 +388,7 @@ semver exclusivity >=5.6.1-rc
388388
this.installer.on("message", (m) => this.handleMessage(m));
389389
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
390390
index 963c5732b..1ea17a9bc 100644
391-
semver exclusivity >=5.6.1-rc
391+
semver exclusivity >=5.6.1-rc <5.7.0-beta
392392
--- a/lib/typescript.d.ts
393393
+++ b/lib/typescript.d.ts
394394
@@ -3242,6 +3242,7 @@ declare namespace ts {
@@ -418,7 +418,7 @@ semver exclusivity >=5.6.1-rc
418418
function resolveTripleslashReference(moduleName: string, containingFile: string): string;
419419
diff --git a/lib/typescript.js b/lib/typescript.js
420420
index 4dae4289c..842eaf260 100644
421-
semver exclusivity >=5.6.1-rc
421+
semver exclusivity >=5.6.1-rc <5.7.0-beta
422422
--- a/lib/typescript.js
423423
+++ b/lib/typescript.js
424424
@@ -8450,6 +8450,9 @@ var sys = (() => {

0 commit comments

Comments
 (0)