@opennextjs/cloudflare 1.0.0-beta.0 → 1.0.0-beta.1

package/dist/api/overrides/incremental-cache/kv-incremental-cache.js

@@ -105,7 +105,7 @@ class KVIncrementalCache {
         }
     }
     getKVKey(key, isFetch) {
-        return `${this.getBuildId()}/${key}.${isFetch ? "fetch" : "cache"}`;
+        return `${this.getBuildId()}/${key}.${isFetch ? "fetch" : "cache"}`.replace(/\/+/g, "/");
     }
     getAssetUrl(key, isFetch) {
         return isFetch

package/dist/api/overrides/incremental-cache/r2-incremental-cache.js

@@ -56,7 +56,7 @@ class R2IncrementalCache {
     }
     getR2Key(key, isFetch) {
         const directory = getCloudflareContext().env.NEXT_INC_CACHE_R2_PREFIX ?? "incremental-cache";
-        return `${directory}/${process.env.NEXT_BUILD_ID ?? "no-build-id"}/${key}.${isFetch ? "fetch" : "cache"}`;
+        return `${directory}/${process.env.NEXT_BUILD_ID ?? "no-build-id"}/${key}.${isFetch ? "fetch" : "cache"}`.replace(/\/+/g, "/");
     }
 }
 export default new R2IncrementalCache();

package/dist/cli/commands/populate-cache.js

@@ -2,6 +2,8 @@ import { existsSync } from "node:fs";
 import path from "node:path";
 import logger from "@opennextjs/aws/logger.js";
 import { globSync } from "glob";
+import { tqdm } from "ts-tqdm";
+import { unstable_readConfig } from "wrangler";
 import { NAME as R2_CACHE_NAME } from "../../api/overrides/incremental-cache/r2-incremental-cache.js";
 import { NAME as D1_TAG_NAME } from "../../api/overrides/tag-cache/d1-next-tag-cache.js";
 import { runWrangler } from "../utils/run-wrangler.js";
@@ -34,15 +36,24 @@ export async function populateCache(options, config, populateCacheOptions) {
         const name = await resolveCacheName(incrementalCache);
         switch (name) {
             case R2_CACHE_NAME: {
+                const config = unstable_readConfig({ env: populateCacheOptions.environment });
+                const binding = (config.r2_buckets ?? []).find(({ binding }) => binding === "NEXT_INC_CACHE_R2_BUCKET");
+                if (!binding) {
+                    throw new Error("No R2 binding 'NEXT_INC_CACHE_R2_BUCKET' found!");
+                }
+                const bucket = binding.bucket_name;
+                if (!bucket) {
+                    throw new Error("R2 binding 'NEXT_INC_CACHE_R2_BUCKET' should have a 'bucket_name'");
+                }
                 logger.info("\nPopulating R2 incremental cache...");
                 const assets = getCacheAssetPaths(options);
-                assets.forEach(({ fsPath, destPath }) => {
-                    const fullDestPath = path.join("NEXT_INC_CACHE_R2_BUCKET", process.env.NEXT_INC_CACHE_R2_PREFIX ?? "incremental-cache", destPath);
+                for (const { fsPath, destPath } of tqdm(assets)) {
+                    const fullDestPath = path.join(bucket, process.env.NEXT_INC_CACHE_R2_PREFIX ?? "incremental-cache", destPath);
                     runWrangler(options, ["r2 object put", JSON.stringify(fullDestPath), `--file ${JSON.stringify(fsPath)}`], 
                     // NOTE: R2 does not support the environment flag and results in the following error:
                     // Incorrect type for the 'cacheExpiry' field on 'HttpMetadata': the provided value is not of type 'date'.
                     { target: populateCacheOptions.target, excludeRemoteFlag: true, logging: "error" });
-                });
+                }
                 logger.info(`Successfully populated cache with ${assets.length} assets`);
                 break;
             }

package/dist/cli/utils/run-wrangler.js

@@ -49,6 +49,10 @@ export function runWrangler(options, args, wranglerOpts = {}) {
     ], {
         shell: true,
         stdio: wranglerOpts.logging === "error" ? ["ignore", "ignore", "inherit"] : "inherit",
+        env: {
+            ...process.env,
+            ...(wranglerOpts.logging === "error" ? { WRANGLER_LOG: "error" } : undefined),
+        },
     });
     if (result.status !== 0) {
         logger.error("Wrangler command failed");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.0-beta.1",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -43,9 +43,10 @@
   "homepage": "https://github.com/opennextjs/opennextjs-cloudflare",
   "dependencies": {
     "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "3.5.4",
+    "@opennextjs/aws": "3.5.5",
     "enquirer": "^2.4.1",
-    "glob": "^11.0.0"
+    "glob": "^11.0.0",
+    "ts-tqdm": "^0.8.6"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250224.0",