Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-03 23:00:14 -05:00
Code Issues Activity

🐛 Fixed mainEntityOfPage property within page metadata

Browse source 
fixes https://github.com/TryGhost/Ghost/issues/16367
refs https://github.com/schemaorg/schemaorg/discussions/3274

- after a discussion with the schemaorg maintainers, it looks like
  `mainEntityOfPage` should refer to the entity itself vs the parent
  entity
- this commit updates the code to use the entity URL and fixes the
  associated tests
This commit is contained in:
Daniel Lockyer 2023-03-17 14:49:26 +01:00 • committed by Daniel Lockyer
parent f67b38daf4
commit b7a03ca765
3 changed files with 45 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ghost/core/core/frontend/meta/schema.js
View file

@ -107,10 +107,7 @@ function getPostSchema(metaData, data) {
keywords: metaData.keywords && metaData.keywords.length > 0 ?
metaData.keywords.join(', ') : null,
description: description,
mainEntityOfPage: {
'@type': 'WebPage',
'@id': metaData.site.url || null
}
mainEntityOfPage: metaData.url
};
schema.author = trimSchema(schema.author);
return trimSchema(schema);
@ -123,10 +120,7 @@ function getHomeSchema(metaData) {
publisher: schemaPublisherObject(metaData),
url: metaData.url,
image: schemaImageObject(metaData.coverImage),
mainEntityOfPage: {
'@type': 'WebPage',
'@id': metaData.site.url || null
},
mainEntityOfPage: metaData.url,
description: metaData.metaDescription ?
escapeExpression(metaData.metaDescription) :
null
@ -142,10 +136,7 @@ function getTagSchema(metaData, data) {
url: metaData.url,
image: schemaImageObject(metaData.coverImage),
name: data.tag.name,
mainEntityOfPage: {
'@type': 'WebPage',
'@id': metaData.site.url || null
},
mainEntityOfPage: metaData.url,
description: metaData.metaDescription ?
escapeExpression(metaData.metaDescription) :
null
@ -162,10 +153,7 @@ function getAuthorSchema(metaData, data) {
name: escapeExpression(data.author.name),
url: metaData.authorUrl,
image: schemaImageObject(metaData.coverImage),
mainEntityOfPage: {
'@type': 'WebPage',
'@id': metaData.site.url || null
},
mainEntityOfPage: metaData.authorUrl,
description: metaData.metaDescription ?
escapeExpression(metaData.metaDescription) :
null

165
ghost/core/test/unit/frontend/helpers/__snapshots__/ghost_head.test.js.snap
View file

@ -61,10 +61,7 @@ Object {
\\"url\\": \\"http://127.0.0.1:2369/content/images/test-image-about.png\\"
},
\\"description\\": \\"all about our site\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://127.0.0.1:2369/\\"
}
\\"mainEntityOfPage\\": \\"http://127.0.0.1:2369/post/\\"
}
</script>
@ -200,10 +197,7 @@ Object {
\\"url\\": \\"http://127.0.0.1:2369/content/images/test-image-about.png\\"
},
\\"description\\": \\"all about our site\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://127.0.0.1:2369/\\"
}
\\"mainEntityOfPage\\": \\"http://127.0.0.1:2369/post/\\"
}
</script>
@ -273,10 +267,7 @@ Object {
\\"url\\": \\"http://127.0.0.1:2369/content/images/test-image-about.png\\"
},
\\"description\\": \\"all about our site\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://127.0.0.1:2369/\\"
}
\\"mainEntityOfPage\\": \\"http://127.0.0.1:2369/post/\\"
}
</script>
@ -359,10 +350,7 @@ Object {
\\"url\\": \\"http://127.0.0.1:2369/content/images/test-image-about.png\\"
},
\\"description\\": \\"all about our site\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://127.0.0.1:2369/\\"
}
\\"mainEntityOfPage\\": \\"http://127.0.0.1:2369/post/\\"
}
</script>
@ -434,10 +422,7 @@ Object {
\\"url\\": \\"http://127.0.0.1:2369/content/images/test-image-about.png\\"
},
\\"description\\": \\"all about our site\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://127.0.0.1:2369/\\"
}
\\"mainEntityOfPage\\": \\"http://127.0.0.1:2369/post/\\"
}
</script>
@ -765,10 +750,7 @@ Object {
\\"@type\\": \\"ImageObject\\",
\\"url\\": \\"http://127.0.0.1:2369/content/images/site-cover.png\\"
},
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://127.0.0.1:2369/\\"
},
\\"mainEntityOfPage\\": \\"http://127.0.0.1:2369/\\",
\\"description\\": \\"site description\\"
}
</script>
@ -881,10 +863,7 @@ Object {
\\"@type\\": \\"ImageObject\\",
\\"url\\": \\"http://127.0.0.1:2369/content/images/site-cover.png\\"
},
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://127.0.0.1:2369/\\"
},
\\"mainEntityOfPage\\": \\"http://127.0.0.1:2369/\\",
\\"description\\": \\"site description\\"
}
</script>
@ -996,10 +975,7 @@ Object {
\\"@type\\": \\"ImageObject\\",
\\"url\\": \\"http://127.0.0.1:2369/content/images/site-cover.png\\"
},
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://127.0.0.1:2369/\\"
},
\\"mainEntityOfPage\\": \\"http://127.0.0.1:2369/\\",
\\"description\\": \\"site description\\"
}
</script>
@ -1112,10 +1088,7 @@ Object {
\\"@type\\": \\"ImageObject\\",
\\"url\\": \\"http://127.0.0.1:2369/content/images/site-cover.png\\"
},
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://127.0.0.1:2369/\\"
},
\\"mainEntityOfPage\\": \\"http://127.0.0.1:2369/\\",
\\"description\\": \\"site description\\"
}
</script>
@ -1228,10 +1201,7 @@ Object {
\\"@type\\": \\"ImageObject\\",
\\"url\\": \\"http://127.0.0.1:2369/content/images/site-cover.png\\"
},
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://127.0.0.1:2369/\\"
},
\\"mainEntityOfPage\\": \\"http://127.0.0.1:2369/\\",
\\"description\\": \\"site description\\"
}
</script>
@ -1280,10 +1250,7 @@ Object {
\\"@type\\": \\"ImageObject\\",
\\"url\\": \\"http://127.0.0.1:2369/content/images/site-cover.png\\"
},
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://127.0.0.1:2369/\\"
},
\\"mainEntityOfPage\\": \\"http://127.0.0.1:2369/\\",
\\"description\\": \\"site description\\"
}
</script>
@ -1396,10 +1363,7 @@ Object {
\\"@type\\": \\"ImageObject\\",
\\"url\\": \\"http://127.0.0.1:2369/content/images/site-cover.png\\"
},
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://127.0.0.1:2369/\\"
},
\\"mainEntityOfPage\\": \\"http://127.0.0.1:2369/\\",
\\"description\\": \\"site description\\"
}
</script>
@ -1543,10 +1507,7 @@ Object {
\\"url\\": \\"http://localhost:65530/content/images/test-image-about.png\\"
},
\\"description\\": \\"all about our site\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
}
\\"mainEntityOfPage\\": \\"http://localhost:65530/\\"
}
</script>
@ -1644,10 +1605,7 @@ Object {
\\"@type\\": \\"ImageObject\\",
\\"url\\": \\"http://localhost:65530/content/images/site-cover.png\\"
},
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
},
\\"mainEntityOfPage\\": \\"http://localhost:65530/\\",
\\"description\\": \\"site description\\"
}
</script>
@ -1730,10 +1688,7 @@ Object {
\\"@type\\": \\"ImageObject\\",
\\"url\\": \\"http://localhost:65530/content/images/site-cover.png\\"
},
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
},
\\"mainEntityOfPage\\": \\"http://localhost:65530/\\",
\\"description\\": \\"site description\\"
}
</script>
@ -1783,10 +1738,7 @@ Object {
\\"@type\\": \\"ImageObject\\",
\\"url\\": \\"http://localhost:65530/content/images/site-cover.png\\"
},
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
},
\\"mainEntityOfPage\\": \\"http://localhost:65530/\\",
\\"description\\": \\"site description\\"
}
</script>
@ -1873,10 +1825,7 @@ Object {
\\"dateModified\\": \\"1970-01-01T00:00:00.000Z\\",
\\"keywords\\": \\"tag1, tag2, tag3\\",
\\"description\\": \\"This is a short post\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
}
\\"mainEntityOfPage\\": \\"http://localhost:65530/about/\\"
}
</script>
@ -1924,10 +1873,7 @@ Object {
\\"@type\\": \\"ImageObject\\",
\\"url\\": \\"http://localhost:65530/content/images/site-cover.png\\"
},
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
},
\\"mainEntityOfPage\\": \\"http://localhost:65530/\\",
\\"description\\": \\"site SEO description\\"
}
</script>
@ -2039,10 +1985,7 @@ Object {
\\"url\\": \\"http://localhost:65530/content/images/tag-image.png\\"
},
\\"name\\": \\"tagtitle\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
},
\\"mainEntityOfPage\\": \\"http://localhost:65530/tag/tagtitle/\\",
\\"description\\": \\"tag meta description\\"
}
</script>
@ -2091,10 +2034,7 @@ Object {
\\"@type\\": \\"ImageObject\\",
\\"url\\": \\"http://localhost:65530/content/images/author-cover-image.png\\"
},
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
},
\\"mainEntityOfPage\\": \\"https://mysite.com/fakeauthor/\\",
\\"description\\": \\"Author bio\\"
}
</script>
@ -2175,10 +2115,7 @@ Object {
},
\\"keywords\\": \\"tag1, tag2, tag3\\",
\\"description\\": \\"site &quot;test&quot; description\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
}
\\"mainEntityOfPage\\": \\"http://localhost:65530/post/\\"
}
</script>
@ -2257,10 +2194,7 @@ Object {
},
\\"keywords\\": \\"tag1, tag2, tag3\\",
\\"description\\": \\"site description\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
}
\\"mainEntityOfPage\\": \\"http://localhost:65530/post/\\"
}
</script>
@ -2305,10 +2239,7 @@ Object {
\\"@type\\": \\"ImageObject\\",
\\"url\\": \\"http://localhost:65530/content/images/site-cover.png\\"
},
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
},
\\"mainEntityOfPage\\": \\"http://localhost:65530/\\",
\\"description\\": \\"site description\\"
}
</script>
@ -2389,10 +2320,7 @@ Object {
},
\\"keywords\\": \\"tag1, tag2, tag3\\",
\\"description\\": \\"site description\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
}
\\"mainEntityOfPage\\": \\"http://localhost:65530/post/\\"
}
</script>
@ -2472,10 +2400,7 @@ Object {
},
\\"keywords\\": \\"tag1, tag2, tag3\\",
\\"description\\": \\"post custom excerpt\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
}
\\"mainEntityOfPage\\": \\"http://localhost:65530/post/\\"
}
</script>
@ -2543,10 +2468,7 @@ Object {
\\"datePublished\\": \\"1970-01-01T00:00:00.000Z\\",
\\"dateModified\\": \\"1970-01-01T00:00:00.000Z\\",
\\"description\\": \\"This is a short post\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
}
\\"mainEntityOfPage\\": \\"http://localhost:65530/post/\\"
}
</script>
@ -2618,10 +2540,7 @@ Object {
\\"dateModified\\": \\"1970-01-01T00:00:00.000Z\\",
\\"keywords\\": \\"tag1, tag2, tag3\\",
\\"description\\": \\"site description\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
}
\\"mainEntityOfPage\\": \\"http://localhost:65530/post/\\"
}
</script>
@ -2693,10 +2612,7 @@ Object {
\\"url\\": \\"http://localhost:65530/content/images/test-image-about.png\\"
},
\\"description\\": \\"all about our site\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
}
\\"mainEntityOfPage\\": \\"http://localhost:65530/about/\\"
}
</script>
@ -2768,10 +2684,7 @@ Object {
\\"url\\": \\"http://localhost:65530/content/images/test-image-about.png\\"
},
\\"description\\": \\"all about our site\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
}
\\"mainEntityOfPage\\": \\"http://localhost:65530/about/\\"
}
</script>
@ -2844,10 +2757,7 @@ Object {
\\"url\\": \\"http://localhost:65530/content/images/test-image.png\\"
},
\\"description\\": \\"site description\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
}
\\"mainEntityOfPage\\": \\"http://localhost:65530/post/\\"
}
</script>
@ -2912,10 +2822,7 @@ Object {
\\"dateModified\\": \\"1970-01-01T00:00:00.000Z\\",
\\"keywords\\": \\"tag1, tag2, tag3\\",
\\"description\\": \\"This is a short post\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
}
\\"mainEntityOfPage\\": \\"http://localhost:65530/post/\\"
}
</script>
@ -2962,10 +2869,7 @@ Object {
\\"url\\": \\"http://localhost:65530/content/images/tag-image.png\\"
},
\\"name\\": \\"tagtitle\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
}
\\"mainEntityOfPage\\": \\"http://localhost:65530/tag/tagtitle/\\"
}
</script>
@ -3015,10 +2919,7 @@ Object {
\\"url\\": \\"http://localhost:65530/content/images/tag-image.png\\"
},
\\"name\\": \\"tagtitle\\",
\\"mainEntityOfPage\\": {
\\"@type\\": \\"WebPage\\",
\\"@id\\": \\"http://localhost:65530/\\"
},
\\"mainEntityOfPage\\": \\"http://localhost:65530/tag/tagtitle/\\",
\\"description\\": \\"tag description\\"
}
</script>

40
ghost/core/test/unit/frontend/meta/schema.test.js
View file

@ -87,10 +87,7 @@ describe('getSchema', function () {
height: 500
},
keywords: 'one, two, tag',
mainEntityOfPage: {
'@type': 'WebPage',
'@id': 'http://mysite.com'
},
mainEntityOfPage: 'http://mysite.com/post/my-post-slug/',
publisher: {
'@type': 'Organization',
name: 'Site Title',
@ -191,10 +188,7 @@ describe('getSchema', function () {
height: 500
},
keywords: 'one, two',
mainEntityOfPage: {
'@type': 'WebPage',
'@id': 'http://mysite.com'
},
mainEntityOfPage: 'http://mysite.com/post/my-page-slug/',
publisher: {
'@type': 'Organization',
name: 'Site Title',
@ -299,10 +293,7 @@ describe('getSchema', function () {
height: 500
},
keywords: 'one, two, tag',
mainEntityOfPage: {
'@type': 'WebPage',
'@id': 'http://mysite.com'
},
mainEntityOfPage: 'http://mysite.com/post/my-amp-post-slug/',
publisher: {
'@type': 'Organization',
name: 'Site Title',
@ -366,10 +357,7 @@ describe('getSchema', function () {
datePublished: '2015-12-25T05:35:01.234Z',
description: 'Post meta description',
headline: 'Post Title',
mainEntityOfPage: {
'@type': 'WebPage',
'@id': null
},
mainEntityOfPage: 'http://mysite.com/post/my-post-slug/',
publisher: {
'@type': 'Organization',
name: 'Site Title',
@ -451,10 +439,7 @@ describe('getSchema', function () {
url: 'http://mysite.com/content/image/mypostcoverimage.jpg'
},
keywords: 'one, two, tag',
mainEntityOfPage: {
'@type': 'WebPage',
'@id': 'http://mysite.com'
},
mainEntityOfPage: 'http://mysite.com/post/my-post-slug/',
publisher: {
'@type': 'Organization',
name: 'Site Title',
@ -501,10 +486,7 @@ describe('getSchema', function () {
width: 500,
height: 500
},
mainEntityOfPage: {
'@type': 'WebPage',
'@id': null
},
mainEntityOfPage: 'http://mysite.com/post/my-post-slug/',
publisher: {
'@type': 'Organization',
name: 'Site Title',
@ -550,10 +532,7 @@ describe('getSchema', function () {
width: 500,
height: 500
},
mainEntityOfPage: {
'@type': 'WebPage',
'@id': null
},
mainEntityOfPage: 'http://mysite.com/post/my-post-slug/',
name: 'Great Tag',
publisher: {
'@type': 'Organization',
@ -597,10 +576,7 @@ describe('getSchema', function () {
'@context': 'https://schema.org',
'@type': 'Person',
description: 'This is the author description!',
mainEntityOfPage: {
'@type': 'WebPage',
'@id': 'http://mysite.com'
},
mainEntityOfPage: 'http://mysite.com/author/me/',
name: 'Author Name',
sameAs: [
'http://myblogsite.com/?user&#x3D;bambedibu&amp;a&#x3D;&lt;script&gt;alert(&quot;bambedibu&quot;)&lt;/script&gt;',