Merge branch 'master' into weakType

It's probably fine!

Author: sandersn

.gitignore

@@ -1,51 +1,60 @@
 node_modules/
 built/*
-tests/cases/*.js
-tests/cases/*/*.js
-tests/cases/*/*/*.js
-tests/cases/*/*/*/*.js
-tests/cases/*/*/*/*/*.js
-tests/cases/*.js.map
-tests/cases/*/*.js.map
-tests/cases/*/*/*.js.map
-tests/cases/*/*/*/*.js.map
-tests/cases/*/*/*/*/*.js.map
 tests/cases/rwc/*
 tests/cases/test262/*
 tests/cases/perf/*
 !tests/cases/webharness/compilerToString.js
 test-args.txt
 ~*.docx
+\#*\#
+.\#*
 tests/baselines/local/*
+tests/baselines/local.old/*
 tests/services/baselines/local/*
 tests/baselines/prototyping/local/*
 tests/baselines/rwc/*
 tests/baselines/test262/*
-tests/baselines/reference/projectOutput/*
+tests/baselines/reference/projectOutput/*
 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.js
+scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
 src/harness/*.js
+src/compiler/diagnosticInformationMap.generated.ts
+src/compiler/diagnosticMessages.generated.json
 rwc-report.html
 *.swp
 build.json
 *.actual
+tests/webTestServer.js
+tests/webTestServer.js.map
 tests/webhost/*.d.ts
 tests/webhost/webtsc.js
-tests/*.js
-tests/*.js.map
-tests/*.d.ts
+tests/cases/**/*.js
+tests/cases/**/*.js.map
 *.config
 scripts/debug.bat
 scripts/run.bat
 scripts/word2md.js
+scripts/buildProtocol.js
 scripts/ior.js
+scripts/buildProtocol.js
 scripts/*.js.map
+scripts/typings/
 coverage/
 internal/
 **/.DS_Store
-.settings/*
-!.settings/tasks.json
+.settings
+**/.vs
+**/.vscode
+!**/.vscode/tasks.json
+!tests/cases/projects/projectOption/**/node_modules
+!tests/cases/projects/NodeModulesSearch/**/*
+!tests/baselines/reference/project/nodeModules*/**/*
+.idea
+yarn.lock

.mailmap

@@ -0,0 +1,251 @@
+
+AbubakerB <[email protected]> # Abubaker Bashir
+Alexander <[email protected]># Alexander Kuvaev
+Aluan Haddad  <[email protected]>
+Adam Freidin <[email protected]> Adam Freidin <[email protected]>
+Adi Dahiya <[email protected]> Adi Dahiya <[email protected]>
+Ahmad Farid <[email protected]> ahmad-farid <[email protected]>
+Alexander Rusakov  <[email protected]>
+Alex Eagle <[email protected]>
+Anatoly Ressin  <[email protected]>
+Anders Hejlsberg <[email protected]> unknown <[email protected]> unknown <[email protected]> Anders Hejlsberg  <Anders Hejlsberg>
+about-code  <[email protected]> # Andreas Martin
+Andrej Baran  <[email protected]>
+Andrew Ochsner  <[email protected]>
+Andrew Z Allen <[email protected]>
+Andy Hanson <[email protected]> Andy <[email protected]>
+Anil Anar <[email protected]>
+Anton Tolmachev <[email protected]>
+Anubha Mathur  <[email protected]> anubmat  <[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]>
+Schmavery <[email protected]> # Avery Morin
+Basarat Ali Syed <[email protected]> Basarat Syed <[email protected]> basarat <[email protected]>
+Bill Ticehurst <[email protected]> Bill Ticehurst <[email protected]>
+Ben Duffield <[email protected]>
+Ben Mosher  <[email protected]>
+Benjamin Bock  <[email protected]>
+Blake Embrey <[email protected]>
+Bowden Kelly <[email protected]>
+Brett Mayen <[email protected]>
+Bryan Forbes <[email protected]>
+Caitlin Potter <[email protected]>
+ChrisBubernak <[email protected]> unknown <[email protected]> # Chris Bubernak
+Christophe Vidal  <[email protected]>
+Chuck Jazdzewski <[email protected]>
+Colby Russell <[email protected]>
+Colin Snover <[email protected]>
+Cyrus Najmabadi <[email protected]> CyrusNajmabadi <[email protected]> unknown <[email protected]>
+Dafrok  <[email protected]> # Dafrok Zhang
+Dan Corder <[email protected]>
+Dan Quirk <[email protected]> Dan Quirk <[email protected]> nknown <[email protected]>
+Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]>
+David Li <[email protected]>
+David Sheldrick  <[email protected]>
+David Souther <[email protected]>
+Denis Nedelyaev <[email protected]>
+Dick van den Brink <[email protected]> unknown <[email protected]> unknown <[email protected]>
+Dirk Baeumer <[email protected]> Dirk Bäumer <[email protected]> # Dirk Bäumer
+Dirk Holtwick <[email protected]>
+Dom Chen  <[email protected]>
+Doug Ilijev <[email protected]>
+Erik Edrosa <[email protected]>
+Erik McClenney  <[email protected]>
+erictsangx  <[email protected]> # Eric Tsang
+Ethan Rubio <[email protected]>
+Evan Martin <[email protected]>
+Evan Sebastian <[email protected]>
+Eyas <[email protected]> # Eyas Sharaiha
+Fabian Cook  <[email protected]>
+falsandtru <[email protected]> # @falsandtru
+flowmemo  <[email protected]> # @flowmemo
+Frank Wallis <[email protected]>
+František Žiacik <[email protected]> František Žiacik <[email protected]>
+Gabe Moothart  <[email protected]>
+Gabriel Isenberg <[email protected]>
+Gilad Peleg <[email protected]>
+Godfrey Chan  <[email protected]>
+Graeme Wicksted <[email protected]>
+Guillaume Salles <[email protected]>
+Guy Bedford <[email protected]> guybedford <[email protected]>
+Harald Niesche <[email protected]>
+Homa Wong  <[email protected]>
+Hendrik Liebau  <[email protected]>
+Iain Monro <[email protected]>
+IgorNovozhilov  <[email protected]> # Igor Novozhilov
+Ingvar Stepanyan <[email protected]>
+impinball <[email protected]> # Isiah Meadows
+Iwata Hidetaka  <[email protected]>
+Ivo Gabe de Wolff <[email protected]>
+Jakub Młokosiewicz  <[email protected]>
+James Whitney <[email protected]>
+James Henry  <[email protected]>
+Jason Freeman <[email protected]> Jason Freeman <[email protected]>
+Jason Jarrett  <[email protected]>
+Jason Killian <[email protected]>
+Jason Ramsay <[email protected]> jramsay <[email protected]>
+Jed Mao <[email protected]>
+Jeffrey Morlan <[email protected]>
+tobisek <[email protected]> # Jiri Tobisek
+Johannes Rieken <[email protected]>
+John Vilk <[email protected]>
+jbondc <[email protected]> jbondc <[email protected]> jbondc <[email protected]> # Jonathan Bond-Caron
+Jonathan Park <[email protected]>
+Jonathan Turner <[email protected]> Jonathan Turner <[email protected]>
+Jonathan Toland <[email protected]>
+Jesse Schalken <[email protected]>
+Joel Day  <[email protected]>
+Josh Abernathy  <[email protected]> joshaber  <[email protected]>
+Josh Goldberg  <[email protected]>
+Josh Kalderimis <[email protected]>
+Josh Soref <[email protected]>
+Juan Luis Boya García <[email protected]>
+Julian Williams <[email protected]>
+Justin Bay  <[email protected]>
+Justin Johansson  <[email protected]>
+Herrington Darkholme <[email protected]> (´·?·`)  <[email protected]> # Herrington Darkholme
+Kagami Sascha Rosylight <[email protected]> SaschaNaz <[email protected]>
+Kanchalai Tanglertsampan <[email protected]> Yui <[email protected]>
+Kanchalai Tanglertsampan <[email protected]> Yui T <[email protected]>
+Kanchalai Tanglertsampan <[email protected]> Yui <[email protected]>
+Kanchalai Tanglertsampan <[email protected]> Yui <[email protected]>
+Kanchalai Tanglertsampan <[email protected]> yui T <[email protected]>
+Kārlis Gaņģis <[email protected]>
+Keith Mashinter <[email protected]> kmashint <[email protected]>
+Ken Howard <[email protected]>
+Kevin Lang  <[email protected]>
+kimamula <[email protected]> # Kenji Imamula
+Kitson Kelly  <[email protected]>
+Klaus Meinhardt  <[email protected]>
+Kyle Kelley <[email protected]>
+Lorant Pinter <[email protected]>
+Lucien Greathouse <[email protected]>
+Lukas Elmer  <[email protected]> Lukas Elmer  <[email protected]>
+Magnus Hiie  <[email protected]>
+Martin Vseticka <[email protected]> Martin Všeticka <[email protected]> MartyIX <[email protected]>
+gcnew  <[email protected]> # Marin Marinov
+vvakame <[email protected]> # Masahiro Wakame
+Matt McCutchen <[email protected]>  Matt McCutchen  <[email protected]>
+Matt Bierner  <[email protected]>
+MANISH-GIRI  <[email protected]> # Manish Giri
+Max Deepfield <[email protected]>
+Micah Zoltu <[email protected]>
+Michael  <[email protected]>
+Mike Busyrev  <[email protected]>
+Mine Starks  <[email protected]> Mine Starks  <[email protected]>
+Mohamed Hegazy <[email protected]>
+ncoley  <[email protected]> # Natalie Coley
+Nathan Shively-Sanders <[email protected]>
+Nathan Yee <[email protected]>
+Nima Zahedi <[email protected]>
+Noah Chen  <[email protected]>
+Noj Vek <[email protected]>
+mihailik <[email protected]> # Oleg Mihailik
+Oleksandr Chekhovskyi <[email protected]>
+Paul van Brenk <[email protected]> Paul van Brenk <[email protected]> unknown <[email protected]> unknown <[email protected]>	unknown <[email protected]>
+Omer Sheikh  <[email protected]>
+Oskar Segersva¨rd <[email protected]>
+pcan <[email protected]> # Piero Cangianiello
+pcbro <[email protected]> # @pcbro
+Pedro Maltez <[email protected]> # Pedro Maltez
+piloopin <[email protected]> # @piloopin
+milkisevil <[email protected]> # Philip Bulley
+progre <[email protected]> # @progre
+Prayag Verma <[email protected]>
+Punya Biswal <[email protected]>
+Rado Kirov <[email protected]>
+Ron Buckton <[email protected]> Ron Buckton <[email protected]> rbuckton  <[email protected]>
+Rostislav Galimsky  <[email protected]>
+Richard Knoll <[email protected]> Richard Knoll <[email protected]>
+Richard Karmazín  <[email protected]>
+Rowan Wyborn <[email protected]>
+Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]>
+Ryohei Ikegami <[email protected]>
+Sarangan Rajamanickam <[email protected]>
+Sébastien Arod <[email protected]>
+Sergey Shandar  <[email protected]>
+chico  <[email protected]> # Sergey Rubanov
+Sheetal Nandi <[email protected]>
+Shengping Zhong <[email protected]>
+[email protected] <[email protected]> # Shyyko Serhiy
+Sam El-Husseini  <[email protected]>
+Simon Hürlimann <[email protected]>
+Slawomir Sadziak  <[email protected]>
+Solal Pirelli <[email protected]>
+Soo Jae Hwang  <[email protected]>
+Stan Thomas <[email protected]>
+Stanislav Sysoev <[email protected]>
+Steve Lucco <[email protected]> steveluc <[email protected]>
+Sudheesh Singanamalla  <[email protected]>
+Tarik <[email protected]> # Tarik Ozket
+Tetsuharu OHZEKI <[email protected]> # Tetsuharu Ohzeki
+Tien Nguyen <[email protected]> tien <[email protected]> unknown <[email protected]> #Tien Hoanhtien
+Tim Perry <[email protected]>
+Tim Viiding-Spader <[email protected]>
+Tingan Ho <[email protected]>
+togru <[email protected]> # togru
+Tomas Grubliauskas <[email protected]>
+ToddThomson <[email protected]> # Todd Thomson
+Torben Fitschen  <[email protected]>
+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]>
+York Yao <[email protected]> york yao <[email protected]> yaoyao <[email protected]>
+Yuichi Nukiyama <[email protected]> YuichiNukiyama <[email protected]>
+Zev Spitz <[email protected]>
+Zhengbo Li <[email protected]> zhengbli <[email protected]> Zhengbo Li <Zhengbo Li> Zhengbo Li <[email protected]> tinza123 <[email protected]> unknown <[email protected]> Zhengbo Li <Zhengbo Li> zhengbli  <[email protected]>
+zhongsp <[email protected]> # Patrick Zhong
+T18970237136 <[email protected]> # @T18970237136
+JBerger <[email protected]>
+bootstraponline  <[email protected]> # @bootstraponline
+yortus  <[email protected]> # @yortus
+András Parditka  <[email protected]>
+Anton Khlynovskiy  <[email protected]>
+Charly POLY  <[email protected]>
+Cotton Hou  <[email protected]>
+Ethan Resnick  <[email protected]>
+Marius Schulz  <[email protected]>
+Mattias Buelens  <[email protected]>
+Myles Megyesi  <[email protected]>
+Tim Lancina  <[email protected]>
+Aaron Holmes <[email protected]> Aaron Holmes <[email protected]>
+Akshar Patel <[email protected]>
+Ali Sabzevari <[email protected]>
+Aliaksandr Radzivanovich <[email protected]>
+BuildTools <[email protected]> # Franklin Tse
+ChogyDan <[email protected]> # Daniel Hollocher
+Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]>
+DLehenbauer  <[email protected]> # Daniel Lehenbauer
+David Kmenta <[email protected]>
+E020873 <[email protected]> # Nicolas Henry
+Elisée Maurer <[email protected]>
+Emilio García-Pumarino <[email protected]> dashaus <[email protected]>
+Guilherme Oenning <[email protected]>
+Herrington Darkholme <[email protected]>
+Ivo Gabe de Wolff <[email protected]>
+Joey Wilson <[email protected]>
+Jonathon Smith <[email protected]>
+Juan Luis Boya García <[email protected]>
+Kagami Sascha Rosylight <[email protected]>
+Lucien Greathouse <[email protected]>
+Martin Vseticka <[email protected]>
+Mattias Buelens <[email protected]>
+Michael Bromley <[email protected]>
+Paul Jolly <[email protected]>
+Perry Jiang <[email protected]>
+Peter Burns <[email protected]>
+Robert Coie <[email protected]>
+Thomas Loubiou <[email protected]>
+Tim Perry <[email protected]>
+Vidar Tonaas Fauske <[email protected]>
+Viktor Zozulyak <[email protected]>
+rix <[email protected]> # Richard Sentino
+rohitverma007 <[email protected]> # Rohit Verma
+rdosanjh  <[email protected]> # Raj Dosanjh
+gdh1995  <[email protected]> # Dahan Gong
+cedvdb  <[email protected]> # @cedvdb
+kpreisser  <[email protected]> # K. Preißer
+e-cloud  <[email protected]> # @e-cloud

.npmignore

@@ -1,8 +1,19 @@
 built
 doc
+Gulpfile.ts
+internal
+issue_template.md
+jenkins.sh
+lib/README.md
+netci.groovy
+pull_request_template.md
 scripts
 src
 tests
-Jakefile
+tslint.json
+Jakefile.js
+.editorconfig
+.gitattributes
+.settings/
 .travis.yml
-.settings/
+.vscode/

.travis.yml

@@ -1,6 +1,33 @@
 language: node_js
 
 node_js:
-  - '0.10'
+  - 'stable'
+  - '6'
+  - '4'
 
-sudo: false
+sudo: false
+
+env:
+  - workerCount=3
+
+matrix:
+  fast_finish: true
+
+branches:
+  only:
+  - master
+  - release-2.1
+  - release-2.2
+  - release-2.3
+
+install:
+  - npm uninstall typescript
+  - npm uninstall tslint
+  - npm install
+
+cache:
+  directories:
+    - node_modules
+
+git:
+  depth: 1