Unverified Commit 045ad0d1 authored by Wyatt Johnson's avatar Wyatt Johnson Committed by GitHub

Replaced Reflect with ReflectAdapter (#48000)

On some runtimes, `Reflect` is not available. This creates a new "naive"
implementation.
parent 94489131
...@@ -92,6 +92,7 @@ import { SearchParamsContext } from '../shared/lib/hooks-client-context' ...@@ -92,6 +92,7 @@ import { SearchParamsContext } from '../shared/lib/hooks-client-context'
import { getTracer } from './lib/trace/tracer' import { getTracer } from './lib/trace/tracer'
import { RenderSpan } from './lib/trace/constants' import { RenderSpan } from './lib/trace/constants'
import { PageNotFoundError } from '../shared/lib/utils' import { PageNotFoundError } from '../shared/lib/utils'
import { ReflectAdapter } from './web/spec-extension/adapters/reflect'
let tryGetPreviewData: typeof import('./api-utils/node').tryGetPreviewData let tryGetPreviewData: typeof import('./api-utils/node').tryGetPreviewData
let warn: typeof import('../build/output/log').warn let warn: typeof import('../build/output/log').warn
...@@ -979,7 +980,7 @@ export async function renderToHTML( ...@@ -979,7 +980,7 @@ export async function renderToHTML(
let deferredContent = false let deferredContent = false
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
resOrProxy = new Proxy<ServerResponse>(res, { resOrProxy = new Proxy<ServerResponse>(res, {
get: function (obj, prop, receiver) { get: function (obj, prop) {
if (!canAccessRes) { if (!canAccessRes) {
const message = const message =
`You should not access 'res' after getServerSideProps resolves.` + `You should not access 'res' after getServerSideProps resolves.` +
...@@ -991,15 +992,12 @@ export async function renderToHTML( ...@@ -991,15 +992,12 @@ export async function renderToHTML(
warn(message) warn(message)
} }
} }
const value = Reflect.get(obj, prop, receiver)
// since ServerResponse uses internal fields which if (typeof prop === 'symbol') {
// proxy can't map correctly we need to ensure functions return ReflectAdapter.get(obj, prop, res)
// are bound correctly while being proxied
if (typeof value === 'function') {
return value.bind(obj)
} }
return value
return ReflectAdapter.get(obj, prop, res)
}, },
}) })
} }
......
...@@ -236,6 +236,9 @@ describe('HeadersAdapter', () => { ...@@ -236,6 +236,9 @@ describe('HeadersAdapter', () => {
const sealed = HeadersAdapter.seal(headers) const sealed = HeadersAdapter.seal(headers)
expect(sealed).toBeInstanceOf(Headers) expect(sealed).toBeInstanceOf(Headers)
expect(sealed.get('content-type')).toBe('application/json')
expect(sealed.get('x-custom-header')).toBe('custom')
// These methods are not available on the sealed instance // These methods are not available on the sealed instance
expect(() => expect(() =>
(sealed as any).append('x-custom-header', 'custom2') (sealed as any).append('x-custom-header', 'custom2')
......
import type { IncomingHttpHeaders } from 'http' import type { IncomingHttpHeaders } from 'http'
import { ReflectAdapter } from './reflect'
/** /**
* @internal * @internal
*/ */
...@@ -30,7 +32,9 @@ export class HeadersAdapter extends Headers { ...@@ -30,7 +32,9 @@ export class HeadersAdapter extends Headers {
// Because this is just an object, we expect that all "get" operations // Because this is just an object, we expect that all "get" operations
// are for properties. If it's a "get" for a symbol, we'll just return // are for properties. If it's a "get" for a symbol, we'll just return
// the symbol. // the symbol.
if (typeof prop === 'symbol') return Reflect.get(target, prop, receiver) if (typeof prop === 'symbol') {
return ReflectAdapter.get(target, prop, receiver)
}
const lowercased = prop.toLowerCase() const lowercased = prop.toLowerCase()
...@@ -45,10 +49,12 @@ export class HeadersAdapter extends Headers { ...@@ -45,10 +49,12 @@ export class HeadersAdapter extends Headers {
if (typeof original === 'undefined') return if (typeof original === 'undefined') return
// If the original casing exists, return the value. // If the original casing exists, return the value.
return Reflect.get(target, original, receiver) return ReflectAdapter.get(target, original, receiver)
}, },
set(target, prop, value) { set(target, prop, value, receiver) {
if (typeof prop === 'symbol') return Reflect.set(target, prop, value) if (typeof prop === 'symbol') {
return ReflectAdapter.set(target, prop, value, receiver)
}
const lowercased = prop.toLowerCase() const lowercased = prop.toLowerCase()
...@@ -60,10 +66,10 @@ export class HeadersAdapter extends Headers { ...@@ -60,10 +66,10 @@ export class HeadersAdapter extends Headers {
) )
// If the original casing doesn't exist, use the prop as the key. // If the original casing doesn't exist, use the prop as the key.
return Reflect.set(target, original ?? prop, value) return ReflectAdapter.set(target, original ?? prop, value, receiver)
}, },
has(target, prop) { has(target, prop) {
if (typeof prop === 'symbol') return Reflect.has(target, prop) if (typeof prop === 'symbol') return ReflectAdapter.has(target, prop)
const lowercased = prop.toLowerCase() const lowercased = prop.toLowerCase()
...@@ -78,11 +84,11 @@ export class HeadersAdapter extends Headers { ...@@ -78,11 +84,11 @@ export class HeadersAdapter extends Headers {
if (typeof original === 'undefined') return false if (typeof original === 'undefined') return false
// If the original casing exists, return true. // If the original casing exists, return true.
return Reflect.has(target, original) return ReflectAdapter.has(target, original)
}, },
deleteProperty(target, prop) { deleteProperty(target, prop) {
if (typeof prop === 'symbol') if (typeof prop === 'symbol')
return Reflect.deleteProperty(target, prop) return ReflectAdapter.deleteProperty(target, prop)
const lowercased = prop.toLowerCase() const lowercased = prop.toLowerCase()
...@@ -97,7 +103,7 @@ export class HeadersAdapter extends Headers { ...@@ -97,7 +103,7 @@ export class HeadersAdapter extends Headers {
if (typeof original === 'undefined') return true if (typeof original === 'undefined') return true
// If the original casing exists, delete the property. // If the original casing exists, delete the property.
return Reflect.deleteProperty(target, original) return ReflectAdapter.deleteProperty(target, original)
}, },
}) })
} }
...@@ -107,7 +113,7 @@ export class HeadersAdapter extends Headers { ...@@ -107,7 +113,7 @@ export class HeadersAdapter extends Headers {
* any mutating method is called. * any mutating method is called.
*/ */
public static seal(headers: Headers): ReadonlyHeaders { public static seal(headers: Headers): ReadonlyHeaders {
return new Proxy(headers, { return new Proxy<ReadonlyHeaders>(headers, {
get(target, prop, receiver) { get(target, prop, receiver) {
switch (prop) { switch (prop) {
case 'append': case 'append':
...@@ -115,7 +121,7 @@ export class HeadersAdapter extends Headers { ...@@ -115,7 +121,7 @@ export class HeadersAdapter extends Headers {
case 'set': case 'set':
return ReadonlyHeadersError.callable return ReadonlyHeadersError.callable
default: default:
return Reflect.get(target, prop, receiver) return ReflectAdapter.get(target, prop, receiver)
} }
}, },
}) })
......
export class ReflectAdapter {
static get<T extends object>(
target: T,
prop: string | symbol,
receiver: unknown
): any {
const value = Reflect.get(target, prop, receiver)
if (typeof value === 'function') {
return value.bind(target)
}
return value
}
static set<T extends object>(
target: T,
prop: string | symbol,
value: any,
receiver: any
): boolean {
return Reflect.set(target, prop, value, receiver)
}
static has<T extends object>(target: T, prop: string | symbol): boolean {
return Reflect.has(target, prop)
}
static deleteProperty<T extends object>(
target: T,
prop: string | symbol
): boolean {
return Reflect.deleteProperty(target, prop)
}
}
import type { RequestCookies } from '../cookies' import type { RequestCookies } from '../cookies'
import { ReflectAdapter } from './reflect'
/** /**
* @internal * @internal
...@@ -23,14 +24,14 @@ export type ReadonlyRequestCookies = Omit< ...@@ -23,14 +24,14 @@ export type ReadonlyRequestCookies = Omit<
export class RequestCookiesAdapter { export class RequestCookiesAdapter {
public static seal(cookies: RequestCookies): ReadonlyRequestCookies { public static seal(cookies: RequestCookies): ReadonlyRequestCookies {
return new Proxy(cookies, { return new Proxy(cookies, {
get(target, prop) { get(target, prop, receiver) {
switch (prop) { switch (prop) {
case 'clear': case 'clear':
case 'delete': case 'delete':
case 'set': case 'set':
return ReadonlyRequestCookiesError.callable return ReadonlyRequestCookiesError.callable
default: default:
return Reflect.get(target, prop) return ReflectAdapter.get(target, prop, receiver)
} }
}, },
}) })
......
import type { ReadonlyHeaders } from 'next/dist/server/web/spec-extension/adapters/headers'
import type { ReadonlyRequestCookies } from 'next/dist/server/web/spec-extension/adapters/request-cookies'
const KEY = 'x-request-meta' const KEY = 'x-request-meta'
/** /**
...@@ -55,7 +58,7 @@ type Cookies = { ...@@ -55,7 +58,7 @@ type Cookies = {
* @returns any injected metadata on the request * @returns any injected metadata on the request
*/ */
export function getRequestMeta( export function getRequestMeta(
headersOrCookies: Headers | Cookies headersOrCookies: Headers | Cookies | ReadonlyHeaders | ReadonlyRequestCookies
): Record<string, any> { ): Record<string, any> {
const headerOrCookie = headersOrCookies.get(KEY) const headerOrCookie = headersOrCookies.get(KEY)
if (!headerOrCookie) return {} if (!headerOrCookie) return {}
......
...@@ -52,7 +52,7 @@ export class NextDeployInstance extends NextInstance { ...@@ -52,7 +52,7 @@ export class NextDeployInstance extends NextInstance {
// link the project // link the project
const linkRes = await execa( const linkRes = await execa(
'vercel', 'vercel',
['link', '-p', TEST_PROJECT_NAME, '--confirm', ...vercelFlags], ['link', '-p', TEST_PROJECT_NAME, '--yes', ...vercelFlags],
{ {
cwd: this.testDir, cwd: this.testDir,
env: vercelEnv, env: vercelEnv,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment