Skip to content

Commit 5087d8d

Browse files
committed
Merge branch 'main' of https://github.com/microsoft/TypeScript into fix/3792
2 parents ce2df3e + b845fd2 commit 5087d8d

File tree

3,498 files changed

+488336
-291673
lines changed

Some content is hidden

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

3,498 files changed

+488336
-291673
lines changed

.devcontainer/Dockerfile

Lines changed: 0 additions & 7 deletions
This file was deleted.

.devcontainer/devcontainer.json

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node
13
{
24
"name": "Node.js",
3-
"build": {
4-
"dockerfile": "Dockerfile",
5-
"args": {
6-
"VARIANT": "18"
7-
}
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"image": "mcr.microsoft.com/devcontainers/javascript-node:1-22-bookworm",
7+
8+
// Features to add to the dev container. More info: https://containers.dev/features.
9+
"features": {
10+
"ghcr.io/devcontainers/features/go:1": {}
11+
},
12+
13+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
14+
// "forwardPorts": [],
15+
16+
// Use 'postCreateCommand' to run commands after the container is created.
17+
"postCreateCommand": {
18+
"Configure Build Tools": "sudo corepack enable npm; sudo npm install -g hereby; npm ci",
19+
"Install pprof": "go install github.com/google/pprof@latest",
20+
"Install Graphviz": "sudo apt install graphviz"
821
},
22+
23+
// Configure tool-specific properties.
924
"customizations": {
1025
"vscode": {
1126
"settings": {
@@ -23,5 +38,7 @@
2338
]
2439
}
2540
},
41+
42+
// More info: https://aka.ms/dev-containers-non-root.
2643
"remoteUser": "node"
2744
}

.dprint.jsonc

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,9 @@
2929
"exportDeclaration.sortNamedExports": "caseInsensitive",
3030
"importDeclaration.sortNamedImports": "caseInsensitive"
3131
},
32-
"prettier": {
33-
"newLineKind": "lf",
34-
"associations": [
35-
"**/*.{yaml,yml}"
36-
],
37-
"yml.tabWidth": 2,
38-
"yaml.tabWidth": 2,
39-
"yml.singleQuote": true,
40-
"yaml.singleQuote": true
32+
"yaml": {
33+
"indentWidth": 2,
34+
"quotes": "preferSingle"
4135
},
4236
"json": {
4337
// This would be good to do in known-JSONC files, but VS Code warns on trailing commas.
@@ -59,8 +53,8 @@
5953
// Note: if adding new languages, make sure settings.template.json is updated too.
6054
// Also, if updating typescript, update the one in package.json.
6155
"plugins": [
62-
"https://plugins.dprint.dev/typescript-0.91.6.wasm",
56+
"https://plugins.dprint.dev/typescript-0.93.0.wasm",
6357
"https://plugins.dprint.dev/json-0.19.3.wasm",
64-
"https://plugins.dprint.dev/prettier-0.46.1.json@e5bd083088a8dfc6e5ce2d3c9bee81489b065bd5345ef55b59f5d96627928b7a"
58+
"https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.0.wasm"
6559
]
6660
}

.github/dependabot.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# To get started with Dependabot version updates, you'll need to specify which
22
# package ecosystems to update and where the package manifests are located.
3-
# Please see the documentation for all configuration options:
3+
# Please see the documentation for more information:
44
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
# https://containers.dev/guide/dependabot
56

67
version: 2
78
updates:
@@ -13,3 +14,8 @@ updates:
1314
github-actions:
1415
patterns:
1516
- '*'
17+
18+
- package-ecosystem: 'devcontainers'
19+
directory: '/'
20+
schedule:
21+
interval: weekly

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
20+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2121
with:
2222
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
23-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
23+
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
2424
with:
2525
node-version: 'lts/*'
2626

.github/workflows/ci.yml

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

5151
steps:
52-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
52+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
5353
- name: Use node version ${{ matrix.node-version }}
54-
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
54+
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
5555
with:
5656
node-version: ${{ matrix.node-version }}
5757
check-latest: true
@@ -80,8 +80,8 @@ jobs:
8080
contents: read
8181

8282
steps:
83-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
84-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
83+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
84+
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
8585
with:
8686
node-version: 'lts/*'
8787
- run: npm ci
@@ -90,7 +90,7 @@ jobs:
9090
run: npm test -- --no-lint --coverage
9191

9292
- name: Upload coverage artifact
93-
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
93+
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
9494
with:
9595
name: coverage
9696
path: coverage
@@ -105,8 +105,8 @@ jobs:
105105
runs-on: ubuntu-latest
106106

107107
steps:
108-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
109-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
108+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
109+
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
110110
with:
111111
node-version: 'lts/*'
112112
- run: npm ci
@@ -118,8 +118,8 @@ jobs:
118118
runs-on: ubuntu-latest
119119

120120
steps:
121-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
122-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
121+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
122+
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
123123
with:
124124
node-version: 'lts/*'
125125
- run: npm ci
@@ -131,8 +131,8 @@ jobs:
131131
runs-on: ubuntu-latest
132132

133133
steps:
134-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
135-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
134+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
135+
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
136136
with:
137137
node-version: 'lts/*'
138138
- run: npm ci
@@ -151,8 +151,8 @@ jobs:
151151
runs-on: ubuntu-latest
152152

153153
steps:
154-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
155-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
154+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
155+
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
156156
with:
157157
node-version: 'lts/*'
158158
- run: npm ci
@@ -167,8 +167,8 @@ jobs:
167167
runs-on: ubuntu-latest
168168

169169
steps:
170-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
171-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
170+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
171+
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
172172
with:
173173
node-version: 'lts/*'
174174
- run: npm ci
@@ -180,9 +180,9 @@ jobs:
180180
runs-on: ubuntu-latest
181181

182182
steps:
183-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
183+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
184184

185-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
185+
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
186186
with:
187187
node-version: 'lts/*'
188188
- run: |
@@ -221,16 +221,16 @@ jobs:
221221
if: github.event_name == 'pull_request'
222222

223223
steps:
224-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
224+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
225225
with:
226226
path: pr
227227

228-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
228+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
229229
with:
230230
path: base
231231
ref: ${{ github.base_ref }}
232232

233-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
233+
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
234234
with:
235235
node-version: 'lts/*'
236236
- run: |
@@ -262,8 +262,8 @@ jobs:
262262
runs-on: ubuntu-latest
263263

264264
steps:
265-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
266-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
265+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
266+
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
267267
with:
268268
node-version: 'lts/*'
269269
- run: npm ci
@@ -278,8 +278,8 @@ jobs:
278278
runs-on: ubuntu-latest
279279

280280
steps:
281-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
282-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
281+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
282+
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
283283
with:
284284
node-version: 'lts/*'
285285
- run: npm ci
@@ -297,8 +297,8 @@ jobs:
297297
runs-on: ubuntu-latest
298298

299299
steps:
300-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
301-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
300+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
301+
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
302302
with:
303303
node-version: 'lts/*'
304304
- run: npm ci
@@ -334,7 +334,7 @@ jobs:
334334
335335
- name: Upload baseline diff artifact
336336
if: ${{ failure() && steps.check-baselines.conclusion == 'failure' }}
337-
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
337+
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
338338
with:
339339
name: fix_baselines.patch
340340
path: fix_baselines.patch

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ jobs:
4242

4343
steps:
4444
- name: Checkout repository
45-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
45+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
49+
uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
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@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
59+
uses: github/codeql-action/autobuild@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
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@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
73+
uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9

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

Lines changed: 1 addition & 1 deletion
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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
50+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
if: github.repository == 'microsoft/TypeScript'
2121

2222
steps:
23-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
24-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
23+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
24+
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
2525
with:
2626
node-version: 'lts/*'
2727
- run: |
@@ -42,8 +42,8 @@ jobs:
4242
if: github.repository == 'microsoft/TypeScript'
4343

4444
steps:
45-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
46-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
45+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
46+
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
4747
with:
4848
node-version: 'lts/*'
4949
# Use NODE_AUTH_TOKEN environment variable to authenticate to this registry.

.github/workflows/lkg.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
exit 1
2828
fi
2929
30-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
30+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3131
with:
3232
ref: ${{ inputs.branch_name }}
3333
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
34-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
34+
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
3535
with:
3636
node-version: 'lts/*'
3737
- run: |

0 commit comments

Comments
 (0)