@opennextjs/cloudflare 1.7.0 → 1.8.0

package/dist/api/overrides/cache-purge/index.js

@@ -1,3 +1,4 @@
+import { error } from "@opennextjs/aws/adapters/logger.js";
 import { getCloudflareContext } from "../../cloudflare-context.js";
 import { debugCache, internalPurgeCacheByTags } from "../internal.js";
 export const purgeCache = ({ type = "direct" }) => {
@@ -13,7 +14,7 @@ export const purgeCache = ({ type = "direct" }) => {
             else {
                 const durableObject = env.NEXT_CACHE_DO_PURGE;
                 if (!durableObject) {
-                    debugCache("cdnInvalidation", "No durable object found. Skipping cache purge.");
+                    error("Purge cache: NEXT_CACHE_DO_PURGE not found. Skipping cache purge.");
                     return;
                 }
                 const id = durableObject.idFromName("cache-purge");

package/dist/api/overrides/internal.js

@@ -1,4 +1,5 @@
 import { createHash } from "node:crypto";
+import { error } from "@opennextjs/aws/adapters/logger.js";
 import { getCloudflareContext } from "../cloudflare-context.js";
 export const debugCache = (name, ...args) => {
     if (process.env.NEXT_PRIVATE_DEBUG_CACHE) {
@@ -29,9 +30,9 @@ export async function purgeCacheByTags(tags) {
     }
 }
 export async function internalPurgeCacheByTags(env, tags) {
-    if (!env.CACHE_PURGE_ZONE_ID && !env.CACHE_PURGE_API_TOKEN) {
+    if (!env.CACHE_PURGE_ZONE_ID || !env.CACHE_PURGE_API_TOKEN) {
         // THIS IS A NO-OP
-        debugCache("purgeCacheByTags", "No cache zone ID or API token provided. Skipping cache purge.");
+        error("No cache zone ID or API token provided. Skipping cache purge.");
         return "missing-credentials";
     }
     let response;
@@ -48,12 +49,12 @@ export async function internalPurgeCacheByTags(env, tags) {
         });
         if (response.status === 429) {
             // Rate limit exceeded
-            debugCache("purgeCacheByTags", "Rate limit exceeded. Skipping cache purge.");
+            error("purgeCacheByTags: Rate limit exceeded. Skipping cache purge.");
             return "rate-limit-exceeded";
         }
         const bodyResponse = (await response.json());
         if (!bodyResponse.success) {
-            debugCache("purgeCacheByTags", "Cache purge failed. Errors:", bodyResponse.errors.map((error) => `${error.code}: ${error.message}`));
+            error("purgeCacheByTags: Cache purge failed. Errors:", bodyResponse.errors.map((error) => `${error.code}: ${error.message}`));
             return "purge-failed";
         }
         debugCache("purgeCacheByTags", "Cache purged successfully for tags:", tags);

package/dist/cli/build/patches/plugins/next-server.d.ts

@@ -22,3 +22,23 @@ export declare const buildIdRule = "\nrule:\n  pattern:\n    selector: method_de
  */
 export declare function createCacheHandlerRule(handlerPath: string): string;
 export declare function createComposableCacheHandlersRule(handlerPath: string): string;
+/**
+ * `attachRequestMeta` sets `initUrl` to always be with `https` cause this.fetchHostname && this.port is undefined in our case.
+ * this.nextConfig.experimental.trustHostHeader is also true.
+ *
+ * This patch checks if the original protocol was "http:" and rewrites the `initUrl` to reflect the actual host protocol.
+ * It will make `request.url` in route handlers end up with the correct protocol.
+ *
+ * Note: We cannot use the already defined `initURL` we passed in as requestMetaData to NextServer's request handler as pages router
+ * data routes would fail. It would miss the `_next/data` part in the path in that case.
+ *
+ * Therefor we just replace the protocol if necessary in the value from this template string:
+ * https://github.com/vercel/next.js/blob/ea08bf27/packages/next/src/server/next-server.ts#L1920
+ *
+ * Affected lines:
+ * https://github.com/vercel/next.js/blob/ea08bf27/packages/next/src/server/next-server.ts#L1916-L1923
+ *
+ * Callstack: handleRequest-> handleRequestImpl -> attachRequestMeta
+ *
+ */
+export declare const attachRequestMetaRule = "\nrule:\n  kind: identifier\n  regex: ^initUrl$\n  inside:\n    kind: arguments\n    all:\n      - has: {kind: identifier, regex: ^req$}\n      - has: {kind: string, regex: initURL}\n    inside:\n      kind: call_expression\n      all:\n        - has: {kind: parenthesized_expression, regex: '0'}\n        - has: { regex: _requestmeta.addRequestMeta}\n      inside:\n        kind: expression_statement\n        inside:\n          kind: statement_block\n          inside:\n            kind: method_definition\n            has:\n              kind: property_identifier\n              regex: ^attachRequestMeta$\nfix:\n  'req[Symbol.for(\"NextInternalRequestMeta\")]?.initProtocol === \"http:\" && initUrl.startsWith(\"https://\") ? `http://${initUrl.slice(8)}`: initUrl'";

package/dist/cli/build/patches/plugins/next-server.js

@@ -28,6 +28,7 @@ export function patchNextServer(updater, buildOpts) {
                 contents = patchCode(contents, createComposableCacheHandlersRule(composableCacheHandler));
                 // Node middleware are not supported on Cloudflare yet
                 contents = patchCode(contents, disableNodeMiddlewareRule);
+                contents = patchCode(contents, attachRequestMetaRule);
                 return contents;
             },
         },
@@ -100,3 +101,47 @@ fix: |-
   globalThis[handlersSetSymbol] = new Set(globalThis[handlersMapSymbol].values());
 `;
 }
+/**
+ * `attachRequestMeta` sets `initUrl` to always be with `https` cause this.fetchHostname && this.port is undefined in our case.
+ * this.nextConfig.experimental.trustHostHeader is also true.
+ *
+ * This patch checks if the original protocol was "http:" and rewrites the `initUrl` to reflect the actual host protocol.
+ * It will make `request.url` in route handlers end up with the correct protocol.
+ *
+ * Note: We cannot use the already defined `initURL` we passed in as requestMetaData to NextServer's request handler as pages router
+ * data routes would fail. It would miss the `_next/data` part in the path in that case.
+ *
+ * Therefor we just replace the protocol if necessary in the value from this template string:
+ * https://github.com/vercel/next.js/blob/ea08bf27/packages/next/src/server/next-server.ts#L1920
+ *
+ * Affected lines:
+ * https://github.com/vercel/next.js/blob/ea08bf27/packages/next/src/server/next-server.ts#L1916-L1923
+ *
+ * Callstack: handleRequest-> handleRequestImpl -> attachRequestMeta
+ *
+ */
+export const attachRequestMetaRule = `
+rule:
+  kind: identifier
+  regex: ^initUrl$
+  inside:
+    kind: arguments
+    all:
+      - has: {kind: identifier, regex: ^req$}
+      - has: {kind: string, regex: initURL}
+    inside:
+      kind: call_expression
+      all:
+        - has: {kind: parenthesized_expression, regex: '0'}
+        - has: { regex: _requestmeta.addRequestMeta}
+      inside:
+        kind: expression_statement
+        inside:
+          kind: statement_block
+          inside:
+            kind: method_definition
+            has:
+              kind: property_identifier
+              regex: ^attachRequestMeta$
+fix:
+  'req[Symbol.for("NextInternalRequestMeta")]?.initProtocol === "http:" && initUrl.startsWith("https://") ? \`http://\${initUrl.slice(8)}\`: initUrl'`;

package/dist/cli/build/utils/create-config-files.d.ts

@@ -15,5 +15,6 @@ export declare function getLatestCompatDate(): Promise<string | undefined>;
  * If the user refuses an error is thrown (since the file is mandatory).
  *
  * @param sourceDir The source directory for the project
+ * @return The path to the created source file
  */
-export declare function createOpenNextConfigIfNotExistent(sourceDir: string): Promise<void>;
+export declare function createOpenNextConfigIfNotExistent(sourceDir: string): Promise<string>;

package/dist/cli/build/utils/create-config-files.js

@@ -67,6 +67,7 @@ export async function getLatestCompatDate() {
  * If the user refuses an error is thrown (since the file is mandatory).
  *
  * @param sourceDir The source directory for the project
+ * @return The path to the created source file
  */
 export async function createOpenNextConfigIfNotExistent(sourceDir) {
     const openNextConfigPath = join(sourceDir, "open-next.config.ts");
@@ -77,4 +78,5 @@ export async function createOpenNextConfigIfNotExistent(sourceDir) {
         }
         cpSync(join(getPackageTemplatesDirPath(), "open-next.config.ts"), openNextConfigPath);
     }
+    return openNextConfigPath;
 }

package/dist/cli/commands/build.js

@@ -7,7 +7,7 @@ import { compileConfig, getNormalizedOptions, nextAppDir, printHeaders, readWran
  */
 async function buildCommand(args) {
     printHeaders("build");
-    const { config, buildDir } = await compileConfig();
+    const { config, buildDir } = await compileConfig(args.openNextConfigPath);
     const options = getNormalizedOptions(config, buildDir);
     const wranglerConfig = readWranglerConfig(args);
     await buildImpl(options, config, { ...args, minify: !args.noMinify, sourceDir: nextAppDir }, wranglerConfig);
@@ -34,5 +34,9 @@ export function addBuildCommand(y) {
         type: "boolean",
         default: ["1", "true", "yes"].includes(String(process.env.SKIP_WRANGLER_CONFIG_CHECK)),
         desc: "Skip checking for a Wrangler config",
+    })
+        .option("openNextConfigPath", {
+        type: "string",
+        desc: "Path to the OpenNext configuration file",
     }), (args) => buildCommand(withWranglerPassthroughArgs(args)));
 }

package/dist/cli/commands/deploy.js

@@ -15,14 +15,14 @@ export async function deployCommand(args) {
     const options = getNormalizedOptions(config);
     const wranglerConfig = readWranglerConfig(args);
     const envVars = await getEnvFromPlatformProxy({
-        configPath: args.configPath,
+        configPath: args.wranglerConfigPath,
         environment: args.env,
     });
     const deploymentMapping = await getDeploymentMapping(options, config, envVars);
     await populateCache(options, config, wranglerConfig, {
         target: "remote",
         environment: args.env,
-        configPath: args.configPath,
+        wranglerConfigPath: args.wranglerConfigPath,
         cacheChunkSize: args.cacheChunkSize,
     });
     runWrangler(options, [

package/dist/cli/commands/populate-cache.d.ts

@@ -13,7 +13,7 @@ export declare function getCacheAssets(opts: BuildOptions): CacheAsset[];
 type PopulateCacheOptions = {
     target: WranglerTarget;
     environment?: string;
-    configPath?: string;
+    wranglerConfigPath?: string;
     cacheChunkSize?: number;
 };
 export declare function populateCache(options: BuildOptions, config: OpenNextConfig, wranglerConfig: WranglerConfig, populateCacheOptions: PopulateCacheOptions): Promise<void>;
@@ -24,6 +24,8 @@ export declare function populateCache(options: BuildOptions, config: OpenNextCon
  */
 export declare function addPopulateCacheCommand<T extends yargs.Argv>(y: T): yargs.Argv<{}>;
 export declare function withPopulateCacheOptions<T extends yargs.Argv>(args: T): yargs.Argv<{
+    config: string | undefined;
+} & {
     configPath: string | undefined;
 } & {
     env: string | undefined;

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

@@ -76,7 +76,7 @@ async function populateR2IncrementalCache(options, config, populateCacheOptions)
             `--file ${quoteShellMeta(fullPath)}`,
         ], {
             target: populateCacheOptions.target,
-            configPath: populateCacheOptions.configPath,
+            configPath: populateCacheOptions.wranglerConfigPath,
             // 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'.
             environment: undefined,
@@ -113,7 +113,7 @@ async function populateKVIncrementalCache(options, config, populateCacheOptions)
         runWrangler(options, ["kv bulk put", quoteShellMeta(chunkPath), `--binding ${KV_CACHE_BINDING_NAME}`], {
             target: populateCacheOptions.target,
             environment: populateCacheOptions.environment,
-            configPath: populateCacheOptions.configPath,
+            configPath: populateCacheOptions.wranglerConfigPath,
             logging: "error",
         });
         rmSync(chunkPath);
@@ -133,7 +133,7 @@ function populateD1TagCache(options, config, populateCacheOptions) {
     ], {
         target: populateCacheOptions.target,
         environment: populateCacheOptions.environment,
-        configPath: populateCacheOptions.configPath,
+        configPath: populateCacheOptions.wranglerConfigPath,
         logging: "error",
     });
     logger.info("\nSuccessfully created D1 table");
@@ -189,7 +189,7 @@ async function populateCacheCommand(target, args) {
     await populateCache(options, config, wranglerConfig, {
         target,
         environment: args.env,
-        configPath: args.configPath,
+        wranglerConfigPath: args.wranglerConfigPath,
         cacheChunkSize: args.cacheChunkSize,
     });
 }

package/dist/cli/commands/preview.js

@@ -14,7 +14,7 @@ export async function previewCommand(args) {
     await populateCache(options, config, wranglerConfig, {
         target: "local",
         environment: args.env,
-        configPath: args.configPath,
+        wranglerConfigPath: args.wranglerConfigPath,
         cacheChunkSize: args.cacheChunkSize,
     });
     runWrangler(options, ["dev", ...args.wranglerArgs], { logging: "all" });

package/dist/cli/commands/upload.js

@@ -15,14 +15,14 @@ export async function uploadCommand(args) {
     const options = getNormalizedOptions(config);
     const wranglerConfig = readWranglerConfig(args);
     const envVars = await getEnvFromPlatformProxy({
-        configPath: args.configPath,
+        configPath: args.wranglerConfigPath,
         environment: args.env,
     });
     const deploymentMapping = await getDeploymentMapping(options, config, envVars);
     await populateCache(options, config, wranglerConfig, {
         target: "remote",
         environment: args.env,
-        configPath: args.configPath,
+        wranglerConfigPath: args.wranglerConfigPath,
         cacheChunkSize: args.cacheChunkSize,
     });
     runWrangler(options, [

package/dist/cli/commands/utils.d.ts

@@ -2,7 +2,7 @@ import type yargs from "yargs";
 import type { OpenNextConfig } from "../../api/config.js";
 export type WithWranglerArgs<T = unknown> = T & {
     wranglerArgs: string[];
-    configPath: string | undefined;
+    wranglerConfigPath: string | undefined;
     env: string | undefined;
 };
 export declare const nextAppDir: string;
@@ -13,11 +13,17 @@ export declare const nextAppDir: string;
  */
 export declare function printHeaders(command: string): void;
 /**
- * Compile the OpenNext config, and ensure it is for Cloudflare.
+ * Compile the OpenNext config.
+ *
+ * When users do not specify a custom config file (using `--openNextConfigPath`),
+ * the CLI will offer to create one.
+ *
+ * When users specify a custom config file but it doesn't exist, we throw an Error.
  *
+ * @param configPath Optional path to the config file. Absolute or relative to cwd.
  * @returns OpenNext config.
  */
-export declare function compileConfig(): Promise<{
+export declare function compileConfig(configPath: string | undefined): Promise<{
     config: import("@opennextjs/aws/types/open-next.js").OpenNextConfig;
     buildDir: string;
 }>;
@@ -64,18 +70,21 @@ export declare function readWranglerConfig(args: WithWranglerArgs): import("wran
  * Adds flags for the wrangler config path and environment to the yargs configuration.
  */
 export declare function withWranglerOptions<T extends yargs.Argv>(args: T): yargs.Argv<{
+    config: string | undefined;
+} & {
     configPath: string | undefined;
 } & {
     env: string | undefined;
 }>;
+type WranglerInputArgs = {
+    configPath: string | undefined;
+    config: string | undefined;
+    env: string | undefined;
+};
 /**
  *
  * @param args
  * @returns The inputted args, and an array of arguments that can be given to wrangler commands, including the `--config` and `--env` args.
  */
-export declare function withWranglerPassthroughArgs<T extends yargs.ArgumentsCamelCase<{
-    configPath: string | undefined;
-    env: string | undefined;
-}>>(args: T): T & {
-    wranglerArgs: string[];
-};
+export declare function withWranglerPassthroughArgs<T extends yargs.ArgumentsCamelCase<WranglerInputArgs>>(args: T): WithWranglerArgs<T>;
+export {};

package/dist/cli/commands/utils.js

@@ -18,13 +18,25 @@ export function printHeaders(command) {
     showWarningOnWindows();
 }
 /**
- * Compile the OpenNext config, and ensure it is for Cloudflare.
+ * Compile the OpenNext config.
  *
+ * When users do not specify a custom config file (using `--openNextConfigPath`),
+ * the CLI will offer to create one.
+ *
+ * When users specify a custom config file but it doesn't exist, we throw an Error.
+ *
+ * @param configPath Optional path to the config file. Absolute or relative to cwd.
  * @returns OpenNext config.
  */
-export async function compileConfig() {
-    await createOpenNextConfigIfNotExistent(nextAppDir);
-    const { config, buildDir } = await compileOpenNextConfig(nextAppDir, undefined, { compileEdge: true });
+export async function compileConfig(configPath) {
+    if (configPath && !existsSync(configPath)) {
+        throw new Error(`Custom config file not found at ${configPath}`);
+    }
+    if (!configPath) {
+        configPath = await createOpenNextConfigIfNotExistent(nextAppDir);
+    }
+    // TODO: remove the hack passing the `configPath` as the `baseDir` when https://github.com/opennextjs/opennextjs-aws/pull/972 is merged
+    const { config, buildDir } = await compileOpenNextConfig(configPath, "", { compileEdge: true });
     ensureCloudflareConfig(config);
     return { config, buildDir };
 }
@@ -64,19 +76,24 @@ export function getNormalizedOptions(config, buildDir = nextAppDir) {
  * @returns Wrangler config.
  */
 export function readWranglerConfig(args) {
-    return unstable_readConfig({ env: args.env, config: args.configPath });
+    return unstable_readConfig({ env: args.env, config: args.wranglerConfigPath });
 }
 /**
  * Adds flags for the wrangler config path and environment to the yargs configuration.
  */
 export function withWranglerOptions(args) {
     return args
-        .options("configPath", {
+        .option("config", {
         type: "string",
-        alias: ["config", "c"],
+        alias: "c",
         desc: "Path to Wrangler configuration file",
     })
-        .options("env", {
+        .option("configPath", {
+        type: "string",
+        desc: "Path to Wrangler configuration file",
+        deprecated: true,
+    })
+        .option("env", {
         type: "string",
         alias: "e",
         desc: "Wrangler environment to use for operations",
@@ -88,8 +105,16 @@ export function withWranglerOptions(args) {
  * @returns An array of arguments that can be given to wrangler commands, including the `--config` and `--env` args.
  */
 function getWranglerArgs(args) {
+    if (args.configPath) {
+        logger.warn("The `--configPath` flag is deprecated, please use `--config` instead.");
+        if (args.config) {
+            logger.error("Multiple config flags found. Please use the `--config` flag for your Wrangler config path.");
+            process.exit(1);
+        }
+    }
     return [
         ...(args.configPath ? ["--config", args.configPath] : []),
+        ...(args.config ? ["--config", args.config] : []),
         ...(args.env ? ["--env", args.env] : []),
         // Note: the first args in `_` will be the commands.
         ...args._.slice(args._[0] === "populateCache" ? 2 : 1).map((a) => `${a}`),
@@ -101,5 +126,9 @@ function getWranglerArgs(args) {
  * @returns The inputted args, and an array of arguments that can be given to wrangler commands, including the `--config` and `--env` args.
  */
 export function withWranglerPassthroughArgs(args) {
-    return { ...args, wranglerArgs: getWranglerArgs(args) };
+    return {
+        ...args,
+        wranglerConfigPath: args.config ?? args.configPath,
+        wranglerArgs: getWranglerArgs(args),
+    };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"