Skip to content

Commit fc2a826

Browse files
weswighamweswigham
committed
Merge branch 'master' into use-conditionals-while-narrowing
2 parents cb855af + cb42086 commit fc2a826

File tree

4,117 files changed

+371537
-285395
lines changed

Some content is hidden

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

4,117 files changed

+371537
-285395
lines changed

‎.circleci/config.yml

-90
This file was deleted.

‎.github/ISSUE_TEMPLATE/Bug_report.md

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
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:** 2.9.0-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? -->

‎.github/ISSUE_TEMPLATE/Feature_request.md

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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. Please read the FAQ first, especially the "Common Feature Requests" section.
10+
11+
-->
12+
13+
## Search Terms
14+
15+
<!-- List of keywords you searched for before creating this issue. Write them down here so that others can find this suggestion more easily -->
16+
17+
## Suggestion
18+
19+
<!-- A summary of what you'd like to see added or changed -->
20+
21+
## Use Cases
22+
23+
<!--
24+
What do you want to use this for?
25+
What shortcomings exist with current approaches?
26+
-->
27+
28+
## Examples
29+
30+
<!-- Show how this would be used and what the behavior would be -->
31+
32+
## Checklist
33+
34+
My suggestion meets these guidelines:
35+
[ ] This wouldn't be a breaking change in existing TypeScript / JavaScript code
36+
[ ] This wouldn't change the runtime behavior of existing JavaScript code
37+
[ ] This could be implemented without emitting different JS based on the types of the expressions
38+
[ ] This isn't a runtime feature (e.g. new expression-level syntax)
39+

‎.github/ISSUE_TEMPLATE/Question.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
name: Question
3+
about: The issue tracker is not for questions. Please use Stack Overflow or other resources for help writing TypeScript code.
4+
5+
---
6+
7+
THE ISSUE TRACKER IS NOT FOR QUESTIONS.
8+
9+
DO NOT CREATE A NEW ISSUE TO ASK A QUESTION.
10+
11+
IF YOU ARE HAVING PROBLEMS WITH YOUR TYPESCRIPT CODE, DO NOT ASK A QUESTION HERE.
12+
13+
Tens of thousands of TypeScript questions have been asked and answered on StackOverflow; see https://stackoverflow.com/questions/tagged/typescript . You can ask questions there or on other websites.
14+
15+
The only exception is if you have a question about *the TypeScript compiler API itself*. Please post a complete example of what you're trying to do and precisely describe what your question is.

‎issue_template.md renamed to ‎.github/issue_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Please help us by doing the following steps before logging an issue:
2424
-->
2525

2626
<!-- Please try to reproduce the issue with `typescript@next`. It may have already been fixed. -->
27-
**TypeScript Version:** 2.7.0-dev.201xxxxx
27+
**TypeScript Version:** 2.9.0-dev.201xxxxx
2828

2929
<!-- Search terms you tried before logging this (so others can find this issue more easily) -->
3030
**Search Terms:**

‎pull_request_template.md renamed to ‎.github/pull_request_template.md

File renamed without changes.

‎.gitmodules

+20
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,23 @@
1818
path = tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter
1919
url = https://github.com/Microsoft/TypeScript-WeChat-Starter.git
2020
ignore = all
21+
[submodule "tests/cases/user/create-react-app/create-react-app"]
22+
path = tests/cases/user/create-react-app/create-react-app
23+
url = https://github.com/facebook/create-react-app.git
24+
ignore = all
25+
[submodule "tests/cases/user/webpack/webpack"]
26+
path = tests/cases/user/webpack/webpack
27+
url = https://github.com/webpack/webpack.git
28+
ignore = all
29+
[submodule "tests/cases/user/puppeteer/puppeteer"]
30+
path = tests/cases/user/puppeteer/puppeteer
31+
url = https://github.com/GoogleChrome/puppeteer.git
32+
ignore = all
33+
[submodule "tests/cases/user/axios-src/axios-src"]
34+
path = tests/cases/user/axios-src/axios-src
35+
url = https://github.com/axios/axios.git
36+
ignore = all
37+
[submodule "tests/cases/user/prettier/prettier"]
38+
path = tests/cases/user/prettier/prettier
39+
url = https://github.com/prettier/prettier.git
40+
ignore = all

‎.mailmap

+6-1
Original file line numberDiff line numberDiff line change
@@ -316,4 +316,9 @@ Adnan Chowdhury <[email protected]>
316316
Esakki Raj <[email protected]>
317317
Jack Williams <[email protected]>
318318
Philippe Voinov <[email protected]>
319-
Stephan Ginthör <[email protected]>
319+
Stephan Ginthör <[email protected]>
320+
AdityaDaflapurkar <[email protected]> # Aditya Daflapurkar
321+
Eric Grube <[email protected]>
322+
Martyn Janes <[email protected]>
323+
Ricardo N Feliciano <[email protected]>
324+
Sergii Bezliudnyi <[email protected]>

‎.npmignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@ built
22
doc
33
Gulpfile.ts
44
internal
5-
issue_template.md
65
jenkins.sh
76
lib/README.md
87
lib/enu
98
netci.groovy
10-
pull_request_template.md
119
scripts
1210
src
1311
tests
@@ -24,3 +22,4 @@ Jakefile.js
2422
test.config
2523
package-lock.json
2624
yarn.lock
25+
.github/

‎.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ matrix:
1616
branches:
1717
only:
1818
- master
19-
- release-2.5
20-
- release-2.6
2119
- release-2.7
20+
- release-2.8
2221

2322
install:
2423
- npm uninstall typescript --no-save

‎.vscode/tasks.json

+26-22
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,34 @@
1-
// Available variables which can be used inside of strings.
2-
// ${workspaceRoot}: the root folder of the team
3-
// ${file}: the current opened file
4-
// ${fileBasename}: the current opened file's basename
5-
// ${fileDirname}: the current opened file's dirname
6-
// ${fileExtname}: the current opened file's extension
7-
// ${cwd}: the current working directory of the spawned process
81
{
9-
"version": "0.1.0",
10-
"command": "gulp",
11-
"isShellCommand": true,
12-
"showOutput": "silent",
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "2.0.0",
135
"tasks": [
146
{
15-
"taskName": "local",
16-
"isBuildCommand": true,
17-
"showOutput": "silent",
18-
"problemMatcher": [
19-
"$tsc"
20-
]
7+
"type": "shell",
8+
"identifier": "local",
9+
"label": "gulp: local",
10+
"command": "gulp",
11+
"args": ["local"],
12+
"group": { "kind": "build", "isDefault": true },
13+
"problemMatcher": ["$gulp-tsc"]
2114
},
2215
{
23-
"taskName": "tests",
24-
"showOutput": "silent",
25-
"problemMatcher": [
26-
"$tsc"
27-
]
16+
"type": "shell",
17+
"identifier": "tsc",
18+
"label": "gulp: tsc",
19+
"command": "gulp",
20+
"args": ["tsc"],
21+
"group": "build",
22+
"problemMatcher": ["$gulp-tsc"]
23+
},
24+
{
25+
"type": "shell",
26+
"identifier": "tests",
27+
"label": "gulp: tests",
28+
"command": "gulp",
29+
"args": ["tests"],
30+
"group": "build",
31+
"problemMatcher": ["$gulp-tsc"]
2832
}
2933
]
3034
}

‎AUTHORS.md

+5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ TypeScript is authored by:
33
* Abubaker Bashir
44
* Adam Freidin
55
* Adi Dahiya
6+
* Aditya Daflapurkar
67
* Adnan Chowdhury
78
* Adrian Leonhard
89
* Ahmad Farid
@@ -85,6 +86,7 @@ TypeScript is authored by:
8586
* @e-cloud
8687
* Elisée Maurer
8788
* Emilio García-Pumarino
89+
* Eric Grube
8890
* Eric Tsang
8991
* Erik Edrosa
9092
* Erik McClenney
@@ -184,6 +186,7 @@ TypeScript is authored by:
184186
* Marius Schulz
185187
* Martin Hiller
186188
* Martin Vseticka
189+
* Martyn Janes
187190
* Masahiro Wakame
188191
* Matt Bierner
189192
* Matt McCutchen
@@ -237,6 +240,7 @@ TypeScript is authored by:
237240
* Raj Dosanjh
238241
* Reiner Dolp
239242
* Remo H. Jansen
243+
* Ricardo N Feliciano
240244
* Richard Karmazín
241245
* Richard Knoll
242246
* Richard Sentino
@@ -252,6 +256,7 @@ TypeScript is authored by:
252256
* Sean Barag
253257
* Sergey Rubanov
254258
* Sergey Shandar
259+
* Sergii Bezliudnyi
255260
* Sharon Rolel
256261
* Sheetal Nandi
257262
* Shengping Zhong

0 commit comments

Comments
 (0)