From 19c9fcddf87f06e5d198aed178fb4422508af2ff Mon Sep 17 00:00:00 2001 From: Joe Workman Date: Tue, 26 Aug 2014 22:56:04 -0700 Subject: [PATCH] Version Automation Part 2 This time, I am more exact on exactly what files are processed for the version info. So if you want to start adding it to more files then you will need to make sure that its processed by the grunt file. --- Gruntfile.js | 21 ++++++++++++++++++++- bower.json | 2 +- js/foundation/foundation.abide.js | 2 +- js/foundation/foundation.accordion.js | 2 +- js/foundation/foundation.alert.js | 2 +- js/foundation/foundation.clearing.js | 2 +- js/foundation/foundation.dropdown.js | 2 +- js/foundation/foundation.equalizer.js | 2 +- js/foundation/foundation.interchange.js | 2 +- js/foundation/foundation.joyride.js | 2 +- js/foundation/foundation.js | 2 +- js/foundation/foundation.magellan.js | 2 +- js/foundation/foundation.offcanvas.js | 2 +- js/foundation/foundation.orbit.js | 2 +- js/foundation/foundation.reveal.js | 2 +- js/foundation/foundation.slider.js | 2 +- js/foundation/foundation.tab.js | 2 +- js/foundation/foundation.tooltip.js | 2 +- js/foundation/foundation.topbar.js | 2 +- package.json | 2 +- scss/foundation/components/_global.scss | 2 +- 21 files changed, 40 insertions(+), 21 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 697331e2f..9ac873ddd 100755 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -62,6 +62,24 @@ module.exports = function(grunt) { } }, + 'string-replace': { + dist: { + files: { + 'dist/assets/css/':'dist/assets/css/*.css', + 'dist/assets/js/':'dist/assets/js/*js', + 'dist/assets/js/foundation/':'dist/assets/js/foundation/*js', + 'dist/assets/scss/foundation/components/':'dist/assets/scss/foundation/components/*.scss', + 'dist/docs/assets/css/':'dist/docs/assets/css/*.css', + 'dist/docs/assets/js/':'dist/docs/assets/js/*.js' + }, + options: { + replacements: [ + {pattern: /{{\s*VERSION\s*}}/g, replacement: '<%= pkg.version %>'} + ] + } + } + }, + concat: { dist: { files: { @@ -219,9 +237,10 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-rsync'); grunt.loadNpmTasks('grunt-sass'); grunt.loadNpmTasks('grunt-contrib-jst'); + grunt.loadNpmTasks('grunt-string-replace'); grunt.task.registerTask('watch_start', ['karma:dev_watch:start', 'watch']); - grunt.registerTask('build:assets', ['clean', 'sass', 'concat', 'uglify', 'copy', 'jst']); + grunt.registerTask('build:assets', ['clean', 'sass', 'concat', 'uglify', 'copy', 'jst', 'string-replace']); grunt.registerTask('build', ['build:assets', 'assemble']); grunt.registerTask('travis', ['build', 'karma:continuous']); grunt.registerTask('develop', ['travis', 'watch_start']); diff --git a/bower.json b/bower.json index 6f99f655c..8ddc58ac9 100755 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "foundation", - "version": "5.3.3", + "version": "5.4.1", "main": [ "css/foundation.css", "js/foundation.js" diff --git a/js/foundation/foundation.abide.js b/js/foundation/foundation.abide.js index 9d24f25a1..8994d417e 100755 --- a/js/foundation/foundation.abide.js +++ b/js/foundation/foundation.abide.js @@ -4,7 +4,7 @@ Foundation.libs.abide = { name : 'abide', - version : '5.4.1', + version : '{{VERSION}}', settings : { live_validate : true, diff --git a/js/foundation/foundation.accordion.js b/js/foundation/foundation.accordion.js index 777f87154..962263720 100755 --- a/js/foundation/foundation.accordion.js +++ b/js/foundation/foundation.accordion.js @@ -4,7 +4,7 @@ Foundation.libs.accordion = { name : 'accordion', - version : '5.4.1', + version : '{{VERSION}}', settings : { active_class: 'active', diff --git a/js/foundation/foundation.alert.js b/js/foundation/foundation.alert.js index ef8c98817..1453169d1 100755 --- a/js/foundation/foundation.alert.js +++ b/js/foundation/foundation.alert.js @@ -4,7 +4,7 @@ Foundation.libs.alert = { name : 'alert', - version : '5.4.1', + version : '{{VERSION}}', settings : { callback: function (){} diff --git a/js/foundation/foundation.clearing.js b/js/foundation/foundation.clearing.js index d1c3c753a..b91a8a058 100755 --- a/js/foundation/foundation.clearing.js +++ b/js/foundation/foundation.clearing.js @@ -4,7 +4,7 @@ Foundation.libs.clearing = { name : 'clearing', - version: '5.4.1', + version: '{{VERSION}}', settings : { templates : { diff --git a/js/foundation/foundation.dropdown.js b/js/foundation/foundation.dropdown.js index 68e4b8745..b919d1b2c 100755 --- a/js/foundation/foundation.dropdown.js +++ b/js/foundation/foundation.dropdown.js @@ -4,7 +4,7 @@ Foundation.libs.dropdown = { name : 'dropdown', - version : '5.4.1', + version : '{{VERSION}}', settings : { active_class: 'open', diff --git a/js/foundation/foundation.equalizer.js b/js/foundation/foundation.equalizer.js index dde2da72a..d85901e19 100755 --- a/js/foundation/foundation.equalizer.js +++ b/js/foundation/foundation.equalizer.js @@ -4,7 +4,7 @@ Foundation.libs.equalizer = { name : 'equalizer', - version : '5.4.1', + version : '{{VERSION}}', settings : { use_tallest: true, diff --git a/js/foundation/foundation.interchange.js b/js/foundation/foundation.interchange.js index 8d8b05e7f..ddc6420ec 100755 --- a/js/foundation/foundation.interchange.js +++ b/js/foundation/foundation.interchange.js @@ -4,7 +4,7 @@ Foundation.libs.interchange = { name : 'interchange', - version : '5.4.1', + version : '{{VERSION}}', cache : {}, diff --git a/js/foundation/foundation.joyride.js b/js/foundation/foundation.joyride.js index 5916b27be..c0731b051 100755 --- a/js/foundation/foundation.joyride.js +++ b/js/foundation/foundation.joyride.js @@ -6,7 +6,7 @@ Foundation.libs.joyride = { name : 'joyride', - version : '5.4.1', + version : '{{VERSION}}', defaults : { expose : false, // turn on or off the expose feature diff --git a/js/foundation/foundation.js b/js/foundation/foundation.js index 61c632ec9..dd4e92d78 100755 --- a/js/foundation/foundation.js +++ b/js/foundation/foundation.js @@ -278,7 +278,7 @@ window.Foundation = { name : 'Foundation', - version : '5.3.3', + version : '{{VERSION}}', media_queries : { small : S('.foundation-mq-small').css('font-family').replace(/^[\/\\'"]+|(;\s?})+|[\/\\'"]+$/g, ''), diff --git a/js/foundation/foundation.magellan.js b/js/foundation/foundation.magellan.js index 9158f73f9..65af76802 100755 --- a/js/foundation/foundation.magellan.js +++ b/js/foundation/foundation.magellan.js @@ -4,7 +4,7 @@ Foundation.libs['magellan-expedition'] = { name : 'magellan-expedition', - version : '5.4.1', + version : '{{VERSION}}', settings : { active_class: 'active', diff --git a/js/foundation/foundation.offcanvas.js b/js/foundation/foundation.offcanvas.js index 9ed31dfdc..19ac36ec3 100644 --- a/js/foundation/foundation.offcanvas.js +++ b/js/foundation/foundation.offcanvas.js @@ -4,7 +4,7 @@ Foundation.libs.offcanvas = { name : 'offcanvas', - version : '5.4.1', + version : '{{VERSION}}', settings : { open_method: 'move', diff --git a/js/foundation/foundation.orbit.js b/js/foundation/foundation.orbit.js index aba8b3cad..2eb0cb191 100755 --- a/js/foundation/foundation.orbit.js +++ b/js/foundation/foundation.orbit.js @@ -402,7 +402,7 @@ Foundation.libs.orbit = { name: 'orbit', - version: '5.3.3', + version: '{{VERSION}}', settings: { animation: 'slide', diff --git a/js/foundation/foundation.reveal.js b/js/foundation/foundation.reveal.js index 051428619..362f1c9bd 100755 --- a/js/foundation/foundation.reveal.js +++ b/js/foundation/foundation.reveal.js @@ -4,7 +4,7 @@ Foundation.libs.reveal = { name : 'reveal', - version : '5.4.1', + version : '{{VERSION}}', locked : false, diff --git a/js/foundation/foundation.slider.js b/js/foundation/foundation.slider.js index 87588eace..51200b345 100755 --- a/js/foundation/foundation.slider.js +++ b/js/foundation/foundation.slider.js @@ -4,7 +4,7 @@ Foundation.libs.slider = { name : 'slider', - version : '5.4.1', + version : '{{VERSION}}', settings: { start: 0, diff --git a/js/foundation/foundation.tab.js b/js/foundation/foundation.tab.js index 3c8d8fd75..59d768f2d 100755 --- a/js/foundation/foundation.tab.js +++ b/js/foundation/foundation.tab.js @@ -4,7 +4,7 @@ Foundation.libs.tab = { name : 'tab', - version : '5.4.1', + version : '{{VERSION}}', settings : { active_class: 'active', diff --git a/js/foundation/foundation.tooltip.js b/js/foundation/foundation.tooltip.js index 7444a3400..6d7388e05 100755 --- a/js/foundation/foundation.tooltip.js +++ b/js/foundation/foundation.tooltip.js @@ -4,7 +4,7 @@ Foundation.libs.tooltip = { name : 'tooltip', - version : '5.4.1', + version : '{{VERSION}}', settings : { additional_inheritable_classes : [], diff --git a/js/foundation/foundation.topbar.js b/js/foundation/foundation.topbar.js index 432901ca5..24539f45d 100755 --- a/js/foundation/foundation.topbar.js +++ b/js/foundation/foundation.topbar.js @@ -4,7 +4,7 @@ Foundation.libs.topbar = { name : 'topbar', - version: '5.4.1', + version: '{{VERSION}}', settings : { index : 0, diff --git a/package.json b/package.json index 6b3d91911..9f538445e 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zurb-foundation", - "version": "5.3.3", + "version": "5.4.1", "devDependencies": { "assemble": "~0.4.37", "grunt": "~0.4.4", diff --git a/scss/foundation/components/_global.scss b/scss/foundation/components/_global.scss index 967d7e4ac..b4cc521bc 100755 --- a/scss/foundation/components/_global.scss +++ b/scss/foundation/components/_global.scss @@ -339,7 +339,7 @@ $cursor-text-value: text !default; // Forward slash placed around everything to convince PhantomJS to read the value. meta.foundation-version { - font-family: "/5.4.1/"; + font-family: "/{{VERSION}}/"; } meta.foundation-mq-small { -- 2.47.2