Skip to content

Commit 48fe04f

Browse files
Merge main branch: Array line number changes
2 parents 92f48e8 + af9ced1 commit 48fe04f

File tree

1,610 files changed

+605878
-248025
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,610 files changed

+605878
-248025
lines changed

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ scripts/run.bat
2020
scripts/word2md.js
2121
scripts/buildProtocol.js
2222
scripts/ior.js
23-
scripts/authors.js
2423
scripts/configurePrerelease.js
2524
scripts/open-user-pr.js
2625
scripts/open-cherry-pick-pr.js

.eslintignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,20 @@
33
/tests/**
44
/lib/**
55
/src/lib/*.generated.d.ts
6+
# Ignore all compiled script outputs
67
/scripts/*.js
8+
# But, not the ones that are hand-written.
9+
# TODO: remove once scripts are pure JS
10+
!/scripts/browserIntegrationTest.js
11+
!/scripts/createPlaygroundBuild.js
12+
!/scripts/failed-tests.js
13+
!/scripts/find-unused-diagnostic-messages.js
14+
!/scripts/lint-hooks.js
15+
!/scripts/perf-result-post.js
16+
!/scripts/post-vsts-artifact-comment.js
17+
!/scripts/regenerate-unicode-identifier-parts.js
18+
!/scripts/run-sequence.js
19+
!/scripts/update-experimental-branches.js
720
/scripts/eslint/built/**
821
/internal/**
922
/coverage/**

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
//
2323
// ESLint in VS Code will lint any opened file (so long as it's not eslintignore'd), so
2424
// that will work regardless of the below.
25-
{ "files": ["*.ts"] }
25+
{ "files": ["*.ts", "*.mts", "*.cts", "*.mjs", "*.cjs"] }
2626
],
2727
"rules": {
2828
"@typescript-eslint/adjacent-overload-signatures": "error",

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- run: npm ci
3333

3434
- name: Tests
35-
run: npm test -- --no-lint
35+
run: npm test
3636

3737
lint:
3838
runs-on: ubuntu-latest
@@ -46,7 +46,7 @@ jobs:
4646
- run: npm ci
4747

4848
- name: Linter
49-
run: npm run lint:ci
49+
run: npm run lint
5050

5151
browser-integration:
5252
runs-on: ubuntu-latest

.github/workflows/twoslash-repros.yaml

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,31 @@ on:
88
- cron: '0 8 * * *'
99
repository_dispatch:
1010
types: run-twoslash-repros
11-
issues:
12-
types:
13-
- labeled
1411
workflow_dispatch:
1512
inputs:
16-
bisect_issue:
17-
description: Triggers a bisect request on the given issue number instead of updating repros on all issues
13+
issue:
14+
description: Limits run to a single issue.
15+
required: false
16+
type: string
17+
bisect:
18+
description: If set, runs a git bisect on an existing repro. Requires 'issue' to be set. Value can be revision labels (e.g. `good v4.7.3 bad main`) or `true` to infer bisect range.
1819
required: false
1920
type: string
2021

2122
jobs:
2223
run:
23-
if: ${{ github.repository == 'microsoft/TypeScript' && !github.event.label && !github.event.inputs.bisect_issue }}
24-
runs-on: ubuntu-latest
25-
steps:
26-
- uses: actions/setup-node@v3
27-
- uses: microsoft/TypeScript-Twoslash-Repro-Action@master
28-
with:
29-
github-token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
30-
31-
bisect:
32-
if: ${{ github.event.label.name == 'Bisect Repro' || github.event.inputs.bisect_issue }}
24+
if: ${{ github.repository == 'microsoft/TypeScript' }}
3325
runs-on: ubuntu-latest
3426
steps:
35-
- uses: actions/checkout@v3
27+
- if: ${{ github.event.inputs.bisect }}
28+
uses: actions/checkout@v3
3629
with:
3730
fetch-depth: 0
31+
- if: ${{ !github.event.inputs.bisect }}
32+
uses: actions/checkout@v3
3833
- uses: actions/setup-node@v3
3934
- uses: microsoft/TypeScript-Twoslash-Repro-Action@master
4035
with:
4136
github-token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
42-
bisect: ${{ github.event.issue.number || github.event.inputs.bisect_issue }}
37+
issue: ${{ github.event.inputs.issue }}
38+
bisect: ${{ github.event.inputs.bisect }}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ jobs:
1414

1515
steps:
1616
- uses: actions/checkout@v2
17+
with:
18+
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
1719
- uses: actions/setup-node@v3
1820
with:
1921
node-version: 16

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ scripts/run.bat
4343
scripts/word2md.js
4444
scripts/buildProtocol.js
4545
scripts/ior.js
46-
scripts/authors.js
4746
scripts/configurePrerelease.js
4847
scripts/configureLanguageServiceBuild.js
4948
scripts/open-user-pr.js

0 commit comments

Comments
 (0)