diff --git a/Gruntfile.js b/Gruntfile.js index 6cb5fdc..7f0cef6 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,45 +7,64 @@ module.exports = function(grunt) { options: { banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n' }, - build: { - src: 'src/js/*.js', - dest: 'dist/js/<%= pkg.name %>.min.js' + game: { + files: { + 'dist/js/<%= pkg.name %>.game.min.js': ['src/game/js/*.js'] + } + }, + generator: { + files: { + 'dist/js/<%= pkg.name %>.generator.min.js': ['src/generator/js/*.js'] + } } }, cssmin: { target: { files: { - 'dist/css/<%= pkg.name %>.css': 'src/css/*.css' + 'dist/css/<%= pkg.name %>.generator.css': 'src/generator/css/*.css', + 'dist/css/<%= pkg.name %>.game.css': 'src/game/css/*.css' } } }, jshint: { - all: ['src/js/*.js'] + all: ['src/game/js/*.js', 'src/generator/js/*.js'] }, copy: { main: { files: [ - {expand: true, cwd: 'src/', src: '*.html', dest: 'dist/', filter: 'isFile'}, - {expand: true, cwd: 'vendor/', src: '*.min.js', dest: 'dist/js/', filter: 'isFile'} - ] + {expand: true, flatten: true, src: ['src/game/*.html', 'src/generator/*.html'], dest: 'dist/', filter: 'isFile'} + ], + options: { + process: function (content, srcpath) { + return content.replace(/(game.css|generator.css)/g, "motsmeles.$1"); + //return content.replace(/(\.\.\/\.\.\/vendor\/fabric\.1\.4\.0\.min\.js)/g,"js/fabric.1.4.0.min.js"); + } + } }, dev: { files: [ - {expand: true, cwd: 'src/', src: '*.html', dest: 'dist/', filter: 'isFile'}, - {expand: true, cwd: 'vendor/', src: '*.min.js', dest: 'dist/js/', filter: 'isFile'}, - {expand: true, cwd: 'src/js/', src: '*.js', dest: 'dist/js/', filter: 'isFile'}, - {expand: true, cwd: 'src/css/', src: '*.js', dest: 'dist/js/', filter: 'isFile'} + {expand: true, flatten: true, src: ['src/game/*.html', 'src/generator/*.html'], dest: 'dist/', filter: 'isFile'}, + {expand: true, cwd: 'src/game/css/', src: '*.css', dest: 'dist/css/', filter: 'isFile'}, + {expand: true, cwd: 'src/generator/css/', src: '*.css', dest: 'dist/css/', filter: 'isFile'}, ] + }, + vendor: { + files: [{expand: true, cwd: 'vendor/', src: '*.min.js', dest: 'dist/js/', filter: 'isFile'}] } }, concat: { - dist: { - src: ['src/js/*.js'], - dest: 'dist/js/<%= pkg.name %>.min.js' + game: { + src: ['src/game/js/*.js'], + dest: 'dist/js/<%= pkg.name %>.game.min.js' + }, + generator: { + src: ['src/generator/js/*.js'], + dest: 'dist/js/<%= pkg.name %>.generator.min.js' } }, clean: { - dist: ['dist/js','dist/css','index.html'] + dist: ['dist'], + force: true } }); @@ -56,7 +75,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-concat'); - grunt.registerTask('default', ['clean:dist', 'jshint', 'uglify', 'cssmin', 'copy:main']); - grunt.registerTask('dev', ['clean:dist', 'jshint', 'concat', 'copy:dev']); + grunt.registerTask('default', ['clean:dist', 'jshint', 'uglify', 'cssmin', 'copy:main', 'copy:vendor']); + grunt.registerTask('dev', ['clean:dist', 'jshint', 'concat', 'copy:dev', 'copy:vendor']); }; \ No newline at end of file diff --git a/dist/css/motsmeles.css b/dist/css/motsmeles.css deleted file mode 100644 index 5dc119c..0000000 --- a/dist/css/motsmeles.css +++ /dev/null @@ -1 +0,0 @@ -body{font-family:Helvetica,Arial,sans-serif;font-size:20px;font-weight:700}h1{width:600px;text-align:center;margin:15px auto;z-index:10;font-weight:700;color:#6C9BD9;font-size:50px}ul{list-style:none;float:left;margin:50px 30px;line-height:20px;font-size:16px}ul li.validate{color:green;font-weight:700;text-decoration:line-through}ul li.validate:before{content:'\2713 ';color:green;font-weight:700}.canvas-container{float:left;margin:50px 30px}#playground{display:block;width:600px;height:600px;margin:0 auto} \ No newline at end of file diff --git a/dist/index.html b/dist/index.html index fe7de75..9aa1f60 100644 --- a/dist/index.html +++ b/dist/index.html @@ -4,14 +4,14 @@