fix: client and server warnings

plone · May 16, 2024 · d66b0ac · d66b0ac
1 parent dd553b8
commit d66b0ac
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/packages/volto/src/helpers/Html/Html.jsx b/packages/volto/src/helpers/Html/Html.jsx
@@ -92,6 +92,8 @@ class Html extends Component {
     const head = Helmet.rewind();
     const bodyClass = join(BodyClass.rewind(), ' ');
     const htmlAttributes = head.htmlAttributes.toComponent();
+    const shouldPrefix =
+      config.settings.prefixPath && process.env.NODE_ENV === 'production';
 
     return (
       <html lang={htmlAttributes.lang}>
@@ -121,22 +123,32 @@ class Html extends Component {
 
           <link
             rel="icon"
-            href={(config.settings.prefixPath ?? '') + '/favicon.ico'}
+            href={
+              (shouldPrefix ? config.settings.prefixPath : '') + '/favicon.ico'
+            }
             sizes="any"
           />
           <link
             rel="icon"
-            href={(config.settings.prefixPath ?? '') + '/icon.svg'}
+            href={
+              (shouldPrefix ? config.settings.prefixPath : '') + '/icon.svg'
+            }
             type="image/svg+xml"
           />
           <link
             rel="apple-touch-icon"
             sizes="180x180"
-            href={(config.settings.prefixPath ?? '') + '/apple-touch-icon.png'}
+            href={
+              (shouldPrefix ? config.settings.prefixPath : '') +
+              '/apple-touch-icon.png'
+            }
           />
           <link
             rel="manifest"
-            href={(config.settings.prefixPath ?? '') + '/site.webmanifest'}
+            href={
+              (shouldPrefix ? config.settings.prefixPath : '') +
+              '/site.webmanifest'
+            }
           />
           <meta name="generator" content="Plone 6 - https://plone.org" />
           <meta name="viewport" content="width=device-width, initial-scale=1" />

diff --git a/packages/volto/src/server.jsx b/packages/volto/src/server.jsx
@@ -273,7 +273,7 @@ server.get('/*', (req, res) => {
                   config.settings.prefixPath &&
                   process.env.NODE_ENV === 'production'
                     ? config.settings.prefixPath
-                    : '/'
+                    : undefined
                 }
               >
                 <ReduxAsyncConnect routes={routes} helpers={api} />

diff --git a/packages/volto/src/start-client.jsx b/packages/volto/src/start-client.jsx
@@ -17,7 +17,10 @@ import configureStore from '@plone/volto/store';
 import { Api, persistAuthToken, ScrollToTop } from '@plone/volto/helpers';
 
 export const history = createBrowserHistory({
-  basename: config.settings.prefixPath,
+  basename:
+    config.settings.prefixPath && process.env.NODE_ENV === 'production'
+      ? config.settings.prefixPath
+      : '/',
 });
 
 function reactIntlErrorHandler(error) {