Commit 72678f6769327d521ab2cd561ed68dd40c3ecc94
Merge branch 'kira' into develop
Showing
4 changed files
with
14 additions
and
2 deletions
gulp/config.js
| @@ -35,7 +35,9 @@ module.exports = { | @@ -35,7 +35,9 @@ module.exports = { | ||
| 35 | js: { | 35 | js: { |
| 36 | all: src + "/js/**/*.js", | 36 | all: src + "/js/**/*.js", |
| 37 | src: src + "/js/*.js", | 37 | src: src + "/js/*.js", |
| 38 | - dest: dest + "/js" | 38 | + copy: src + "/js/**/*", |
| 39 | + dest: dest + "/js", | ||
| 40 | + | ||
| 39 | }, | 41 | }, |
| 40 | img: { | 42 | img: { |
| 41 | src: src + "/img/**/*", | 43 | src: src + "/img/**/*", |
gulp/tasks/deploy.js
| 1 | var gulp = require('gulp'); | 1 | var gulp = require('gulp'); |
| 2 | 2 | ||
| 3 | -gulp.task('deploy', ['srcSass', 'html', 'css', 'img', 'uglifyJS']) | ||
| 4 | \ No newline at end of file | 3 | \ No newline at end of file |
| 4 | +gulp.task('deploy', ['srcSass', 'html', 'css', 'img', 'uglifyJS', 'copy']) | ||
| 5 | \ No newline at end of file | 5 | \ No newline at end of file |
gulp/tasks/uglify.js
| @@ -12,3 +12,10 @@ gulp.task('uglifyJS', function(cb) { | @@ -12,3 +12,10 @@ gulp.task('uglifyJS', function(cb) { | ||
| 12 | cb | 12 | cb |
| 13 | ); | 13 | ); |
| 14 | }); | 14 | }); |
| 15 | + | ||
| 16 | + | ||
| 17 | +gulp.task('copy', function(){ | ||
| 18 | + return gulp.src([config.copy, '!**/*.js']) | ||
| 19 | + .pipe(gulp.dest(config.dest)) | ||
| 20 | +}) | ||
| 21 | + |