Skip to content

fix: rewrite meta image link (#615) #620

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 10, 2024
Merged

fix: rewrite meta image link (#615) #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/steps/extract-metadata.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { toString } from 'hast-util-to-string';
import { remove } from 'unist-util-remove';
import { visit, EXIT, CONTINUE } from 'unist-util-visit';
import {
getAbsoluteUrl, makeCanonicalHtmlUrl, optimizeImageURL, resolveUrl,
getAbsoluteUrl, makeCanonicalHtmlUrl, optimizeImageURL, resolveUrl, rewriteUrl,
} from './utils.js';
import { toMetaName } from '../utils/modifiers.js';
import { childNodes } from '../utils/hast-utils.js';
Expand Down Expand Up @@ -251,7 +251,9 @@ export default function extractMetaData(state, req) {
meta.image = content.image || '/default-meta-image.png';
}
if (meta.image) {
meta.image = getAbsoluteUrl(state, optimizeMetaImage(state.info.path, meta.image));
meta.image = rewriteUrl(state, meta.image);
meta.image = optimizeMetaImage(state.info.path, meta.image);
meta.image = getAbsoluteUrl(state, meta.image);
}

meta.imageAlt = meta['image-alt'] ?? content.imageAlt;
Expand Down
34 changes: 34 additions & 0 deletions test/fixtures/content/image-from-meta-rewrite-link.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!DOCTYPE html>
<html>
<head>
<title>ACME CORP</title>
<link rel="canonical" href="https://www.adobe.com/image-from-meta-rewrite-link">
<meta name="description" content="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed euismod, urna eu tempor congue, nisi erat condimentum nunc, eget tincidunt nisl nunc euismod.">
<meta property="og:title" content="ACME CORP">
<meta property="og:description" content="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed euismod, urna eu tempor congue, nisi erat condimentum nunc, eget tincidunt nisl nunc euismod.">
<meta property="og:url" content="https://www.adobe.com/image-from-meta-rewrite-link">
<meta property="og:image" content="https://www.adobe.com/images/meta/default-meta-image.png?width=1200&#x26;format=pjpg&#x26;optimize=medium">
<meta property="og:image:secure_url" content="https://www.adobe.com/images/meta/default-meta-image.png?width=1200&#x26;format=pjpg&#x26;optimize=medium">
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:title" content="ACME CORP">
<meta name="twitter:description" content="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed euismod, urna eu tempor congue, nisi erat condimentum nunc, eget tincidunt nisl nunc euismod.">
<meta name="twitter:image" content="https://www.adobe.com/images/meta/default-meta-image.png?width=1200&#x26;format=pjpg&#x26;optimize=medium">
<meta name="locale" content="en-US">
<meta name="zero-cell" content="0">
<meta name="publication-date" content="09/12/2023">
<link id="favicon" rel="icon" type="image/svg+xml" href="/icons/spark.svg">
<meta name="viewport" content="width=device-width, initial-scale=1">
<script src="/scripts.js" type="module"></script>
<link rel="stylesheet" href="/styles.css">
</head>
<body>
<header></header>
<main>
<div>
<h1 id="hero">Hero</h1>
<p>Test Content.</p>
</div>
</main>
<footer></footer>
</body>
</html>
11 changes: 11 additions & 0 deletions test/fixtures/content/image-from-meta-rewrite-link.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Hero

Test Content.

+---------------------------------------------------------------------------------------------------+
| Metadata |
+------------------+--------------------------------------------------------------------------------+
| Image | <https://main--helix-pages--adobe.hlx.page/images/meta/default-meta-image.png> |
+------------------+--------------------------------------------------------------------------------+
| Publication Date | 09/12/2023 |
+------------------+--------------------------------------------------------------------------------+
6 changes: 3 additions & 3 deletions test/fixtures/content/image-from-meta.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<link rel="canonical" href="https://helix-pages.com/image-from-meta">
<meta property="og:title" content="Hero">
<meta property="og:url" content="https://helix-pages.com/image-from-meta">
<meta property="og:image" content="https://hlx.blob.core.windows.net/external/67af739484f3d60dc64e306ccbf9b90a6d63a24c#image.png">
<meta property="og:image:secure_url" content="https://hlx.blob.core.windows.net/external/67af739484f3d60dc64e306ccbf9b90a6d63a24c#image.png">
<meta property="og:image" content="https://helix-pages.com/media_67af739484f3d60dc64e306ccbf9b90a6d63a24c.png?width=1200&#x26;format=pjpg&#x26;optimize=medium">
<meta property="og:image:secure_url" content="https://helix-pages.com/media_67af739484f3d60dc64e306ccbf9b90a6d63a24c.png?width=1200&#x26;format=pjpg&#x26;optimize=medium">
<meta property="og:image:alt" content="Alt text from metadata">
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:title" content="Hero">
<meta name="twitter:image" content="https://hlx.blob.core.windows.net/external/67af739484f3d60dc64e306ccbf9b90a6d63a24c#image.png">
<meta name="twitter:image" content="https://helix-pages.com/media_67af739484f3d60dc64e306ccbf9b90a6d63a24c.png?width=1200&#x26;format=pjpg&#x26;optimize=medium">
<link id="favicon" rel="icon" type="image/svg+xml" href="/icons/spark.svg">
<meta name="viewport" content="width=device-width, initial-scale=1">
<script src="/scripts.js" type="module"></script>
Expand Down
5 changes: 5 additions & 0 deletions test/rendering.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,11 @@ describe('Rendering', () => {
await testRender('image-from-meta-rewrite', 'html');
});

it('uses correct image - from metadata with rewrite (link)', async () => {
loader.status('config-all.json', 404);
await testRender('image-from-meta-rewrite-link', 'html');
});

it('uses correct description', async () => {
config = DEFAULT_CONFIG_EMPTY;
await testRender('description-long', 'head');
Expand Down