diff --git a/.bowerrc b/.bowerrc index 7dcff4cd0..b6b594ac1 100644 --- a/.bowerrc +++ b/.bowerrc @@ -1,3 +1,3 @@ { - "directory" : "lib" + "directory" : "./.bower_cache" } \ No newline at end of file diff --git a/.gitignore b/.gitignore index 53e678b45..02070188a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /node_modules/ -/lib/ \ No newline at end of file +/lib/ +/.bower_cache/ \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index f2c257a22..f56323940 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: node_js node_js: - - "0.8" - "0.10" before_install: - npm install -g grunt-cli \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index ec89b6fda..a5fa63d17 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -86,16 +86,26 @@ module.exports = function(grunt) { // Testing jasmine: { src: [ - 'lib/jquery/jquery.min.js', 'src/js/data.js', 'src/js/intlTelInput.js' ], options: { + vendor: [ + 'lib/jquery/jquery.min.js', + 'lib/jasmine-jquery/lib/jasmine-jquery.js' + ], specs: [ 'src/js/tests.js' ] } - } + }, + + // Asset libs + bower: { + install: { + // defaults are fine + } + }, }); @@ -105,6 +115,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-jasmine'); + grunt.loadNpmTasks('grunt-bower-task'); // tasks // build everything ready for a commit diff --git a/package.json b/package.json index 53d9be8f2..51a139608 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,8 @@ "grunt-contrib-jshint": "~0.5.4", "grunt-contrib-watch": "~0.4.4", "grunt-contrib-uglify": "~0.2.4", - "grunt-contrib-jasmine": "~0.5.2" + "grunt-contrib-jasmine": "~0.5.2", + "grunt-bower-task": "~0.3.2" }, "repository": { "type": "git",