Merge pull request #15037 from Microsoft/master-14401 · phpnode/TypeScript@ee52477 · GitHub

phpnode / TypeScript Public

forked from microsoft/TypeScript

• Notifications You must be signed in to change notification settings
• Fork 1
• Star 1

• Code
• Pull requests
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit ee52477

Browse filesBrowse the repository at this point in the historyBrowse files

yuit

authored

Merge pull request microsoft#15037 from Microsoft/master-14401

[Master] Include dom into default library files

2 parents 60e056a + 04c71f0 commit ee52477
Copy full SHA for ee52477

3 files changed

+12-5Lines changed: 12 additions & 5 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Gulpfile.ts
• Jakefile.js
• src/compiler
  • utilities.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Gulpfile.ts‎

Copy file name to clipboardExpand all lines: Gulpfile.ts

+4-1Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -162,7 +162,10 @@ const librarySourceMap = [
162	162
163	163	// JavaScript + all host library
164	164	{ 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") },
166	169	].concat(es2015LibrarySourceMap, es2016LibrarySourceMap, es2017LibrarySourceMap, esnextLibrarySourceMap);
167	170
168	171	const libraryTargets = librarySourceMap.map(function(f) {

Collapse file

‎Jakefile.js‎

Copy file name to clipboardExpand all lines: Jakefile.js

+4-1Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -205,7 +205,10 @@ var librarySourceMap = [
205	205
206	206	// JavaScript + all host library
207	207	{ 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") },
209	212	].concat(es2015LibrarySourceMap, es2016LibrarySourceMap, es2017LibrarySourceMap, esnextLibrarySourceMap);
210	213
211	214	var libraryTargets = librarySourceMap.map(function (f) {

Collapse file

‎src/compiler/utilities.ts‎

Copy file name to clipboardExpand all lines: src/compiler/utilities.ts

+4-3Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -4202,12 +4202,13 @@ namespace ts {
4202	4202	export function getDefaultLibFileName(options: CompilerOptions): string {
4203	4203	switch (options.target) {
4204	4204	case ScriptTarget.ESNext:
	4205	+ return "lib.esnext.full.d.ts";
4205	4206	case ScriptTarget.ES2017:
4206		- return "lib.es2017.d.ts";
	4207	+ return "lib.es2017.full.d.ts";
4207	4208	case ScriptTarget.ES2016:
4208		- return "lib.es2016.d.ts";
	4209	+ return "lib.es2016.full.d.ts";
4209	4210	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.
4211	4212	default:
4212	4213	return "lib.d.ts";
4213	4214	}

0 commit comments

Comments

0 (0)