Skip to content

Commit

Permalink
タスク実行が非同期になっていた問題を修正 #20
Browse files Browse the repository at this point in the history
  • Loading branch information
jkazama committed May 19, 2016
1 parent 180cc53 commit dca30e4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ gulp.task('build:webpack', () => {
process.env.NODE_ENV = (production == true) ? 'production' : 'development'
let plugins = [ new webpack.optimize.DedupePlugin() ]
if (production) plugins.push(new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }}))
gulp.src([resource.src.webpack.babel, resource.src.webpack.vue])
return gulp.src([resource.src.webpack.babel, resource.src.webpack.vue])
.pipe($.plumber())
.pipe(webpackStream({
entry: [`${paths.src.js}/main.js`],
Expand All @@ -120,7 +120,7 @@ gulp.task('build:webpack', () => {

// compile Jade -> HTML
gulp.task('build:jade', () => {
gulp.src(resource.src.jade)
return gulp.src(resource.src.jade)
.pipe($.plumber())
.pipe($.jade())
.pipe($.htmlhint())
Expand All @@ -131,7 +131,7 @@ gulp.task('build:jade', () => {

// compile Sass -> CSS
gulp.task('build:sass', () => {
gulp.src(resource.src.sass)
return gulp.src(resource.src.sass)
.pipe($.plumber())
.pipe($.sass())
.pipe($.concat('style.css'))
Expand All @@ -154,7 +154,7 @@ gulp.task('build:static', () => {
.pipe(gulp.dest(paths.dist.js))
gulp.src(resource.vendor.fontawesome)
.pipe(gulp.dest(paths.dist.font))
gulp.src(resource.src.static)
return gulp.src(resource.src.static)
.pipe(gulp.dest(paths.dist.root))
})

Expand All @@ -171,18 +171,18 @@ gulp.task('server', () => {
})

// append Resource Revision
gulp.task('revision:clean', () => {
gulp.task('revision:clean', () =>
del.sync([root.tmp], { force: true })
})
)

gulp.task('revision:append', () => {
let revAll = new RevAll({dontRenameFile: [/^\/favicon.ico$/g, '.html']})
gulp.src(`${paths.dist.root}/**/*`)
return gulp.src(`${paths.dist.root}/**/*`)
.pipe(revAll.revision())
.pipe(gulp.dest(root.tmp))
})

gulp.task('revision:copy', () => {
gulp.src(`${root.tmp}/**/*`)
return gulp.src(`${root.tmp}/**/*`)
.pipe(gulp.dest(paths.dist.root))
})
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sample-ui-vue",
"version": "0.6.3",
"version": "0.6.4",
"description": "Vue.js Boilerplate",
"main": "source/js/main.js",
"scripts": {
Expand Down

0 comments on commit dca30e4

Please sign in to comment.