From c7ea1b7c56df3b12ec18761b8932fe0f5ca9c21c Mon Sep 17 00:00:00 2001
From: SleeplessOne1917 <abias1122@gmail.com>
Date: Thu, 29 Jun 2023 06:18:31 -0400
Subject: [PATCH] Address PR feedback

---
 src/server/index.tsx                            | 2 +-
 src/server/utils/create-ssr-html.tsx            | 4 ++--
 src/shared/components/common/icon.tsx           | 2 +-
 src/shared/components/person/person-listing.tsx | 2 +-
 src/shared/config.ts                            | 4 ++--
 webpack.config.js                               | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/server/index.tsx b/src/server/index.tsx
index 5dd83031..e9c907f7 100644
--- a/src/server/index.tsx
+++ b/src/server/index.tsx
@@ -19,7 +19,7 @@ const [hostname, port] = process.env["LEMMY_UI_HOST"]
 
 server.use(express.json());
 server.use(express.urlencoded({ extended: false }));
-server.use(`/static-${COMMIT_HASH}`, express.static(path.resolve("./dist")));
+server.use(`/static/${COMMIT_HASH}`, express.static(path.resolve("./dist")));
 server.use(setCacheControl);
 
 if (!process.env["LEMMY_UI_DISABLE_CSP"] && !process.env["LEMMY_UI_DEBUG"]) {
diff --git a/src/server/utils/create-ssr-html.tsx b/src/server/utils/create-ssr-html.tsx
index d77df26a..0a4ec22f 100644
--- a/src/server/utils/create-ssr-html.tsx
+++ b/src/server/utils/create-ssr-html.tsx
@@ -88,7 +88,7 @@ export async function createSsrHtml(
     <link rel="apple-touch-startup-image" href=${appleTouchIcon} />
   
     <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="/static-${COMMIT_HASH}/styles/styles.css" />
+    <link rel="stylesheet" type="text/css" href="/static/${COMMIT_HASH}/styles/styles.css" />
   
     <!-- Current theme and more -->
     ${helmet.link.toString() || fallbackTheme}
@@ -103,7 +103,7 @@ export async function createSsrHtml(
       </noscript>
   
       <div id='root'>${root}</div>
-      <script defer src='/static-${COMMIT_HASH}/js/client.js'></script>
+      <script defer src='/static/${COMMIT_HASH}/js/client.js'></script>
     </body>
   </html>
   `;
diff --git a/src/shared/components/common/icon.tsx b/src/shared/components/common/icon.tsx
index 7060e9c9..10f59c7b 100644
--- a/src/shared/components/common/icon.tsx
+++ b/src/shared/components/common/icon.tsx
@@ -24,7 +24,7 @@ export class Icon extends Component<IconProps, any> {
         })}
       >
         <use
-          xlinkHref={`/static-${COMMIT_HASH}/assets/symbols.svg#icon-${this.props.icon}`}
+          xlinkHref={`/static/${COMMIT_HASH}/assets/symbols.svg#icon-${this.props.icon}`}
         ></use>
         <div className="visually-hidden">
           <title>{this.props.icon}</title>
diff --git a/src/shared/components/person/person-listing.tsx b/src/shared/components/person/person-listing.tsx
index a8fc0dae..169a93f1 100644
--- a/src/shared/components/person/person-listing.tsx
+++ b/src/shared/components/person/person-listing.tsx
@@ -90,7 +90,7 @@ export class PersonListing extends Component<PersonListingProps, any> {
           showAvatars() && (
             <PictrsImage
               src={
-                avatar ?? `/static-${COMMIT_HASH}/assets/icons/icon-96x96.png`
+                avatar ?? `/static/${COMMIT_HASH}/assets/icons/icon-96x96.png`
               }
               icon
             />
diff --git a/src/shared/config.ts b/src/shared/config.ts
index 6b0a190d..cb0f8e1e 100644
--- a/src/shared/config.ts
+++ b/src/shared/config.ts
@@ -1,7 +1,7 @@
 import { COMMIT_HASH } from "./version";
 
-export const favIconUrl = `/static-${COMMIT_HASH}/assets/icons/favicon.svg`;
-export const favIconPngUrl = `/static-${COMMIT_HASH}/assets/icons/apple-touch-icon.png`;
+export const favIconUrl = `/static/${COMMIT_HASH}/assets/icons/favicon.svg`;
+export const favIconPngUrl = `/static/${COMMIT_HASH}/assets/icons/apple-touch-icon.png`;
 
 export const repoUrl = "https://github.com/LemmyNet";
 export const joinLemmyUrl = "https://join-lemmy.org";
diff --git a/webpack.config.js b/webpack.config.js
index 268d9eca..0b03f6d9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -101,7 +101,7 @@ const createClientConfig = (_env, mode) => {
     entry: "./src/client/index.tsx",
     output: {
       filename: "js/client.js",
-      publicPath: `/static-${commitHash}`,
+      publicPath: `/static/${commitHash}`,
     },
     plugins: [
       ...base.plugins,
@@ -109,7 +109,7 @@ const createClientConfig = (_env, mode) => {
         enableInDevelopment: mode !== "development", // this may seem counterintuitive, but it is correct
         workbox: {
           modifyURLPrefix: {
-            "/": `/static-${commitHash}/`,
+            "/": `/static/${commitHash}/`,
           },
           cacheId: "lemmy",
           include: [/(assets|styles)\/.+\..+|client\.js$/g],