Skip to content

Commit 3911b5c

Browse files
committed
Merge branch 'master' into typeof-in-switch
2 parents 4d8529c + 990d445 commit 3911b5c

File tree

7,335 files changed

+1224476
-541605
lines changed

Some content is hidden

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

7,335 files changed

+1224476
-541605
lines changed

.circleci/config.yml

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

.github/ISSUE_TEMPLATE/Bug_report.md

Lines changed: 37 additions & 0 deletions
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:** 3.0.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? -->
Lines changed: 39 additions & 0 deletions
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

Lines changed: 15 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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:** 3.0.0-dev.201xxxxx
2828

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

.github/pull_request_template.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!--
2+
Thank you for submitting a pull request!
3+
4+
Here's a checklist you might find useful.
5+
* [ ] There is an associated issue that is labeled
6+
'Bug' or 'help wanted' or is in the Community milestone
7+
* [ ] Code is up-to-date with the `master` branch
8+
* [ ] You've successfully run `jake runtests` locally
9+
* [ ] You've signed the CLA
10+
* [ ] There are new or updated unit tests validating the change
11+
12+
Refer to CONTRIBUTING.MD for more details.
13+
https://github.com/Microsoft/TypeScript/blob/master/CONTRIBUTING.md
14+
-->
15+
16+
Fixes #
17+

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
node_modules/
2+
.node_modules/
23
built/*
34
tests/cases/rwc/*
45
tests/cases/test262/*
@@ -22,6 +23,8 @@ tests/services/browser/typescriptServices.js
2223
src/harness/*.js
2324
src/compiler/diagnosticInformationMap.generated.ts
2425
src/compiler/diagnosticMessages.generated.json
26+
src/parser/diagnosticInformationMap.generated.ts
27+
src/parser/diagnosticMessages.generated.json
2528
rwc-report.html
2629
*.swp
2730
build.json
@@ -40,8 +43,10 @@ scripts/buildProtocol.js
4043
scripts/ior.js
4144
scripts/authors.js
4245
scripts/configurePrerelease.js
46+
scripts/open-user-pr.js
4347
scripts/processDiagnosticMessages.d.ts
4448
scripts/processDiagnosticMessages.js
49+
scripts/produceLKG.js
4550
scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
4651
scripts/generateLocalizedDiagnosticMessages.js
4752
scripts/*.js.map
@@ -68,4 +73,5 @@ tests/cases/user/*/**/*.d.ts
6873
!tests/cases/user/zone.js/
6974
!tests/cases/user/bignumber.js/
7075
!tests/cases/user/discord.js/
71-
tests/baselines/reference/dt
76+
tests/baselines/reference/dt
77+
.failed-tests

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,7 @@
3434
path = tests/cases/user/axios-src/axios-src
3535
url = https://github.com/axios/axios.git
3636
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

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ Michael <[email protected]>
139139
Mike Busyrev <[email protected]>
140140
Mine Starks <[email protected]> Mine Starks <[email protected]>
141141
Mohamed Hegazy <[email protected]>
142-
ncoley <[email protected]> # Natalie Coley
143142
Nathan Shively-Sanders <[email protected]> Nathan Shively-Sanders <[email protected]>
144143
Nathan Yee <[email protected]>
145144
Nima Zahedi <[email protected]>
@@ -164,7 +163,7 @@ Rostislav Galimsky <[email protected]>
164163
Richard Knoll <[email protected]> Richard Knoll <[email protected]>
165164
Richard Karmazín <[email protected]>
166165
Rowan Wyborn <[email protected]>
167-
Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]>
166+
Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]>
168167
Ryohei Ikegami <[email protected]>
169168
Sarangan Rajamanickam <[email protected]>
170169
Sébastien Arod <[email protected]>
@@ -308,7 +307,7 @@ Remo H. Jansen <[email protected]>
308307
Sean Barag <[email protected]>
309308
Sharon Rolel <[email protected]>
310309
Stanislav Iliev <[email protected]>
311-
Wenlu Wang <[email protected]> wenlu.wang <[email protected]> kingwl <[email protected]>
310+
Wenlu Wang <[email protected]> wenlu.wang <[email protected]> kingwl <[email protected]> 王文璐 <[email protected]> 王文璐 <[email protected]>
312311
Wilson Hobbs <[email protected]>
313312
Yuval Greenfield <[email protected]>
314313
Daniel <[email protected]> # @nieltg
@@ -321,4 +320,41 @@ AdityaDaflapurkar <[email protected]> # Aditya Daflapurkar
321320
Eric Grube <[email protected]>
322321
Martyn Janes <[email protected]>
323322
Ricardo N Feliciano <[email protected]>
324-
Sergii Bezliudnyi <[email protected]>
323+
Sergii Bezliudnyi <[email protected]>
324+
Adrien Gibrat <[email protected]>
325+
Alex Ryan <[email protected]>
326+
Alexader <[email protected]> Alexander T <[email protected]> # Alexander Tarasyuk
327+
Andrew Faulkner <[email protected]>
328+
Artem Tyurin <[email protected]>
329+
Brandon Slade <[email protected]>
330+
Derek P Sifford <[email protected]>
331+
Dhruv Rajvanshi <[email protected]>
332+
Holger Jeromin <[email protected]>
333+
Jordi Oliveras Rovira <[email protected]>
334+
Joscha Feth <[email protected]> Joscha Feth <[email protected]>
335+
Ken703 <[email protected]> # Bowden Kenny
336+
Kevin Donnelly <[email protected]>
337+
Maarten Sijm <[email protected]>
338+
Paul Koerbitz <[email protected]>
339+
EcoleKeine <[email protected]> # Ecole Keine
340+
341+
rhysd <[email protected]> # @rhysd
342+
Zen <[email protected]> Zzzen <[email protected]> # @Zzzen
343+
bluelovers <[email protected]> # @bluelovers
344+
Dan Freeman <[email protected]>
345+
David Sherret <[email protected]>
346+
David Staheli <[email protected]>
347+
Elizabeth Dinella <[email protected]>
348+
349+
Kevin Gibbons <[email protected]>
350+
Markus Johnsson <[email protected]>
351+
Martin Probst <[email protected]>
352+
Mateusz Burzyński <[email protected]>
353+
Steven <[email protected]> # @styfle
354+
Pi Lanningham <[email protected]>
355+
Sam Bostock <[email protected]>
356+
Vimal Raghubir <[email protected]>
357+
Vyacheslav Pukhanov <[email protected]>
358+
dangoo <[email protected]> # Daniel Gooss
359+
krk <[email protected]> # Kerem Kat
360+
micnic <[email protected]> # Nicu Micleușanu

.npmignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
built
22
doc
3-
Gulpfile.ts
3+
Gulpfile.js
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,5 @@ Jakefile.js
2422
test.config
2523
package-lock.json
2624
yarn.lock
25+
.github/
26+
CONTRIBUTING.md

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ branches:
1818
- master
1919
- release-2.7
2020
- release-2.8
21+
- release-2.9
22+
- release-3.0
2123

2224
install:
2325
- npm uninstall typescript --no-save

.vscode/tasks.json

Lines changed: 26 additions & 22 deletions
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
}

0 commit comments

Comments
 (0)