Skip to content

Commit 8a1f79d

Browse files
typescript-bottypescript-bot
committed
Merge remote-tracking branch 'origin/main' into release-5.4
2 parents e806758 + d04e348 commit 8a1f79d

File tree

1,286 files changed

+124272
-7883
lines changed

Some content is hidden

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

1,286 files changed

+124272
-7883
lines changed

Diff for: ‎.eslintrc.json

+8-3
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,14 @@
105105
}
106106
}
107107
],
108-
109-
// Todo: For each of these, investigate whether we want to enable them ✨
110-
"@typescript-eslint/no-unused-vars": "off",
108+
"@typescript-eslint/no-unused-vars": [
109+
"error",
110+
{
111+
// Ignore: (solely underscores | starting with exactly one underscore)
112+
"argsIgnorePattern": "^(_+$|_[^_])",
113+
"varsIgnorePattern": "^(_+$|_[^_])"
114+
}
115+
],
111116

112117
// Pending https://github.com/typescript-eslint/typescript-eslint/issues/4820
113118
"@typescript-eslint/prefer-optional-chain": "off",

Diff for: ‎.github/workflows/accept-baselines-fix-lints.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2121
with:
2222
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
23-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
23+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
2424

2525
- name: Configure Git, Run Tests, Update Baselines, Apply Fixes
2626
run: |

Diff for: ‎.github/workflows/ci.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
steps:
4242
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4343
- name: Use node version ${{ matrix.node-version }}
44-
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
44+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
4545
with:
4646
node-version: ${{ matrix.node-version }}
4747
check-latest: true
@@ -56,7 +56,7 @@ jobs:
5656

5757
steps:
5858
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
59-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
59+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
6060
with:
6161
node-version: '*'
6262
check-latest: true
@@ -70,7 +70,7 @@ jobs:
7070

7171
steps:
7272
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
73-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
73+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
7474
with:
7575
node-version: '*'
7676
check-latest: true
@@ -91,7 +91,7 @@ jobs:
9191

9292
steps:
9393
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
94-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
94+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
9595
with:
9696
node-version: '*'
9797
check-latest: true
@@ -108,7 +108,7 @@ jobs:
108108

109109
steps:
110110
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
111-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
111+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
112112
with:
113113
node-version: '*'
114114
check-latest: true
@@ -123,7 +123,7 @@ jobs:
123123
steps:
124124
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
125125

126-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
126+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
127127
with:
128128
node-version: '*'
129129
check-latest: true
@@ -171,7 +171,7 @@ jobs:
171171
path: base
172172
ref: ${{ github.base_ref }}
173173

174-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
174+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
175175
with:
176176
node-version: '*'
177177
check-latest: true
@@ -205,7 +205,7 @@ jobs:
205205

206206
steps:
207207
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
208-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
208+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
209209
with:
210210
node-version: '*'
211211
check-latest: true
@@ -222,7 +222,7 @@ jobs:
222222

223223
steps:
224224
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
225-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
225+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
226226
with:
227227
node-version: '*'
228228
check-latest: true
@@ -242,7 +242,7 @@ jobs:
242242

243243
steps:
244244
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
245-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
245+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
246246
with:
247247
node-version: '*'
248248
check-latest: true

Diff for: ‎.github/workflows/codeql.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
49+
uses: github/codeql-action/init@e675ced7a7522a761fc9c8eb26682c8b27c42b2b # v3.24.1
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@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
59+
uses: github/codeql-action/autobuild@e675ced7a7522a761fc9c8eb26682c8b27c42b2b # v3.24.1
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@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
73+
uses: github/codeql-action/analyze@e675ced7a7522a761fc9c8eb26682c8b27c42b2b # v3.24.1

Diff for: ‎.github/workflows/new-release-branch.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
filter: blob:none # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
2424
fetch-depth: 0 # Default is 1; need to set to 0 to get the benefits of blob:none.
2525
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
26-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
26+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
2727
- run: |
2828
npm --version
2929
# corepack enable npm

Diff for: ‎.github/workflows/nightly.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
27-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
27+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
2828
with:
2929
# Use NODE_AUTH_TOKEN environment variable to authenticate to this registry.
3030
registry-url: https://registry.npmjs.org/

Diff for: ‎.github/workflows/release-branch-artifact.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
23-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
23+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
2424
- run: |
2525
npm --version
2626
# corepack enable npm
@@ -41,7 +41,7 @@ jobs:
4141
npm pack ./
4242
mv typescript-*.tgz typescript.tgz
4343
- name: Upload built tarfile
44-
uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0
44+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
4545
with:
4646
name: tgz
4747
path: typescript.tgz

Diff for: ‎.github/workflows/rich-navigation.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ jobs:
2626
steps:
2727
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2828

29-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
29+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
3030

3131
- name: Install dependencies
3232
run: npm ci
3333

34-
- uses: microsoft/RichCodeNavIndexer@e444937494b8941cc2bcccf2bcf2cd595d402f6b # v0.1
34+
- uses: microsoft/RichCodeNavIndexer@c8b97bc908f7bc0151fe4872aa029e99b2a0b96b # v0.1
3535
with:
3636
languages: typescript
3737
repo-token: ${{ secrets.GITHUB_TOKEN }}

Diff for: ‎.github/workflows/scorecard.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ jobs:
4747
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
4848
# format to the repository Actions tab.
4949
- name: 'Upload artifact'
50-
uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0
50+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
5151
with:
5252
name: SARIF file
5353
path: results.sarif
5454
retention-days: 5
5555

5656
# Upload the results to GitHub's code scanning dashboard.
5757
- name: 'Upload to code-scanning'
58-
uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
58+
uses: github/codeql-action/upload-sarif@e675ced7a7522a761fc9c8eb26682c8b27c42b2b # v3.24.1
5959
with:
6060
sarif_file: results.sarif

Diff for: ‎.github/workflows/set-version.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
ref: ${{ github.event.client_payload.branch_name }}
2323
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
24-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
24+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
2525
- run: |
2626
npm --version
2727
# corepack enable npm

Diff for: ‎.github/workflows/sync-branch.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424

2525
steps:
26-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
26+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
2727
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2828
with:
2929
ref: ${{ github.event.inputs.branch_name || github.event.client_payload.branch_name }}

Diff for: ‎.github/workflows/twoslash-repros.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
fetch-depth: 0 # Default is 1; need to set to 0 to get the benefits of blob:none.
4141
- if: ${{ !github.event.inputs.bisect }}
4242
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
43-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
44-
- uses: microsoft/TypeScript-Twoslash-Repro-Action@80178415feb0ebd3ed88d09e263a7cb8c8d6e1d2 # master
43+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
44+
- uses: microsoft/TypeScript-Twoslash-Repro-Action@8680b5b290d48a7badbc7ba65971d526c61b86b8 # master
4545
with:
4646
github-token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
4747
issue: ${{ github.event.inputs.issue }}

Diff for: ‎.github/workflows/update-package-lock.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2626
with:
2727
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
28-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
28+
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
2929
with:
3030
node-version: '*'
3131
check-latest: true

Diff for: ‎.vscode/launch.template.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"0"
3939
],
4040
"env": {
41-
"NODE_ENV": "testing"
41+
"NODE_ENV": "development"
4242
},
4343
"outFiles": [
4444
"${workspaceFolder}/built/**/*.js",

Diff for: ‎Herebyfile.mjs

+4-2
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,15 @@ export const cleanSrc = task({
159159
run: () => cleanProject("src"),
160160
});
161161

162+
const dtsBundlerPath = "./scripts/dtsBundler.mjs";
163+
162164
/**
163165
* @param {string} entrypoint
164166
* @param {string} output
165167
*/
166168
async function runDtsBundler(entrypoint, output) {
167169
await exec(process.execPath, [
168-
"./scripts/dtsBundler.mjs",
170+
dtsBundlerPath,
169171
"--entrypoint",
170172
entrypoint,
171173
"--output",
@@ -392,7 +394,7 @@ export const dtsServices = task({
392394
description: "Bundles typescript.d.ts",
393395
dependencies: [buildServices],
394396
run: async () => {
395-
if (needsUpdate("./built/local/typescript/tsconfig.tsbuildinfo", ["./built/local/typescript.d.ts", "./built/local/typescript.internal.d.ts"])) {
397+
if (needsUpdate(["./built/local/typescript/tsconfig.tsbuildinfo", dtsBundlerPath], ["./built/local/typescript.d.ts", "./built/local/typescript.internal.d.ts"])) {
396398
await runDtsBundler("./built/local/typescript/typescript.d.ts", "./built/local/typescript.d.ts");
397399
}
398400
},

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ with any additional questions or comments.
4747

4848
## Roadmap
4949

50-
For details on our planned features and future direction please refer to our [roadmap](https://github.com/microsoft/TypeScript/wiki/Roadmap).
50+
For details on our planned features and future direction, please refer to our [roadmap](https://github.com/microsoft/TypeScript/wiki/Roadmap).

0 commit comments

Comments
 (0)