Merge branch 'master' into dts-first

Author: Andy Hanson

.gitignore

@@ -19,11 +19,6 @@ tests/baselines/local/projectOutput/*
 tests/baselines/reference/testresults.tap
 tests/services/baselines/prototyping/local/*
 tests/services/browser/typescriptServices.js
-scripts/authors.js
-scripts/configureNightly.js
-scripts/processDiagnosticMessages.d.ts
-scripts/processDiagnosticMessages.js
-scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
 src/harness/*.js
 src/compiler/diagnosticInformationMap.generated.ts
 src/compiler/diagnosticMessages.generated.json
@@ -43,7 +38,12 @@ scripts/run.bat
 scripts/word2md.js
 scripts/buildProtocol.js
 scripts/ior.js
-scripts/buildProtocol.js
+scripts/authors.js
+scripts/configureNightly.js
+scripts/processDiagnosticMessages.d.ts
+scripts/processDiagnosticMessages.js
+scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
+scripts/generateLocalizedDiagnosticMessages.js
 scripts/*.js.map
 scripts/typings/
 coverage/
@@ -58,4 +58,14 @@ internal/
 !tests/baselines/reference/project/nodeModules*/**/*
 .idea
 yarn.lock
-package-lock.json
+yarn-error.log
+.parallelperf.*
+tests/cases/user/*/package-lock.json
+tests/cases/user/*/node_modules/
+tests/cases/user/*/**/*.js
+tests/cases/user/*/**/*.js.map
+tests/cases/user/*/**/*.d.ts
+!tests/cases/user/zone.js/
+!tests/cases/user/bignumber.js/
+!tests/cases/user/discord.js/
+tests/baselines/reference/dt

.gitmodules

@@ -0,0 +1,20 @@
+[submodule "tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter"]
+	path = tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter
+	url = https://github.com/Microsoft/TypeScript-React-Starter
+	ignore = all
+[submodule "tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter"]
+	path = tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
+	url = https://github.com/Microsoft/TypeScript-Node-Starter.git
+	ignore = all
+[submodule "tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter"]
+	path = tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter
+	url = https://github.com/Microsoft/TypeScript-React-Native-Starter.git
+	ignore = all
+[submodule "tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter"]
+	path = tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter
+	url = https://github.com/Microsoft/TypeScript-Vue-Starter.git
+	ignore = all
+[submodule "tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter"]
+	path = tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter
+	url = https://github.com/Microsoft/TypeScript-WeChat-Starter.git
+	ignore = all

.mailmap

@@ -17,6 +17,8 @@ Andy Hanson <[email protected]> Andy <[email protected]>
 Anil Anar <[email protected]>
 Anton Tolmachev <[email protected]>
 Anubha Mathur  <[email protected]> anubmat  <[email protected]>
+Armando Aguirre  <[email protected]>
+Arnaud Tournier  <[email protected]>
 Arnavion <[email protected]> # Arnav Singh
 Arthur Ozga <[email protected]> Arthur Ozga <[email protected]> Arthur Ozga  <[email protected]> Arthur Ozga  <[email protected]> Arthur Ozga  <[email protected]>
 Asad Saeeduddin <[email protected]>
@@ -26,6 +28,7 @@ Bill Ticehurst <[email protected]> Bill Ticehurst <[email protected]>
 Ben Duffield <[email protected]>
 Ben Mosher  <[email protected]>
 Benjamin Bock  <[email protected]>
+Benjamin Lichtman  <[email protected]> uniqueiniquity  <[email protected]>
 Blake Embrey <[email protected]>
 Bowden Kelly <[email protected]>
 Brett Mayen <[email protected]>
@@ -59,6 +62,7 @@ Evan Sebastian <[email protected]>
 Eyas <[email protected]> # Eyas Sharaiha
 Fabian Cook  <[email protected]>
 falsandtru <[email protected]> # @falsandtru
+Filipe Silva  <[email protected]>
 flowmemo  <[email protected]> # @flowmemo
 Frank Wallis <[email protected]>
 František Žiacik <[email protected]> František Žiacik <[email protected]>
@@ -192,7 +196,7 @@ TruongSinh Tran-Nguyen <[email protected]>
 vilicvane <[email protected]> # Vilic Vane
 Vladimir Matveev <[email protected]> vladima <[email protected]> v2m <[email protected]>
 Vadi Taslim  <[email protected]>
-Wesley Wigham <[email protected]> Wesley Wigham <[email protected]>
+Wesley Wigham <[email protected]> Wesley Wigham <[email protected]> Wesley Wigham  <[email protected]>
 York Yao <[email protected]> york yao <[email protected]> yaoyao <[email protected]>
 Yuichi Nukiyama <[email protected]> YuichiNukiyama <[email protected]>
 Zev Spitz <[email protected]>
@@ -267,4 +271,20 @@ Reiner Dolp  <[email protected]>
 t_  <[email protected]> # @t_
 TravCav  <[email protected]> # @TravCav
 Vladimir Kurchatkin  <[email protected]>
-William Orr  <[email protected]>
+William Orr  <[email protected]>
+Francois Wouts  <[email protected]>
+Jan Melcher  <[email protected]> Jan Melcher  <[email protected]>
+Matt Mitchell  <[email protected]>
+Maxwell Paul Brickner  <[email protected]>
+Tycho Grouwstra  <[email protected]>
+Adrian Leonhard  <[email protected]>
+Alex Chugaev  <[email protected]>
+Henry Mercer  <[email protected]>
+Ivan Enderlin  <[email protected]>
+Joe Calzaretta  <[email protected]>
+Magnus Kulke  <[email protected]>
+Stas Vilchik  <[email protected]>
+Taras Mankovski  <[email protected]>
+Thomas den Hollander  <[email protected]>
+Vakhurin Sergey  <[email protected]>
+Zeeshan Ahmed  <[email protected]>

.npmignore

@@ -5,6 +5,7 @@ internal
 issue_template.md
 jenkins.sh
 lib/README.md
+lib/enu
 netci.groovy
 pull_request_template.md
 scripts
@@ -16,4 +17,5 @@ Jakefile.js
 .gitattributes
 .settings/
 .travis.yml
-.vscode/
+.vscode/
+test.config

.travis.yml

@@ -2,8 +2,8 @@ language: node_js
 
 node_js:
   - 'stable'
+  - '8'
   - '6'
-  - '4'
 
 sudo: false
 
@@ -16,6 +16,9 @@ matrix:
 branches:
   only:
   - master
+  - release-2.5
+  - release-2.6
+  - release-2.7
 
 install:
   - npm uninstall typescript --no-save

.vscode/tasks.json

@@ -18,6 +18,13 @@
             "problemMatcher": [
                 "$tsc"
             ]
+        },
+        {
+            "taskName": "tests",
+            "showOutput": "silent",
+            "problemMatcher": [
+                "$tsc"
+            ]
         }
     ]
 }

AUTHORS.md

@@ -3,8 +3,10 @@ TypeScript is authored by:
 * Abubaker Bashir
 * Adam Freidin
 * Adi Dahiya
+* Adrian Leonhard 
 * Ahmad Farid
 * Akshar Patel
+* Alex Chugaev 
 * Alex Eagle
 * Alexander Kuvaev
 * Alexander Rusakov 
@@ -25,6 +27,8 @@ TypeScript is authored by:
 * Anton Khlynovskiy 
 * Anton Tolmachev
 * Anubha Mathur 
+* Armando Aguirre 
+* Arnaud Tournier 
 * Arnav Singh
 * Arthur Ozga
 * Asad Saeeduddin
@@ -33,6 +37,7 @@ TypeScript is authored by:
 * Ben Duffield
 * Ben Mosher 
 * Benjamin Bock 
+* Benjamin Lichtman 
 * Benny Neugebauer 
 * Bill Ticehurst
 * Blaine Bublitz 
@@ -85,7 +90,9 @@ TypeScript is authored by:
 * Eyas Sharaiha
 * Fabian Cook 
 * @falsandtru
+* Filipe Silva 
 * @flowmemo
+* Francois Wouts 
 * Frank Wallis
 * Franklin Tse
 * František Žiacik
@@ -100,18 +107,21 @@ TypeScript is authored by:
 * Halasi Tamás 
 * Harald Niesche
 * Hendrik Liebau 
+* Henry Mercer 
 * Herrington Darkholme
 * Homa Wong 
 * Iain Monro
 * Igor Novozhilov
 * Ika 
 * Ingvar Stepanyan
 * Isiah Meadows
+* Ivan Enderlin 
 * Ivo Gabe de Wolff
 * Iwata Hidetaka 
 * Jakub Młokosiewicz 
 * James Henry 
 * James Whitney
+* Jan Melcher 
 * Jason Freeman
 * Jason Jarrett 
 * Jason Killian
@@ -121,6 +131,7 @@ TypeScript is authored by:
 * Jeffrey Morlan
 * Jesse Schalken
 * Jiri Tobisek
+* Joe Calzaretta 
 * Joe Chung 
 * Joel Day 
 * Joey Wilson
@@ -155,16 +166,19 @@ TypeScript is authored by:
 * Lucien Greathouse
 * Lukas Elmer 
 * Magnus Hiie 
+* Magnus Kulke 
 * Manish Giri
 * Marin Marinov
 * Marius Schulz 
 * Martin Vseticka
 * Masahiro Wakame
 * Matt Bierner 
 * Matt McCutchen
+* Matt Mitchell 
 * Mattias Buelens
 * Mattias Buelens 
 * Max Deepfield
+* Maxwell Paul Brickner 
 * Micah Zoltu
 * Michael 
 * Michael Bromley
@@ -224,13 +238,16 @@ TypeScript is authored by:
 * Soo Jae Hwang 
 * Stan Thomas
 * Stanislav Sysoev
+* Stas Vilchik 
 * Steve Lucco
 * Sudheesh Singanamalla 
 * Sébastien Arod
 * @T18970237136
 * @t_
+* Taras Mankovski 
 * Tarik Ozket
 * Tetsuharu Ohzeki
+* Thomas den Hollander 
 * Thomas Loubiou
 * Tien Hoanhtien
 * Tim Lancina 
@@ -243,7 +260,9 @@ TypeScript is authored by:
 * Torben Fitschen 
 * @TravCav
 * TruongSinh Tran-Nguyen
+* Tycho Grouwstra 
 * Vadi Taslim 
+* Vakhurin Sergey 
 * Vidar Tonaas Fauske
 * Viktor Zozulyak
 * Vilic Vane
@@ -254,5 +273,6 @@ TypeScript is authored by:
 * York Yao
 * @yortus
 * Yuichi Nukiyama
+* Zeeshan Ahmed 
 * Zev Spitz
 * Zhengbo Li

CONTRIBUTING.md

@@ -8,7 +8,14 @@ Issues that ask questions answered in the FAQ will be closed without elaboration
 
 ## 2. Search for Duplicates
 
-[Search the existing issues](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue) before logging a new one.
+[Search the existing issues](https://github.com/Microsoft/TypeScript/search?type=Issues) before logging a new one.
+
+Some search tips:
+ * *Don't* restrict your search to only open issues. An issue with a title similar to yours may have been closed as a duplicate of one with a less-findable title.
+ * Check for synonyms. For example, if your bug involves an interface, it likely also occurs with type aliases or classes.
+ * Search for the title of the issue you're about to log. This sounds obvious but 80% of the time this is sufficient to find a duplicate when one exists.
+ * Read more than the first page of results. Many bugs here use the same words so relevancy sorting is not particularly strong.
+ * If you have a crash, search for the first few topmost function names shown in the call stack.
 
 ## 3. Do you have a question?
 
@@ -183,3 +190,10 @@ jake baseline-accept
 ```
 
 to establish the new baselines as the desired behavior. This will change the files in `tests\baselines\reference`, which should be included as part of your commit. It's important to carefully validate changes in the baselines.
+
+## Localization
+
+All strings the user may see are stored in [`diagnosticMessages.json`](./src/compiler/diagnosticMessages.json).
+If you make changes to it, run `jake generate-diagnostics` to push them to the `Diagnostic` interface in [`diagnosticInformationMap.generated.ts`](./src/compiler/diagnosticInformationMap.generated.ts).
+
+See [coding guidelines on diagnostic messages](https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines#diagnostic-messages).

CopyrightNotice.txt

@@ -1,15 +1,15 @@
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved. 
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0  
- 
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
-MERCHANTABLITY OR NON-INFRINGEMENT. 
- 
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+