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.

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

Refactor freezing metadata while resolving and fix title merging #45965

Merged
merged 9 commits into from
Feb 17, 2023
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
add unit test and fix lint
  • Loading branch information
huozhi committed Feb 16, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit dfe2364843543b43cb02738d56fc4d557f4fcaee
37 changes: 37 additions & 0 deletions packages/next/src/lib/metadata/resolve-metadata.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { accumulateMetadata, MetadataItems } from './resolve-metadata'

describe('accumulateMetadata', () => {
describe('merge title', () => {
it('should merge page title', async () => {
const metadataItems: MetadataItems = [
[{ title: 'root' }, null],
[{ title: 'layout' }, null],
[{ title: 'page' }, null],
]
const metadata = await accumulateMetadata(metadataItems)
expect(metadata).toMatchObject({
title: { absolute: 'page', template: null },
})
})

it('should merge page title', async () => {
const metadataItems: MetadataItems = [
[{ title: 'root' }, null],
[
{ title: { absolute: 'layout', template: '1st parent layout %s' } },
null,
],
[
{ title: { absolute: 'layout', template: '2nd parent layout %s' } },
null,
],
[null, null], // same level layout
[{ title: 'page' }, null],
]
const metadata = await accumulateMetadata(metadataItems)
expect(metadata).toMatchObject({
title: { absolute: '2nd parent layout page', template: null },
})
})
})
})
1 change: 0 additions & 1 deletion packages/next/src/lib/metadata/resolve-metadata.ts
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@ import type {
ResolvedMetadata,
ResolvingMetadata,
} from './types/metadata-interface'
import type { AbsoluteTemplateString } from './types/metadata-types'
import type { MetadataImageModule } from '../../build/webpack/loaders/metadata/types'
import { createDefaultMetadata } from './default-metadata'
import { resolveOpenGraph, resolveTwitter } from './resolvers/resolve-opengraph'
22 changes: 22 additions & 0 deletions packages/next/src/lib/metadata/resolvers/resolve-title.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { resolveTitle } from './resolve-title'

describe('resolveTitle', () => {
it('should resolve nullable template as empty string title', () => {
expect(resolveTitle('', null)).toEqual({ absolute: '', template: null })
expect(resolveTitle(null, null)).toEqual({ absolute: '', template: null })
})

it('should resolve title with template', () => {
// returned template should equal the input title's template
expect(resolveTitle('title', 'dash %s')).toEqual({
absolute: 'dash title',
template: null,
})
expect(
resolveTitle({ default: 'title', template: '%s | absolute' }, 'dash %s')
).toEqual({ absolute: 'dash title', template: '%s | absolute' })
expect(
resolveTitle({ default: '', template: '%s | absolute' }, 'fake template')
).toEqual({ absolute: 'fake template', template: '%s | absolute' })
})
})