mirror of
https://github.com/hanzoai/next.js.git
synced 2026-10-30 14:46:38 +00:00
Andrew GadzikandGitHub
6d39c38d79
<!-- Thanks for opening a PR! Your contribution is much appreciated. To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below. Choose the right checklist for the change(s) that you're making: ## For Contributors ### Improving Documentation - Run `pnpm prettier-fix` to fix formatting issues before opening the PR. - Read the Docs Contribution Guide to ensure your contribution follows the docs guidelines: https://nextjs.org/docs/community/contribution-guide ### Adding or Updating Examples - The "examples guidelines" are followed from our contributing doc https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md - Make sure the linting passes by running `pnpm build && pnpm lint`. See https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md ### Fixing a bug - Related issues linked using `fixes #number` - Tests added. See: https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ### Adding a feature - Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. (A discussion must be opened, see https://github.com/vercel/next.js/discussions/new?category=ideas) - Related issues/discussions are linked using `fixes #number` - e2e tests added (https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) - Documentation added - Telemetry added. In case of a feature if it's used or not. - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ## For Maintainers - Minimal description (aim for explaining to someone not on the team to understand the PR) - When linking to a Slack thread, you might want to share details of the conclusion - Link both the Linear (Fixes NEXT-xxx) and the GitHub issues - Add review comments if necessary to explain to the reviewer the logic behind a change ### What? ### Why? ### How? Closes NEXT- Fixes # --> ### What? The `preferredRegion` [option](https://nextjs.org/docs/app/api-reference/file-conventions/route-segment-config#preferredregion) does not work for `nodejs` runtime functions. This PR attempts to fix that by setting a new `regions` property on the functions config manifest file if `preferredRegion` was set.
81 lines
2.7 KiB
TypeScript
81 lines
2.7 KiB
TypeScript
import { nextTestSetup } from 'e2e-utils'
|
|
|
|
describe('preferred-region', () => {
|
|
const { next, isNextStart } = nextTestSetup({
|
|
files: __dirname,
|
|
})
|
|
|
|
it('should return success from Node.js API route', async () => {
|
|
const res = await next.fetch('/api/test')
|
|
expect(res.status).toBe(200)
|
|
|
|
const data = await res.json()
|
|
expect(data).toEqual({ status: 'success' })
|
|
})
|
|
|
|
it('should return success from Edge API route', async () => {
|
|
const res = await next.fetch('/api/test-edge')
|
|
expect(res.status).toBe(200)
|
|
|
|
const data = await res.json()
|
|
expect(data).toEqual({ status: 'success', runtime: 'edge' })
|
|
})
|
|
|
|
it('should include preferredRegion in functions config manifest for nodejs runtime', async () => {
|
|
if (isNextStart) {
|
|
let functionsConfigManifest
|
|
let middlewareManifest
|
|
|
|
try {
|
|
// Check Functions Config Manifest (for Node.js runtime)
|
|
functionsConfigManifest = JSON.parse(
|
|
await next.readFile('.next/server/functions-config-manifest.json')
|
|
)
|
|
|
|
// Check Middleware Manifest (for Edge runtime)
|
|
middlewareManifest = JSON.parse(
|
|
await next.readFile('.next/server/middleware-manifest.json')
|
|
)
|
|
} catch (error) {
|
|
console.error('Error reading manifests:', error)
|
|
throw error
|
|
}
|
|
|
|
// Test our fix: Node.js route should have both maxDuration and regions
|
|
expect(functionsConfigManifest.functions).toHaveProperty('/api/test')
|
|
expect(functionsConfigManifest.functions['/api/test']).toHaveProperty(
|
|
'maxDuration',
|
|
100
|
|
)
|
|
expect(functionsConfigManifest.functions['/api/test']).toHaveProperty(
|
|
'regions'
|
|
)
|
|
expect(functionsConfigManifest.functions['/api/test'].regions).toEqual([
|
|
'iad1',
|
|
])
|
|
|
|
// Edge route should also be in functions manifest with regions
|
|
expect(functionsConfigManifest.functions).toHaveProperty('/api/test-edge')
|
|
expect(
|
|
functionsConfigManifest.functions['/api/test-edge']
|
|
).toHaveProperty('maxDuration', 100)
|
|
expect(
|
|
functionsConfigManifest.functions['/api/test-edge']
|
|
).toHaveProperty('regions')
|
|
expect(
|
|
functionsConfigManifest.functions['/api/test-edge'].regions
|
|
).toEqual(['iad1'])
|
|
|
|
// Edge runtime should also work correctly in middleware manifest - check for regions only
|
|
const edgeRoutePath = '/api/test-edge/route'
|
|
expect(middlewareManifest.functions).toHaveProperty(edgeRoutePath)
|
|
expect(middlewareManifest.functions[edgeRoutePath]).toHaveProperty(
|
|
'regions'
|
|
)
|
|
expect(middlewareManifest.functions[edgeRoutePath].regions).toEqual([
|
|
'iad1',
|
|
])
|
|
}
|
|
})
|
|
})
|