Skip to content

Commit

Permalink
fix(compat): update patch for [email protected] (#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
`[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 authored Jan 30, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 124e562 commit 16c1d99
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": {
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
@@ -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",
2 changes: 1 addition & 1 deletion packages/docusaurus/package.json
Original file line number Diff line number Diff line change
@@ -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": [
Original file line number Diff line number Diff line change
@@ -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`,
},
];

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 = (() => {
@@ -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 = (() => {
@@ -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 {
@@ -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")}
@@ -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 = (() => {

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/plugin-compat/sources/patches/typescript.patch.ts

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/yarnpkg-builder/package.json
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
"devDependencies": {
"@types/semver": "^7.1.0",
"@yarnpkg/monorepo": "workspace:^",
"typescript": "^5.3.3"
"typescript": "5.4.0-beta"
},
"scripts": {
"postpack": "rm -rf lib",
2 changes: 1 addition & 1 deletion packages/yarnpkg-doctor/package.json
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
"micromatch": "^4.0.2",
"p-limit": "^2.2.0",
"tslib": "^2.4.0",
"typescript": "^5.3.3"
"typescript": "5.4.0-beta"
},
"devDependencies": {
"@types/micromatch": "^4.0.1",
24 changes: 12 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
@@ -5023,7 +5023,7 @@ __metadata:
esbuild: "npm:esbuild-wasm@^0.15.15"
semver: "npm:^7.1.2"
tslib: "npm:^2.4.0"
typescript: "npm:^5.3.3"
typescript: "npm:5.4.0-beta"
bin:
builder: ./sources/boot-cli-dev.js
languageName: unknown
@@ -5143,7 +5143,7 @@ __metadata:
micromatch: "npm:^4.0.2"
p-limit: "npm:^2.2.0"
tslib: "npm:^2.4.0"
typescript: "npm:^5.3.3"
typescript: "npm:5.4.0-beta"
bin:
doctor: ./sources/boot-cli-dev.js
languageName: unknown
@@ -5229,7 +5229,7 @@ __metadata:
three: "npm:^0.145.0"
tslib: "npm:^2.4.0"
typedoc: "npm:^0.25.3"
typescript: "npm:^5.3.3"
typescript: "npm:5.4.0-beta"
unist-util-visit: "npm:^2"
unist-util-visit-parents: "npm:^2"
usehooks-ts: "npm:^2.9.1"
@@ -5339,7 +5339,7 @@ __metadata:
react: "npm:^17.0.2"
semver: "npm:^7.1.2"
tslib: "npm:^2.4.0"
typescript: "npm:^5.3.3"
typescript: "npm:5.4.0-beta"
dependenciesMeta:
core-js:
built: false
@@ -18202,23 +18202,23 @@ pem@dexus/pem:
languageName: node
linkType: hard

"typescript@npm:^5.3.3":
version: 5.3.3
resolution: "typescript@npm:5.3.3"
"typescript@npm:5.4.0-beta":
version: 5.4.0-beta
resolution: "typescript@npm:5.4.0-beta"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 10/6e4e6a14a50c222b3d14d4ea2f729e79f972fa536ac1522b91202a9a65af3605c2928c4a790a4a50aa13694d461c479ba92cedaeb1e7b190aadaa4e4b96b8e18
checksum: 10/380556e1a843d1649ad1834eeacef491b28cf69951b6b7b41a413a49b15b88777961adff98140c900bef35c6bdcf6df1e09b6ebdff352ca8c3269deb971843b6
languageName: node
linkType: hard

"typescript@patch:typescript@npm%3A^5.3.3#optional!builtin<compat/typescript>":
version: 5.3.3
resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>::version=5.3.3&hash=e012d7"
"typescript@patch:typescript@npm%3A5.4.0-beta#optional!builtin<compat/typescript>":
version: 5.4.0-beta
resolution: "typescript@patch:typescript@npm%3A5.4.0-beta#optional!builtin<compat/typescript>::version=5.4.0-beta&hash=d69c25"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 10/c93786fcc9a70718ba1e3819bab56064ead5817004d1b8186f8ca66165f3a2d0100fee91fa64c840dcd45f994ca5d615d8e1f566d39a7470fc1e014dbb4cf15d
checksum: 10/7188bd33c638cb19595e122eab95eae608b465873e837ea49df9e46c7a8e9c62e68d67a49e262d628d8c9263959fe92127b5f8cab34509c31b7920b8fcbaad20
languageName: node
linkType: hard

0 comments on commit 16c1d99

Please sign in to comment.