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.

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

Jump to bottom

fix(v2): fix external URL for og:image tag #2420

Merged
merged 7 commits into from
Mar 18, 2020
Merged

fix(v2): fix external URL for og:image tag #2420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5832639
fix(v2): og:image
38elements Mar 16, 2020
7344e8b
Use isInternalUrl()
38elements Mar 17, 2020
037115e
Update index.js
yangshun Mar 18, 2020
d36774d
Update index.js
yangshun Mar 18, 2020
1562ce9
Update index.js
yangshun Mar 18, 2020
d64b644
Update index.js
yangshun Mar 18, 2020
6d5c797
Update index.js
yangshun Mar 18, 2020
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: 5 additions & 1 deletion packages/docusaurus-theme-classic/src/theme/DocItem/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import React from 'react';

import Head from '@docusaurus/Head';
import isInternalUrl from '@docusaurus/isInternalUrl';
import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
import useBaseUrl from '@docusaurus/useBaseUrl';
import DocPaginator from '@theme/DocPaginator';
Expand Down Expand Up @@ -75,7 +76,10 @@ function DocItem(props) {
},
} = DocContent;

const metaImageUrl = siteUrl + useBaseUrl(metaImage);
let metaImageUrl = siteUrl + useBaseUrl(metaImage);
if (!isInternalUrl(metaImage)) {
metaImageUrl = metaImage;
}

return (
<>
Expand Down
9 changes: 7 additions & 2 deletions packages/docusaurus-theme-classic/src/theme/Layout/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import React from 'react';
import Head from '@docusaurus/Head';
import isInternalUrl from '@docusaurus/isInternalUrl';
import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
import useBaseUrl from '@docusaurus/useBaseUrl';

Expand Down Expand Up @@ -36,8 +37,12 @@ function Layout(props) {
version,
} = props;
const metaTitle = title ? `${title} | ${siteTitle}` : siteTitle;
const metaImage = image || defaultImage;
const metaImageUrl = siteUrl + useBaseUrl(metaImage);

let metaImageUrl = siteUrl + useBaseUrl(metaImage);
if (!isInternalUrl(metaImage)) {
metaImageUrl = metaImage;
}

const faviconUrl = useBaseUrl(favicon);

return (
Expand Down