Skip to content

feat: Add env param to Cloudflare Middleware #1068

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.

Sign up for GitHub

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

Closed
wants to merge 3 commits into from
Closed

feat: Add env param to Cloudflare Middleware #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0cbc86
Add env to Cloudflare middleware
nnelgxorz Aug 15, 2022
4a07509
🔭
nnelgxorz Aug 15, 2022
fbbca7f
📷
nnelgxorz Aug 15, 2022
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
4 changes: 3 additions & 1 deletion packages/qwik-city/middleware/cloudflare-pages/api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import type { RenderOptions } from '@builder.io/qwik/server';

// @alpha (undocumented)
export interface EventPluginContext {
// (undocumented)
env: Record<string, any>;
// (undocumented)
next: (input?: Request | string, init?: RequestInit) => Promise<Response>;
// (undocumented)
Expand All @@ -18,7 +20,7 @@ export interface EventPluginContext {
}

// @alpha (undocumented)
export function qwikCity(render: Render, opts?: QwikCityCloudflarePagesOptions): ({ request, next, waitUntil }: EventPluginContext) => Promise<Response>;
export function qwikCity(render: Render, opts?: QwikCityCloudflarePagesOptions): ({ request, env, next, waitUntil }: EventPluginContext) => Promise<Response>;

// Warning: (ae-forgotten-export) The symbol "QwikCityRequestOptions" needs to be exported by the entry point index.d.ts
//
Expand Down
7 changes: 4 additions & 3 deletions packages/qwik-city/middleware/cloudflare-pages/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type { Render } from '@builder.io/qwik/server';
* @alpha
*/
export function qwikCity(render: Render, opts?: QwikCityCloudflarePagesOptions) {
async function onRequest({ request, next, waitUntil }: EventPluginContext) {
async function onRequest({ request, env, next, waitUntil }: EventPluginContext) {
try {
const url = new URL(request.url);

Expand Down Expand Up @@ -63,8 +63,8 @@ export function qwikCity(render: Render, opts?: QwikCityCloudflarePagesOptions)
});
},
};

const handledResponse = await requestHandler<Response>(requestCtx, render, opts);
const optsWithEnv: QwikCityCloudflarePagesOptions = { ...(opts || {}), envData: env };
const handledResponse = await requestHandler<Response>(requestCtx, render, optsWithEnv);
if (handledResponse) {
return handledResponse;
}
Expand Down Expand Up @@ -97,6 +97,7 @@ export interface QwikCityCloudflarePagesOptions extends QwikCityRequestOptions {
*/
export interface EventPluginContext {
request: Request;
env: Record<string, any>;
waitUntil: (promise: Promise<any>) => void;
next: (input?: Request | string, init?: RequestInit) => Promise<Response>;
}