Merge branch 'master' into vfs

Author: rbuckton

.circleci/config.yml

@@ -2,30 +2,9 @@ workflows:
   version: 2
   main:
     jobs:
-      - node9:
-          filters:
-            branches:
-              only:
-                - master
-                - release-2.5
-                - release-2.6
-                - release-2.7
-      - node8:
-          filters:
-            branches:
-              only:
-                - master
-                - release-2.5
-                - release-2.6
-                - release-2.7
-      - node6:
-          filters:
-            branches:
-              only:
-                - master
-                - release-2.5
-                - release-2.6
-                - release-2.7
+      - node9
+      - node8
+      - node6
   nightly:
     triggers:
       - schedule:
@@ -35,39 +14,20 @@ workflows:
               only: master
     jobs:
       - node9:
-          filters:
-            branches:
-              only:
-                - master
-                - release-2.5
-                - release-2.6
-                - release-2.7
           context: nightlies
       - node8:
-          filters:
-            branches:
-              only:
-                - master
-                - release-2.5
-                - release-2.6
-                - release-2.7
           context: nightlies
       - node6:
-          filters:
-            branches:
-              only:
-                - master
-                - release-2.5
-                - release-2.6
-                - release-2.7
           context: nightlies
 
 base: &base
   environment:
     - workerCount: 4
+    - timeout: 400000
   steps:
     - checkout
     - run: |
+        git submodule update --init --recursive
         npm uninstall typescript --no-save
         npm uninstall tslint --no-save
         npm install

.gitmodules

@@ -18,3 +18,14 @@
 	path = tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter
 	url = https://github.com/Microsoft/TypeScript-WeChat-Starter.git
 	ignore = all
+[submodule "tests/cases/user/create-react-app/create-react-app"]
+	path = tests/cases/user/create-react-app/create-react-app
+	url = https://github.com/facebook/create-react-app.git
+	ignore = all
+[submodule "tests/cases/user/webpack/webpack"]
+	path = tests/cases/user/webpack/webpack 
+        url = https://github.com/webpack/webpack.git
+	ignore = all
+[submodule "tests/cases/user/puppeteer/puppeteer"]
+	path = tests/cases/user/puppeteer/puppeteer
+	url = https://github.com/GoogleChrome/puppeteer.git

.mailmap

@@ -316,4 +316,9 @@ Adnan Chowdhury  <bttf@users.noreply.github.com>
 Esakki Raj  <esakkiraj.tce@gmail.com>
 Jack Williams  <jw@jackw.io>
 Philippe Voinov  <philippevoinov@gmail.com>
-Stephan Ginthör  <26004708+Lazarus535@users.noreply.github.com>
+Stephan Ginthör  <26004708+Lazarus535@users.noreply.github.com>
+AdityaDaflapurkar  <adaflapurkar@gmail.com> # Aditya Daflapurkar
+Eric Grube  <grubee79@gmail.com>
+Martyn Janes  <martyn@obany.com>
+Ricardo N Feliciano  <FelicianoTech@gmail.com>
+Sergii Bezliudnyi  <serg.bezludny@gmail.com>

.npmignore

@@ -15,8 +15,12 @@ tslint.json
 Jakefile.js
 .editorconfig
 .gitattributes
+.gitmodules
 .settings/
 .travis.yml
+.circleci
 .vscode/
+.parallelperf.json
 test.config
 package-lock.json
+yarn.lock

.travis.yml

@@ -7,17 +7,16 @@ node_js:
 sudo: false
 
 env:
-  - workerCount=3
+  - workerCount=3 timeout=600000
 
 matrix:
   fast_finish: true
 
 branches:
   only:
   - master
-  - release-2.5
-  - release-2.6
   - release-2.7
+  - release-2.8
 
 install:
   - npm uninstall typescript --no-save

AUTHORS.md

@@ -3,6 +3,7 @@ TypeScript is authored by:
 * Abubaker Bashir
 * Adam Freidin
 * Adi Dahiya
+* Aditya Daflapurkar
 * Adnan Chowdhury 
 * Adrian Leonhard 
 * Ahmad Farid
@@ -85,6 +86,7 @@ TypeScript is authored by:
 * @e-cloud
 * Elisée Maurer
 * Emilio García-Pumarino
+* Eric Grube 
 * Eric Tsang
 * Erik Edrosa
 * Erik McClenney 
@@ -184,6 +186,7 @@ TypeScript is authored by:
 * Marius Schulz 
 * Martin Hiller 
 * Martin Vseticka
+* Martyn Janes 
 * Masahiro Wakame
 * Matt Bierner 
 * Matt McCutchen
@@ -237,6 +240,7 @@ TypeScript is authored by:
 * Raj Dosanjh
 * Reiner Dolp 
 * Remo H. Jansen 
+* Ricardo N Feliciano 
 * Richard Karmazín 
 * Richard Knoll
 * Richard Sentino
@@ -252,6 +256,7 @@ TypeScript is authored by:
 * Sean Barag 
 * Sergey Rubanov
 * Sergey Shandar 
+* Sergii Bezliudnyi 
 * Sharon Rolel 
 * Sheetal Nandi
 * Shengping Zhong

Gulpfile.ts

@@ -216,8 +216,8 @@ for (const i in libraryTargets) {
             .pipe(gulp.dest(".")));
 }
 
-const configureNightlyJs = path.join(scriptsDirectory, "configureNightly.js");
-const configureNightlyTs = path.join(scriptsDirectory, "configureNightly.ts");
+const configurePreleleaseJs = path.join(scriptsDirectory, "configurePrerelease.js");
+const configurePreleleaseTs = path.join(scriptsDirectory, "configurePrerelease.ts");
 const packageJson = "package.json";
 const versionFile = path.join(compilerDirectory, "core.ts");
 
@@ -302,24 +302,25 @@ function getCompilerSettings(base: tsc.Settings, useBuiltCompiler?: boolean): ts
     return copy;
 }
 
-gulp.task(configureNightlyJs, /*help*/ false, [], () => {
+gulp.task(configurePreleleaseJs, /*help*/ false, [], () => {
     const settings: tsc.Settings = {
         declaration: false,
         removeComments: true,
         noResolve: false,
         stripInternal: false,
+        module: "commonjs"
     };
-    return gulp.src(configureNightlyTs)
+    return gulp.src(configurePreleleaseTs)
         .pipe(sourcemaps.init())
         .pipe(tsc(settings))
-        .pipe(sourcemaps.write(path.dirname(configureNightlyJs)))
-        .pipe(gulp.dest(path.dirname(configureNightlyJs)));
+        .pipe(sourcemaps.write("."))
+        .pipe(gulp.dest("./scripts"));
 });
 
 
 // Nightly management tasks
-gulp.task("configure-nightly", "Runs scripts/configureNightly.ts to prepare a build for nightly publishing", [configureNightlyJs], (done) => {
-    exec(host, [configureNightlyJs, packageJson, versionFile], done, done);
+gulp.task("configure-nightly", "Runs scripts/configurePrerelease.ts to prepare a build for nightly publishing", [configurePreleleaseJs], (done) => {
+    exec(host, [configurePreleleaseJs, "dev", packageJson, versionFile], done, done);
 });
 gulp.task("publish-nightly", "Runs `npm publish --tag next` to create a new nightly build on npm", ["LKG"], () => {
     return runSequence("clean", "useDebugMode", "runtests-parallel", (done) => {
@@ -363,20 +364,11 @@ const builtGeneratedDiagnosticMessagesJSON = path.join(builtLocalDirectory, "dia
 
 // processDiagnosticMessages script
 gulp.task(processDiagnosticMessagesJs, /*help*/ false, [], () => {
-    const settings: tsc.Settings = getCompilerSettings({
-        target: "es5",
-        declaration: false,
-        removeComments: true,
-        noResolve: false,
-        stripInternal: false,
-        outFile: processDiagnosticMessagesJs
-    }, /*useBuiltCompiler*/ false);
-    return gulp.src(processDiagnosticMessagesTs)
+    const diagsProject = tsc.createProject('./scripts/processDiagnosticMessages.tsconfig.json');
+    return diagsProject.src()
         .pipe(newer(processDiagnosticMessagesJs))
-        .pipe(sourcemaps.init())
-        .pipe(tsc(settings))
-        .pipe(sourcemaps.write("."))
-        .pipe(gulp.dest("."));
+        .pipe(diagsProject())
+        .pipe(gulp.dest(scriptsDirectory));
 });
 
 // The generated diagnostics map; built for the compiler and for the "generate-diagnostics" task

Jakefile.js

@@ -88,11 +88,10 @@ var typingsInstallerSources = filesFromConfig(path.join(serverDirectory, "typing
 var watchGuardSources = filesFromConfig(path.join(serverDirectory, "watchGuard/tsconfig.json"));
 var serverSources = filesFromConfig(path.join(serverDirectory, "tsconfig.json"));
 var languageServiceLibrarySources = filesFromConfig(path.join(serverDirectory, "tsconfig.library.json"));
+var harnessSources = filesFromConfig("./src/harness/tsconfig.json");
 
 var typesMapOutputPath = path.join(builtLocalDirectory, 'typesMap.json');
 
-var harnessSources = filesFromConfig("./src/harness/tsconfig.json");
-
 var es2015LibrarySources = [
     "es2015.core.d.ts",
     "es2015.collection.d.ts",
@@ -449,6 +448,8 @@ task("lib", libraryTargets);
 // Generate diagnostics
 var processDiagnosticMessagesJs = path.join(scriptsDirectory, "processDiagnosticMessages.js");
 var processDiagnosticMessagesTs = path.join(scriptsDirectory, "processDiagnosticMessages.ts");
+var processDiagnosticMessagesSources = filesFromConfig("./scripts/processDiagnosticMessages.tsconfig.json");
+
 var diagnosticMessagesJson = path.join(compilerDirectory, "diagnosticMessages.json");
 var diagnosticInfoMapTs = path.join(compilerDirectory, "diagnosticInformationMap.generated.ts");
 var generatedDiagnosticMessagesJSON = path.join(compilerDirectory, "diagnosticMessages.generated.json");
@@ -458,8 +459,8 @@ file(processDiagnosticMessagesTs);
 
 // processDiagnosticMessages script
 compileFile(processDiagnosticMessagesJs,
-    [processDiagnosticMessagesTs],
-    [processDiagnosticMessagesTs],
+    processDiagnosticMessagesSources,
+    processDiagnosticMessagesSources,
     [],
     /*useBuiltCompiler*/ false);
 
@@ -569,7 +570,7 @@ compileFile(/*outfile*/configurePrereleaseJs,
             /*prereqs*/[configurePrereleaseTs],
             /*prefixes*/[],
             /*useBuiltCompiler*/ false,
-    { noOutFile: false, generateDeclarations: false, keepComments: false, noResolve: false, stripInternal: false });
+    { noOutFile: true, generateDeclarations: false, keepComments: false, noResolve: false, stripInternal: false });
 
 task("setDebugMode", function () {
     useDebugMode = true;