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.

refactor: drop legacy netlify templates from CLI (#4833)

Bogdan Chadkin196a3d39032d
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b7cca1dc6c..5168daa9b3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -134,7 +134,7 @@ jobs:
}
const results = [
await assertSize('./fixtures/ssg/dist/client', 352),
- await assertSize('./fixtures/webstudio-remix-netlify-functions/build/client', 440),
+ await assertSize('./fixtures/react-router-netlify/build/client', 360),
await assertSize('./fixtures/webstudio-features/build/client', 926),
]
for (const result of results) {
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/.npmrc b/fixtures/webstudio-remix-netlify-edge-functions/.npmrc
deleted file mode 100644
index 43ce02f127..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/.npmrc
+++ /dev/null
@@ -1,3 +0,0 @@
-force=true
-# to support using NODE_OPTIONS for windows tests
-shell-emulator=true
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/config.json b/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/config.json
deleted file mode 100644
index 3bad791718..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "projectId": "d845c167-ea07-4875-b08d-83e97c09dcce"
-}
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/data.json b/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/data.json
deleted file mode 100644
index 8f97956ab8..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/data.json
+++ /dev/null
@@ -1,498 +0,0 @@
-{
- "build": {
- "id": "a2e8de30-03d5-4514-a3a6-406b3266a3af",
- "projectId": "d845c167-ea07-4875-b08d-83e97c09dcce",
- "version": 38,
- "createdAt": "2024-07-29T12:50:07.515+00:00",
- "updatedAt": "2024-07-29T12:50:07.515+00:00",
- "pages": {
- "meta": {
- "siteName": "",
- "faviconAssetId": "",
- "code": ""
- },
- "homePage": {
- "id": "9di_L14CzctvSruIoKVvE",
- "name": "Home",
- "title": "\"Home\"",
- "rootInstanceId": "MMimeobf_zi4ZkRGXapju",
- "systemDataSourceId": "2KT4-bRzToj9cAGAN_woK",
- "meta": {},
- "path": ""
- },
- "pages": [
- {
- "id": "WPPAbLFyJD_02vhjRd8P4",
- "name": "Another page",
- "title": "\"Another page\"",
- "history": ["/another-page"],
- "rootInstanceId": "n_VBMr7klpx25buS0NV7R",
- "systemDataSourceId": "tdXe9gFf83hSo9BLWU6xl",
- "meta": {
- "description": "\"\"",
- "excludePageFromSearch": "true",
- "language": "\"\"",
- "socialImageUrl": "\"\"",
- "status": "200",
- "redirect": "\"\"",
- "documentType": "html",
- "custom": [
- {
- "property": "",
- "content": "\"\""
- }
- ]
- },
- "marketplace": {
- "include": false
- },
- "path": "/another-page"
- }
- ],
- "folders": [
- {
- "id": "root",
- "name": "Root",
- "slug": "",
- "children": ["9di_L14CzctvSruIoKVvE", "WPPAbLFyJD_02vhjRd8P4"]
- }
- ]
- },
- "breakpoints": [
- [
- "rKj-wYctg3-GnqL3WHN9I",
- {
- "id": "rKj-wYctg3-GnqL3WHN9I",
- "label": "Base"
- }
- ],
- [
- "yH9RXhqCyeaVkrOt8MzLc",
- {
- "id": "yH9RXhqCyeaVkrOt8MzLc",
- "label": "Tablet",
- "maxWidth": 991
- }
- ],
- [
- "8nSCZbeS002IVwkTdoIes",
- {
- "id": "8nSCZbeS002IVwkTdoIes",
- "label": "Mobile landscape",
- "maxWidth": 767
- }
- ],
- [
- "7gBD25KrrbBdJYNDlhPz7",
- {
- "id": "7gBD25KrrbBdJYNDlhPz7",
- "label": "Mobile portrait",
- "maxWidth": 479
- }
- ]
- ],
- "styles": [
- [
- "7_QL45cpvP-zG8Hkgf4cr:rKj-wYctg3-GnqL3WHN9I:display:",
- {
- "breakpointId": "rKj-wYctg3-GnqL3WHN9I",
- "styleSourceId": "7_QL45cpvP-zG8Hkgf4cr",
- "property": "display",
- "value": {
- "type": "keyword",
- "value": "flex"
- }
- }
- ],
- [
- "7_QL45cpvP-zG8Hkgf4cr:rKj-wYctg3-GnqL3WHN9I:alignItems:",
- {
- "breakpointId": "rKj-wYctg3-GnqL3WHN9I",
- "styleSourceId": "7_QL45cpvP-zG8Hkgf4cr",
- "property": "alignItems",
- "value": {
- "type": "keyword",
- "value": "center"
- }
- }
- ],
- [
- "7_QL45cpvP-zG8Hkgf4cr:rKj-wYctg3-GnqL3WHN9I:justifyContent:",
- {
- "breakpointId": "rKj-wYctg3-GnqL3WHN9I",
- "styleSourceId": "7_QL45cpvP-zG8Hkgf4cr",
- "property": "justifyContent",
- "value": {
- "type": "keyword",
- "value": "center"
- }
- }
- ],
- [
- "7_QL45cpvP-zG8Hkgf4cr:rKj-wYctg3-GnqL3WHN9I:flexDirection:",
- {
- "breakpointId": "rKj-wYctg3-GnqL3WHN9I",
- "styleSourceId": "7_QL45cpvP-zG8Hkgf4cr",
- "property": "flexDirection",
- "value": {
- "type": "keyword",
- "value": "column"
- }
- }
- ],
- [
- "0KA68BwP9gdTzE1ESO2Zp:rKj-wYctg3-GnqL3WHN9I:marginBottom:",
- {
- "breakpointId": "rKj-wYctg3-GnqL3WHN9I",
- "styleSourceId": "0KA68BwP9gdTzE1ESO2Zp",
- "property": "marginBottom",
- "value": {
- "type": "unit",
- "unit": "em",
- "value": 1
- }
- }
- ],
- [
- "mf2C07UBmGT7y_G4Du3yg:rKj-wYctg3-GnqL3WHN9I:width:",
- {
- "breakpointId": "rKj-wYctg3-GnqL3WHN9I",
- "styleSourceId": "mf2C07UBmGT7y_G4Du3yg",
- "property": "width",
- "value": {
- "type": "unit",
- "unit": "px",
- "value": 400
- }
- }
- ]
- ],
- "styleSources": [
- [
- "7_QL45cpvP-zG8Hkgf4cr",
- {
- "type": "local",
- "id": "7_QL45cpvP-zG8Hkgf4cr"
- }
- ],
- [
- "0KA68BwP9gdTzE1ESO2Zp",
- {
- "type": "local",
- "id": "0KA68BwP9gdTzE1ESO2Zp"
- }
- ],
- [
- "mf2C07UBmGT7y_G4Du3yg",
- {
- "type": "local",
- "id": "mf2C07UBmGT7y_G4Du3yg"
- }
- ]
- ],
- "styleSourceSelections": [
- [
- "MMimeobf_zi4ZkRGXapju",
- {
- "instanceId": "MMimeobf_zi4ZkRGXapju",
- "values": ["7_QL45cpvP-zG8Hkgf4cr"]
- }
- ],
- [
- "BMJfjOzunWs8XkQgvvx1e",
- {
- "instanceId": "BMJfjOzunWs8XkQgvvx1e",
- "values": ["0KA68BwP9gdTzE1ESO2Zp"]
- }
- ],
- [
- "uHB3Fjb7-NELG-bnH7bXB",
- {
- "instanceId": "uHB3Fjb7-NELG-bnH7bXB",
- "values": ["mf2C07UBmGT7y_G4Du3yg"]
- }
- ]
- ],
- "props": [
- [
- "1p34InvRgqoKVqeNZ1uBb",
- {
- "id": "1p34InvRgqoKVqeNZ1uBb",
- "instanceId": "pjkZo5EiBqaeUXBcyHf_O",
- "name": "href",
- "type": "page",
- "value": "WPPAbLFyJD_02vhjRd8P4"
- }
- ],
- [
- "su3ag3OxH9WTBjJg5eIyg",
- {
- "id": "su3ag3OxH9WTBjJg5eIyg",
- "instanceId": "uHB3Fjb7-NELG-bnH7bXB",
- "name": "src",
- "type": "asset",
- "value": "1d8bf4398f643f5333d415091507d778aaed62f28883642636cbed0be156a0ee"
- }
- ],
- [
- "vGCYpBBB1QUPIPPIdyexn",
- {
- "id": "vGCYpBBB1QUPIPPIdyexn",
- "instanceId": "uHB3Fjb7-NELG-bnH7bXB",
- "name": "width",
- "type": "asset",
- "value": "1d8bf4398f643f5333d415091507d778aaed62f28883642636cbed0be156a0ee"
- }
- ],
- [
- "JKAGY7DWpciEl0UdnWuKL",
- {
- "id": "JKAGY7DWpciEl0UdnWuKL",
- "instanceId": "uHB3Fjb7-NELG-bnH7bXB",
- "name": "height",
- "type": "asset",
- "value": "1d8bf4398f643f5333d415091507d778aaed62f28883642636cbed0be156a0ee"
- }
- ],
- [
- "CAkmmL8-JAgokmeopoFXh",
- {
- "id": "CAkmmL8-JAgokmeopoFXh",
- "instanceId": "2sIE8GxbKRBaav_zdhaZ1",
- "name": "src",
- "type": "string",
- "value": "https://picsum.photos/id/237/100/100.jpg?blur=4&grayscale"
- }
- ]
- ],
- "dataSources": [
- [
- "2KT4-bRzToj9cAGAN_woK",
- {
- "type": "parameter",
- "id": "2KT4-bRzToj9cAGAN_woK",
- "scopeInstanceId": "MMimeobf_zi4ZkRGXapju",
- "name": "system"
- }
- ],
- [
- "tdXe9gFf83hSo9BLWU6xl",
- {
- "type": "parameter",
- "id": "tdXe9gFf83hSo9BLWU6xl",
- "scopeInstanceId": "n_VBMr7klpx25buS0NV7R",
- "name": "system"
- }
- ]
- ],
- "resources": [],
- "instances": [
- [
- "MMimeobf_zi4ZkRGXapju",
- {
- "type": "instance",
- "id": "MMimeobf_zi4ZkRGXapju",
- "component": "Body",
- "children": [
- {
- "type": "id",
- "value": "MYDt0guk1-vzc7yzqyN6A"
- },
- {
- "type": "id",
- "value": "BMJfjOzunWs8XkQgvvx1e"
- },
- {
- "type": "id",
- "value": "pjkZo5EiBqaeUXBcyHf_O"
- },
- {
- "type": "id",
- "value": "uHB3Fjb7-NELG-bnH7bXB"
- },
- {
- "type": "id",
- "value": "2sIE8GxbKRBaav_zdhaZ1"
- }
- ]
- }
- ],
- [
- "MYDt0guk1-vzc7yzqyN6A",
- {
- "type": "instance",
- "id": "MYDt0guk1-vzc7yzqyN6A",
- "component": "Heading",
- "label": "xD",
- "children": [
- {
- "type": "text",
- "value": "Simple Project to test CLI"
- }
- ]
- }
- ],
- [
- "BMJfjOzunWs8XkQgvvx1e",
- {
- "type": "instance",
- "id": "BMJfjOzunWs8XkQgvvx1e",
- "component": "Text",
- "children": [
- {
- "type": "text",
- "value": "Please don't change directly in the fixture"
- }
- ]
- }
- ],
- [
- "pjkZo5EiBqaeUXBcyHf_O",
- {
- "type": "instance",
- "id": "pjkZo5EiBqaeUXBcyHf_O",
- "component": "Link",
- "children": [
- {
- "type": "text",
- "value": "Test another page link"
- }
- ]
- }
- ],
- [
- "n_VBMr7klpx25buS0NV7R",
- {
- "type": "instance",
- "id": "n_VBMr7klpx25buS0NV7R",
- "component": "Body",
- "children": [
- {
- "type": "id",
- "value": "wthNByqb3RPmheb-56VYI"
- }
- ]
- }
- ],
- [
- "wthNByqb3RPmheb-56VYI",
- {
- "type": "instance",
- "id": "wthNByqb3RPmheb-56VYI",
- "component": "Heading",
- "children": [
- {
- "type": "text",
- "value": "Another page"
- }
- ]
- }
- ],
- [
- "uHB3Fjb7-NELG-bnH7bXB",
- {
- "type": "instance",
- "id": "uHB3Fjb7-NELG-bnH7bXB",
- "component": "Image",
- "children": []
- }
- ],
- [
- "2sIE8GxbKRBaav_zdhaZ1",
- {
- "type": "instance",
- "id": "2sIE8GxbKRBaav_zdhaZ1",
- "component": "Image",
- "children": []
- }
- ]
- ],
- "deployment": {
- "domains": [],
- "projectDomain": "cli-basic-test-d0osr"
- }
- },
- "page": {
- "id": "9di_L14CzctvSruIoKVvE",
- "name": "Home",
- "title": "\"Home\"",
- "rootInstanceId": "MMimeobf_zi4ZkRGXapju",
- "systemDataSourceId": "2KT4-bRzToj9cAGAN_woK",
- "meta": {},
- "path": ""
- },
- "pages": [
- {
- "id": "9di_L14CzctvSruIoKVvE",
- "name": "Home",
- "title": "\"Home\"",
- "rootInstanceId": "MMimeobf_zi4ZkRGXapju",
- "systemDataSourceId": "2KT4-bRzToj9cAGAN_woK",
- "meta": {},
- "path": ""
- },
- {
- "id": "WPPAbLFyJD_02vhjRd8P4",
- "name": "Another page",
- "title": "\"Another page\"",
- "history": ["/another-page"],
- "rootInstanceId": "n_VBMr7klpx25buS0NV7R",
- "systemDataSourceId": "tdXe9gFf83hSo9BLWU6xl",
- "meta": {
- "description": "\"\"",
- "excludePageFromSearch": "true",
- "language": "\"\"",
- "socialImageUrl": "\"\"",
- "status": "200",
- "redirect": "\"\"",
- "documentType": "html",
- "custom": [
- {
- "property": "",
- "content": "\"\""
- }
- ]
- },
- "marketplace": {
- "include": false
- },
- "path": "/another-page"
- }
- ],
- "assets": [
- {
- "id": "1d8bf4398f643f5333d415091507d778aaed62f28883642636cbed0be156a0ee",
- "name": "iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg",
- "description": null,
- "projectId": "d845c167-ea07-4875-b08d-83e97c09dcce",
- "size": 999,
- "type": "image",
- "format": "svg",
- "createdAt": "2024-07-26T13:39:48.678+00:00",
- "meta": {
- "width": 14,
- "height": 16
- }
- },
- {
- "id": "d0974db9300c1a3b0fb8b291dd9fabd45ad136478908394280af2f7087e3aecd",
- "name": "147-1478573_cat-icon-png-black-cat-png-icon.png_ZJ6-qJjk1RlFzuYwyCXdp.jpeg",
- "description": null,
- "projectId": "d845c167-ea07-4875-b08d-83e97c09dcce",
- "size": 64701,
- "type": "image",
- "format": "jpg",
- "createdAt": "2024-12-06T14:36:07.046+00:00",
- "meta": {
- "width": 820,
- "height": 985
- }
- }
- ],
- "user": {
- "email": "[email protected]"
- },
- "projectDomain": "cli-basic-test-d0osr",
- "projectTitle": "cli-basic-test",
- "origin": "https://main.development.webstudio.is"
-}
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/README.md b/fixtures/webstudio-remix-netlify-edge-functions/README.md
deleted file mode 100644
index c6f8cfa5b9..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Fixture to test/play with webstudio
-
-## How to develop
-
-```bash
-# Terminal 1
-cd packages/webstudio
-pnpm dev
-```
-
-```bash
-# Terminal 2
-pnpm fixtures:link
-
-pnpm fixtures:sync
-# data.json generated
-
-pnpm fixtures:build
-# exec `pnpm run dev` to see result
-```
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/$resources.sitemap.xml.ts b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/$resources.sitemap.xml.ts
deleted file mode 100644
index 9b3f4dfa6d..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/$resources.sitemap.xml.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export const sitemap = [
- {
- path: "/",
- lastModified: "2024-07-29",
- },
-];
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/[another-page]._index.server.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/[another-page]._index.server.tsx
deleted file mode 100644
index dc6510942c..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/[another-page]._index.server.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* eslint-disable */
-/* This is a auto generated file for building the project */
-
-import type { PageMeta } from "@webstudio-is/sdk";
-import type { System, ResourceRequest } from "@webstudio-is/sdk";
-export const getResources = (_props: { system: System }) => {
- const _data = new Map<string, ResourceRequest>([]);
- const _action = new Map<string, ResourceRequest>([]);
- return { data: _data, action: _action };
-};
-
-export const getPageMeta = ({
- system,
- resources,
-}: {
- system: System;
- resources: Record<string, any>;
-}): PageMeta => {
- return {
- title: "Another page",
- description: "",
- excludePageFromSearch: true,
- language: "",
- socialImageAssetName: undefined,
- socialImageUrl: "",
- status: 200,
- redirect: "",
- custom: [],
- };
-};
-
-type Params = Record<string, string | undefined>;
-export const getRemixParams = ({ ...params }: Params): Params => {
- return params;
-};
-
-export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";
-
-export const contactEmail = "[email protected]";
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/[another-page]._index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/[another-page]._index.tsx
deleted file mode 100644
index 7946eb9573..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/[another-page]._index.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-/* eslint-disable */
-/* This is a auto generated file for building the project */
-
-import { Fragment, useState } from "react";
-import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";
-import { useResource, useVariableState } from "@webstudio-is/react-sdk/runtime";
-import { Body as Body } from "@webstudio-is/sdk-components-react-remix";
-import { Heading as Heading } from "@webstudio-is/sdk-components-react";
-
-export const siteName = "";
-
-export const favIconAsset: ImageAsset | undefined = undefined;
-
-// Font assets on current page (can be preloaded)
-export const pageFontAssets: FontAsset[] = [];
-
-export const pageBackgroundImageAssets: ImageAsset[] = [];
-
-const Page = ({}: { system: any }) => {
- return (
- <Body className={`w-body`}>
- <Heading className={`w-heading`}>{"Another page"}</Heading>
- </Body>
- );
-};
-
-export { Page };
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.server.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.server.tsx
deleted file mode 100644
index 83d760a977..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.server.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* eslint-disable */
-/* This is a auto generated file for building the project */
-
-import type { PageMeta } from "@webstudio-is/sdk";
-import type { System, ResourceRequest } from "@webstudio-is/sdk";
-export const getResources = (_props: { system: System }) => {
- const _data = new Map<string, ResourceRequest>([]);
- const _action = new Map<string, ResourceRequest>([]);
- return { data: _data, action: _action };
-};
-
-export const getPageMeta = ({
- system,
- resources,
-}: {
- system: System;
- resources: Record<string, any>;
-}): PageMeta => {
- return {
- title: "Home",
- description: undefined,
- excludePageFromSearch: undefined,
- language: undefined,
- socialImageAssetName: undefined,
- socialImageUrl: undefined,
- status: undefined,
- redirect: undefined,
- custom: [],
- };
-};
-
-type Params = Record<string, string | undefined>;
-export const getRemixParams = ({ ...params }: Params): Params => {
- return params;
-};
-
-export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";
-
-export const contactEmail = "[email protected]";
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx
deleted file mode 100644
index 5866f7323d..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-/* eslint-disable */
-/* This is a auto generated file for building the project */
-
-import { Fragment, useState } from "react";
-import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";
-import { useResource, useVariableState } from "@webstudio-is/react-sdk/runtime";
-import {
- Body as Body,
- Link as Link,
-} from "@webstudio-is/sdk-components-react-remix";
-import {
- Heading as Heading,
- Text as Text,
- Image as Image,
-} from "@webstudio-is/sdk-components-react";
-
-export const siteName = "";
-
-export const favIconAsset: ImageAsset | undefined = undefined;
-
-// Font assets on current page (can be preloaded)
-export const pageFontAssets: FontAsset[] = [];
-
-export const pageBackgroundImageAssets: ImageAsset[] = [];
-
-export const CustomCode = () => {
- return <></>;
-};
-
-const Page = ({}: { system: any }) => {
- return (
- <Body className={`w-body c1jaw2zx cbipm55 ctniqj4 ctgx88l`}>
- <Heading className={`w-heading`}>{"Simple Project to test CLI"}</Heading>
- <Text className={`w-text cn3rfux`}>
- {"Please don't change directly in the fixture"}
- </Text>
- <Link href={"/another-page"} className={`w-link`}>
- {"Test another page link"}
- </Link>
- <Image
- src={"/assets/iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg"}
- width={14}
- height={16}
- className={`w-image c161qeci`}
- />
- <Image
- src={"https://picsum.photos/id/237/100/100.jpg?blur=4&grayscale"}
- className={`w-image`}
- />
- </Body>
- );
-};
-
-export { Page };
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/index.css b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/index.css
deleted file mode 100644
index dd85fdf13b..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/index.css
+++ /dev/null
@@ -1,118 +0,0 @@
-@media all {
- :root {
- display: grid;
- min-height: 100%;
- font-family: Arial, Roboto, sans-serif;
- font-size: 16px;
- line-height: 1.2;
- white-space: pre-wrap;
- white-space-collapse: preserve;
- }
- :where(body.w-body) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- margin: 0;
- }
- :where(h1.w-heading) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- }
- :where(h2.w-heading) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- }
- :where(h3.w-heading) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- }
- :where(h4.w-heading) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- }
- :where(h5.w-heading) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- }
- :where(h6.w-heading) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- }
- :where(div.w-text) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- min-height: 1em;
- }
- :where(a.w-link) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- display: inline-block;
- }
- :where(img.w-image) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- max-width: 100%;
- display: block;
- height: auto;
- }
-}
-@media all {
- .c1jaw2zx {
- display: flex;
- }
- .cbipm55 {
- align-items: center;
- }
- .ctniqj4 {
- justify-content: center;
- }
- .ctgx88l {
- flex-direction: column;
- }
- .cn3rfux {
- margin-bottom: 1em;
- }
- .c161qeci {
- width: 400px;
- }
-}
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/constants.mjs b/fixtures/webstudio-remix-netlify-edge-functions/app/constants.mjs
deleted file mode 100644
index bef2400ae8..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/constants.mjs
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * We use mjs extension as constants in this file is shared with the build script
- * and we use `node --eval` to extract the constants.
- */
-export const assetBaseUrl = "/assets/";
-
-/**
- * @type {import("@webstudio-is/image").ImageLoader}
- */
-export const imageLoader = (props) => {
- if (process.env.NODE_ENV !== "production") {
- return props.src;
- }
-
- if (props.format === "raw") {
- return props.src;
- }
-
- // https://docs.netlify.com/image-cdn/overview/
- const searchParams = new URLSearchParams();
- searchParams.set("url", props.src);
- searchParams.set("w", props.width.toString());
- if (props.height) {
- searchParams.set("h", props.height.toString());
- }
- searchParams.set("q", props.quality.toString());
- // fit=contain by default
- return `/.netlify/images?${searchParams}`;
-};
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/entry.server.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/entry.server.tsx
deleted file mode 100644
index fb8ea87098..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/entry.server.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { EntryContext } from "@remix-run/node";
-import { RemixServer } from "@remix-run/react";
-import { renderToString } from "react-dom/server";
-
-export default function handleRequest(
- request: Request,
- responseStatusCode: number,
- responseHeaders: Headers,
- remixContext: EntryContext
-) {
- const markup = renderToString(
- <RemixServer context={remixContext} url={request.url} />
- );
-
- responseHeaders.set("Content-Type", "text/html");
-
- return new Response("<!DOCTYPE html>" + markup, {
- headers: responseHeaders,
- status: responseStatusCode,
- });
-}
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/extension.ts b/fixtures/webstudio-remix-netlify-edge-functions/app/extension.ts
deleted file mode 100644
index 3345c28d98..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/extension.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { AppLoadContext } from "@remix-run/server-runtime";
-import { ResourceRequest } from "@webstudio-is/sdk";
-
-declare module "@remix-run/server-runtime" {
- interface AppLoadContext {
- EXCLUDE_FROM_SEARCH: boolean;
- getDefaultActionResource?: (options: {
- url: URL;
- projectId: string;
- contactEmail: string;
- formData: FormData;
- }) => ResourceRequest;
- }
-}
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/root.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/root.tsx
deleted file mode 100644
index 40cefeeec7..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/root.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment */
-
-import { Links, Meta, Outlet, useMatches } from "@remix-run/react";
-// @todo think about how to make __generated__ typeable
-// @ts-ignore
-import { CustomCode } from "./__generated__/_index";
-
-const Root = () => {
- // Get language from matches
- const matches = useMatches();
-
- const lastMatchWithLanguage = matches.findLast((match) => {
- // @ts-ignore
- const language = match?.data?.pageMeta?.language;
- return language != null;
- });
-
- // @ts-ignore
- const lang = lastMatchWithLanguage?.data?.pageMeta?.language ?? "en";
-
- return (
- <html lang={lang}>
- <head>
- <meta charSet="utf-8" />
- <meta name="viewport" content="width=device-width,initial-scale=1" />
- <Meta />
- <Links />
- <CustomCode />
- </head>
- <Outlet />
- </html>
- );
-};
-
-export default Root;
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
deleted file mode 100644
index 63ab5675f9..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/[another-page]._index.tsx
+++ /dev/null
@@ -1,297 +0,0 @@
-import {
- type ServerRuntimeMetaFunction as MetaFunction,
- type LinksFunction,
- type LinkDescriptor,
- type ActionFunctionArgs,
- type LoaderFunctionArgs,
- type HeadersFunction,
- json,
- redirect,
-} from "@remix-run/server-runtime";
-import { useLoaderData } from "@remix-run/react";
-import {
- isLocalResource,
- loadResource,
- loadResources,
- formIdFieldName,
- formBotFieldName,
-} from "@webstudio-is/sdk/runtime";
-import {
- ReactSdkContext,
- PageSettingsMeta,
- PageSettingsTitle,
- PageSettingsCanonicalLink,
-} from "@webstudio-is/react-sdk/runtime";
-import {
- Page,
- siteName,
- favIconAsset,
- pageFontAssets,
- pageBackgroundImageAssets,
-} from "../__generated__/[another-page]._index";
-import {
- getResources,
- getPageMeta,
- getRemixParams,
- projectId,
- contactEmail,
-} from "../__generated__/[another-page]._index.server";
-import { assetBaseUrl, imageLoader } from "../constants.mjs";
-import css from "../__generated__/index.css?url";
-import { sitemap } from "../__generated__/$resources.sitemap.xml";
-
-const customFetch: typeof fetch = (input, init) => {
- if (typeof input !== "string") {
- return fetch(input, init);
- }
-
- if (isLocalResource(input, "sitemap.xml")) {
- // @todo: dynamic import sitemap ???
- const response = new Response(JSON.stringify(sitemap));
- response.headers.set("content-type", "application/json; charset=utf-8");
- return Promise.resolve(response);
- }
-
- return fetch(input, init);
-};
-
-export const loader = async (arg: LoaderFunctionArgs) => {
- const url = new URL(arg.request.url);
- const host =
- arg.request.headers.get("x-forwarded-host") ||
- arg.request.headers.get("host") ||
- "";
- url.host = host;
- url.protocol = "https";
-
- const params = getRemixParams(arg.params);
- const system = {
- params,
- search: Object.fromEntries(url.searchParams),
- origin: url.origin,
- };
-
- const resources = await loadResources(
- customFetch,
- getResources({ system }).data
- );
- const pageMeta = getPageMeta({ system, resources });
-
- if (pageMeta.redirect) {
- const status =
- pageMeta.status === 301 || pageMeta.status === 302
- ? pageMeta.status
- : 302;
- return redirect(pageMeta.redirect, status);
- }
-
- // typecheck
- arg.context.EXCLUDE_FROM_SEARCH satisfies boolean;
-
- if (arg.context.EXCLUDE_FROM_SEARCH) {
- pageMeta.excludePageFromSearch = arg.context.EXCLUDE_FROM_SEARCH;
- }
-
- return json(
- {
- host,
- url: url.href,
- system,
- resources,
- pageMeta,
- },
- // No way for current information to change, so add cache for 10 minutes
- // In case of CRM Data, this should be set to 0
- {
- status: pageMeta.status,
- headers: {
- "Cache-Control": "public, max-age=600",
- },
- }
- );
-};
-
-export const headers: HeadersFunction = () => {
- return {
- "Cache-Control": "public, max-age=0, must-revalidate",
- };
-};
-
-export const meta: MetaFunction<typeof loader> = ({ data }) => {
- const metas: ReturnType<MetaFunction> = [];
- if (data === undefined) {
- return metas;
- }
-
- const origin = `https://${data.host}`;
-
- if (siteName) {
- metas.push({
- "script:ld+json": {
- "@context": "https://schema.org",
- "@type": "WebSite",
- name: siteName,
- url: origin,
- },
- });
- }
-
- return metas;
-};
-
-export const links: LinksFunction = () => {
- const result: LinkDescriptor[] = [];
-
- result.push({
- rel: "stylesheet",
- href: css,
- });
-
- if (favIconAsset) {
- result.push({
- rel: "icon",
- href: imageLoader({
- src: `${assetBaseUrl}${favIconAsset.name}`,
- // width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-search
- width: 144,
- height: 144,
- fit: "pad",
- quality: 100,
- format: "auto",
- }),
- type: undefined,
- });
- }
-
- for (const asset of pageFontAssets) {
- result.push({
- rel: "preload",
- href: `${assetBaseUrl}${asset.name}`,
- as: "font",
- crossOrigin: "anonymous",
- });
- }
-
- for (const backgroundImageAsset of pageBackgroundImageAssets) {
- result.push({
- rel: "preload",
- href: `${assetBaseUrl}${backgroundImageAsset.name}`,
- as: "image",
- });
- }
-
- return result;
-};
-
-const getRequestHost = (request: Request): string =>
- request.headers.get("x-forwarded-host") || request.headers.get("host") || "";
-
-export const action = async ({
- request,
- context,
-}: ActionFunctionArgs): Promise<
- { success: true } | { success: false; errors: string[] }
-> => {
- try {
- const url = new URL(request.url);
- url.host = getRequestHost(request);
-
- const formData = await request.formData();
-
- const system = {
- params: {},
- search: {},
- origin: url.origin,
- };
-
- const resourceName = formData.get(formIdFieldName);
- let resource =
- typeof resourceName === "string"
- ? getResources({ system }).action.get(resourceName)
- : undefined;
-
- const formBotValue = formData.get(formBotFieldName);
-
- if (formBotValue == null || typeof formBotValue !== "string") {
- throw new Error("Form bot field not found");
- }
-
- const submitTime = parseInt(formBotValue, 16);
- // Assumes that the difference between the server time and the form submission time,
- // including any client-server time drift, is within a 5-minute range.
- // Note: submitTime might be NaN because formBotValue can be any string used for logging purposes.
- // Example: `formBotValue: jsdom`, or `formBotValue: headless-env`
- if (
- Number.isNaN(submitTime) ||
- Math.abs(Date.now() - submitTime) > 1000 * 60 * 5
- ) {
- throw new Error(`Form bot value invalid ${formBotValue}`);
- }
-
- formData.delete(formIdFieldName);
- formData.delete(formBotFieldName);
-
- if (resource) {
- resource.headers.push({
- name: "Content-Type",
- value: "application/json",
- });
- resource.body = Object.fromEntries(formData);
- } else {
- if (contactEmail === undefined) {
- throw new Error("Contact email not found");
- }
-
- resource = context.getDefaultActionResource?.({
- url,
- projectId,
- contactEmail,
- formData,
- });
- }
-
- if (resource === undefined) {
- throw Error("Resource not found");
- }
- const { ok, statusText } = await loadResource(fetch, resource);
- if (ok) {
- return { success: true };
- }
- return { success: false, errors: [statusText] };
- } catch (error) {
- console.error(error);
-
- return {
- success: false,
- errors: [error instanceof Error ? error.message : "Unknown error"],
- };
- }
-};
-
-const Outlet = () => {
- const { system, resources, url, pageMeta, host } =
- useLoaderData<typeof loader>();
- return (
- <ReactSdkContext.Provider
- value={{
- imageLoader,
- assetBaseUrl,
- resources,
- }}
- >
- {/* 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}
- host={host}
- siteName={siteName}
- imageLoader={imageLoader}
- />
- <PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
- <PageSettingsCanonicalLink href={url} />
- </ReactSdkContext.Provider>
- );
-};
-
-export default Outlet;
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/[robots.txt].tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/[robots.txt].tsx
deleted file mode 100644
index aad4a9b368..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/[robots.txt].tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
-
-export const loader = (arg: LoaderFunctionArgs) => {
- const host =
- arg.request.headers.get("x-forwarded-host") ||
- arg.request.headers.get("host") ||
- "";
-
- return new Response(
- `
-User-agent: *
-Disallow: /api/
-
-Sitemap: https://${host}/sitemap.xml
-
- `,
- {
- headers: {
- "Content-Type": "text/plain",
- },
- status: 200,
- }
- );
-};
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/[sitemap.xml]._index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/[sitemap.xml]._index.tsx
deleted file mode 100644
index 2a57cb3721..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/[sitemap.xml]._index.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
-import { sitemap } from "../__generated__/$resources.sitemap.xml";
-
-export const loader = (arg: LoaderFunctionArgs) => {
- const host =
- arg.request.headers.get("x-forwarded-host") ||
- arg.request.headers.get("host") ||
- "";
-
- const urls = sitemap.map((page) => {
- const url = new URL(`https://${host}${page.path}`);
-
- return `
- <url>
- <loc>${url.href}</loc>
- <lastmod>${page.lastModified.split("T")[0]}</lastmod>
- </url>
- `;
- });
-
- return new Response(
- `<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-${urls.join("")}
-</urlset>
- `,
- {
- headers: {
- "Content-Type": "application/xml",
- },
- status: 200,
- }
- );
-};
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx
deleted file mode 100644
index 9bc280da9b..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx
+++ /dev/null
@@ -1,297 +0,0 @@
-import {
- type ServerRuntimeMetaFunction as MetaFunction,
- type LinksFunction,
- type LinkDescriptor,
- type ActionFunctionArgs,
- type LoaderFunctionArgs,
- type HeadersFunction,
- json,
- redirect,
-} from "@remix-run/server-runtime";
-import { useLoaderData } from "@remix-run/react";
-import {
- isLocalResource,
- loadResource,
- loadResources,
- formIdFieldName,
- formBotFieldName,
-} from "@webstudio-is/sdk/runtime";
-import {
- ReactSdkContext,
- PageSettingsMeta,
- PageSettingsTitle,
- PageSettingsCanonicalLink,
-} from "@webstudio-is/react-sdk/runtime";
-import {
- Page,
- siteName,
- favIconAsset,
- pageFontAssets,
- pageBackgroundImageAssets,
-} from "../__generated__/_index";
-import {
- getResources,
- getPageMeta,
- getRemixParams,
- projectId,
- contactEmail,
-} from "../__generated__/_index.server";
-import { assetBaseUrl, imageLoader } from "../constants.mjs";
-import css from "../__generated__/index.css?url";
-import { sitemap } from "../__generated__/$resources.sitemap.xml";
-
-const customFetch: typeof fetch = (input, init) => {
- if (typeof input !== "string") {
- return fetch(input, init);
- }
-
- if (isLocalResource(input, "sitemap.xml")) {
- // @todo: dynamic import sitemap ???
- const response = new Response(JSON.stringify(sitemap));
- response.headers.set("content-type", "application/json; charset=utf-8");
- return Promise.resolve(response);
- }
-
- return fetch(input, init);
-};
-
-export const loader = async (arg: LoaderFunctionArgs) => {
- const url = new URL(arg.request.url);
- const host =
- arg.request.headers.get("x-forwarded-host") ||
- arg.request.headers.get("host") ||
- "";
- url.host = host;
- url.protocol = "https";
-
- const params = getRemixParams(arg.params);
- const system = {
- params,
- search: Object.fromEntries(url.searchParams),
- origin: url.origin,
- };
-
- const resources = await loadResources(
- customFetch,
- getResources({ system }).data
- );
- const pageMeta = getPageMeta({ system, resources });
-
- if (pageMeta.redirect) {
- const status =
- pageMeta.status === 301 || pageMeta.status === 302
- ? pageMeta.status
- : 302;
- return redirect(pageMeta.redirect, status);
- }
-
- // typecheck
- arg.context.EXCLUDE_FROM_SEARCH satisfies boolean;
-
- if (arg.context.EXCLUDE_FROM_SEARCH) {
- pageMeta.excludePageFromSearch = arg.context.EXCLUDE_FROM_SEARCH;
- }
-
- return json(
- {
- host,
- url: url.href,
- system,
- resources,
- pageMeta,
- },
- // No way for current information to change, so add cache for 10 minutes
- // In case of CRM Data, this should be set to 0
- {
- status: pageMeta.status,
- headers: {
- "Cache-Control": "public, max-age=600",
- },
- }
- );
-};
-
-export const headers: HeadersFunction = () => {
- return {
- "Cache-Control": "public, max-age=0, must-revalidate",
- };
-};
-
-export const meta: MetaFunction<typeof loader> = ({ data }) => {
- const metas: ReturnType<MetaFunction> = [];
- if (data === undefined) {
- return metas;
- }
-
- const origin = `https://${data.host}`;
-
- if (siteName) {
- metas.push({
- "script:ld+json": {
- "@context": "https://schema.org",
- "@type": "WebSite",
- name: siteName,
- url: origin,
- },
- });
- }
-
- return metas;
-};
-
-export const links: LinksFunction = () => {
- const result: LinkDescriptor[] = [];
-
- result.push({
- rel: "stylesheet",
- href: css,
- });
-
- if (favIconAsset) {
- result.push({
- rel: "icon",
- href: imageLoader({
- src: `${assetBaseUrl}${favIconAsset.name}`,
- // width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-search
- width: 144,
- height: 144,
- fit: "pad",
- quality: 100,
- format: "auto",
- }),
- type: undefined,
- });
- }
-
- for (const asset of pageFontAssets) {
- result.push({
- rel: "preload",
- href: `${assetBaseUrl}${asset.name}`,
- as: "font",
- crossOrigin: "anonymous",
- });
- }
-
- for (const backgroundImageAsset of pageBackgroundImageAssets) {
- result.push({
- rel: "preload",
- href: `${assetBaseUrl}${backgroundImageAsset.name}`,
- as: "image",
- });
- }
-
- return result;
-};
-
-const getRequestHost = (request: Request): string =>
- request.headers.get("x-forwarded-host") || request.headers.get("host") || "";
-
-export const action = async ({
- request,
- context,
-}: ActionFunctionArgs): Promise<
- { success: true } | { success: false; errors: string[] }
-> => {
- try {
- const url = new URL(request.url);
- url.host = getRequestHost(request);
-
- const formData = await request.formData();
-
- const system = {
- params: {},
- search: {},
- origin: url.origin,
- };
-
- const resourceName = formData.get(formIdFieldName);
- let resource =
- typeof resourceName === "string"
- ? getResources({ system }).action.get(resourceName)
- : undefined;
-
- const formBotValue = formData.get(formBotFieldName);
-
- if (formBotValue == null || typeof formBotValue !== "string") {
- throw new Error("Form bot field not found");
- }
-
- const submitTime = parseInt(formBotValue, 16);
- // Assumes that the difference between the server time and the form submission time,
- // including any client-server time drift, is within a 5-minute range.
- // Note: submitTime might be NaN because formBotValue can be any string used for logging purposes.
- // Example: `formBotValue: jsdom`, or `formBotValue: headless-env`
- if (
- Number.isNaN(submitTime) ||
- Math.abs(Date.now() - submitTime) > 1000 * 60 * 5
- ) {
- throw new Error(`Form bot value invalid ${formBotValue}`);
- }
-
- formData.delete(formIdFieldName);
- formData.delete(formBotFieldName);
-
- if (resource) {
- resource.headers.push({
- name: "Content-Type",
- value: "application/json",
- });
- resource.body = Object.fromEntries(formData);
- } else {
- if (contactEmail === undefined) {
- throw new Error("Contact email not found");
- }
-
- resource = context.getDefaultActionResource?.({
- url,
- projectId,
- contactEmail,
- formData,
- });
- }
-
- if (resource === undefined) {
- throw Error("Resource not found");
- }
- const { ok, statusText } = await loadResource(fetch, resource);
- if (ok) {
- return { success: true };
- }
- return { success: false, errors: [statusText] };
- } catch (error) {
- console.error(error);
-
- return {
- success: false,
- errors: [error instanceof Error ? error.message : "Unknown error"],
- };
- }
-};
-
-const Outlet = () => {
- const { system, resources, url, pageMeta, host } =
- useLoaderData<typeof loader>();
- return (
- <ReactSdkContext.Provider
- value={{
- imageLoader,
- assetBaseUrl,
- resources,
- }}
- >
- {/* 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}
- host={host}
- siteName={siteName}
- imageLoader={imageLoader}
- />
- <PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
- <PageSettingsCanonicalLink href={url} />
- </ReactSdkContext.Provider>
- );
-};
-
-export default Outlet;
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/netlify.toml b/fixtures/webstudio-remix-netlify-edge-functions/netlify.toml
deleted file mode 100644
index 4f3f001c6d..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/netlify.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[build]
-command = "npm run build"
-publish = "build/client"
-
-[dev]
-command = "npm run dev"
-framework = "vite"
-
-# Set immutable caching for static files, because they have fingerprinted filenames
-
-[[headers]]
-for = "/build/*"
-
-[headers.values]
-
-"Cache-Control" = "public, max-age=31560000, immutable"
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/package.json b/fixtures/webstudio-remix-netlify-edge-functions/package.json
deleted file mode 100644
index 125807cc5f..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/package.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "scripts": {
- "predev": "node -e \"fs.rmSync('./public/_redirects', { recursive: true, force: true })\"",
- "start": "netlify serve",
- "build": "remix vite:build",
- "dev": "remix vite:dev",
- "typecheck": "tsc",
- "cli": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio",
- "fixtures:link": "pnpm cli link --link https://p-d845c167-ea07-4875-b08d-83e97c09dcce-dot-${BUILDER_HOST:-main.development.webstudio.is}'?authToken=e9d1343f-9298-4fd3-a66e-f89a5af2dd93'",
- "fixtures:sync": "pnpm cli sync --buildId a2e8de30-03d5-4514-a3a6-406b3266a3af && pnpm prettier --write ./.webstudio/",
- "fixtures:build": "pnpm cli build --template netlify-edge-functions --template internal && pnpm prettier --write ./app/ ./package.json ./tsconfig.json"
- },
- "dependencies": {
- "@netlify/edge-functions": "^2.11.1",
- "@netlify/remix-edge-adapter": "^3.4.2",
- "@remix-run/node": "2.15.2",
- "@remix-run/react": "2.15.2",
- "@remix-run/server-runtime": "2.15.2",
- "@webstudio-is/image": "workspace:*",
- "@webstudio-is/react-sdk": "workspace:*",
- "@webstudio-is/sdk": "workspace:*",
- "@webstudio-is/sdk-components-animation": "workspace:*",
- "@webstudio-is/sdk-components-react": "workspace:*",
- "@webstudio-is/sdk-components-react-radix": "workspace:*",
- "@webstudio-is/sdk-components-react-remix": "workspace:*",
- "isbot": "^5.1.22",
- "react": "18.3.0-canary-14898b6a9-20240318",
- "react-dom": "18.3.0-canary-14898b6a9-20240318"
- },
- "private": true,
- "sideEffects": false,
- "devDependencies": {
- "@remix-run/dev": "2.15.2",
- "@types/react": "^18.2.70",
- "@types/react-dom": "^18.2.25",
- "typescript": "5.7.3",
- "vite": "^5.4.11",
- "webstudio": "workspace:*"
- },
- "engines": {
- "node": ">=20.0.0"
- },
- "name": "webstudio-remix-netlify-edge-functions",
- "version": "0.0.1",
- "description": "",
- "main": "index.js",
- "keywords": [],
- "author": "",
- "license": "AGPL-3.0-or-later",
- "type": "module"
-}
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/public/assets/147-1478573_cat-icon-png-black-cat-png-icon.png_ZJ6-qJjk1RlFzuYwyCXdp.jpeg b/fixtures/webstudio-remix-netlify-edge-functions/public/assets/147-1478573_cat-icon-png-black-cat-png-icon.png_ZJ6-qJjk1RlFzuYwyCXdp.jpeg
deleted file mode 100644
index 9d5e2b8843..0000000000
Binary files a/fixtures/webstudio-remix-netlify-edge-functions/public/assets/147-1478573_cat-icon-png-black-cat-png-icon.png_ZJ6-qJjk1RlFzuYwyCXdp.jpeg and /dev/null differ
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/public/assets/iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg b/fixtures/webstudio-remix-netlify-edge-functions/public/assets/iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg
deleted file mode 100644
index bc70d3a453..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/public/assets/iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="14" height="16" xmlns="http://www.w3.org/2000/svg"><path d="M4.203.702a.713.713 0 0 0-.366.213c-.124.148-.137.208-.15.672l-.012.431-.443.015c-.481.017-.686.041-.991.117-.651.161-1.273.668-1.586 1.29a2.834 2.834 0 0 0-.252.839c-.038.241-.041.553-.041 4.366 0 4.4-.002 4.323.117 4.784.107.412.325.79.639 1.106.422.426.865.64 1.536.742.255.038.554.041 4.346.041s4.091-.003 4.346-.041c.671-.102 1.114-.316 1.536-.742.314-.316.532-.694.639-1.106.119-.461.117-.384.117-4.784 0-3.813-.003-4.125-.041-4.366a2.834 2.834 0 0 0-.252-.839c-.313-.622-.935-1.129-1.586-1.29-.305-.076-.51-.1-.991-.117l-.443-.015-.012-.431c-.013-.488-.039-.581-.204-.726C9.91.687 9.61.64 9.39.75c-.132.066-.302.249-.339.366a3.432 3.432 0 0 0-.038.5l-.011.414H4.998l-.011-.414a3.432 3.432 0 0 0-.038-.5c-.036-.115-.207-.3-.332-.361a.689.689 0 0 0-.414-.053m2.139 9.442-.007.088-.038-.105a5.451 5.451 0 0 0-.054-.142c-.01-.025.003-.045.039-.061.049-.022.054-.018.06.054a1.15 1.15 0 0 1 0 .166" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/public/favicon.ico b/fixtures/webstudio-remix-netlify-edge-functions/public/favicon.ico
deleted file mode 100644
index 9cb8c815dc..0000000000
Binary files a/fixtures/webstudio-remix-netlify-edge-functions/public/favicon.ico and /dev/null differ
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/tsconfig.json b/fixtures/webstudio-remix-netlify-edge-functions/tsconfig.json
deleted file mode 100644
index 99e0e652cc..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "include": ["**/*.ts", "**/*.tsx", "**/*.mjs"],
- "compilerOptions": {
- "lib": ["DOM", "DOM.Iterable", "ESNext"],
- "types": [
- "@remix-run/node",
- "vite/client",
- "@webstudio-is/react-sdk/placeholder"
- ],
- "isolatedModules": true,
- "esModuleInterop": true,
- "jsx": "react-jsx",
- "module": "ESNext",
- "moduleResolution": "bundler",
- "target": "ES2022",
- "strict": true,
- "allowJs": true,
- "forceConsistentCasingInFileNames": true,
- "noEmit": true,
- "skipLibCheck": true,
- "customConditions": ["webstudio"]
- }
-}
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/vite.config.ts b/fixtures/webstudio-remix-netlify-edge-functions/vite.config.ts
deleted file mode 100644
index e7824dd58d..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/vite.config.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { vitePlugin as remix } from "@remix-run/dev";
-import { defineConfig } from "vite";
-import { netlifyPlugin } from "@netlify/remix-edge-adapter/plugin";
-
-export default defineConfig({
- plugins: [
- remix({
- future: {
- v3_lazyRouteDiscovery: false,
- v3_relativeSplatPath: false,
- v3_singleFetch: false,
- v3_fetcherPersist: false,
- v3_throwAbortReason: false,
- },
- }),
- netlifyPlugin(),
- ],
-});
diff --git a/fixtures/webstudio-remix-netlify-functions/.npmrc b/fixtures/webstudio-remix-netlify-functions/.npmrc
deleted file mode 100644
index 43ce02f127..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/.npmrc
+++ /dev/null
@@ -1,3 +0,0 @@
-force=true
-# to support using NODE_OPTIONS for windows tests
-shell-emulator=true
diff --git a/fixtures/webstudio-remix-netlify-functions/.webstudio/config.json b/fixtures/webstudio-remix-netlify-functions/.webstudio/config.json
deleted file mode 100644
index 3bad791718..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/.webstudio/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "projectId": "d845c167-ea07-4875-b08d-83e97c09dcce"
-}
diff --git a/fixtures/webstudio-remix-netlify-functions/.webstudio/data.json b/fixtures/webstudio-remix-netlify-functions/.webstudio/data.json
deleted file mode 100644
index 7dc933cfb6..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/.webstudio/data.json
+++ /dev/null
@@ -1,500 +0,0 @@
-{
- "build": {
- "id": "f565d527-32e7-4731-bc71-aca9e9574587",
- "projectId": "d845c167-ea07-4875-b08d-83e97c09dcce",
- "version": 43,
- "createdAt": "2025-01-04T11:01:50.091+00:00",
- "updatedAt": "2025-01-04T11:01:50.091+00:00",
- "pages": {
- "meta": {
- "siteName": "",
- "faviconAssetId": "d0974db9300c1a3b0fb8b291dd9fabd45ad136478908394280af2f7087e3aecd",
- "code": ""
- },
- "homePage": {
- "id": "9di_L14CzctvSruIoKVvE",
- "name": "Home",
- "title": "\"Home\"",
- "rootInstanceId": "MMimeobf_zi4ZkRGXapju",
- "systemDataSourceId": "2KT4-bRzToj9cAGAN_woK",
- "meta": {},
- "path": ""
- },
- "pages": [
- {
- "id": "WPPAbLFyJD_02vhjRd8P4",
- "name": "Another page",
- "title": "\"Another page\"",
- "history": ["/another-page"],
- "rootInstanceId": "n_VBMr7klpx25buS0NV7R",
- "systemDataSourceId": "tdXe9gFf83hSo9BLWU6xl",
- "meta": {
- "description": "\"\"",
- "excludePageFromSearch": "true",
- "language": "\"\"",
- "socialImageUrl": "\"\"",
- "status": "200",
- "redirect": "\"\"",
- "documentType": "html",
- "custom": [
- {
- "property": "",
- "content": "\"\""
- }
- ]
- },
- "marketplace": {
- "include": false
- },
- "path": "/another-page"
- }
- ],
- "folders": [
- {
- "id": "root",
- "name": "Root",
- "slug": "",
- "children": ["9di_L14CzctvSruIoKVvE", "WPPAbLFyJD_02vhjRd8P4"]
- }
- ]
- },
- "breakpoints": [
- [
- "rKj-wYctg3-GnqL3WHN9I",
- {
- "id": "rKj-wYctg3-GnqL3WHN9I",
- "label": "Base"
- }
- ],
- [
- "yH9RXhqCyeaVkrOt8MzLc",
- {
- "id": "yH9RXhqCyeaVkrOt8MzLc",
- "label": "Tablet",
- "maxWidth": 991
- }
- ],
- [
- "8nSCZbeS002IVwkTdoIes",
- {
- "id": "8nSCZbeS002IVwkTdoIes",
- "label": "Mobile landscape",
- "maxWidth": 767
- }
- ],
- [
- "7gBD25KrrbBdJYNDlhPz7",
- {
- "id": "7gBD25KrrbBdJYNDlhPz7",
- "label": "Mobile portrait",
- "maxWidth": 479
- }
- ]
- ],
- "styles": [
- [
- "7_QL45cpvP-zG8Hkgf4cr:rKj-wYctg3-GnqL3WHN9I:display:",
- {
- "breakpointId": "rKj-wYctg3-GnqL3WHN9I",
- "styleSourceId": "7_QL45cpvP-zG8Hkgf4cr",
- "property": "display",
- "value": {
- "type": "keyword",
- "value": "flex"
- }
- }
- ],
- [
- "7_QL45cpvP-zG8Hkgf4cr:rKj-wYctg3-GnqL3WHN9I:alignItems:",
- {
- "breakpointId": "rKj-wYctg3-GnqL3WHN9I",
- "styleSourceId": "7_QL45cpvP-zG8Hkgf4cr",
- "property": "alignItems",
- "value": {
- "type": "keyword",
- "value": "center"
- }
- }
- ],
- [
- "7_QL45cpvP-zG8Hkgf4cr:rKj-wYctg3-GnqL3WHN9I:justifyContent:",
- {
- "breakpointId": "rKj-wYctg3-GnqL3WHN9I",
- "styleSourceId": "7_QL45cpvP-zG8Hkgf4cr",
- "property": "justifyContent",
- "value": {
- "type": "keyword",
- "value": "center"
- }
- }
- ],
- [
- "7_QL45cpvP-zG8Hkgf4cr:rKj-wYctg3-GnqL3WHN9I:flexDirection:",
- {
- "breakpointId": "rKj-wYctg3-GnqL3WHN9I",
- "styleSourceId": "7_QL45cpvP-zG8Hkgf4cr",
- "property": "flexDirection",
- "value": {
- "type": "keyword",
- "value": "column"
- }
- }
- ],
- [
- "0KA68BwP9gdTzE1ESO2Zp:rKj-wYctg3-GnqL3WHN9I:marginBottom:",
- {
- "breakpointId": "rKj-wYctg3-GnqL3WHN9I",
- "styleSourceId": "0KA68BwP9gdTzE1ESO2Zp",
- "property": "marginBottom",
- "value": {
- "type": "unit",
- "unit": "em",
- "value": 1
- }
- }
- ],
- [
- "mf2C07UBmGT7y_G4Du3yg:rKj-wYctg3-GnqL3WHN9I:width:",
- {
- "breakpointId": "rKj-wYctg3-GnqL3WHN9I",
- "styleSourceId": "mf2C07UBmGT7y_G4Du3yg",
- "property": "width",
- "value": {
- "type": "unit",
- "unit": "px",
- "value": 400
- }
- }
- ]
- ],
- "styleSources": [
- [
- "7_QL45cpvP-zG8Hkgf4cr",
- {
- "type": "local",
- "id": "7_QL45cpvP-zG8Hkgf4cr"
- }
- ],
- [
- "0KA68BwP9gdTzE1ESO2Zp",
- {
- "type": "local",
- "id": "0KA68BwP9gdTzE1ESO2Zp"
- }
- ],
- [
- "mf2C07UBmGT7y_G4Du3yg",
- {
- "type": "local",
- "id": "mf2C07UBmGT7y_G4Du3yg"
- }
- ]
- ],
- "styleSourceSelections": [
- [
- "MMimeobf_zi4ZkRGXapju",
- {
- "instanceId": "MMimeobf_zi4ZkRGXapju",
- "values": ["7_QL45cpvP-zG8Hkgf4cr"]
- }
- ],
- [
- "BMJfjOzunWs8XkQgvvx1e",
- {
- "instanceId": "BMJfjOzunWs8XkQgvvx1e",
- "values": ["0KA68BwP9gdTzE1ESO2Zp"]
- }
- ],
- [
- "uHB3Fjb7-NELG-bnH7bXB",
- {
- "instanceId": "uHB3Fjb7-NELG-bnH7bXB",
- "values": ["mf2C07UBmGT7y_G4Du3yg"]
- }
- ]
- ],
- "props": [
- [
- "1p34InvRgqoKVqeNZ1uBb",
- {
- "id": "1p34InvRgqoKVqeNZ1uBb",
- "instanceId": "pjkZo5EiBqaeUXBcyHf_O",
- "name": "href",
- "type": "page",
- "value": "WPPAbLFyJD_02vhjRd8P4"
- }
- ],
- [
- "su3ag3OxH9WTBjJg5eIyg",
- {
- "id": "su3ag3OxH9WTBjJg5eIyg",
- "instanceId": "uHB3Fjb7-NELG-bnH7bXB",
- "name": "src",
- "type": "asset",
- "value": "1d8bf4398f643f5333d415091507d778aaed62f28883642636cbed0be156a0ee"
- }
- ],
- [
- "vGCYpBBB1QUPIPPIdyexn",
- {
- "id": "vGCYpBBB1QUPIPPIdyexn",
- "instanceId": "uHB3Fjb7-NELG-bnH7bXB",
- "name": "width",
- "type": "asset",
- "value": "1d8bf4398f643f5333d415091507d778aaed62f28883642636cbed0be156a0ee"
- }
- ],
- [
- "JKAGY7DWpciEl0UdnWuKL",
- {
- "id": "JKAGY7DWpciEl0UdnWuKL",
- "instanceId": "uHB3Fjb7-NELG-bnH7bXB",
- "name": "height",
- "type": "asset",
- "value": "1d8bf4398f643f5333d415091507d778aaed62f28883642636cbed0be156a0ee"
- }
- ],
- [
- "CAkmmL8-JAgokmeopoFXh",
- {
- "id": "CAkmmL8-JAgokmeopoFXh",
- "instanceId": "2sIE8GxbKRBaav_zdhaZ1",
- "name": "src",
- "type": "string",
- "value": "https://picsum.photos/id/237/100/100.jpg?blur=4&grayscale"
- }
- ]
- ],
- "dataSources": [
- [
- "2KT4-bRzToj9cAGAN_woK",
- {
- "type": "parameter",
- "id": "2KT4-bRzToj9cAGAN_woK",
- "scopeInstanceId": "MMimeobf_zi4ZkRGXapju",
- "name": "system"
- }
- ],
- [
- "tdXe9gFf83hSo9BLWU6xl",
- {
- "type": "parameter",
- "id": "tdXe9gFf83hSo9BLWU6xl",
- "scopeInstanceId": "n_VBMr7klpx25buS0NV7R",
- "name": "system"
- }
- ]
- ],
- "resources": [],
- "instances": [
- [
- "MMimeobf_zi4ZkRGXapju",
- {
- "type": "instance",
- "id": "MMimeobf_zi4ZkRGXapju",
- "component": "Body",
- "children": [
- {
- "type": "id",
- "value": "MYDt0guk1-vzc7yzqyN6A"
- },
- {
- "type": "id",
- "value": "BMJfjOzunWs8XkQgvvx1e"
- },
- {
- "type": "id",
- "value": "pjkZo5EiBqaeUXBcyHf_O"
- },
- {
- "type": "id",
- "value": "uHB3Fjb7-NELG-bnH7bXB"
- },
- {
- "type": "id",
- "value": "2sIE8GxbKRBaav_zdhaZ1"
- }
- ]
- }
- ],
- [
- "MYDt0guk1-vzc7yzqyN6A",
- {
- "type": "instance",
- "id": "MYDt0guk1-vzc7yzqyN6A",
- "component": "Heading",
- "label": "xD",
- "children": [
- {
- "type": "text",
- "value": "Simple Project to test CLI"
- }
- ]
- }
- ],
- [
- "BMJfjOzunWs8XkQgvvx1e",
- {
- "type": "instance",
- "id": "BMJfjOzunWs8XkQgvvx1e",
- "component": "Text",
- "children": [
- {
- "type": "text",
- "value": "Please don't change directly in the fixture"
- }
- ]
- }
- ],
- [
- "pjkZo5EiBqaeUXBcyHf_O",
- {
- "type": "instance",
- "id": "pjkZo5EiBqaeUXBcyHf_O",
- "component": "Link",
- "children": [
- {
- "type": "text",
- "value": "Test another page link"
- }
- ]
- }
- ],
- [
- "n_VBMr7klpx25buS0NV7R",
- {
- "type": "instance",
- "id": "n_VBMr7klpx25buS0NV7R",
- "component": "Body",
- "children": [
- {
- "type": "id",
- "value": "wthNByqb3RPmheb-56VYI"
- }
- ]
- }
- ],
- [
- "wthNByqb3RPmheb-56VYI",
- {
- "type": "instance",
- "id": "wthNByqb3RPmheb-56VYI",
- "component": "Heading",
- "children": [
- {
- "type": "text",
- "value": "Another page"
- }
- ]
- }
- ],
- [
- "uHB3Fjb7-NELG-bnH7bXB",
- {
- "type": "instance",
- "id": "uHB3Fjb7-NELG-bnH7bXB",
- "component": "Image",
- "children": []
- }
- ],
- [
- "2sIE8GxbKRBaav_zdhaZ1",
- {
- "type": "instance",
- "id": "2sIE8GxbKRBaav_zdhaZ1",
- "component": "Image",
- "children": []
- }
- ]
- ],
- "deployment": {
- "destination": "saas",
- "domains": ["cli-basic-test-d0osr"],
- "assetsDomain": "cli-basic-test-d0osr",
- "excludeWstdDomainFromSearch": false
- }
- },
- "page": {
- "id": "9di_L14CzctvSruIoKVvE",
- "name": "Home",
- "title": "\"Home\"",
- "rootInstanceId": "MMimeobf_zi4ZkRGXapju",
- "systemDataSourceId": "2KT4-bRzToj9cAGAN_woK",
- "meta": {},
- "path": ""
- },
- "pages": [
- {
- "id": "9di_L14CzctvSruIoKVvE",
- "name": "Home",
- "title": "\"Home\"",
- "rootInstanceId": "MMimeobf_zi4ZkRGXapju",
- "systemDataSourceId": "2KT4-bRzToj9cAGAN_woK",
- "meta": {},
- "path": ""
- },
- {
- "id": "WPPAbLFyJD_02vhjRd8P4",
- "name": "Another page",
- "title": "\"Another page\"",
- "history": ["/another-page"],
- "rootInstanceId": "n_VBMr7klpx25buS0NV7R",
- "systemDataSourceId": "tdXe9gFf83hSo9BLWU6xl",
- "meta": {
- "description": "\"\"",
- "excludePageFromSearch": "true",
- "language": "\"\"",
- "socialImageUrl": "\"\"",
- "status": "200",
- "redirect": "\"\"",
- "documentType": "html",
- "custom": [
- {
- "property": "",
- "content": "\"\""
- }
- ]
- },
- "marketplace": {
- "include": false
- },
- "path": "/another-page"
- }
- ],
- "assets": [
- {
- "id": "1d8bf4398f643f5333d415091507d778aaed62f28883642636cbed0be156a0ee",
- "name": "iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg",
- "description": null,
- "projectId": "d845c167-ea07-4875-b08d-83e97c09dcce",
- "size": 999,
- "type": "image",
- "format": "svg",
- "createdAt": "2024-07-26T13:39:48.678+00:00",
- "meta": {
- "width": 14,
- "height": 16
- }
- },
- {
- "id": "d0974db9300c1a3b0fb8b291dd9fabd45ad136478908394280af2f7087e3aecd",
- "name": "147-1478573_cat-icon-png-black-cat-png-icon.png_ZJ6-qJjk1RlFzuYwyCXdp.jpeg",
- "description": null,
- "projectId": "d845c167-ea07-4875-b08d-83e97c09dcce",
- "size": 64701,
- "type": "image",
- "format": "jpg",
- "createdAt": "2024-12-06T14:36:07.046+00:00",
- "meta": {
- "width": 820,
- "height": 985
- }
- }
- ],
- "user": {
- "email": "[email protected]"
- },
- "projectDomain": "cli-basic-test-d0osr",
- "projectTitle": "cli-basic-test",
- "origin": "https://main.development.webstudio.is"
-}
diff --git a/fixtures/webstudio-remix-netlify-functions/README.md b/fixtures/webstudio-remix-netlify-functions/README.md
deleted file mode 100644
index c6f8cfa5b9..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Fixture to test/play with webstudio
-
-## How to develop
-
-```bash
-# Terminal 1
-cd packages/webstudio
-pnpm dev
-```
-
-```bash
-# Terminal 2
-pnpm fixtures:link
-
-pnpm fixtures:sync
-# data.json generated
-
-pnpm fixtures:build
-# exec `pnpm run dev` to see result
-```
diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/$resources.sitemap.xml.ts b/fixtures/webstudio-remix-netlify-functions/app/__generated__/$resources.sitemap.xml.ts
deleted file mode 100644
index 181eac4621..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/$resources.sitemap.xml.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export const sitemap = [
- {
- path: "/",
- lastModified: "2025-01-04",
- },
-];
diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/[another-page]._index.server.tsx b/fixtures/webstudio-remix-netlify-functions/app/__generated__/[another-page]._index.server.tsx
deleted file mode 100644
index dc6510942c..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/[another-page]._index.server.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* eslint-disable */
-/* This is a auto generated file for building the project */
-
-import type { PageMeta } from "@webstudio-is/sdk";
-import type { System, ResourceRequest } from "@webstudio-is/sdk";
-export const getResources = (_props: { system: System }) => {
- const _data = new Map<string, ResourceRequest>([]);
- const _action = new Map<string, ResourceRequest>([]);
- return { data: _data, action: _action };
-};
-
-export const getPageMeta = ({
- system,
- resources,
-}: {
- system: System;
- resources: Record<string, any>;
-}): PageMeta => {
- return {
- title: "Another page",
- description: "",
- excludePageFromSearch: true,
- language: "",
- socialImageAssetName: undefined,
- socialImageUrl: "",
- status: 200,
- redirect: "",
- custom: [],
- };
-};
-
-type Params = Record<string, string | undefined>;
-export const getRemixParams = ({ ...params }: Params): Params => {
- return params;
-};
-
-export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";
-
-export const contactEmail = "[email protected]";
diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/[another-page]._index.tsx b/fixtures/webstudio-remix-netlify-functions/app/__generated__/[another-page]._index.tsx
deleted file mode 100644
index fba9c2d0ac..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/[another-page]._index.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-/* eslint-disable */
-/* This is a auto generated file for building the project */
-
-import { Fragment, useState } from "react";
-import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";
-import { useResource, useVariableState } from "@webstudio-is/react-sdk/runtime";
-import { Body as Body } from "@webstudio-is/sdk-components-react-remix";
-import { Heading as Heading } from "@webstudio-is/sdk-components-react";
-
-export const siteName = "";
-
-export const favIconAsset: ImageAsset | undefined = {
- id: "d0974db9300c1a3b0fb8b291dd9fabd45ad136478908394280af2f7087e3aecd",
- name: "147-1478573_cat-icon-png-black-cat-png-icon.png_ZJ6-qJjk1RlFzuYwyCXdp.jpeg",
- description: null,
- projectId: "d845c167-ea07-4875-b08d-83e97c09dcce",
- size: 64701,
- type: "image",
- format: "jpg",
- createdAt: "2024-12-06T14:36:07.046+00:00",
- meta: { width: 820, height: 985 },
-};
-
-// Font assets on current page (can be preloaded)
-export const pageFontAssets: FontAsset[] = [];
-
-export const pageBackgroundImageAssets: ImageAsset[] = [];
-
-const Page = ({}: { system: any }) => {
- return (
- <Body className={`w-body`}>
- <Heading className={`w-heading`}>{"Another page"}</Heading>
- </Body>
- );
-};
-
-export { Page };
diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.server.tsx b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.server.tsx
deleted file mode 100644
index 83d760a977..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.server.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* eslint-disable */
-/* This is a auto generated file for building the project */
-
-import type { PageMeta } from "@webstudio-is/sdk";
-import type { System, ResourceRequest } from "@webstudio-is/sdk";
-export const getResources = (_props: { system: System }) => {
- const _data = new Map<string, ResourceRequest>([]);
- const _action = new Map<string, ResourceRequest>([]);
- return { data: _data, action: _action };
-};
-
-export const getPageMeta = ({
- system,
- resources,
-}: {
- system: System;
- resources: Record<string, any>;
-}): PageMeta => {
- return {
- title: "Home",
- description: undefined,
- excludePageFromSearch: undefined,
- language: undefined,
- socialImageAssetName: undefined,
- socialImageUrl: undefined,
- status: undefined,
- redirect: undefined,
- custom: [],
- };
-};
-
-type Params = Record<string, string | undefined>;
-export const getRemixParams = ({ ...params }: Params): Params => {
- return params;
-};
-
-export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";
-
-export const contactEmail = "[email protected]";
diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx
deleted file mode 100644
index 687faae553..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-/* eslint-disable */
-/* This is a auto generated file for building the project */
-
-import { Fragment, useState } from "react";
-import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";
-import { useResource, useVariableState } from "@webstudio-is/react-sdk/runtime";
-import {
- Body as Body,
- Link as Link,
-} from "@webstudio-is/sdk-components-react-remix";
-import {
- Heading as Heading,
- Text as Text,
- Image as Image,
-} from "@webstudio-is/sdk-components-react";
-
-export const siteName = "";
-
-export const favIconAsset: ImageAsset | undefined = {
- id: "d0974db9300c1a3b0fb8b291dd9fabd45ad136478908394280af2f7087e3aecd",
- name: "147-1478573_cat-icon-png-black-cat-png-icon.png_ZJ6-qJjk1RlFzuYwyCXdp.jpeg",
- description: null,
- projectId: "d845c167-ea07-4875-b08d-83e97c09dcce",
- size: 64701,
- type: "image",
- format: "jpg",
- createdAt: "2024-12-06T14:36:07.046+00:00",
- meta: { width: 820, height: 985 },
-};
-
-// Font assets on current page (can be preloaded)
-export const pageFontAssets: FontAsset[] = [];
-
-export const pageBackgroundImageAssets: ImageAsset[] = [];
-
-export const CustomCode = () => {
- return <></>;
-};
-
-const Page = ({}: { system: any }) => {
- return (
- <Body className={`w-body c1jaw2zx cbipm55 ctniqj4 ctgx88l`}>
- <Heading className={`w-heading`}>{"Simple Project to test CLI"}</Heading>
- <Text className={`w-text cn3rfux`}>
- {"Please don't change directly in the fixture"}
- </Text>
- <Link href={"/another-page"} className={`w-link`}>
- {"Test another page link"}
- </Link>
- <Image
- src={"/assets/iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg"}
- width={14}
- height={16}
- className={`w-image c161qeci`}
- />
- <Image
- src={"https://picsum.photos/id/237/100/100.jpg?blur=4&grayscale"}
- className={`w-image`}
- />
- </Body>
- );
-};
-
-export { Page };
diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/index.css b/fixtures/webstudio-remix-netlify-functions/app/__generated__/index.css
deleted file mode 100644
index dd85fdf13b..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/index.css
+++ /dev/null
@@ -1,118 +0,0 @@
-@media all {
- :root {
- display: grid;
- min-height: 100%;
- font-family: Arial, Roboto, sans-serif;
- font-size: 16px;
- line-height: 1.2;
- white-space: pre-wrap;
- white-space-collapse: preserve;
- }
- :where(body.w-body) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- margin: 0;
- }
- :where(h1.w-heading) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- }
- :where(h2.w-heading) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- }
- :where(h3.w-heading) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- }
- :where(h4.w-heading) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- }
- :where(h5.w-heading) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- }
- :where(h6.w-heading) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- }
- :where(div.w-text) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- min-height: 1em;
- }
- :where(a.w-link) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- display: inline-block;
- }
- :where(img.w-image) {
- box-sizing: border-box;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- outline-width: 1px;
- max-width: 100%;
- display: block;
- height: auto;
- }
-}
-@media all {
- .c1jaw2zx {
- display: flex;
- }
- .cbipm55 {
- align-items: center;
- }
- .ctniqj4 {
- justify-content: center;
- }
- .ctgx88l {
- flex-direction: column;
- }
- .cn3rfux {
- margin-bottom: 1em;
- }
- .c161qeci {
- width: 400px;
- }
-}
diff --git a/fixtures/webstudio-remix-netlify-functions/app/constants.mjs b/fixtures/webstudio-remix-netlify-functions/app/constants.mjs
deleted file mode 100644
index bef2400ae8..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/app/constants.mjs
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * We use mjs extension as constants in this file is shared with the build script
- * and we use `node --eval` to extract the constants.
- */
-export const assetBaseUrl = "/assets/";
-
-/**
- * @type {import("@webstudio-is/image").ImageLoader}
- */
-export const imageLoader = (props) => {
- if (process.env.NODE_ENV !== "production") {
- return props.src;
- }
-
- if (props.format === "raw") {
- return props.src;
- }
-
- // https://docs.netlify.com/image-cdn/overview/
- const searchParams = new URLSearchParams();
- searchParams.set("url", props.src);
- searchParams.set("w", props.width.toString());
- if (props.height) {
- searchParams.set("h", props.height.toString());
- }
- searchParams.set("q", props.quality.toString());
- // fit=contain by default
- return `/.netlify/images?${searchParams}`;
-};
diff --git a/fixtures/webstudio-remix-netlify-functions/app/entry.server.tsx b/fixtures/webstudio-remix-netlify-functions/app/entry.server.tsx
deleted file mode 100644
index beacf24084..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/app/entry.server.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { handleRequest as default } from "@netlify/remix-adapter";
diff --git a/fixtures/webstudio-remix-netlify-functions/app/extension.ts b/fixtures/webstudio-remix-netlify-functions/app/extension.ts
deleted file mode 100644
index 3345c28d98..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/app/extension.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { AppLoadContext } from "@remix-run/server-runtime";
-import { ResourceRequest } from "@webstudio-is/sdk";
-
-declare module "@remix-run/server-runtime" {
- interface AppLoadContext {
- EXCLUDE_FROM_SEARCH: boolean;
- getDefaultActionResource?: (options: {
- url: URL;
- projectId: string;
- contactEmail: string;
- formData: FormData;
- }) => ResourceRequest;
- }
-}
diff --git a/fixtures/webstudio-remix-netlify-functions/app/root.tsx b/fixtures/webstudio-remix-netlify-functions/app/root.tsx
deleted file mode 100644
index 40cefeeec7..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/app/root.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment */
-
-import { Links, Meta, Outlet, useMatches } from "@remix-run/react";
-// @todo think about how to make __generated__ typeable
-// @ts-ignore
-import { CustomCode } from "./__generated__/_index";
-
-const Root = () => {
- // Get language from matches
- const matches = useMatches();
-
- const lastMatchWithLanguage = matches.findLast((match) => {
- // @ts-ignore
- const language = match?.data?.pageMeta?.language;
- return language != null;
- });
-
- // @ts-ignore
- const lang = lastMatchWithLanguage?.data?.pageMeta?.language ?? "en";
-
- return (
- <html lang={lang}>
- <head>
- <meta charSet="utf-8" />
- <meta name="viewport" content="width=device-width,initial-scale=1" />
- <Meta />
- <Links />
- <CustomCode />
- </head>
- <Outlet />
- </html>
- );
-};
-
-export default Root;
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
deleted file mode 100644
index 63ab5675f9..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/app/routes/[another-page]._index.tsx
+++ /dev/null
@@ -1,297 +0,0 @@
-import {
- type ServerRuntimeMetaFunction as MetaFunction,
- type LinksFunction,
- type LinkDescriptor,
- type ActionFunctionArgs,
- type LoaderFunctionArgs,
- type HeadersFunction,
- json,
- redirect,
-} from "@remix-run/server-runtime";
-import { useLoaderData } from "@remix-run/react";
-import {
- isLocalResource,
- loadResource,
- loadResources,
- formIdFieldName,
- formBotFieldName,
-} from "@webstudio-is/sdk/runtime";
-import {
- ReactSdkContext,
- PageSettingsMeta,
- PageSettingsTitle,
- PageSettingsCanonicalLink,
-} from "@webstudio-is/react-sdk/runtime";
-import {
- Page,
- siteName,
- favIconAsset,
- pageFontAssets,
- pageBackgroundImageAssets,
-} from "../__generated__/[another-page]._index";
-import {
- getResources,
- getPageMeta,
- getRemixParams,
- projectId,
- contactEmail,
-} from "../__generated__/[another-page]._index.server";
-import { assetBaseUrl, imageLoader } from "../constants.mjs";
-import css from "../__generated__/index.css?url";
-import { sitemap } from "../__generated__/$resources.sitemap.xml";
-
-const customFetch: typeof fetch = (input, init) => {
- if (typeof input !== "string") {
- return fetch(input, init);
- }
-
- if (isLocalResource(input, "sitemap.xml")) {
- // @todo: dynamic import sitemap ???
- const response = new Response(JSON.stringify(sitemap));
- response.headers.set("content-type", "application/json; charset=utf-8");
- return Promise.resolve(response);
- }
-
- return fetch(input, init);
-};
-
-export const loader = async (arg: LoaderFunctionArgs) => {
- const url = new URL(arg.request.url);
- const host =
- arg.request.headers.get("x-forwarded-host") ||
- arg.request.headers.get("host") ||
- "";
- url.host = host;
- url.protocol = "https";
-
- const params = getRemixParams(arg.params);
- const system = {
- params,
- search: Object.fromEntries(url.searchParams),
- origin: url.origin,
- };
-
- const resources = await loadResources(
- customFetch,
- getResources({ system }).data
- );
- const pageMeta = getPageMeta({ system, resources });
-
- if (pageMeta.redirect) {
- const status =
- pageMeta.status === 301 || pageMeta.status === 302
- ? pageMeta.status
- : 302;
- return redirect(pageMeta.redirect, status);
- }
-
- // typecheck
- arg.context.EXCLUDE_FROM_SEARCH satisfies boolean;
-
- if (arg.context.EXCLUDE_FROM_SEARCH) {
- pageMeta.excludePageFromSearch = arg.context.EXCLUDE_FROM_SEARCH;
- }
-
- return json(
- {
- host,
- url: url.href,
- system,
- resources,
- pageMeta,
- },
- // No way for current information to change, so add cache for 10 minutes
- // In case of CRM Data, this should be set to 0
- {
- status: pageMeta.status,
- headers: {
- "Cache-Control": "public, max-age=600",
- },
- }
- );
-};
-
-export const headers: HeadersFunction = () => {
- return {
- "Cache-Control": "public, max-age=0, must-revalidate",
- };
-};
-
-export const meta: MetaFunction<typeof loader> = ({ data }) => {
- const metas: ReturnType<MetaFunction> = [];
- if (data === undefined) {
- return metas;
- }
-
- const origin = `https://${data.host}`;
-
- if (siteName) {
- metas.push({
- "script:ld+json": {
- "@context": "https://schema.org",
- "@type": "WebSite",
- name: siteName,
- url: origin,
- },
- });
- }
-
- return metas;
-};
-
-export const links: LinksFunction = () => {
- const result: LinkDescriptor[] = [];
-
- result.push({
- rel: "stylesheet",
- href: css,
- });
-
- if (favIconAsset) {
- result.push({
- rel: "icon",
- href: imageLoader({
- src: `${assetBaseUrl}${favIconAsset.name}`,
- // width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-search
- width: 144,
- height: 144,
- fit: "pad",
- quality: 100,
- format: "auto",
- }),
- type: undefined,
- });
- }
-
- for (const asset of pageFontAssets) {
- result.push({
- rel: "preload",
- href: `${assetBaseUrl}${asset.name}`,
- as: "font",
- crossOrigin: "anonymous",
- });
- }
-
- for (const backgroundImageAsset of pageBackgroundImageAssets) {
- result.push({
- rel: "preload",
- href: `${assetBaseUrl}${backgroundImageAsset.name}`,
- as: "image",
- });
- }
-
- return result;
-};
-
-const getRequestHost = (request: Request): string =>
- request.headers.get("x-forwarded-host") || request.headers.get("host") || "";
-
-export const action = async ({
- request,
- context,
-}: ActionFunctionArgs): Promise<
- { success: true } | { success: false; errors: string[] }
-> => {
- try {
- const url = new URL(request.url);
- url.host = getRequestHost(request);
-
- const formData = await request.formData();
-
- const system = {
- params: {},
- search: {},
- origin: url.origin,
- };
-
- const resourceName = formData.get(formIdFieldName);
- let resource =
- typeof resourceName === "string"
- ? getResources({ system }).action.get(resourceName)
- : undefined;
-
- const formBotValue = formData.get(formBotFieldName);
-
- if (formBotValue == null || typeof formBotValue !== "string") {
- throw new Error("Form bot field not found");
- }
-
- const submitTime = parseInt(formBotValue, 16);
- // Assumes that the difference between the server time and the form submission time,
- // including any client-server time drift, is within a 5-minute range.
- // Note: submitTime might be NaN because formBotValue can be any string used for logging purposes.
- // Example: `formBotValue: jsdom`, or `formBotValue: headless-env`
- if (
- Number.isNaN(submitTime) ||
- Math.abs(Date.now() - submitTime) > 1000 * 60 * 5
- ) {
- throw new Error(`Form bot value invalid ${formBotValue}`);
- }
-
- formData.delete(formIdFieldName);
- formData.delete(formBotFieldName);
-
- if (resource) {
- resource.headers.push({
- name: "Content-Type",
- value: "application/json",
- });
- resource.body = Object.fromEntries(formData);
- } else {
- if (contactEmail === undefined) {
- throw new Error("Contact email not found");
- }
-
- resource = context.getDefaultActionResource?.({
- url,
- projectId,
- contactEmail,
- formData,
- });
- }
-
- if (resource === undefined) {
- throw Error("Resource not found");
- }
- const { ok, statusText } = await loadResource(fetch, resource);
- if (ok) {
- return { success: true };
- }
- return { success: false, errors: [statusText] };
- } catch (error) {
- console.error(error);
-
- return {
- success: false,
- errors: [error instanceof Error ? error.message : "Unknown error"],
- };
- }
-};
-
-const Outlet = () => {
- const { system, resources, url, pageMeta, host } =
- useLoaderData<typeof loader>();
- return (
- <ReactSdkContext.Provider
- value={{
- imageLoader,
- assetBaseUrl,
- resources,
- }}
- >
- {/* 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}
- host={host}
- siteName={siteName}
- imageLoader={imageLoader}
- />
- <PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
- <PageSettingsCanonicalLink href={url} />
- </ReactSdkContext.Provider>
- );
-};
-
-export default Outlet;
diff --git a/fixtures/webstudio-remix-netlify-functions/app/routes/[robots.txt].tsx b/fixtures/webstudio-remix-netlify-functions/app/routes/[robots.txt].tsx
deleted file mode 100644
index aad4a9b368..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/app/routes/[robots.txt].tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
-
-export const loader = (arg: LoaderFunctionArgs) => {
- const host =
- arg.request.headers.get("x-forwarded-host") ||
- arg.request.headers.get("host") ||
- "";
-
- return new Response(
- `
-User-agent: *
-Disallow: /api/
-
-Sitemap: https://${host}/sitemap.xml
-
- `,
- {
- headers: {
- "Content-Type": "text/plain",
- },
- status: 200,
- }
- );
-};
diff --git a/fixtures/webstudio-remix-netlify-functions/app/routes/[sitemap.xml]._index.tsx b/fixtures/webstudio-remix-netlify-functions/app/routes/[sitemap.xml]._index.tsx
deleted file mode 100644
index 2a57cb3721..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/app/routes/[sitemap.xml]._index.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
-import { sitemap } from "../__generated__/$resources.sitemap.xml";
-
-export const loader = (arg: LoaderFunctionArgs) => {
- const host =
- arg.request.headers.get("x-forwarded-host") ||
- arg.request.headers.get("host") ||
- "";
-
- const urls = sitemap.map((page) => {
- const url = new URL(`https://${host}${page.path}`);
-
- return `
- <url>
- <loc>${url.href}</loc>
- <lastmod>${page.lastModified.split("T")[0]}</lastmod>
- </url>
- `;
- });
-
- return new Response(
- `<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-${urls.join("")}
-</urlset>
- `,
- {
- headers: {
- "Content-Type": "application/xml",
- },
- status: 200,
- }
- );
-};
diff --git a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx
deleted file mode 100644
index 9bc280da9b..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx
+++ /dev/null
@@ -1,297 +0,0 @@
-import {
- type ServerRuntimeMetaFunction as MetaFunction,
- type LinksFunction,
- type LinkDescriptor,
- type ActionFunctionArgs,
- type LoaderFunctionArgs,
- type HeadersFunction,
- json,
- redirect,
-} from "@remix-run/server-runtime";
-import { useLoaderData } from "@remix-run/react";
-import {
- isLocalResource,
- loadResource,
- loadResources,
- formIdFieldName,
- formBotFieldName,
-} from "@webstudio-is/sdk/runtime";
-import {
- ReactSdkContext,
- PageSettingsMeta,
- PageSettingsTitle,
- PageSettingsCanonicalLink,
-} from "@webstudio-is/react-sdk/runtime";
-import {
- Page,
- siteName,
- favIconAsset,
- pageFontAssets,
- pageBackgroundImageAssets,
-} from "../__generated__/_index";
-import {
- getResources,
- getPageMeta,
- getRemixParams,
- projectId,
- contactEmail,
-} from "../__generated__/_index.server";
-import { assetBaseUrl, imageLoader } from "../constants.mjs";
-import css from "../__generated__/index.css?url";
-import { sitemap } from "../__generated__/$resources.sitemap.xml";
-
-const customFetch: typeof fetch = (input, init) => {
- if (typeof input !== "string") {
- return fetch(input, init);
- }
-
- if (isLocalResource(input, "sitemap.xml")) {
- // @todo: dynamic import sitemap ???
- const response = new Response(JSON.stringify(sitemap));
- response.headers.set("content-type", "application/json; charset=utf-8");
- return Promise.resolve(response);
- }
-
- return fetch(input, init);
-};
-
-export const loader = async (arg: LoaderFunctionArgs) => {
- const url = new URL(arg.request.url);
- const host =
- arg.request.headers.get("x-forwarded-host") ||
- arg.request.headers.get("host") ||
- "";
- url.host = host;
- url.protocol = "https";
-
- const params = getRemixParams(arg.params);
- const system = {
- params,
- search: Object.fromEntries(url.searchParams),
- origin: url.origin,
- };
-
- const resources = await loadResources(
- customFetch,
- getResources({ system }).data
- );
- const pageMeta = getPageMeta({ system, resources });
-
- if (pageMeta.redirect) {
- const status =
- pageMeta.status === 301 || pageMeta.status === 302
- ? pageMeta.status
- : 302;
- return redirect(pageMeta.redirect, status);
- }
-
- // typecheck
- arg.context.EXCLUDE_FROM_SEARCH satisfies boolean;
-
- if (arg.context.EXCLUDE_FROM_SEARCH) {
- pageMeta.excludePageFromSearch = arg.context.EXCLUDE_FROM_SEARCH;
- }
-
- return json(
- {
- host,
- url: url.href,
- system,
- resources,
- pageMeta,
- },
- // No way for current information to change, so add cache for 10 minutes
- // In case of CRM Data, this should be set to 0
- {
- status: pageMeta.status,
- headers: {
- "Cache-Control": "public, max-age=600",
- },
- }
- );
-};
-
-export const headers: HeadersFunction = () => {
- return {
- "Cache-Control": "public, max-age=0, must-revalidate",
- };
-};
-
-export const meta: MetaFunction<typeof loader> = ({ data }) => {
- const metas: ReturnType<MetaFunction> = [];
- if (data === undefined) {
- return metas;
- }
-
- const origin = `https://${data.host}`;
-
- if (siteName) {
- metas.push({
- "script:ld+json": {
- "@context": "https://schema.org",
- "@type": "WebSite",
- name: siteName,
- url: origin,
- },
- });
- }
-
- return metas;
-};
-
-export const links: LinksFunction = () => {
- const result: LinkDescriptor[] = [];
-
- result.push({
- rel: "stylesheet",
- href: css,
- });
-
- if (favIconAsset) {
- result.push({
- rel: "icon",
- href: imageLoader({
- src: `${assetBaseUrl}${favIconAsset.name}`,
- // width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-search
- width: 144,
- height: 144,
- fit: "pad",
- quality: 100,
- format: "auto",
- }),
- type: undefined,
- });
- }
-
- for (const asset of pageFontAssets) {
- result.push({
- rel: "preload",
- href: `${assetBaseUrl}${asset.name}`,
- as: "font",
- crossOrigin: "anonymous",
- });
- }
-
- for (const backgroundImageAsset of pageBackgroundImageAssets) {
- result.push({
- rel: "preload",
- href: `${assetBaseUrl}${backgroundImageAsset.name}`,
- as: "image",
- });
- }
-
- return result;
-};
-
-const getRequestHost = (request: Request): string =>
- request.headers.get("x-forwarded-host") || request.headers.get("host") || "";
-
-export const action = async ({
- request,
- context,
-}: ActionFunctionArgs): Promise<
- { success: true } | { success: false; errors: string[] }
-> => {
- try {
- const url = new URL(request.url);
- url.host = getRequestHost(request);
-
- const formData = await request.formData();
-
- const system = {
- params: {},
- search: {},
- origin: url.origin,
- };
-
- const resourceName = formData.get(formIdFieldName);
- let resource =
- typeof resourceName === "string"
- ? getResources({ system }).action.get(resourceName)
- : undefined;
-
- const formBotValue = formData.get(formBotFieldName);
-
- if (formBotValue == null || typeof formBotValue !== "string") {
- throw new Error("Form bot field not found");
- }
-
- const submitTime = parseInt(formBotValue, 16);
- // Assumes that the difference between the server time and the form submission time,
- // including any client-server time drift, is within a 5-minute range.
- // Note: submitTime might be NaN because formBotValue can be any string used for logging purposes.
- // Example: `formBotValue: jsdom`, or `formBotValue: headless-env`
- if (
- Number.isNaN(submitTime) ||
- Math.abs(Date.now() - submitTime) > 1000 * 60 * 5
- ) {
- throw new Error(`Form bot value invalid ${formBotValue}`);
- }
-
- formData.delete(formIdFieldName);
- formData.delete(formBotFieldName);
-
- if (resource) {
- resource.headers.push({
- name: "Content-Type",
- value: "application/json",
- });
- resource.body = Object.fromEntries(formData);
- } else {
- if (contactEmail === undefined) {
- throw new Error("Contact email not found");
- }
-
- resource = context.getDefaultActionResource?.({
- url,
- projectId,
- contactEmail,
- formData,
- });
- }
-
- if (resource === undefined) {
- throw Error("Resource not found");
- }
- const { ok, statusText } = await loadResource(fetch, resource);
- if (ok) {
- return { success: true };
- }
- return { success: false, errors: [statusText] };
- } catch (error) {
- console.error(error);
-
- return {
- success: false,
- errors: [error instanceof Error ? error.message : "Unknown error"],
- };
- }
-};
-
-const Outlet = () => {
- const { system, resources, url, pageMeta, host } =
- useLoaderData<typeof loader>();
- return (
- <ReactSdkContext.Provider
- value={{
- imageLoader,
- assetBaseUrl,
- resources,
- }}
- >
- {/* 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}
- host={host}
- siteName={siteName}
- imageLoader={imageLoader}
- />
- <PageSettingsTitle>{pageMeta.title}</PageSettingsTitle>
- <PageSettingsCanonicalLink href={url} />
- </ReactSdkContext.Provider>
- );
-};
-
-export default Outlet;
diff --git a/fixtures/webstudio-remix-netlify-functions/netlify.toml b/fixtures/webstudio-remix-netlify-functions/netlify.toml
deleted file mode 100644
index 4f3f001c6d..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/netlify.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[build]
-command = "npm run build"
-publish = "build/client"
-
-[dev]
-command = "npm run dev"
-framework = "vite"
-
-# Set immutable caching for static files, because they have fingerprinted filenames
-
-[[headers]]
-for = "/build/*"
-
-[headers.values]
-
-"Cache-Control" = "public, max-age=31560000, immutable"
diff --git a/fixtures/webstudio-remix-netlify-functions/package.json b/fixtures/webstudio-remix-netlify-functions/package.json
deleted file mode 100644
index edf89ad9f9..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/package.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "scripts": {
- "build": "remix vite:build",
- "dev": "remix vite:dev",
- "start": "npx netlify-cli serve",
- "typecheck": "tsc",
- "cli": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio",
- "fixtures:link": "pnpm cli link --link https://p-d845c167-ea07-4875-b08d-83e97c09dcce-dot-${BUILDER_HOST:-main.development.webstudio.is}'?authToken=e9d1343f-9298-4fd3-a66e-f89a5af2dd93'",
- "fixtures:sync": "pnpm cli sync --buildId f565d527-32e7-4731-bc71-aca9e9574587 && pnpm prettier --write ./.webstudio/",
- "fixtures:build": "pnpm cli build --template netlify-functions --template internal && pnpm prettier --write ./app/ ./package.json ./tsconfig.json"
- },
- "dependencies": {
- "@netlify/functions": "^2.8.2",
- "@netlify/remix-adapter": "^2.5.1",
- "@remix-run/node": "2.15.2",
- "@remix-run/react": "2.15.2",
- "@remix-run/server-runtime": "2.15.2",
- "@webstudio-is/image": "workspace:*",
- "@webstudio-is/react-sdk": "workspace:*",
- "@webstudio-is/sdk": "workspace:*",
- "@webstudio-is/sdk-components-animation": "workspace:*",
- "@webstudio-is/sdk-components-react": "workspace:*",
- "@webstudio-is/sdk-components-react-radix": "workspace:*",
- "@webstudio-is/sdk-components-react-remix": "workspace:*",
- "isbot": "^5.1.22",
- "react": "18.3.0-canary-14898b6a9-20240318",
- "react-dom": "18.3.0-canary-14898b6a9-20240318"
- },
- "private": true,
- "sideEffects": false,
- "devDependencies": {
- "@remix-run/dev": "2.15.2",
- "@types/react": "^18.2.70",
- "@types/react-dom": "^18.2.25",
- "typescript": "5.7.3",
- "vite": "^5.4.11",
- "webstudio": "workspace:*"
- },
- "engines": {
- "node": ">=20.0.0"
- },
- "name": "webstudio-remix-netlify-functions",
- "version": "0.0.1",
- "description": "",
- "main": "index.js",
- "keywords": [],
- "author": "",
- "license": "AGPL-3.0-or-later",
- "type": "module"
-}
diff --git a/fixtures/webstudio-remix-netlify-functions/public/assets/147-1478573_cat-icon-png-black-cat-png-icon.png_ZJ6-qJjk1RlFzuYwyCXdp.jpeg b/fixtures/webstudio-remix-netlify-functions/public/assets/147-1478573_cat-icon-png-black-cat-png-icon.png_ZJ6-qJjk1RlFzuYwyCXdp.jpeg
deleted file mode 100644
index 9d5e2b8843..0000000000
Binary files a/fixtures/webstudio-remix-netlify-functions/public/assets/147-1478573_cat-icon-png-black-cat-png-icon.png_ZJ6-qJjk1RlFzuYwyCXdp.jpeg and /dev/null differ
diff --git a/fixtures/webstudio-remix-netlify-functions/public/assets/iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg b/fixtures/webstudio-remix-netlify-functions/public/assets/iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg
deleted file mode 100644
index bc70d3a453..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/public/assets/iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="14" height="16" xmlns="http://www.w3.org/2000/svg"><path d="M4.203.702a.713.713 0 0 0-.366.213c-.124.148-.137.208-.15.672l-.012.431-.443.015c-.481.017-.686.041-.991.117-.651.161-1.273.668-1.586 1.29a2.834 2.834 0 0 0-.252.839c-.038.241-.041.553-.041 4.366 0 4.4-.002 4.323.117 4.784.107.412.325.79.639 1.106.422.426.865.64 1.536.742.255.038.554.041 4.346.041s4.091-.003 4.346-.041c.671-.102 1.114-.316 1.536-.742.314-.316.532-.694.639-1.106.119-.461.117-.384.117-4.784 0-3.813-.003-4.125-.041-4.366a2.834 2.834 0 0 0-.252-.839c-.313-.622-.935-1.129-1.586-1.29-.305-.076-.51-.1-.991-.117l-.443-.015-.012-.431c-.013-.488-.039-.581-.204-.726C9.91.687 9.61.64 9.39.75c-.132.066-.302.249-.339.366a3.432 3.432 0 0 0-.038.5l-.011.414H4.998l-.011-.414a3.432 3.432 0 0 0-.038-.5c-.036-.115-.207-.3-.332-.361a.689.689 0 0 0-.414-.053m2.139 9.442-.007.088-.038-.105a5.451 5.451 0 0 0-.054-.142c-.01-.025.003-.045.039-.061.049-.022.054-.018.06.054a1.15 1.15 0 0 1 0 .166" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/fixtures/webstudio-remix-netlify-functions/public/favicon.ico b/fixtures/webstudio-remix-netlify-functions/public/favicon.ico
deleted file mode 100644
index 9cb8c815dc..0000000000
Binary files a/fixtures/webstudio-remix-netlify-functions/public/favicon.ico and /dev/null differ
diff --git a/fixtures/webstudio-remix-netlify-functions/tsconfig.json b/fixtures/webstudio-remix-netlify-functions/tsconfig.json
deleted file mode 100644
index 99e0e652cc..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "include": ["**/*.ts", "**/*.tsx", "**/*.mjs"],
- "compilerOptions": {
- "lib": ["DOM", "DOM.Iterable", "ESNext"],
- "types": [
- "@remix-run/node",
- "vite/client",
- "@webstudio-is/react-sdk/placeholder"
- ],
- "isolatedModules": true,
- "esModuleInterop": true,
- "jsx": "react-jsx",
- "module": "ESNext",
- "moduleResolution": "bundler",
- "target": "ES2022",
- "strict": true,
- "allowJs": true,
- "forceConsistentCasingInFileNames": true,
- "noEmit": true,
- "skipLibCheck": true,
- "customConditions": ["webstudio"]
- }
-}
diff --git a/fixtures/webstudio-remix-netlify-functions/vite.config.ts b/fixtures/webstudio-remix-netlify-functions/vite.config.ts
deleted file mode 100644
index 2444643720..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/vite.config.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { vitePlugin as remix } from "@remix-run/dev";
-import { defineConfig } from "vite";
-import { netlifyPlugin } from "@netlify/remix-adapter/plugin";
-
-export default defineConfig({
- plugins: [
- remix({
- future: {
- v3_lazyRouteDiscovery: false,
- v3_relativeSplatPath: false,
- v3_singleFetch: false,
- v3_fetcherPersist: false,
- v3_throwAbortReason: false,
- },
- }),
- netlifyPlugin(),
- ],
-});
diff --git a/packages/cli/README.md b/packages/cli/README.md
index b7619352f9..fa7fecec2c 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -129,13 +129,7 @@ You can configure the project to support netlify serverless/edge-functions respe
You can manually change it using the `build` command. For serverless functions:
```bash
-webstudio build --template netlify-functions
-```
-
-and for edge functions:
-
-```bash
-webstudio build --template netlify-edge-functions
+webstudio build --template netlify
```
## Important Notes
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 65c2ae6b8e..a7e44b6ecd 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -31,7 +31,7 @@
"node": ">=20.12"
},
"dependencies": {
- "@clack/prompts": "^0.9.1",
+ "@clack/prompts": "^0.10.0",
"@emotion/hash": "^0.9.2",
"acorn": "^8.14.0",
"acorn-walk": "^8.3.4",
@@ -48,8 +48,6 @@
"zod": "^3.22.4"
},
"devDependencies": {
- "@netlify/remix-adapter": "^2.5.1",
- "@netlify/remix-edge-adapter": "3.4.2",
"@netlify/vite-plugin-react-router": "^1.0.0",
"@react-router/dev": "^7.1.5",
"@react-router/fs-routes": "^7.1.5",
diff --git a/packages/cli/src/commands/init-flow.ts b/packages/cli/src/commands/init-flow.ts
index 407a976dff..8ae81ff797 100644
--- a/packages/cli/src/commands/init-flow.ts
+++ b/packages/cli/src/commands/init-flow.ts
@@ -137,8 +137,6 @@ const getDeploymentInstructions = (
case "vercel":
return `Run ${pc.dim("npx vercel")} to publish on Vercel.`;
case "netlify":
- case "netlify-functions":
- case "netlify-edge-functions":
return [
`To deploy to Netlify, run the following commands: `,
`Run ${pc.dim("npx netlify-cli login")} to login to Netlify.`,
diff --git a/packages/cli/src/config.ts b/packages/cli/src/config.ts
index 693197d94e..2b4fefbbd1 100644
--- a/packages/cli/src/config.ts
+++ b/packages/cli/src/config.ts
@@ -73,16 +73,6 @@ export const PROJECT_TEMPLATES = [
label: "Netlify",
expand: ["react-router", "react-router-netlify"],
},
- {
- value: "netlify-functions" as const,
- label: "Netlify Functions",
- expand: ["defaults", "netlify-functions"],
- },
- {
- value: "netlify-edge-functions" as const,
- label: "Netlify Edge Functions",
- expand: ["defaults", "netlify-edge-functions"],
- },
{
value: "ssg" as const,
label: "Static Site Generation (SSG)",
diff --git a/packages/cli/templates/netlify-edge-functions/app/constants.mjs b/packages/cli/templates/netlify-edge-functions/app/constants.mjs
deleted file mode 100644
index bef2400ae8..0000000000
--- a/packages/cli/templates/netlify-edge-functions/app/constants.mjs
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * We use mjs extension as constants in this file is shared with the build script
- * and we use `node --eval` to extract the constants.
- */
-export const assetBaseUrl = "/assets/";
-
-/**
- * @type {import("@webstudio-is/image").ImageLoader}
- */
-export const imageLoader = (props) => {
- if (process.env.NODE_ENV !== "production") {
- return props.src;
- }
-
- if (props.format === "raw") {
- return props.src;
- }
-
- // https://docs.netlify.com/image-cdn/overview/
- const searchParams = new URLSearchParams();
- searchParams.set("url", props.src);
- searchParams.set("w", props.width.toString());
- if (props.height) {
- searchParams.set("h", props.height.toString());
- }
- searchParams.set("q", props.quality.toString());
- // fit=contain by default
- return `/.netlify/images?${searchParams}`;
-};
diff --git a/packages/cli/templates/netlify-edge-functions/app/entry.server.tsx b/packages/cli/templates/netlify-edge-functions/app/entry.server.tsx
deleted file mode 100644
index fb8ea87098..0000000000
--- a/packages/cli/templates/netlify-edge-functions/app/entry.server.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { EntryContext } from "@remix-run/node";
-import { RemixServer } from "@remix-run/react";
-import { renderToString } from "react-dom/server";
-
-export default function handleRequest(
- request: Request,
- responseStatusCode: number,
- responseHeaders: Headers,
- remixContext: EntryContext
-) {
- const markup = renderToString(
- <RemixServer context={remixContext} url={request.url} />
- );
-
- responseHeaders.set("Content-Type", "text/html");
-
- return new Response("<!DOCTYPE html>" + markup, {
- headers: responseHeaders,
- status: responseStatusCode,
- });
-}
diff --git a/packages/cli/templates/netlify-edge-functions/netlify.toml b/packages/cli/templates/netlify-edge-functions/netlify.toml
deleted file mode 100644
index 4f3f001c6d..0000000000
--- a/packages/cli/templates/netlify-edge-functions/netlify.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[build]
-command = "npm run build"
-publish = "build/client"
-
-[dev]
-command = "npm run dev"
-framework = "vite"
-
-# Set immutable caching for static files, because they have fingerprinted filenames
-
-[[headers]]
-for = "/build/*"
-
-[headers.values]
-
-"Cache-Control" = "public, max-age=31560000, immutable"
diff --git a/packages/cli/templates/netlify-edge-functions/package.json b/packages/cli/templates/netlify-edge-functions/package.json
deleted file mode 100644
index 04629f5a0e..0000000000
--- a/packages/cli/templates/netlify-edge-functions/package.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "scripts": {
- "start": "netlify serve"
- },
- "dependencies": {
- "@netlify/edge-functions": "^2.11.1",
- "@netlify/remix-edge-adapter": "^3.4.2"
- }
-}
diff --git a/packages/cli/templates/netlify-edge-functions/vite.config.ts b/packages/cli/templates/netlify-edge-functions/vite.config.ts
deleted file mode 100644
index e7824dd58d..0000000000
--- a/packages/cli/templates/netlify-edge-functions/vite.config.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { vitePlugin as remix } from "@remix-run/dev";
-import { defineConfig } from "vite";
-import { netlifyPlugin } from "@netlify/remix-edge-adapter/plugin";
-
-export default defineConfig({
- plugins: [
- remix({
- future: {
- v3_lazyRouteDiscovery: false,
- v3_relativeSplatPath: false,
- v3_singleFetch: false,
- v3_fetcherPersist: false,
- v3_throwAbortReason: false,
- },
- }),
- netlifyPlugin(),
- ],
-});
diff --git a/packages/cli/templates/netlify-functions/app/constants.mjs b/packages/cli/templates/netlify-functions/app/constants.mjs
deleted file mode 100644
index bef2400ae8..0000000000
--- a/packages/cli/templates/netlify-functions/app/constants.mjs
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * We use mjs extension as constants in this file is shared with the build script
- * and we use `node --eval` to extract the constants.
- */
-export const assetBaseUrl = "/assets/";
-
-/**
- * @type {import("@webstudio-is/image").ImageLoader}
- */
-export const imageLoader = (props) => {
- if (process.env.NODE_ENV !== "production") {
- return props.src;
- }
-
- if (props.format === "raw") {
- return props.src;
- }
-
- // https://docs.netlify.com/image-cdn/overview/
- const searchParams = new URLSearchParams();
- searchParams.set("url", props.src);
- searchParams.set("w", props.width.toString());
- if (props.height) {
- searchParams.set("h", props.height.toString());
- }
- searchParams.set("q", props.quality.toString());
- // fit=contain by default
- return `/.netlify/images?${searchParams}`;
-};
diff --git a/packages/cli/templates/netlify-functions/app/entry.server.tsx b/packages/cli/templates/netlify-functions/app/entry.server.tsx
deleted file mode 100644
index beacf24084..0000000000
--- a/packages/cli/templates/netlify-functions/app/entry.server.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { handleRequest as default } from "@netlify/remix-adapter";
diff --git a/packages/cli/templates/netlify-functions/netlify.toml b/packages/cli/templates/netlify-functions/netlify.toml
deleted file mode 100644
index 4f3f001c6d..0000000000
--- a/packages/cli/templates/netlify-functions/netlify.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[build]
-command = "npm run build"
-publish = "build/client"
-
-[dev]
-command = "npm run dev"
-framework = "vite"
-
-# Set immutable caching for static files, because they have fingerprinted filenames
-
-[[headers]]
-for = "/build/*"
-
-[headers.values]
-
-"Cache-Control" = "public, max-age=31560000, immutable"
diff --git a/packages/cli/templates/netlify-functions/package.json b/packages/cli/templates/netlify-functions/package.json
deleted file mode 100644
index 6de9191f26..0000000000
--- a/packages/cli/templates/netlify-functions/package.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "scripts": {
- "start": "npx netlify-cli serve"
- },
- "dependencies": {
- "@netlify/functions": "^2.8.2",
- "@netlify/remix-adapter": "^2.5.1"
- }
-}
diff --git a/packages/cli/templates/netlify-functions/vite.config.ts b/packages/cli/templates/netlify-functions/vite.config.ts
deleted file mode 100644
index 2444643720..0000000000
--- a/packages/cli/templates/netlify-functions/vite.config.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { vitePlugin as remix } from "@remix-run/dev";
-import { defineConfig } from "vite";
-import { netlifyPlugin } from "@netlify/remix-adapter/plugin";
-
-export default defineConfig({
- plugins: [
- remix({
- future: {
- v3_lazyRouteDiscovery: false,
- v3_relativeSplatPath: false,
- v3_singleFetch: false,
- v3_fetcherPersist: false,
- v3_throwAbortReason: false,
- },
- }),
- netlifyPlugin(),
- ],
-});
diff --git a/packages/sdk/src/schema/deployment.ts b/packages/sdk/src/schema/deployment.ts
index 64413be5d4..42047fb857 100644
--- a/packages/sdk/src/schema/deployment.ts
+++ b/packages/sdk/src/schema/deployment.ts
@@ -5,8 +5,6 @@ export const Templates = z.enum([
"docker",
"vercel",
"netlify",
- "netlify-functions",
- "netlify-edge-functions",
"ssg",
"ssg-netlify",
"ssg-vercel",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8637653806..1aa40b1c28 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -925,140 +925,6 @@ importers:
specifier: 5.7.3
version: 5.7.3
- fixtures/webstudio-remix-netlify-edge-functions:
- dependencies:
- '@netlify/edge-functions':
- specifier: ^2.11.1
- version: 2.11.1
- '@netlify/remix-edge-adapter':
- specifier: ^3.4.2
- '@remix-run/node':
- specifier: 2.15.2
- version: 2.15.2([email protected])
- '@remix-run/react':
- specifier: 2.15.2
- '@remix-run/server-runtime':
- specifier: 2.15.2
- version: 2.15.2([email protected])
- '@webstudio-is/image':
- specifier: workspace:*
- version: link:../../packages/image
- '@webstudio-is/react-sdk':
- specifier: workspace:*
- version: link:../../packages/react-sdk
- '@webstudio-is/sdk':
- specifier: workspace:*
- version: link:../../packages/sdk
- '@webstudio-is/sdk-components-animation':
- specifier: workspace:*
- version: link:../../packages/sdk-components-animation
- '@webstudio-is/sdk-components-react':
- specifier: workspace:*
- version: link:../../packages/sdk-components-react
- '@webstudio-is/sdk-components-react-radix':
- specifier: workspace:*
- version: link:../../packages/sdk-components-react-radix
- '@webstudio-is/sdk-components-react-remix':
- specifier: workspace:*
- version: link:../../packages/sdk-components-react-remix
- isbot:
- specifier: ^5.1.22
- version: 5.1.22
- react:
- specifier: 18.3.0-canary-14898b6a9-20240318
- version: 18.3.0-canary-14898b6a9-20240318
- react-dom:
- specifier: 18.3.0-canary-14898b6a9-20240318
- version: 18.3.0-canary-14898b6a9-20240318([email protected])
- devDependencies:
- '@remix-run/dev':
- specifier: 2.15.2
- '@types/react':
- specifier: ^18.2.70
- version: 18.2.79
- '@types/react-dom':
- specifier: ^18.2.25
- version: 18.2.25
- typescript:
- specifier: 5.7.3
- version: 5.7.3
- vite:
- specifier: ^5.4.11
- version: 5.4.11(@types/[email protected])
- webstudio:
- specifier: workspace:*
- version: link:../../packages/cli
-
- fixtures/webstudio-remix-netlify-functions:
- dependencies:
- '@netlify/functions':
- specifier: ^2.8.2
- version: 2.8.2
- '@netlify/remix-adapter':
- specifier: ^2.5.1
- '@remix-run/node':
- specifier: 2.15.2
- version: 2.15.2([email protected])
- '@remix-run/react':
- specifier: 2.15.2
- '@remix-run/server-runtime':
- specifier: 2.15.2
- version: 2.15.2([email protected])
- '@webstudio-is/image':
- specifier: workspace:*
- version: link:../../packages/image
- '@webstudio-is/react-sdk':
- specifier: workspace:*
- version: link:../../packages/react-sdk
- '@webstudio-is/sdk':
- specifier: workspace:*
- version: link:../../packages/sdk
- '@webstudio-is/sdk-components-animation':
- specifier: workspace:*
- version: link:../../packages/sdk-components-animation
- '@webstudio-is/sdk-components-react':
- specifier: workspace:*
- version: link:../../packages/sdk-components-react
- '@webstudio-is/sdk-components-react-radix':
- specifier: workspace:*
- version: link:../../packages/sdk-components-react-radix
- '@webstudio-is/sdk-components-react-remix':
- specifier: workspace:*
- version: link:../../packages/sdk-components-react-remix
- isbot:
- specifier: ^5.1.22
- version: 5.1.22
- react:
- specifier: 18.3.0-canary-14898b6a9-20240318
- version: 18.3.0-canary-14898b6a9-20240318
- react-dom:
- specifier: 18.3.0-canary-14898b6a9-20240318
- version: 18.3.0-canary-14898b6a9-20240318([email protected])
- devDependencies:
- '@remix-run/dev':
- specifier: 2.15.2
- '@types/react':
- specifier: ^18.2.70
- version: 18.2.79
- '@types/react-dom':
- specifier: ^18.2.25
- version: 18.2.25
- typescript:
- specifier: 5.7.3
- version: 5.7.3
- vite:
- specifier: ^5.4.11
- version: 5.4.11(@types/[email protected])
- webstudio:
- specifier: workspace:*
- version: link:../../packages/cli
-
packages/ai:
dependencies:
'@webstudio-is/css-data':
@@ -1170,8 +1036,8 @@ importers:
packages/cli:
dependencies:
'@clack/prompts':
- specifier: ^0.9.1
- version: 0.9.1
+ specifier: ^0.10.0
+ version: 0.10.0
'@emotion/hash':
specifier: ^0.9.2
version: 0.9.2
@@ -1215,12 +1081,6 @@ importers:
specifier: ^3.22.4
version: 3.22.4
devDependencies:
- '@netlify/remix-adapter':
- specifier: ^2.5.1
- '@netlify/remix-edge-adapter':
- specifier: 3.4.2
'@netlify/vite-plugin-react-router':
specifier: ^1.0.0
@@ -2555,8 +2415,8 @@ packages:
resolution: {integrity: sha512-Pxhij4UXg8KSr7rPek6Zowm+5M22rbd2g1nfojHJkxp5YkFqiZ2+YLEM/XGVIzvGOcM0nqjIFxrpDwWRZYWYjA==}
- '@clack/[email protected]':
- resolution: {integrity: sha512-JIpyaboYZeWYlyP0H+OoPPxd6nqueG/CmN6ixBiNFsIDHREevjIf0n0Ohh5gr5C8pEDknzgvz+pIJ8dMhzWIeg==}
+ '@clack/[email protected]':
+ resolution: {integrity: sha512-H3rCl6CwW1NdQt9rE3n373t7o5cthPv7yUoxF2ytZvyvlJv89C5RYMJu83Hed8ODgys5vpBU0GKxIRG83jd8NQ==}
'@cloudflare/[email protected]':
resolution: {integrity: sha512-FNcunDuTmEfQTLRLtA6zz+buIXUHj1soPvSWzzQFBC+n2lsy+CGf/NIrR3SEPCmsVNQj70/Jx2lViCpq+09YpQ==}
@@ -3882,46 +3742,6 @@ packages:
nanostores: ^0.9.0 || ^0.10.0 || ^0.11.0
react: 18.3.0-canary-14898b6a9-20240318
- '@netlify/[email protected]':
- resolution: {integrity: sha512-pyQOTZ8a+ge5lZlE+H/UAHyuqQqtL5gE0pXrHT9mOykr3YQqnkB2hZMtx12odatZ87gHg4EA+UPyMZUbLfnXvw==}
-
- '@netlify/[email protected]':
- resolution: {integrity: sha512-DeoAQh8LuNPvBE4qsKlezjKj0PyXDryOFJfJKo3Z1qZLKzQ21sT314KQKPVjfvw6knqijj+IO+0kHXy/TJiqNA==}
- engines: {node: '>=14.0.0'}
-
- '@netlify/[email protected]':
- resolution: {integrity: sha512-OAs1xG+FfLX0LoRASpqzVntVV/RpYkgpI0VrUnw2u0Q1qiZUzcPffxRK8HF3gc4GjuhG5ahOEMJ9bswBiZPq0g==}
- engines: {node: ^14.16.0 || >=16.0.0}
-
- '@netlify/[email protected]':
- resolution: {integrity: sha512-VGMLYWqelmcYTpqlyjqgw52xXSQOWe8ApHh4smo/VmaO1TqstFr2VBJN9iSZsXdRvU0Gx9im6r6uziXRnis2sQ==}
- engines: {node: '>=18'}
- peerDependencies:
- '@netlify/functions': ^2.8.1
- vite: ^5.0.0
- peerDependenciesMeta:
- vite:
- optional: true
-
- '@netlify/[email protected]':
- resolution: {integrity: sha512-zapovr1o/SecEzsrpSqsCvmT0NahhjEybm59W71LqOM9ZDvvOslUwnNtV1pqj75oJfR0xO6GYbcIwujCZj40xQ==}
- engines: {node: '>=16.0.0'}
- peerDependencies:
- vite: ^5.0.0
- peerDependenciesMeta:
- vite:
- optional: true
-
- '@netlify/[email protected]':
- resolution: {integrity: sha512-5gVnFavbyzUTW8U8+XeLQjh/NhktiLpauaxH0Oh6r66WOXrDYFi8/QWxdcOhb6WRomYidnxTeNrxQDUp59Vplg==}
- engines: {node: '>=18'}
- peerDependencies:
- '@remix-run/server-runtime': ^2.9.2
-
- '@netlify/[email protected]':
- resolution: {integrity: sha512-q3L9i3HoNfz0SGpTIS4zTcKBbRkxzCRpd169eyiTuk3IwcPC3/85mzLHranlKo2b+HYT0gu37YxGB45aD8A3Tw==}
- engines: {node: '>=18.0.0'}
-
'@netlify/[email protected]':
resolution: {integrity: sha512-J9xzn2Gdehg3LSEXFrpXLjQm2T2HQEnnlbTH7Ic9mjaz9rwkRmgwbYBn9h5SexQ0mV82jZjhvneblL8VPKiUtQ==}
engines: {node: '>=18'}
@@ -9309,9 +9129,6 @@ packages:
resolution: {integrity: sha512-DOE84vZT2fEcl9gqCUTcnAw5ZY5Id55ikUcziSUntuEFL3pRvavg5kwDmTEUJkeCHInTlV/HexFomgYnzO5kdQ==}
- resolution: {integrity: sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ==}
-
resolution: {integrity: sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==}
engines: {node: '>=10'}
@@ -10018,7 +9835,7 @@ snapshots:
picocolors: 1.1.1
sisteransi: 1.0.5
- '@clack/[email protected]':
+ '@clack/[email protected]':
dependencies:
'@clack/core': 0.4.1
picocolors: 1.1.1
@@ -11053,61 +10870,6 @@ snapshots:
nanostores: 0.11.3
react: 18.3.0-canary-14898b6a9-20240318
- '@netlify/[email protected]': {}
-
- '@netlify/[email protected]':
- dependencies:
- '@netlify/serverless-functions-api': 1.26.1
-
- '@netlify/[email protected]': {}
-
- dependencies:
- '@netlify/functions': 2.8.2
- '@remix-run/node': 2.15.2([email protected])
- isbot: 5.1.22
- optionalDependencies:
- vite: 5.4.11(@types/[email protected])
- transitivePeerDependencies:
- - typescript
-
- dependencies:
- '@netlify/remix-runtime': 2.3.1(@remix-run/[email protected]([email protected]))
- isbot: 5.1.22
- optionalDependencies:
- vite: 5.4.11(@types/[email protected])
- transitivePeerDependencies:
- - '@remix-run/react'
- - '@remix-run/serve'
- - '@remix-run/server-runtime'
- - '@types/node'
- - babel-plugin-macros
- - bluebird
- - bufferutil
- - less
- - lightningcss
- - sass
- - sass-embedded
- - stylus
- - sugarss
- - supports-color
- - terser
- - ts-node
- - typescript
- - utf-8-validate
- - wrangler
-
- dependencies:
- '@remix-run/server-runtime': 2.15.2([email protected])
-
- '@netlify/[email protected]':
- dependencies:
- '@netlify/node-cookies': 0.1.0
- urlpattern-polyfill: 8.0.2
-
dependencies:
@@ -17432,8 +17194,6 @@ snapshots:
-
dependencies:
react: 18.3.0-canary-14898b6a9-20240318