Skip to content

Commit dbe4a57

Browse files
committed
Merge branch 'master' into fix39364
2 parents 9fc7dc5 + eac0f6d commit dbe4a57

File tree

1,145 files changed

+41897
-12735
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,145 files changed

+41897
-12735
lines changed

.eslintrc.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
"@typescript-eslint/adjacent-overload-signatures": "error",
1818
"@typescript-eslint/array-type": "error",
1919

20-
"camelcase": "off",
20+
"brace-style": "off",
21+
"@typescript-eslint/brace-style": ["error", "stroustrup", { "allowSingleLine": true }],
22+
2123
"@typescript-eslint/naming-convention": [
2224
"error",
2325
{ "selector": "typeLike", "format": ["PascalCase"], "filter": { "regex": "^(__String|[A-Za-z]+_[A-Za-z]+)$", "match": false } },
@@ -32,6 +34,10 @@
3234
],
3335

3436
"@typescript-eslint/consistent-type-definitions": ["error", "interface"],
37+
38+
"no-duplicate-imports": "off",
39+
"@typescript-eslint/no-duplicate-imports": "error",
40+
3541
"@typescript-eslint/no-inferrable-types": "error",
3642
"@typescript-eslint/no-misused-new": "error",
3743
"@typescript-eslint/no-this-alias": "error",
@@ -86,7 +92,6 @@
8692
"jsdoc/check-alignment": "error",
8793

8894
// eslint
89-
"brace-style": ["error", "stroustrup", { "allowSingleLine": true }],
9095
"constructor-super": "error",
9196
"curly": ["error", "multi-line"],
9297
"dot-notation": "error",
@@ -95,7 +100,6 @@
95100
"new-parens": "error",
96101
"no-caller": "error",
97102
"no-duplicate-case": "error",
98-
"no-duplicate-imports": "error",
99103
"no-empty": "error",
100104
"no-eval": "error",
101105
"no-extra-bind": "error",

.github/pr_owners.txt

+5
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,8 @@ RyanCavanaugh
66
sheetalkamat
77
orta
88
rbuckton
9+
ahejlsberg
10+
amcasey
11+
jessetrinity
12+
minestarks
13+
uniqueiniquity

.github/workflows/nightly.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup and publish nightly
2323
run: |
2424
npm whoami
25-
npm i
25+
npm ci
2626
gulp configure-nightly
2727
gulp LKG
2828
gulp runtests-parallel

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

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ jobs:
2525
npm test
2626
env:
2727
CI: true
28+
- name: Adding playwright
29+
run: npm install --no-save --no-package-lock playwright
2830
- name: Validate the browser can import TypeScript
2931
run: gulp test-browser-integration
3032
- name: LKG, clean, and pack

README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ There are many ways to [contribute](https://github.com/microsoft/TypeScript/blob
3434
* Join the [#typescript](https://twitter.com/search?q=%23TypeScript) discussion on Twitter.
3535
* [Contribute bug fixes](https://github.com/microsoft/TypeScript/blob/master/CONTRIBUTING.md).
3636
* Read the archived language specification ([docx](https://github.com/microsoft/TypeScript/blob/master/doc/TypeScript%20Language%20Specification%20-%20ARCHIVED.docx?raw=true),
37-
[pdf](https://github.com/microsoft/TypeScript/blob/master/doc/TypeScript%20Language%20Specification%20-%20ARCHIVED.pdf?raw=true), [md](https://github.com/microsoft/TypeScript/blob/master/doc/spec-archived.md)).
37+
[pdf](https://github.com/microsoft/TypeScript/blob/master/doc/TypeScript%20Language%20Specification%20-%20ARCHIVED.pdf?raw=true), [md](https://github.com/microsoft/TypeScript/blob/master/doc/spec-ARCHIVED.md)).
3838

3939
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see
4040
the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected])
@@ -78,8 +78,6 @@ gulp LKG # Replace the last known good with the built one.
7878
# Bootstrapping step to be executed when the built compiler reaches a stable state.
7979
gulp tests # Build the test infrastructure using the built compiler.
8080
gulp runtests # Run tests using the built compiler and test infrastructure.
81-
# Some low-value tests are skipped when not on a CI machine - you can use the
82-
# --skipPercent=0 command to override this behavior and run all tests locally.
8381
# You can override the specific suite runner used or specify a test for this command.
8482
# Use --tests=<testPath> for a specific test and/or --runner=<runnerName> for a specific suite.
8583
# Valid runners include conformance, compiler, fourslash, project, user, and docker

doc/handbook/README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# The TypeScript Handbook
22

3-
The contents of the TypeScript Handbook can be read from [its GitHub repository](https://github.com/Microsoft/TypeScript-Handbook).
4-
Issues and pull requests should be directed there.
3+
The contents of the TypeScript Handbook can be found in the
4+
[TypeScript website repository](https://github.com/microsoft/TypeScript-Website/tree/v2/packages/documentation).
5+
Issues and pull requests should be directed there.

0 commit comments

Comments
 (0)