From 026cfe525add4694490260dda184f1cd3d9b3066 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 3 Jun 2022 10:52:00 +0200
Subject: [PATCH] cli: fix missing trailing / in public path output config

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/calm-timers-wonder.md       | 5 +++++
 packages/cli/src/lib/bundler/config.ts | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/calm-timers-wonder.md

diff --git a/.changeset/calm-timers-wonder.md b/.changeset/calm-timers-wonder.md
new file mode 100644
index 0000000000..516e2ae9ce
--- /dev/null
+++ b/.changeset/calm-timers-wonder.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Fix the public path configuration of the frontend app build so that a trailing `/` is always appended when needed.
diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index fb073a25e3..d723b963bd 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -89,6 +89,7 @@ export async function createConfig(
 
   const baseUrl = frontendConfig.getString('app.baseUrl');
   const validBaseUrl = new URL(baseUrl);
+  const publicPath = validBaseUrl.pathname.replace(/\/$/, '');
   if (checksEnabled) {
     plugins.push(
       new ForkTsCheckerWebpackPlugin({
@@ -121,7 +122,7 @@ export async function createConfig(
     new HtmlWebpackPlugin({
       template: paths.targetHtml,
       templateParameters: {
-        publicPath: validBaseUrl.pathname.replace(/\/$/, ''),
+        publicPath,
         config: frontendConfig,
       },
     }),
@@ -194,7 +195,7 @@ export async function createConfig(
     },
     output: {
       path: paths.targetDist,
-      publicPath: validBaseUrl.pathname,
+      publicPath: `${publicPath}/`,
       filename: isDev ? '[name].js' : 'static/[name].[fullhash:8].js',
       chunkFilename: isDev
         ? '[name].chunk.js'