Skip to content

Commit 926c561

Browse files
committed
Merge branch 'master' into lib/es2020/add-promise-allsettled
2 parents be97a6b + bb306a7 commit 926c561

File tree

2,158 files changed

+133658
-50361
lines changed

Some content is hidden

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

2,158 files changed

+133658
-50361
lines changed

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ scripts/buildProtocol.js
2222
scripts/ior.js
2323
scripts/authors.js
2424
scripts/configurePrerelease.js
25-
scripts/configureTSCBuild.js
2625
scripts/open-user-pr.js
2726
scripts/open-cherry-pick-pr.js
2827
scripts/processDiagnosticMessages.d.ts
2928
scripts/processDiagnosticMessages.js
3029
scripts/produceLKG.js
3130
scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
3231
scripts/generateLocalizedDiagnosticMessages.js
32+
scripts/configureLanguageServiceBuild.js
3333
scripts/*.js.map
3434
scripts/typings/
3535
coverage/

.eslintrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
"simple-indent": "error",
5555
"debug-assert": "error",
5656
"no-keywords": "error",
57+
"one-namespace-per-file": "error",
5758

5859
// eslint-plugin-import
5960
"import/no-extraneous-dependencies": ["error", { "optionalDependencies": false }],

.github/ISSUE_TEMPLATE/Bug_report.md

Lines changed: 44 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,44 @@
1-
---
2-
name: Bug report
3-
about: Create a report to help us improve
4-
5-
---
6-
7-
<!-- 🚨 STOP 🚨 𝗦𝗧𝗢𝗣 🚨 𝑺𝑻𝑶𝑷 🚨
8-
9-
Half of all issues filed here are duplicates, answered in the FAQ, or not appropriate for the bug tracker. Even if you think you've found a *bug*, please read the FAQ first, especially the Common "Bugs" That Aren't Bugs section!
10-
11-
Please help us by doing the following steps before logging an issue:
12-
* Search: https://github.com/Microsoft/TypeScript/search?type=Issues
13-
* Read the FAQ: https://github.com/Microsoft/TypeScript/wiki/FAQ
14-
15-
Please fill in the *entire* template below.
16-
-->
17-
18-
<!-- Please try to reproduce the issue with `typescript@next`. It may have already been fixed. -->
19-
**TypeScript Version:** 3.7.x-dev.201xxxxx
20-
21-
<!-- Search terms you tried before logging this (so others can find this issue more easily) -->
22-
**Search Terms:**
23-
24-
**Code**
25-
26-
```ts
27-
// A *self-contained* demonstration of the problem follows...
28-
// Test this by running `tsc` on the command-line, rather than through another build tool such as Gulp, Webpack, etc.
29-
```
30-
31-
**Expected behavior:**
32-
33-
**Actual behavior:**
34-
35-
**Playground Link:** <!-- A link to a TypeScript Playground "Share" link which demonstrates this behavior -->
36-
37-
**Related Issues:** <!-- Did you find other bugs that looked similar? -->
1+
---
2+
name: Bug
3+
about: Create a report to help us improve TypeScript
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!-- 🚨 STOP 🚨 𝗦𝗧𝗢𝗣 🚨 𝑺𝑻𝑶𝑷 🚨
11+
12+
Half of all issues filed here are duplicates, answered in the FAQ, or not appropriate for the bug tracker. Even if you think you've found a *bug*, please read the FAQ first, especially the Common "Bugs" That Aren't Bugs section!
13+
14+
Please help us by doing the following steps before logging an issue:
15+
* Search: https://github.com/Microsoft/TypeScript/search?type=Issues
16+
* Read the FAQ: https://github.com/Microsoft/TypeScript/wiki/FAQ
17+
18+
Please fill in the *entire* template below.
19+
-->
20+
21+
<!--
22+
Please try to reproduce the issue with the latest published version. It may have already been fixed.
23+
For npm: `typescript@next`
24+
This is also the 'Nightly' version in the playground: http://www.typescriptlang.org/play/?ts=Nightly
25+
-->
26+
**TypeScript Version:** 3.7.x-dev.201xxxxx
27+
28+
<!-- Search terms you tried before logging this (so others can find this issue more easily) -->
29+
**Search Terms:**
30+
31+
**Code**
32+
33+
```ts
34+
// A *self-contained* demonstration of the problem follows...
35+
// Test this by running `tsc` on the command-line, rather than through another build tool such as Gulp, Webpack, etc.
36+
```
37+
38+
**Expected behavior:**
39+
40+
**Actual behavior:**
41+
42+
**Playground Link:** <!-- A link to a TypeScript Playground "Share" link which demonstrates this behavior -->
43+
44+
**Related Issues:** <!-- Did you find other bugs that looked similar? -->
Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,47 @@
1-
---
2-
name: Feature request
3-
about: Suggest an idea for this project
4-
5-
---
6-
7-
<!-- 🚨 STOP 🚨 𝗦𝗧𝗢𝗣 🚨 𝑺𝑻𝑶𝑷 🚨
8-
9-
Half of all issues filed here are duplicates, answered in the FAQ, or not appropriate for the bug tracker.
10-
11-
Please help us by doing the following steps before logging an issue:
12-
* Search: https://github.com/Microsoft/TypeScript/search?type=Issues
13-
* Read the FAQ, especially the "Common Feature Requests" section: https://github.com/Microsoft/TypeScript/wiki/FAQ
14-
15-
-->
16-
17-
## Search Terms
18-
19-
<!-- List of keywords you searched for before creating this issue. Write them down here so that others can find this suggestion more easily -->
20-
21-
## Suggestion
22-
23-
<!-- A summary of what you'd like to see added or changed -->
24-
25-
## Use Cases
26-
27-
<!--
28-
What do you want to use this for?
29-
What shortcomings exist with current approaches?
30-
-->
31-
32-
## Examples
33-
34-
<!-- Show how this would be used and what the behavior would be -->
35-
36-
## Checklist
37-
38-
My suggestion meets these guidelines:
39-
40-
* [ ] This wouldn't be a breaking change in existing TypeScript/JavaScript code
41-
* [ ] This wouldn't change the runtime behavior of existing JavaScript code
42-
* [ ] This could be implemented without emitting different JS based on the types of the expressions
43-
* [ ] This isn't a runtime feature (e.g. library functionality, non-ECMAScript syntax with JavaScript output, etc.)
44-
* [ ] This feature would agree with the rest of [TypeScript's Design Goals](https://github.com/Microsoft/TypeScript/wiki/TypeScript-Design-Goals).
45-
1+
---
2+
name: Feature Request
3+
about: Suggest an idea
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!-- 🚨 STOP 🚨 𝗦𝗧𝗢𝗣 🚨 𝑺𝑻𝑶𝑷 🚨
11+
12+
Half of all issues filed here are duplicates, answered in the FAQ, or not appropriate for the bug tracker.
13+
14+
Please help us by doing the following steps before logging an issue:
15+
* Search: https://github.com/Microsoft/TypeScript/search?type=Issues
16+
* Read the FAQ, especially the "Common Feature Requests" section: https://github.com/Microsoft/TypeScript/wiki/FAQ
17+
18+
-->
19+
20+
## Search Terms
21+
22+
<!-- List of keywords you searched for before creating this issue. Write them down here so that others can find this suggestion more easily -->
23+
24+
## Suggestion
25+
26+
<!-- A summary of what you'd like to see added or changed -->
27+
28+
## Use Cases
29+
30+
<!--
31+
What do you want to use this for?
32+
What shortcomings exist with current approaches?
33+
-->
34+
35+
## Examples
36+
37+
<!-- Show how this would be used and what the behavior would be -->
38+
39+
## Checklist
40+
41+
My suggestion meets these guidelines:
42+
43+
* [ ] This wouldn't be a breaking change in existing TypeScript/JavaScript code
44+
* [ ] This wouldn't change the runtime behavior of existing JavaScript code
45+
* [ ] This could be implemented without emitting different JS based on the types of the expressions
46+
* [ ] This isn't a runtime feature (e.g. library functionality, non-ECMAScript syntax with JavaScript output, etc.)
47+
* [ ] This feature would agree with the rest of [TypeScript's Design Goals](https://github.com/Microsoft/TypeScript/wiki/TypeScript-Design-Goals).

.github/ISSUE_TEMPLATE/Question.md

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

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Question
4+
url: https://stackoverflow.com/questions/tagged/typescript
5+
about: Please ask and answer questions here.
6+
- name: TypeScript FAQ
7+
url: https://github.com/microsoft/TypeScript/wiki/FAQ
8+
about: Please check the FAQ before filing new issues
9+
- name: Website
10+
url: https://github.com/microsoft/TypeScript-Website/issues/new
11+
about: Please raise issues about the site on it's own repo.

.github/workflows/ci.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- release-*
8+
pull_request:
9+
branches:
10+
- master
11+
- release-*
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
17+
strategy:
18+
matrix:
19+
node-version: [8.x, 10.x, 12.x]
20+
21+
steps:
22+
- uses: actions/checkout@v1
23+
with:
24+
fetch-depth: 5
25+
- name: Use node version ${{ matrix.node-version }}
26+
uses: actions/setup-node@v1
27+
with:
28+
node-version: ${{ matrix.node-version }}
29+
- name: Remove existing TypeScript
30+
run: |
31+
npm uninstall typescript --no-save
32+
npm uninstall tslint --no-save
33+
- name: npm install and test
34+
run: |
35+
npm install
36+
npm update
37+
npm test

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ scripts/ior.js
4646
scripts/authors.js
4747
scripts/configurePrerelease.js
4848
scripts/configureLanguageServiceBuild.js
49-
scripts/createLanguageServiceBuild.js
5049
scripts/open-user-pr.js
5150
scripts/open-cherry-pick-pr.js
5251
scripts/processDiagnosticMessages.d.ts
@@ -91,6 +90,7 @@ tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter
9190
tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter
9291
tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter
9392
tests/cases/user/create-react-app/create-react-app
93+
tests/cases/user/fp-ts/fp-ts
9494
tests/cases/user/webpack/webpack
9595
tests/cases/user/puppeteer/puppeteer
9696
tests/cases/user/axios-src/axios-src

.vscode/launch.template.json

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
1-
// Rename this file 'launch.json' or merge its
2-
// contents into your existing configurations.
1+
/*
2+
3+
Copy this file into '.vscode/launch.json' or merge its
4+
contents into your existing configurations.
5+
6+
If you want to remove the errors in comments for all JSON
7+
files, add this to your settings in ~/.vscode/User/settings.json
8+
9+
"files.associations": {
10+
"*.json": "jsonc"
11+
},
12+
13+
*/
14+
315
{
416
// Use IntelliSense to learn about possible attributes.
517
// Hover to view descriptions of existing attributes.
@@ -10,7 +22,7 @@
1022
"type": "node",
1123
"protocol": "inspector",
1224
"request": "launch",
13-
"name": "Mocha Tests (currently opened test)",
25+
"name": "Mocha Tests (currently opened test)",
1426
"runtimeArgs": ["--nolazy"],
1527
"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
1628
"args": [
@@ -20,6 +32,8 @@
2032
"--colors",
2133
"built/local/run.js",
2234
"-f",
35+
// You can change this to be the name of a specific test file (without the file extension)
36+
// to consistently launch the same test
2337
"${fileBasenameNoExtension}",
2438
"--skip-percent",
2539
"0"
@@ -34,6 +48,13 @@
3448
"outFiles": [
3549
"${workspaceRoot}/built/local/run.js"
3650
]
51+
},
52+
{
53+
// See: https://github.com/microsoft/TypeScript/wiki/Debugging-Language-Service-in-VS-Code
54+
"type": "node",
55+
"request": "attach",
56+
"name": "Attach to VS Code TS Server via Port",
57+
"processId": "${command:PickProcess}"
3758
}
3859
]
39-
}
60+
}

CONTRIBUTING.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,31 +59,31 @@ Run `gulp` to build a version of the compiler/language service that reflects cha
5959

6060
## Contributing bug fixes
6161

62-
TypeScript is currently accepting contributions in the form of bug fixes. A bug must have an issue tracking it in the issue tracker that has been approved (labelled ["help wanted"](https://github.com/Microsoft/TypeScript/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)) by the TypeScript team. Your pull request should include a link to the bug that you are fixing. If you've submitted a PR for a bug, please post a comment in the bug to avoid duplication of effort.
62+
TypeScript is currently accepting contributions in the form of bug fixes. A bug must have an issue tracking it in the issue tracker that has been approved (labelled ["help wanted"](https://github.com/Microsoft/TypeScript/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) or in the "Backlog milestone") by the TypeScript team. Your pull request should include a link to the bug that you are fixing. If you've submitted a PR for a bug, please post a comment in the bug to avoid duplication of effort.
6363

6464
## Contributing features
6565

66-
Features (things that add new or improved functionality to TypeScript) may be accepted, but will need to first be approved ([labelled "help wanted"](https://github.com/Microsoft/TypeScript/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) by a TypeScript project maintainer) in the suggestion issue. Features with language design impact, or that are adequately satisfied with external tools, will not be accepted.
66+
Features (things that add new or improved functionality to TypeScript) may be accepted, but will need to first be approved (labelled ["help wanted"](https://github.com/Microsoft/TypeScript/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) or in the "Backlog" milestone) by a TypeScript project maintainer) in the suggestion issue. Features with language design impact, or that are adequately satisfied with external tools, will not be accepted.
6767

6868
Design changes will not be accepted at this time. If you have a design change proposal, please log a suggestion issue.
6969

7070
## Legal
7171

7272
You will need to complete a Contributor License Agreement (CLA). Briefly, this agreement testifies that you are granting us permission to use the submitted change according to the terms of the project's license, and that the work being submitted is under appropriate copyright.
7373

74-
Please submit a Contributor License Agreement (CLA) before submitting a pull request. You may visit https://cla.microsoft.com to sign digitally. Alternatively, download the agreement ([Microsoft Contribution License Agreement.pdf](https://opensource.microsoft.com/pdf/microsoft-contribution-license-agreement.pdf)), sign, scan, and email it back to <cla@microsoft.com>. Be sure to include your GitHub user name along with the agreement. Once we have received the signed CLA, we'll review the request.
74+
Please submit a Contributor License Agreement (CLA) before submitting a pull request. You may visit https://cla.microsoft.com to sign digitally. Alternatively, download the agreement ([Microsoft Contribution License Agreement.pdf](https://opensource.microsoft.com/pdf/microsoft-contribution-license-agreement.pdf)), sign, scan, and email it back to <cla@microsoft.com>. Be sure to include your GitHub user name along with the agreement. Once we have received the signed CLA, we'll review the request.
7575

7676
## Housekeeping
7777

78-
Your pull request should:
78+
Your pull request should:
7979

8080
* Include a description of what your change intends to do
81-
* Be a child commit of a reasonably recent commit in the **master** branch
81+
* Be a child commit of a reasonably recent commit in the **master** branch
8282
* Requests need not be a single commit, but should be a linear sequence of commits (i.e. no merge commits in your PR)
8383
* It is desirable, but not necessary, for the tests to pass at each commit
84-
* Have clear commit messages
84+
* Have clear commit messages
8585
* e.g. "Minor refactor in goToTypeDefinition", "Fix iterated type in for-await-of", "Add test for preserveWatchOutput on command line"
86-
* Include adequate tests
86+
* Include adequate tests
8787
* At least one test should fail in the absence of your non-test code changes. If your PR does not match this criteria, please specify why
8888
* Tests should include reasonable permutations of the target fix/change
8989
* Include baseline changes with your change
@@ -133,7 +133,7 @@ e.g. to run all compiler baseline tests:
133133
gulp runtests --tests=compiler
134134
```
135135

136-
or to run a specific test: `tests\cases\compiler\2dArrays.ts`
136+
or to run a specific test: `tests\cases\compiler\2dArrays.ts`
137137

138138
```Shell
139139
gulp runtests --tests=2dArrays

0 commit comments

Comments
 (0)