diff --git a/build-scripts/env.cjs b/build-scripts/env.cjs index 2735a85a8b..b4e39607c2 100644 --- a/build-scripts/env.cjs +++ b/build-scripts/env.cjs @@ -5,9 +5,6 @@ const paths = require("./paths.cjs"); const isTrue = (value) => value === "1" || value?.toLowerCase() === "true"; module.exports = { - useWDS() { - return isTrue(process.env.WDS); - }, isProdBuild() { return ( process.env.NODE_ENV === "production" || module.exports.isStatsBuild() diff --git a/build-scripts/gulp/app.js b/build-scripts/gulp/app.js index ae39690665..4b8a36667d 100644 --- a/build-scripts/gulp/app.js +++ b/build-scripts/gulp/app.js @@ -8,7 +8,6 @@ import "./gen-icons-json.js"; import "./locale-data.js"; import "./service-worker.js"; import "./translations.js"; -import "./wds.js"; import "./rspack.js"; gulp.task( @@ -26,7 +25,7 @@ gulp.task( "build-locale-data" ), "copy-static-app", - env.useWDS() ? "wds-watch-app" : "rspack-watch-app" + "rspack-watch-app" ) ); diff --git a/build-scripts/gulp/entry-html.js b/build-scripts/gulp/entry-html.js index ec7da3c1c0..016aab28c2 100644 --- a/build-scripts/gulp/entry-html.js +++ b/build-scripts/gulp/entry-html.js @@ -11,7 +11,6 @@ import { minify } from "html-minifier-terser"; import template from "lodash.template"; import { dirname, extname, resolve } from "node:path"; import { htmlMinifierOptions, terserOptions } from "../bundle.cjs"; -import env from "../env.cjs"; import paths from "../paths.cjs"; // macOS companion app has no way to obtain the Safari version used by WKWebView, @@ -56,7 +55,6 @@ const getCommonTemplateVars = () => { { ignorePatch: true, allowHigherVersions: true } ); return { - useWDS: env.useWDS(), modernRegex: compileRegex(browserRegexes.concat(haMacOSRegex)).toString(), }; }; @@ -92,13 +90,11 @@ const minifyHtml = (content, ext) => { }; // Function to generate a dev task for each project's configuration -// Note Currently WDS paths are hard-coded to only work for app const genPagesDevTask = ( pageEntries, inputRoot, outputRoot, - useWDS = false, inputSub = "src/html", publicRoot = "" ) => @@ -109,17 +105,13 @@ const genPagesDevTask = resolve(inputRoot, inputSub, `${page}.template`), { ...commonVars, - latestEntryJS: entries.map((entry) => - useWDS - ? `http://localhost:8000/src/entrypoints/${entry}.ts` - : `${publicRoot}/frontend_latest/${entry}.js` + latestEntryJS: entries.map( + (entry) => `${publicRoot}/frontend_latest/${entry}.js` ), es5EntryJS: entries.map( (entry) => `${publicRoot}/frontend_es5/${entry}.js` ), - latestCustomPanelJS: useWDS - ? "http://localhost:8000/src/entrypoints/custom-panel.ts" - : `${publicRoot}/frontend_latest/custom-panel.js`, + latestCustomPanelJS: `${publicRoot}/frontend_latest/custom-panel.js`, es5CustomPanelJS: `${publicRoot}/frontend_es5/custom-panel.js`, } ); @@ -176,12 +168,7 @@ const APP_PAGE_ENTRIES = { gulp.task( "gen-pages-app-dev", - genPagesDevTask( - APP_PAGE_ENTRIES, - paths.polymer_dir, - paths.app_output_root, - env.useWDS() - ) + genPagesDevTask(APP_PAGE_ENTRIES, paths.polymer_dir, paths.app_output_root) ); gulp.task( @@ -287,7 +274,6 @@ gulp.task( HASSIO_PAGE_ENTRIES, paths.hassio_dir, paths.hassio_output_root, - undefined, "src", paths.hassio_publicPath ) diff --git a/build-scripts/gulp/wds.js b/build-scripts/gulp/wds.js deleted file mode 100644 index d6ebcb93af..0000000000 --- a/build-scripts/gulp/wds.js +++ /dev/null @@ -1,10 +0,0 @@ -import gulp from "gulp"; -import { startDevServer } from "@web/dev-server"; - -gulp.task("wds-watch-app", async () => { - startDevServer({ - config: { - watch: true, - }, - }); -}); diff --git a/package.json b/package.json index 88911355e6..131c95114d 100644 --- a/package.json +++ b/package.json @@ -162,12 +162,10 @@ "@babel/preset-env": "7.26.0", "@babel/preset-typescript": "7.26.0", "@bundle-stats/plugin-webpack-filter": "4.17.0", - "@koa/cors": "5.0.0", "@lokalise/node-api": "12.8.0", "@octokit/auth-oauth-device": "7.1.1", "@octokit/plugin-retry": "7.1.2", "@octokit/rest": "21.0.2", - "@open-wc/dev-server-hmr": "0.1.4", "@rsdoctor/rspack-plugin": "0.4.10", "@rspack/cli": "1.1.4", "@rspack/core": "1.1.4", @@ -233,7 +231,6 @@ "systemjs": "6.15.1", "tar": "7.4.3", "terser-webpack-plugin": "5.3.10", - "transform-async-modules-webpack-plugin": "1.1.1", "ts-lit-plugin": "2.0.2", "typescript": "5.7.2", "vitest": "2.1.8", diff --git a/renovate.json b/renovate.json index 8c85f3c96e..383157092a 100644 --- a/renovate.json +++ b/renovate.json @@ -43,12 +43,6 @@ "description": "Group date-fns with dependent timezone package", "groupName": "date-fns", "matchPackageNames": ["date-fns", "date-fns-tz"] - }, - { - "description": "Group and temporarily disable WDS packages", - "groupName": "Web Dev Server", - "enabled": false, - "matchPackageNames": ["@web/dev-server{/,}**"] } ] } diff --git a/src/html/_header.html.template b/src/html/_header.html.template index 9ba28a1421..0a3c1360dd 100644 --- a/src/html/_header.html.template +++ b/src/html/_header.html.template @@ -1,8 +1,6 @@ -<% if (!useWDS) { %> - <% for (const entry of latestEntryJS) { %> - - <% } %> +<% for (const entry of latestEntryJS) { %> + <% } %> diff --git a/src/html/_script_loader.html.template b/src/html/_script_loader.html.template index f56c5c01b1..f525d5a328 100644 --- a/src/html/_script_loader.html.template +++ b/src/html/_script_loader.html.template @@ -1,4 +1,4 @@ -