Skip to content

Commit

Permalink
fix(compat): update patch for [email protected] (#6533)
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 authored Oct 15, 2024
1 parent 50d87b5 commit 157da5c
Show file tree
Hide file tree
Showing 5 changed files with 1,076 additions and 6 deletions.
23 changes: 23 additions & 0 deletions .yarn/versions/ef453d28.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
Expand Up @@ -295,7 +295,14 @@ const SLICES = [
from: `0102e47303cb33503219740015f711e2fe7d89ab`,
to: `0102e47303cb33503219740015f711e2fe7d89ab`,
onto: `6212132b835145b1a8fd49982680ac668caf3ddc`,
range: `>=5.6.1-rc`,
range: `>=5.6.1-rc <5.7.0-beta`,
},
// https://github.com/yarnpkg/TypeScript/tree/merceyz/pnp-5.7-beta
{
from: `18776a771f795ecc2535ee56705ea9fdb786a569`,
to: `519971751e31f38542a608abf21ba3d61c5c3f93`,
onto: `69fb689edbbce517a4615be9d356c6c812639849`,
range: `>=5.7.0-beta`,
},
];

Expand Down
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 1af7d4794..74d702d96 100644
semver exclusivity >=5.6.1-rc
semver exclusivity >=5.6.1-rc <5.7.0-beta
--- a/lib/tsc.js
+++ b/lib/tsc.js
@@ -5064,6 +5064,9 @@ var sys = (() => {
Expand Down Expand Up @@ -335,7 +335,7 @@ semver exclusivity >=5.6.1-rc
break;
diff --git a/lib/tsserver.js b/lib/tsserver.js
index f38266561..a38dfeb1c 100644
semver exclusivity >=5.6.1-rc
semver exclusivity >=5.6.1-rc <5.7.0-beta
--- a/lib/tsserver.js
+++ b/lib/tsserver.js
@@ -53,6 +53,25 @@ var import_net = __toESM(require("net"));
Expand Down Expand Up @@ -388,7 +388,7 @@ semver exclusivity >=5.6.1-rc
this.installer.on("message", (m) => this.handleMessage(m));
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
index 963c5732b..1ea17a9bc 100644
semver exclusivity >=5.6.1-rc
semver exclusivity >=5.6.1-rc <5.7.0-beta
--- a/lib/typescript.d.ts
+++ b/lib/typescript.d.ts
@@ -3242,6 +3242,7 @@ declare namespace ts {
Expand Down Expand Up @@ -418,7 +418,7 @@ semver exclusivity >=5.6.1-rc
function resolveTripleslashReference(moduleName: string, containingFile: string): string;
diff --git a/lib/typescript.js b/lib/typescript.js
index 4dae4289c..842eaf260 100644
semver exclusivity >=5.6.1-rc
semver exclusivity >=5.6.1-rc <5.7.0-beta
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -8450,6 +8450,9 @@ var sys = (() => {
Expand Down
Loading

0 comments on commit 157da5c

Please sign in to comment.