Skip to content

Commit

Permalink
fix(compat): update patch for [email protected] (#6349)
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 Jun 21, 2024
1 parent de389fc commit 12254ec
Show file tree
Hide file tree
Showing 14 changed files with 1,120 additions and 39 deletions.
32 changes: 16 additions & 16 deletions .pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion .yarn/sdks/typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "typescript",
"version": "5.5.0-beta-sdk",
"version": "5.5.2-sdk",
"main": "./lib/typescript.js",
"type": "commonjs",
"bin": {
Expand Down
23 changes: 23 additions & 0 deletions .yarn/versions/cab716b2.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"
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"jest": "^29.2.1",
"pirates": "^4.0.5",
"tslib": "^2.4.0",
"typescript": "5.5.0-beta"
"typescript": "^5.5.2"
},
"resolutions": {
"ink": "patch:ink@npm%3A3.0.8#~/.yarn/patches/ink-npm-3.0.8-3a8005f59f.patch",
Expand Down
2 changes: 1 addition & 1 deletion packages/docusaurus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"three": "^0.145.0",
"tslib": "^2.4.0",
"typedoc": "^0.25.7",
"typescript": "5.5.0-beta",
"typescript": "^5.5.2",
"unist-util-visit-parents": "^6.0.1",
"usehooks-ts": "^2.9.1",
"webpack": "^5.88.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,14 @@ const SLICES = [
from: `f90eb7508e66a3d5066b1d8a06606c6c23f3df43`,
to: `43d2cbd6ac423e35a5a095a509fc90c03f0c22ba`,
onto: `b574864abc989d0f8b15367baea1058819e126ba`,
range: `>=5.5.0-beta`,
range: `>=5.5.0-beta <5.5.2`,
},
// https://github.com/yarnpkg/TypeScript/tree/merceyz/pnp-5.5
{
from: `5b321aa5835f9f4dba6d55553fd559985d44b1a9`,
to: `c41328460d8dba2fac56c220803c68ca961d7cd5`,
onto: `ce2e60e4ea15a65992e54a9e8877d16be9d42abb`,
range: `>=5.5.2`,
},
];

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 06f7f5ec9..4a7e28076 100644
semver exclusivity >=5.5.0-beta
semver exclusivity >=5.5.0-beta <5.5.2
--- a/lib/tsc.js
+++ b/lib/tsc.js
@@ -5120,6 +5120,9 @@ var sys = (() => {
Expand Down Expand Up @@ -347,7 +347,7 @@ semver exclusivity >=5.5.0-beta
function reloadFileNamesFromConfigFile() {
diff --git a/lib/tsserver.js b/lib/tsserver.js
index 50cc6659c..9cefc330a 100644
semver exclusivity >=5.5.0-beta
semver exclusivity >=5.5.0-beta <5.5.2
--- a/lib/tsserver.js
+++ b/lib/tsserver.js
@@ -33,6 +33,25 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
Expand Down Expand Up @@ -400,7 +400,7 @@ semver exclusivity >=5.5.0-beta
this.installer.on("message", (m) => this.handleMessage(m));
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
index f4c59a844..631850d94 100644
semver exclusivity >=5.5.0-beta
semver exclusivity >=5.5.0-beta <5.5.2
--- a/lib/typescript.d.ts
+++ b/lib/typescript.d.ts
@@ -9339,6 +9339,8 @@ declare namespace ts {
Expand All @@ -414,7 +414,7 @@ semver exclusivity >=5.5.0-beta
function resolveTripleslashReference(moduleName: string, containingFile: string): string;
diff --git a/lib/typescript.js b/lib/typescript.js
index 6b52dd675..22cf43d26 100644
semver exclusivity >=5.5.0-beta
semver exclusivity >=5.5.0-beta <5.5.2
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -8708,6 +8708,9 @@ var sys = (() => {
Expand Down
Loading

0 comments on commit 12254ec

Please sign in to comment.