Skip to content

Commit

Permalink
fix(compat): update patch for [email protected] (#6461)
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.
merceyz committed Aug 24, 2024
1 parent f29bb60 commit a69a09d
Showing 5 changed files with 1,080 additions and 6 deletions.
23 changes: 23 additions & 0 deletions .yarn/versions/a147fbbf.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"
Original file line number Diff line number Diff line change
@@ -288,7 +288,14 @@ const SLICES = [
from: `b774b54693034b8aeae7f9a7b24d25fcacdbc8a5`,
to: `b774b54693034b8aeae7f9a7b24d25fcacdbc8a5`,
onto: `b4732bdd6199ec353ec0873f334515f391d80d3b`,
range: `>=5.6.0-beta`,
range: `>=5.6.0-beta <5.6.1-rc`,
},
// https://github.com/yarnpkg/TypeScript/tree/merceyz/pnp-5.6-rc
{
from: `0102e47303cb33503219740015f711e2fe7d89ab`,
to: `0102e47303cb33503219740015f711e2fe7d89ab`,
onto: `6212132b835145b1a8fd49982680ac668caf3ddc`,
range: `>=5.6.1-rc`,
},
];

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff --git a/lib/tsc.js b/lib/tsc.js
index c9113e23c..8d141d301 100644
semver exclusivity >=5.6.0-beta
semver exclusivity >=5.6.0-beta <5.6.1-rc
--- a/lib/tsc.js
+++ b/lib/tsc.js
@@ -5064,6 +5064,9 @@ var sys = (() => {
@@ -330,7 +330,7 @@ semver exclusivity >=5.6.0-beta
break;
diff --git a/lib/tsserver.js b/lib/tsserver.js
index bf00af3be..9140dc50b 100644
semver exclusivity >=5.6.0-beta
semver exclusivity >=5.6.0-beta <5.6.1-rc
--- a/lib/tsserver.js
+++ b/lib/tsserver.js
@@ -53,6 +53,25 @@ var import_net = __toESM(require("net"));
@@ -383,7 +383,7 @@ semver exclusivity >=5.6.0-beta
this.installer.on("message", (m) => this.handleMessage(m));
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
index 7070d1cde..0b33587cf 100644
semver exclusivity >=5.6.0-beta
semver exclusivity >=5.6.0-beta <5.6.1-rc
--- a/lib/typescript.d.ts
+++ b/lib/typescript.d.ts
@@ -3242,6 +3242,7 @@ declare namespace ts {
@@ -413,7 +413,7 @@ semver exclusivity >=5.6.0-beta
function resolveTripleslashReference(moduleName: string, containingFile: string): string;
diff --git a/lib/typescript.js b/lib/typescript.js
index eb00df40a..79a588a4f 100644
semver exclusivity >=5.6.0-beta
semver exclusivity >=5.6.0-beta <5.6.1-rc
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -8441,6 +8441,9 @@ var sys = (() => {
2 changes: 1 addition & 1 deletion packages/plugin-compat/sources/patches/typescript.patch.ts

Large diffs are not rendered by default.

0 comments on commit a69a09d

Please sign in to comment.