Skip to content

Commit 14ff342

Browse files
committed
fix(compat): update patch for [email protected] (#6349)
**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 866e929 commit 14ff342

File tree

5 files changed

+1087
-6
lines changed

5 files changed

+1087
-6
lines changed

.yarn/versions/cab716b2.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
@@ -274,7 +274,14 @@ const SLICES = [
274274
from: `f90eb7508e66a3d5066b1d8a06606c6c23f3df43`,
275275
to: `43d2cbd6ac423e35a5a095a509fc90c03f0c22ba`,
276276
onto: `b574864abc989d0f8b15367baea1058819e126ba`,
277-
range: `>=5.5.0-beta`,
277+
range: `>=5.5.0-beta <5.5.2`,
278+
},
279+
// https://github.com/yarnpkg/TypeScript/tree/merceyz/pnp-5.5
280+
{
281+
from: `5b321aa5835f9f4dba6d55553fd559985d44b1a9`,
282+
to: `c41328460d8dba2fac56c220803c68ca961d7cd5`,
283+
onto: `ce2e60e4ea15a65992e54a9e8877d16be9d42abb`,
284+
range: `>=5.5.2`,
278285
},
279286
];
280287

packages/plugin-compat/extra/typescript/patch-51ab57a4392bdf0fe1e44f78309540a3.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 06f7f5ec9..4a7e28076 100644
3-
semver exclusivity >=5.5.0-beta
3+
semver exclusivity >=5.5.0-beta <5.5.2
44
--- a/lib/tsc.js
55
+++ b/lib/tsc.js
66
@@ -5120,6 +5120,9 @@ var sys = (() => {
@@ -347,7 +347,7 @@ semver exclusivity >=5.5.0-beta
347347
function reloadFileNamesFromConfigFile() {
348348
diff --git a/lib/tsserver.js b/lib/tsserver.js
349349
index 50cc6659c..9cefc330a 100644
350-
semver exclusivity >=5.5.0-beta
350+
semver exclusivity >=5.5.0-beta <5.5.2
351351
--- a/lib/tsserver.js
352352
+++ b/lib/tsserver.js
353353
@@ -33,6 +33,25 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
@@ -400,7 +400,7 @@ semver exclusivity >=5.5.0-beta
400400
this.installer.on("message", (m) => this.handleMessage(m));
401401
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
402402
index f4c59a844..631850d94 100644
403-
semver exclusivity >=5.5.0-beta
403+
semver exclusivity >=5.5.0-beta <5.5.2
404404
--- a/lib/typescript.d.ts
405405
+++ b/lib/typescript.d.ts
406406
@@ -9339,6 +9339,8 @@ declare namespace ts {
@@ -414,7 +414,7 @@ semver exclusivity >=5.5.0-beta
414414
function resolveTripleslashReference(moduleName: string, containingFile: string): string;
415415
diff --git a/lib/typescript.js b/lib/typescript.js
416416
index 6b52dd675..22cf43d26 100644
417-
semver exclusivity >=5.5.0-beta
417+
semver exclusivity >=5.5.0-beta <5.5.2
418418
--- a/lib/typescript.js
419419
+++ b/lib/typescript.js
420420
@@ -8708,6 +8708,9 @@ var sys = (() => {

0 commit comments

Comments
 (0)