From efcf3107e0966c3d9c5d546ca784f8da8bca03b1 Mon Sep 17 00:00:00 2001 From: Anthony Truskinger Date: Thu, 3 Jul 2014 22:39:20 +1000 Subject: [PATCH] updated dependendcies --- Gruntfile.js | 10 ++++++---- bower.json | 2 +- package.json | 11 +++++------ 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index b46cede4..9ab6ac02 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -526,11 +526,13 @@ module.exports = function (grunt) { options: { hostname: '*', port: 8080, - base: '<%= build_dir %>', + base: './<%= build_dir %>', debug: true, livereload: true, - //keepalive: true, middleware: function (connect, options) { + + grunt.log.writeln(options.base); + return [ modRewrite([ @@ -557,10 +559,10 @@ module.exports = function (grunt) { ]), // this specifies that the build_dir, ('build') is a static directory where content // will be served from. - connect.static(options.base), + connect.static(options.base[0]), // for source maps - connect.static(__dirname) + //connect.static(__dirname) ]; } } diff --git a/bower.json b/bower.json index c4870bfa..f73dff88 100644 --- a/bower.json +++ b/bower.json @@ -13,7 +13,7 @@ "hint.css": "https://github.com/chinchang/hint.css.git", "modernizr": "~2.8.x", "jquery-ui": "~1.10.3", - "momentjs": "~2.6.x", + "momentjs": "~2.7.x", "jasmine-matchers": "https://github.com/JamieMason/Jasmine-Matchers.git#develop", "objectdiff": "https://github.com/NV/objectDiff.js.git", "lodash": "~2.4.x", diff --git a/package.json b/package.json index 0eac2a43..07a88dfa 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,7 @@ "url": "https://github.com/QutBioacoustics/baw-client.git" }, "//": [ - "THE karma-chrome-launcher IS NEEDED TO LAUNCH CHROME PROPERLY ON WINDOWS. REMOVE WHEN PULL REQUEST COMPLETED https://github.com/karma-runner/karma-chrome-launcher", - "to install specific version of karma: npm i -g karma@0.10.10" + "THE karma-chrome-launcher IS NEEDED TO LAUNCH CHROME PROPERLY ON WINDOWS. REMOVE WHEN PULL REQUEST COMPLETED https://github.com/karma-runner/karma-chrome-launcher" ], "devDependencies": { "grunt": "~0.4.1", @@ -23,7 +22,7 @@ "grunt-contrib-jshint": "0.10.x", "grunt-contrib-concat": "~0.4.0", "grunt-contrib-watch": "~0.6.x", - "grunt-contrib-uglify": "0.4.x", + "grunt-contrib-uglify": "0.5.x", "grunt-karma": "~0.8.x", "karma-chrome-launcher": "~0.1.1", "grunt-ngmin": "0.0.3", @@ -31,9 +30,9 @@ "grunt-conventional-changelog": "~1.1", "grunt-changelog": "~0.2.x", "grunt-bump": "0.0.14", - "grunt-contrib-connect": "0.7.x", - "connect-modrewrite": "~0.5.7", - "grunt-sass": "0.12.x", + "grunt-contrib-connect": "0.8.x", + "connect-modrewrite": "0.7.x", + "grunt-sass": "0.14.x", "lodash": "~2.4.1", "karma-phantomjs-launcher": "~0.1.1", "karma-jasmine": "~0.2.x",