Skip to content

Commit a23c19b

Browse files
VedantMadaneVedantMadane
authored
Merge branch 'main' into feat/json-parse-with-source
2 parents 078f805 + b465fdb commit a23c19b

29 files changed

Lines changed: 1149 additions & 241 deletions

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

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55

66
permissions:
77
contents: read
8+
id-token: write
89

910
# Ensure scripts are run with pipefail. See:
1011
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference
@@ -15,19 +16,22 @@ defaults:
1516
jobs:
1617
build:
1718
runs-on: ubuntu-latest
19+
environment:
20+
name: azure
21+
deployment: false
1822

1923
steps:
20-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
24+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2125
with:
22-
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
23-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
26+
persist-credentials: false
27+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2428
with:
2529
node-version: 'lts/*'
2630

2731
- name: Configure Git, Run Tests, Update Baselines, Apply Fixes
2832
run: |
29-
git config user.email "typescriptbot@microsoft.com"
30-
git config user.name "TypeScript Bot"
33+
git config user.email "290192711+typescript-automation[bot]@users.noreply.github.com"
34+
git config user.name "typescript-automation[bot]"
3135
npm ci
3236
git rm -r --quiet tests/baselines/reference
3337
npx hereby runtests-parallel --ci --fix || true
@@ -37,4 +41,27 @@ jobs:
3741
git add ./tests/baselines/reference
3842
git diff --cached
3943
git commit -m "Update Baselines, Applied Lint Fixes, and/or Formatted"
40-
git push
44+
- uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0
45+
with:
46+
client-id: ${{ vars.AZURE_CLIENT_ID }}
47+
tenant-id: ${{ vars.AZURE_TENANT_ID }}
48+
subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }}
49+
- name: Create GitHub App token
50+
id: app-token
51+
uses: microsoft/create-github-app-token-via-key-vault@5ba0d436e9c3cac52feff4d1f2f66f9698ce4a2d # v1
52+
with:
53+
client-id: ${{ vars.TYPESCRIPT_AUTOMATION_GITHUB_APP_CLIENT_ID }}
54+
key-id: ${{ vars.TYPESCRIPT_AUTOMATION_GITHUB_APP_KEY_ID }}
55+
owner: microsoft
56+
repositories: TypeScript
57+
permission-contents: write
58+
- name: Configure git for GitHub App token
59+
shell: bash
60+
env:
61+
GITHUB_APP_TOKEN: ${{ steps.app-token.outputs.token }}
62+
run: |
63+
set -euo pipefail
64+
basic_auth="$(node -e 'process.stdout.write(Buffer.from("x-access-token:" + process.env.GITHUB_APP_TOKEN).toString("base64"))')"
65+
echo "::add-mask::$basic_auth"
66+
git config --local http.https://github.com/.extraheader "AUTHORIZATION: basic ${basic_auth}"
67+
- run: git push

‎.github/workflows/ci.yml‎

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

109109
steps:
110-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
110+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
111111
- name: Use node version ${{ matrix.config.node-version }}
112-
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
112+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
113113
with:
114114
node-version: ${{ matrix.config.node-version }}
115115
check-latest: true
@@ -142,8 +142,8 @@ jobs:
142142
contents: read
143143

144144
steps:
145-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
146-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
145+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
146+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
147147
with:
148148
node-version: 'lts/*'
149149
- run: npm ci
@@ -152,12 +152,12 @@ jobs:
152152
run: npm test -- --no-lint --coverage
153153

154154
- name: Upload coverage artifact
155-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
155+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
156156
with:
157157
name: coverage
158158
path: coverage
159159

160-
- uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
160+
- uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
161161
with:
162162
use_oidc: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork) }}
163163
disable_search: true
@@ -167,8 +167,8 @@ jobs:
167167
runs-on: ubuntu-latest
168168

169169
steps:
170-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
171-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
170+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
171+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
172172
with:
173173
node-version: 'lts/*'
174174
- run: npm ci
@@ -180,8 +180,8 @@ jobs:
180180
runs-on: ubuntu-latest
181181

182182
steps:
183-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
184-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
183+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
184+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
185185
with:
186186
node-version: 'lts/*'
187187
- run: npm ci
@@ -193,13 +193,13 @@ jobs:
193193
runs-on: ubuntu-latest
194194

195195
steps:
196-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
197-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
196+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
197+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
198198
with:
199199
node-version: 'lts/*'
200200
- run: npm ci
201201

202-
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
202+
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
203203
with:
204204
path: ~/.cache/dprint
205205
key: ${{ runner.os }}-dprint-${{ hashFiles('package-lock.json', '.dprint.jsonc') }}
@@ -209,30 +209,12 @@ jobs:
209209
- name: Check formatting
210210
run: npx dprint check
211211

212-
browser-integration:
213-
if: ${{ github.event_name != 'merge_group' }}
214-
215-
runs-on: ubuntu-latest
216-
217-
steps:
218-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
219-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
220-
with:
221-
node-version: 'lts/*'
222-
- run: npm ci
223-
224-
- name: Installing browsers
225-
run: npx playwright install --with-deps
226-
227-
- name: Validate the browser can import TypeScript
228-
run: npx hereby test-browser-integration
229-
230212
typecheck:
231213
runs-on: ubuntu-latest
232214

233215
steps:
234-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
235-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
216+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
217+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
236218
with:
237219
node-version: 'lts/*'
238220
- run: npm ci
@@ -244,9 +226,9 @@ jobs:
244226
runs-on: ubuntu-latest
245227

246228
steps:
247-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
229+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
248230

249-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
231+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
250232
with:
251233
node-version: 'lts/*'
252234
- run: |
@@ -287,16 +269,16 @@ jobs:
287269
if: github.event_name == 'pull_request'
288270

289271
steps:
290-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
272+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
291273
with:
292274
path: pr
293275

294-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
276+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
295277
with:
296278
path: base
297279
ref: ${{ github.base_ref }}
298280

299-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
281+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
300282
with:
301283
node-version: 'lts/*'
302284
- run: |
@@ -334,8 +316,8 @@ jobs:
334316
runs-on: ubuntu-latest
335317

336318
steps:
337-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
338-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
319+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
320+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
339321
with:
340322
node-version: 'lts/*'
341323
- run: npm ci
@@ -350,8 +332,8 @@ jobs:
350332
runs-on: ubuntu-latest
351333

352334
steps:
353-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
354-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
335+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
336+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
355337
with:
356338
node-version: 'lts/*'
357339
- run: npm ci
@@ -371,8 +353,8 @@ jobs:
371353
runs-on: ubuntu-latest
372354

373355
steps:
374-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
375-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
356+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
357+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
376358
with:
377359
node-version: 'lts/*'
378360
- run: npm ci
@@ -408,7 +390,7 @@ jobs:
408390
409391
- name: Upload baseline diff artifact
410392
if: ${{ failure() && steps.check-baselines.conclusion == 'failure' }}
411-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
393+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
412394
with:
413395
name: fix_baselines.patch
414396
path: fix_baselines.patch
@@ -422,7 +404,6 @@ jobs:
422404
- lint
423405
- knip
424406
- format
425-
- browser-integration
426407
- typecheck
427408
- smoke
428409
- package-size

‎.github/workflows/close-issues.yml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77

88
permissions:
99
contents: read
10+
id-token: write
1011

1112
# Ensure scripts are run with pipefail. See:
1213
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference
@@ -17,15 +18,36 @@ defaults:
1718
jobs:
1819
close-issues:
1920
runs-on: ubuntu-latest
21+
environment:
22+
name: azure
23+
deployment: false
2024
if: github.repository == 'microsoft/TypeScript'
2125
permissions:
2226
contents: read # Apparently required to create issues
27+
id-token: write
2328
issues: write
2429

2530
steps:
31+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
32+
with:
33+
persist-credentials: false
34+
- uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0
35+
with:
36+
client-id: ${{ vars.AZURE_CLIENT_ID }}
37+
tenant-id: ${{ vars.AZURE_TENANT_ID }}
38+
subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }}
39+
- name: Create GitHub App token
40+
id: app-token
41+
uses: microsoft/create-github-app-token-via-key-vault@5ba0d436e9c3cac52feff4d1f2f66f9698ce4a2d # v1
42+
with:
43+
client-id: ${{ vars.TYPESCRIPT_AUTOMATION_GITHUB_APP_CLIENT_ID }}
44+
key-id: ${{ vars.TYPESCRIPT_AUTOMATION_GITHUB_APP_KEY_ID }}
45+
owner: microsoft
46+
repositories: TypeScript
47+
permission-issues: write
2648
- name: Close issues
2749
env:
28-
GH_TOKEN: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
50+
GH_TOKEN: ${{ steps.app-token.outputs.token }}
2951
REPO: ${{ github.repository }}
3052
run: |
3153
DATE=$(date --date='2 days ago' --iso-8601)

‎.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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
45+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
49+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
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@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
59+
uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
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@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
73+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
# You can define any steps you want, and they will run before the agent starts.
1616
# If you do not check out your code, Copilot will do this for you.
1717
steps:
18-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
19-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
18+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
19+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2020
- run: npm ci
2121
# pull dprint caches before network access is blocked
2222
- run: npx hereby check-format || true

0 commit comments

Comments
 (0)