From: Jon Schlinkert Date: Sun, 5 Jan 2014 16:17:40 +0000 (-0500) Subject: adds Assemble to build templates, removes grunt-includes X-Git-Tag: v1.0.5~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F49%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-emails.git adds Assemble to build templates, removes grunt-includes --- diff --git a/Gruntfile.js b/Gruntfile.js index 6a993bca..bd08558d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,33 +1,22 @@ module.exports = function(grunt) { grunt.initConfig({ pkg: grunt.file.readJSON('package.json'), - includes: { + assemble: { + options: {partials: 'css/*.css'}, templates: { src: 'templates/**/*.html', dest: 'build/downloads', - cwd: '.', - options: { - includeRegexp: /^\s*\/\*\s*[Ii]nclude\s+([^'"\s]+)\s*\*\/$/, - includePath: 'css', - } + cwd: './' }, docsDev: { src: 'docs/examples/*.html', dest: 'build/docs', - cwd: '.', - options: { - includeRegexp: /^\s*\/\*\s*[Ii]nclude\s+([^'"\s]+)\s*\*\/$/, - includePath: 'css', - } + cwd: './' }, docsDeploy: { src: 'docs/examples/*.html', dest: 'build', - cwd: '.', - options: { - includeRegexp: /^\s*\/\*\s*[Ii]nclude\s+([^'"\s]+)\s*\*\/$/, - includePath: 'css', - } + cwd: './' } }, shell: { @@ -41,7 +30,7 @@ module.exports = function(grunt) { 'mkdir build/docs', ].join('&&') }, - zipTemplates: { + zipTemplates: { command: [ 'cd build/downloads/templates/base', 'cp * ../', @@ -109,7 +98,7 @@ module.exports = function(grunt) { }, }); - grunt.loadNpmTasks('grunt-includes'); + grunt.loadNpmTasks('assemble'); grunt.loadNpmTasks('grunt-shell'); grunt.loadNpmTasks('grunt-contrib-watch'); @@ -117,5 +106,5 @@ module.exports = function(grunt) { grunt.registerTask('deploy:downloads', ['shell:makeStage', 'includes:templates', 'shell:zipTemplates', 'shell:zipFramework', 'shell:linkFramework', 'shell:deployDownloads', 'shell:cleanUp']); grunt.registerTask('make:docs', ['shell:makeStage', 'includes:docsDev', 'shell:testDocs']); grunt.registerTask('deploy:docs', ['shell:makeStage', 'includes:docsDeploy', 'shell:deployDocs', 'shell:cleanUp']); - // grunt.registerTask('default', ['shell:makeStage', 'includes:docs', 'shell:deployDocs']); + grunt.registerTask('default', ['shell:makeStage', 'includes', 'shell:deployDocs']); }; \ No newline at end of file diff --git a/docs/examples/basic-block-grid.html b/docs/examples/basic-block-grid.html index c9a4eab0..042648fb 100644 --- a/docs/examples/basic-block-grid.html +++ b/docs/examples/basic-block-grid.html @@ -4,8 +4,9 @@