Merge branch 'master' into vfs

Author: rbuckton

.gitignore

@@ -39,7 +39,7 @@ scripts/word2md.js
 scripts/buildProtocol.js
 scripts/ior.js
 scripts/authors.js
-scripts/configureNightly.js
+scripts/configurePrerelease.js
 scripts/processDiagnosticMessages.d.ts
 scripts/processDiagnosticMessages.js
 scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
@@ -59,6 +59,7 @@ internal/
 !tests/baselines/reference/project/nodeModules*/**/*
 .idea
 yarn.lock
+yarn-error.log
 .parallelperf.*
 tests/cases/user/*/package-lock.json
 tests/cases/user/*/node_modules/

.mailmap

@@ -140,7 +140,7 @@ Mike Busyrev  <busyrev@gmail.com>
 Mine Starks  <minestarks@users.noreply.github.com> Mine Starks  <mineyalc@microsoft.com>
 Mohamed Hegazy <mhegazy@microsoft.com>
 ncoley  <nrcoley@gmail.com> # Natalie Coley
-Nathan Shively-Sanders <nathansa@microsoft.com>
+Nathan Shively-Sanders <nathansa@microsoft.com> Nathan Shively-Sanders  <293473+sandersn@users.noreply.github.com>
 Nathan Yee <ny.nathan.yee@gmail.com>
 Nima Zahedi <nima.zahedee@gmail.com>
 Noah Chen  <nchen@palantir.com>
@@ -287,4 +287,29 @@ Stas Vilchik  <stas.vilchik@sonarsource.com>
 Taras Mankovski  <tarasm@gmail.com>
 Thomas den Hollander  <ThomasdenH@users.noreply.github.com>
 Vakhurin Sergey  <igelbox@gmail.com>
-Zeeshan Ahmed  <ziishaned@gmail.com>
+Zeeshan Ahmed  <ziishaned@gmail.com>
+Orta  <orta.therox+github@gmail.com> # Orta Therox
+IdeaHunter  <admin@fckn.me> # @IdeaHunter
+kujon  <jakub.korzeniowski@gmail.com> # Jakub Korzeniowski
+Matt  <begincalendar@users.noreply.github.com> @begincalendar
+meyer  <github.com@meyer.fm> # @meyer
+micbou  <contact@micbou.com> # @micbou
+Alan Agius  <alan.agius4@gmail.com>
+Alex Khomchenko  <akhomchenko@gmail.com>
+Oussama Ben Brahim  <benbraou@gmail.com> benbraou  <benbraou@users.noreply.github.com>
+Cameron Taggart  <cameron.taggart@gmail.com>
+csigs  <csigs@outlook.com> csigs  <csigs@users.noreply.github.com>
+Eugene Timokhov  <timocov@gmail.com>
+Kris Zyp  <kriszyp@gmail.com>
+Jing Ma  <mjingm87@qq.com>
+Martin Hiller  <martin.hiller88@gmail.com>
+Mike Morearty  <mmorearty@users.noreply.github.com>
+Priyantha Lankapura  <403912+lankaapura@users.noreply.github.com>
+Remo H. Jansen  <remo.jansen@wolksoftware.com>
+Sean Barag  <sjbarag@gmail.com>
+Sharon Rolel  <sharonrolel@gmail.com>
+Stanislav Iliev  <gigobest2@gmail.com>
+Wenlu Wang  <805037171@163.com> wenlu.wang  <805037171@163.com> kingwl  <805037171@163.com>
+Wilson Hobbs  <wilsonhobbs1@gmail.com>
+Yuval Greenfield  <ubershmekel@gmail.com>
+Daniel  <nieltg@users.noreply.github.com> # @nieltg

.npmignore

@@ -18,4 +18,5 @@ Jakefile.js
 .settings/
 .travis.yml
 .vscode/
-test.config
+test.config
+package-lock.json

.travis.yml

@@ -18,6 +18,7 @@ branches:
   - master
   - release-2.5
   - release-2.6
+  - release-2.7
 
 install:
   - npm uninstall typescript --no-save

AUTHORS.md

@@ -6,8 +6,10 @@ TypeScript is authored by:
 * Adrian Leonhard 
 * Ahmad Farid
 * Akshar Patel
+* Alan Agius 
 * Alex Chugaev 
 * Alex Eagle
+* Alex Khomchenko 
 * Alexander Kuvaev
 * Alexander Rusakov 
 * Ali Sabzevari
@@ -47,6 +49,7 @@ TypeScript is authored by:
 * Brett Mayen
 * Bryan Forbes
 * Caitlin Potter
+* Cameron Taggart 
 * @cedvdb
 * Charles Pierce 
 * Charly POLY 
@@ -56,6 +59,7 @@ TypeScript is authored by:
 * Colby Russell
 * Colin Snover
 * Cotton Hou 
+* csigs 
 * Cyrus Najmabadi
 * Dafrok Zhang
 * Dahan Gong
@@ -85,6 +89,7 @@ TypeScript is authored by:
 * Erik McClenney 
 * Ethan Resnick 
 * Ethan Rubio
+* Eugene Timokhov 
 * Evan Martin
 * Evan Sebastian
 * Eyas Sharaiha
@@ -111,13 +116,15 @@ TypeScript is authored by:
 * Herrington Darkholme
 * Homa Wong 
 * Iain Monro
+* @IdeaHunter
 * Igor Novozhilov
 * Ika 
 * Ingvar Stepanyan
 * Isiah Meadows
 * Ivan Enderlin 
 * Ivo Gabe de Wolff
 * Iwata Hidetaka 
+* Jakub Korzeniowski
 * Jakub Młokosiewicz 
 * James Henry 
 * James Whitney
@@ -130,6 +137,7 @@ TypeScript is authored by:
 * Jed Mao
 * Jeffrey Morlan
 * Jesse Schalken
+* Jing Ma 
 * Jiri Tobisek
 * Joe Calzaretta 
 * Joe Chung 
@@ -160,6 +168,7 @@ TypeScript is authored by:
 * Kevin Lang 
 * Kitson Kelly 
 * Klaus Meinhardt 
+* Kris Zyp 
 * Kyle Kelley
 * Kārlis Gaņģis
 * Lorant Pinter
@@ -170,19 +179,24 @@ TypeScript is authored by:
 * Manish Giri
 * Marin Marinov
 * Marius Schulz 
+* Martin Hiller 
 * Martin Vseticka
 * Masahiro Wakame
+* Matt 
 * Matt Bierner 
 * Matt McCutchen
 * Matt Mitchell 
 * Mattias Buelens
 * Mattias Buelens 
 * Max Deepfield
 * Maxwell Paul Brickner 
+* @meyer
 * Micah Zoltu
+* @micbou
 * Michael 
 * Michael Bromley
 * Mike Busyrev 
+* Mike Morearty 
 * Mine Starks 
 * Mohamed Hegazy
 * Mohsen Azimi 
@@ -191,14 +205,17 @@ TypeScript is authored by:
 * Nathan Shively-Sanders
 * Nathan Yee
 * Nicolas Henry
+* @nieltg
 * Nima Zahedi
 * Noah Chen 
 * Noel Varanda 
 * Noj Vek
 * Oleg Mihailik
 * Oleksandr Chekhovskyi
 * Omer Sheikh 
+* Orta Therox
 * Oskar Segersva¨rd
+* Oussama Ben Brahim 
 * Patrick Zhong
 * Paul Jolly
 * Paul van Brenk
@@ -210,11 +227,13 @@ TypeScript is authored by:
 * Piero Cangianiello
 * @piloopin
 * Prayag Verma
+* Priyantha Lankapura 
 * @progre
 * Punya Biswal
 * Rado Kirov
 * Raj Dosanjh
 * Reiner Dolp 
+* Remo H. Jansen 
 * Richard Karmazín 
 * Richard Knoll
 * Richard Sentino
@@ -227,8 +246,10 @@ TypeScript is authored by:
 * Ryohei Ikegami
 * Sam El-Husseini 
 * Sarangan Rajamanickam
+* Sean Barag 
 * Sergey Rubanov
 * Sergey Shandar 
+* Sharon Rolel 
 * Sheetal Nandi
 * Shengping Zhong
 * Shyyko Serhiy
@@ -237,6 +258,7 @@ TypeScript is authored by:
 * Solal Pirelli
 * Soo Jae Hwang 
 * Stan Thomas
+* Stanislav Iliev 
 * Stanislav Sysoev
 * Stas Vilchik 
 * Steve Lucco
@@ -268,11 +290,14 @@ TypeScript is authored by:
 * Vilic Vane
 * Vladimir Kurchatkin 
 * Vladimir Matveev
+* Wenlu Wang 
 * Wesley Wigham
 * William Orr 
+* Wilson Hobbs 
 * York Yao
 * @yortus
 * Yuichi Nukiyama
+* Yuval Greenfield 
 * Zeeshan Ahmed 
 * Zev Spitz
 * Zhengbo Li

CONTRIBUTING.md

@@ -8,7 +8,14 @@ Issues that ask questions answered in the FAQ will be closed without elaboration
 
 ## 2. Search for Duplicates
 
-[Search the existing issues](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue) before logging a new one.
+[Search the existing issues](https://github.com/Microsoft/TypeScript/search?type=Issues) before logging a new one.
+
+Some search tips:
+ * *Don't* restrict your search to only open issues. An issue with a title similar to yours may have been closed as a duplicate of one with a less-findable title.
+ * Check for synonyms. For example, if your bug involves an interface, it likely also occurs with type aliases or classes.
+ * Search for the title of the issue you're about to log. This sounds obvious but 80% of the time this is sufficient to find a duplicate when one exists.
+ * Read more than the first page of results. Many bugs here use the same words so relevancy sorting is not particularly strong.
+ * If you have a crash, search for the first few topmost function names shown in the call stack.
 
 ## 3. Do you have a question?
 
@@ -183,3 +190,10 @@ jake baseline-accept
 ```
 
 to establish the new baselines as the desired behavior. This will change the files in `tests\baselines\reference`, which should be included as part of your commit. It's important to carefully validate changes in the baselines.
+
+## Localization
+
+All strings the user may see are stored in [`diagnosticMessages.json`](./src/compiler/diagnosticMessages.json).
+If you make changes to it, run `jake generate-diagnostics` to push them to the `Diagnostic` interface in [`diagnosticInformationMap.generated.ts`](./src/compiler/diagnosticInformationMap.generated.ts).
+
+See [coding guidelines on diagnostic messages](https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines#diagnostic-messages).

Gulpfile.ts

@@ -151,7 +151,9 @@ const es2018LibrarySourceMap = es2018LibrarySource.map(source =>
     ({ target: "lib." + source, sources: ["header.d.ts", source] }));
 
 const esnextLibrarySource = [
-    "esnext.asynciterable.d.ts"
+    "esnext.asynciterable.d.ts",
+    "esnext.array.d.ts",
+    "esnext.promise.d.ts"
 ];
 
 const esnextLibrarySourceMap = esnextLibrarySource.map(source =>
@@ -527,7 +529,7 @@ gulp.task(tsserverLibraryFile, /*help*/ false, [servicesFile, typesMapJson], (do
     const serverLibraryProject = tsc.createProject("src/server/tsconfig.library.json", getCompilerSettings({ removeComments: false }, /*useBuiltCompiler*/ true));
     const {js, dts}: { js: NodeJS.ReadableStream, dts: NodeJS.ReadableStream } = serverLibraryProject.src()
         .pipe(sourcemaps.init())
-        .pipe(newer(tsserverLibraryFile))
+        .pipe(newer(<any>{ dest: tsserverLibraryFile, extra: ["src/compiler/**/*.ts", "src/services/**/*.ts"] }))
         .pipe(serverLibraryProject());
 
     return merge2([
@@ -732,14 +734,14 @@ function runConsoleTests(defaultReporter: string, runInParallel: boolean, done:
             workerCount = cmdLineOptions.workers;
         }
 
-        if (tests || runners || light || taskConfigsFolder) {
-            writeTestConfigFile(tests, runners, light, taskConfigsFolder, workerCount, stackTraceLimit);
-        }
-
         if (tests && tests.toLocaleLowerCase() === "rwc") {
             testTimeout = 400000;
         }
 
+        if (tests || runners || light || testTimeout || taskConfigsFolder) {
+            writeTestConfigFile(tests, runners, light, taskConfigsFolder, workerCount, stackTraceLimit, testTimeout);
+        }
+
         const colors = cmdLineOptions.colors;
         const reporter = cmdLineOptions.reporter || defaultReporter;
 
@@ -929,8 +931,17 @@ function cleanTestDirs(done: (e?: any) => void) {
 }
 
 // used to pass data from jake command line directly to run.js
-function writeTestConfigFile(tests: string, runners: string, light: boolean, taskConfigsFolder?: string, workerCount?: number, stackTraceLimit?: string) {
-    const testConfigContents = JSON.stringify({ test: tests ? [tests] : undefined, runner: runners ? runners.split(",") : undefined, light, workerCount, stackTraceLimit, taskConfigsFolder, noColor: !cmdLineOptions.colors });
+function writeTestConfigFile(tests: string, runners: string, light: boolean, taskConfigsFolder?: string, workerCount?: number, stackTraceLimit?: string, timeout?: number) {
+    const testConfigContents = JSON.stringify({
+        test: tests ? [tests] : undefined,
+        runner: runners ? runners.split(",") : undefined,
+        light,
+        workerCount,
+        stackTraceLimit,
+        taskConfigsFolder,
+        noColor: !cmdLineOptions.colors,
+        timeout,
+    });
     console.log("Running tests with config: " + testConfigContents);
     fs.writeFileSync("test.config", testConfigContents);
 }