@opennextjs/cloudflare 0.5.11 → 0.6.0

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

@@ -0,0 +1,41 @@
+import { spawnSync } from "node:child_process";
+import logger from "@opennextjs/aws/logger.js";
+export function runWrangler(options, args, wranglerOpts = {}) {
+    const result = spawnSync(options.packager, [
+        "exec",
+        "wrangler",
+        ...args,
+        wranglerOpts.environment && `--env ${wranglerOpts.environment}`,
+        wranglerOpts.target === "remote" && !wranglerOpts.excludeRemoteFlag && "--remote",
+        wranglerOpts.target === "local" && "--local",
+    ].filter((v) => !!v), {
+        shell: true,
+        stdio: wranglerOpts.logging === "error" ? ["ignore", "ignore", "inherit"] : "inherit",
+    });
+    if (result.status !== 0) {
+        logger.error("Wrangler command failed");
+        process.exit(1);
+    }
+}
+export function isWranglerTarget(v) {
+    return !!v && ["local", "remote"].includes(v);
+}
+/**
+ * Find the value of the environment flag (`--env` / `-e`) used by Wrangler.
+ *
+ * @param args - CLI arguments.
+ * @returns Value of the environment flag.
+ */
+export function getWranglerEnvironmentFlag(args) {
+    for (let i = 0; i <= args.length; i++) {
+        const arg = args[i];
+        if (!arg)
+            continue;
+        if (arg === "--env" || arg === "-e") {
+            return args[i + 1];
+        }
+        if (arg.startsWith("--env=") || arg.startsWith("-e=")) {
+            return arg.split("=")[1];
+        }
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.5.11",
+  "version": "0.6.0",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -41,6 +41,12 @@
     "url": "https://github.com/opennextjs/opennextjs-cloudflare/issues"
   },
   "homepage": "https://github.com/opennextjs/opennextjs-cloudflare",
+  "dependencies": {
+    "@dotenvx/dotenvx": "1.31.0",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@798",
+    "enquirer": "^2.4.1",
+    "glob": "^11.0.0"
+  },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250224.0",
     "@eslint/js": "^9.11.1",
@@ -60,16 +66,8 @@
     "typescript-eslint": "^8.7.0",
     "vitest": "^2.1.1"
   },
-  "dependencies": {
-    "@ast-grep/napi": "^0.36.1",
-    "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@7e23eee",
-    "enquirer": "^2.4.1",
-    "glob": "^11.0.0",
-    "yaml": "^2.7.0"
-  },
   "peerDependencies": {
-    "wrangler": "^3.111.0"
+    "wrangler": "^3.114.1 || ^4.0.0"
   },
   "scripts": {
     "clean": "rimraf dist",

package/templates/open-next.config.ts

@@ -1,6 +1,6 @@
 // default open-next.config.ts file created by @opennextjs/cloudflare
 import { defineCloudflareConfig } from "@opennextjs/cloudflare/config";
-import kvIncrementalCache from "@opennextjs/cloudflare/kv-cache";
+import kvIncrementalCache from "@opennextjs/cloudflare/overrides/incremental-cache/kv-incremental-cache";
 
 export default defineCloudflareConfig({
   incrementalCache: kvIncrementalCache,

package/templates/wrangler.jsonc

@@ -9,10 +9,10 @@
     "binding": "ASSETS"
   },
   "kv_namespaces": [
-    // Create a KV binding with the binding name "NEXT_CACHE_WORKERS_KV"
+    // Create a KV binding with the binding name "NEXT_INC_CACHE_KV"
     // to enable the KV based caching:
     // {
-    //   "binding": "NEXT_CACHE_WORKERS_KV",
+    //   "binding": "NEXT_INC_CACHE_KV",
     //   "id": "<BINDING_ID>"
     // }
   ]

package/dist/api/kvCache.d.ts

@@ -1,5 +0,0 @@
-import kvIncrementalCache from "./kv-cache.js";
-/**
- * @deprecated Please import from `kv-cache` instead of `kvCache`.
- */
-export default kvIncrementalCache;

package/dist/api/kvCache.js

@@ -1,5 +0,0 @@
-import kvIncrementalCache from "./kv-cache.js";
-/**
- * @deprecated Please import from `kv-cache` instead of `kvCache`.
- */
-export default kvIncrementalCache;

package/dist/cli/build/patches/ast/util.d.ts

@@ -1,50 +0,0 @@
-import { type Edit, Lang, type NapiConfig, type SgNode } from "@ast-grep/napi";
-/**
- * fix has the same meaning as in yaml rules
- * see https://ast-grep.github.io/guide/rewrite-code.html#using-fix-in-yaml-rule
- */
-export type RuleConfig = NapiConfig & {
-    fix?: string;
-};
-/**
- * Returns the `Edit`s and `Match`es for an ast-grep rule in yaml format
- *
- * The rule must have a `fix` to rewrite the matched node.
- *
- * Tip: use https://ast-grep.github.io/playground.html to create rules.
- *
- * @param rule The rule. Either a yaml string or an instance of `RuleConfig`
- * @param root The root node
- * @param once only apply once
- * @returns A list of edits and a list of matches.
- */
-export declare function applyRule(rule: string | RuleConfig, root: SgNode, { once }?: {
-    once?: boolean | undefined;
-}): {
-    edits: Edit[];
-    matches: SgNode<import("@ast-grep/napi/types/staticTypes").TypesMap, import("@ast-grep/napi/types/staticTypes").Kinds<import("@ast-grep/napi/types/staticTypes").TypesMap>>[];
-};
-/**
- * Parse a file and obtain its root.
- *
- * @param path The file path
- * @param lang The language to parse. Defaults to TypeScript.
- * @returns The root for the file.
- */
-export declare function parseFile(path: string, lang?: Lang): SgNode<import("@ast-grep/napi/types/staticTypes").TypesMap, import("@ast-grep/napi/types/staticTypes").Kinds<import("@ast-grep/napi/types/staticTypes").TypesMap>>;
-/**
- * Patches the code from by applying the rule.
- *
- * This function is mainly for on off edits and tests,
- * use `getRuleEdits` to apply multiple rules.
- *
- * @param code The source code
- * @param rule The astgrep rule (yaml or NapiConfig)
- * @param lang The language used by the source code
- * @param lang Whether to apply the rule only once
- * @returns The patched code
- */
-export declare function patchCode(code: string, rule: string | RuleConfig, { lang, once }?: {
-    lang?: Lang | undefined;
-    once?: boolean | undefined;
-}): string;

package/dist/cli/build/patches/ast/util.js

@@ -1,65 +0,0 @@
-import { readFileSync } from "node:fs";
-import { Lang, parse } from "@ast-grep/napi";
-import yaml from "yaml";
-/**
- * Returns the `Edit`s and `Match`es for an ast-grep rule in yaml format
- *
- * The rule must have a `fix` to rewrite the matched node.
- *
- * Tip: use https://ast-grep.github.io/playground.html to create rules.
- *
- * @param rule The rule. Either a yaml string or an instance of `RuleConfig`
- * @param root The root node
- * @param once only apply once
- * @returns A list of edits and a list of matches.
- */
-export function applyRule(rule, root, { once = false } = {}) {
-    const ruleConfig = typeof rule === "string" ? yaml.parse(rule) : rule;
-    if (ruleConfig.transform) {
-        throw new Error("transform is not supported");
-    }
-    if (!ruleConfig.fix) {
-        throw new Error("no fix to apply");
-    }
-    const fix = ruleConfig.fix;
-    const matches = once ? [root.find(ruleConfig)].filter((m) => m !== null) : root.findAll(ruleConfig);
-    const edits = [];
-    matches.forEach((match) => {
-        edits.push(match.replace(
-        // Replace known placeholders by their value
-        fix
-            .replace(/\$\$\$([A-Z0-9_]+)/g, (_m, name) => match
-            .getMultipleMatches(name)
-            .map((n) => n.text())
-            .join(""))
-            .replace(/\$([A-Z0-9_]+)/g, (m, name) => match.getMatch(name)?.text() ?? m)));
-    });
-    return { edits, matches };
-}
-/**
- * Parse a file and obtain its root.
- *
- * @param path The file path
- * @param lang The language to parse. Defaults to TypeScript.
- * @returns The root for the file.
- */
-export function parseFile(path, lang = Lang.TypeScript) {
-    return parse(lang, readFileSync(path, { encoding: "utf-8" })).root();
-}
-/**
- * Patches the code from by applying the rule.
- *
- * This function is mainly for on off edits and tests,
- * use `getRuleEdits` to apply multiple rules.
- *
- * @param code The source code
- * @param rule The astgrep rule (yaml or NapiConfig)
- * @param lang The language used by the source code
- * @param lang Whether to apply the rule only once
- * @returns The patched code
- */
-export function patchCode(code, rule, { lang = Lang.TypeScript, once = false } = {}) {
-    const node = parse(lang, code).root();
-    const { edits } = applyRule(rule, node, { once });
-    return node.commitEdits(edits);
-}

package/dist/cli/build/patches/ast/util.spec.js

@@ -1,43 +0,0 @@
-import { afterEach, describe, expect, it, vi } from "vitest";
-import { patchCode } from "./util.js";
-describe("patchCode", () => {
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-    it("should throw an error if rule has a transform", () => {
-        expect(() => patchCode(`console.log("hi")`, { rule: { pattern: "console.log($MSG)" }, transform: "not supported" })).toThrow(/not supported/);
-    });
-    it("should throw an error if rule has no fix", () => {
-        expect(() => patchCode(`console.log("hi")`, { rule: { pattern: "console.log($MSG)" } })).toThrow(/no fix/);
-    });
-    it("should accept yaml rules", () => {
-        const yamlRule = `
-rule:
-  pattern: a
-fix: b
-`;
-        expect(patchCode(`a`, yamlRule)).toEqual("b");
-    });
-    it("should apply fix to a single match when once is true", () => {
-        expect(patchCode(`a+a`, { rule: { pattern: "a" }, fix: "b" }, { once: true })).toEqual("b+a");
-    });
-    it("should apply fix to all matches when once is false (default)", () => {
-        expect(patchCode(`a+a`, { rule: { pattern: "a" }, fix: "b" })).toEqual("b+b");
-        expect(patchCode(`a+a`, { rule: { pattern: "a" }, fix: "b" }, { once: false })).toEqual("b+b");
-    });
-    it("should handle no matches", () => {
-        expect(patchCode(`a`, { rule: { pattern: "b" }, fix: "c" })).toEqual("a");
-    });
-    it("should replace $PLACEHOLDER with match text", () => {
-        expect(patchCode(`console.log(message)`, { rule: { pattern: "console.log($MSG)" }, fix: "$MSG" })).toEqual("message");
-    });
-    it("should handle $PLACEHODLERS that are not found in matches", () => {
-        expect(patchCode(`console.log(message)`, { rule: { pattern: "console.log($MSG)" }, fix: "$WHAT$$$WHAT" })).toEqual("$WHAT");
-    });
-    it("should replace $$$PLACEHOLDER with match text", () => {
-        expect(patchCode(`console.log("hello" + world, "!")`, {
-            rule: { pattern: "console.log($$$ARGS)" },
-            fix: "$$$ARGS",
-        })).toEqual(`"hello" + world,"!"`);
-    });
-});

package/dist/cli/build/patches/plugins/content-updater.d.ts

@@ -1,44 +0,0 @@
-/**
- * ESBuild stops calling `onLoad` hooks after the first hook returns an updated content.
- *
- * The updater allows multiple plugins to update the content.
- */
-import { type OnLoadOptions, type Plugin, type PluginBuild } from "esbuild";
-/**
- * The callbacks returns either an updated content or undefined if the content is unchanged.
- */
-export type Callback = (args: {
-    contents: string;
-    path: string;
-}) => string | undefined | Promise<string | undefined>;
-/**
- * The callback is called only when `contentFilter` matches the content.
- * It can be used as a fast heuristic to prevent an expensive update.
- */
-export type OnUpdateOptions = OnLoadOptions & {
-    contentFilter: RegExp;
-};
-export type Updater = OnUpdateOptions & {
-    callback: Callback;
-};
-export declare class ContentUpdater {
-    updaters: Map<string, Updater>;
-    /**
-     * Register a callback to update the file content.
-     *
-     * The callbacks are called in order of registration.
-     *
-     * @param name The name of the plugin (must be unique).
-     * @param options Options.
-     * @param callback The callback updating the content.
-     * @returns A noop ESBuild plugin.
-     */
-    updateContent(name: string, options: OnUpdateOptions, callback: Callback): Plugin;
-    /**
-     * Returns an ESBuild plugin applying the registered updates.
-     */
-    get plugin(): {
-        name: string;
-        setup: (build: PluginBuild) => Promise<void>;
-    };
-}

package/dist/cli/build/patches/plugins/content-updater.js

@@ -1,55 +0,0 @@
-/**
- * ESBuild stops calling `onLoad` hooks after the first hook returns an updated content.
- *
- * The updater allows multiple plugins to update the content.
- */
-import { readFile } from "node:fs/promises";
-export class ContentUpdater {
-    updaters = new Map();
-    /**
-     * Register a callback to update the file content.
-     *
-     * The callbacks are called in order of registration.
-     *
-     * @param name The name of the plugin (must be unique).
-     * @param options Options.
-     * @param callback The callback updating the content.
-     * @returns A noop ESBuild plugin.
-     */
-    updateContent(name, options, callback) {
-        if (this.updaters.has(name)) {
-            throw new Error(`Plugin "${name}" already registered`);
-        }
-        this.updaters.set(name, { ...options, callback });
-        return {
-            name,
-            setup() { },
-        };
-    }
-    /**
-     * Returns an ESBuild plugin applying the registered updates.
-     */
-    get plugin() {
-        return {
-            name: "aggregate-on-load",
-            setup: async (build) => {
-                build.onLoad({ filter: /\.(js|mjs|cjs|jsx|ts|tsx)$/ }, async (args) => {
-                    let contents = await readFile(args.path, "utf-8");
-                    for (const { filter, namespace, contentFilter, callback } of this.updaters.values()) {
-                        if (namespace !== undefined && args.namespace !== namespace) {
-                            continue;
-                        }
-                        if (!args.path.match(filter)) {
-                            continue;
-                        }
-                        if (!contents.match(contentFilter)) {
-                            continue;
-                        }
-                        contents = (await callback({ contents, path: args.path })) ?? contents;
-                    }
-                    return { contents };
-                });
-            },
-        };
-    }
-}

package/dist/cli/build/patches/plugins/fetch-cache-wait-until.d.ts

@@ -1,14 +0,0 @@
-import type { ContentUpdater } from "./content-updater.js";
-/**
- * The following Next.js code sets values in the incremental cache for fetch calls:
- *  https://github.com/vercel/next.js/blob/e5fc495e3d4/packages/next/src/server/lib/patch-fetch.ts#L690-L728
- *
- * The issue here is that this promise is never awaited in the Next.js code (since in a standard node.js server
- * the promise will eventually simply just run) but we do need to run it inside `waitUntil` (so that the worker
- * is not killed before the promise is fully executed), without that this promise gets discarded and values
- * don't get saved in the incremental cache.
- *
- * This function wraps the promise in a `waitUntil` call (retrieved from `globalThis.__openNextAls.getStore()`).
- */
-export declare function patchFetchCacheSetMissingWaitUntil(updater: ContentUpdater): import("esbuild").Plugin;
-export declare const rule = "\nrule:\n  kind: call_expression\n  pattern: $PROMISE\n  all:\n    - has: { pattern: $_.arrayBuffer().then, stopBy: end }\n    - has: { pattern: \"Buffer.from\", stopBy: end }\n    - any:\n        - inside:\n            kind: sequence_expression\n            inside:\n                kind: return_statement\n        - inside:\n            kind: expression_statement\n            precedes:\n                kind: return_statement\n    - has: { pattern: $_.FETCH, stopBy: end }\n\nfix: |\n  globalThis.__openNextAls?.getStore()?.waitUntil?.($PROMISE)\n";

package/dist/cli/build/patches/plugins/fetch-cache-wait-until.js

@@ -1,40 +0,0 @@
-import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
-import { patchCode } from "../ast/util.js";
-/**
- * The following Next.js code sets values in the incremental cache for fetch calls:
- *  https://github.com/vercel/next.js/blob/e5fc495e3d4/packages/next/src/server/lib/patch-fetch.ts#L690-L728
- *
- * The issue here is that this promise is never awaited in the Next.js code (since in a standard node.js server
- * the promise will eventually simply just run) but we do need to run it inside `waitUntil` (so that the worker
- * is not killed before the promise is fully executed), without that this promise gets discarded and values
- * don't get saved in the incremental cache.
- *
- * This function wraps the promise in a `waitUntil` call (retrieved from `globalThis.__openNextAls.getStore()`).
- */
-export function patchFetchCacheSetMissingWaitUntil(updater) {
-    return updater.updateContent("patch-fetch-cache-set-missing-wait-until", {
-        filter: getCrossPlatformPathRegex(String.raw `(server/chunks/.*\.js|.*\.runtime\..*\.js|patch-fetch\.js)$`, { escape: false }),
-        contentFilter: /arrayBuffer\(\)\s*\.then/,
-    }, ({ contents }) => patchCode(contents, rule));
-}
-export const rule = `
-rule:
-  kind: call_expression
-  pattern: $PROMISE
-  all:
-    - has: { pattern: $_.arrayBuffer().then, stopBy: end }
-    - has: { pattern: "Buffer.from", stopBy: end }
-    - any:
-        - inside:
-            kind: sequence_expression
-            inside:
-                kind: return_statement
-        - inside:
-            kind: expression_statement
-            precedes:
-                kind: return_statement
-    - has: { pattern: $_.FETCH, stopBy: end }
-
-fix: |
-  globalThis.__openNextAls?.getStore()?.waitUntil?.($PROMISE)
-`;