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.

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

Jump to bottom

fix NextRequest proxy in edge runtime #66551

Merged
merged 1 commit into from
Jun 5, 2024
Merged

fix NextRequest proxy in edge runtime #66551

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 16 additions & 43 deletions packages/next/src/server/route-modules/app-route/module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import { cleanURL } from './helpers/clean-url'
import { StaticGenBailoutError } from '../../../client/components/static-generation-bailout'
import { isStaticGenEnabled } from './helpers/is-static-gen-enabled'
import { trackDynamicDataAccessed } from '../../app-render/dynamic-rendering'
import { ReflectAdapter } from '../../web/spec-extension/adapters/reflect'

/**
* The AppRouteModule is the type of the module exported by the bundled App
Expand Down Expand Up @@ -598,11 +599,7 @@ const forceStaticRequestHandlers = {
))
)
default:
const result = Reflect.get(target, prop, receiver)
if (typeof result === 'function') {
return result.bind(target)
}
return result
return ReflectAdapter.get(target, prop, receiver)
}
},
// We don't need to proxy set because all the properties we proxy are ready only
Expand Down Expand Up @@ -649,11 +646,7 @@ const forceStaticNextUrlHandlers = {
new Proxy(target.clone(), forceStaticNextUrlHandlers))
)
default:
const result = Reflect.get(target, prop, receiver)
if (typeof result === 'function') {
return result.bind(target)
}
return result
return ReflectAdapter.get(target, prop, receiver)
}
},
}
Expand All @@ -677,11 +670,7 @@ function proxyNextRequest(
case 'toString':
case 'origin': {
trackDynamicDataAccessed(staticGenerationStore, `nextUrl.${prop}`)
const result = Reflect.get(target, prop, receiver)
if (typeof result === 'function') {
return result.bind(target)
}
return result
return ReflectAdapter.get(target, prop, receiver)
}
case 'clone':
return (
Expand All @@ -690,20 +679,15 @@ function proxyNextRequest(
new Proxy(target.clone(), nextUrlHandlers))
)
default:
const result = Reflect.get(target, prop, receiver)
if (typeof result === 'function') {
return result.bind(target)
}
return result
return ReflectAdapter.get(target, prop, receiver)
}
},
}

const nextRequestHandlers = {
get(
target: NextRequest & RequestSymbolTarget,
prop: string | symbol,
receiver: any
prop: string | symbol
): unknown {
switch (prop) {
case 'nextUrl':
Expand All @@ -721,12 +705,10 @@ function proxyNextRequest(
case 'arrayBuffer':
case 'formData': {
trackDynamicDataAccessed(staticGenerationStore, `request.${prop}`)

const result = Reflect.get(target, prop, receiver)
if (typeof result === 'function') {
return result.bind(target)
}
return result
// The receiver arg is intentionally the same as the target to fix an issue with
// edge runtime, where attempting to access internal slots with the wrong `this` context
// results in an error.
return ReflectAdapter.get(target, prop, target)
}
case 'clone':
return (
Expand All @@ -745,11 +727,10 @@ function proxyNextRequest(
))
)
default:
const result = Reflect.get(target, prop, receiver)
if (typeof result === 'function') {
return result.bind(target)
}
return result
// The receiver arg is intentionally the same as the target to fix an issue with
// edge runtime, where attempting to access internal slots with the wrong `this` context
// results in an error.
return ReflectAdapter.get(target, prop, target)
}
},
// We don't need to proxy set because all the properties we proxy are ready only
Expand Down Expand Up @@ -803,11 +784,7 @@ const requireStaticRequestHandlers = {
))
)
default:
const result = Reflect.get(target, prop, receiver)
if (typeof result === 'function') {
return result.bind(target)
}
return result
return ReflectAdapter.get(target, prop, receiver)
}
},
// We don't need to proxy set because all the properties we proxy are ready only
Expand Down Expand Up @@ -838,11 +815,7 @@ const requireStaticNextUrlHandlers = {
new Proxy(target.clone(), requireStaticNextUrlHandlers))
)
default:
const result = Reflect.get(target, prop, receiver)
if (typeof result === 'function') {
return result.bind(target)
}
return result
return ReflectAdapter.get(target, prop, receiver)
}
},
}
Loading