3 files changed, 18 insertions, 9 deletions

diff --git a/.travis.yml b/.travis.yml
index 0d818e995..b7cd25117 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,8 @@ matrix:
       osx_image: xcode12
 
 language: node_js
+node_js:
+  - 14
 git:
   submodules: false
 branches:
@@ -33,15 +35,18 @@ before_install:
       git fetch source
       git merge --no-ff --commit -m "Merge remote-tracking branch 'source/develop' into HEAD [skip ci]" source/develop
       CHANGES_COUNT=$(git diff --stat HEAD origin/nightly | wc -l)
-      echo $TRAVIS_EVENT_TYPE
-      echo $changes
+      echo "Travis event type: $TRAVIS_EVENT_TYPE"
+      echo "Number of changes: $CHANGES_COUNT"
       if [ $CHANGES_COUNT -eq 0 -a $TRAVIS_EVENT_TYPE == "cron" ]; then
-        travis_terminate 0;
+        echo "Terminating the build since there are no changes in a cron-triggered build"
+        travis_terminate 0
       else
+        echo "Found changes, proceeding with submodule updates"
         git submodule update --remote --force
         git add .
         git commit -m "Update submodules [skip ci]" || true
       fi
+      echo "Completed merging from develop branch and upgrading submodules"
     fi
 install:
   - cd recipes && npm install && npm run package && cd ..
@@ -52,7 +57,7 @@ before_script:
 script:
   - |
     if [ $TRAVIS_BRANCH == "release" ]; then
-      echo "Building..."
+      echo "Building for release..."
       travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=ferdi -c.mac.identity=null
     fi
   - |
@@ -60,7 +65,7 @@ script:
       git add .
       git commit -m "Apply linter fixes [skip ci]"
       npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]"
-      echo "Building..."
+      echo "Building for nightly..."
       travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies
       if [ $TRAVIS_OS_NAME == "osx" ]; then
         git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 6a788a9ae..782b56406 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -11,10 +11,9 @@ import connect from 'gulp-connect';
 import { exec } from 'child_process';
 import dotenv from 'dotenv';
 import sassVariables from 'gulp-sass-variables';
-import { moveSync, removeSync } from 'fs-extra';
+import { removeSync } from 'fs-extra';
 import kebabCase from 'kebab-case';
 import hexRgb from 'hex-rgb';
-import path from 'path';
 
 import config from './package.json';
 
@@ -80,6 +79,7 @@ const paths = {
   },
 };
 
+// eslint-disable-next-line no-unused-vars
 function _shell(cmd, cb) {
   console.log('executing', cmd);
   exec(
@@ -136,7 +136,7 @@ export function html() {
     .src(paths.html.src, { since: gulp.lastRun(html) })
     .pipe(gulpIf(process.env.NODE_ENV !== 'development', htmlMin({ // Only minify in production to speed up dev builds
       collapseWhitespace: true,
-      removeComments: true
+      removeComments: true,
     })))
     .pipe(gulp.dest(paths.html.dest))
     .pipe(connect.reload());
@@ -224,7 +224,7 @@ export function watch() {
 export function webserver() {
   connect.server({
     root: paths.dest,
-    livereload: true
+    livereload: true,
   });
 }
 
diff --git a/package.json b/package.json
index 99c6d2723..0046b57c7 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,10 @@
   "homepage": "https://github.com/getferdi/ferdi",
   "repository": "https://github.com/getferdi/ferdi.git",
   "private": true,
+  "engines": {
+    "node": "14.x",
+    "npm": "6.x"
+  },
   "scripts": {
     "prestart": "npm run rebuild",
     "start": "electron ./build",