Skip to content

Commit 34a6d3d

Browse files
AndaristAndarist
committed
Merge remote-tracking branch 'origin/main' into fix/noinfer-flow-type
2 parents a3c5821 + 22eaccb commit 34a6d3d

File tree

5,695 files changed

+134638
-65683
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

5,695 files changed

+134638
-65683
lines changed

‎.dprint.jsonc

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
// If updating this, also update the config in dtsBundler.mjs.
23
"indentWidth": 4,
34
"lineWidth": 1000,
45
"newLineKind": "auto",
@@ -56,9 +57,10 @@
5657
"**/_namespaces/**"
5758
],
5859
// Note: if adding new languages, make sure settings.template.json is updated too.
60+
// Also, if updating typescript, update the one in package.json.
5961
"plugins": [
60-
"https://plugins.dprint.dev/typescript-0.90.0.wasm",
61-
"https://plugins.dprint.dev/json-0.19.2.wasm",
62-
"https://plugins.dprint.dev/prettier-0.39.0.json@896b70f29ef8213c1b0ba81a93cee9c2d4f39ac2194040313cd433906db7bc7c"
62+
"https://plugins.dprint.dev/typescript-0.91.0.wasm",
63+
"https://plugins.dprint.dev/json-0.19.3.wasm",
64+
"https://plugins.dprint.dev/prettier-0.40.0.json@68c668863ec834d4be0f6f5ccaab415df75336a992aceb7eeeb14fdf096a9e9c"
6365
]
6466
}

‎.eslintrc.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,8 @@
144144
"local/no-in-operator": "error",
145145
"local/debug-assert": "error",
146146
"local/no-keywords": "error",
147-
"local/jsdoc-format": "error"
147+
"local/jsdoc-format": "error",
148+
"local/js-extensions": "error"
148149
},
149150
"overrides": [
150151
// By default, the ESLint CLI only looks at .js files. But, it will also look at

‎.github/workflows/accept-baselines-fix-lints.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
20+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
2121
with:
2222
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
2323
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2

‎.github/workflows/ci.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
name: Test Node ${{ matrix.node-version }} on ${{ matrix.os }}${{ (!matrix.bundle && ' with --no-bundle') || '' }}
5050

5151
steps:
52-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
52+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
5353
- name: Use node version ${{ matrix.node-version }}
5454
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
5555
with:
@@ -73,7 +73,7 @@ jobs:
7373
runs-on: ubuntu-latest
7474

7575
steps:
76-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
76+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
7777
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
7878
with:
7979
node-version: '*'
@@ -87,7 +87,7 @@ jobs:
8787
runs-on: ubuntu-latest
8888

8989
steps:
90-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
90+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
9191
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
9292
with:
9393
node-version: '*'
@@ -108,7 +108,7 @@ jobs:
108108
runs-on: ubuntu-latest
109109

110110
steps:
111-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
111+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
112112
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
113113
with:
114114
node-version: '*'
@@ -125,7 +125,7 @@ jobs:
125125
runs-on: ubuntu-latest
126126

127127
steps:
128-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
128+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
129129
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
130130
with:
131131
node-version: '*'
@@ -139,7 +139,7 @@ jobs:
139139
runs-on: ubuntu-latest
140140

141141
steps:
142-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
142+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
143143

144144
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
145145
with:
@@ -181,11 +181,11 @@ jobs:
181181
if: github.event_name == 'pull_request'
182182

183183
steps:
184-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
184+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
185185
with:
186186
path: pr
187187

188-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
188+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
189189
with:
190190
path: base
191191
ref: ${{ github.base_ref }}
@@ -223,7 +223,7 @@ jobs:
223223
runs-on: ubuntu-latest
224224

225225
steps:
226-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
226+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
227227
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
228228
with:
229229
node-version: '*'
@@ -240,7 +240,7 @@ jobs:
240240
runs-on: ubuntu-latest
241241

242242
steps:
243-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
243+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
244244
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
245245
with:
246246
node-version: '*'
@@ -260,7 +260,7 @@ jobs:
260260
runs-on: ubuntu-latest
261261

262262
steps:
263-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
263+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
264264
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
265265
with:
266266
node-version: '*'

‎.github/workflows/codeql.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ jobs:
4242

4343
steps:
4444
- name: Checkout repository
45-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
45+
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
49+
uses: github/codeql-action/init@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
5050
with:
5151
config-file: ./.github/codeql/codeql-configuration.yml
5252
# Override language selection by uncommenting this and choosing your languages
@@ -56,7 +56,7 @@ jobs:
5656
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5757
# If this step fails, then you should remove it and run the build manually (see below).
5858
- name: Autobuild
59-
uses: github/codeql-action/autobuild@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
59+
uses: github/codeql-action/autobuild@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
6060

6161
# ℹ️ Command-line programs to run using the OS shell.
6262
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -70,4 +70,4 @@ jobs:
7070
# make release
7171

7272
- name: Perform CodeQL Analysis
73-
uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
73+
uses: github/codeql-action/analyze@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4

‎.github/workflows/create-cherry-pick-pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
if: github.repository == 'microsoft/TypeScript'
4848

4949
steps:
50-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
50+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
5151
with:
5252
filter: blob:none # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
5353
fetch-depth: 0 # Default is 1; need to set to 0 to get the benefits of blob:none.

‎.github/workflows/insiders.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
if: github.repository == 'microsoft/TypeScript'
2121

2222
steps:
23-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
23+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
2424
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
2525
with:
2626
node-version: 'lts/*'
@@ -42,7 +42,7 @@ jobs:
4242
if: github.repository == 'microsoft/TypeScript'
4343

4444
steps:
45-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
45+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
4646
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
4747
with:
4848
node-version: 'lts/*'

‎.github/workflows/lkg.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
exit 1
2828
fi
2929
30-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
30+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
3131
with:
3232
ref: ${{ inputs.branch_name }}
3333
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}

‎.github/workflows/new-release-branch.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
runs-on: ubuntu-latest
5151

5252
steps:
53-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
53+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
5454
with:
5555
filter: blob:none # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
5656
fetch-depth: 0 # Default is 1; need to set to 0 to get the benefits of blob:none.

‎.github/workflows/nightly.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
if: github.repository == 'microsoft/TypeScript'
2222

2323
steps:
24-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
24+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
2525
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
2626
with:
2727
node-version: 'lts/*'
@@ -42,7 +42,7 @@ jobs:
4242
if: github.repository == 'microsoft/TypeScript'
4343

4444
steps:
45-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
45+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
4646
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
4747
with:
4848
node-version: 'lts/*'

‎.github/workflows/release-branch-artifact.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020

2121
steps:
22-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
22+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
2323
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
2424
with:
2525
node-version: 'lts/*'

‎.github/workflows/scorecard.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929

3030
steps:
3131
- name: 'Checkout code'
32-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
32+
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
3333
with:
3434
persist-credentials: false
3535

3636
- name: 'Run analysis'
37-
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
37+
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
3838
with:
3939
results_file: results.sarif
4040
results_format: sarif
@@ -55,6 +55,6 @@ jobs:
5555

5656
# Upload the results to GitHub's code scanning dashboard.
5757
- name: 'Upload to code-scanning'
58-
uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
58+
uses: github/codeql-action/upload-sarif@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
5959
with:
6060
sarif_file: results.sarif

‎.github/workflows/set-version.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
build:
5050
runs-on: ubuntu-latest
5151
steps:
52-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
52+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
5353
with:
5454
ref: ${{ inputs.branch_name }}
5555
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}

‎.github/workflows/sync-branch.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
4646
with:
4747
node-version: 'lts/*'
48-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
48+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
4949
with:
5050
ref: ${{ inputs.branch_name }}
5151
filter: blob:none # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/

‎.github/workflows/sync-wiki.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Get repo name
1919
run: R=${GITHUB_REPOSITORY%?wiki}; echo "BASENAME=${R##*/}" >> $GITHUB_ENV
2020
- name: Checkout ${{ env.BASENAME }}-wiki
21-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
21+
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
2222
with:
2323
repository: '${{ GITHUB.repository_owner }}/${{ env.BASENAME }}-wiki'
2424
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}

‎.github/workflows/twoslash-repros.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ jobs:
4949
runs-on: ubuntu-latest
5050
steps:
5151
- if: ${{ github.event.inputs.bisect }}
52-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
52+
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
5353
with:
5454
filter: blob:none # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
5555
fetch-depth: 0 # Default is 1; need to set to 0 to get the benefits of blob:none.
5656
- if: ${{ !github.event.inputs.bisect }}
57-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
57+
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
5858
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
5959
with:
6060
node-version: 'lts/*'

‎.github/workflows/update-package-lock.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
if: github.repository == 'microsoft/TypeScript'
2323

2424
steps:
25-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
25+
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
2626
with:
2727
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
2828
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2

‎.vscode/settings.template.json

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
".git-blame-ignore-revs"
1919
],
2020

21+
"javascript.preferences.importModuleSpecifierEnding": "js",
22+
"typescript.preferences.importModuleSpecifierEnding": "js",
23+
2124
// Match dprint in organize/auto-imports.
2225
"typescript.unstable": {
2326
"organizeImportsCollation": "unicode",

0 commit comments

Comments
 (0)