Ensure app/layout.tsx can export preferredRegion (#49031)

Fixes a small bug where `layout` directly under `app` wasn't considered.
<!-- 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 or adding/fixing 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 #

-->
This commit is contained in:
Tim Neutkens 2023-05-01 11:58:36 +02:00 committed by GitHub
parent 0b07616eb2
commit ec8e0f911f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions

View file

@ -85,11 +85,12 @@ export async function getStaticInfoIncludingLayouts({
} }
: pageStaticInfo : pageStaticInfo
if (isInsideAppDir) { if (isInsideAppDir && appDir) {
const layoutFiles = [] const layoutFiles = []
const potentialLayoutFiles = pageExtensions.map((ext) => 'layout.' + ext) const potentialLayoutFiles = pageExtensions.map((ext) => 'layout.' + ext)
let dir = dirname(pageFilePath) let dir = dirname(pageFilePath)
while (dir !== appDir) { // Uses startsWith to not include directories further up.
while (dir.startsWith(appDir)) {
for (const potentialLayoutFile of potentialLayoutFiles) { for (const potentialLayoutFile of potentialLayoutFiles) {
const layoutFile = join(dir, potentialLayoutFile) const layoutFile = join(dir, potentialLayoutFile)
if (!(await fileExists(layoutFile))) { if (!(await fileExists(layoutFile))) {

View file

@ -4,6 +4,7 @@ import '../styles/global.css'
import './style.css' import './style.css'
export const revalidate = 0 export const revalidate = 0
export const preferredRegion = 'sfo1'
async function getData() { async function getData() {
return { return {

View file

@ -29,6 +29,11 @@ createNextDescribe(
expect(middlewareManifest.functions['/test-page/page'].regions).toEqual( expect(middlewareManifest.functions['/test-page/page'].regions).toEqual(
['home'] ['home']
) )
// Inherits from the root layout.
expect(
middlewareManifest.functions['/slow-page-with-loading/page'].regions
).toEqual(['sfo1'])
}) })
} }