Switch OpenNext incremental cache from KV to R2 #2
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import { defineCloudflareConfig } from '@opennextjs/cloudflare' | ||
| import r2IncrementalCache from '@opennextjs/cloudflare/overrides/incremental-cache/r2-incremental-cache' | ||
|
|
||
| export default defineCloudflareConfig({ | ||
| incrementalCache: r2IncrementalCache | ||
| }) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| #!/usr/bin/env bash | ||
| # Deploy to Cloudflare Workers using Cloudflare secrets pulled from Bitwarden. | ||
| # | ||
| # Prereqs: | ||
| # - Bitwarden CLI (`bw`) installed and logged in. | ||
| # - `jq` installed. | ||
| # - Vault unlocked: `export BW_SESSION=$(bw unlock --raw)` | ||
| # - Bitwarden item "techempower cloudflare api" (secure note) with: | ||
| # - notes -> CLOUDFLARE_API_TOKEN | ||
| # - custom "id" -> CLOUDFLARE_ACCOUNT_ID | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| ITEM_NAME="techempower cloudflare api" | ||
|
|
||
| if ! command -v bw >/dev/null 2>&1; then | ||
| echo "error: bw (Bitwarden CLI) not found on PATH" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| if ! command -v jq >/dev/null 2>&1; then | ||
| echo "error: jq not found on PATH" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| bw_status="$(bw status 2>/dev/null || true)" | ||
| if ! printf '%s' "$bw_status" | grep -q '"status":"unlocked"'; then | ||
| echo "error: Bitwarden vault is locked (or bw is not logged in)." >&2 | ||
| echo " run: export BW_SESSION=\$(bw unlock --raw)" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| item_json="$(bw get item "$ITEM_NAME")" | ||
| CLOUDFLARE_API_TOKEN="$(printf '%s' "$item_json" | jq -r '.notes // ""')" | ||
| CLOUDFLARE_ACCOUNT_ID="$(printf '%s' "$item_json" | jq -r '.fields[]? | select(.name=="id") | .value')" | ||
|
|
||
| if [[ -z "$CLOUDFLARE_API_TOKEN" || -z "$CLOUDFLARE_ACCOUNT_ID" ]]; then | ||
| echo "error: could not read CLOUDFLARE_API_TOKEN (notes) or CLOUDFLARE_ACCOUNT_ID (custom field 'id')" >&2 | ||
| echo " from Bitwarden item '$ITEM_NAME'" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| export CLOUDFLARE_API_TOKEN | ||
| export CLOUDFLARE_ACCOUNT_ID | ||
|
|
||
| exec pnpm cf:deploy |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,10 +16,12 @@ | |
| "observability": { | ||
| "enabled": true | ||
| }, | ||
| "r2_buckets": [ | ||
| { | ||
| // Bucket must be pre-created in the Cloudflare account before deploy: | ||
| // npx wrangler r2 bucket create techempower-cache | ||
| "binding": "NEXT_INC_CACHE_R2_BUCKET", | ||
| "bucket_name": "techempower-cache" | ||
| } | ||
|
Comment on lines
+19
to
25
Owner
Author
There was a problem hiding this comment. Addressed in 71399b4 — added a JSONC comment on the Generated by Claude Code |
||
| ] | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Addressed in 71399b4 —
.github/workflows/deploy.ymlnow deploys to Cloudflare Workers viapnpm cf:deployon push tomaster/main, usingCLOUDFLARE_API_TOKEN+CLOUDFLARE_ACCOUNT_IDsecrets.package.json'sdeployscript and the hosting section ofCLAUDE.mdwere updated to match.Generated by Claude Code