From 5eca8d03ae5156da840b1102f5f11e5388a1e372 Mon Sep 17 00:00:00 2001
From: Andrew Sliwinski <andrewsliwinski@acm.org>
Date: Wed, 9 Sep 2015 13:24:50 -0700
Subject: [PATCH] Add deployment configuration
---
.gitignore | 5 +++++
Makefile | 39 ++++++++++++++++++++-------------------
package.json | 4 ++--
3 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/.gitignore b/.gitignore
index a7bef3917..5751771c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,8 @@ npm-*
# Build
/build
+
+# Elastic Beanstalk Files
+.elasticbeanstalk/*
+!.elasticbeanstalk/*.cfg.yml
+!.elasticbeanstalk/*.global.yml
diff --git a/Makefile b/Makefile
index bf3d6d2a3..2f1255b66 100644
--- a/Makefile
+++ b/Makefile
@@ -17,15 +17,30 @@ clean:
static:
cp -a ./static/. ./build/
-nginx_conf:
- @make static
- node server/nginx.js
-
webpack:
$(WEBPACK)
# ------------------------------------
+watch:
+ $(WATCH) "make clean && make static" ./static &
+ $(WEBPACK) -d --watch &
+ wait
+
+stop:
+ pkill -f "node $(WEBPACK) -d --watch"
+ pkill -f "node $(WATCH) make clean && make static ./static"
+
+start:
+ $(NODE) ./server/index.js
+
+# ------------------------------------
+
+nginx_conf:
+ node server/nginx.js
+
+# ------------------------------------
+
test:
@make lint
@@ -39,18 +54,4 @@ lint:
# ------------------------------------
-watch:
- $(WATCH) "make clean && make static" ./static &
- $(WEBPACK) -d --watch &
- wait
-
-stop-watch:
- pkill -f "node $(WATCH) make clean && make static ./static"
- pkill -f "node $(WEBPACK) -d --watch"
-
-start:
- $(NODE) ./server/index.js
-
-# ------------------------------------
-
-.PHONY: build clean static webpack test lint watch start
+.PHONY: build clean static webpack watch stop start nginx_conf test lint
diff --git a/package.json b/package.json
index c12a4c097..f0ad612da 100644
--- a/package.json
+++ b/package.json
@@ -2,13 +2,13 @@
"name": "www",
"version": "1.0.0",
"description": "Standalone WWW client for Scratch",
- "main": "index.js",
"scripts": {
"start": "make start",
"test": "make test",
"watch": "make watch",
"stop-watch": "make stop-watch",
- "build": "make build"
+ "build": "make build",
+ "prestart": "make build"
},
"repository": {
"type": "git",