Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

fix: improve SSG output (#5555)

Bogdan Chadkin3fa07155607d
diff --git a/fixtures/ssg-netlify-by-project-id/pages/index/+Head.tsx b/fixtures/ssg-netlify-by-project-id/pages/index/+Head.tsx
index e907d9db93..3f0595bec3 100644
--- a/fixtures/ssg-netlify-by-project-id/pages/index/+Head.tsx
+++ b/fixtures/ssg-netlify-by-project-id/pages/index/+Head.tsx
@@ -8,42 +8,14 @@ import {
} from "../../app/__generated__/_index";
import "../../app/__generated__/index.css";
-export const Head = ({ data }: { data: PageContext["data"] }) => {
- const { pageMeta } = data;
- const { origin } = new URL(data.url);
+export const Head = ({}: { data: PageContext["data"] }) => {
const ldJson = {
"@context": "https://schema.org",
"@type": "WebSite",
name: siteName,
- url: origin,
};
- let socialImageUrl = pageMeta.socialImageUrl;
- if (pageMeta.socialImageAssetName) {
- socialImageUrl = `${origin}${imageLoader({
- src: `${assetBaseUrl}/${pageMeta.socialImageAssetName}`,
- // Do not transform social image (not enough information do we need to do this)
- format: "raw",
- })}`;
- }
- const isTwitterCardSizeDefined = pageMeta.custom.some(
- (meta) => meta.property === "twitter:card"
- );
return (
<>
- {data.url && <meta property="og:url" content={data.url} />}
- <title>{pageMeta.title}</title>
- <meta property="og:title" content={pageMeta.title} />
- {pageMeta.description && (
- <>
- <meta name="description" content={pageMeta.description} />
- <meta property="og:description" content={pageMeta.description} />
- </>
- )}
- <meta property="og:type" content="website" />
- {siteName && <meta property="og:site_name" content={siteName} />}
- {socialImageUrl && (
- <meta property="og:image" content={pageMeta.socialImageUrl} />
- )}
{siteName && (
<script
type="application/ld+json"
@@ -52,18 +24,6 @@ export const Head = ({ data }: { data: PageContext["data"] }) => {
}}
></script>
)}
- {pageMeta.excludePageFromSearch && (
- <meta name="robots" content="noindex, nofollow" />
- )}
- {pageMeta.custom.map(({ property, content }) => (
- <meta key={property} property={property} content={content} />
- ))}
- {(pageMeta.socialImageAssetName !== undefined ||
- pageMeta.socialImageUrl !== undefined) &&
- isTwitterCardSizeDefined === false && (
- <meta property="twitter:card" content="summary_large_image" />
- )}
-
{favIconAsset && (
<link
rel="icon"
diff --git a/fixtures/ssg-netlify-by-project-id/pages/index/+Page.tsx b/fixtures/ssg-netlify-by-project-id/pages/index/+Page.tsx
index 2aecc01909..d865d57f09 100644
--- a/fixtures/ssg-netlify-by-project-id/pages/index/+Page.tsx
+++ b/fixtures/ssg-netlify-by-project-id/pages/index/+Page.tsx
@@ -1,10 +1,14 @@
import type { PageContext } from "vike/types";
-import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";
+import {
+ PageSettingsMeta,
+ PageSettingsTitle,
+ ReactSdkContext,
+} from "@webstudio-is/react-sdk/runtime";
import { assetBaseUrl, imageLoader } from "../../app/constants.mjs";
-import { Page, breakpoints } from "../../app/__generated__/_index";
+import { Page, breakpoints, siteName } from "../../app/__generated__/_index";
const PageComponent = ({ data }: { data: PageContext["data"] }) => {
- const { system, resources, url } = data;
+ const { system, resources, url, pageMeta } = data;
return (
<ReactSdkContext.Provider
value={{
@@ -17,6 +21,14 @@ const PageComponent = ({ data }: { data: PageContext["data"] }) => {
>
{/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}
<Page key={url} system={system} />
+ <PageSettingsMeta
+ url={url}
+ pageMeta={pageMeta}
+ siteName={siteName}
+ imageLoader={imageLoader}
+ assetBaseUrl={assetBaseUrl}
+ />
+ <PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/ssg-netlify-by-project-id/renderer/+onRenderClient.tsx b/fixtures/ssg-netlify-by-project-id/renderer/+onRenderClient.tsx
index fb75527ca5..d1c62273d7 100644
--- a/fixtures/ssg-netlify-by-project-id/renderer/+onRenderClient.tsx
+++ b/fixtures/ssg-netlify-by-project-id/renderer/+onRenderClient.tsx
@@ -1,9 +1,5 @@
import { type Root, createRoot } from "react-dom/client";
import type { OnRenderClientSync } from "vike/types";
-// @todo think about how to make __generated__ typeable
-/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */
-// @ts-ignore
-import { CustomCode } from "../app/__generated__/_index";
let root: Root;
@@ -17,7 +13,7 @@ export const onRenderClient: OnRenderClientSync = (pageContext) => {
<meta charSet="UTF-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<Head data={pageContext.data} />
- <CustomCode />
+ {/* avoid hydrating custom code on client, it will duplicate all scripts */}
</head>
<Page data={pageContext.data} />
</>
diff --git a/fixtures/ssg/pages/another-page/+Head.tsx b/fixtures/ssg/pages/another-page/+Head.tsx
index 67d80a19e4..a20d934685 100644
--- a/fixtures/ssg/pages/another-page/+Head.tsx
+++ b/fixtures/ssg/pages/another-page/+Head.tsx
@@ -8,42 +8,14 @@ import {
} from "../../app/__generated__/[another-page]._index";
import "../../app/__generated__/index.css";
-export const Head = ({ data }: { data: PageContext["data"] }) => {
- const { pageMeta } = data;
- const { origin } = new URL(data.url);
+export const Head = ({}: { data: PageContext["data"] }) => {
const ldJson = {
"@context": "https://schema.org",
"@type": "WebSite",
name: siteName,
- url: origin,
};
- let socialImageUrl = pageMeta.socialImageUrl;
- if (pageMeta.socialImageAssetName) {
- socialImageUrl = `${origin}${imageLoader({
- src: `${assetBaseUrl}/${pageMeta.socialImageAssetName}`,
- // Do not transform social image (not enough information do we need to do this)
- format: "raw",
- })}`;
- }
- const isTwitterCardSizeDefined = pageMeta.custom.some(
- (meta) => meta.property === "twitter:card"
- );
return (
<>
- {data.url && <meta property="og:url" content={data.url} />}
- <title>{pageMeta.title}</title>
- <meta property="og:title" content={pageMeta.title} />
- {pageMeta.description && (
- <>
- <meta name="description" content={pageMeta.description} />
- <meta property="og:description" content={pageMeta.description} />
- </>
- )}
- <meta property="og:type" content="website" />
- {siteName && <meta property="og:site_name" content={siteName} />}
- {socialImageUrl && (
- <meta property="og:image" content={pageMeta.socialImageUrl} />
- )}
{siteName && (
<script
type="application/ld+json"
@@ -52,18 +24,6 @@ export const Head = ({ data }: { data: PageContext["data"] }) => {
}}
></script>
)}
- {pageMeta.excludePageFromSearch && (
- <meta name="robots" content="noindex, nofollow" />
- )}
- {pageMeta.custom.map(({ property, content }) => (
- <meta key={property} property={property} content={content} />
- ))}
- {(pageMeta.socialImageAssetName !== undefined ||
- pageMeta.socialImageUrl !== undefined) &&
- isTwitterCardSizeDefined === false && (
- <meta property="twitter:card" content="summary_large_image" />
- )}
-
{favIconAsset && (
<link
rel="icon"
diff --git a/fixtures/ssg/pages/another-page/+Page.tsx b/fixtures/ssg/pages/another-page/+Page.tsx
index 2d568eff92..2b0a21844c 100644
--- a/fixtures/ssg/pages/another-page/+Page.tsx
+++ b/fixtures/ssg/pages/another-page/+Page.tsx
@@ -1,13 +1,18 @@
import type { PageContext } from "vike/types";
-import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";
+import {
+ PageSettingsMeta,
+ PageSettingsTitle,
+ ReactSdkContext,
+} from "@webstudio-is/react-sdk/runtime";
import { assetBaseUrl, imageLoader } from "../../app/constants.mjs";
import {
Page,
breakpoints,
+ siteName,
} from "../../app/__generated__/[another-page]._index";
const PageComponent = ({ data }: { data: PageContext["data"] }) => {
- const { system, resources, url } = data;
+ const { system, resources, url, pageMeta } = data;
return (
<ReactSdkContext.Provider
value={{
@@ -20,6 +25,14 @@ const PageComponent = ({ data }: { data: PageContext["data"] }) => {
>
{/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}
<Page key={url} system={system} />
+ <PageSettingsMeta
+ url={url}
+ pageMeta={pageMeta}
+ siteName={siteName}
+ imageLoader={imageLoader}
+ assetBaseUrl={assetBaseUrl}
+ />
+ <PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/ssg/pages/index/+Head.tsx b/fixtures/ssg/pages/index/+Head.tsx
index e907d9db93..3f0595bec3 100644
--- a/fixtures/ssg/pages/index/+Head.tsx
+++ b/fixtures/ssg/pages/index/+Head.tsx
@@ -8,42 +8,14 @@ import {
} from "../../app/__generated__/_index";
import "../../app/__generated__/index.css";
-export const Head = ({ data }: { data: PageContext["data"] }) => {
- const { pageMeta } = data;
- const { origin } = new URL(data.url);
+export const Head = ({}: { data: PageContext["data"] }) => {
const ldJson = {
"@context": "https://schema.org",
"@type": "WebSite",
name: siteName,
- url: origin,
};
- let socialImageUrl = pageMeta.socialImageUrl;
- if (pageMeta.socialImageAssetName) {
- socialImageUrl = `${origin}${imageLoader({
- src: `${assetBaseUrl}/${pageMeta.socialImageAssetName}`,
- // Do not transform social image (not enough information do we need to do this)
- format: "raw",
- })}`;
- }
- const isTwitterCardSizeDefined = pageMeta.custom.some(
- (meta) => meta.property === "twitter:card"
- );
return (
<>
- {data.url && <meta property="og:url" content={data.url} />}
- <title>{pageMeta.title}</title>
- <meta property="og:title" content={pageMeta.title} />
- {pageMeta.description && (
- <>
- <meta name="description" content={pageMeta.description} />
- <meta property="og:description" content={pageMeta.description} />
- </>
- )}
- <meta property="og:type" content="website" />
- {siteName && <meta property="og:site_name" content={siteName} />}
- {socialImageUrl && (
- <meta property="og:image" content={pageMeta.socialImageUrl} />
- )}
{siteName && (
<script
type="application/ld+json"
@@ -52,18 +24,6 @@ export const Head = ({ data }: { data: PageContext["data"] }) => {
}}
></script>
)}
- {pageMeta.excludePageFromSearch && (
- <meta name="robots" content="noindex, nofollow" />
- )}
- {pageMeta.custom.map(({ property, content }) => (
- <meta key={property} property={property} content={content} />
- ))}
- {(pageMeta.socialImageAssetName !== undefined ||
- pageMeta.socialImageUrl !== undefined) &&
- isTwitterCardSizeDefined === false && (
- <meta property="twitter:card" content="summary_large_image" />
- )}
-
{favIconAsset && (
<link
rel="icon"
diff --git a/fixtures/ssg/pages/index/+Page.tsx b/fixtures/ssg/pages/index/+Page.tsx
index 2aecc01909..d865d57f09 100644
--- a/fixtures/ssg/pages/index/+Page.tsx
+++ b/fixtures/ssg/pages/index/+Page.tsx
@@ -1,10 +1,14 @@
import type { PageContext } from "vike/types";
-import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";
+import {
+ PageSettingsMeta,
+ PageSettingsTitle,
+ ReactSdkContext,
+} from "@webstudio-is/react-sdk/runtime";
import { assetBaseUrl, imageLoader } from "../../app/constants.mjs";
-import { Page, breakpoints } from "../../app/__generated__/_index";
+import { Page, breakpoints, siteName } from "../../app/__generated__/_index";
const PageComponent = ({ data }: { data: PageContext["data"] }) => {
- const { system, resources, url } = data;
+ const { system, resources, url, pageMeta } = data;
return (
<ReactSdkContext.Provider
value={{
@@ -17,6 +21,14 @@ const PageComponent = ({ data }: { data: PageContext["data"] }) => {
>
{/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}
<Page key={url} system={system} />
+ <PageSettingsMeta
+ url={url}
+ pageMeta={pageMeta}
+ siteName={siteName}
+ imageLoader={imageLoader}
+ assetBaseUrl={assetBaseUrl}
+ />
+ <PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/ssg/renderer/+onRenderClient.tsx b/fixtures/ssg/renderer/+onRenderClient.tsx
index fb75527ca5..d1c62273d7 100644
--- a/fixtures/ssg/renderer/+onRenderClient.tsx
+++ b/fixtures/ssg/renderer/+onRenderClient.tsx
@@ -1,9 +1,5 @@
import { type Root, createRoot } from "react-dom/client";
import type { OnRenderClientSync } from "vike/types";
-// @todo think about how to make __generated__ typeable
-/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */
-// @ts-ignore
-import { CustomCode } from "../app/__generated__/_index";
let root: Root;
@@ -17,7 +13,7 @@ export const onRenderClient: OnRenderClientSync = (pageContext) => {
<meta charSet="UTF-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<Head data={pageContext.data} />
- <CustomCode />
+ {/* avoid hydrating custom code on client, it will duplicate all scripts */}
</head>
<Page data={pageContext.data} />
</>
diff --git a/packages/cli/templates/ssg/app/route-templates/html/+Head.tsx b/packages/cli/templates/ssg/app/route-templates/html/+Head.tsx
index 88350e320b..ba678e2223 100644
--- a/packages/cli/templates/ssg/app/route-templates/html/+Head.tsx
+++ b/packages/cli/templates/ssg/app/route-templates/html/+Head.tsx
@@ -8,42 +8,14 @@ import {
} from "__CLIENT__";
import "__CSS__";
-export const Head = ({ data }: { data: PageContext["data"] }) => {
- const { pageMeta } = data;
- const { origin } = new URL(data.url);
+export const Head = ({}: { data: PageContext["data"] }) => {
const ldJson = {
"@context": "https://schema.org",
"@type": "WebSite",
name: siteName,
- url: origin,
};
- let socialImageUrl = pageMeta.socialImageUrl;
- if (pageMeta.socialImageAssetName) {
- socialImageUrl = `${origin}${imageLoader({
- src: `${assetBaseUrl}/${pageMeta.socialImageAssetName}`,
- // Do not transform social image (not enough information do we need to do this)
- format: "raw",
- })}`;
- }
- const isTwitterCardSizeDefined = pageMeta.custom.some(
- (meta) => meta.property === "twitter:card"
- );
return (
<>
- {data.url && <meta property="og:url" content={data.url} />}
- <title>{pageMeta.title}</title>
- <meta property="og:title" content={pageMeta.title} />
- {pageMeta.description && (
- <>
- <meta name="description" content={pageMeta.description} />
- <meta property="og:description" content={pageMeta.description} />
- </>
- )}
- <meta property="og:type" content="website" />
- {siteName && <meta property="og:site_name" content={siteName} />}
- {socialImageUrl && (
- <meta property="og:image" content={pageMeta.socialImageUrl} />
- )}
{siteName && (
<script
type="application/ld+json"
@@ -52,18 +24,6 @@ export const Head = ({ data }: { data: PageContext["data"] }) => {
}}
></script>
)}
- {pageMeta.excludePageFromSearch && (
- <meta name="robots" content="noindex, nofollow" />
- )}
- {pageMeta.custom.map(({ property, content }) => (
- <meta key={property} property={property} content={content} />
- ))}
- {(pageMeta.socialImageAssetName !== undefined ||
- pageMeta.socialImageUrl !== undefined) &&
- isTwitterCardSizeDefined === false && (
- <meta property="twitter:card" content="summary_large_image" />
- )}
-
{favIconAsset && (
<link
rel="icon"
diff --git a/packages/cli/templates/ssg/app/route-templates/html/+Page.tsx b/packages/cli/templates/ssg/app/route-templates/html/+Page.tsx
index fd37e42efc..19c341ab7f 100644
--- a/packages/cli/templates/ssg/app/route-templates/html/+Page.tsx
+++ b/packages/cli/templates/ssg/app/route-templates/html/+Page.tsx
@@ -1,10 +1,14 @@
import type { PageContext } from "vike/types";
-import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";
+import {
+ PageSettingsMeta,
+ PageSettingsTitle,
+ ReactSdkContext,
+} from "@webstudio-is/react-sdk/runtime";
import { assetBaseUrl, imageLoader } from "__CONSTANTS__";
-import { Page, breakpoints } from "__CLIENT__";
+import { Page, breakpoints, siteName } from "__CLIENT__";
const PageComponent = ({ data }: { data: PageContext["data"] }) => {
- const { system, resources, url } = data;
+ const { system, resources, url, pageMeta } = data;
return (
<ReactSdkContext.Provider
value={{
@@ -17,6 +21,14 @@ const PageComponent = ({ data }: { data: PageContext["data"] }) => {
>
{/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}
<Page key={url} system={system} />
+ <PageSettingsMeta
+ url={url}
+ pageMeta={pageMeta}
+ siteName={siteName}
+ imageLoader={imageLoader}
+ assetBaseUrl={assetBaseUrl}
+ />
+ <PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
</ReactSdkContext.Provider>
);
};
diff --git a/packages/cli/templates/ssg/renderer/+onRenderClient.tsx b/packages/cli/templates/ssg/renderer/+onRenderClient.tsx
index fb75527ca5..d1c62273d7 100644
--- a/packages/cli/templates/ssg/renderer/+onRenderClient.tsx
+++ b/packages/cli/templates/ssg/renderer/+onRenderClient.tsx
@@ -1,9 +1,5 @@
import { type Root, createRoot } from "react-dom/client";
import type { OnRenderClientSync } from "vike/types";
-// @todo think about how to make __generated__ typeable
-/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */
-// @ts-ignore
-import { CustomCode } from "../app/__generated__/_index";
let root: Root;
@@ -17,7 +13,7 @@ export const onRenderClient: OnRenderClientSync = (pageContext) => {
<meta charSet="UTF-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<Head data={pageContext.data} />
- <CustomCode />
+ {/* avoid hydrating custom code on client, it will duplicate all scripts */}
</head>
<Page data={pageContext.data} />
</>
diff --git a/packages/react-sdk/src/page-settings-meta.tsx b/packages/react-sdk/src/page-settings-meta.tsx
index 0e349cbc04..8a0fb7fe23 100644
--- a/packages/react-sdk/src/page-settings-meta.tsx
+++ b/packages/react-sdk/src/page-settings-meta.tsx
@@ -69,8 +69,8 @@ export const PageSettingsMeta = ({
assetBaseUrl,
}: {
url?: string;
- host: string;
- siteName: string;
+ host?: string;
+ siteName?: string;
pageMeta: PageMeta;
imageLoader: ImageLoader;
assetBaseUrl: string;
@@ -120,9 +120,10 @@ export const PageSettingsMeta = ({
}
if (pageMeta.socialImageAssetName) {
+ const origin = host ? `https://${host}` : "";
metas.push({
property: "og:image",
- content: `https://${host}${imageLoader({
+ content: `${origin}${imageLoader({
src: `${assetBaseUrl}${pageMeta.socialImageAssetName}`,
// Do not transform social image (not enough information do we need to do this)
format: "raw",