@opennextjs/cloudflare 1.16.3 → 1.16.4

package/dist/cli/build/utils/files.d.ts

@@ -6,6 +6,10 @@
  *
  * @param filepath The path to the file.
  * @param text The text to append to the file.
- * @param condition A function that receives the current file content and returns `true` if the text should be appended to it, the condition is skipped when the file is being created.
+ * @param opts.appendIf A function that receives the current file content and returns `true` if the text should be appended to it, the condition is skipped when the file is being created. Defaults to a function that always returns true.
+ * @param opts.appendPrefix A string that will be inserted between the pre-existing file's content and the new text in case the file already existed. Defaults to an empty string.
  */
-export declare function conditionalAppendFileSync(filepath: string, text: string, condition: (fileContent: string) => boolean): void;
+export declare function conditionalAppendFileSync(filepath: string, text: string, { appendIf, appendPrefix, }?: {
+    appendIf?: (fileContent: string) => boolean;
+    appendPrefix?: string;
+}): void;

package/dist/cli/build/utils/files.js

@@ -1,4 +1,5 @@
 import fs from "node:fs";
+import path from "node:path";
 /**
  * Appends text to a file
  *
@@ -7,11 +8,17 @@ import fs from "node:fs";
  *
  * @param filepath The path to the file.
  * @param text The text to append to the file.
- * @param condition A function that receives the current file content and returns `true` if the text should be appended to it, the condition is skipped when the file is being created.
+ * @param opts.appendIf A function that receives the current file content and returns `true` if the text should be appended to it, the condition is skipped when the file is being created. Defaults to a function that always returns true.
+ * @param opts.appendPrefix A string that will be inserted between the pre-existing file's content and the new text in case the file already existed. Defaults to an empty string.
  */
-export function conditionalAppendFileSync(filepath, text, condition) {
+export function conditionalAppendFileSync(filepath, text, { appendIf = () => true, appendPrefix = "", } = {}) {
     const fileExists = fs.existsSync(filepath);
-    if (!fileExists || condition(fs.readFileSync(filepath, "utf8"))) {
-        fs.appendFileSync(filepath, text);
+    const maybeFileContent = fileExists ? fs.readFileSync(filepath, "utf8") : "";
+    if (!fileExists) {
+        const dir = path.dirname(filepath);
+        fs.mkdirSync(dir, { recursive: true });
+    }
+    if (!fileExists || appendIf(maybeFileContent)) {
+        fs.appendFileSync(filepath, `${maybeFileContent.length > 0 ? appendPrefix : ""}${text}`);
     }
 }

package/dist/cli/commands/build.js

@@ -26,7 +26,7 @@ async function buildCommand(args) {
  * Consumes 1 positional parameter.
  */
 export function addBuildCommand(y) {
-    return y.command("build", "Build an OpenNext Cloudflare worker", (c) => withWranglerOptions(c)
+    return y.command("build [args..]", "Build an OpenNext Cloudflare worker", (c) => withWranglerOptions(c)
         .option("skipNextBuild", {
         type: "boolean",
         alias: ["skipBuild", "s"],

package/dist/cli/commands/deploy.js

@@ -46,5 +46,5 @@ export async function deployCommand(args) {
  * Consumes 1 positional parameter.
  */
 export function addDeployCommand(y) {
-    return y.command("deploy", "Deploy a built OpenNext app to Cloudflare Workers", (c) => withPopulateCacheOptions(c), (args) => deployCommand(withWranglerPassthroughArgs(args)));
+    return y.command("deploy [args..]", "Deploy a built OpenNext app to Cloudflare Workers", (c) => withPopulateCacheOptions(c), (args) => deployCommand(withWranglerPassthroughArgs(args)));
 }

package/dist/cli/commands/migrate.js

@@ -49,12 +49,18 @@ async function migrateCommand(args) {
     await createOpenNextConfigFile("./");
     const devVarsExists = fs.existsSync(".dev.vars");
     printStepTitle(`${devVarsExists ? "Updating" : "Creating"} .dev.vars file`);
-    conditionalAppendFileSync(".dev.vars", "\nNEXTJS_ENV=development\n", (content) => !/\bNEXTJS_ENV\b/.test(content));
+    conditionalAppendFileSync(".dev.vars", "NEXTJS_ENV=development\n", {
+        appendIf: (content) => !/\bNEXTJS_ENV\b/.test(content),
+        appendPrefix: "\n",
+    });
     printStepTitle(`${fs.existsSync("public/_headers") ? "Updating" : "Creating"} public/_headers file`);
-    conditionalAppendFileSync("public/_headers", "\n\n# https://developers.cloudflare.com/workers/static-assets/headers\n" +
+    conditionalAppendFileSync("public/_headers", "# https://developers.cloudflare.com/workers/static-assets/headers\n" +
         "# https://opennext.js.org/cloudflare/caching#static-assets-caching\n" +
         "/_next/static/*\n" +
-        "  Cache-Control: public,max-age=31536000,immutable\n\n", (content) => !/^\/_next\/static\/*\b/.test(content));
+        "  Cache-Control: public,max-age=31536000,immutable\n", {
+        appendIf: (content) => !/^\/_next\/static\/*\b/.test(content),
+        appendPrefix: "\n\n",
+    });
     printStepTitle("Updating package.json scripts");
     const openNextScripts = {
         preview: "opennextjs-cloudflare build && opennextjs-cloudflare preview",
@@ -82,9 +88,18 @@ async function migrateCommand(args) {
     }
     const gitIgnoreExists = fs.existsSync(".gitignore");
     printStepTitle(`${gitIgnoreExists ? "Updating" : "Creating"} .gitignore file`);
-    conditionalAppendFileSync(".gitignore", "\n# OpenNext\n.open-next\n", (content) => !content.includes(".open-next"));
-    printStepTitle("Updating Next.js config");
-    conditionalAppendFileSync(findNextConfig({ appPath: projectDir }), "\nimport('@opennextjs/cloudflare').then(m => m.initOpenNextCloudflareForDev());\n", (content) => !content.includes("initOpenNextCloudflareForDev"));
+    conditionalAppendFileSync(".gitignore", "# OpenNext\n.open-next\n", {
+        appendIf: (content) => !content.includes(".open-next"),
+        appendPrefix: "\n",
+    });
+    const nextConfig = findNextConfig({ appPath: projectDir });
+    if (nextConfig) {
+        printStepTitle("Updating Next.js config");
+        conditionalAppendFileSync(nextConfig.path, "import('@opennextjs/cloudflare').then(m => m.initOpenNextCloudflareForDev());\n", {
+            appendIf: (content) => !content.includes("initOpenNextCloudflareForDev"),
+            appendPrefix: "\n",
+        });
+    }
     printStepTitle("Checking for edge runtime usage");
     try {
         const extensions = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".mts"];

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

@@ -219,8 +219,8 @@ function populateStaticAssetsIncrementalCache(options) {
  */
 export function addPopulateCacheCommand(y) {
     return y.command("populateCache", "Populate the cache for a built Next.js app", (c) => c
-        .command("local", "Local dev server cache", (c) => withPopulateCacheOptions(c), (args) => populateCacheCommand("local", withWranglerPassthroughArgs(args)))
-        .command("remote", "Remote Cloudflare Worker cache", (c) => withPopulateCacheOptions(c), (args) => populateCacheCommand("remote", withWranglerPassthroughArgs(args)))
+        .command("local [args..]", "Local dev server cache", (c) => withPopulateCacheOptions(c), (args) => populateCacheCommand("local", withWranglerPassthroughArgs(args)))
+        .command("remote [args..]", "Remote Cloudflare Worker cache", (c) => withPopulateCacheOptions(c), (args) => populateCacheCommand("remote", withWranglerPassthroughArgs(args)))
         .demandCommand(1, 1));
 }
 export function withPopulateCacheOptions(args) {

package/dist/cli/commands/preview.js

@@ -28,7 +28,7 @@ export async function previewCommand(args) {
  * Consumes 1 positional parameter.
  */
 export function addPreviewCommand(y) {
-    return y.command("preview", "Preview a built OpenNext app with a Wrangler dev server", (c) => withPopulateCacheOptions(c).option("remote", {
+    return y.command("preview [args..]", "Preview a built OpenNext app with a Wrangler dev server", (c) => withPopulateCacheOptions(c).option("remote", {
         type: "boolean",
         alias: "r",
         default: false,

package/dist/cli/commands/upload.js

@@ -40,5 +40,5 @@ export async function uploadCommand(args) {
  * Consumes 1 positional parameter.
  */
 export function addUploadCommand(y) {
-    return y.command("upload", "Upload a built OpenNext app to Cloudflare Workers", (c) => withPopulateCacheOptions(c), (args) => uploadCommand(withWranglerPassthroughArgs(args)));
+    return y.command("upload [args..]", "Upload a built OpenNext app to Cloudflare Workers", (c) => withPopulateCacheOptions(c), (args) => uploadCommand(withWranglerPassthroughArgs(args)));
 }

package/dist/cli/commands/utils.js

@@ -120,8 +120,8 @@ function getWranglerArgs(args) {
         ...(args.config ? ["--config", args.config] : []),
         ...(args.env ? ["--env", args.env] : []),
         ...(args.remote ? ["--remote"] : []),
-        // Note: the first args in `_` will be the commands.
-        ...args._.slice(args._[0] === "populateCache" ? 2 : 1).map((a) => `${a}`),
+        // Note: the `args` array contains unrecognised flags.
+        ...(args.args?.map((a) => `${a}`) ?? []),
     ];
 }
 /**

package/dist/cli/index.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
+import logger from "@opennextjs/aws/logger.js";
 import yargs from "yargs";
+import { getVersion } from "./build/utils/version.js";
 import { addBuildCommand } from "./commands/build.js";
 import { addDeployCommand } from "./commands/deploy.js";
 import { addMigrateCommand } from "./commands/migrate.js";
@@ -9,7 +11,22 @@ import { addUploadCommand } from "./commands/upload.js";
 export function runCommand() {
     const y = yargs(process.argv.slice(2).filter((arg) => arg !== "--"))
         .scriptName("opennextjs-cloudflare")
-        .parserConfiguration({ "unknown-options-as-args": true });
+        .parserConfiguration({ "unknown-options-as-args": true })
+        .strictCommands()
+        .help()
+        .alias("h", "help")
+        .version(getVersion().cloudflare)
+        .alias("v", "version")
+        .fail((msg, err, yargs) => {
+        if (msg) {
+            logger.error(`${msg}\n`);
+        }
+        if (err) {
+            throw err;
+        }
+        yargs.showHelp();
+        process.exit(1);
+    });
     addBuildCommand(y);
     addPreviewCommand(y);
     addDeployCommand(y);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "1.16.3",
+  "version": "1.16.4",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -44,7 +44,7 @@
   "dependencies": {
     "@ast-grep/napi": "^0.40.5",
     "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "3.9.15",
+    "@opennextjs/aws": "3.9.16",
     "cloudflare": "^4.4.1",
     "enquirer": "^2.4.1",
     "glob": "^12.0.0",