Skip to content

Commit 02f908a

Browse files
committed
Merge branch 'master' into noImplicitAnyDestructuring
2 parents 34f7f2c + 905957d commit 02f908a

File tree

3,197 files changed

+389868
-270036
lines changed

Some content is hidden

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

3,197 files changed

+389868
-270036
lines changed

.gitignore

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ tests/baselines/reference/projectOutput/*
1717
tests/baselines/local/projectOutput/*
1818
tests/services/baselines/prototyping/local/*
1919
tests/services/browser/typescriptServices.js
20+
scripts/authors.js
2021
scripts/configureNightly.js
2122
scripts/processDiagnosticMessages.d.ts
2223
scripts/processDiagnosticMessages.js
@@ -34,7 +35,6 @@ tests/webhost/*.d.ts
3435
tests/webhost/webtsc.js
3536
tests/cases/**/*.js
3637
tests/cases/**/*.js.map
37-
tests/cases/**/*.d.ts
3838
*.config
3939
scripts/debug.bat
4040
scripts/run.bat
@@ -46,5 +46,9 @@ coverage/
4646
internal/
4747
**/.DS_Store
4848
.settings
49-
.vscode/*
50-
!.vscode/tasks.json
49+
**/.vs
50+
**/.vscode
51+
!**/.vscode/tasks.json
52+
!tests/cases/projects/projectOption/**/node_modules
53+
!tests/cases/projects/NodeModulesSearch/**/*
54+
!tests/baselines/reference/project/nodeModules*/**/*

.mailmap

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+

2+
Alexander <[email protected]># Alexander Kuvaev
3+
AbubakerB <[email protected]> # Abubaker Bashir
4+
Adam Freidin <[email protected]> Adam Freidin <[email protected]>
5+
Adi Dahiya <[email protected]> Adi Dahiya <[email protected]>
6+
Ahmad Farid <[email protected]> ahmad-farid <[email protected]>
7+
Alex Eagle <[email protected]>
8+
Anders Hejlsberg <[email protected]> unknown <[email protected]> unknown <[email protected]>
9+
Andrew Z Allen <[email protected]>
10+
11+
Anil Anar <[email protected]>
12+
Anton Tolmachev <[email protected]>
13+
Arnavion <[email protected]> # Arnav Singh
14+
Arthur Ozga <[email protected]> Arthur Ozga <[email protected]>
15+
Asad Saeeduddin <[email protected]>
16+
Schmavery <[email protected]> # Avery Morin
17+
Basarat Ali Syed <[email protected]> Basarat Syed <[email protected]> basarat <[email protected]>
18+
Bill Ticehurst <[email protected]> Bill Ticehurst <[email protected]>
19+
Ben Duffield <[email protected]>
20+
Blake Embrey <[email protected]>
21+
Bowden Kelly <[email protected]>
22+
Brett Mayen <[email protected]>
23+
Bryan Forbes <[email protected]>
24+
Caitlin Potter <[email protected]>
25+
ChrisBubernak <[email protected]> unknown <[email protected]> # Chris Bubernak
26+
Chuck Jazdzewski <[email protected]>
27+
Colby Russell <[email protected]>
28+
Colin Snover <[email protected]>
29+
Cyrus Najmabadi <[email protected]> CyrusNajmabadi <[email protected]> unknown <[email protected]>
30+
Dan Corder <[email protected]>
31+
32+
Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]>
33+
34+
David Souther <[email protected]>
35+
Denis Nedelyaev <[email protected]>
36+
Dick van den Brink <[email protected]> unknown <[email protected]> unknown <[email protected]>
37+
Dirk Baeumer <[email protected]> Dirk Bäumer <[email protected]> # Dirk Bäumer
38+
Dirk Holtwick <[email protected]>
39+
Doug Ilijev <[email protected]>
40+
Erik Edrosa <[email protected]>
41+
Ethan Rubio <[email protected]>
42+
Evan Martin <[email protected]>
43+
Evan Sebastian <[email protected]>
44+
Eyas <[email protected]> # Eyas Sharaiha
45+
falsandtru <[email protected]> # @falsandtru
46+
Frank Wallis <[email protected]>
47+
František Žiačik <[email protected]> František Žiačik <[email protected]>
48+
Gabriel Isenberg <[email protected]>
49+
Gilad Peleg <[email protected]>
50+
Graeme Wicksted <[email protected]>
51+
Guillaume Salles <[email protected]>
52+
Guy Bedford <[email protected]> guybedford <[email protected]>
53+
Harald Niesche <[email protected]>
54+
Iain Monro <[email protected]>
55+
Ingvar Stepanyan <[email protected]>
56+
impinball <[email protected]> # Isiah Meadows
57+
Ivo Gabe de Wolff <[email protected]>
58+
James Whitney <[email protected]>
59+
Jason Freeman <[email protected]> Jason Freeman <[email protected]>
60+
Jason Killian <[email protected]>
61+
Jason Ramsay <[email protected]> jramsay <[email protected]>
62+
63+
Jeffrey Morlan <[email protected]>
64+
tobisek <[email protected]> # Jiri Tobisek
65+
Johannes Rieken <[email protected]>
66+
John Vilk <[email protected]>
67+
jbondc <[email protected]> jbondc <[email protected]> jbondc <[email protected]> # Jonathan Bond-Caron
68+
Jonathan Park <[email protected]>
69+
Jonathan Turner <[email protected]> Jonathan Turner <[email protected]>
70+
Jonathan Toland <[email protected]>
71+
Jesse Schalken <[email protected]>
72+
Josh Kalderimis <[email protected]>
73+
Josh Soref <[email protected]>
74+
Juan Luis Boya García <[email protected]>
75+
Julian Williams <[email protected]>
76+
Herrington Darkholme <[email protected]>
77+
Kagami Sascha Rosylight <[email protected]> SaschaNaz <[email protected]>
78+
Kanchalai Tanglertsampan <[email protected]> Yui <[email protected]>
79+
Kanchalai Tanglertsampan <[email protected]> Yui T <[email protected]>
80+
Kanchalai Tanglertsampan <[email protected]> Yui <[email protected]>
81+
Kanchalai Tanglertsampan <[email protected]> Yui <[email protected]>
82+
Kanchalai Tanglertsampan <[email protected]> yui T <[email protected]>
83+
Keith Mashinter <[email protected]> kmashint <[email protected]>
84+
Ken Howard <[email protected]>
85+
kimamula <[email protected]> # Kenji Imamula
86+
Kyle Kelley <[email protected]>
87+
Lorant Pinter <[email protected]>
88+
Lucien Greathouse <[email protected]>
89+
Martin Vseticka <[email protected]> Martin Všeticka <[email protected]> MartyIX <[email protected]>
90+
vvakame <[email protected]> # Masahiro Wakame
91+
Matt McCutchen <[email protected]>
92+
Max Deepfield <[email protected]>
93+
Micah Zoltu <[email protected]>
94+
Mohamed Hegazy <[email protected]>
95+
Nathan Shively-Sanders <[email protected]>
96+
Nathan Yee <[email protected]>
97+
Nima Zahedi <[email protected]>
98+
99+
mihailik <[email protected]> # Oleg Mihailik
100+
Oleksandr Chekhovskyi <[email protected]>
101+
Paul van Brenk <[email protected]> Paul van Brenk <[email protected]> unknown <[email protected]> unknown <[email protected]> unknown <[email protected]>
102+
Oskar Segersva¨rd <[email protected]>
103+
pcan <[email protected]> # Piero Cangianiello
104+
pcbro <[email protected]> # @pcbro
105+
Pedro Maltez <[email protected]> # Pedro Maltez
106+
piloopin <[email protected]> # @piloopin
107+
milkisevil <[email protected]> # Philip Bulley
108+
progre <[email protected]> # @progre
109+
Prayag Verma <[email protected]>
110+
Punya Biswal <[email protected]>
111+
Rado Kirov <[email protected]>
112+
Ron Buckton <[email protected]> Ron Buckton <[email protected]>
113+
Richard Knoll <[email protected]> Richard Knoll <[email protected]>
114+
Rowan Wyborn <[email protected]>
115+
Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]>
116+
Ryohei Ikegami <[email protected]>
117+
Sarangan Rajamanickam <[email protected]>
118+
Sébastien Arod <[email protected]>
119+
Sheetal Nandi <[email protected]>
120+
Shengping Zhong <[email protected]>
121+
122+
Simon Hürlimann <[email protected]>
123+
Solal Pirelli <[email protected]>
124+
Stan Thomas <[email protected]>
125+
Stanislav Sysoev <[email protected]>
126+
Steve Lucco <[email protected]> steveluc <[email protected]>
127+
Tarik <[email protected]> # Tarik Ozket
128+
Tetsuharu OHZEKI <[email protected]> # Tetsuharu Ohzeki
129+
Tien Nguyen <[email protected]> tien <[email protected]> unknown <[email protected]> #Tien Hoanhtien
130+
Tim Perry <[email protected]>
131+
Tim Viiding-Spader <[email protected]>
132+
Tingan Ho <[email protected]>
133+
togru <[email protected]> # togru
134+
Tomas Grubliauskas <[email protected]>
135+
ToddThomson <[email protected]> # Todd Thomson
136+
TruongSinh Tran-Nguyen <[email protected]>
137+
vilicvane <[email protected]> # Vilic Vane
138+
Vladimir Matveev <[email protected]> vladima <[email protected]> v2m <[email protected]>
139+
Wesley Wigham <[email protected]> Wesley Wigham <[email protected]>
140+
141+
Yuichi Nukiyama <[email protected]> YuichiNukiyama <[email protected]>
142+
Zev Spitz <[email protected]>
143+
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>
144+
zhongsp <[email protected]> # Patrick Zhong
145+
T18970237136 <[email protected]> # @T18970237136
146+

.npmignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
built
22
doc
3+
internal
4+
issue_template.md
35
lib/README.md
6+
pull_request_template.md
47
scripts
58
src
69
tests
7-
internal
810
tslint.json
911
Jakefile.js
1012
.editorconfig

.travis.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,34 @@ node_js:
66
- '0.10'
77

88
sudo: false
9+
10+
env:
11+
- workerCount=3
12+
13+
matrix:
14+
fast_finish: true
15+
include:
16+
- os: osx
17+
node_js: stable
18+
osx_image: xcode7.3
19+
env: workerCount=2
20+
allow_failures:
21+
- os: osx
22+
23+
branches:
24+
only:
25+
- master
26+
- transforms
27+
28+
install:
29+
- npm uninstall typescript
30+
- npm uninstall tslint
31+
- npm install
32+
- npm update
33+
34+
cache:
35+
directories:
36+
- node_modules
37+
38+
git:
39+
depth: 1

.vscode/tasks.json

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// ${cwd}: the current working directory of the spawned process
88
{
99
"version": "0.1.0",
10-
"command": "jake",
10+
"command": "gulp",
1111
"isShellCommand": true,
1212
"showOutput": "silent",
1313
"tasks": [
@@ -18,25 +18,6 @@
1818
"problemMatcher": [
1919
"$tsc"
2020
]
21-
},
22-
{
23-
"taskName": "lint-server",
24-
"args": [],
25-
"problemMatcher": {
26-
"owner": "typescript",
27-
"fileLocation": ["relative", "${workspaceRoot}"],
28-
"pattern": {
29-
"regexp": "^(warning|error)\\s+([^(]+)\\s+\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\):\\s+(.*)$",
30-
"severity": 1,
31-
"file": 2,
32-
"location": 3,
33-
"message": 4
34-
},
35-
"watchedTaskBeginsRegExp": "^\\*\\*\\*Lint failure\\*\\*\\*$",
36-
"watchedTaskEndsRegExp": "^\\*\\*\\* Total \\d+ failures\\.$"
37-
},
38-
"showOutput": "always",
39-
"isWatching": true
4021
}
4122
]
4223
}

0 commit comments

Comments
 (0)