Revert "Use gulp-terser instead of webpack-terser (#5788)" (#5796)

build-scripts/gulp/app.js

@@ -9,7 +9,6 @@ require("./gen-icons-json.js");
 require("./gather-static.js");
 require("./compress.js");
 require("./webpack.js");
-require("./minify.js");
 require("./service-worker.js");
 require("./entry-html.js");
 
@@ -43,7 +42,7 @@ gulp.task(
     "copy-static",
     "webpack-prod-app",
     ...// Don't compress running tests
-    (envVars.isTest() ? [] : ["minify-app", "compress-app"]),
+    (envVars.isTest() ? [] : ["compress-app"]),
     gulp.parallel(
       "gen-pages-prod",
       "gen-index-app-prod",

build-scripts/gulp/cast.js

@@ -4,7 +4,6 @@ require("./clean.js");
 require("./translations.js");
 require("./gather-static.js");
 require("./webpack.js");
-require("./minify.js");
 require("./service-worker.js");
 require("./entry-html.js");
 
@@ -33,7 +32,6 @@ gulp.task(
     gulp.parallel("gen-icons-json", "build-translations"),
     "copy-static-cast",
     "webpack-prod-cast",
-    "minify-cast",
     "gen-index-cast-prod"
   )
 );

build-scripts/gulp/demo.js

@@ -6,7 +6,6 @@ require("./translations.js");
 require("./gen-icons-json.js");
 require("./gather-static.js");
 require("./webpack.js");
-require("./minify.js");
 require("./service-worker.js");
 require("./entry-html.js");
 
@@ -36,7 +35,6 @@ gulp.task(
     gulp.parallel("gen-icons-json", "build-translations"),
     "copy-static-demo",
     "webpack-prod-demo",
-    "minify-demo",
     "gen-index-demo-prod"
   )
 );

build-scripts/gulp/gallery.js

@@ -6,7 +6,6 @@ require("./translations.js");
 require("./gen-icons-json.js");
 require("./gather-static.js");
 require("./webpack.js");
-require("./minify.js");
 require("./service-worker.js");
 require("./entry-html.js");
 
@@ -36,7 +35,6 @@ gulp.task(
     gulp.parallel("gen-icons-json", "build-translations"),
     "copy-static-gallery",
     "webpack-prod-gallery",
-    "minify-gallery",
     "gen-index-gallery-prod"
   )
 );

build-scripts/gulp/minify.js

@@ -1,47 +0,0 @@
-const path = require("path");
-const gulp = require("gulp");
-const terser = require("gulp-terser");
-const merge = require("merge-stream");
-const paths = require("../paths");
-
-function minifyStream(source, latestBuild) {
-  return gulp
-    .src(path.resolve(source, "**/*.js"))
-    .pipe(
-      terser({
-        output: { comments: false },
-        safari10: true,
-        ecma: latestBuild ? undefined : 5,
-      })
-    )
-    .pipe(gulp.dest(source));
-}
-
-gulp.task("minify-app", function minifyJS() {
-  return merge([
-    minifyStream(paths.output, true),
-    minifyStream(paths.output_es5, false),
-  ]);
-});
-
-gulp.task("minify-demo", function minifyJS() {
-  return merge([
-    minifyStream(paths.demo_output, true),
-    minifyStream(paths.demo_output_es5, false),
-  ]);
-});
-
-gulp.task("minify-cast", function minifyJS() {
-  return merge([
-    minifyStream(paths.cast_output, true),
-    minifyStream(paths.cast_output_es5, false),
-  ]);
-});
-
-gulp.task("minify-hassio", function minifyJS() {
-  return minifyStream(paths.hassio_root, false);
-});
-
-gulp.task("minify-gallery", function minifyJS() {
-  minifyStream(paths.gallery_output, false);
-});

build-scripts/webpack.js

@@ -29,7 +29,7 @@ const createWebpackConfig = ({
   }
   return {
     mode: isProdBuild ? "production" : "development",
-    devtool: isProdBuild ? undefined : "inline-cheap-module-source-map",
+    devtool: isProdBuild ? "source-map" : "inline-cheap-module-source-map",
     entry,
     module: {
       rules: [
@@ -54,18 +54,17 @@ const createWebpackConfig = ({
     },
     optimization: {
       minimizer: [
-        // We minify in gulp. Only minify if we look at stats.
-        isStatsBuild &&
-          new TerserPlugin({
-            cache: true,
-            parallel: true,
-            extractComments: true,
-            terserOptions: {
-              safari10: true,
-              ecma: latestBuild ? undefined : 5,
-            },
-          }),
-      ].filter(Boolean),
+        new TerserPlugin({
+          cache: true,
+          parallel: true,
+          extractComments: true,
+          sourceMap: true,
+          terserOptions: {
+            safari10: true,
+            ecma: latestBuild ? undefined : 5,
+          },
+        }),
+      ],
     },
     plugins: [
       new ManifestPlugin(),