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

enable getCloudflareContext to also work with next dev #33

Merged
merged 4 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
run: npm install -g pnpm && pnpm install
- name: Install Playwright browsers
run: pnpm run install-playwright
- name: Run playwright tests (api)
run: pnpm -F api run e2e
- name: Run playwright tests (create-next-app)
run: pnpm -F create-next-app run e2e
- name: Run playwright tests
run: pnpm e2e
- name: Run playwright dev tests
run: pnpm e2e:dev
1 change: 1 addition & 0 deletions examples/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"dev:worker": "wrangler dev --port 8770",
"preview:worker": "pnpm build:worker && pnpm dev:worker",
"e2e": "playwright test",
"e2e:dev": "playwright test -c playwright.dev.config.ts",
"cf-typegen": "wrangler types --env-interface CloudflareEnv"
},
"dependencies": {
Expand Down
80 changes: 80 additions & 0 deletions examples/api/playwright.dev.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
import { defineConfig, devices } from "@playwright/test";

declare var process: { env: Record<string, string> };

/**
* Read environment variables from file.
* https://github.com/motdotla/dotenv
*/
// import dotenv from 'dotenv';
dario-piotrowicz marked this conversation as resolved.
Show resolved Hide resolved
// dotenv.config({ path: path.resolve(__dirname, '.env') });

/**
* See https://playwright.dev/docs/test-configuration.
*/
export default defineConfig({
testDir: "./e2e-tests",
/* Run tests in files in parallel */
fullyParallel: true,
/* Fail the build on CI if you accidentally left test.only in the source code. */
forbidOnly: !!process.env.CI,
/* Retry on CI only */
retries: process.env.CI ? 2 : 0,
/* Opt out of parallel tests on CI. */
workers: process.env.CI ? 1 : undefined,
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
reporter: "html",
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
use: {
/* Base URL to use in actions like `await page.goto('/')`. */
baseURL: "http://localhost:3333",

/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
trace: "on-first-retry",
},

/* Configure projects for major browsers */
projects: [
{
name: "chromium",
use: { ...devices["Desktop Chrome"] },
},

{
name: "firefox",
use: { ...devices["Desktop Firefox"] },
},

{
name: "webkit",
use: { ...devices["Desktop Safari"] },
},

/* Test against mobile viewports. */
dario-piotrowicz marked this conversation as resolved.
Show resolved Hide resolved
// {
// name: 'Mobile Chrome',
// use: { ...devices['Pixel 5'] },
// },
// {
// name: 'Mobile Safari',
// use: { ...devices['iPhone 12'] },
// },

/* Test against branded browsers. */
// {
// name: 'Microsoft Edge',
// use: { ...devices['Desktop Edge'], channel: 'msedge' },
// },
// {
// name: 'Google Chrome',
// use: { ...devices['Desktop Chrome'], channel: 'chrome' },
// },
],

/* Run your local dev server before starting the tests */
webServer: {
command: "pnpm dev --port 3333",
url: "http://localhost:3333",
reuseExistingServer: !process.env.CI,
},
});
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"prettier:fix": "prettier --write .",
"postinstall": "pnpm --filter cloudflare build",
"install-playwright": "playwright install --with-deps",
"e2e": "pnpm -r e2e"
"e2e": "pnpm -r e2e",
"e2e:dev": "pnpm -r e2e:dev"
}
}
3 changes: 3 additions & 0 deletions packages/cloudflare/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,8 @@
},
"dependencies": {
"ts-morph": "catalog:"
},
"peerDependencies": {
"wrangler": "catalog:"
}
}
50 changes: 40 additions & 10 deletions packages/cloudflare/src/api/get-cloudflare-context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,55 @@ const cloudflareContextSymbol = Symbol.for("__cloudflare-context__");
/**
* Utility to get the current Cloudflare context
*
* Throws an error if the context could not be retrieved
dario-piotrowicz marked this conversation as resolved.
Show resolved Hide resolved
*
* @returns the cloudflare context
*/
export async function getCloudflareContext<
CfProperties extends Record<string, unknown> = IncomingRequestCfProperties,
Context = ExecutionContext,
>(): Promise<CloudflareContext<CfProperties, Context>> {
const cloudflareContext = (
globalThis as unknown as {
[cloudflareContextSymbol]: CloudflareContext<CfProperties, Context> | undefined;
}
)[cloudflareContextSymbol];
const global = globalThis as unknown as {
[cloudflareContextSymbol]: CloudflareContext<CfProperties, Context> | undefined;
};

const cloudflareContext = global[cloudflareContextSymbol];

if (!cloudflareContext) {
// TODO: cloudflareContext should always be present in production/preview, if not it means that this
// is running under `next dev`, in this case use `getPlatformProxy` to return local proxies
throw new Error("Cloudflare context is not defined!");
// the cloudflare context is initialized by the worker and is always present in production/preview,
// so, it not being present means that the application is running under `next dev`
return getCloudflareContextInNextDev();
}

return cloudflareContext;
}

const cloudflareContextInNextDevSymbol = Symbol.for("__next-dev/cloudflare-context__");

/**
* Gets a local proxy version of the cloudflare context (created using `getPlatformProxy`) when
* running in the standard next dev server (via `next dev`)
*
* @returns the local proxy version of the cloudflare context
*/
async function getCloudflareContextInNextDev<
CfProperties extends Record<string, unknown> = IncomingRequestCfProperties,
Context = ExecutionContext,
>(): Promise<CloudflareContext<CfProperties, Context>> {
const global = globalThis as unknown as {
[cloudflareContextInNextDevSymbol]: CloudflareContext<CfProperties, Context> | undefined;
};

if (!global[cloudflareContextInNextDevSymbol]) {
// Note: we never want wrangler to be bundled in the Next.js app, that's why the import below looks like it does
const { getPlatformProxy } = await import(
/* webpackIgnore: true */ `${"__wrangler".replaceAll("_", "")}`
);
const { env, cf, ctx } = await getPlatformProxy();
global[cloudflareContextInNextDevSymbol] = {
env,
cf: cf as unknown as CfProperties,
ctx: ctx as Context,
};
}

return global[cloudflareContextInNextDevSymbol]!;
}
2 changes: 2 additions & 0 deletions packages/cloudflare/tsup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const cliConfig = defineConfig({
format: ["esm"],
platform: "node",
external: ["esbuild"],
clean: true,
onSuccess: async () => {
await cp(`${__dirname}/src/cli/templates`, `${__dirname}/dist/cli/templates`, {
recursive: true,
Expand All @@ -22,6 +23,7 @@ const apiConfig = defineConfig({
format: ["esm"],
platform: "node",
external: ["server-only"],
clean: true,
});

export default [cliConfig, apiConfig];
3 changes: 3 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.