@opennextjs/cloudflare 0.6.4 → 0.6.5

package/dist/api/durable-objects/queue.js

@@ -221,13 +221,11 @@ export class DurableObjectQueueHandler extends DurableObject {
         try {
             if (this.disableSQLite)
                 return false;
-            const numNewer = this.sql
-                .exec("SELECT COUNT(*) as numNewer FROM sync WHERE id = ? AND lastSuccess > ? LIMIT 1", `${msg.MessageBody.host}${msg.MessageBody.url}`, Math.round(msg.MessageBody.lastModified / 1000))
-                .one().numNewer;
-            return numNewer > 0;
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            return (this.sql
+                .exec("SELECT 1 FROM sync WHERE id = ? AND lastSuccess > ? LIMIT 1", `${msg.MessageBody.host}${msg.MessageBody.url}`, Math.round(msg.MessageBody.lastModified / 1000))
+                .toArray().length > 0);
         }
-        catch (e) {
+        catch {
             return false;
         }
     }

package/dist/api/durable-objects/sharded-tag-cache.js

@@ -9,10 +9,9 @@ export class DOShardedTagCache extends DurableObject {
         });
     }
     async hasBeenRevalidated(tags, lastModified) {
-        const result = this.sql
-            .exec(`SELECT COUNT(*) as cnt FROM revalidations WHERE tag IN (${tags.map(() => "?").join(", ")}) AND revalidatedAt > ?`, ...tags, lastModified ?? Date.now())
-            .one();
-        return result.cnt > 0;
+        return (this.sql
+            .exec(`SELECT 1 FROM revalidations WHERE tag IN (${tags.map(() => "?").join(", ")}) AND revalidatedAt > ? LIMIT 1`, ...tags, lastModified ?? Date.now())
+            .toArray().length > 0);
     }
     async writeTags(tags, lastModified) {
         tags.forEach((tag) => {

package/dist/api/overrides/tag-cache/d1-next-tag-cache.js

@@ -10,12 +10,10 @@ export class D1NextModeTagCache {
             return false;
         try {
             const result = await db
-                .prepare(`SELECT COUNT(*) as cnt FROM revalidations WHERE tag IN (${tags.map(() => "?").join(", ")}) AND revalidatedAt > ? LIMIT 1`)
+                .prepare(`SELECT 1 FROM revalidations WHERE tag IN (${tags.map(() => "?").join(", ")}) AND revalidatedAt > ? LIMIT 1`)
                 .bind(...tags.map((tag) => this.getCacheKey(tag)), lastModified ?? Date.now())
-                .first();
-            if (!result)
-                throw new RecoverableError(`D1 select failed for ${tags}`);
-            return result.cnt > 0;
+                .raw();
+            return result.length > 0;
         }
         catch (e) {
             error(e);

package/dist/cli/build/bundle-server.js

@@ -87,7 +87,7 @@ export async function bundleServer(buildOpts) {
             // Apply updater updates, must be the last plugin
             updater.plugin,
         ],
-        external: ["./middleware/handler.mjs"],
+        external: ["./middleware/handler.mjs", "*.wasm"],
         alias: {
             // Note: it looks like node-fetch is actually not necessary for us, so we could replace it with an empty shim
             //       but just to be safe we replace it with a module that re-exports the native fetch

package/dist/cli/build/open-next/createServerBundle.js

@@ -2,10 +2,11 @@
 // Adapted for cloudflare workers
 import fs from "node:fs";
 import path from "node:path";
+import { loadMiddlewareManifest } from "@opennextjs/aws/adapters/config/util.js";
 import { bundleNextServer } from "@opennextjs/aws/build/bundleNextServer.js";
 import { compileCache } from "@opennextjs/aws/build/compileCache.js";
 import { copyTracedFiles } from "@opennextjs/aws/build/copyTracedFiles.js";
-import { generateEdgeBundle } from "@opennextjs/aws/build/edge/createEdgeBundle.js";
+import { copyMiddlewareResources, generateEdgeBundle } from "@opennextjs/aws/build/edge/createEdgeBundle.js";
 import * as buildHelper from "@opennextjs/aws/build/helper.js";
 import { installDependencies } from "@opennextjs/aws/build/installDeps.js";
 import { applyCodePatches } from "@opennextjs/aws/build/patch/codePatcher.js";
@@ -86,25 +87,28 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
     //       `.next/standalone/package/path` (ie. `.next`, `server.js`).
     //       We need to output the handler file inside the package path.
     const packagePath = buildHelper.getPackagePath(options);
-    fs.mkdirSync(path.join(outputPath, packagePath), { recursive: true });
+    const outPackagePath = path.join(outputPath, packagePath);
+    fs.mkdirSync(outPackagePath, { recursive: true });
     const ext = fnOptions.runtime === "deno" ? "mjs" : "cjs";
-    fs.copyFileSync(path.join(options.buildDir, `cache.${ext}`), path.join(outputPath, packagePath, "cache.cjs"));
+    fs.copyFileSync(path.join(options.buildDir, `cache.${ext}`), path.join(outPackagePath, "cache.cjs"));
     if (fnOptions.runtime === "deno") {
         addDenoJson(outputPath, packagePath);
     }
     // Bundle next server if necessary
     const isBundled = fnOptions.experimentalBundledNextServer ?? false;
     if (isBundled) {
-        await bundleNextServer(path.join(outputPath, packagePath), appPath, {
+        await bundleNextServer(outPackagePath, appPath, {
             minify: options.minify,
         });
     }
     // Copy middleware
     if (!config.middleware?.external) {
-        fs.copyFileSync(path.join(options.buildDir, "middleware.mjs"), path.join(outputPath, packagePath, "middleware.mjs"));
+        fs.copyFileSync(path.join(options.buildDir, "middleware.mjs"), path.join(outPackagePath, "middleware.mjs"));
+        const middlewareManifest = loadMiddlewareManifest(path.join(options.appBuildOutputPath, ".next"));
+        copyMiddlewareResources(options, middlewareManifest.middleware["/"], outPackagePath);
     }
     // Copy open-next.config.mjs
-    buildHelper.copyOpenNextConfig(options.buildDir, path.join(outputPath, packagePath), true);
+    buildHelper.copyOpenNextConfig(options.buildDir, outPackagePath, true);
     // Copy env files
     buildHelper.copyEnvFile(appBuildOutputPath, packagePath, outputPath);
     // Copy all necessary traced files
@@ -164,7 +168,7 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
             : []),
         openNextEdgePlugins({
             nextDir: path.join(options.appBuildOutputPath, ".next"),
-            isInCloudfare: true,
+            isInCloudflare: true,
         }),
     ];
     const outfileExt = fnOptions.runtime === "deno" ? "ts" : "mjs";
@@ -228,7 +232,7 @@ function addMonorepoEntrypoint(outputPath, packagePath) {
     //       the Lambda function to be able to find the handler at
     //       the root of the bundle. We will create a dummy `index.mjs`
     //       that re-exports the real handler.
-    fs.writeFileSync(path.join(outputPath, "index.mjs"), `export * from "./${normalizePath(packagePath)}/index.mjs";`);
+    fs.writeFileSync(path.join(outputPath, "index.mjs"), `export { handler } from "./${normalizePath(packagePath)}/index.mjs";`);
 }
 async function minifyServerBundle(outputDir) {
     logger.info("Minimizing server function...");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -43,7 +43,7 @@
   "homepage": "https://github.com/opennextjs/opennextjs-cloudflare",
   "dependencies": {
     "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@798",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@802",
     "enquirer": "^2.4.1",
     "glob": "^11.0.0"
   },
@@ -67,7 +67,7 @@
     "vitest": "^2.1.1"
   },
   "peerDependencies": {
-    "wrangler": "^3.114.1 || ^4.0.0"
+    "wrangler": "^3.114.1 || ^4.6.0"
   },
   "scripts": {
     "clean": "rimraf dist",