From 0acfe62dc2ac2292af6f056e0070a3b717600485 Mon Sep 17 00:00:00 2001 From: Petter Aas Date: Thu, 8 May 2014 00:08:37 +0200 Subject: [PATCH 1/5] Updated dev dependencies. --- static/package.json | 66 ++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/static/package.json b/static/package.json index 0d96042..a8eb757 100644 --- a/static/package.json +++ b/static/package.json @@ -3,46 +3,46 @@ "version": "0.1.0", "dependencies": {}, "devDependencies": { + "bower": "^1.3.3", + "connect-livereload": "^0.4.0", "grunt": "~0.4.1", - "grunt-contrib-copy": "~0.4.1", - "grunt-contrib-concat": "~0.3.0", - "grunt-contrib-coffee": "~0.7.0", - "grunt-contrib-uglify": "~0.2.0", - "grunt-contrib-compass": "~0.5.0", - "grunt-contrib-jshint": "~0.6.0", - "grunt-contrib-cssmin": "~0.6.0", - "grunt-contrib-connect": "~0.3.0", + "grunt-autoprefixer": "^0.7.3", + "grunt-cli": "~0.1.13", + "grunt-concurrent": "^0.5.0", "grunt-contrib-clean": "~0.5.0", - "grunt-contrib-htmlmin": "~0.1.3", - "grunt-contrib-imagemin": "~0.2.0", - "grunt-contrib-watch": "~0.5.2", - "grunt-autoprefixer": "~0.2.0", - "grunt-usemin": "~0.1.11", - "grunt-svgmin": "~0.2.0", - "grunt-rev": "~0.1.0", - "grunt-open": "~0.2.0", - "grunt-concurrent": "~0.3.0", - "load-grunt-tasks": "~0.1.0", - "connect-livereload": "~0.2.0", - "grunt-google-cdn": "~0.2.0", + "grunt-contrib-coffee": "^0.10.1", + "grunt-contrib-compass": "^0.7.2", + "grunt-contrib-concat": "^0.4.0", + "grunt-contrib-connect": "^0.7.1", + "grunt-contrib-copy": "^0.5.0", + "grunt-contrib-cssmin": "^0.9.0", + "grunt-contrib-htmlmin": "^0.3.0", + "grunt-contrib-imagemin": "^0.7.0", + "grunt-contrib-jshint": "^0.10.0", + "grunt-contrib-uglify": "^0.4.0", + "grunt-contrib-watch": "^0.6.1", + "grunt-google-cdn": "^0.4.0", + "grunt-karma": "^0.8.3", "grunt-ngmin": "~0.0.2", - "time-grunt": "~0.1.0", - "karma-ng-scenario": "~0.1.0", - "grunt-karma": "~0.6.2", - "karma-coverage": "~0.1.5", - "karma-script-launcher": "~0.1.0", + "grunt-open": "~0.2.0", + "grunt-rev": "~0.1.0", + "grunt-svgmin": "^0.4.0", + "grunt-usemin": "^2.1.1", + "karma": "^0.12.14", "karma-chrome-launcher": "~0.1.1", - "karma-html2js-preprocessor": "~0.1.0", + "karma-coffee-preprocessor": "^0.2.1", + "karma-coverage": "^0.2.1", "karma-firefox-launcher": "~0.1.2", + "karma-html2js-preprocessor": "~0.1.0", "karma-jasmine": "~0.1.3", - "requirejs": "~2.1.9", - "karma-requirejs": "~0.2.0", - "karma-coffee-preprocessor": "~0.1.1", - "karma-phantomjs-launcher": "~0.1.1", - "karma": "~0.10.8", "karma-ng-html2js-preprocessor": "~0.1.0", - "bower": "~1.2.8", - "grunt-cli": "~0.1.13" + "karma-ng-scenario": "~0.1.0", + "karma-phantomjs-launcher": "~0.1.1", + "karma-requirejs": "~0.2.0", + "karma-script-launcher": "~0.1.0", + "load-grunt-tasks": "^0.4.0", + "requirejs": "~2.1.9", + "time-grunt": "^0.3.1" }, "engines": { "node": ">=0.8.0" From 3bb829a8cc94adbd42499b645bf4918e9ada28c1 Mon Sep 17 00:00:00 2001 From: Petter Aas Date: Thu, 8 May 2014 00:36:54 +0200 Subject: [PATCH 2/5] Try bower cache clean + bower update to possibly fix cache problem. --- static/.travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/static/.travis.yml b/static/.travis.yml index 83f4e22..b612b56 100644 --- a/static/.travis.yml +++ b/static/.travis.yml @@ -4,4 +4,5 @@ node_js: - '0.10' before_script: - 'npm install -g bower grunt-cli' - - 'bower install' + - bower cache clean + - bower update From ea541772465e75c53ca18996ca199edf011da6f1 Mon Sep 17 00:00:00 2001 From: Petter Aas Date: Thu, 8 May 2014 00:48:09 +0200 Subject: [PATCH 3/5] Run bower cache clean --- static/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/package.json b/static/package.json index a8eb757..831ac98 100644 --- a/static/package.json +++ b/static/package.json @@ -49,6 +49,6 @@ }, "scripts": { "test": "grunt test", - "postinstall": "node_modules/.bin/bower install; node_modules/.bin/grunt" + "postinstall": "node_modules/.bin/bower cache clean; node_modules/.bin/bower install; node_modules/.bin/grunt" } } From 9ba120ae7fa9058cb3fb183153ae6d937be336b5 Mon Sep 17 00:00:00 2001 From: Petter Aas Date: Thu, 8 May 2014 00:48:32 +0200 Subject: [PATCH 4/5] Run bower update instead of install --- static/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/package.json b/static/package.json index 831ac98..abaa514 100644 --- a/static/package.json +++ b/static/package.json @@ -49,6 +49,6 @@ }, "scripts": { "test": "grunt test", - "postinstall": "node_modules/.bin/bower cache clean; node_modules/.bin/bower install; node_modules/.bin/grunt" + "postinstall": "node_modules/.bin/bower cache clean; node_modules/.bin/bower update; node_modules/.bin/grunt" } } From 91d0e107b747c6308727d2a489e0cb5a89831c86 Mon Sep 17 00:00:00 2001 From: Petter Aas Date: Thu, 8 May 2014 00:59:12 +0200 Subject: [PATCH 5/5] Added 'use strict' --- service/config.js.example | 2 ++ service/src/app.js | 1 + 2 files changed, 3 insertions(+) diff --git a/service/config.js.example b/service/config.js.example index 30ff5c1..8c3bf33 100644 --- a/service/config.js.example +++ b/service/config.js.example @@ -1,3 +1,5 @@ +'use strict'; + var development = { 'db': { 'url': 'http://localhost:9200', diff --git a/service/src/app.js b/service/src/app.js index c93501c..3f1bab8 100644 --- a/service/src/app.js +++ b/service/src/app.js @@ -1,4 +1,5 @@ 'use strict'; + try { require('newrelic'); } catch (e) {