Merge branch 'dev' into zwave_custom_param

build-scripts/README.md

@@ -15,7 +15,7 @@ The Home Assistant build pipeline contains various steps to prepare a build.
 
 Currently in Home Assistant we use a bundler to convert TypeScript, CSS and JSON files to JavaScript files that the browser understands.
 
-We currently rely on Webpack but also have experimental Rollup support. Both of these programs bundle the converted files in both production and development.
+We currently rely on Webpack. Both of these programs bundle the converted files in both production and development.
 
 For development, bundling is optional. We just want to get the right files in the browser.
 

build-scripts/bundle.cjs

@@ -226,13 +226,12 @@ module.exports.config = {
     return {
       name: "frontend" + nameSuffix(latestBuild),
       entry: {
-        "service-worker":
-          !env.useRollup() && !latestBuild
-            ? {
-                import: "./src/entrypoints/service-worker.ts",
-                layer: "sw",
-              }
-            : "./src/entrypoints/service-worker.ts",
+        "service-worker": !latestBuild
+          ? {
+              import: "./src/entrypoints/service-worker.ts",
+              layer: "sw",
+            }
+          : "./src/entrypoints/service-worker.ts",
         app: "./src/entrypoints/app.ts",
         authorize: "./src/entrypoints/authorize.ts",
         onboarding: "./src/entrypoints/onboarding.ts",

build-scripts/env.cjs

@@ -3,9 +3,6 @@ const path = require("path");
 const paths = require("./paths.cjs");
 
 module.exports = {
-  useRollup() {
-    return process.env.ROLLUP === "1";
-  },
   useWDS() {
     return process.env.WDS === "1";
   },

build-scripts/gulp/app.js

@@ -6,7 +6,6 @@ import "./entry-html.js";
 import "./gather-static.js";
 import "./gen-icons-json.js";
 import "./locale-data.js";
-import "./rollup.js";
 import "./service-worker.js";
 import "./translations.js";
 import "./wds.js";
@@ -27,11 +26,7 @@ gulp.task(
       "build-locale-data"
     ),
     "copy-static-app",
-    env.useWDS()
-      ? "wds-watch-app"
-      : env.useRollup()
-        ? "rollup-watch-app"
-        : "webpack-watch-app"
+    env.useWDS() ? "wds-watch-app" : "webpack-watch-app"
   )
 );
 
@@ -44,7 +39,7 @@ gulp.task(
     "clean",
     gulp.parallel("gen-icons-json", "build-translations", "build-locale-data"),
     "copy-static-app",
-    env.useRollup() ? "rollup-prod-app" : "webpack-prod-app",
+    "webpack-prod-app",
     gulp.parallel("gen-pages-app-prod", "gen-service-worker-app-prod"),
     // Don't compress running tests
     ...(env.isTestBuild() ? [] : ["compress-app"])

build-scripts/gulp/cast.js

@@ -1,9 +1,7 @@
 import gulp from "gulp";
-import env from "../env.cjs";
 import "./clean.js";
 import "./entry-html.js";
 import "./gather-static.js";
-import "./rollup.js";
 import "./service-worker.js";
 import "./translations.js";
 import "./webpack.js";
@@ -19,7 +17,7 @@ gulp.task(
     gulp.parallel("gen-icons-json", "build-translations", "build-locale-data"),
     "copy-static-cast",
     "gen-pages-cast-dev",
-    env.useRollup() ? "rollup-dev-server-cast" : "webpack-dev-server-cast"
+    "webpack-dev-server-cast"
   )
 );
 
@@ -33,7 +31,7 @@ gulp.task(
     "translations-enable-merge-backend",
     gulp.parallel("gen-icons-json", "build-translations", "build-locale-data"),
     "copy-static-cast",
-    env.useRollup() ? "rollup-prod-cast" : "webpack-prod-cast",
+    "webpack-prod-cast",
     "gen-pages-cast-prod"
   )
 );

build-scripts/gulp/demo.js

@@ -1,10 +1,8 @@
 import gulp from "gulp";
-import env from "../env.cjs";
 import "./clean.js";
 import "./entry-html.js";
 import "./gather-static.js";
 import "./gen-icons-json.js";
-import "./rollup.js";
 import "./service-worker.js";
 import "./translations.js";
 import "./webpack.js";
@@ -24,7 +22,7 @@ gulp.task(
       "build-locale-data"
     ),
     "copy-static-demo",
-    env.useRollup() ? "rollup-dev-server-demo" : "webpack-dev-server-demo"
+    "webpack-dev-server-demo"
   )
 );
 
@@ -39,7 +37,7 @@ gulp.task(
     "translations-enable-merge-backend",
     gulp.parallel("gen-icons-json", "build-translations", "build-locale-data"),
     "copy-static-demo",
-    env.useRollup() ? "rollup-prod-demo" : "webpack-prod-demo",
+    "webpack-prod-demo",
     "gen-pages-demo-prod"
   )
 );

build-scripts/gulp/entry-html.js

@@ -56,7 +56,6 @@ const getCommonTemplateVars = () => {
     { ignorePatch: true, allowHigherVersions: true }
   );
   return {
-    useRollup: env.useRollup(),
     useWDS: env.useWDS(),
     modernRegex: compileRegex(browserRegexes.concat(haMacOSRegex)).toString(),
   };

build-scripts/gulp/gallery.js

@@ -4,13 +4,11 @@ import gulp from "gulp";
 import yaml from "js-yaml";
 import { marked } from "marked";
 import path from "path";
-import env from "../env.cjs";
 import paths from "../paths.cjs";
 import "./clean.js";
 import "./entry-html.js";
 import "./gather-static.js";
 import "./gen-icons-json.js";
-import "./rollup.js";
 import "./service-worker.js";
 import "./translations.js";
 import "./webpack.js";
@@ -158,9 +156,7 @@ gulp.task(
     "copy-static-gallery",
     "gen-pages-gallery-dev",
     gulp.parallel(
-      env.useRollup()
-        ? "rollup-dev-server-gallery"
-        : "webpack-dev-server-gallery",
+      "webpack-dev-server-gallery",
       async function watchMarkdownFiles() {
         gulp.watch(
           [
@@ -189,7 +185,7 @@ gulp.task(
       "gather-gallery-pages"
     ),
     "copy-static-gallery",
-    env.useRollup() ? "rollup-prod-gallery" : "webpack-prod-gallery",
+    "webpack-prod-gallery",
     "gen-pages-gallery-prod"
   )
 );

build-scripts/gulp/gather-static.js

@@ -4,7 +4,6 @@ import fs from "fs-extra";
 import gulp from "gulp";
 import path from "path";
 import paths from "../paths.cjs";
-import env from "../env.cjs";
 
 const npmPath = (...parts) =>
   path.resolve(paths.polymer_dir, "node_modules", ...parts);
@@ -69,9 +68,6 @@ function copyPolyfills(staticDir) {
 }
 
 function copyLoaderJS(staticDir) {
-  if (!env.useRollup()) {
-    return;
-  }
   const staticPath = genStaticPath(staticDir);
   copyFileDir(npmPath("systemjs/dist/s.min.js"), staticPath("js"));
   copyFileDir(npmPath("systemjs/dist/s.min.js.map"), staticPath("js"));

build-scripts/gulp/hassio.js

@@ -5,7 +5,6 @@ import "./compress.js";
 import "./entry-html.js";
 import "./gather-static.js";
 import "./gen-icons-json.js";
-import "./rollup.js";
 import "./translations.js";
 import "./webpack.js";
 
@@ -22,7 +21,7 @@ gulp.task(
     "copy-translations-supervisor",
     "build-locale-data",
     "copy-static-supervisor",
-    env.useRollup() ? "rollup-watch-hassio" : "webpack-watch-hassio"
+    "webpack-watch-hassio"
   )
 );
 
@@ -38,7 +37,7 @@ gulp.task(
     "copy-translations-supervisor",
     "build-locale-data",
     "copy-static-supervisor",
-    env.useRollup() ? "rollup-prod-hassio" : "webpack-prod-hassio",
+    "webpack-prod-hassio",
     "gen-pages-hassio-prod",
     ...// Don't compress running tests
     (env.isTestBuild() ? [] : ["compress-hassio"])