fix conflicts

1 files changed, 10 insertions, 1 deletions

diff --git a/gulpfile.js b/gulpfile.js
index 920e9f8ae..f26fff995 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -233,11 +233,12 @@ function createScssBuildTask ({ src, dest, devMode, pattern }) {
         await endOfStream(stream)
         livereload.changed(event.path)
       })
+      return buildScssWithSourceMaps()
     }
     return buildScss()
   }
 
-  function buildScss () {
+  function buildScssWithSourceMaps () {
     return gulp.src(src)
       .pipe(sourcemaps.init())
       .pipe(sass().on('error', sass.logError))
@@ -245,6 +246,13 @@ function createScssBuildTask ({ src, dest, devMode, pattern }) {
       .pipe(autoprefixer())
       .pipe(gulp.dest(dest))
   }
+
+  function buildScss () {
+    return gulp.src(src)
+      .pipe(sass().on('error', sass.logError))
+      .pipe(autoprefixer())
+      .pipe(gulp.dest(dest))
+  }
 }
 
 gulp.task('lint-scss', function () {
@@ -271,6 +279,7 @@ const buildJsFiles = [
   'contentscript',
   'background',
   'ui',
+  'phishing-detect',
 ]
 
 // bundle tasks