Skip to content

Commit 2a30c2a

Browse files
typescript-bottypescript-bot
committed
Merge remote-tracking branch 'origin/main' into release-5.6
2 parents b4732bd + 936a79b commit 2a30c2a

File tree

1,050 files changed

+79092
-23484
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,050 files changed

+79092
-23484
lines changed

‎.c8rc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"reporter": ["lcovonly", "cobertura", "v8", "codecov"],
2+
"reporter": ["lcovonly", "cobertura", "v8", "v8-json", "codecov"],
33
"src": "src",
44
"include": ["src/**", "built/local/**"],
55
"exclude": ["**/node_modules/**"],

‎.dprint.jsonc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
// Note: if adding new languages, make sure settings.template.json is updated too.
6060
// Also, if updating typescript, update the one in package.json.
6161
"plugins": [
62-
"https://plugins.dprint.dev/typescript-0.91.4.wasm",
62+
"https://plugins.dprint.dev/typescript-0.91.6.wasm",
6363
"https://plugins.dprint.dev/json-0.19.3.wasm",
64-
"https://plugins.dprint.dev/prettier-0.40.0.json@68c668863ec834d4be0f6f5ccaab415df75336a992aceb7eeeb14fdf096a9e9c"
64+
"https://plugins.dprint.dev/prettier-0.46.1.json@e5bd083088a8dfc6e5ce2d3c9bee81489b065bd5345ef55b59f5d96627928b7a"
6565
]
6666
}

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ body:
3838
3939
Please keep and fill in the line that best applies.
4040
value: |
41-
- This is a crash
4241
- This changed between versions ______ and _______
4342
- This changed in commit or PR _______
4443
- This is the behavior in every version I tried, and I reviewed the FAQ for entries about _________

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
run: npm test -- --no-lint --coverage
9191

9292
- name: Upload coverage artifact
93-
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
93+
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
9494
with:
9595
name: coverage
9696
path: coverage
@@ -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@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
337+
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
338338
with:
339339
name: fix_baselines.patch
340340
path: fix_baselines.patch

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
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@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
49+
uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.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@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
59+
uses: github/codeql-action/autobuild@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.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@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
73+
uses: github/codeql-action/analyze@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
npm pack ./
4545
mv typescript-*.tgz typescript.tgz
4646
- name: Upload built tarfile
47-
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
47+
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
4848
with:
4949
name: tgz
5050
path: typescript.tgz

‎.github/workflows/scorecard.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
persist-credentials: false
3535

3636
- name: 'Run analysis'
37-
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
37+
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
3838
with:
3939
results_file: results.sarif
4040
results_format: sarif
@@ -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@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
50+
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
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@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
58+
uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
5959
with:
6060
sarif_file: results.sarif

‎eslint.config.mjs‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// @ts-check
22
import eslint from "@eslint/js";
3+
import * as regexpPlugin from "eslint-plugin-regexp";
34
import fs from "fs";
45
import globals from "globals";
56
import { createRequire } from "module";
@@ -36,6 +37,7 @@ export default tseslint.config(
3637
eslint.configs.recommended,
3738
...tseslint.configs.recommended,
3839
...tseslint.configs.stylistic,
40+
regexpPlugin.configs["flat/recommended"],
3941
{
4042
plugins: {
4143
local: {
@@ -123,24 +125,15 @@ export default tseslint.config(
123125
"@typescript-eslint/no-var-requires": "off",
124126
"@typescript-eslint/no-empty-interface": "off",
125127
"@typescript-eslint/no-explicit-any": "off",
126-
"@typescript-eslint/ban-types": [
127-
"error",
128-
{
129-
extendDefaults: true,
130-
types: {
131-
// This is theoretically good, but ts-eslint appears to mistake our declaration of Symbol for the global Symbol type.
132-
// See: https://github.com/typescript-eslint/typescript-eslint/issues/7306
133-
"Symbol": false,
134-
"{}": false, // {} is a totally useful and valid type.
135-
},
136-
},
137-
],
128+
"@typescript-eslint/no-empty-object-type": "off", // {} is a totally useful and valid type.
129+
"@typescript-eslint/no-require-imports": "off",
138130
"@typescript-eslint/no-unused-vars": [
139131
"warn",
140132
{
141133
// Ignore: (solely underscores | starting with exactly one underscore)
142134
argsIgnorePattern: "^(_+$|_[^_])",
143135
varsIgnorePattern: "^(_+$|_[^_])",
136+
// Not setting an ignore pattern for caught errors; those can always be safely removed.
144137
},
145138
],
146139
"@typescript-eslint/no-inferrable-types": "off",
@@ -162,6 +155,7 @@ export default tseslint.config(
162155
"local/no-keywords": "error",
163156
"local/jsdoc-format": "error",
164157
"local/js-extensions": "error",
158+
"local/no-array-mutating-method-expressions": "error",
165159
},
166160
},
167161
{
@@ -210,12 +204,21 @@ export default tseslint.config(
210204
{ name: "clearImmediate" },
211205
{ name: "performance" },
212206
],
207+
"local/no-direct-import": "error",
213208
},
214209
},
215210
{
216211
files: ["src/harness/**", "src/testRunner/**"],
217212
rules: {
218213
"no-restricted-globals": "off",
214+
"regexp/no-super-linear-backtracking": "off",
215+
"local/no-direct-import": "off",
216+
},
217+
},
218+
{
219+
files: ["src/**/_namespaces/**"],
220+
rules: {
221+
"local/no-direct-import": "off",
219222
},
220223
},
221224
{
@@ -231,7 +234,8 @@ export default tseslint.config(
231234
"@typescript-eslint/interface-name-prefix": "off",
232235
"@typescript-eslint/prefer-function-type": "off",
233236
"@typescript-eslint/unified-signatures": "off",
234-
"@typescript-eslint/ban-types": "off",
237+
"@typescript-eslint/no-unsafe-function-type": "off",
238+
"@typescript-eslint/no-wrapper-object-types": "off",
235239
"@typescript-eslint/no-unused-vars": "off",
236240

237241
// scripts/eslint/rules

0 commit comments

Comments
 (0)