add additional tests and fix lint errors

Author: mathu97

packages/@apphosting/adapter-nextjs/e2e/config-override-test-cases.yaml

@@ -142,3 +142,61 @@ tests:
 
       module.exports = nextConfig
     file: next.config.js
+  - name: with-images-unoptimized-false
+    config: |
+      /** @type {import('next').NextConfig} */
+      const nextConfig = {
+        reactStrictMode: true,
+        images: {
+          unoptimized: false,
+        },
+        async headers() {
+          return [
+            {
+              source: '/:path*',
+              headers: [
+                {
+                  key: 'x-custom-header',
+                  value: 'js-config-value',
+                },
+                {
+                  key: 'x-config-type',
+                  value: 'object',
+                },
+              ],
+            },
+          ];
+        },
+      };
+
+      module.exports = nextConfig;
+    file: next.config.js
+  - name: with-custom-image-loader
+    config: |
+      /** @type {import('next').NextConfig} */
+      const nextConfig = {
+        images: {
+          loader: "akamai",
+          path: "",
+        },
+        async headers() {
+          return [
+            {
+              source: '/:path*',
+              headers: [
+                {
+                  key: 'x-custom-header',
+                  value: 'js-config-value',
+                },
+                {
+                  key: 'x-config-type',
+                  value: 'object',
+                },
+              ],
+            },
+          ];
+        },
+      };
+
+      module.exports = nextConfig;
+    file: next.config.js

packages/@apphosting/adapter-nextjs/e2e/config-override.spec.ts

@@ -27,13 +27,20 @@ const compiledFilesPath = posix.join(
   ".next",
 );
 
+const requiredServerFilePath = posix.join(compiledFilesPath, "required-server-files.json");
+
 describe("next.config override", () => {
   it("should have images optimization disabled", async function () {
-    if (scenario.includes("with-empty-config")) {
+    if (
+      scenario.includes("with-empty-config") ||
+      scenario.includes("with-images-unoptimized-false") ||
+      scenario.includes("with-custom-image-loader")
+    ) {
+      // eslint-disable-next-line @typescript-eslint/no-invalid-this
       this.skip();
     }
 
-    const serverFiles = await fsExtra.readJson(`${compiledFilesPath}/required-server-files.json`);
+    const serverFiles = await fsExtra.readJson(requiredServerFilePath);
     const config = serverFiles.config;
 
     // Verify that images.unoptimized is set to true
@@ -47,6 +54,7 @@ describe("next.config override", () => {
 
   it("should preserve other user set next configs", async function () {
     if (scenario.includes("with-empty-config")) {
+      // eslint-disable-next-line @typescript-eslint/no-invalid-this
       this.skip();
     }
 
@@ -68,6 +76,7 @@ describe("next.config override", () => {
   it("should handle function-style config correctly", async function () {
     // Only run this test for scenarios with function-style config
     if (!scenario.includes("function-style")) {
+      // eslint-disable-next-line @typescript-eslint/no-invalid-this
       this.skip();
     }
 
@@ -80,6 +89,7 @@ describe("next.config override", () => {
   it("should handle object-style config correctly", async function () {
     // Only run this test for scenarios with object-style config
     if (!scenario.includes("object-style") && !scenario.includes("with-empty-config")) {
+      // eslint-disable-next-line @typescript-eslint/no-invalid-this
       this.skip();
     }
 
@@ -92,4 +102,24 @@ describe("next.config override", () => {
       assert.equal(response.headers.get("x-config-type") ?? "", "object");
     }
   });
+
+  it("should not override images.unoptimized if user explicitly defines configs", async function () {
+    if (
+      !scenario.includes("with-images-unoptimized-false") &&
+      !scenario.includes("with-custom-image-loader")
+    ) {
+      // eslint-disable-next-line @typescript-eslint/no-invalid-this
+      this.skip();
+    }
+
+    const serverFiles = await fsExtra.readJson(requiredServerFilePath);
+    const config = serverFiles.config;
+
+    assert.ok(config.images, "Config should have images property");
+    assert.strictEqual(
+      config.images.unoptimized,
+      false,
+      "Images should have unoptimized set to false",
+    );
+  });
 });