address some comments

Author: mathu97

packages/@apphosting/adapter-nextjs/src/overrides.spec.ts

@@ -166,6 +166,23 @@ describe("route overrides", () => {
 
 describe("next config overrides", () => {
   let tmpDir: string;
+  const nextConfigOverrideBody = `
+     // This file was automatically generated by Firebase App Hosting adapter
+    const fahOptimizedConfig = (config) => ({
+      ...config,
+      images: {
+        ...(config.images || {}),
+        ...(config.images?.unoptimized === undefined ? { unoptimized: true } : {}),
+      },
+    });
+
+    const config = typeof originalConfig === 'function' 
+      ? (...args) => {
+          const resolvedConfig = originalConfig(...args);
+          return fahOptimizedConfig(resolvedConfig);
+        }
+      : fahOptimizedConfig(originalConfig);
+      `;
 
   beforeEach(() => {
     tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "test-overrides"));
@@ -192,27 +209,10 @@ describe("next config overrides", () => {
     assert.equal(
       normalizeWhitespace(updatedConfig),
       normalizeWhitespace(`
+      // @ts-nocheck
       const originalConfig = require('./next.config.original.js');
       
-      // This file was automatically generated by Firebase App Hosting adapter
-      const config = typeof originalConfig === 'function' 
-        ? (...args) => {
-            const resolvedConfig = originalConfig(...args);
-              return {
-                ...resolvedConfig,
-                images: {
-                  ...(resolvedConfig.images || {}),
-                  unoptimized: true,
-                },
-              };
-        }
-        : {
-            ...originalConfig,
-            images: {
-              ...(originalConfig.images || {}),
-              unoptimized: true,
-            },
-          };
+      ${nextConfigOverrideBody}
 
       module.exports = config;
       `),
@@ -241,28 +241,11 @@ describe("next config overrides", () => {
     assert.equal(
       normalizeWhitespace(updatedConfig),
       normalizeWhitespace(`
+      // @ts-nocheck
       import originalConfig from './next.config.original.mjs';
 
-      // This file was automatically generated by Firebase App Hosting adapter
-      const config = typeof originalConfig === 'function' 
-        ? (...args) => {
-            const resolvedConfig = originalConfig(...args);
-            return {
-              ...resolvedConfig,
-              images: {
-                ...(resolvedConfig.images || {}),
-                unoptimized: true,
-              },
-            };
-        }
-        : {
-            ...originalConfig,
-            images: {
-              ...(originalConfig.images || {}),
-              unoptimized: true,
-            },
-          };
-      
+      ${nextConfigOverrideBody}
+
       export default config;
       `),
     );
@@ -291,27 +274,10 @@ describe("next config overrides", () => {
     assert.equal(
       normalizeWhitespace(updatedConfig),
       normalizeWhitespace(`
+      // @ts-nocheck
       import originalConfig from './next.config.original.mjs';
 
-      // This file was automatically generated by Firebase App Hosting adapter
-      const config = typeof originalConfig === 'function' 
-        ? (...args) => {
-            const resolvedConfig = originalConfig(...args);
-            return {
-              ...resolvedConfig,
-              images: {
-                ...(resolvedConfig.images || {}),
-                unoptimized: true,
-              },
-            };
-          }
-        : {
-            ...originalConfig,
-            images: {
-              ...(originalConfig.images || {}),
-              unoptimized: true,
-            },
-          };
+      ${nextConfigOverrideBody}
       
       export default config;
       `),
@@ -337,27 +303,10 @@ describe("next config overrides", () => {
     assert.equal(
       normalizeWhitespace(updatedConfig),
       normalizeWhitespace(`
+      // @ts-nocheck
       import originalConfig from './next.config.original';
       
-      // This file was automatically generated by Firebase App Hosting adapter
-      const config = typeof originalConfig === 'function' 
-        ? (...args) => {
-            const resolvedConfig = originalConfig(...args);
-            return {
-              ...resolvedConfig,
-              images: {
-                ...(resolvedConfig.images || {}),
-                unoptimized: true,
-              },
-            };
-          }
-        : {
-            ...originalConfig,
-            images: {
-              ...(originalConfig.images || {}),
-              unoptimized: true,
-            },
-          };
+      ${nextConfigOverrideBody}
       
       module.exports = config;
       `),

packages/@apphosting/adapter-nextjs/src/overrides.ts

@@ -41,30 +41,7 @@ export async function overrideNextConfig(projectRoot: string, nextConfigFileName
     }
 
     // Create the new config content with our overrides
-    const newConfigContent = `${importStatement}
-
-// This file was automatically generated by Firebase App Hosting adapter
-const config = typeof originalConfig === 'function' 
-  ? (...args) => {
-      const resolvedConfig = originalConfig(...args);
-      return {
-        ...resolvedConfig,
-        images: {
-          ...(resolvedConfig.images || {}),
-          unoptimized: true,
-        },
-      };
-    }
-  : {
-      ...originalConfig,
-      images: {
-        ...(originalConfig.images || {}),
-        unoptimized: true,
-      },
-    };
-
-${fileExtension === "mjs" ? "export default config;" : "module.exports = config;"}
-`;
+    const newConfigContent = getCustomNextConfig(importStatement, fileExtension);
 
     // Write the new config file
     await writeFile(join(projectRoot, newConfigName), newConfigContent);
@@ -75,6 +52,33 @@ ${fileExtension === "mjs" ? "export default config;" : "module.exports = config;
   }
 }
 
+function getCustomNextConfig(importStatement: string, fileExtension: string) {
+  return `
+  // @ts-nocheck
+  ${importStatement}
+
+  // This file was automatically generated by Firebase App Hosting adapter
+  const fahOptimizedConfig = (config) => ({
+    ...config,
+    images: {
+      ...(config.images || {}),
+      ...(config.images?.unoptimized === undefined && config.images?.loader === undefined 
+          ? { unoptimized: true } 
+          : {}),
+    },
+  });
+
+  const config = typeof originalConfig === 'function' 
+    ? (...args) => {
+        const resolvedConfig = originalConfig(...args);
+        return fahOptimizedConfig(resolvedConfig);
+      }
+    : fahOptimizedConfig(originalConfig);
+
+  ${fileExtension === "mjs" ? "export default config;" : "module.exports = config;"}
+  `;
+}
+
 /**
  * Modifies the app's route manifest (routes-manifest.json) to add Firebase App Hosting
  * specific overrides (i.e headers).