--- a/client/gruntfile.js Fri Jun 12 14:42:27 2015 +0200
+++ b/client/gruntfile.js Fri Jun 12 14:49:25 2015 +0200
@@ -39,21 +39,23 @@
requtils: "require-utils",
jquery: "empty:",
underscore: "empty:",
- filesaver: "empty:"
+ filesaver: "empty:",
+ 'ckeditor-core': "empty:",
+ 'ckeditor-jquery': "empty:"
}
}
}
},
jst: {
- compile: {
- options: {
- namespace: 'renkanJST',
- //amd: true
- },
- files: {
- "dist/js/templates.js": ["templates/**/*.html"]
- }
- }
+ compile: {
+ options: {
+ namespace: 'renkanJST',
+ //amd: true
+ },
+ files: {
+ "dist/js/templates.js": ["templates/**/*.html"]
+ }
+ }
},
uglify: {
options: {
@@ -85,6 +87,7 @@
jst:["dist/js/templates.js"],
renkan: ["dist/"],
lib: ["lib/"],
+ bower: ["bower_components/"]
},
cssmin: {
options: {
@@ -99,6 +102,9 @@
}
},
copy: {
+ vendors: {
+ files: [{expand: true, cwd: 'vendors/', src: ['**'], dest: 'lib/'}],
+ },
renkan: {
files: [
{expand: true, cwd: '', src: ['img/*'], dest: 'dist/', filter: 'isFile'},
@@ -142,28 +148,32 @@
layout: 'byComponent',
install: true,
verbose: false,
- cleanTargetDir: false,
+ cleanTargetDir: true,
cleanBowerDir: false,
bowerOptions: {}
}
}
},
watch: {
- css:{
- files: ['css/**/*.css'],
- tasks: ['cssmin', 'copy:renkan_css'],
- },
- js:{
- files: ['js/**/*.js', 'templates/**/*.html'],
- tasks: ['jshint', 'requirejs', 'jst', 'concat', 'uglify', 'copy:renkan', 'clean:renderer'],
- },
- lib:{
- files: ['bower.json'],
- tasks: ['bower:install', 'copy:renkan'],
- },
- options: {
- interrupt: true,
- },
+ css:{
+ files: ['css/**/*.css'],
+ tasks: ['cssmin', 'copy:renkan_css'],
+ },
+ js:{
+ files: ['js/**/*.js', 'templates/**/*.html'],
+ tasks: ['jshint', 'requirejs', 'jst', 'concat', 'uglify', 'copy:renkan', 'clean:renderer'],
+ },
+ lib:{
+ files: ['bower.json'],
+ tasks: ['bower:install', 'copy:vendors', 'copy:renkan'],
+ },
+ vendors: {
+ files: ['vendors/**'],
+ tasks: ['copy:vendors', 'copy:renkan'],
+ },
+ options: {
+ interrupt: true,
+ },
},
connect: {
server: {
@@ -195,11 +205,11 @@
grunt.loadNpmTasks('grunt-contrib-watch');
// Default task(s).
- grunt.registerTask('default', ['jshint', 'requirejs', 'jst', 'concat', 'uglify', 'cssmin', 'bower:install', 'copy:renkan', 'copy:renkan_css', 'clean:renderer', 'clean:jst']);
+ grunt.registerTask('default', ['jshint', 'bower:install', 'copy:vendors', 'requirejs', 'jst', 'concat', 'uglify', 'cssmin', 'copy:renkan', 'copy:renkan_css', 'clean:renderer', 'clean:jst']);
grunt.registerTask('copy-server', 'copy files to server part', function(){
grunt.task.run(['copy:renkan_server']);
});
- grunt.registerTask('dev', [ 'jshint', 'requirejs', 'jst', 'concat', 'uglify', 'cssmin', 'bower:install', 'copy:renkan', 'copy:renkan_css', 'clean:renderer', 'connect:server', 'watch']);
+ grunt.registerTask('dev', [ 'jshint', 'bower:install', 'copy:vendors', 'requirejs', 'jst', 'concat', 'uglify', 'cssmin', 'copy:renkan', 'copy:renkan_css', 'clean:renderer', 'connect:server', 'watch']);
};