Merge branch 'master' into inlined.await-tls

firebase · Apr 18, 2024 · 78e540c · 78e540c
2 parents 9f7b752 + e68b69f
commit 78e540c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1 @@
+- fix non static check for not-found route in Next.js 14.2 (#7012)
diff --git a/src/apphosting/githubConnections.ts b/src/apphosting/githubConnections.ts
@@ -166,7 +166,7 @@ async function createFullyInstalledConnection(
 
   while (conn.installationState.stage !== "COMPLETE") {
     utils.logBullet("Install the Firebase GitHub app to enable access to GitHub repositories");
-    const targetUri = conn.installationState.actionUri.replace("install_v2", "direct_install_v2");
+    const targetUri = conn.installationState.actionUri;
     utils.logBullet(targetUri);
     await utils.openInBrowser(targetUri);
     await promptOnce({

diff --git a/src/apphosting/repo.ts b/src/apphosting/repo.ts
@@ -151,7 +151,7 @@ async function createFullyInstalledConnection(
 
   while (conn.installationState.stage !== "COMPLETE") {
     utils.logBullet("Install the Cloud Build GitHub app to enable access to GitHub repositories");
-    const targetUri = conn.installationState.actionUri.replace("install_v2", "direct_install_v2");
+    const targetUri = conn.installationState.actionUri;
     utils.logBullet(targetUri);
     await utils.openInBrowser(targetUri);
     await promptOnce({

diff --git a/src/frameworks/next/index.ts b/src/frameworks/next/index.ts
@@ -253,11 +253,11 @@ export async function build(
         dynamicRoutes,
       );
 
-      if (
-        unrenderedServerComponents.has("/_not-found") &&
-        (await hasStaticAppNotFoundComponent(dir, distDir))
-      ) {
-        unrenderedServerComponents.delete("/_not-found");
+      const notFoundPageKey = ["/_not-found", "/_not-found/page"].find((key) =>
+        unrenderedServerComponents.has(key),
+      );
+      if (notFoundPageKey && (await hasStaticAppNotFoundComponent(dir, distDir))) {
+        unrenderedServerComponents.delete(notFoundPageKey);
       }
 
       for (const key of unrenderedServerComponents) {