Skip to content

Commit beb6aef

Browse files
author
Andy Hanson
committed
Merge branch 'master' into services_settings
2 parents e8033dc + ac5a39c commit beb6aef

File tree

1,546 files changed

+63526
-55595
lines changed

Some content is hidden

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

1,546 files changed

+63526
-55595
lines changed

.circleci/config.yml

+18-43
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,21 @@
1+
defaultFilters: &defaultFilters
2+
filters:
3+
branches:
4+
only:
5+
- master
6+
- release-2.5
7+
- release-2.6
8+
- release-2.7
19
workflows:
210
version: 2
311
main:
412
jobs:
513
- node9:
6-
filters:
7-
branches:
8-
only:
9-
- master
10-
- release-2.5
11-
- release-2.6
12-
- release-2.7
14+
<<: *defaultFilters
1315
- node8:
14-
filters:
15-
branches:
16-
only:
17-
- master
18-
- release-2.5
19-
- release-2.6
20-
- release-2.7
16+
<<: *defaultFilters
2117
- node6:
22-
filters:
23-
branches:
24-
only:
25-
- master
26-
- release-2.5
27-
- release-2.6
28-
- release-2.7
18+
<<: *defaultFilters
2919
nightly:
3020
triggers:
3121
- schedule:
@@ -35,38 +25,23 @@ workflows:
3525
only: master
3626
jobs:
3727
- node9:
38-
filters:
39-
branches:
40-
only:
41-
- master
42-
- release-2.5
43-
- release-2.6
44-
- release-2.7
28+
<<: *defaultFilters
4529
context: nightlies
4630
- node8:
47-
filters:
48-
branches:
49-
only:
50-
- master
51-
- release-2.5
52-
- release-2.6
53-
- release-2.7
31+
<<: *defaultFilters
5432
context: nightlies
5533
- node6:
56-
filters:
57-
branches:
58-
only:
59-
- master
60-
- release-2.5
61-
- release-2.6
62-
- release-2.7
34+
<<: *defaultFilters
6335
context: nightlies
6436

6537
base: &base
6638
environment:
6739
- workerCount: 4
40+
- timeout: 400000
6841
steps:
69-
- checkout
42+
- checkout:
43+
post:
44+
- git submodule update --init --recursive
7045
- run: |
7146
npm uninstall typescript --no-save
7247
npm uninstall tslint --no-save

.npmignore

+4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@ tslint.json
1515
Jakefile.js
1616
.editorconfig
1717
.gitattributes
18+
.gitmodules
1819
.settings/
1920
.travis.yml
21+
.circleci
2022
.vscode/
23+
.parallelperf.json
2124
test.config
2225
package-lock.json
26+
yarn.lock

.travis.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@ node_js:
88
sudo: false
99

1010
env:
11-
- workerCount=3
11+
- workerCount=3 timeout=600000
1212

1313
matrix:
1414
fast_finish: true
1515

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

Gulpfile.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,16 @@ const es2017LibrarySource = [
143143
const es2017LibrarySourceMap = es2017LibrarySource.map(source =>
144144
({ target: "lib." + source, sources: ["header.d.ts", source] }));
145145

146-
const es2018LibrarySource = [];
146+
const es2018LibrarySource = [
147+
"es2018.regexp.d.ts",
148+
"es2018.promise.d.ts"
149+
];
147150
const es2018LibrarySourceMap = es2018LibrarySource.map(source =>
148151
({ target: "lib." + source, sources: ["header.d.ts", source] }));
149152

150153
const esnextLibrarySource = [
151154
"esnext.asynciterable.d.ts",
152-
"esnext.array.d.ts",
153-
"esnext.promise.d.ts"
155+
"esnext.array.d.ts"
154156
];
155157

156158
const esnextLibrarySourceMap = esnextLibrarySource.map(source =>

Jakefile.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -206,16 +206,18 @@ var es2017LibrarySourceMap = es2017LibrarySource.map(function (source) {
206206
return { target: "lib." + source, sources: ["header.d.ts", source] };
207207
});
208208

209-
var es2018LibrarySource = [];
209+
var es2018LibrarySource = [
210+
"es2018.regexp.d.ts",
211+
"es2018.promise.d.ts"
212+
];
210213

211214
var es2018LibrarySourceMap = es2018LibrarySource.map(function (source) {
212215
return { target: "lib." + source, sources: ["header.d.ts", source] };
213216
});
214217

215218
var esnextLibrarySource = [
216219
"esnext.asynciterable.d.ts",
217-
"esnext.array.d.ts",
218-
"esnext.promise.d.ts"
220+
"esnext.array.d.ts"
219221
];
220222

221223
var esnextLibrarySourceMap = esnextLibrarySource.map(function (source) {

0 commit comments

Comments
 (0)