Skip to content

Commit da6acba

Browse files
sandersnsandersn
committed
Merge branch 'master' into excess-property-checks-for-discriminated-unions
2 parents f47c96f + c02865f commit da6acba

9,445 files changed

Lines changed: 906955 additions & 37471 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: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ tests/baselines/local/projectOutput/*
1919
tests/baselines/reference/testresults.tap
2020
tests/services/baselines/prototyping/local/*
2121
tests/services/browser/typescriptServices.js
22-
scripts/authors.js
23-
scripts/configureNightly.js
24-
scripts/processDiagnosticMessages.d.ts
25-
scripts/processDiagnosticMessages.js
26-
scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
2722
src/harness/*.js
2823
src/compiler/diagnosticInformationMap.generated.ts
2924
src/compiler/diagnosticMessages.generated.json
@@ -43,7 +38,12 @@ scripts/run.bat
4338
scripts/word2md.js
4439
scripts/buildProtocol.js
4540
scripts/ior.js
46-
scripts/buildProtocol.js
41+
scripts/authors.js
42+
scripts/configureNightly.js
43+
scripts/processDiagnosticMessages.d.ts
44+
scripts/processDiagnosticMessages.js
45+
scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
46+
scripts/generateLocalizedDiagnosticMessages.js
4747
scripts/*.js.map
4848
scripts/typings/
4949
coverage/
@@ -59,3 +59,4 @@ internal/
5959
.idea
6060
yarn.lock
6161
package-lock.json
62+
.parallelperf.*

‎.mailmap‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Andy Hanson <anhans@microsoft.com> Andy <anhans@microsoft.com>
1717
Anil Anar <anilanar@hotmail.com>
1818
Anton Tolmachev <myste@mail.ru>
1919
Anubha Mathur <anubmat@microsoft.com> anubmat <anubmat@microsoft.com>
20+
Armando Aguirre <armando.aguirre@microsoft.com>
21+
Arnaud Tournier <ltearno@gmail.com>
2022
Arnavion <arnavion@gmail.com> # Arnav Singh
2123
Arthur Ozga <aozgaa@umich.edu> Arthur Ozga <t-arthoz@microsoft.com> Arthur Ozga <aozgaa-ms@outlook.com> Arthur Ozga <aozgaa@users.noreply.github.com> Arthur Ozga <arozga@microsoft.com>
2224
Asad Saeeduddin <masaeedu@gmail.com>
@@ -26,6 +28,7 @@ Bill Ticehurst <billti@hotmail.com> Bill Ticehurst <billti@microsoft.com>
2628
Ben Duffield <jebavarde@gmail.com>
2729
Ben Mosher <me@benmosher.com>
2830
Benjamin Bock <bb@users.noreply.github.com>
31+
Benjamin Lichtman <uniqueiniquity@users.noreply.github.com> uniqueiniquity <blichtman623@gmail.com>
2932
Blake Embrey <hello@blakeembrey.com>
3033
Bowden Kelly <wilkelly@microsoft.com>
3134
Brett Mayen <bmayen@midnightsnacks.net>
@@ -59,6 +62,7 @@ Evan Sebastian <evanlhoini@gmail.com>
5962
Eyas <eyas.sharaiha@gmail.com> # Eyas Sharaiha
6063
Fabian Cook <faybecook@gmail.com>
6164
falsandtru <falsandtru@users.noreply.github.com> # @falsandtru
65+
Filipe Silva <filipematossilva@gmail.com>
6266
flowmemo <flowmemo@outlook.com> # @flowmemo
6367
Frank Wallis <fwallis@outlook.com>
6468
František Žiacik <fziacik@gratex.com> František Žiacik <ziacik@gmail.com>
@@ -192,7 +196,7 @@ TruongSinh Tran-Nguyen <i@truongsinh.pro>
192196
vilicvane <i@vilic.info> # Vilic Vane
193197
Vladimir Matveev <vladima@microsoft.com> vladima <vladima@microsoft.com> v2m <desco.by@gmail.com>
194198
Vadi Taslim <vadz77@hotmail.com>
195-
Wesley Wigham <t-weswig@microsoft.com> Wesley Wigham <wwigham@gmail.com>
199+
Wesley Wigham <t-weswig@microsoft.com> Wesley Wigham <wwigham@gmail.com> Wesley Wigham <wewigham@microsoft.com>
196200
York Yao <plantain-00@users.noreply.github.com> york yao <yaoao12306@outlook.com> yaoyao <yaoyao12306@163.com>
197201
Yuichi Nukiyama <oscar.wilde84@hotmail.co.jp> YuichiNukiyama <oscar.wilde84@hotmail.co.jp>
198202
Zev Spitz <shivisi@etrog.net.il>
@@ -267,4 +271,9 @@ Reiner Dolp <reiner-dolp@users.noreply.github.com>
267271
t_ <t-mrt@users.noreply.github.com> # @t_
268272
TravCav <xurrux@gmail.com> # @TravCav
269273
Vladimir Kurchatkin <vladimir.kurchatkin@gmail.com>
270-
William Orr <will@worrbase.com>
274+
William Orr <will@worrbase.com>
275+
Francois Wouts <f@codonut.com>
276+
Jan Melcher <jan.melcher@aeb.com> Jan Melcher <mail@jan-melcher.de>
277+
Matt Mitchell <mmitche@microsoft.com>
278+
Maxwell Paul Brickner <mbrickn@users.noreply.github.com>
279+
Tycho Grouwstra <tychogrouwstra@gmail.com>

‎.npmignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ internal
55
issue_template.md
66
jenkins.sh
77
lib/README.md
8+
lib/enu
89
netci.groovy
910
pull_request_template.md
1011
scripts
@@ -16,5 +17,5 @@ Jakefile.js
1617
.gitattributes
1718
.settings/
1819
.travis.yml
19-
.vscode/
20+
.vscode/
2021
test.config

‎AUTHORS.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ TypeScript is authored by:
2525
* Anton Khlynovskiy
2626
* Anton Tolmachev
2727
* Anubha Mathur
28+
* Armando Aguirre
29+
* Arnaud Tournier
2830
* Arnav Singh
2931
* Arthur Ozga
3032
* Asad Saeeduddin
@@ -33,6 +35,7 @@ TypeScript is authored by:
3335
* Ben Duffield
3436
* Ben Mosher
3537
* Benjamin Bock
38+
* Benjamin Lichtman
3639
* Benny Neugebauer
3740
* Bill Ticehurst
3841
* Blaine Bublitz
@@ -85,7 +88,9 @@ TypeScript is authored by:
8588
* Eyas Sharaiha
8689
* Fabian Cook
8790
* @falsandtru
91+
* Filipe Silva
8892
* @flowmemo
93+
* Francois Wouts
8994
* Frank Wallis
9095
* Franklin Tse
9196
* František Žiacik
@@ -112,6 +117,7 @@ TypeScript is authored by:
112117
* Jakub Młokosiewicz
113118
* James Henry
114119
* James Whitney
120+
* Jan Melcher
115121
* Jason Freeman
116122
* Jason Jarrett
117123
* Jason Killian
@@ -162,9 +168,11 @@ TypeScript is authored by:
162168
* Masahiro Wakame
163169
* Matt Bierner
164170
* Matt McCutchen
171+
* Matt Mitchell
165172
* Mattias Buelens
166173
* Mattias Buelens
167174
* Max Deepfield
175+
* Maxwell Paul Brickner
168176
* Micah Zoltu
169177
* Michael
170178
* Michael Bromley
@@ -243,6 +251,7 @@ TypeScript is authored by:
243251
* Torben Fitschen
244252
* @TravCav
245253
* TruongSinh Tran-Nguyen
254+
* Tycho Grouwstra
246255
* Vadi Taslim
247256
* Vidar Tonaas Fauske
248257
* Viktor Zozulyak

‎CopyrightNotice.txt‎

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

0 commit comments

Comments
 (0)