Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add "async mode" to getCloudflareContext #372

Merged
merged 20 commits into from
Feb 14, 2025
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0d74780
add "async mode" to `getCloudflareContext`
dario-piotrowicz Feb 12, 2025
aae8cab
change comment
dario-piotrowicz Feb 12, 2025
0d2dd9b
Update packages/cloudflare/src/api/cloudflare-context.ts
dario-piotrowicz Feb 12, 2025
c5af439
Update .changeset/tough-tables-talk.md
dario-piotrowicz Feb 12, 2025
51d6619
remove unnecessary partial
dario-piotrowicz Feb 12, 2025
d4a5d4b
fix async still being treated as optional
dario-piotrowicz Feb 12, 2025
049d01c
Apply suggestions from code review
dario-piotrowicz Feb 13, 2025
3c2df27
update incorrect function names and comments
dario-piotrowicz Feb 13, 2025
9a3db1c
update e2e text
dario-piotrowicz Feb 13, 2025
477e2a1
Apply suggestions from code review
dario-piotrowicz Feb 13, 2025
75fc340
inline setting of context and fix wrong types
dario-piotrowicz Feb 13, 2025
b572baf
get rid of `options.async`
dario-piotrowicz Feb 13, 2025
3cc360b
fix incorrect logic in `getCloudflareContext`
dario-piotrowicz Feb 13, 2025
2e99410
Apply suggestions from code review
dario-piotrowicz Feb 13, 2025
213fdba
add comment to `isNodejsRuntime`
dario-piotrowicz Feb 13, 2025
abd7f3c
add if-else statement around `asyncMode`
dario-piotrowicz Feb 13, 2025
30683e7
fixup! Update wrangler.json, playwright.config.ts
vicb Feb 14, 2025
18e755d
apply suggested change
dario-piotrowicz Feb 14, 2025
0fef012
split `getCloudflareContext` implementation in `getCloudflareContextS…
dario-piotrowicz Feb 14, 2025
621718e
remove `throwMissingInitOpenNextCloudflareForDevError` function
dario-piotrowicz Feb 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .changeset/tough-tables-talk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"@opennextjs/cloudflare": patch
---

add "async mode" to `getCloudflareContext`

Add an `async` option to `getCloudflareContext({async})` to run it in "async mode", the difference being that the returned value is a
promise of the Cloudflare context instead of the context itself

The main of this is that it allows the function to also run during SSG (since the missing context can be created on demand).
1 change: 1 addition & 0 deletions examples/common/apps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const apps = [
"middleware",
"vercel-blog-starter",
"vercel-commerce",
"ssg-app",
vicb marked this conversation as resolved.
Show resolved Hide resolved
// e2e
"app-pages-router",
"app-router",
Expand Down
1 change: 1 addition & 0 deletions examples/ssg-app/.dev.vars
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MY_SECRET = "psst... this is a secret!"
47 changes: 47 additions & 0 deletions examples/ssg-app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/versions

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# env files (can opt-in for committing if needed)
.env*

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts

# playwright
/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
Binary file added examples/ssg-app/app/favicon.ico
Binary file not shown.
14 changes: 14 additions & 0 deletions examples/ssg-app/app/globals.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
html,
body {
max-width: 100vw;
overflow-x: hidden;
height: 100vh;
display: flex;
flex-direction: column;
}

footer {
padding: 1rem;
display: flex;
justify-content: end;
}
28 changes: 28 additions & 0 deletions examples/ssg-app/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import type { Metadata } from "next";
import "./globals.css";

import { getCloudflareContext } from "@opennextjs/cloudflare";

export const metadata: Metadata = {
title: "SSG App",
description: "An app in which all the routes are SSG'd",
};

export default async function RootLayout({
children,
}: Readonly<{
children: React.ReactNode;
}>) {
const cloudflareContext = await getCloudflareContext({
async: true,
});

return (
<html lang="en">
<body>
{children}
<footer data-testid="app-version">{cloudflareContext.env.APP_VERSION}</footer>
</body>
</html>
);
}
17 changes: 17 additions & 0 deletions examples/ssg-app/app/page.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
.page {
display: grid;
grid-template-rows: 20px 1fr 20px;
align-items: center;
justify-items: center;
flex: 1;
border: 3px solid gray;
margin: 1rem;
margin-block-end: 0;
}

.main {
display: flex;
flex-direction: column;
gap: 32px;
grid-row-start: 2;
}
17 changes: 17 additions & 0 deletions examples/ssg-app/app/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import styles from "./page.module.css";
import { getCloudflareContext } from "@opennextjs/cloudflare";

export default async function Home() {
const cloudflareContext = await getCloudflareContext({
async: true,
});

return (
<div className={styles.page}>
<main className={styles.main}>
<h1>Hello from a Statically generated page</h1>
<p data-testid="my-secret">{cloudflareContext.env.MY_SECRET}</p>
</main>
</div>
);
}
17 changes: 17 additions & 0 deletions examples/ssg-app/e2e/base.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { test, expect } from "@playwright/test";

test("the index page should work", async ({ page }) => {
await page.goto("/");
await expect(page.getByText("Hello from a Statically generated page")).toBeVisible();
});

test("the APP_VERSION var from the cloudflare context should be displayed", async ({ page }) => {
await page.goto("/");
await expect(page.getByTestId("app-version")).toHaveText("1.2.345");
});

// Note: secrets from .dev.vars are also part of the SSG output, this is expected and nothing we can avoid
test("the MY_SECRET secret from the cloudflare context should be displayed", async ({ page }) => {
await page.goto("/");
await expect(page.getByTestId("my-secret")).toHaveText("psst... this is a secret!");
});
3 changes: 3 additions & 0 deletions examples/ssg-app/e2e/playwright.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { configurePlaywright } from "../../common/config-e2e";

export default configurePlaywright("ssg-app", { isCI: !!process.env.CI });
dario-piotrowicz marked this conversation as resolved.
Show resolved Hide resolved
10 changes: 10 additions & 0 deletions examples/ssg-app/next.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import type { NextConfig } from "next";
import { initOpenNextCloudflareForDev } from "@opennextjs/cloudflare";

initOpenNextCloudflareForDev();

const nextConfig: NextConfig = {
/* config options here */
};

export default nextConfig;
26 changes: 26 additions & 0 deletions examples/ssg-app/open-next.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// default open-next.config.ts file created by @opennextjs/cloudflare

import cache from "@opennextjs/cloudflare/kv-cache";

const config = {
default: {
override: {
wrapper: "cloudflare-node",
converter: "edge",
incrementalCache: async () => cache,
tagCache: "dummy",
queue: "dummy",
},
},

middleware: {
external: true,
override: {
wrapper: "cloudflare-edge",
converter: "edge",
proxyExternalRequest: "fetch",
},
},
};

export default config;
28 changes: 28 additions & 0 deletions examples/ssg-app/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"name": "ssg-app",
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"build:worker": "opennextjs-cloudflare",
"preview": "pnpm build:worker && pnpm wrangler dev",
"e2e": "playwright test -c e2e/playwright.config.ts"
},
"dependencies": {
"react": "^19.0.0",
"react-dom": "^19.0.0",
"next": "15.1.7"
},
"devDependencies": {
"@opennextjs/cloudflare": "workspace:*",
"@playwright/test": "catalog:",
"@types/node": "catalog:",
"@types/react": "^19",
"@types/react-dom": "^19",
"typescript": "catalog:",
"wrangler": "catalog:"
}
}
27 changes: 27 additions & 0 deletions examples/ssg-app/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"compilerOptions": {
"target": "ES2017",
"lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
"skipLibCheck": true,
"strict": true,
"noEmit": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
"incremental": true,
"plugins": [
{
"name": "next"
}
],
"paths": {
"@/*": ["./*"]
}
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
"exclude": ["node_modules"]
}
5 changes: 5 additions & 0 deletions examples/ssg-app/worker-configuration.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
interface CloudflareEnv {
APP_VERSION: "1.2.345";
MY_SECRET: string;
ASSETS: Fetcher;
}
22 changes: 22 additions & 0 deletions examples/ssg-app/wrangler.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
dario-piotrowicz marked this conversation as resolved.
Show resolved Hide resolved
"$schema": "node_modules/wrangler/config-schema.json",
"main": ".open-next/worker.js",
"name": "ssg-app",
"compatibility_date": "2025-02-04",
"compatibility_flags": ["nodejs_compat"],
"assets": {
"directory": ".open-next/assets",
"binding": "ASSETS"
},
"vars": {
"APP_VERSION": "1.2.345"
},
"kv_namespaces": [
// Create a KV binding with the binding name "NEXT_CACHE_WORKERS_KV"
// to enable the KV based caching:
// {
// "binding": "NEXT_CACHE_WORKERS_KV",
// "id": "<BINDING_ID>"
// }
vicb marked this conversation as resolved.
Show resolved Hide resolved
]
vicb marked this conversation as resolved.
Show resolved Hide resolved
}
Loading