Unverified Commit bf09c65e authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Allow override icon rel (#49194)

Fixes #48392

When passing down `Array<IconDescriptor>`, it should allow overriding `rel` prop of icon instead of always picking the default one
fix NEXT-1085
parent 7fd97b8b
...@@ -11,7 +11,7 @@ function IconDescriptorLink({ icon }: { icon: IconDescriptor }) { ...@@ -11,7 +11,7 @@ function IconDescriptorLink({ icon }: { icon: IconDescriptor }) {
function IconLink({ rel, icon }: { rel?: string; icon: Icon }) { function IconLink({ rel, icon }: { rel?: string; icon: Icon }) {
if (typeof icon === 'object' && !(icon instanceof URL)) { if (typeof icon === 'object' && !(icon instanceof URL)) {
if (rel) icon.rel = rel if (!icon.rel && rel) icon.rel = rel
return <IconDescriptorLink icon={icon} /> return <IconDescriptorLink icon={icon} />
} else { } else {
const href = icon.toString() const href = icon.toString()
......
...@@ -4,7 +4,11 @@ export default function page() { ...@@ -4,7 +4,11 @@ export default function page() {
export const metadata = { export const metadata = {
icons: { icons: {
icon: [{ url: '/icon.png' }, new URL('/icon.png', 'https://example.com')], icon: [
{ url: '/icon.png' },
new URL('/icon.png', 'https://example.com'),
{ url: '/icon2.png', rel: 'apple-touch-icon' }, // override icon rel
],
shortcut: ['/shortcut-icon.png'], shortcut: ['/shortcut-icon.png'],
apple: [ apple: [
{ url: '/apple-icon.png' }, { url: '/apple-icon.png' },
......
...@@ -535,6 +535,7 @@ createNextDescribe( ...@@ -535,6 +535,7 @@ createNextDescribe(
'https://example.com/icon.png', 'https://example.com/icon.png',
]) ])
await checkLink(browser, 'apple-touch-icon', [ await checkLink(browser, 'apple-touch-icon', [
'/icon2.png',
'/apple-icon.png', '/apple-icon.png',
'/apple-icon-x3.png', '/apple-icon-x3.png',
]) ])
......
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