diff --git a/app/templates/.src/templates/layouts/default.hbs b/app/templates/.src/templates/layouts/default.hbs
index d152de7..7ce6df1 100644
--- a/app/templates/.src/templates/layouts/default.hbs
+++ b/app/templates/.src/templates/layouts/default.hbs
@@ -9,19 +9,19 @@
-
+
{{> facebook}}
-
-
- <% if (includeBootstrap && !includeSass) { %><% } %>
-
+
+
+ <% if (includeBootstrap && !includeSass) { %><% } %>
+
-
+
@@ -34,26 +34,26 @@
{{> footer }}
-
+
-
+
<% if (includeBootstrap) { %>
-
+
<% bsPlugins.forEach(function (plugin) { -%>
<% }) -%>
<% } %>
-
-
+
+
-
+
diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
index fc614d5..5278c09 100644
--- a/app/templates/Gruntfile.js
+++ b/app/templates/Gruntfile.js
@@ -126,8 +126,7 @@ module.exports = function(grunt) {
'<%%= config.test %>/spec/{,*/}*.js'
],
options: {
- config: '.jscsrc',
- verbose: true
+ config: '.jscsrc'
}
},
@@ -248,10 +247,11 @@ module.exports = function(grunt) {
// concat, minify and revision files. Creates configurations in memory so
// additional tasks can operate on them
useminPrepare: {
+ html: '<%%= config.app %>/index.html',
options: {
+ root: '<%%= config.app %>',
dest: '<%%= config.dist %>'
- },
- html: '<%%= config.app %>/index.html'
+ }
},
// Performs rewrites based on rev and the useminPrepare configuration
@@ -260,10 +260,11 @@ module.exports = function(grunt) {
assetsDirs: [
'<%%= config.dist %>',
'<%%= config.dist %>/images',
- '<%%= config.dist %>/styles'
+ '<%%= config.dist %>/styles',
+ '<%%= config.dist %>/scripts'
]
},
- html: ['<%%= config.dist %>/{,*/}*.html'],
+ html: ['<%%= config.dist %>/{,**/}*.html'],
css: ['<%%= config.dist %>/styles/{,*/}*.css']
},
@@ -312,32 +313,6 @@ module.exports = function(grunt) {
}
},
- // By default, your `index.html`'s will take care
- // of minification. These next options are pre-configured if you do not
- // wish to use the Usemin blocks.
- // cssmin: {
- // dist: {
- // files: {
- // '<%%= config.dist %>/styles/main.css': [
- // '.tmp/styles/{,*/}*.css',
- // '<%%= config.app %>/styles/{,*/}*.css'
- // ]
- // }
- // }
- // },
- // uglify: {
- // dist: {
- // files: {
- // '<%%= config.dist %>/scripts/scripts.js': [
- // '<%%= config.dist %>/scripts/scripts.js'
- // ]
- // }
- // }
- // },
- // concat: {
- // dist: {}
- // },
-
// Copies remaining files to places other tasks can use
copy: {
dist: {
@@ -402,7 +377,7 @@ module.exports = function(grunt) {
flatten: true,
layoutext: '.hbs',
// FIXME: assets path malfunction https://github.com/assemble/grunt-assemble/issues/44
- // assets: '<%%= config.app %>',
+ assets: '<%%= config.app %>/<%%= config.app %>',
layoutdir: '<%%= config.src %>/templates/layouts',
partials: ['<%%= config.src %>/templates/partials/*.hbs'],
data: ['<%%= config.src %>/data/{i18n/,}*.yml'],
@@ -423,7 +398,7 @@ module.exports = function(grunt) {
}
},
src: '!*.*',
- dest: '<%%= config.app %>/'
+ dest: './<%%= config.app %>/'
},
pages: {
options: {
@@ -440,7 +415,7 @@ module.exports = function(grunt) {
}
},
src: '<%%= config.src %>/pages/{,*/}*.hbs',
- dest: '<%%= config.app %>/'
+ dest: './<%%= config.app %>/'
}
},
@@ -477,17 +452,6 @@ module.exports = function(grunt) {
]
},
- browserSync: {
- dev: {
- bsFiles: {
- src: '.tmp/styles/main.css',
- },
- options: {
- watchTask: true
- }
- }
- },
-
browserSync: {
dev: {
bsFiles: {
@@ -516,7 +480,7 @@ module.exports = function(grunt) {
}
});
- grunt.registerTask('serve', 'Start server. Use --allow-remote for remote access', function(target) {
+ grunt.registerTask('serve', 'Start server. Use --allow-remote for remote access', function() {
grunt.task.run([
'clean:server',
'concurrent:server',
@@ -559,11 +523,11 @@ module.exports = function(grunt) {
'useminPrepare',
'concurrent:dist',
'autoprefixer',
- 'concat',
- 'cssmin',
- 'uglify',
'copy:dist',<% if (includeModernizr) { %>
'modernizr',<% } %>
+ 'concat:generated',
+ 'cssmin:generated',
+ 'uglify:generated',
'rev',
'usemin',
'htmlmin'
diff --git a/app/templates/package.json b/app/templates/package.json
index 8c0e44d..9f3ad11 100644
--- a/app/templates/package.json
+++ b/app/templates/package.json
@@ -32,8 +32,8 @@
"grunt-pngcheck": "^0.1.0",
"grunt-browser-sync": "^2.2.0",
"jit-grunt": "^0.10.0",<% if (includeAssemble) { %>
- "grunt-assemble": "assemble/grunt-assemble#3148d66",
- "grunt-assemble-permalinks": "^0.1.0",
+ "grunt-assemble": "^0.6.3",
+ "grunt-assemble-permalinks": "^0.1.1",
"grunt-assemble-i18n": "^0.1.1",
"handlebars-helper-rawinclude": "^1.0.0",
"handlebars-helper-i18n": "interactive-pioneers/handlebars-helper-i18n#128910a",<% } %>