Merge branch 'master' into externalExportStar

Author: rbuckton

.mailmap

@@ -8,11 +8,14 @@ Alexander Rusakov  <[email protected]>
 Alex Eagle <[email protected]>
 Anatoly Ressin  <[email protected]>
 Anders Hejlsberg <[email protected]> unknown <[email protected]> unknown <[email protected]>
+about-code  <[email protected]> # Andreas Martin
 Andrej Baran  <[email protected]>
+Andrew Ochsner  <[email protected]>
 Andrew Z Allen <[email protected]>
 Andy Hanson <[email protected]> Andy <[email protected]>
 Anil Anar <[email protected]>
 Anton Tolmachev <[email protected]>
+Anubha Mathur  <[email protected]> anubmat  <[email protected]>
 Arnavion <[email protected]> # Arnav Singh
 Arthur Ozga <[email protected]> Arthur Ozga <[email protected]> Arthur Ozga  <[email protected]> Arthur Ozga  <[email protected]> Arthur Ozga  <[email protected]>
 Asad Saeeduddin <[email protected]>
@@ -37,6 +40,7 @@ Dan Corder <[email protected]>
 Dan Quirk <[email protected]> Dan Quirk <[email protected]> nknown <[email protected]>
 Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]>
 David Li <[email protected]>
+David Sheldrick  <[email protected]>
 David Souther <[email protected]>
 Denis Nedelyaev <[email protected]>
 Dick van den Brink <[email protected]> unknown <[email protected]> unknown <[email protected]>
@@ -52,6 +56,7 @@ Evan Sebastian <[email protected]>
 Eyas <[email protected]> # Eyas Sharaiha
 Fabian Cook  <[email protected]>
 falsandtru <[email protected]> # @falsandtru
+flowmemo  <[email protected]> # @flowmemo
 Frank Wallis <[email protected]>
 František Žiacik <[email protected]> František Žiacik <[email protected]>
 Gabe Moothart  <[email protected]>
@@ -62,6 +67,7 @@ Graeme Wicksted <[email protected]>
 Guillaume Salles <[email protected]>
 Guy Bedford <[email protected]> guybedford <[email protected]>
 Harald Niesche <[email protected]>
+Homa Wong  <[email protected]>
 Iain Monro <[email protected]>
 Ingvar Stepanyan <[email protected]>
 impinball <[email protected]> # Isiah Meadows
@@ -81,6 +87,7 @@ Jonathan Park <[email protected]>
 Jonathan Turner <[email protected]> Jonathan Turner <[email protected]>
 Jonathan Toland <[email protected]>
 Jesse Schalken <[email protected]>
+Joel Day  <[email protected]>
 Josh Abernathy  <[email protected]> joshaber  <[email protected]>
 Josh Kalderimis <[email protected]>
 Josh Soref <[email protected]>
@@ -95,10 +102,12 @@ Kanchalai Tanglertsampan <[email protected]> Yui T <[email protected]>
 Kanchalai Tanglertsampan <[email protected]> Yui <[email protected]>
 Kanchalai Tanglertsampan <[email protected]> Yui <[email protected]>
 Kanchalai Tanglertsampan <[email protected]> yui T <[email protected]>
+Kārlis Gaņģis <[email protected]>
 Keith Mashinter <[email protected]> kmashint <[email protected]>
 Ken Howard <[email protected]>
 Kevin Lang  <[email protected]>
 kimamula <[email protected]> # Kenji Imamula
+Klaus Meinhardt  <[email protected]>
 Kyle Kelley <[email protected]>
 Lorant Pinter <[email protected]>
 Lucien Greathouse <[email protected]>
@@ -107,6 +116,7 @@ Martin Vseticka <[email protected]> Martin Všeticka <vseticka.martin@gm
 gcnew  <[email protected]> # Marin Marinov
 vvakame <[email protected]> # Masahiro Wakame
 Matt McCutchen <[email protected]>
+MANISH-GIRI  <[email protected]> # Manish Giri
 Max Deepfield <[email protected]>
 Micah Zoltu <[email protected]>
 Michael  <[email protected]>
@@ -213,4 +223,6 @@ Tim Perry <[email protected]>
 Vidar Tonaas Fauske <[email protected]>
 Viktor Zozulyak <[email protected]>
 rix <[email protected]> # Richard Sentino
-rohitverma007 <[email protected]> # Rohit Verma
+rohitverma007 <[email protected]> # Rohit Verma
+rdosanjh  <[email protected]> # Raj Dosanjh
+gdh1995  <[email protected]> # Dahan Gong

.travis.yml

@@ -17,6 +17,7 @@ branches:
   only:
   - master
   - release-2.1
+  - release-2.2
 
 install:
   - npm uninstall typescript

AUTHORS.md

@@ -12,13 +12,16 @@ TypeScript is authored by:
 * Aliaksandr Radzivanovich
 * Anatoly Ressin 
 * Anders Hejlsberg
+* Andreas Martin
 * Andrej Baran 
+* Andrew Ochsner 
 * Andrew Z Allen
 * András Parditka 
 * Andy Hanson
 * Anil Anar
 * Anton Khlynovskiy 
 * Anton Tolmachev
+* Anubha Mathur 
 * Arnav Singh
 * Arthur Ozga
 * Asad Saeeduddin
@@ -42,12 +45,14 @@ TypeScript is authored by:
 * Cotton Hou 
 * Cyrus Najmabadi
 * Dafrok Zhang
+* Dahan Gong
 * Dan Corder
 * Dan Quirk
 * Daniel Hollocher
 * Daniel Rosenwasser
 * David Kmenta
 * David Li
+* David Sheldrick 
 * David Souther
 * Denis Nedelyaev
 * Dick van den Brink
@@ -66,6 +71,7 @@ TypeScript is authored by:
 * Eyas Sharaiha
 * Fabian Cook 
 * @falsandtru
+* @flowmemo
 * Frank Wallis
 * Franklin Tse
 * František Žiacik
@@ -79,6 +85,7 @@ TypeScript is authored by:
 * Guy Bedford
 * Harald Niesche
 * Herrington Darkholme
+* Homa Wong 
 * Iain Monro
 * Ingvar Stepanyan
 * Isiah Meadows
@@ -93,6 +100,7 @@ TypeScript is authored by:
 * Jeffrey Morlan
 * Jesse Schalken
 * Jiri Tobisek
+* Joel Day 
 * Joey Wilson
 * Johannes Rieken
 * John Vilk
@@ -114,10 +122,13 @@ TypeScript is authored by:
 * Ken Howard
 * Kenji Imamula
 * Kevin Lang 
+* Klaus Meinhardt 
 * Kyle Kelley
+* Kārlis Gaņģis
 * Lorant Pinter
 * Lucien Greathouse
 * Lukas Elmer 
+* Manish Giri
 * Marin Marinov
 * Marius Schulz 
 * Martin Vseticka
@@ -155,6 +166,7 @@ TypeScript is authored by:
 * @progre
 * Punya Biswal
 * Rado Kirov
+* Raj Dosanjh
 * Richard Knoll
 * Richard Sentino
 * Robert Coie

Gulpfile.ts

@@ -41,7 +41,7 @@ const {runTestsInParallel} = mochaParallel;
 Error.stackTraceLimit = 1000;
 
 const cmdLineOptions = minimist(process.argv.slice(2), {
-    boolean: ["debug", "light", "colors", "lint", "soft"],
+    boolean: ["debug", "inspect", "light", "colors", "lint", "soft"],
     string: ["browser", "tests", "host", "reporter", "stackTraceLimit"],
     alias: {
         d: "debug",
@@ -50,19 +50,22 @@ const cmdLineOptions = minimist(process.argv.slice(2), {
         r: "reporter",
         color: "colors",
         f: "files",
-        file: "files"
+        file: "files",
+        w: "workers",
     },
     default: {
         soft: false,
         colors: process.env.colors || process.env.color || true,
         debug: process.env.debug || process.env.d,
+        inspect: process.env.inspect,
         host: process.env.TYPESCRIPT_HOST || process.env.host || "node",
         browser: process.env.browser || process.env.b || "IE",
         tests: process.env.test || process.env.tests || process.env.t,
         light: process.env.light || false,
         reporter: process.env.reporter || process.env.r,
         lint: process.env.lint || true,
         files: process.env.f || process.env.file || process.env.files || "",
+        workers: process.env.workerCount || os.cpus().length,
     }
 });
 
@@ -136,6 +139,14 @@ const es2017LibrarySourceMap = es2017LibrarySource.map(function(source) {
     return { target: "lib." + source, sources: ["header.d.ts", source] };
 });
 
+const esnextLibrarySource = [
+    "esnext.asynciterable.d.ts"
+];
+
+const esnextLibrarySourceMap = esnextLibrarySource.map(function (source) {
+    return { target: "lib." + source, sources: ["header.d.ts", source] };
+});
+
 const hostsLibrarySources = ["dom.generated.d.ts", "webworker.importscripts.d.ts", "scripthost.d.ts"];
 
 const librarySourceMap = [
@@ -150,11 +161,12 @@ const librarySourceMap = [
     { target: "lib.es2015.d.ts", sources: ["header.d.ts", "es2015.d.ts"] },
     { target: "lib.es2016.d.ts", sources: ["header.d.ts", "es2016.d.ts"] },
     { target: "lib.es2017.d.ts", sources: ["header.d.ts", "es2017.d.ts"] },
+    { target: "lib.esnext.d.ts", sources: ["header.d.ts", "esnext.d.ts"] },
 
     // JavaScript + all host library
     { target: "lib.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(hostsLibrarySources) },
     { target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") }
-].concat(es2015LibrarySourceMap, es2016LibrarySourceMap, es2017LibrarySourceMap);
+].concat(es2015LibrarySourceMap, es2016LibrarySourceMap, es2017LibrarySourceMap, esnextLibrarySourceMap);
 
 const libraryTargets = librarySourceMap.map(function(f) {
     return path.join(builtLocalDirectory, f.target);
@@ -242,23 +254,21 @@ function needsUpdate(source: string | string[], dest: string | string[]): boolea
     return true;
 }
 
+// Doing tsconfig inheritance manually. https://github.com/ivogabe/gulp-typescript/issues/459
+const tsconfigBase = JSON.parse(fs.readFileSync("src/tsconfig-base.json", "utf-8")).compilerOptions;
+
 function getCompilerSettings(base: tsc.Settings, useBuiltCompiler?: boolean): tsc.Settings {
     const copy: tsc.Settings = {};
-    copy.noEmitOnError = true;
-    copy.noImplicitAny = true;
-    copy.noImplicitThis = true;
-    copy.pretty = true;
-    copy.types = [];
+    for (const key in tsconfigBase) {
+        copy[key] = tsconfigBase[key];
+    }
     for (const key in base) {
         copy[key] = base[key];
     }
     if (!useDebugMode) {
         if (copy.removeComments === undefined) copy.removeComments = true;
         copy.newLine = "lf";
     }
-    else {
-        copy.preserveConstEnums = true;
-    }
     if (useBuiltCompiler === true) {
         copy.typescript = require("./built/local/typescript.js");
     }
@@ -330,6 +340,7 @@ const builtGeneratedDiagnosticMessagesJSON = path.join(builtLocalDirectory, "dia
 // processDiagnosticMessages script
 gulp.task(processDiagnosticMessagesJs, false, [], () => {
     const settings: tsc.Settings = getCompilerSettings({
+        target: "es5",
         declaration: false,
         removeComments: true,
         noResolve: false,
@@ -471,7 +482,10 @@ gulp.task(tsserverLibraryFile, false, [servicesFile], (done) => {
         js.pipe(prependCopyright())
             .pipe(sourcemaps.write("."))
             .pipe(gulp.dest(".")),
-        dts.pipe(prependCopyright())
+        dts.pipe(prependCopyright(/*outputCopyright*/true))
+            .pipe(insert.transform((content) => {
+                return content + "\r\nexport = ts;\r\nexport as namespace ts;";
+            }))
             .pipe(gulp.dest("."))
     ]);
 });
@@ -584,6 +598,7 @@ function runConsoleTests(defaultReporter: string, runInParallel: boolean, done:
     cleanTestDirs((err) => {
         if (err) { console.error(err); failWithStatus(err, 1); }
         const debug = cmdLineOptions["debug"];
+        const inspect = cmdLineOptions["inspect"];
         const tests = cmdLineOptions["tests"];
         const light = cmdLineOptions["light"];
         const stackTraceLimit = cmdLineOptions["stackTraceLimit"];
@@ -602,7 +617,7 @@ function runConsoleTests(defaultReporter: string, runInParallel: boolean, done:
             } while (fs.existsSync(taskConfigsFolder));
             fs.mkdirSync(taskConfigsFolder);
 
-            workerCount = process.env.workerCount || os.cpus().length;
+            workerCount = cmdLineOptions["workers"];
         }
 
         if (tests || light || taskConfigsFolder) {
@@ -620,7 +635,10 @@ function runConsoleTests(defaultReporter: string, runInParallel: boolean, done:
         // default timeout is 2sec which really should be enough, but maybe we just need a small amount longer
         if (!runInParallel) {
             const args = [];
-            if (debug) {
+            if (inspect) {
+                args.push("--inspect");
+            }
+            if (inspect || debug) {
                 args.push("--debug-brk");
             }
             args.push("-R", reporter);
@@ -1015,7 +1033,7 @@ gulp.task("lint", "Runs tslint on the compiler sources. Optional arguments are:
             cb();
         }, (cb) => {
             files = files.filter(file =>  fileMatcher.test(file.path)).sort((filea, fileb) => filea.stat.size - fileb.stat.size);
-            const workerCount = (process.env.workerCount && +process.env.workerCount) || os.cpus().length;
+            const workerCount = cmdLineOptions["workers"];
             for (let i = 0; i < workerCount; i++) {
                 spawnLintWorker(files, finished);
             }