From 354151422e140ea98991d467489e69e3856788f8 Mon Sep 17 00:00:00 2001 From: Aia Patag Date: Tue, 27 May 2014 22:37:44 +0800 Subject: [PATCH] Updated grunt-update-submodules to 0.4.0 closes #2503 - It can now have custom additional parameters to `git submodule update` instead of always having `--init --recursive --merge` --- Gruntfile.js | 16 +++++++++++++--- package.json | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 090b0477c5..f58eab660a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -630,6 +630,16 @@ var path = require('path'), 'core/built/public/jquery.min.js': 'core/built/public/jquery.js' } } + }, + + // ### grunt-update-submodules + // Grunt task to update git submodules + "update_submodules": { + default: { + options: { + params: false // blanks command-line parameters + } + } } }; @@ -890,7 +900,7 @@ var path = require('path'), // `bower` does have some quirks, such as not running as root. If you have problems please try running // `grunt init --verbose` to see if there are any errors. grunt.registerTask('init', 'Prepare the project for development', - ['shell:bower', 'default']); + ['shell:bower', 'update_submodules', 'default']); // ### Production assets // `grunt prod` - will build the minified assets used in production. @@ -905,7 +915,7 @@ var path = require('path'), // Compiles handlebars templates, concatenates javascript files for the admin UI into a handful of files instead // of many files, and makes sure the bower dependencies are in the right place. grunt.registerTask('default', 'Build JS & templates for development', - ['update_submodules', 'handlebars', 'concat', 'copy:dev', 'emberBuild']); + ['handlebars', 'concat', 'copy:dev', 'emberBuild']); // ### Live reload // `grunt dev` - build assets on the fly whilst developing @@ -932,7 +942,7 @@ var path = require('path'), ' - Copy files to release-folder/#/#{version} directory\n' + ' - Clean out unnecessary files (travis, .git*, etc)\n' + ' - Zip files in release-folder to dist-folder/#{version} directory', - ['shell:bower', 'handlebars', 'concat', 'uglify', 'clean:release', 'copy:release', 'compress:release']); + ['shell:bower', 'update_submodules', 'handlebars', 'concat', 'uglify', 'clean:release', 'copy:release', 'compress:release']); }; // Export the configuration diff --git a/package.json b/package.json index 4ff4cff2ef..0420156d5c 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "grunt-express-server": "~0.4.11", "grunt-mocha-cli": "~1.4.0", "grunt-shell": "~0.6.1", - "grunt-update-submodules": "~0.2.1", + "grunt-update-submodules": "~0.4.0", "matchdep": "~0.3.0", "mocha": "~1.15.1", "nock": "0.27.2",