Skip to content

Commit 8ff9520

Browse files
rbucktonrbuckton
committed
Merge branch 'master' into vfs
2 parents db6794a + fe40873 commit 8ff9520

1,212 files changed

Lines changed: 149223 additions & 117377 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,12 @@ internal/
5858
!tests/baselines/reference/project/nodeModules*/**/*
5959
.idea
6060
yarn.lock
61-
package-lock.json
6261
.parallelperf.*
62+
tests/cases/user/*/package-lock.json
63+
tests/cases/user/*/node_modules/
64+
tests/cases/user/*/**/*.js
65+
tests/cases/user/*/**/*.js.map
66+
tests/cases/user/*/**/*.d.ts
67+
!tests/cases/user/zone.js/
68+
!tests/cases/user/bignumber.js/
69+
!tests/cases/user/discord.js/

‎.mailmap‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,4 +276,15 @@ Francois Wouts <f@codonut.com>
276276
Jan Melcher <jan.melcher@aeb.com> Jan Melcher <mail@jan-melcher.de>
277277
Matt Mitchell <mmitche@microsoft.com>
278278
Maxwell Paul Brickner <mbrickn@users.noreply.github.com>
279-
Tycho Grouwstra <tychogrouwstra@gmail.com>
279+
Tycho Grouwstra <tychogrouwstra@gmail.com>
280+
Adrian Leonhard <adrianleonhard@gmail.com>
281+
Alex Chugaev <achugaev93@gmail.com>
282+
Henry Mercer <henry.mercer@me.com>
283+
Ivan Enderlin <ivan.enderlin@hoa-project.net>
284+
Joe Calzaretta <jcalz@mit.edu>
285+
Magnus Kulke <mkulke@gmail.com>
286+
Stas Vilchik <stas.vilchik@sonarsource.com>
287+
Taras Mankovski <tarasm@gmail.com>
288+
Thomas den Hollander <ThomasdenH@users.noreply.github.com>
289+
Vakhurin Sergey <igelbox@gmail.com>
290+
Zeeshan Ahmed <ziishaned@gmail.com>

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ language: node_js
22

33
node_js:
44
- 'stable'
5+
- '8'
56
- '6'
6-
- '4'
77

88
sudo: false
99

@@ -17,6 +17,7 @@ branches:
1717
only:
1818
- master
1919
- release-2.5
20+
- release-2.6
2021

2122
install:
2223
- npm uninstall typescript --no-save

‎AUTHORS.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ TypeScript is authored by:
33
* Abubaker Bashir
44
* Adam Freidin
55
* Adi Dahiya
6+
* Adrian Leonhard
67
* Ahmad Farid
78
* Akshar Patel
9+
* Alex Chugaev
810
* Alex Eagle
911
* Alexander Kuvaev
1012
* Alexander Rusakov
@@ -105,13 +107,15 @@ TypeScript is authored by:
105107
* Halasi Tamás
106108
* Harald Niesche
107109
* Hendrik Liebau
110+
* Henry Mercer
108111
* Herrington Darkholme
109112
* Homa Wong
110113
* Iain Monro
111114
* Igor Novozhilov
112115
* Ika
113116
* Ingvar Stepanyan
114117
* Isiah Meadows
118+
* Ivan Enderlin
115119
* Ivo Gabe de Wolff
116120
* Iwata Hidetaka
117121
* Jakub Młokosiewicz
@@ -127,6 +131,7 @@ TypeScript is authored by:
127131
* Jeffrey Morlan
128132
* Jesse Schalken
129133
* Jiri Tobisek
134+
* Joe Calzaretta
130135
* Joe Chung
131136
* Joel Day
132137
* Joey Wilson
@@ -161,6 +166,7 @@ TypeScript is authored by:
161166
* Lucien Greathouse
162167
* Lukas Elmer
163168
* Magnus Hiie
169+
* Magnus Kulke
164170
* Manish Giri
165171
* Marin Marinov
166172
* Marius Schulz
@@ -232,13 +238,16 @@ TypeScript is authored by:
232238
* Soo Jae Hwang
233239
* Stan Thomas
234240
* Stanislav Sysoev
241+
* Stas Vilchik
235242
* Steve Lucco
236243
* Sudheesh Singanamalla
237244
* Sébastien Arod
238245
* @T18970237136
239246
* @t_
247+
* Taras Mankovski
240248
* Tarik Ozket
241249
* Tetsuharu Ohzeki
250+
* Thomas den Hollander
242251
* Thomas Loubiou
243252
* Tien Hoanhtien
244253
* Tim Lancina
@@ -253,6 +262,7 @@ TypeScript is authored by:
253262
* TruongSinh Tran-Nguyen
254263
* Tycho Grouwstra
255264
* Vadi Taslim
265+
* Vakhurin Sergey
256266
* Vidar Tonaas Fauske
257267
* Viktor Zozulyak
258268
* Vilic Vane
@@ -263,5 +273,6 @@ TypeScript is authored by:
263273
* York Yao
264274
* @yortus
265275
* Yuichi Nukiyama
276+
* Zeeshan Ahmed
266277
* Zev Spitz
267278
* Zhengbo Li

0 commit comments

Comments
 (0)