Merge branch 'master' into multiple-jsx-factories

Author: weswigham

.circleci/config.yml

@@ -0,0 +1,90 @@
+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
+  nightly:
+    triggers:
+      - schedule:
+          cron: "0 8 * * *"
+          filters:
+            branches:
+              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
+  steps:
+    - checkout
+    - run: |
+        npm uninstall typescript --no-save
+        npm uninstall tslint --no-save
+        npm install
+        #npm update Appeared in Jenkins only
+        npm test
+
+version: 2
+jobs:
+  node9:
+    docker:
+      - image: circleci/node:9
+    <<: *base
+  node8:
+    docker:
+      - image: circleci/node:8
+    <<: *base
+  node6:
+    docker:
+      - image: circleci/node:6
+    <<: *base

.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

.mailmap

@@ -140,7 +140,7 @@ Mike Busyrev  <[email protected]>
 Mine Starks  <[email protected]> Mine Starks  <[email protected]>
 Mohamed Hegazy <[email protected]>
 ncoley  <[email protected]> # Natalie Coley
-Nathan Shively-Sanders <[email protected]>
+Nathan Shively-Sanders <[email protected]> Nathan Shively-Sanders  <[email protected]>
 Nathan Yee <[email protected]>
 Nima Zahedi <[email protected]>
 Noah Chen  <[email protected]>
@@ -287,4 +287,33 @@ Stas Vilchik  <[email protected]>
 Taras Mankovski  <[email protected]>
 Thomas den Hollander  <[email protected]>
 Vakhurin Sergey  <[email protected]>
-Zeeshan Ahmed  <[email protected]>
+Zeeshan Ahmed  <[email protected]>
+Orta  <[email protected]> # Orta Therox
+IdeaHunter  <[email protected]> # @IdeaHunter
+kujon  <[email protected]> # Jakub Korzeniowski
+Matt  <[email protected]> # @begincalendar
+meyer  <[email protected]> # @meyer
+micbou  <[email protected]> # @micbou
+Alan Agius  <[email protected]>
+Alex Khomchenko  <[email protected]>
+Oussama Ben Brahim  <[email protected]> benbraou  <[email protected]>
+Cameron Taggart  <[email protected]>
+Eugene Timokhov  <[email protected]>
+Kris Zyp  <[email protected]>
+Jing Ma  <[email protected]>
+Martin Hiller  <[email protected]>
+Mike Morearty  <[email protected]>
+Priyantha Lankapura  <[email protected]>
+Remo H. Jansen  <[email protected]>
+Sean Barag  <[email protected]>
+Sharon Rolel  <[email protected]>
+Stanislav Iliev  <[email protected]>
+Wenlu Wang  <[email protected]> wenlu.wang  <[email protected]> kingwl  <[email protected]>
+Wilson Hobbs  <[email protected]>
+Yuval Greenfield  <[email protected]>
+Daniel  <[email protected]> # @nieltg
+Adnan Chowdhury  <[email protected]>
+Esakki Raj  <[email protected]>
+Jack Williams  <[email protected]>
+Philippe Voinov  <[email protected]>
+Stephan Ginthör  <[email protected]>

.npmignore

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

AUTHORS.md

@@ -3,11 +3,14 @@ TypeScript is authored by:
 * Abubaker Bashir
 * Adam Freidin
 * Adi Dahiya
+* Adnan Chowdhury 
 * Adrian Leonhard 
 * Ahmad Farid
 * Akshar Patel
+* Alan Agius 
 * Alex Chugaev 
 * Alex Eagle
+* Alex Khomchenko 
 * Alexander Kuvaev
 * Alexander Rusakov 
 * Ali Sabzevari
@@ -34,6 +37,7 @@ TypeScript is authored by:
 * Asad Saeeduddin
 * Avery Morin
 * Basarat Ali Syed
+* @begincalendar
 * Ben Duffield
 * Ben Mosher 
 * Benjamin Bock 
@@ -47,6 +51,7 @@ TypeScript is authored by:
 * Brett Mayen
 * Bryan Forbes
 * Caitlin Potter
+* Cameron Taggart 
 * @cedvdb
 * Charles Pierce 
 * Charly POLY 
@@ -83,8 +88,10 @@ TypeScript is authored by:
 * Eric Tsang
 * Erik Edrosa
 * Erik McClenney 
+* Esakki Raj 
 * Ethan Resnick 
 * Ethan Rubio
+* Eugene Timokhov 
 * Evan Martin
 * Evan Sebastian
 * Eyas Sharaiha
@@ -111,13 +118,16 @@ 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 
+* Jack Williams 
+* Jakub Korzeniowski
 * Jakub Młokosiewicz 
 * James Henry 
 * James Whitney
@@ -130,6 +140,7 @@ TypeScript is authored by:
 * Jed Mao
 * Jeffrey Morlan
 * Jesse Schalken
+* Jing Ma 
 * Jiri Tobisek
 * Joe Calzaretta 
 * Joe Chung 
@@ -160,6 +171,7 @@ TypeScript is authored by:
 * Kevin Lang 
 * Kitson Kelly 
 * Klaus Meinhardt 
+* Kris Zyp 
 * Kyle Kelley
 * Kārlis Gaņģis
 * Lorant Pinter
@@ -170,6 +182,7 @@ TypeScript is authored by:
 * Manish Giri
 * Marin Marinov
 * Marius Schulz 
+* Martin Hiller 
 * Martin Vseticka
 * Masahiro Wakame
 * Matt Bierner 
@@ -179,10 +192,13 @@ TypeScript is authored by:
 * 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 +207,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
@@ -207,14 +226,17 @@ TypeScript is authored by:
 * Perry Jiang
 * Peter Burns
 * Philip Bulley
+* Philippe Voinov 
 * 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 +249,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,8 +261,10 @@ TypeScript is authored by:
 * Solal Pirelli
 * Soo Jae Hwang 
 * Stan Thomas
+* Stanislav Iliev 
 * Stanislav Sysoev
 * Stas Vilchik 
+* Stephan Ginthör 
 * Steve Lucco
 * Sudheesh Singanamalla 
 * Sébastien Arod
@@ -268,11 +294,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

Gulpfile.ts

@@ -53,7 +53,6 @@ const cmdLineOptions = minimist(process.argv.slice(2), {
         "ru": "runners", "runner": "runners",
         "r": "reporter",
         "c": "colors", "color": "colors",
-        "f": "files", "file": "files",
         "w": "workers",
     },
     default: {
@@ -69,7 +68,6 @@ const cmdLineOptions = minimist(process.argv.slice(2), {
         light: process.env.light === undefined || 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,
     }
 });
@@ -528,7 +526,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([
@@ -1112,13 +1110,11 @@ function spawnLintWorker(files: {path: string}[], callback: (failures: number) =
 
 gulp.task("lint", "Runs tslint on the compiler sources. Optional arguments are: --f[iles]=regex", ["build-rules"], () => {
     if (fold.isTravis()) console.log(fold.start("lint"));
-    const fileMatcher = cmdLineOptions.files;
-    const files = fileMatcher
-        ? `src/**/${fileMatcher}`
-        : "Gulpfile.ts 'scripts/generateLocalizedDiagnosticMessages.ts' 'scripts/tslint/**/*.ts' 'src/**/*.ts' --exclude 'src/lib/*.d.ts'";
-    const cmd = `node node_modules/tslint/bin/tslint ${files} --formatters-dir ./built/local/tslint/formatters --format autolinkableStylish`;
-    console.log("Linting: " + cmd);
-    child_process.execSync(cmd, { stdio: [0, 1, 2] });
+    for (const project of ["scripts/tslint/tsconfig.json", "src/tsconfig-base.json"]) {
+        const cmd = `node node_modules/tslint/bin/tslint --project ${project} --formatters-dir ./built/local/tslint/formatters --format autolinkableStylish`;
+        console.log("Linting: " + cmd);
+        child_process.execSync(cmd, { stdio: [0, 1, 2] });
+    }
     if (fold.isTravis()) console.log(fold.end("lint"));
 });