From 087903447525fea9b4703333746d600161bb5e82 Mon Sep 17 00:00:00 2001
From: Eric Lambrecht <ericlambrecht.hh@gmail.com>
Date: Mon, 21 Jan 2019 15:07:20 +0100
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fix=20broken=20github=20p?=
 =?UTF-8?q?ages=20deployment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml       | 21 +++++++++++++--------
 package-lock.json | 41 +++++++++++------------------------------
 2 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 55eab002..6f941c3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,9 @@ node_js:
 
 stages:
 - test
-- name: deploy-github
-  if: tag IS present
-- name: deploy-now-nightly
-  if: branch = master
-- name: deploy-now
-  if: tag IS present
+- deploy-github
+- deploy-now-nightly
+- deploy-now
 
 jobs:
   include:
@@ -21,16 +18,24 @@ jobs:
         provider: pages
         skip-cleanup: true
         github-token: $GITHUB_TOKEN  # Set in the settings page of your repository, as a secure variable
+        local-dir: './dist'
         keep-history: true
         on:
           branch: master
           tags: true
     - stage: deploy-now-nightly
-      script: npm run deploy
-      after_script: npm run alias:dev
+      deploy:
+        provider: script
+        skip-cleanup: true
+        script: npm run deploy
+        on:
+          all_branches: true
+          tags: false
+      after_deploy: npm run alias:dev
     - stage: deploy-now
       deploy:
         provider: script
+        skip-cleanup: true
         script: npm run deploy
         on:
           branch: master
diff --git a/package-lock.json b/package-lock.json
index d88f6100..4a952bf8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4833,8 +4833,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4855,14 +4854,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4877,20 +4874,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5007,8 +5001,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5020,7 +5013,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5035,7 +5027,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5043,14 +5034,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5069,7 +5058,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5150,8 +5138,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5163,7 +5150,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5249,8 +5235,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5286,7 +5271,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5306,7 +5290,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5350,14 +5333,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },