fix: correct passing executionCtx to context.cloudflare.ctx (#45)

yusukebe · Dec 3, 2024 · a2418e2 · a2418e2
1 parent 8399406
commit a2418e2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/examples/cloudflare-pages/app/routes/_index.tsx b/examples/cloudflare-pages/app/routes/_index.tsx
@@ -5,11 +5,12 @@ export const loader = (args: LoaderFunctionArgs) => {
   const extra = args.context.extra
   const cloudflare = args.context.cloudflare
   const myVarInVariables = args.context.hono.context.get('MY_VAR_IN_VARIABLES')
-  return { cloudflare, extra, myVarInVariables }
+  const isWaitUntilDefined = !!cloudflare.ctx.waitUntil
+  return { cloudflare, extra, myVarInVariables, isWaitUntilDefined }
 }
 
 export default function Index() {
-  const { cloudflare, extra, myVarInVariables } = useLoaderData<typeof loader>()
+  const { cloudflare, extra, myVarInVariables, isWaitUntilDefined } = useLoaderData<typeof loader>()
   return (
     <div>
       <h1>Remix and Hono</h1>
@@ -21,6 +22,7 @@ export default function Index() {
       </h3>
       <h4>Extra is {extra}</h4>
       <h5>Var in Variables is {myVarInVariables}</h5>
+      <h6>waitUntil is {isWaitUntilDefined ? 'defined' : 'not defined'}</h6>
     </div>
   )
 }
diff --git a/examples/cloudflare-pages/e2e.test.ts b/examples/cloudflare-pages/e2e.test.ts
@@ -21,6 +21,9 @@ test('Should return 200 response - /', async ({ page }) => {
 
   const contentH5 = await page.textContent('h5')
   expect(contentH5).toBe('Var in Variables is My variable set in c.set')
+
+  const contentH6 = await page.textContent('h6')
+  expect(contentH6).toBe('waitUntil is defined')
 })
 
 test('Should return 200 response - /api', async ({ page }) => {

diff --git a/examples/cloudflare-workers/app/routes/_index.tsx b/examples/cloudflare-workers/app/routes/_index.tsx
@@ -5,11 +5,12 @@ export const loader = (args: LoaderFunctionArgs) => {
   const extra = args.context.extra
   const cloudflare = args.context.cloudflare
   const myVarInVariables = args.context.hono.context.get('MY_VAR_IN_VARIABLES')
-  return { cloudflare, extra, myVarInVariables }
+  const isWaitUntilDefined = !!cloudflare.ctx.waitUntil
+  return { cloudflare, extra, myVarInVariables, isWaitUntilDefined }
 }
 
 export default function Index() {
-  const { cloudflare, extra, myVarInVariables } = useLoaderData<typeof loader>()
+  const { cloudflare, extra, myVarInVariables, isWaitUntilDefined } = useLoaderData<typeof loader>()
   return (
     <div>
       <h1>Remix and Hono</h1>
@@ -21,6 +22,7 @@ export default function Index() {
       </h3>
       <h4>Extra is {extra}</h4>
       <h5>Var in Variables is {myVarInVariables}</h5>
+      <h6>waitUntil is {isWaitUntilDefined ? 'defined' : 'not defined'}</h6>
     </div>
   )
 }
diff --git a/examples/cloudflare-workers/e2e.test.ts b/examples/cloudflare-workers/e2e.test.ts
@@ -21,6 +21,9 @@ test('Should return 200 response - /', async ({ page }) => {
 
   const contentH5 = await page.textContent('h5')
   expect(contentH5).toBe('Var in Variables is My variable set in c.set')
+
+  const contentH6 = await page.textContent('h6')
+  expect(contentH6).toBe('waitUntil is defined')
 })
 
 test('Should return 200 response - /api', async ({ page }) => {

diff --git a/src/remix.ts b/src/remix.ts
@@ -28,9 +28,7 @@ export const createGetLoadContextArgs = (c: Context): GetLoadContextArgs => {
       cloudflare: {
         env: c.env,
         cf: c.req.raw.cf,
-        ctx: {
-          ...c.executionCtx,
-        },
+        ctx: c.executionCtx,
         // @ts-expect-error globalThis.caches is not typed
         caches: globalThis.caches ? caches : undefined,
       },