1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00

build - fix scss + js reload

This commit is contained in:
kumavis 2018-03-29 22:19:15 -07:00
parent b2d0e9871c
commit 7b9b890aa9

View File

@ -28,7 +28,8 @@ const stylefmt = require('gulp-stylefmt')
const uglify = require('gulp-uglify-es').default const uglify = require('gulp-uglify-es').default
const babel = require('gulp-babel') const babel = require('gulp-babel')
const debug = require('gulp-debug') const debug = require('gulp-debug')
const pify = require('pify')
const endOfStream = pify(require('end-of-stream'))
const disableDebugTools = gutil.env.disableDebugTools const disableDebugTools = gutil.env.disableDebugTools
const debugMode = gutil.env.debug const debugMode = gutil.env.debug
@ -260,7 +261,11 @@ gulp.task('dev:scss', createScssBuildTask({
function createScssBuildTask({ src, dest, devMode, pattern }) { function createScssBuildTask({ src, dest, devMode, pattern }) {
return function () { return function () {
if (devMode) { if (devMode) {
watch(pattern, buildScss) watch(pattern, async (event) => {
const stream = buildScss()
await endOfStream(stream)
livereload.changed(event.path)
})
} }
return buildScss() return buildScss()
} }
@ -454,7 +459,11 @@ function generateBundler(opts, performBundle) {
if (opts.watch) { if (opts.watch) {
bundler = watchify(bundler) bundler = watchify(bundler)
// on any file update, re-runs the bundler // on any file update, re-runs the bundler
bundler.on('update', performBundle) bundler.on('update', async (ids) => {
const stream = performBundle()
await endOfStream(stream)
livereload.changed(`${ids}`)
})
} }
return bundler return bundler
@ -494,7 +503,6 @@ function bundleTask(opts) {
return performBundle return performBundle
function performBundle(){ function performBundle(){
let buildStream = bundler.bundle() let buildStream = bundler.bundle()
// handle errors // handle errors
@ -545,10 +553,6 @@ function bundleTask(opts) {
buildStream = buildStream.pipe(gulp.dest(dest)) buildStream = buildStream.pipe(gulp.dest(dest))
}) })
// finally, trigger live reload
buildStream = buildStream
.pipe(gulpif(debugMode, livereload()))
return buildStream return buildStream
} }