From 3e18f54a3944b462cd4157529eeadc87ea6da245 Mon Sep 17 00:00:00 2001 From: Zachary Carter Date: Thu, 9 Jan 2014 11:25:16 -0800 Subject: [PATCH] Move things around to handle awsbox deploy --- Gruntfile.js | 2 +- package.json | 25 +++++++++++++------------ scripts/awsbox/post_deploy.sh | 2 ++ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 2c7c18b44..5106c5951 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -28,7 +28,7 @@ module.exports = function (grunt) { // show elapsed time at the end require('time-grunt')(grunt); // load all grunt tasks - require('load-grunt-tasks')(grunt); + require('load-grunt-tasks')(grunt, {scope: 'dependencies'}); grunt.initConfig({ }); diff --git a/package.json b/package.json index 4f54923ae..316478d6a 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,8 @@ "author": "Mozilla (https://mozilla.org/)", "license": "MPL 2.0", "dependencies": { + "bower": "1.2.8", + "jshint": "0.9.1", "connect-cachify": "0.0.15", "convict": "0.4.0", "express": "3.3.4", @@ -24,14 +26,6 @@ "jwcrypto": "0.4.3", "intel": "0.4.0", "helmet": "0.1.2", - "connect-fonts": "0.0.12", - "connect-fonts-firasans": "0.0.2", - "connect-fonts-clearsans": "0.0.1" - }, - "devDependencies": { - "bower": "1.2.8", - "awsbox": "0.6.2", - "jshint": "0.9.1", "grunt": "~0.4.1", "grunt-contrib-copy": "~0.4.1", "grunt-contrib-concat": "~0.3.0", @@ -53,11 +47,18 @@ "grunt-requirejs": "~0.4.0", "grunt-svgmin": "~0.2.0", "grunt-concurrent": "~0.3.0", - "load-grunt-tasks": "~0.1.0", - "time-grunt": "~0.1.1", - "intern-geezer": "1.3.2", - "jshint-stylish": "~0.1.4", "grunt-preprocess": "~3.0.1", + "load-grunt-tasks": "0.2.1", + "time-grunt": "~0.1.1", + "jshint-stylish": "~0.1.4", + "connect-fonts": "0.0.12", + "connect-fonts-firasans": "0.0.2", + "connect-fonts-clearsans": "0.0.1", + "grunt-cli": "0.1.11" + }, + "devDependencies": { + "awsbox": "0.6.2", + "intern-geezer": "1.3.2", "xmlhttprequest": "git://github.com/zaach/node-XMLHttpRequest.git#onerror" }, "engines": { diff --git a/scripts/awsbox/post_deploy.sh b/scripts/awsbox/post_deploy.sh index 71259c0ee..984f96e45 100755 --- a/scripts/awsbox/post_deploy.sh +++ b/scripts/awsbox/post_deploy.sh @@ -10,4 +10,6 @@ else nohup /usr/bin/circusd --daemon /home/app/circus.ini > /home/app/circusd.log 2>&1 & fi +node_modules/.bin/grunt build + echo "DONE"