From 3bde8453efa9a4d14404c63bdc061c87843d49d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Mon, 15 Jul 2024 17:10:33 +0200
Subject: [PATCH] fix(editor): Ensure all static assets are accessible from the
 server (#10062)

---
 packages/cli/src/Server.ts                          |   1 +
 .../{ => static}/google-auth/disabled.dark.png      | Bin
 .../public/{ => static}/google-auth/disabled.png    | Bin
 .../public/{ => static}/google-auth/focus.dark.png  | Bin
 .../public/{ => static}/google-auth/focus.png       | Bin
 .../public/{ => static}/google-auth/normal.dark.png | Bin
 .../public/{ => static}/google-auth/normal.png      | Bin
 .../{ => static}/google-auth/pressed.dark.png       | Bin
 .../public/{ => static}/google-auth/pressed.png     | Bin
 .../components/CredentialEdit/GoogleAuthButton.vue  |   8 ++++----
 10 files changed, 5 insertions(+), 4 deletions(-)
 rename packages/editor-ui/public/{ => static}/google-auth/disabled.dark.png (100%)
 rename packages/editor-ui/public/{ => static}/google-auth/disabled.png (100%)
 rename packages/editor-ui/public/{ => static}/google-auth/focus.dark.png (100%)
 rename packages/editor-ui/public/{ => static}/google-auth/focus.png (100%)
 rename packages/editor-ui/public/{ => static}/google-auth/normal.dark.png (100%)
 rename packages/editor-ui/public/{ => static}/google-auth/normal.png (100%)
 rename packages/editor-ui/public/{ => static}/google-auth/pressed.dark.png (100%)
 rename packages/editor-ui/public/{ => static}/google-auth/pressed.png (100%)

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 88d62b6aa..c367ea5e0 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -334,6 +334,7 @@ export class Server extends AbstractServer {
 
 			// Route all UI urls to index.html to support history-api
 			const nonUIRoutes: Readonly<string[]> = [
+				'favicon.ico',
 				'assets',
 				'static',
 				'types',
diff --git a/packages/editor-ui/public/google-auth/disabled.dark.png b/packages/editor-ui/public/static/google-auth/disabled.dark.png
similarity index 100%
rename from packages/editor-ui/public/google-auth/disabled.dark.png
rename to packages/editor-ui/public/static/google-auth/disabled.dark.png
diff --git a/packages/editor-ui/public/google-auth/disabled.png b/packages/editor-ui/public/static/google-auth/disabled.png
similarity index 100%
rename from packages/editor-ui/public/google-auth/disabled.png
rename to packages/editor-ui/public/static/google-auth/disabled.png
diff --git a/packages/editor-ui/public/google-auth/focus.dark.png b/packages/editor-ui/public/static/google-auth/focus.dark.png
similarity index 100%
rename from packages/editor-ui/public/google-auth/focus.dark.png
rename to packages/editor-ui/public/static/google-auth/focus.dark.png
diff --git a/packages/editor-ui/public/google-auth/focus.png b/packages/editor-ui/public/static/google-auth/focus.png
similarity index 100%
rename from packages/editor-ui/public/google-auth/focus.png
rename to packages/editor-ui/public/static/google-auth/focus.png
diff --git a/packages/editor-ui/public/google-auth/normal.dark.png b/packages/editor-ui/public/static/google-auth/normal.dark.png
similarity index 100%
rename from packages/editor-ui/public/google-auth/normal.dark.png
rename to packages/editor-ui/public/static/google-auth/normal.dark.png
diff --git a/packages/editor-ui/public/google-auth/normal.png b/packages/editor-ui/public/static/google-auth/normal.png
similarity index 100%
rename from packages/editor-ui/public/google-auth/normal.png
rename to packages/editor-ui/public/static/google-auth/normal.png
diff --git a/packages/editor-ui/public/google-auth/pressed.dark.png b/packages/editor-ui/public/static/google-auth/pressed.dark.png
similarity index 100%
rename from packages/editor-ui/public/google-auth/pressed.dark.png
rename to packages/editor-ui/public/static/google-auth/pressed.dark.png
diff --git a/packages/editor-ui/public/google-auth/pressed.png b/packages/editor-ui/public/static/google-auth/pressed.png
similarity index 100%
rename from packages/editor-ui/public/google-auth/pressed.png
rename to packages/editor-ui/public/static/google-auth/pressed.png
diff --git a/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue b/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
index 083deabaf..c2c73bc9c 100644
--- a/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
@@ -13,10 +13,10 @@ import { useRootStore } from '@/stores/root.store';
 const { baseUrl } = useRootStore();
 const type = useUIStore().appliedTheme === 'dark' ? '.dark.png' : '.png';
 const googleAuthButtons = {
-	'--google-auth-btn-normal': `url(${baseUrl}google-auth/normal${type}`,
-	'--google-auth-btn-focus': `url(${baseUrl}google-auth/focus${type}`,
-	'--google-auth-btn-pressed': `url(${baseUrl}google-auth/pressed${type}`,
-	'--google-auth-btn-disabled': `url(${baseUrl}google-auth/disabled${type}`,
+	'--google-auth-btn-normal': `url(${baseUrl}static/google-auth/normal${type}`,
+	'--google-auth-btn-focus': `url(${baseUrl}static/google-auth/focus${type}`,
+	'--google-auth-btn-pressed': `url(${baseUrl}static/google-auth/pressed${type}`,
+	'--google-auth-btn-disabled': `url(${baseUrl}static/google-auth/disabled${type}`,
 };
 </script>