Skip to content

Commit 2df7a89

Browse files
sandersnsandersn
committed
Merge branch 'master' into limit-recursive-structured-type-resolution
2 parents fb3042c + 81fbe12 commit 2df7a89

722 files changed

Lines changed: 179981 additions & 84119 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.

‎.gitmodules‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,19 @@
22
path = tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter
33
url = https://github.com/Microsoft/TypeScript-React-Starter
44
ignore = all
5-
shallow = true
65
[submodule "tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter"]
76
path = tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
87
url = https://github.com/Microsoft/TypeScript-Node-Starter.git
98
ignore = all
10-
shallow = true
119
[submodule "tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter"]
1210
path = tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter
1311
url = https://github.com/Microsoft/TypeScript-React-Native-Starter.git
1412
ignore = all
15-
shallow = true
1613
[submodule "tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter"]
1714
path = tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter
1815
url = https://github.com/Microsoft/TypeScript-Vue-Starter.git
1916
ignore = all
20-
shallow = true
2117
[submodule "tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter"]
2218
path = tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter
2319
url = https://github.com/Microsoft/TypeScript-WeChat-Starter.git
2420
ignore = all
25-
shallow = true

‎Gulpfile.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@ const es2017LibrarySource = [
145145
const es2017LibrarySourceMap = es2017LibrarySource.map(source =>
146146
({ target: "lib." + source, sources: ["header.d.ts", source] }));
147147

148+
const es2018LibrarySource = [];
149+
const es2018LibrarySourceMap = es2018LibrarySource.map(source =>
150+
({ target: "lib." + source, sources: ["header.d.ts", source] }));
151+
148152
const esnextLibrarySource = [
149153
"esnext.asynciterable.d.ts"
150154
];
@@ -166,15 +170,17 @@ const librarySourceMap = [
166170
{ target: "lib.es2015.d.ts", sources: ["header.d.ts", "es2015.d.ts"] },
167171
{ target: "lib.es2016.d.ts", sources: ["header.d.ts", "es2016.d.ts"] },
168172
{ target: "lib.es2017.d.ts", sources: ["header.d.ts", "es2017.d.ts"] },
173+
{ target: "lib.es2018.d.ts", sources: ["header.d.ts", "es2018.d.ts"] },
169174
{ target: "lib.esnext.d.ts", sources: ["header.d.ts", "esnext.d.ts"] },
170175

171176
// JavaScript + all host library
172177
{ target: "lib.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(hostsLibrarySources) },
173178
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") },
174179
{ target: "lib.es2016.full.d.ts", sources: ["header.d.ts", "es2016.d.ts"].concat(hostsLibrarySources, "dom.iterable.d.ts") },
175180
{ target: "lib.es2017.full.d.ts", sources: ["header.d.ts", "es2017.d.ts"].concat(hostsLibrarySources, "dom.iterable.d.ts") },
181+
{ target: "lib.es2018.full.d.ts", sources: ["header.d.ts", "es2018.d.ts"].concat(hostsLibrarySources, "dom.iterable.d.ts") },
176182
{ target: "lib.esnext.full.d.ts", sources: ["header.d.ts", "esnext.d.ts"].concat(hostsLibrarySources, "dom.iterable.d.ts") },
177-
].concat(es2015LibrarySourceMap, es2016LibrarySourceMap, es2017LibrarySourceMap, esnextLibrarySourceMap);
183+
].concat(es2015LibrarySourceMap, es2016LibrarySourceMap, es2017LibrarySourceMap, es2018LibrarySourceMap, esnextLibrarySourceMap);
178184

179185
const libraryTargets = librarySourceMap.map(f =>
180186
path.join(builtLocalDirectory, f.target));

‎Jakefile.js‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ var harnessSources = harnessCoreSources.concat([
130130
"textStorage.ts",
131131
"moduleResolution.ts",
132132
"tsconfigParsing.ts",
133+
"asserts.ts",
133134
"builder.ts",
134135
"commandLineParsing.ts",
135136
"configurationExtension.ts",
@@ -205,6 +206,12 @@ var es2017LibrarySourceMap = es2017LibrarySource.map(function (source) {
205206
return { target: "lib." + source, sources: ["header.d.ts", source] };
206207
});
207208

209+
var es2018LibrarySource = [];
210+
211+
var es2018LibrarySourceMap = es2018LibrarySource.map(function (source) {
212+
return { target: "lib." + source, sources: ["header.d.ts", source] };
213+
});
214+
208215
var esnextLibrarySource = [
209216
"esnext.asynciterable.d.ts"
210217
];
@@ -227,15 +234,17 @@ var librarySourceMap = [
227234
{ target: "lib.es2015.d.ts", sources: ["header.d.ts", "es2015.d.ts"] },
228235
{ target: "lib.es2016.d.ts", sources: ["header.d.ts", "es2016.d.ts"] },
229236
{ target: "lib.es2017.d.ts", sources: ["header.d.ts", "es2017.d.ts"] },
237+
{ target: "lib.es2018.d.ts", sources: ["header.d.ts", "es2018.d.ts"] },
230238
{ target: "lib.esnext.d.ts", sources: ["header.d.ts", "esnext.d.ts"] },
231239

232240
// JavaScript + all host library
233241
{ target: "lib.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(hostsLibrarySources) },
234242
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") },
235243
{ target: "lib.es2016.full.d.ts", sources: ["header.d.ts", "es2016.d.ts"].concat(hostsLibrarySources, "dom.iterable.d.ts") },
236244
{ target: "lib.es2017.full.d.ts", sources: ["header.d.ts", "es2017.d.ts"].concat(hostsLibrarySources, "dom.iterable.d.ts") },
245+
{ target: "lib.es2018.full.d.ts", sources: ["header.d.ts", "es2018.d.ts"].concat(hostsLibrarySources, "dom.iterable.d.ts") },
237246
{ target: "lib.esnext.full.d.ts", sources: ["header.d.ts", "esnext.d.ts"].concat(hostsLibrarySources, "dom.iterable.d.ts") },
238-
].concat(es2015LibrarySourceMap, es2016LibrarySourceMap, es2017LibrarySourceMap, esnextLibrarySourceMap);
247+
].concat(es2015LibrarySourceMap, es2016LibrarySourceMap, es2017LibrarySourceMap, es2018LibrarySourceMap, esnextLibrarySourceMap);
239248

240249
var libraryTargets = librarySourceMap.map(function (f) {
241250
return path.join(builtLocalDirectory, f.target);

‎lib/cancellationToken.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,3 @@ function createCancellationToken(args) {
6969
}
7070
}
7171
module.exports = createCancellationToken;
72-
73-
//# sourceMappingURL=cancellationToken.js.map

0 commit comments

Comments
 (0)