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

feat: Add title support to HeadSlot #4758

Merged
merged 4 commits into from
Jan 19, 2025
Merged

feat: Add title support to HeadSlot #4758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5cc71dd
feat: Add title support to HeadSlot
istarkov Jan 18, 2025
874c37a
Add title dedupe
istarkov Jan 18, 2025
86538be
test arm
istarkov Jan 19, 2025
578710b
Empty
istarkov Jan 19, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
DATABASE_URL: postgres://
AUTH_SECRET: test

runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm

steps:
- uses: actions/checkout@v4
Expand Down
7 changes: 2 additions & 5 deletions fixtures/webstudio-cloudflare-template/app/routes/[another-page]._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
Expand Down Expand Up @@ -121,13 +122,8 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => {
return metas;
}

const { pageMeta } = data;
const origin = `https://${data.host}`;

if (pageMeta.title) {
metas.push({ title: pageMeta.title });
}

if (siteName) {
metas.push({
"script:ld+json": {
Expand Down Expand Up @@ -291,6 +287,7 @@ const Outlet = () => {
siteName={siteName}
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
</ReactSdkContext.Provider>
);
};
Expand Down
7 changes: 2 additions & 5 deletions fixtures/webstudio-cloudflare-template/app/routes/_index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
Expand Down Expand Up @@ -121,13 +122,8 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => {
return metas;
}

const { pageMeta } = data;
const origin = `https://${data.host}`;

if (pageMeta.title) {
metas.push({ title: pageMeta.title });
}

if (siteName) {
metas.push({
"script:ld+json": {
Expand Down Expand Up @@ -291,6 +287,7 @@ const Outlet = () => {
siteName={siteName}
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
</ReactSdkContext.Provider>
);
};
Expand Down
7 changes: 2 additions & 5 deletions fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
Expand Down Expand Up @@ -121,13 +122,8 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => {
return metas;
}

const { pageMeta } = data;
const origin = `https://${data.host}`;

if (pageMeta.title) {
metas.push({ title: pageMeta.title });
}

if (siteName) {
metas.push({
"script:ld+json": {
Expand Down Expand Up @@ -291,6 +287,7 @@ const Outlet = () => {
siteName={siteName}
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
</ReactSdkContext.Provider>
);
};
Expand Down
7 changes: 2 additions & 5 deletions fixtures/webstudio-custom-template/app/routes/[world]._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
Expand Down Expand Up @@ -121,13 +122,8 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => {
return metas;
}

const { pageMeta } = data;
const origin = `https://${data.host}`;

if (pageMeta.title) {
metas.push({ title: pageMeta.title });
}

if (siteName) {
metas.push({
"script:ld+json": {
Expand Down Expand Up @@ -291,6 +287,7 @@ const Outlet = () => {
siteName={siteName}
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
</ReactSdkContext.Provider>
);
};
Expand Down
7 changes: 2 additions & 5 deletions fixtures/webstudio-custom-template/app/routes/_index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
Expand Down Expand Up @@ -121,13 +122,8 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => {
return metas;
}

const { pageMeta } = data;
const origin = `https://${data.host}`;

if (pageMeta.title) {
metas.push({ title: pageMeta.title });
}

if (siteName) {
metas.push({
"script:ld+json": {
Expand Down Expand Up @@ -291,6 +287,7 @@ const Outlet = () => {
siteName={siteName}
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
</ReactSdkContext.Provider>
);
};
Expand Down
7 changes: 2 additions & 5 deletions fixtures/webstudio-remix-netlify-edge-functions/app/routes/[another-page]._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
Expand Down Expand Up @@ -121,13 +122,8 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => {
return metas;
}

const { pageMeta } = data;
const origin = `https://${data.host}`;

if (pageMeta.title) {
metas.push({ title: pageMeta.title });
}

if (siteName) {
metas.push({
"script:ld+json": {
Expand Down Expand Up @@ -291,6 +287,7 @@ const Outlet = () => {
siteName={siteName}
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
</ReactSdkContext.Provider>
);
};
Expand Down
7 changes: 2 additions & 5 deletions fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
Expand Down Expand Up @@ -121,13 +122,8 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => {
return metas;
}

const { pageMeta } = data;
const origin = `https://${data.host}`;

if (pageMeta.title) {
metas.push({ title: pageMeta.title });
}

if (siteName) {
metas.push({
"script:ld+json": {
Expand Down Expand Up @@ -291,6 +287,7 @@ const Outlet = () => {
siteName={siteName}
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
</ReactSdkContext.Provider>
);
};
Expand Down
7 changes: 2 additions & 5 deletions fixtures/webstudio-remix-netlify-functions/app/routes/[another-page]._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
Expand Down Expand Up @@ -121,13 +122,8 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => {
return metas;
}

const { pageMeta } = data;
const origin = `https://${data.host}`;

if (pageMeta.title) {
metas.push({ title: pageMeta.title });
}

if (siteName) {
metas.push({
"script:ld+json": {
Expand Down Expand Up @@ -291,6 +287,7 @@ const Outlet = () => {
siteName={siteName}
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
</ReactSdkContext.Provider>
);
};
Expand Down
7 changes: 2 additions & 5 deletions fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
import {
ReactSdkContext,
PageSettingsMeta,
PageSettingsTitle,
} from "@webstudio-is/react-sdk/runtime";
import {
Page,
Expand Down Expand Up @@ -121,13 +122,8 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => {
return metas;
}

const { pageMeta } = data;
const origin = `https://${data.host}`;

if (pageMeta.title) {
metas.push({ title: pageMeta.title });
}

if (siteName) {
metas.push({
"script:ld+json": {
Expand Down Expand Up @@ -291,6 +287,7 @@ const Outlet = () => {
siteName={siteName}
imageLoader={imageLoader}
/>
<PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
</ReactSdkContext.Provider>
);
};
Expand Down
37 changes: 33 additions & 4 deletions fixtures/webstudio-remix-vercel/.webstudio/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"build": {
"id": "39af85c6-952a-42a5-953b-67718e2b95d7",
"id": "0d43a990-f5cd-43c3-ab26-863ebe71eb27",
"projectId": "cddc1d44-af37-4cb6-a430-d300cf6f932d",
"version": 455,
"createdAt": "2025-01-18T13:58:20.219+00:00",
"updatedAt": "2025-01-18T13:58:20.219+00:00",
"version": 463,
"createdAt": "2025-01-18T19:56:10.675+00:00",
"updatedAt": "2025-01-18T19:56:10.675+00:00",
"pages": {
"meta": {
"siteName": "KittyGuardedZone",
Expand Down Expand Up @@ -2979,6 +2979,16 @@
"type": "string",
"value": "og:title"
}
],
[
"Eo5zG6ibHI2ueliryZsqN",
{
"id": "Eo5zG6ibHI2ueliryZsqN",
"instanceId": "f0kF-WmL7DQg7MSyRvqY1",
"name": "data-ws-show",
"type": "boolean",
"value": true
}
]
],
"dataSources": [
Expand Down Expand Up @@ -5011,6 +5021,10 @@
"id": "Jdxu-0HI2f6Lq-LJwIOyY",
"component": "HeadSlot",
"children": [
{
"type": "id",
"value": "4DTeDG3l8nX_C_oNtaHZQ"
},
{
"type": "id",
"value": "GFN6suio87WybEb7dc8IM"
Expand Down Expand Up @@ -5083,6 +5097,21 @@
"label": "Meta",
"children": []
}
],
[
"4DTeDG3l8nX_C_oNtaHZQ",
{
"type": "instance",
"id": "4DTeDG3l8nX_C_oNtaHZQ",
"component": "HeadTitle",
"label": "Title",
"children": [
{
"type": "text",
"value": "Head Slot Title"
}
]
}
]
],
"deployment": {
Expand Down
8 changes: 5 additions & 3 deletions fixtures/webstudio-remix-vercel/app/__generated__/[head-tag]._index.tsx
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading