Skip to content

Commit d268279

Browse files
author
Josh Goldberg
committed
Merge branch 'master' into pretty-watch-error-summaries
2 parents 15b61dc + b382952 commit d268279

1,054 files changed

Lines changed: 184127 additions & 147241 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.

‎.circleci/config.yml‎

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,9 @@ workflows:
22
version: 2
33
main:
44
jobs:
5-
- node9:
6-
filters:
7-
branches:
8-
only:
9-
- master
10-
- release-2.5
11-
- release-2.6
12-
- release-2.7
13-
- node8:
14-
filters:
15-
branches:
16-
only:
17-
- master
18-
- release-2.5
19-
- release-2.6
20-
- release-2.7
21-
- node6:
22-
filters:
23-
branches:
24-
only:
25-
- master
26-
- release-2.5
27-
- release-2.6
28-
- release-2.7
5+
- node9
6+
- node8
7+
- node6
298
nightly:
309
triggers:
3110
- schedule:
@@ -35,31 +14,10 @@ workflows:
3514
only: master
3615
jobs:
3716
- node9:
38-
filters:
39-
branches:
40-
only:
41-
- master
42-
- release-2.5
43-
- release-2.6
44-
- release-2.7
4517
context: nightlies
4618
- node8:
47-
filters:
48-
branches:
49-
only:
50-
- master
51-
- release-2.5
52-
- release-2.6
53-
- release-2.7
5419
context: nightlies
5520
- node6:
56-
filters:
57-
branches:
58-
only:
59-
- master
60-
- release-2.5
61-
- release-2.6
62-
- release-2.7
6321
context: nightlies
6422

6523
base: &base
@@ -69,6 +27,7 @@ base: &base
6927
steps:
7028
- checkout
7129
- run: |
30+
git submodule update --init --recursive
7231
npm uninstall typescript --no-save
7332
npm uninstall tslint --no-save
7433
npm install

‎.mailmap‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,4 +316,9 @@ Adnan Chowdhury <bttf@users.noreply.github.com>
316316
Esakki Raj <esakkiraj.tce@gmail.com>
317317
Jack Williams <jw@jackw.io>
318318
Philippe Voinov <philippevoinov@gmail.com>
319-
Stephan Ginthör <26004708+Lazarus535@users.noreply.github.com>
319+
Stephan Ginthör <26004708+Lazarus535@users.noreply.github.com>
320+
AdityaDaflapurkar <adaflapurkar@gmail.com> # Aditya Daflapurkar
321+
Eric Grube <grubee79@gmail.com>
322+
Martyn Janes <martyn@obany.com>
323+
Ricardo N Feliciano <FelicianoTech@gmail.com>
324+
Sergii Bezliudnyi <serg.bezludny@gmail.com>

‎.travis.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ matrix:
1616
branches:
1717
only:
1818
- master
19-
- release-2.5
20-
- release-2.6
2119
- release-2.7
20+
- release-2.8
2221

2322
install:
2423
- npm uninstall typescript --no-save

‎AUTHORS.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ TypeScript is authored by:
33
* Abubaker Bashir
44
* Adam Freidin
55
* Adi Dahiya
6+
* Aditya Daflapurkar
67
* Adnan Chowdhury
78
* Adrian Leonhard
89
* Ahmad Farid
@@ -85,6 +86,7 @@ TypeScript is authored by:
8586
* @e-cloud
8687
* Elisée Maurer
8788
* Emilio García-Pumarino
89+
* Eric Grube
8890
* Eric Tsang
8991
* Erik Edrosa
9092
* Erik McClenney
@@ -184,6 +186,7 @@ TypeScript is authored by:
184186
* Marius Schulz
185187
* Martin Hiller
186188
* Martin Vseticka
189+
* Martyn Janes
187190
* Masahiro Wakame
188191
* Matt Bierner
189192
* Matt McCutchen
@@ -237,6 +240,7 @@ TypeScript is authored by:
237240
* Raj Dosanjh
238241
* Reiner Dolp
239242
* Remo H. Jansen
243+
* Ricardo N Feliciano
240244
* Richard Karmazín
241245
* Richard Knoll
242246
* Richard Sentino
@@ -252,6 +256,7 @@ TypeScript is authored by:
252256
* Sean Barag
253257
* Sergey Rubanov
254258
* Sergey Shandar
259+
* Sergii Bezliudnyi
255260
* Sharon Rolel
256261
* Sheetal Nandi
257262
* Shengping Zhong

‎Jakefile.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ var harnessCoreSources = [
115115
});
116116

117117
var harnessSources = harnessCoreSources.concat([
118+
"base64.ts",
118119
"incrementalParser.ts",
119120
"jsDocParsing.ts",
120121
"services/colorization.ts",

0 commit comments

Comments
 (0)