6bf90cf7 by Adam Heath

Allow usemin to scan html files in scripts/view.

1 parent 98e725cf
...@@ -350,7 +350,10 @@ module.exports = function (grunt) { ...@@ -350,7 +350,10 @@ module.exports = function (grunt) {
350 options: { 350 options: {
351 staging: '.grunt/usemin', 351 staging: '.grunt/usemin',
352 }, 352 },
353 src: htmlSourceDir + '/!(scripts){,**/}*.html', 353 src: [
354 htmlSourceDir + '/!(scripts){,**/}*.html',
355 htmlSourceDir + '/scripts/view/**/*.html',
356 ],
354 }, 357 },
355 }; 358 };
356 initConfig.usemin = { 359 initConfig.usemin = {
...@@ -362,7 +365,10 @@ module.exports = function (grunt) { ...@@ -362,7 +365,10 @@ module.exports = function (grunt) {
362 dirs: ['dist/build'], 365 dirs: ['dist/build'],
363 assetsDirs: ['dist/build'], 366 assetsDirs: ['dist/build'],
364 }, 367 },
365 src: ['dist/build/!(scripts){,**/}*.html'], 368 src: [
369 'dist/build/!(scripts){,**/}*.html',
370 'dist/build/scripts/view/**/*.html',
371 ],
366 }, 372 },
367 }; 373 };
368 initConfig.clean.montyPython.files[0].src.push('.grunt/usemin'); 374 initConfig.clean.montyPython.files[0].src.push('.grunt/usemin');
...@@ -526,6 +532,7 @@ module.exports = function (grunt) { ...@@ -526,6 +532,7 @@ module.exports = function (grunt) {
526 optimize: 'none', 532 optimize: 'none',
527 removeCombined: true, 533 removeCombined: true,
528 skipDirOptimize: true, 534 skipDirOptimize: true,
535 inlineText: false,
529 //generateSourceMaps: true, 536 //generateSourceMaps: true,
530 537
531 dir: 'dist/build/scripts', 538 dir: 'dist/build/scripts',
......