wrap in try-finally and add e2e tests

Author: annajowang

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

@@ -1,7 +1,8 @@
 import * as assert from "assert";
-import { posix } from "path";
+import { posix, join } from "path";
 import fsExtra from "fs-extra";
 
+
 const host = process.env.HOST;
 if (!host) {
   throw new Error("HOST environment variable expected");
@@ -27,9 +28,47 @@ const compiledFilesPath = posix.join(
   ".next",
 );
 
+const standalonePath = posix.join(
+  process.cwd(),
+  "e2e",
+  "runs",
+  runId,
+  ".next",
+  "standalone",
+);
+
+const appPath = posix.join(
+  process.cwd(),
+  "e2e",
+  "runs",
+  runId,
+);
+
 const requiredServerFilePath = posix.join(compiledFilesPath, "required-server-files.json");
 
 describe("next.config override", () => {
+  it("Should not overwrite original next config", async function () {
+    if (
+      scenario.includes("with-empty-config") ||
+      scenario.includes("with-images-unoptimized-false") ||
+      scenario.includes("with-custom-image-loader")
+    ) {
+      this.skip();
+    }
+    const files = await fsExtra.readdir(appPath);
+    const configRegex = /^next\.config\..*$/g;
+    const configOriginalRegex = /^next\.config\.(?!original).*$/g;
+    const configFiles = files
+      .filter((file) =>   file.match(configRegex));
+    assert.strictEqual(configFiles.length, 1);
+    assert.ok(configFiles[0].match(configOriginalRegex), "found original config file in root");
+
+    const standaloneFiles = await fsExtra.readdir(standalonePath);
+    const standaloneConfigFiles = standaloneFiles
+      .filter((file) => file.match(configRegex));
+    assert.strictEqual(standaloneConfigFiles.length, 2);
+    assert.ok(configFiles.some((file) => file.match(configOriginalRegex)), "no original config found in standalone");
+  });
   it("should have images optimization disabled", async function () {
     if (
       scenario.includes("with-empty-config") ||

packages/@apphosting/adapter-nextjs/src/bin/build.ts

@@ -41,32 +41,34 @@ if (await exists(nextConfigPath)) {
   await validateNextConfigOverride(root, opts.projectDirectory, nextConfig.configFileName);
 }
 
-await runBuild();
+try {
+  await runBuild();
 
 
-const adapterMetadata = getAdapterMetadata();
-const nextBuildDirectory = join(opts.projectDirectory, nextConfig.distDir);
-const outputBundleOptions = populateOutputBundleOptions(
-  root,
-  opts.projectDirectory,
-  nextBuildDirectory,
-);
+  const adapterMetadata = getAdapterMetadata();
+  const nextBuildDirectory = join(opts.projectDirectory, nextConfig.distDir);
+  const outputBundleOptions = populateOutputBundleOptions(
+    root,
+    opts.projectDirectory,
+    nextBuildDirectory,
+  );
 
-await addRouteOverrides(
-  outputBundleOptions.outputDirectoryAppPath,
-  nextConfig.distDir,
-  adapterMetadata,
-);
+  await addRouteOverrides(
+    outputBundleOptions.outputDirectoryAppPath,
+    nextConfig.distDir,
+    adapterMetadata,
+  );
 
-const nextjsVersion = process.env.FRAMEWORK_VERSION || "unspecified";
-await generateBuildOutput(
-  root,
-  opts.projectDirectory,
-  outputBundleOptions,
-  nextBuildDirectory,
-  nextjsVersion,
-  adapterMetadata,
-);
-await validateOutputDirectory(outputBundleOptions, nextBuildDirectory);
-
-await restoreNextConfig(root, nextConfig.configFileName);
+  const nextjsVersion = process.env.FRAMEWORK_VERSION || "unspecified";
+  await generateBuildOutput(
+    root,
+    opts.projectDirectory,
+    outputBundleOptions,
+    nextBuildDirectory,
+    nextjsVersion,
+    adapterMetadata,
+  );
+  await validateOutputDirectory(outputBundleOptions, nextBuildDirectory);
+} finally {
+  await restoreNextConfig(root, nextConfig.configFileName);
+}