Merge remote-tracking branch 'Nest/master' into 2361-kafka-microservice

# Conflicts:
#	integration/docker-compose.yml
#	package-lock.json
#	package.json

Author: mkaufmaner

.travis.yml

@@ -7,13 +7,6 @@ cache:
 git:
   depth: 5
 
-addons:
-  firefox: "latest"
-
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-
 before_install:
   - npm i -g npm@latest
 

gulpfile.js

@@ -8,6 +8,7 @@ const deleteEmpty = require('delete-empty');
 const childProcess = require('child_process');
 const log = require('fancy-log');
 const clc = require('cli-color');
+const promiseSeries = require('promise.series');
 
 const { promisify } = require('util');
 
@@ -117,39 +118,39 @@ gulp.task('install:samples', async () => {
   const directories = getDirs(SAMPLE);
 
   const promises = directories.map(async dir => {
-    log.info(
-      `Installing dependencies of ${clc.magenta(dir.replace(__dirname, ''))}`,
-    );
+    const dirName = dir.replace(__dirname, '');
+    log.info(`Installing dependencies of ${clc.magenta(dirName)}`);
     try {
       await exec(`npm install --no-shrinkwrap --prefix ${dir}`);
+      log.info(`Finished installing ${clc.magenta(dirName)}`);
     } catch (err) {
-      log.error(`Failed installing dependencies of ${dir}`);
+      log.error(`Failed installing dependencies of ${dirName}`);
       throw err;
     }
   });
 
-  await Promise.all(promises);
+  return await promiseSeries(promises);
 });
 
 gulp.task('build:samples', async () => {
   const directories = getDirs(SAMPLE);
 
   const promises = directories.map(async dir => {
-    log.info(
-      `Building ${clc.magenta(dir.replace(__dirname, ''))}`,
-    );
+    const dirName = dir.replace(__dirname, '');
+    log.info(`Building ${clc.magenta(dirName)}`);
     try {
       await exec(`npm run build --prefix ${dir}`);
+      log.info(`Finished building ${clc.magenta(dirName)}`);
     } catch (err) {
-      log.error(`Failed building ${clc.magenta(dir)}:`);
-      if(err.stdout) {
+      log.error(`Failed building ${clc.magenta(dirName)}:`);
+      if (err.stdout) {
         log.error(err.stdout);
       }
       throw err;
     }
   });
 
-  return await Promise.all(promises);
+  return await promiseSeries(promises);
 });
 
 gulp.task('move', function() {

integration/docker-compose.yml

@@ -23,8 +23,7 @@ services:
       - "9001:9001"
     restart: always
   mysql:
-    container_name: test-mysql
-    image: mysql:5.7.26
+    image: mysql:5.7.27
     environment:
       MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: test

integration/graphql/package-lock.json

@@ -12,7 +12,7 @@
     "@nestjs/common": "6.5.3",
     "@nestjs/core": "6.5.3",
     "@nestjs/graphql": "6.4.2",
-    "apollo-server-express": "2.7.0",
+    "apollo-server-express": "2.8.1",
     "graphql": "14.4.2",
     "graphql-tools": "4.0.5",
     "reflect-metadata": "0.1.13",