Skip to content

Commit 292b517

Browse files
committed
Merge branch 'master' of https://github.com/Microsoft/TypeScript into listIndent
2 parents 0b65fd2 + ebbfca9 commit 292b517

File tree

983 files changed

+187714
-84710
lines changed

Some content is hidden

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

983 files changed

+187714
-84710
lines changed

Gulpfile.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ const es2017LibrarySource = [
131131
"es2017.object.d.ts",
132132
"es2017.sharedmemory.d.ts",
133133
"es2017.string.d.ts",
134+
"es2017.intl.d.ts",
134135
];
135136

136137
const es2017LibrarySourceMap = es2017LibrarySource.map(function(source) {
@@ -935,7 +936,7 @@ gulp.task(loggedIOJsPath, /*help*/ false, [], (done) => {
935936
const temp = path.join(builtLocalDirectory, "temp");
936937
mkdirP(temp, (err) => {
937938
if (err) { console.error(err); done(err); process.exit(1); }
938-
exec(host, [LKGCompiler, "--types --outdir", temp, loggedIOpath], () => {
939+
exec(host, [LKGCompiler, "--types", "--target es5", "--lib es5", "--outdir", temp, loggedIOpath], () => {
939940
fs.renameSync(path.join(temp, "/harness/loggedIO.js"), loggedIOJsPath);
940941
del(temp).then(() => done(), done);
941942
}, done);
@@ -946,7 +947,13 @@ const instrumenterPath = path.join(harnessDirectory, "instrumenter.ts");
946947
const instrumenterJsPath = path.join(builtLocalDirectory, "instrumenter.js");
947948
gulp.task(instrumenterJsPath, /*help*/ false, [servicesFile], () => {
948949
const settings: tsc.Settings = getCompilerSettings({
949-
outFile: instrumenterJsPath
950+
outFile: instrumenterJsPath,
951+
target: "es5",
952+
lib: [
953+
"es6",
954+
"dom",
955+
"scripthost"
956+
]
950957
}, /*useBuiltCompiler*/ true);
951958
return gulp.src(instrumenterPath)
952959
.pipe(newer(instrumenterJsPath))

Jakefile.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ var es2016LibrarySourceMap = es2016LibrarySource.map(function (source) {
172172
var es2017LibrarySource = [
173173
"es2017.object.d.ts",
174174
"es2017.sharedmemory.d.ts",
175-
"es2017.string.d.ts"
175+
"es2017.string.d.ts",
176+
"es2017.intl.d.ts"
176177
];
177178

178179
var es2017LibrarySourceMap = es2017LibrarySource.map(function (source) {

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![Build Status](https://travis-ci.org/Microsoft/TypeScript.svg?branch=master)](https://travis-ci.org/Microsoft/TypeScript)
22
[![npm version](https://badge.fury.io/js/typescript.svg)](https://www.npmjs.com/package/typescript)
3-
[![Downloads](https://img.shields.io/npm/dm/TypeScript.svg)](https://www.npmjs.com/package/typescript)
3+
[![Downloads](https://img.shields.io/npm/dm/typescript.svg)](https://www.npmjs.com/package/typescript)
44

55
# TypeScript
66

lib/cancellationToken.js

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/lib.d.ts

Lines changed: 577 additions & 349 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)