From c34f5ce1886c399c912f3bc9c7616e4609df16d4 Mon Sep 17 00:00:00 2001
From: Christopher Fullarton <christopher@fullarton.eu>
Date: Tue, 12 Jun 2018 10:08:47 +0200
Subject: [PATCH] Installs angular-cli globally before all scripts

---
 .gitlab-ci.yml |  4 +++-
 package.json   | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75d2073d..cf71ac94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,6 @@
+before_script:
+  - npm install -g @angular-cli@6.0.3
+
 stages:
   - install
   - test
@@ -83,4 +86,3 @@ deploy:
     - ssh-keyscan "$STAGING_FRONTEND_URL" >> ~/.ssh/known_hosts
     - ssh-add <(echo "$STAGING_SSH_PRIVATE_KEY")
     - scp -r dist/* "$STAGING_FRONTEND_SCP_URL"
-
diff --git a/package.json b/package.json
index a71b502e..56840a38 100644
--- a/package.json
+++ b/package.json
@@ -10,20 +10,20 @@
   "scripts": {
     "ng": "./node_modules/.bin/ng",
     "start:SSR": "cd dist && node server",
-    "start:DEV": "./node_modules/.bin/ng serve --host 0.0.0.0 --port 4200 --disable-host-check --aot",
-    "build:DEV": "./node_modules/.bin/ng serve --host 0.0.0.0 --port 4200 --disable-host-check --aot --prod",
+    "start:DEV": "npm run ng serve --host 0.0.0.0 --port 4200 --disable-host-check --aot",
+    "build:DEV": "npm run ng serve --host 0.0.0.0 --port 4200 --disable-host-check --aot --prod",
     "build:SSR": "npm run build:PROD && npm run purify && npm run build:SERVER && npm run webpack:SERVER",
-    "build:SERVER": "./node_modules/.bin/ng run frontend:server",
-    "build:PROD": "./node_modules/.bin/ng build --prod",
-    "build:PROD-STATS": "./node_modules/.bin/ng build --prod --stats-json",
+    "build:SERVER": "npm run ng run frontend:server",
+    "build:PROD": "npm run ng build --prod",
+    "build:PROD-STATS": "npm run ng build --prod --stats-json",
     "bundle-report": "webpack-bundle-analyzer dist/browser/stats.json",
     "webpack:SERVER": "webpack --config webpack.server.config.js --progress --colors",
-    "test": "./node_modules/.bin/ng test --browsers=ChromeHeadless --watch=false --source-map=false",
-    "test:DEV": "./node_modules/.bin/ng test --browsers=Chrome --karma-config=src/karma.conf.dev.js --source-map=false",
-    "test:DEV:HEADLESS": "./node_modules/.bin/ng test --browsers=ChromeHeadless --karma-config=src/karma.conf.dev.js --source-map=false",
-    "lint": "./node_modules/.bin/ng lint",
+    "test": "npm run ng test --browsers=ChromeHeadless --watch=false --source-map=false",
+    "test:DEV": "npm run ng test --browsers=Chrome --karma-config=src/karma.conf.dev.js --source-map=false",
+    "test:DEV:HEADLESS": "npm run ng test --browsers=ChromeHeadless --karma-config=src/karma.conf.dev.js --source-map=false",
+    "lint": "npm run ng lint",
     "pree2e": "webdriver-manager update --standalone false --gecko false",
-    "e2e": "./node_modules/.bin/ng e2e --no-webdriver-update",
+    "e2e": "npm run ng e2e --no-webdriver-update",
     "purify": "node purifycss.js",
     "compress": "gzip dist/browser/** -r",
     "http-startup": "http-server dist/browser/ -p 4711 --gzip",
-- 
GitLab