Fix dev paths (#25)

huntharo · web-flow · commit 7451e98ee018 · 2022-12-31T18:22:56.000-05:00
* Fix dev paths

* Remove prefix
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/app/components/layout.tsx b/packages/app/components/layout.tsx
@@ -7,15 +7,14 @@ import getConfig from 'next/config';
 
 const name = 'PwrDrvr';
 export const siteTitle = 'PwrDrvr Website - 2';
-const isProd = process.env.NODE_ENV === 'production';
 
 export default function Layout({ children, home = undefined }) {
   const base = getConfig().publicRuntimeConfig.staticFolder;
 
   return (
     <div className={styles.container}>
       <Head>
-        <link rel="icon" href={`${isProd ? base : ''}/favicon.ico`} />
+        <link rel="icon" href={`${base}/favicon.ico`} />
         <meta name="description" content="Learn how to build a personal website using Next.js" />
         <meta
           property="og:image"
@@ -31,7 +30,7 @@ export default function Layout({ children, home = undefined }) {
           <>
             <Image
               priority
-              src={`${isProd ? base : ''}/images/profile.jpg`}
+              src={`${base}/images/profile.jpg`}
               unoptimized
               className={utilStyles.borderCircle}
               height={144}
@@ -45,7 +44,7 @@ export default function Layout({ children, home = undefined }) {
             <Link href="/">
               <Image
                 priority
-                src={`${isProd ? base : ''}/images/profile.jpg`}
+                src={`${base}/images/profile.jpg`}
                 unoptimized
                 className={utilStyles.borderCircle}
                 height={108}
diff --git a/packages/app/next.config.js b/packages/app/next.config.js
@@ -56,10 +56,24 @@ module.exports = {
         destination: `/_next/:path*`
       },
       {
-        /** Images */
-        source: `${BASE_VERSION_ONLY}/image/:query*`,
+        /** Image optimizer (not tested yet) */
+        source: `${BASE_VERSION_ONLY}/_next/image/:query*`,
         destination: `/_next/image/:query*`
       },
+      {
+        // Images
+        // Only used for local development
+        // On deployed environments, the images are served from S3
+        // and image requests will never reach this rewrite
+        source: `${BASE_VERSION_ONLY}/images/:query*`,
+        destination: `/images/:query*`
+      },
+      {
+        // Favicon
+        // Only used for local development
+        source: `${BASE_VERSION_ONLY}/favicon.ico`,
+        destination: `/favicon.ico`
+      },
       /** Api Calls */
       {
         source: `${BASE_VERSION_ONLY}/api/:path*`,
