Skip to content

Commit 11887cc

Browse files
committed
Adjustmodularize lib
* Merge array, function, math, number, object, regexp, string into es2015.core * Update baselines * Add node.d.ts; need to fix head of the output * Update unittests from add node as an option for --lib * Move interface declaration into NodeJS namespace * Add console into Node.d.ts * Add compiler baseline-tests for using --lib node * Change name from full.es2015 to es6. This is a es6 library file used when no --lib is specified and --target is es6 * Remove add node.d.ts into src/lib Remove node.d.ts Revert "Update unittests from add node as an option for --lib" This reverts commit 5169273. Revert "Add compiler baseline-tests for using --lib node" This reverts commit 17e437b.
1 parent cafe821 commit 11887cc

39 files changed

Lines changed: 610 additions & 2847 deletions

File tree

Jakefile.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,19 +166,13 @@ var harnessSources = harnessCoreSources.concat([
166166
}));
167167

168168
var es2015LibrarySources = [
169-
"es2015.array.d.ts",
169+
"es2015.core.d.ts",
170170
"es2015.collection.d.ts",
171-
"es2015.function.d.ts",
172171
"es2015.generator.d.ts",
173172
"es2015.iterable.d.ts",
174-
"es2015.math.d.ts",
175-
"es2015.number.d.ts",
176-
"es2015.object.d.ts",
177173
"es2015.promise.d.ts",
178174
"es2015.proxy.d.ts",
179175
"es2015.reflect.d.ts",
180-
"es2015.regexp.d.ts",
181-
"es2015.string.d.ts",
182176
"es2015.symbol.d.ts",
183177
"es2015.symbol.wellknown.d.ts",
184178
];
@@ -209,7 +203,7 @@ var librarySourceMap = [
209203

210204
// JavaScript + all host library
211205
{ target: "lib.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(hostsLibrarySources), },
212-
{ target: "lib.full.es2015.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources), },
206+
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources), },
213207
].concat(es2015LibrarySourceMap, es2016LibrarySourceMap);
214208

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

src/compiler/commandLineParser.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -348,19 +348,13 @@ namespace ts {
348348
"webworker": "lib.webworker.d.ts",
349349
"scripthost": "lib.scripthost.d.ts",
350350
// ES2015 Or ESNext By-feature options
351-
"es2015.array": "lib.es2015.array.d.ts",
351+
"es2015.core": "lib.es2015.core.d.ts",
352352
"es2015.collection": "lib.es2015.collection.d.ts",
353353
"es2015.generator": "lib.es2015.generator.d.ts",
354-
"es2015.function": "lib.es2015.function.d.ts",
355354
"es2015.iterable": "lib.es2015.iterable.d.ts",
356-
"es2015.math": "lib.es2015.math.d.ts",
357-
"es2015.number": "lib.es2015.number.d.ts",
358-
"es2015.object": "lib.es2015.object.d.ts",
359355
"es2015.promise": "lib.es2015.promise.d.ts",
360356
"es2015.proxy": "lib.es2015.proxy.d.ts",
361357
"es2015.reflect": "lib.es2015.reflect.d.ts",
362-
"es2015.regexp": "lib.es2015.regexp.d.ts",
363-
"es2015.string": "lib.es2015.string.d.ts",
364358
"es2015.symbol": "lib.es2015.symbol.d.ts",
365359
"es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
366360
"es2016.array.include": "lib.es2016.array.include.d.ts"

src/compiler/utilities.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2694,7 +2694,7 @@ namespace ts {
26942694

26952695
namespace ts {
26962696
export function getDefaultLibFileName(options: CompilerOptions): string {
2697-
return options.target === ScriptTarget.ES6 ? "lib.full.es2015.d.ts" : "lib.d.ts";
2697+
return options.target === ScriptTarget.ES6 ? "lib.es6.d.ts" : "lib.d.ts";
26982698
}
26992699

27002700
export function textSpanEnd(span: TextSpan) {

src/lib/es2015.array.d.ts

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)