From 54865ec88af331f9be3fb4a088ce62a2c67e0111 Mon Sep 17 00:00:00 2001 From: Michael Myers Date: Mon, 1 Jul 2024 12:34:09 -0500 Subject: [PATCH] Remove index.ejs from web package This PR removes the index.ejs template file which is a relic from webpack. When skipping webasset builds, we can just copy the index.html file instead of the ejs file as vite handles the rest --- Makefile | 4 ++-- web/packages/build/index.ejs | 17 ----------------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 web/packages/build/index.ejs diff --git a/Makefile b/Makefile index a6713c29538ea..8e10452c2d98c 100644 --- a/Makefile +++ b/Makefile @@ -1506,12 +1506,12 @@ test-compat: .PHONY: ensure-webassets ensure-webassets: - @if [[ "${WEBASSETS_SKIP_BUILD}" -eq 1 ]]; then mkdir -p webassets/teleport && mkdir -p webassets/teleport/app && cp web/packages/build/index.ejs webassets/teleport/index.html; \ + @if [[ "${WEBASSETS_SKIP_BUILD}" -eq 1 ]]; then mkdir -p webassets/teleport && mkdir -p webassets/teleport/app && cp web/packages/teleport/index.html webassets/teleport/index.html; \ else MAKE="$(MAKE)" "$(MAKE_DIR)/build.assets/build-webassets-if-changed.sh" OSS webassets/oss-sha build-ui web; fi .PHONY: ensure-webassets-e ensure-webassets-e: - @if [[ "${WEBASSETS_SKIP_BUILD}" -eq 1 ]]; then mkdir -p webassets/teleport && mkdir -p webassets/e/teleport/app && cp web/packages/build/index.ejs webassets/e/teleport/index.html; \ + @if [[ "${WEBASSETS_SKIP_BUILD}" -eq 1 ]]; then mkdir -p webassets/teleport && mkdir -p webassets/e/teleport/app && cp web/packages/teleport/index.html webassets/e/teleport/index.html; \ else MAKE="$(MAKE)" "$(MAKE_DIR)/build.assets/build-webassets-if-changed.sh" Enterprise webassets/e/e-sha build-ui-e web e/web; fi .PHONY: init-submodules-e diff --git a/web/packages/build/index.ejs b/web/packages/build/index.ejs deleted file mode 100644 index 0bbe0a08b1e72..0000000000000 --- a/web/packages/build/index.ejs +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - <%= htmlWebpackPlugin.options.title %> - - - -
- -