From f185e886c3d7cd53153f6f0aa94cd3796c8c5bc1 Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Thu, 4 May 2023 09:49:41 -0400 Subject: [PATCH] Convert top gulp modules to ESM (#16387) --- build-scripts/gulp/{app.cjs => app.js} | 28 +++++++-------- build-scripts/gulp/{cast.cjs => cast.js} | 19 +++++----- build-scripts/gulp/{demo.cjs => demo.js} | 22 ++++++------ .../gulp/{gallery.cjs => gallery.js} | 35 +++++++++---------- build-scripts/gulp/{hassio.cjs => hassio.js} | 20 +++++------ 5 files changed, 58 insertions(+), 66 deletions(-) rename build-scripts/gulp/{app.cjs => app.js} (69%) rename build-scripts/gulp/{cast.cjs => cast.js} (74%) rename build-scripts/gulp/{demo.cjs => demo.js} (73%) rename build-scripts/gulp/{gallery.cjs => gallery.js} (90%) rename build-scripts/gulp/{hassio.cjs => hassio.js} (75%) diff --git a/build-scripts/gulp/app.cjs b/build-scripts/gulp/app.js similarity index 69% rename from build-scripts/gulp/app.cjs rename to build-scripts/gulp/app.js index 4e77e26326..23e0aab95b 100644 --- a/build-scripts/gulp/app.cjs +++ b/build-scripts/gulp/app.js @@ -1,18 +1,16 @@ -// Run HA develop mode - -const gulp = require("gulp"); -const env = require("../env.cjs"); -require("./clean.cjs"); -require("./translations.cjs"); -require("./locale-data.cjs"); -require("./gen-icons-json.cjs"); -require("./gather-static.cjs"); -require("./compress.cjs"); -require("./webpack.cjs"); -require("./service-worker.cjs"); -require("./entry-html.cjs"); -require("./rollup.cjs"); -require("./wds.cjs"); +import gulp from "gulp"; +import env from "../env.cjs"; +import "./clean.cjs"; +import "./compress.cjs"; +import "./entry-html.cjs"; +import "./gather-static.cjs"; +import "./gen-icons-json.cjs"; +import "./locale-data.cjs"; +import "./rollup.cjs"; +import "./service-worker.cjs"; +import "./translations.cjs"; +import "./wds.cjs"; +import "./webpack.cjs"; gulp.task( "develop-app", diff --git a/build-scripts/gulp/cast.cjs b/build-scripts/gulp/cast.js similarity index 74% rename from build-scripts/gulp/cast.cjs rename to build-scripts/gulp/cast.js index ae1a961139..acf694951d 100644 --- a/build-scripts/gulp/cast.cjs +++ b/build-scripts/gulp/cast.js @@ -1,13 +1,12 @@ -const gulp = require("gulp"); -const env = require("../env.cjs"); - -require("./clean.cjs"); -require("./translations.cjs"); -require("./gather-static.cjs"); -require("./webpack.cjs"); -require("./service-worker.cjs"); -require("./entry-html.cjs"); -require("./rollup.cjs"); +import gulp from "gulp"; +import env from "../env.cjs"; +import "./clean.cjs"; +import "./entry-html.cjs"; +import "./gather-static.cjs"; +import "./rollup.cjs"; +import "./service-worker.cjs"; +import "./translations.cjs"; +import "./webpack.cjs"; gulp.task( "develop-cast", diff --git a/build-scripts/gulp/demo.cjs b/build-scripts/gulp/demo.js similarity index 73% rename from build-scripts/gulp/demo.cjs rename to build-scripts/gulp/demo.js index 657dd35634..6731e27104 100644 --- a/build-scripts/gulp/demo.cjs +++ b/build-scripts/gulp/demo.js @@ -1,15 +1,13 @@ -// Run demo develop mode -const gulp = require("gulp"); -const env = require("../env.cjs"); - -require("./clean.cjs"); -require("./translations.cjs"); -require("./gen-icons-json.cjs"); -require("./gather-static.cjs"); -require("./webpack.cjs"); -require("./service-worker.cjs"); -require("./entry-html.cjs"); -require("./rollup.cjs"); +import gulp from "gulp"; +import env from "../env.cjs"; +import "./clean.cjs"; +import "./entry-html.cjs"; +import "./gather-static.cjs"; +import "./gen-icons-json.cjs"; +import "./rollup.cjs"; +import "./service-worker.cjs"; +import "./translations.cjs"; +import "./webpack.cjs"; gulp.task( "develop-demo", diff --git a/build-scripts/gulp/gallery.cjs b/build-scripts/gulp/gallery.js similarity index 90% rename from build-scripts/gulp/gallery.cjs rename to build-scripts/gulp/gallery.js index 3670eb18e3..9afb6ba217 100644 --- a/build-scripts/gulp/gallery.cjs +++ b/build-scripts/gulp/gallery.js @@ -1,22 +1,19 @@ -// Run demo develop mode -const gulp = require("gulp"); -const fs = require("fs"); -const path = require("path"); -const { marked } = require("marked"); -const { glob } = require("glob"); -const yaml = require("js-yaml"); - -const env = require("../env.cjs"); -const paths = require("../paths.cjs"); - -require("./clean.cjs"); -require("./translations.cjs"); -require("./gen-icons-json.cjs"); -require("./gather-static.cjs"); -require("./webpack.cjs"); -require("./service-worker.cjs"); -require("./entry-html.cjs"); -require("./rollup.cjs"); +import fs from "fs"; +import { glob } from "glob"; +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.cjs"; +import "./entry-html.cjs"; +import "./gather-static.cjs"; +import "./gen-icons-json.cjs"; +import "./rollup.cjs"; +import "./service-worker.cjs"; +import "./translations.cjs"; +import "./webpack.cjs"; gulp.task("gather-gallery-pages", async function gatherPages() { const pageDir = path.resolve(paths.gallery_dir, "src/pages"); diff --git a/build-scripts/gulp/hassio.cjs b/build-scripts/gulp/hassio.js similarity index 75% rename from build-scripts/gulp/hassio.cjs rename to build-scripts/gulp/hassio.js index a958cb0365..430fc24831 100644 --- a/build-scripts/gulp/hassio.cjs +++ b/build-scripts/gulp/hassio.js @@ -1,13 +1,13 @@ -const gulp = require("gulp"); -const env = require("../env.cjs"); -require("./clean.cjs"); -require("./compress.cjs"); -require("./entry-html.cjs"); -require("./gather-static.cjs"); -require("./gen-icons-json.cjs"); -require("./rollup.cjs"); -require("./translations.cjs"); -require("./webpack.cjs"); +import gulp from "gulp"; +import env from "../env.cjs"; +import "./clean.cjs"; +import "./compress.cjs"; +import "./entry-html.cjs"; +import "./gather-static.cjs"; +import "./gen-icons-json.cjs"; +import "./rollup.cjs"; +import "./translations.cjs"; +import "./webpack.cjs"; gulp.task( "develop-hassio",