Skip to content

Commit ee52477

Browse files
authored
Merge pull request #15037 from Microsoft/master-14401
[Master] Include dom into default library files
2 parents 60e056a + 04c71f0 commit ee52477

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

Gulpfile.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,10 @@ const librarySourceMap = [
162162

163163
// JavaScript + all host library
164164
{ target: "lib.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(hostsLibrarySources) },
165-
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") }
165+
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") },
166+
{ target: "lib.es2016.full.d.ts", sources: ["header.d.ts", "es2016.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") },
167+
{ target: "lib.es2017.full.d.ts", sources: ["header.d.ts", "es2017.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") },
168+
{ target: "lib.esnext.full.d.ts", sources: ["header.d.ts", "esnext.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") },
166169
].concat(es2015LibrarySourceMap, es2016LibrarySourceMap, es2017LibrarySourceMap, esnextLibrarySourceMap);
167170

168171
const libraryTargets = librarySourceMap.map(function(f) {

Jakefile.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,10 @@ var librarySourceMap = [
205205

206206
// JavaScript + all host library
207207
{ target: "lib.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(hostsLibrarySources) },
208-
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") }
208+
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") },
209+
{ target: "lib.es2016.full.d.ts", sources: ["header.d.ts", "es2016.d.ts"].concat(hostsLibrarySources, "dom.iterable.d.ts") },
210+
{ target: "lib.es2017.full.d.ts", sources: ["header.d.ts", "es2017.d.ts"].concat(hostsLibrarySources, "dom.iterable.d.ts") },
211+
{ target: "lib.esnext.full.d.ts", sources: ["header.d.ts", "esnext.d.ts"].concat(hostsLibrarySources, "dom.iterable.d.ts") },
209212
].concat(es2015LibrarySourceMap, es2016LibrarySourceMap, es2017LibrarySourceMap, esnextLibrarySourceMap);
210213

211214
var libraryTargets = librarySourceMap.map(function (f) {

src/compiler/utilities.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4202,12 +4202,13 @@ namespace ts {
42024202
export function getDefaultLibFileName(options: CompilerOptions): string {
42034203
switch (options.target) {
42044204
case ScriptTarget.ESNext:
4205+
return "lib.esnext.full.d.ts";
42054206
case ScriptTarget.ES2017:
4206-
return "lib.es2017.d.ts";
4207+
return "lib.es2017.full.d.ts";
42074208
case ScriptTarget.ES2016:
4208-
return "lib.es2016.d.ts";
4209+
return "lib.es2016.full.d.ts";
42094210
case ScriptTarget.ES2015:
4210-
return "lib.es6.d.ts";
4211+
return "lib.es6.d.ts"; // We don't use lib.es2015.full.d.ts due to breaking change.
42114212
default:
42124213
return "lib.d.ts";
42134214
}

0 commit comments

Comments
 (0)