-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add "async mode" to
getCloudflareContext
add a new option to `getCloudflareContext` that makes it run 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).
- Loading branch information
1 parent
5a3555e
commit 0d74780
Showing
19 changed files
with
528 additions
and
41 deletions.
There are no files selected for viewing
This file contains 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,10 @@ | ||
--- | ||
"@opennextjs/cloudflare": patch | ||
--- | ||
|
||
add "async mode" to `getCloudflareContext` | ||
|
||
add a new option to `getCloudflareContext` that makes it run 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). |
This file contains 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 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 @@ | ||
MY_SECRET = "psst... this is a secret!" |
This file contains 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,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 not shown.
This file contains 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,14 @@ | ||
html, | ||
body { | ||
max-width: 100vw; | ||
overflow-x: hidden; | ||
height: 100vh; | ||
display: flex; | ||
flex-direction: column; | ||
} | ||
|
||
footer { | ||
padding: 1rem; | ||
display: flex; | ||
justify-content: end; | ||
} |
This file contains 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,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> | ||
); | ||
} |
This file contains 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,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; | ||
} |
This file contains 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,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 app</h1> | ||
<p data-testid="my-secret">{cloudflareContext.env.MY_SECRET}</p> | ||
</main> | ||
</div> | ||
); | ||
} |
This file contains 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,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 app")).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!"); | ||
}); |
This file contains 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,3 @@ | ||
import { configurePlaywright } from "../../common/config-e2e"; | ||
|
||
export default configurePlaywright("ssg-app", { isCI: !!process.env.CI }); |
This file contains 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,10 @@ | ||
import type { NextConfig } from "next"; | ||
import { initOpenNextCloudflareForDev } from "@opennextjs/cloudflare"; | ||
|
||
initOpenNextCloudflareForDev(); | ||
|
||
const nextConfig: NextConfig = { | ||
/* config options here */ | ||
}; | ||
|
||
export default nextConfig; |
This file contains 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,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; |
This file contains 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,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:" | ||
} | ||
} |
This file contains 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,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"] | ||
} |
This file contains 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,5 @@ | ||
interface CloudflareEnv { | ||
APP_VERSION: "1.2.345"; | ||
MY_SECRET: string; | ||
ASSETS: Fetcher; | ||
} |
This file contains 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,22 @@ | ||
{ | ||
"$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>" | ||
// } | ||
] | ||
} |
This file contains 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
Oops, something went wrong.