Skip to content

Commit ed23ca5

Browse files
sheetalkamatsheetalkamat
committed
Merge branch 'master' into builderApi
2 parents 6650029 + 7392230 commit ed23ca5

122 files changed

Lines changed: 4887 additions & 502 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.

‎.mailmap‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Mike Busyrev <[email protected]>
140140
Mine Starks <[email protected]> Mine Starks <[email protected]>
141141
Mohamed Hegazy <[email protected]>
142142
ncoley <[email protected]> # Natalie Coley
143-
Nathan Shively-Sanders <[email protected]>
143+
Nathan Shively-Sanders <[email protected]> Nathan Shively-Sanders <[email protected]>
144144
Nathan Yee <[email protected]>
145145
Nima Zahedi <[email protected]>
146146
Noah Chen <[email protected]>
@@ -287,4 +287,29 @@ Stas Vilchik <[email protected]>
287287
Taras Mankovski <[email protected]>
288288
Thomas den Hollander <[email protected]>
289289
Vakhurin Sergey <[email protected]>
290-
Zeeshan Ahmed <[email protected]>
290+
Zeeshan Ahmed <[email protected]>
291+
Orta <[email protected]> # Orta Therox
292+
IdeaHunter <[email protected]> # @IdeaHunter
293+
kujon <[email protected]> # Jakub Korzeniowski
294+
Matt <[email protected]> @begincalendar
295+
meyer <[email protected]> # @meyer
296+
micbou <[email protected]> # @micbou
297+
Alan Agius <[email protected]>
298+
Alex Khomchenko <[email protected]>
299+
Oussama Ben Brahim <[email protected]> benbraou <[email protected]>
300+
Cameron Taggart <[email protected]>
301+
csigs <[email protected]> csigs <[email protected]>
302+
Eugene Timokhov <[email protected]>
303+
Kris Zyp <[email protected]>
304+
Jing Ma <[email protected]>
305+
Martin Hiller <[email protected]>
306+
Mike Morearty <[email protected]>
307+
Priyantha Lankapura <[email protected]>
308+
Remo H. Jansen <[email protected]>
309+
Sean Barag <[email protected]>
310+
Sharon Rolel <[email protected]>
311+
Stanislav Iliev <[email protected]>
312+
Wenlu Wang <[email protected]> wenlu.wang <[email protected]> kingwl <[email protected]>
313+
Wilson Hobbs <[email protected]>
314+
Yuval Greenfield <[email protected]>
315+
Daniel <[email protected]> # @nieltg

‎AUTHORS.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ TypeScript is authored by:
66
* Adrian Leonhard
77
* Ahmad Farid
88
* Akshar Patel
9+
* Alan Agius
910
* Alex Chugaev
1011
* Alex Eagle
12+
* Alex Khomchenko
1113
* Alexander Kuvaev
1214
* Alexander Rusakov
1315
* Ali Sabzevari
@@ -47,6 +49,7 @@ TypeScript is authored by:
4749
* Brett Mayen
4850
* Bryan Forbes
4951
* Caitlin Potter
52+
* Cameron Taggart
5053
* @cedvdb
5154
* Charles Pierce
5255
* Charly POLY
@@ -56,6 +59,7 @@ TypeScript is authored by:
5659
* Colby Russell
5760
* Colin Snover
5861
* Cotton Hou
62+
* csigs
5963
* Cyrus Najmabadi
6064
* Dafrok Zhang
6165
* Dahan Gong
@@ -85,6 +89,7 @@ TypeScript is authored by:
8589
* Erik McClenney
8690
* Ethan Resnick
8791
* Ethan Rubio
92+
* Eugene Timokhov
8893
* Evan Martin
8994
* Evan Sebastian
9095
* Eyas Sharaiha
@@ -111,13 +116,15 @@ TypeScript is authored by:
111116
* Herrington Darkholme
112117
* Homa Wong
113118
* Iain Monro
119+
* @IdeaHunter
114120
* Igor Novozhilov
115121
* Ika
116122
* Ingvar Stepanyan
117123
* Isiah Meadows
118124
* Ivan Enderlin
119125
* Ivo Gabe de Wolff
120126
* Iwata Hidetaka
127+
* Jakub Korzeniowski
121128
* Jakub Młokosiewicz
122129
* James Henry
123130
* James Whitney
@@ -130,6 +137,7 @@ TypeScript is authored by:
130137
* Jed Mao
131138
* Jeffrey Morlan
132139
* Jesse Schalken
140+
* Jing Ma
133141
* Jiri Tobisek
134142
* Joe Calzaretta
135143
* Joe Chung
@@ -160,6 +168,7 @@ TypeScript is authored by:
160168
* Kevin Lang
161169
* Kitson Kelly
162170
* Klaus Meinhardt
171+
* Kris Zyp
163172
* Kyle Kelley
164173
* Kārlis Gaņģis
165174
* Lorant Pinter
@@ -170,19 +179,24 @@ TypeScript is authored by:
170179
* Manish Giri
171180
* Marin Marinov
172181
* Marius Schulz
182+
* Martin Hiller
173183
* Martin Vseticka
174184
* Masahiro Wakame
185+
* Matt
175186
* Matt Bierner
176187
* Matt McCutchen
177188
* Matt Mitchell
178189
* Mattias Buelens
179190
* Mattias Buelens
180191
* Max Deepfield
181192
* Maxwell Paul Brickner
193+
* @meyer
182194
* Micah Zoltu
195+
* @micbou
183196
* Michael
184197
* Michael Bromley
185198
* Mike Busyrev
199+
* Mike Morearty
186200
* Mine Starks
187201
* Mohamed Hegazy
188202
* Mohsen Azimi
@@ -191,14 +205,17 @@ TypeScript is authored by:
191205
* Nathan Shively-Sanders
192206
* Nathan Yee
193207
* Nicolas Henry
208+
* @nieltg
194209
* Nima Zahedi
195210
* Noah Chen
196211
* Noel Varanda
197212
* Noj Vek
198213
* Oleg Mihailik
199214
* Oleksandr Chekhovskyi
200215
* Omer Sheikh
216+
* Orta Therox
201217
* Oskar Segersva¨rd
218+
* Oussama Ben Brahim
202219
* Patrick Zhong
203220
* Paul Jolly
204221
* Paul van Brenk
@@ -210,11 +227,13 @@ TypeScript is authored by:
210227
* Piero Cangianiello
211228
* @piloopin
212229
* Prayag Verma
230+
* Priyantha Lankapura
213231
* @progre
214232
* Punya Biswal
215233
* Rado Kirov
216234
* Raj Dosanjh
217235
* Reiner Dolp
236+
* Remo H. Jansen
218237
* Richard Karmazín
219238
* Richard Knoll
220239
* Richard Sentino
@@ -227,8 +246,10 @@ TypeScript is authored by:
227246
* Ryohei Ikegami
228247
* Sam El-Husseini
229248
* Sarangan Rajamanickam
249+
* Sean Barag
230250
* Sergey Rubanov
231251
* Sergey Shandar
252+
* Sharon Rolel
232253
* Sheetal Nandi
233254
* Shengping Zhong
234255
* Shyyko Serhiy
@@ -237,6 +258,7 @@ TypeScript is authored by:
237258
* Solal Pirelli
238259
* Soo Jae Hwang
239260
* Stan Thomas
261+
* Stanislav Iliev
240262
* Stanislav Sysoev
241263
* Stas Vilchik
242264
* Steve Lucco
@@ -268,11 +290,14 @@ TypeScript is authored by:
268290
* Vilic Vane
269291
* Vladimir Kurchatkin
270292
* Vladimir Matveev
293+
* Wenlu Wang
271294
* Wesley Wigham
272295
* William Orr
296+
* Wilson Hobbs
273297
* York Yao
274298
* @yortus
275299
* Yuichi Nukiyama
300+
* Yuval Greenfield
276301
* Zeeshan Ahmed
277302
* Zev Spitz
278303
* Zhengbo Li

‎Gulpfile.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ gulp.task(tsserverLibraryFile, /*help*/ false, [servicesFile, typesMapJson], (do
528528
const serverLibraryProject = tsc.createProject("src/server/tsconfig.library.json", getCompilerSettings({ removeComments: false }, /*useBuiltCompiler*/ true));
529529
const {js, dts}: { js: NodeJS.ReadableStream, dts: NodeJS.ReadableStream } = serverLibraryProject.src()
530530
.pipe(sourcemaps.init())
531-
.pipe(newer(tsserverLibraryFile))
531+
.pipe(newer(<any>{ dest: tsserverLibraryFile, extra: ["src/compiler/**/*.ts", "src/services/**/*.ts"] }))
532532
.pipe(serverLibraryProject());
533533

534534
return merge2([

‎scripts/authors.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ namespace Commands {
164164
}
165165
});
166166
};
167-
listAuthors.description = "List known and unknown authors for a given spec";
167+
listAuthors.description = "List known and unknown authors for a given spec, e.g. 'node authors.js listAuthors origin/release-2.6..origin/release-2.7'";
168168
}
169169

170170
var args = process.argv.slice(2);

0 commit comments

Comments
 (0)