re-use the manifest from the createcacheassets function

Author: james-elicx

packages/cloudflare/package.json

@@ -73,7 +73,7 @@
   "dependencies": {
     "@ast-grep/napi": "^0.34.1",
     "@dotenvx/dotenvx": "catalog:",
-    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@733",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@748",
     "enquirer": "^2.4.1",
     "glob": "catalog:",
     "yaml": "^2.7.0"

packages/cloudflare/src/cli/build/build.ts

@@ -87,9 +87,12 @@ export async function build(projectOpts: ProjectOptions): Promise<void> {
   createStaticAssets(options);
 
   if (config.dangerous?.disableIncrementalCache !== true) {
-    createCacheAssets(options);
+    const { metaFiles } = createCacheAssets(options);
     copyCacheAssets(options);
-    compileCacheAssetsManifestSqlFile(options);
+
+    if (config.dangerous?.disableTagCache !== true) {
+      compileCacheAssetsManifestSqlFile(options, metaFiles);
+    }
   }
 
   await createServerBundle(options);

packages/cloudflare/src/cli/build/open-next/compile-cache-assets-manifest.ts

@@ -1,20 +1,13 @@
-import { appendFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { appendFileSync, mkdirSync, writeFileSync } from "node:fs";
 import path from "node:path";
 
 import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
-
-type RawManifest = {
-  tag: { S: string };
-  path: { S: string };
-  revalidatedAt: { N: string };
-}[];
+import type { TagCacheMetaFile } from "@opennextjs/aws/types/open-next.js";
 
 /**
  * Generates SQL statements that can be used to initialise the cache assets manifest in an SQL data store.
  */
-export function compileCacheAssetsManifestSqlFile(options: BuildOptions) {
-  // TODO: Expose the function for getting this data as an adapter-agnostic utility in AWS.
-  const rawManifestPath = path.join(options.outputDir, "dynamodb-provider/dynamodb-cache.json");
+export function compileCacheAssetsManifestSqlFile(options: BuildOptions, metaFiles: TagCacheMetaFile[]) {
   const outputPath = path.join(options.outputDir, "cloudflare/cache-assets-manifest.sql");
 
   const tagsTable = process.env.NEXT_CACHE_D1_TAGS_TABLE || "tags";
@@ -27,18 +20,12 @@ export function compileCacheAssetsManifestSqlFile(options: BuildOptions) {
      CREATE TABLE IF NOT EXISTS ${JSON.stringify(revalidationsTable)} (tag TEXT NOT NULL, revalidatedAt INTEGER NOT NULL, UNIQUE(tag) ON CONFLICT REPLACE);\n`
   );
 
-  if (existsSync(rawManifestPath)) {
-    const rawManifest: RawManifest = JSON.parse(readFileSync(rawManifestPath, "utf-8"));
+  const values = metaFiles.map(({ tag, path }) => `(${JSON.stringify(tag.S)}, ${JSON.stringify(path.S)})`);
 
-    const values = rawManifest.map(
-      ({ tag, path }) => `(${JSON.stringify(tag.S)}, ${JSON.stringify(path.S)})`
+  if (values.length) {
+    appendFileSync(
+      outputPath,
+      `INSERT INTO ${JSON.stringify(tagsTable)} (tag, path) VALUES ${values.join(", ")};`
     );
-
-    if (values.length) {
-      appendFileSync(
-        outputPath,
-        `INSERT INTO ${JSON.stringify(tagsTable)} (tag, path) VALUES ${values.join(", ")};`
-      );
-    }
   }
 }