add other commands

Author: james-elicx

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

@@ -4,4 +4,3 @@ export * from "./ensure-cf-config.js";
 export * from "./extract-project-env-vars.js";
 export * from "./needs-experimental-react.js";
 export * from "./normalize-path.js";
-export * from "./populate-cache.js";

packages/cloudflare/src/cli/deploy/deploy.ts

@@ -1,4 +1,10 @@
 import { BuildOptions } from "@opennextjs/aws/build/helper.js";
 import { OpenNextConfig } from "@opennextjs/aws/types/open-next.js";
 
-export async function deploy(options: BuildOptions, config: OpenNextConfig) {}
+import { populateCache } from "../populate-cache/populate-cache.js";
+import { runWrangler } from "../utils/run-wrangler.js";
+
+export async function deploy(options: BuildOptions, config: OpenNextConfig) {
+  await populateCache(options, config, { target: "remote" });
+  runWrangler(options, ["dev"], { logging: "all" });
+}

packages/cloudflare/src/cli/index.ts

@@ -36,7 +36,7 @@ async function runCommand(args: Arguments) {
 
   switch (args.command) {
     case "build":
-      return build(options, config, args);
+      return build(options, config, { ...args, sourceDir: baseDir });
     case "preview":
       return preview(options, config);
     case "deploy":

packages/cloudflare/src/cli/populate-cache/populate-cache.ts

@@ -65,11 +65,11 @@ export async function populateCache(
             destPath
           );
 
-          runWrangler(options.packager, { ...populateCacheOptions, excludeRemoteFlag: true }, [
-            "r2 object put",
-            JSON.stringify(fullDestPath),
-            `--file ${JSON.stringify(fsPath)}`,
-          ]);
+          runWrangler(
+            options,
+            ["r2 object put", JSON.stringify(fullDestPath), `--file ${JSON.stringify(fsPath)}`],
+            { ...populateCacheOptions, excludeRemoteFlag: true, logging: "error" }
+          );
         });
         logger.info(`Successfully populated cache with ${assets.length} assets`);
         break;
@@ -85,11 +85,15 @@ export async function populateCache(
       case "d1-tag-cache": {
         logger.info("\nPopulating D1 tag cache...");
 
-        runWrangler(options.packager, populateCacheOptions, [
-          "d1 execute",
-          "NEXT_CACHE_D1",
-          `--file ${JSON.stringify(path.join(options.outputDir, "cloudflare/cache-assets-manifest.sql"))}`,
-        ]);
+        runWrangler(
+          options,
+          [
+            "d1 execute",
+            "NEXT_CACHE_D1",
+            `--file ${JSON.stringify(path.join(options.outputDir, "cloudflare/cache-assets-manifest.sql"))}`,
+          ],
+          { ...populateCacheOptions, logging: "error" }
+        );
         logger.info("Successfully populated cache");
         break;
       }

packages/cloudflare/src/cli/preview/preview.ts

@@ -1,4 +1,10 @@
 import { BuildOptions } from "@opennextjs/aws/build/helper.js";
 import { OpenNextConfig } from "@opennextjs/aws/types/open-next.js";
 
-export async function preview(options: BuildOptions, config: OpenNextConfig) {}
+import { populateCache } from "../populate-cache/populate-cache";
+import { runWrangler } from "../utils/run-wrangler";
+
+export async function preview(options: BuildOptions, config: OpenNextConfig) {
+  await populateCache(options, config, { target: "local" });
+  runWrangler(options, ["dev"], { logging: "all" });
+}

packages/cloudflare/src/cli/project-options.ts

@@ -1,4 +1,6 @@
 export type ProjectOptions = {
+  // Next app root folder
+  sourceDir: string;
   // Whether the Next.js build should be skipped (i.e. if the `.next` dir is already built)
   skipNextBuild: boolean;
   // Whether the check to see if a wrangler config file exists should be skipped

packages/cloudflare/src/cli/utils/run-wrangler.ts

@@ -1,16 +1,17 @@
 import { spawnSync } from "node:child_process";
 
+import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
 import logger from "@opennextjs/aws/logger.js";
 
 export type WranglerTarget = "local" | "remote";
 
 export function runWrangler(
-  pm: string,
-  wranglerOpts: { target: WranglerTarget; excludeRemoteFlag?: boolean },
-  args: string[]
+  options: BuildOptions,
+  args: string[],
+  wranglerOpts: { target?: WranglerTarget; excludeRemoteFlag?: boolean; logging?: "all" | "error" } = {}
 ) {
   const result = spawnSync(
-    pm,
+    options.packager,
     [
       "exec",
       "wrangler",
@@ -20,7 +21,7 @@ export function runWrangler(
     ].filter((v): v is string => !!v),
     {
       shell: true,
-      stdio: ["ignore", "ignore", "inherit"],
+      stdio: wranglerOpts.logging === "error" ? ["ignore", "ignore", "inherit"] : "inherit",
     }
   );