address bot

Author: annajowang

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

@@ -57,7 +57,7 @@ describe("next.config override", () => {
     const standaloneConfigFiles = standaloneFiles.filter((file) => file.match(configRegex));
     assert.strictEqual(standaloneConfigFiles.length, 2);
     assert.ok(
-      configFiles.some((file) => file.match(configOriginalRegex)),
+      standaloneConfigFiles.some((file) => file.match(configOriginalRegex)),
       "no original config found in standalone",
     );
   });

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

@@ -147,27 +147,22 @@ export async function validateNextConfigOverride(
  * to leave user code the way we found it.
  */
 export async function restoreNextConfig(projectRoot: string, nextConfigFileName: string) {
-  // Check if the file exists in the current working directory
-  const configPath = join(projectRoot, nextConfigFileName);
-  if (!(await exists(configPath))) {
-    return;
-  }
-
   // Determine the file extension
   const fileExtension = extname(nextConfigFileName);
   const originalConfigPath = join(projectRoot, `next.config.original${fileExtension}`);
+
   if (!(await exists(originalConfigPath))) {
-    console.warn(`next config may have been overwritten but original contents not found`);
+    // No backup file found, nothing to restore.
     return;
   }
   console.log(`Restoring original next config in project root`);
 
+  const configPath = join(projectRoot, nextConfigFileName);
   try {
     await renamePromise(originalConfigPath, configPath);
   } catch (error) {
     console.error(`Error restoring Next config: ${error}`);
   }
-  return;
 }
 
 /**