fix rebase

Author: conico974

packages/cloudflare/src/api/durable-objects/queue.ts

@@ -77,6 +77,10 @@ export class DurableObjectQueueHandler extends DurableObject<CloudflareEnv> {
     // The route is already in a failed state, it will be retried later
     if (this.routeInFailedState.has(msg.MessageDeduplicationId)) return;
 
+    // If the last success is newer than the last modified, it's likely that the regional cache is out of date
+    // We don't need to revalidate in this case
+    if (this.checkSyncTable(msg)) return;
+
     if (this.ongoingRevalidations.size >= this.maxRevalidations) {
       debug(
         `The maximum number of revalidations (${this.maxRevalidations}) is reached. Blocking until one of the revalidations finishes.`
@@ -183,7 +187,6 @@ export class DurableObjectQueueHandler extends DurableObject<CloudflareEnv> {
     for (const event of allEventsToRetry) {
       debug(`Retrying revalidation for ${event.msg.MessageBody.host}${event.msg.MessageBody.url}`);
       await this.executeRevalidation(event.msg);
-      this.routeInFailedState.delete(event.msg.MessageDeduplicationId);
     }
   }
 

packages/cloudflare/src/cli/build/bundle-server.ts

@@ -54,10 +54,14 @@ export async function bundleServer(buildOpts: BuildOptions): Promise<void> {
     "server-functions/default",
     getPackagePath(buildOpts),
     ".next"
+  )
+  const serverFiles = path.join(
+    baseManifestPath,
+    "required-server-files.json"
   );
-  const serverFiles = path.join(baseManifestPath, "required-server-files.json");
   const nextConfig = JSON.parse(fs.readFileSync(serverFiles, "utf-8")).config;
 
+
   console.log(`\x1b[35m⚙️ Bundling the OpenNext server...\n\x1b[0m`);
 
   await patchWebpackRuntime(buildOpts);