add outer files in config module of merged request old

pull/1082/head
Arno Roldao Junior 2016-06-28 21:10:35 -03:00
parent b97973d8c5
commit 70c5d7341d
4 changed files with 21 additions and 15 deletions

View File

@ -2,10 +2,11 @@
'use strict'; 'use strict';
module.exports = function (grunt) { module.exports = function (grunt) {
return { return {
options: { options: {
relaxerror: ['W005'] relaxerror: ['W005']
}, },
files: ['pages/**/*.html', '*.html'] // files: ['pages/**/*.html', '*.html']
files: ['starter.html']
}; };
}; };

View File

@ -9,7 +9,7 @@ module.exports = function (grunt) {
style: 'expanded' style: 'expanded'
}, },
files: { files: {
'dist/tmp/AdminLTE.css': 'build/scss/AdminLTE.scss' 'dist/css/AdminLTE.css': 'build/scss/AdminLTE.scss'
} }
}, },
production: { production: {
@ -17,7 +17,7 @@ module.exports = function (grunt) {
style: 'compressed' style: 'compressed'
}, },
files: { files: {
'dist/tmp/AdminLTE.min.css': 'build/scss/AdminLTE.scss' 'dist/css/adminlte.min.css': 'build/scss/AdminLTE.scss'
} }
} }
}; };

View File

@ -7,8 +7,9 @@ module.exports = function (grunt) {
mangle: true, mangle: true,
preserveComments: 'some' preserveComments: 'some'
}, },
my_target: { target: {
files: { files: {
'dist/js/adminlte.min.js': ['dist/js/adminlte.js'],
'dist/js/app.min.js': ['dist/js/app.js'] 'dist/js/app.min.js': ['dist/js/app.js']
} }
} }

View File

@ -1,15 +1,19 @@
// Watch File Changes // Watch files for changes and invoke appropriate compiler
'use strict'; 'use strict';
module.exports = function (grunt) { module.exports = function (grunt) {
return { return {
// If any .less file changes in directory "build/less/" run the "less"-task. sass: {
// files: ["build/less/*.less", "build/less/skins/*.less", "dist/js/app.js"], files: ['build/scss/*.scss', 'build/scss/skins/*.scss'],
files: [ tasks: ['sass']
"build/scss/*.scss", },
"build/scss/skins/*.scss", es6: {
"dist/js/app.js" files: ['build/js/src/*.js'],
], tasks: ['concat', 'babel', 'uglify']
tasks: ["sass", "uglify"] },
}; js: {
files: ['dist/js/adminlte.js', 'dist/js/app.js'],
tasks: ['uglify']
}
};
}; };