Skip to content

Commit

Permalink
fix(compat): update patch for typescript@5.4.0-beta (#6110)
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
`typescript@5.4.0-beta`.

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 committed Jan 30, 2024
1 parent 124e562 commit 16c1d99
Show file tree
Hide file tree
Showing 14 changed files with 1,892 additions and 40 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.3.1-rc-sdk",
"version": "5.4.0-beta-sdk",
"main": "./lib/typescript.js",
"type": "commonjs",
"bin": {
Expand Down
23 changes: 23 additions & 0 deletions .yarn/versions/abc251f1.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 @@ -28,7 +28,7 @@
"jest": "^29.2.1",
"pirates": "^4.0.5",
"tslib": "^2.4.0",
"typescript": "^5.3.3"
"typescript": "5.4.0-beta"
},
"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 @@ -96,7 +96,7 @@
"esbuild-loader": "^2.20.0",
"fast-glob": "^3.2.2",
"typedoc": "^0.25.3",
"typescript": "^5.3.3"
"typescript": "5.4.0-beta"
},
"browserslist": {
"production": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,14 @@ const SLICES = [
from: `9fb5c1cac14376fe615dfd48ddbe4e97c2e6ac90`,
to: `9fb5c1cac14376fe615dfd48ddbe4e97c2e6ac90`,
onto: `88f80c75e1a4ab6aaec605aa4ec6281b87871ff0`,
range: `>=5.3.1-rc`,
range: `>=5.3.1-rc <5.4.0-beta`,
},
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-5.4-beta
{
from: `9420c380b6f1f072ff66372cbf776fafd6eeed1c`,
to: `9420c380b6f1f072ff66372cbf776fafd6eeed1c`,
onto: `e80675868dff622d0870939e7c9930c68904e7e7`,
range: `>=5.4.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 f82b0a23b..8d4a85e8b 100644
semver exclusivity >=5.3.1-rc
semver exclusivity >=5.3.1-rc <5.4.0-beta
--- a/lib/tsc.js
+++ b/lib/tsc.js
@@ -5059,6 +5059,9 @@ var sys = (() => {
Expand Down Expand Up @@ -345,7 +345,7 @@ semver exclusivity >=5.3.1-rc
function reloadFileNamesFromConfigFile() {
diff --git a/lib/tsserver.js b/lib/tsserver.js
index c4e9b0b40..f48e9267f 100644
semver exclusivity >=5.3.1-rc
semver exclusivity >=5.3.1-rc <5.4.0-beta
--- a/lib/tsserver.js
+++ b/lib/tsserver.js
@@ -8575,6 +8575,9 @@ var sys = (() => {
Expand Down Expand Up @@ -998,7 +998,7 @@ semver exclusivity >=5.3.1-rc
this.installer.on("message", (m) => this.handleMessage(m));
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
index 5ee1d5258..0fbd109c0 100644
semver exclusivity >=5.3.1-rc
semver exclusivity >=5.3.1-rc <5.4.0-beta
--- a/lib/typescript.d.ts
+++ b/lib/typescript.d.ts
@@ -9853,6 +9853,8 @@ declare namespace ts {
Expand All @@ -1012,7 +1012,7 @@ semver exclusivity >=5.3.1-rc
function resolveTripleslashReference(moduleName: string, containingFile: string): string;
diff --git a/lib/typescript.js b/lib/typescript.js
index 780582944..9865ec301 100644
semver exclusivity >=5.3.1-rc
semver exclusivity >=5.3.1-rc <5.4.0-beta
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -6346,6 +6346,9 @@ ${lanes.join("\n")}
Expand Down Expand Up @@ -1711,7 +1711,7 @@ semver exclusivity >=5.3.1-rc
if (!watchers.has(path)) {
diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
index 6dd57dedd..08a78a158 100644
semver exclusivity >=5.3.1-rc
semver exclusivity >=5.3.1-rc <5.4.0-beta
--- a/lib/typingsInstaller.js
+++ b/lib/typingsInstaller.js
@@ -4472,6 +4472,9 @@ var sys = (() => {
Expand Down

0 comments on commit 16c1d99

Please sign in to comment.