Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates the patch to cover 4.3 #2672

Merged
merged 3 commits into from
Apr 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 72 additions & 72 deletions .pnp.cjs

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions .yarn/versions/47ca867b.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
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-node-modules"
- "@yarnpkg/plugin-npm-cli"
- "@yarnpkg/plugin-pack"
- "@yarnpkg/plugin-patch"
- "@yarnpkg/plugin-pnp"
- "@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 @@ -53,7 +53,12 @@ const SLICES = [{
from: `8e0e870`,
to: `b8cb0762f776cae4fed710b9628a3df2e7b58fec`,
onto: `bfc55b5`,
range: `>=4.2`,
range: `>=4.2 <4.3`,
}, {
from: `320a959`,
to: `320a959`,
onto: `f9b35cd`,
range: `>=4.3`,
}];

async function fetch(url) {
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 7f46cc9d8..cdb2b5407 100644
semver exclusivity >=4.2
semver exclusivity >=4.2 <4.3
--- a/lib/tsc.js
+++ b/lib/tsc.js
@@ -4622,6 +4622,9 @@ var ts;
Expand Down Expand Up @@ -300,7 +300,7 @@ semver exclusivity >=4.2
synchronizeProgram();
diff --git a/lib/tsserver.js b/lib/tsserver.js
index a1d0a7a17..ea36199e7 100644
semver exclusivity >=4.2
semver exclusivity >=4.2 <4.3
--- a/lib/tsserver.js
+++ b/lib/tsserver.js
@@ -7249,6 +7249,11 @@ var ts;
Expand Down Expand Up @@ -895,7 +895,7 @@ semver exclusivity >=4.2
var watchers = this.packageJsonFilesMap || (this.packageJsonFilesMap = new ts.Map());
diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts
index 70e326c4c..1fd3a2193 100644
semver exclusivity >=4.2
semver exclusivity >=4.2 <4.3
--- a/lib/tsserverlibrary.d.ts
+++ b/lib/tsserverlibrary.d.ts
@@ -4646,6 +4646,7 @@ declare namespace ts {
Expand All @@ -908,7 +908,7 @@ semver exclusivity >=4.2
* This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
index e8537e466..3a5db7fbb 100644
semver exclusivity >=4.2
semver exclusivity >=4.2 <4.3
--- a/lib/tsserverlibrary.js
+++ b/lib/tsserverlibrary.js
@@ -7443,6 +7443,11 @@ var ts;
Expand Down Expand Up @@ -1503,7 +1503,7 @@ semver exclusivity >=4.2
var watchers = this.packageJsonFilesMap || (this.packageJsonFilesMap = new ts.Map());
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
index 5c9fcf765..e0cca011b 100644
semver exclusivity >=4.2
semver exclusivity >=4.2 <4.3
--- a/lib/typescript.d.ts
+++ b/lib/typescript.d.ts
@@ -4646,6 +4646,7 @@ declare namespace ts {
Expand All @@ -1516,7 +1516,7 @@ semver exclusivity >=4.2
* This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
diff --git a/lib/typescript.js b/lib/typescript.js
index 8539f89fd..57ad1b5d9 100644
semver exclusivity >=4.2
semver exclusivity >=4.2 <4.3
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -7443,6 +7443,11 @@ var ts;
Expand Down Expand Up @@ -2012,7 +2012,7 @@ semver exclusivity >=4.2
});
diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts
index 3a51aada6..62093708e 100644
semver exclusivity >=4.2
semver exclusivity >=4.2 <4.3
--- a/lib/typescriptServices.d.ts
+++ b/lib/typescriptServices.d.ts
@@ -4646,6 +4646,7 @@ declare namespace ts {
Expand All @@ -2025,7 +2025,7 @@ semver exclusivity >=4.2
* This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
index 6b08bfe23..2db549ffc 100644
semver exclusivity >=4.2
semver exclusivity >=4.2 <4.3
--- a/lib/typescriptServices.js
+++ b/lib/typescriptServices.js
@@ -7443,6 +7443,11 @@ var ts;
Expand Down Expand Up @@ -2521,7 +2521,7 @@ semver exclusivity >=4.2
});
diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
index 9fa096358..02a860394 100644
semver exclusivity >=4.2
semver exclusivity >=4.2 <4.3
--- a/lib/typingsInstaller.js
+++ b/lib/typingsInstaller.js
@@ -7238,6 +7238,11 @@ var ts;
Expand Down

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.

6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26626,7 +26626,7 @@ typescript@^4.2.2:

"typescript@patch:[email protected]#~builtin<compat/typescript>":
version: 3.7.5
resolution: "typescript@patch:typescript@npm%3A3.7.5#~builtin<compat/typescript>::version=3.7.5&hash=199744"
resolution: "typescript@patch:typescript@npm%3A3.7.5#~builtin<compat/typescript>::version=3.7.5&hash=34ad7d"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
Expand All @@ -26636,7 +26636,7 @@ typescript@^4.2.2:

"typescript@patch:typescript@^3.8.3#~builtin<compat/typescript>, typescript@patch:typescript@^3.9.3#~builtin<compat/typescript>":
version: 3.9.5
resolution: "typescript@patch:typescript@npm%3A3.9.5#~builtin<compat/typescript>::version=3.9.5&hash=199744"
resolution: "typescript@patch:typescript@npm%3A3.9.5#~builtin<compat/typescript>::version=3.9.5&hash=34ad7d"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
Expand All @@ -26646,7 +26646,7 @@ typescript@^4.2.2:

"typescript@patch:typescript@^4.2.2#~builtin<compat/typescript>":
version: 4.2.3
resolution: "typescript@patch:typescript@npm%3A4.2.3#~builtin<compat/typescript>::version=4.2.3&hash=199744"
resolution: "typescript@patch:typescript@npm%3A4.2.3#~builtin<compat/typescript>::version=4.2.3&hash=34ad7d"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
Expand Down