From 9f906a2de47710224aea14be8080974fbf296a7f Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Mon, 20 Mar 2017 19:20:48 +0000
Subject: [PATCH] Move Makefile commands into npm scripts, the compress script
 is its own executable script file as too complex for single line

---
 compress     | 23 ++++++++++++++++
 package.json | 78 +++++++++++++++++++++++++++++-----------------------
 2 files changed, 66 insertions(+), 35 deletions(-)
 create mode 100644 compress

diff --git a/compress b/compress
new file mode 100644
index 00000000..25a20ada
--- /dev/null
+++ b/compress
@@ -0,0 +1,23 @@
+#!/usr/bin/zsh
+
+echo "compressing app.css and prism files"
+zopfli ./public/assets/css/app.css
+zopfli ./public/assets/prism/prism.css
+zopfli ./public/assets/prism/prism.js
+bro --force --quality 11 --input ./public/assets/css/app.css --output ./public/assets/css/app.css.br
+bro --force --quality 11 --input ./public/assets/prism/prism.css --output ./public/assets/prism/prism.css.br
+bro --force --quality 11 --input ./public/assets/prism/prism.js --output ./public/assets/prism/prism.js.br
+
+echo "compressing js assets"
+for file in ./public/assets/js/*.js
+do
+    zopfli $file
+    bro --force --quality 11 --input $file --output $file.br
+done
+
+echo "compressing frontend assets"
+for file in ./public/assets/frontend/*.css
+do
+    zopfli $file
+    bro --force --quality 11 --input $file --output $file.br
+done
diff --git a/package.json b/package.json
index b3e21cb8..b47e6c37 100644
--- a/package.json
+++ b/package.json
@@ -1,37 +1,45 @@
 {
-  "name": "jbuk-frontend",
-  "version": "0.0.1",
-  "repository": "https://github.com/jonnybarnes/jonnybarnes.uk",
-  "license": "CC0-1.0",
-  "dependencies": {
-    "alertify.js": "^1.0.12",
-    "mapbox-gl": "^0.32.0",
-    "marked": "^0.3.6",
-    "normalize.css": "^5.0.0",
-    "webStorage": "^1.2.2"
-  },
-  "devDependencies": {
-    "babel-cli": "^6.18.0",
-    "babel-core": "^6.21.0",
-    "babel-loader": "^6.2.10",
-    "babel-preset-es2015": "^6.18.0",
-    "babel-preset-latest": "^6.16.0",
-    "babel-runtime": "^6.20.0",
-    "lint-staged": "^3.2.1",
-    "pre-commit": "^1.1.3",
-    "stylelint-config-standard": "^16.0.0",
-    "webpack": "^2.2.0"
-  },
-  "private": true,
-  "scripts": {
-    "lint-staged": "lint-staged",
-    "stylelint-staged": "stylelint --syntax=scss"
-  },
-  "lint-staged": {
-    "eslint": "resources/assets/js/*.js",
-    "stylelint-staged": "resources/assets/sass/**/*.scss"
-  },
-  "pre-commit": [
-    "lint-staged"
-  ]
+    "private": true,
+    "name": "jbuk-frontend",
+    "version": "0.0.1",
+    "repository": "https://github.com/jonnybarnes/jonnybarnes.uk",
+    "license": "CC0-1.0",
+    "dependencies": {
+        "alertify.js": "^1.0.12",
+        "mapbox-gl": "^0.32.0",
+        "marked": "^0.3.6",
+        "normalize.css": "^5.0.0",
+        "webStorage": "^1.2.2"
+    },
+    "devDependencies": {
+        "babel-cli": "^6.18.0",
+        "babel-core": "^6.21.0",
+        "babel-loader": "^6.2.10",
+        "babel-preset-es2015": "^6.18.0",
+        "babel-preset-latest": "^6.16.0",
+        "babel-runtime": "^6.20.0",
+        "lint-staged": "^3.2.1",
+        "pre-commit": "^1.1.3",
+        "stylelint-config-standard": "^16.0.0",
+        "webpack": "^2.2.0"
+    },
+    "scripts": {
+        "lint-staged": "lint-staged",
+        "stylelint-staged": "stylelint --syntax=scss",
+        "eslint-staged": "eslint",
+        "sass": "sassc --style compressed --sourcemap resources/assets/sass/app.scss public/assets/css/app.css",
+        "postcss": "postcss --use autoprefixer --autoprefixer.browsers \"> 5%\" --output public/assets/css/app.css public/assets/css/app.css",
+        "make:css": "npm run sass && npm run postcss",
+        "compress": "./compress",
+        "copy-dist": "cp ./node_modules/mapbox-gl/dist/mapbox-gl.css ./public/assets/frontend/ && cp ./node_modules/alertify.js/dist/css/alertify.css ./public/assets/frontend/ && cp ./node_modules/normalize.css/normalize.css ./public/assets/frontend/",
+        "lint:sass": "stylelint --syntax=scss resources/assets/sass/**/*.scss",
+        "lint:es6": "eslint resources/assets/es6/*.js"
+    },
+    "lint-staged": {
+        "eslint-staged": "resources/assets/es6/*.js",
+        "stylelint-staged": "resources/assets/sass/**/*.scss"
+    },
+    "pre-commit": [
+        "lint-staged"
+    ]
 }