From 58fe8198d31cde5a70a335edaec999145e6e2bb1 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Thu, 5 Jan 2017 13:17:40 +0000
Subject: [PATCH] Add Compser and NPM scripts, remove Makefile

---
 Makefile      | 28 ----------------------------
 composer.json |  7 ++++++-
 package.json  |  5 +++++
 3 files changed, 11 insertions(+), 29 deletions(-)
 delete mode 100644 Makefile

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 5499c8ad..00000000
--- a/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-.PHONY: clean
-
-BOWER="node_modules/.bin/bower"
-GULP="node_modules/.bin/gulp"
-SCULPIN="bin/sculpin"
-
-init: build watch
-
-build:
-	composer install \
-		&& yarn \
-		&& $(BOWER) install \
-		&& $(GULP) build
-
-clean:
-	rm -rf node_modules/ output_*/ vendor/
-
-generate:
-	$(SCULPIN) generate --clean --no-interaction
-
-gulp:
-	$(GULP) watch
-
-serve:
-	$(SCULPIN) generate --server --clean --no-interaction
-
-watch:
-	$(SCULPIN) generate --server --watch --clean --no-interaction
diff --git a/composer.json b/composer.json
index 5ab74f33..7cd8c142 100644
--- a/composer.json
+++ b/composer.json
@@ -1,4 +1,10 @@
 {
+    "scripts": {
+        "clean": "rm -rf output_*/",
+        "dev": "sculpin generate --clean --no-interaction --server --watch",
+        "production": "sculpin generate --clean --no-interaction --env prod",
+        "test": "behat"
+    },
     "require": {
         "behat/mink-extension": "@stable",
         "behat/mink-goutte-driver": "@stable",
@@ -10,7 +16,6 @@
         "tsphethean/sculpin-related-posts-bundle": "~0.1.0"
     },
     "config": {
-        "bin-dir": "bin",
         "sort-packages": true
     }
 }
diff --git a/package.json b/package.json
index 162df95b..1292f169 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,9 @@
 {
+  "scripts": {
+    "init": "yarn && bower install",
+    "dev": "gulp watch",
+    "production": "gulp --production"
+  },
   "devDependencies": {
     "bower": "^1.7.7",
     "del": "^2.2.0",