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.

feat: Add default canonical link (#4776)

Ivan Starkov373fb5f11dda
diff --git a/fixtures/webstudio-cloudflare-template/app/routes/[another-page]._index.tsx b/fixtures/webstudio-cloudflare-template/app/routes/[another-page]._index.tsx
index 6e12e779ed..63ab5675f9 100644
--- a/fixtures/webstudio-cloudflare-template/app/routes/[another-page]._index.tsx
+++ b/fixtures/webstudio-cloudflare-template/app/routes/[another-page]._index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx b/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx
index 8c2322120c..9bc280da9b 100644
--- a/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx
+++ b/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx b/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx
index ea6c11a80c..e1ef0f53c6 100644
--- a/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx
+++ b/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx b/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx
index 6d2d7d8bc7..5e20e7ac2b 100644
--- a/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx
+++ b/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-custom-template/app/routes/_index.tsx b/fixtures/webstudio-custom-template/app/routes/_index.tsx
index 8c2322120c..9bc280da9b 100644
--- a/fixtures/webstudio-custom-template/app/routes/_index.tsx
+++ b/fixtures/webstudio-custom-template/app/routes/_index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/[another-page]._index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/[another-page]._index.tsx
index 6e12e779ed..63ab5675f9 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/[another-page]._index.tsx
+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/[another-page]._index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx
index 8c2322120c..9bc280da9b 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx
+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-remix-netlify-functions/app/routes/[another-page]._index.tsx b/fixtures/webstudio-remix-netlify-functions/app/routes/[another-page]._index.tsx
index 6e12e779ed..63ab5675f9 100644
--- a/fixtures/webstudio-remix-netlify-functions/app/routes/[another-page]._index.tsx
+++ b/fixtures/webstudio-remix-netlify-functions/app/routes/[another-page]._index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx
index 8c2322120c..9bc280da9b 100644
--- a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx
+++ b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-remix-vercel/.webstudio/data.json b/fixtures/webstudio-remix-vercel/.webstudio/data.json
index 695dc0471c..aaa100ed33 100644
--- a/fixtures/webstudio-remix-vercel/.webstudio/data.json
+++ b/fixtures/webstudio-remix-vercel/.webstudio/data.json
@@ -1,10 +1,10 @@
{
"build": {
- "id": "1bd755a0-9c8a-416b-b373-2123f3568393",
+ "id": "3173a7d8-1af3-4e23-87fd-94c3b0cb1018",
"projectId": "cddc1d44-af37-4cb6-a430-d300cf6f932d",
- "version": 464,
- "createdAt": "2025-01-19T14:02:13.405+00:00",
- "updatedAt": "2025-01-19T14:02:13.405+00:00",
+ "version": 474,
+ "createdAt": "2025-01-22T17:59:53.714+00:00",
+ "updatedAt": "2025-01-22T17:59:53.714+00:00",
"pages": {
"meta": {
"siteName": "KittyGuardedZone",
@@ -2979,6 +2979,26 @@
"type": "boolean",
"value": true
}
+ ],
+ [
+ "DohJcBH-kmzk2lvN_F2hS",
+ {
+ "id": "DohJcBH-kmzk2lvN_F2hS",
+ "instanceId": "56x98yMSVYpp7eVo8wuzK",
+ "name": "rel",
+ "type": "string",
+ "value": "canonical"
+ }
+ ],
+ [
+ "_wNeTsN1d6jG8ZM5ud05d",
+ {
+ "id": "_wNeTsN1d6jG8ZM5ud05d",
+ "instanceId": "56x98yMSVYpp7eVo8wuzK",
+ "name": "href",
+ "type": "string",
+ "value": "https://overwritten.slot/head-slot-tag"
+ }
]
],
"dataSources": [
@@ -5026,6 +5046,10 @@
{
"type": "id",
"value": "EveN4Skg9xb8Lj1QJcW52"
+ },
+ {
+ "type": "id",
+ "value": "56x98yMSVYpp7eVo8wuzK"
}
]
}
@@ -5102,6 +5126,16 @@
}
]
}
+ ],
+ [
+ "56x98yMSVYpp7eVo8wuzK",
+ {
+ "type": "instance",
+ "id": "56x98yMSVYpp7eVo8wuzK",
+ "component": "HeadLink",
+ "label": "Link",
+ "children": []
+ }
]
],
"deployment": {
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/$resources.sitemap.xml.ts b/fixtures/webstudio-remix-vercel/app/__generated__/$resources.sitemap.xml.ts
index e2c6e8c37f..1bad56e430 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/$resources.sitemap.xml.ts
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/$resources.sitemap.xml.ts
@@ -1,26 +1,26 @@
export const sitemap = [
{
path: "/",
- lastModified: "2025-01-19",
+ lastModified: "2025-01-22",
},
{
path: "/_route_with_symbols_",
- lastModified: "2025-01-19",
+ lastModified: "2025-01-22",
},
{
path: "/form",
- lastModified: "2025-01-19",
+ lastModified: "2025-01-22",
},
{
path: "/heading-with-id",
- lastModified: "2025-01-19",
+ lastModified: "2025-01-22",
},
{
path: "/resources",
- lastModified: "2025-01-19",
+ lastModified: "2025-01-22",
},
{
path: "/nested/nested-page",
- lastModified: "2025-01-19",
+ lastModified: "2025-01-22",
},
];
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[head-tag]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[head-tag]._index.tsx
index 339e06410a..ccea8747cf 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[head-tag]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[head-tag]._index.tsx
@@ -43,6 +43,10 @@ const Page = ({}: { system: any }) => {
<HeadLink rel={"help"} href={"/help-head-slot"} />
<HeadMeta name={"keywords"} content={"Head Slot Content"} />
<HeadMeta content={"Head Slot Content"} property={"og:title"} />
+ <HeadLink
+ rel={"canonical"}
+ href={"https://overwritten.slot/head-slot-tag"}
+ />
</HeadSlot>
<Heading className={`w-heading`}>{"Test Head Slot"}</Heading>
<Link href={"/"} className={`w-link`}>
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx
index d7486e7268..b20c8d220b 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[class-names]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[class-names]._index.tsx
index 42f6e9655b..6b1827cdcf 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[class-names]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[class-names]._index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[content-block]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[content-block]._index.tsx
index b0767715c7..58f75037e5 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[content-block]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[content-block]._index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[expressions]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[expressions]._index.tsx
index 6badc800b2..db50853602 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[expressions]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[expressions]._index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx
index 38a92c2b70..5b31450447 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[head-tag]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[head-tag]._index.tsx
index b617f702d6..62036aa81d 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[head-tag]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[head-tag]._index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx
index 3411491cd6..cb7aa40b47 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx
index f6c0d0796d..da0ae18585 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx
index 48c413cc19..46dcaf1bbe 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx
index 2b874c673d..2d6a14b080 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx
index 8c2322120c..9bc280da9b 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/fixtures/webstudio-remix-vercel/package.json b/fixtures/webstudio-remix-vercel/package.json
index c730f91498..d2685be1fb 100644
--- a/fixtures/webstudio-remix-vercel/package.json
+++ b/fixtures/webstudio-remix-vercel/package.json
@@ -6,7 +6,7 @@
"typecheck": "tsc",
"cli": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio",
"fixtures:link": "pnpm cli link --link https://p-cddc1d44-af37-4cb6-a430-d300cf6f932d-dot-${BUILDER_HOST:-main.development.webstudio.is}'?authToken=1cdc6026-dd5b-4624-b89b-9bd45e9bcc3d'",
- "fixtures:sync": "pnpm cli sync --buildId 1bd755a0-9c8a-416b-b373-2123f3568393 && pnpm prettier --write ./.webstudio/",
+ "fixtures:sync": "pnpm cli sync --buildId 3173a7d8-1af3-4e23-87fd-94c3b0cb1018 && pnpm prettier --write ./.webstudio/",
"fixtures:build": "pnpm cli build --template vercel --template internal --template ./.template && pnpm prettier --write ./app/ ./package.json ./tsconfig.json"
},
"private": true,
diff --git a/fixtures/webstudio-remix-vercel/proxy-emulator/dedupe-meta.ts b/fixtures/webstudio-remix-vercel/proxy-emulator/dedupe-meta.ts
index 20257b027f..0b1a1c4b2e 100644
--- a/fixtures/webstudio-remix-vercel/proxy-emulator/dedupe-meta.ts
+++ b/fixtures/webstudio-remix-vercel/proxy-emulator/dedupe-meta.ts
@@ -13,85 +13,92 @@ export const dedupeMeta: Plugin = {
return;
}
- console.log("req.url", req.url);
+ // Capture the original response
+ const originalWrite = res.write;
+ const originalEnd = res.end;
- if (req.url?.endsWith("/head-tag")) {
- // Capture the original response
- const originalWrite = res.write;
- const originalEnd = res.end;
+ let body = "";
- let body = "";
+ res.write = (chunk) => {
+ body += chunk.toString();
+ return true;
+ };
- res.write = (chunk) => {
+ res.end = (chunk) => {
+ if (chunk) {
body += chunk.toString();
- return true;
- };
-
- res.end = (chunk) => {
- if (chunk) {
- body += chunk.toString();
- }
-
- const response = new Response(body);
-
- const metasSet = new Set<string>();
- let hasTitle = false;
-
- const rewriter = new HTMLRewriter()
- .on("meta", {
- element(element) {
- const propertyOrName =
- element.getAttribute("property") ||
- element.getAttribute("name");
-
- if (propertyOrName === null) {
- return;
- }
-
- if (propertyOrName === "viewport") {
- // Allow "viewport" property deduplication
- return;
- }
-
- if (metasSet.has(propertyOrName)) {
- console.info(
- `Duplicate meta with name|property = ${propertyOrName} removed`
- );
- element.remove();
- return;
- }
-
- metasSet.add(propertyOrName);
- },
- })
- .on("title", {
- element(element) {
- if (hasTitle) {
- element.remove();
- return;
- }
-
- hasTitle = true;
- },
- });
- rewriter
- // @ts-ignore
- .transform(response)
- .text()
- .then((cleanedHtml) => {
- // Send the modified response
- res.setHeader("Content-Length", Buffer.byteLength(cleanedHtml));
- originalWrite.call(res, cleanedHtml, "utf-8");
- originalEnd.call(res, "", "utf-8");
- });
-
- return res;
- };
-
- next();
- } else {
- next();
- }
+ }
+
+ const response = new Response(body);
+
+ const metasSet = new Set<string>();
+ let hasTitle = false;
+ let hasCanonicalLink = false;
+
+ const rewriter = new HTMLRewriter()
+ .on("meta", {
+ element(element) {
+ const propertyOrName =
+ element.getAttribute("property") ||
+ element.getAttribute("name");
+
+ if (propertyOrName === null) {
+ return;
+ }
+
+ if (propertyOrName === "viewport") {
+ // Allow "viewport" property deduplication
+ return;
+ }
+
+ if (metasSet.has(propertyOrName)) {
+ console.info(
+ `Duplicate meta with name|property = ${propertyOrName} removed`
+ );
+ element.remove();
+ return;
+ }
+
+ metasSet.add(propertyOrName);
+ },
+ })
+ .on("title", {
+ element(element) {
+ if (hasTitle) {
+ console.info(`Duplicate title removed`);
+ element.remove();
+ return;
+ }
+
+ hasTitle = true;
+ },
+ })
+ .on('link[rel="canonical"]', {
+ element(element) {
+ if (hasCanonicalLink) {
+ console.info(`Duplicate link rel canonical removed`);
+ element.remove();
+ return;
+ }
+
+ hasCanonicalLink = true;
+ },
+ });
+ rewriter
+ // @ts-ignore
+ .transform(response)
+ .text()
+ .then((cleanedHtml) => {
+ // Send the modified response
+ res.setHeader("Content-Length", Buffer.byteLength(cleanedHtml));
+ originalWrite.call(res, cleanedHtml, "utf-8");
+ originalEnd.call(res, "", "utf-8");
+ });
+
+ return res;
+ };
+
+ next();
});
},
};
diff --git a/packages/cli/templates/defaults/app/route-templates/html.tsx b/packages/cli/templates/defaults/app/route-templates/html.tsx
index 1609162d8e..e79b74a6d9 100644
--- a/packages/cli/templates/defaults/app/route-templates/html.tsx
+++ b/packages/cli/templates/defaults/app/route-templates/html.tsx
@@ -20,6 +20,7 @@ import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
+ PageSettingsCanonicalLink,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
@@ -288,6 +289,7 @@ const Outlet = () => {
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
+ <PageSettingsCanonicalLink href={url} />
</ReactSdkContext.Provider>
);
};
diff --git a/packages/react-sdk/src/page-settings-canonical-link.tsx b/packages/react-sdk/src/page-settings-canonical-link.tsx
new file mode 100644
index 0000000000..9db82b94fa
--- /dev/null
+++ b/packages/react-sdk/src/page-settings-canonical-link.tsx
@@ -0,0 +1,57 @@
+import { useEffect, useState } from "react";
+import { isElementRenderedWithReact } from "./page-settings-meta";
+
+type PageSettingsCanonicalLinkProps = {
+ href: string;
+};
+
+const isServer = typeof window === "undefined";
+
+/**
+ * Link canonical tag are deduplicated on the server using the HTMLRewriter interface.
+ * This is not full deduplication. We simply skip rendering Page Setting link
+ * if it has already been rendered using HeadSlot/HeadLink.
+ * To prevent React on the client from re-adding the removed link tag, we skip rendering them client-side.
+ * This approach works because React retains server-rendered link tag as long as they are not re-rendered by the client.
+ *
+ * The following component behavior ensures this:
+ * 1. On the server: Render link tag as usual.
+ * 2. On the client: Before rendering, remove any link tag with the same `name` or `property` that were not rendered by Client React,
+ * and then proceed with rendering as usual.
+ */
+export const PageSettingsCanonicalLink = (
+ props: PageSettingsCanonicalLinkProps
+) => {
+ const [localProps, setLocalProps] = useState<
+ PageSettingsCanonicalLinkProps | undefined
+ >();
+
+ useEffect(() => {
+ const selector = `head > link[rel="canonical"]`;
+ let allLinks = document.querySelectorAll(selector);
+
+ for (const meta of allLinks) {
+ if (!isElementRenderedWithReact(meta)) {
+ meta.remove();
+ }
+ }
+
+ allLinks = document.querySelectorAll(selector);
+
+ if (allLinks.length === 0) {
+ setLocalProps(props);
+ }
+ }, [props]);
+
+ if (isServer) {
+ return <link rel="canonical" {...props} />;
+ }
+
+ if (localProps === undefined) {
+ // This method also works during hydration because React retains server-rendered tags
+ // as long as they are not re-rendered by the client.
+ return;
+ }
+
+ return <link rel="canonical" {...localProps} />;
+};
diff --git a/packages/react-sdk/src/runtime.ts b/packages/react-sdk/src/runtime.ts
index c5b06fe65a..bc0785e2b6 100644
--- a/packages/react-sdk/src/runtime.ts
+++ b/packages/react-sdk/src/runtime.ts
@@ -3,6 +3,7 @@ export * from "./hook";
export * from "./variable-state";
export { PageSettingsMeta } from "./page-settings-meta";
export { PageSettingsTitle } from "./page-settings-title";
+export { PageSettingsCanonicalLink } from "./page-settings-canonical-link";
/**
* React has issues rendering certain elements, such as errors when a <link> element has children.