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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
Add fixtures (#2254)
Ivan Starkov08b0bfad5d35
diff --git a/fixtures/webstudio-remix-vercel/.webstudio/config.json b/fixtures/webstudio-remix-vercel/.webstudio/config.jsonnew file mode 100644index 0000000000..9a95b5fb16--- /dev/null+++ b/fixtures/webstudio-remix-vercel/.webstudio/config.json@@ -0,0 +1,3 @@+{+ "projectId": "cddc1d44-af37-4cb6-a430-d300cf6f932d"+}diff --git a/fixtures/webstudio-remix-vercel/.webstudio/data.json b/fixtures/webstudio-remix-vercel/.webstudio/data.jsonnew file mode 100644index 0000000000..859e7d4425--- /dev/null+++ b/fixtures/webstudio-remix-vercel/.webstudio/data.json@@ -0,0 +1,536 @@+{+ "build": {+ "id": "d8e941cb-835b-4f1f-bf8b-4d546a2a67d8",+ "projectId": "cddc1d44-af37-4cb6-a430-d300cf6f932d",+ "version": 41,+ "createdAt": "2023-09-06T11:37:11.556Z",+ "pages": {+ "homePage": {+ "id": "7Db64ZXgYiRqKSQNR-qTQ",+ "name": "Home",+ "title": "Home",+ "meta": {},+ "rootInstanceId": "On9cvWCxr5rdZtY9O1Bv0",+ "path": ""+ },+ "pages": []+ },+ "breakpoints": [+ [+ "UoTkWyaFuTYJihS3MFYK5",+ {+ "id": "UoTkWyaFuTYJihS3MFYK5",+ "label": "Base"+ }+ ],+ [+ "jnlRbFOGvyVBkD8nD2tmp",+ {+ "id": "jnlRbFOGvyVBkD8nD2tmp",+ "label": "Tablet",+ "maxWidth": 991+ }+ ],+ [+ "MzzTm3ImEoIPYnDNKIxdq",+ {+ "id": "MzzTm3ImEoIPYnDNKIxdq",+ "label": "Mobile landscape",+ "maxWidth": 767+ }+ ],+ [+ "e0fdu38A26zqOx-ZyQMP9",+ {+ "id": "e0fdu38A26zqOx-ZyQMP9",+ "label": "Mobile portrait",+ "maxWidth": 479+ }+ ]+ ],+ "styles": [+ [+ "y3sBN2gB0KCBXkheM6GMm:UoTkWyaFuTYJihS3MFYK5:fontSize:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "y3sBN2gB0KCBXkheM6GMm",+ "property": "fontSize",+ "value": {+ "type": "unit",+ "unit": "em",+ "value": 4+ }+ }+ ],+ [+ "NeVTA8c7vqOjhHotkd0Dv:UoTkWyaFuTYJihS3MFYK5:display:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "NeVTA8c7vqOjhHotkd0Dv",+ "property": "display",+ "value": {+ "type": "keyword",+ "value": "flex"+ }+ }+ ],+ [+ "NeVTA8c7vqOjhHotkd0Dv:UoTkWyaFuTYJihS3MFYK5:justifyContent:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "NeVTA8c7vqOjhHotkd0Dv",+ "property": "justifyContent",+ "value": {+ "type": "keyword",+ "value": "center"+ }+ }+ ],+ [+ "ureLSWiLGOYeWpki2JUeu:UoTkWyaFuTYJihS3MFYK5:minWidth:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "ureLSWiLGOYeWpki2JUeu",+ "property": "minWidth",+ "value": {+ "type": "unit",+ "unit": "px",+ "value": 0+ }+ }+ ],+ [+ "7HeiD-PCsn4VW6_fz5Skr:UoTkWyaFuTYJihS3MFYK5:minWidth:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "7HeiD-PCsn4VW6_fz5Skr",+ "property": "minWidth",+ "value": {+ "type": "unit",+ "unit": "px",+ "value": 0+ }+ }+ ],+ [+ "ureLSWiLGOYeWpki2JUeu:UoTkWyaFuTYJihS3MFYK5:flexGrow:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "ureLSWiLGOYeWpki2JUeu",+ "property": "flexGrow",+ "value": {+ "type": "unit",+ "value": 1,+ "unit": "number"+ }+ }+ ],+ [+ "ureLSWiLGOYeWpki2JUeu:UoTkWyaFuTYJihS3MFYK5:flexShrink:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "ureLSWiLGOYeWpki2JUeu",+ "property": "flexShrink",+ "value": {+ "type": "unit",+ "value": 0,+ "unit": "number"+ }+ }+ ],+ [+ "7HeiD-PCsn4VW6_fz5Skr:UoTkWyaFuTYJihS3MFYK5:flexGrow:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "7HeiD-PCsn4VW6_fz5Skr",+ "property": "flexGrow",+ "value": {+ "type": "unit",+ "value": 1,+ "unit": "number"+ }+ }+ ],+ [+ "7HeiD-PCsn4VW6_fz5Skr:UoTkWyaFuTYJihS3MFYK5:flexShrink:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "7HeiD-PCsn4VW6_fz5Skr",+ "property": "flexShrink",+ "value": {+ "type": "unit",+ "value": 0,+ "unit": "number"+ }+ }+ ],+ [+ "ureLSWiLGOYeWpki2JUeu:UoTkWyaFuTYJihS3MFYK5:flexBasis:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "ureLSWiLGOYeWpki2JUeu",+ "property": "flexBasis",+ "value": {+ "type": "unit",+ "unit": "px",+ "value": 0+ }+ }+ ],+ [+ "7HeiD-PCsn4VW6_fz5Skr:UoTkWyaFuTYJihS3MFYK5:flexBasis:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "7HeiD-PCsn4VW6_fz5Skr",+ "property": "flexBasis",+ "value": {+ "type": "unit",+ "unit": "px",+ "value": 0+ }+ }+ ],+ [+ "NeVTA8c7vqOjhHotkd0Dv:UoTkWyaFuTYJihS3MFYK5:alignItems:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "NeVTA8c7vqOjhHotkd0Dv",+ "property": "alignItems",+ "value": {+ "type": "keyword",+ "value": "start"+ }+ }+ ],+ [+ "8VVhDFG7dmCfwcwD4DH8D:UoTkWyaFuTYJihS3MFYK5:aspectRatio:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "8VVhDFG7dmCfwcwD4DH8D",+ "property": "aspectRatio",+ "value": {+ "type": "unit",+ "unit": "number",+ "value": 1+ }+ }+ ],+ [+ "_t7PW0R2Naz9Zy7J1f8eQ:UoTkWyaFuTYJihS3MFYK5:paddingTop:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "_t7PW0R2Naz9Zy7J1f8eQ",+ "property": "paddingTop",+ "value": {+ "type": "unit",+ "unit": "px",+ "value": 16+ }+ }+ ],+ [+ "_t7PW0R2Naz9Zy7J1f8eQ:UoTkWyaFuTYJihS3MFYK5:paddingRight:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "_t7PW0R2Naz9Zy7J1f8eQ",+ "property": "paddingRight",+ "value": {+ "type": "unit",+ "unit": "px",+ "value": 16+ }+ }+ ],+ [+ "_t7PW0R2Naz9Zy7J1f8eQ:UoTkWyaFuTYJihS3MFYK5:paddingLeft:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "_t7PW0R2Naz9Zy7J1f8eQ",+ "property": "paddingLeft",+ "value": {+ "type": "unit",+ "unit": "px",+ "value": 16+ }+ }+ ],+ [+ "_t7PW0R2Naz9Zy7J1f8eQ:UoTkWyaFuTYJihS3MFYK5:paddingBottom:",+ {+ "breakpointId": "UoTkWyaFuTYJihS3MFYK5",+ "styleSourceId": "_t7PW0R2Naz9Zy7J1f8eQ",+ "property": "paddingBottom",+ "value": {+ "type": "unit",+ "unit": "px",+ "value": 16+ }+ }+ ]+ ],+ "styleSources": [+ [+ "y3sBN2gB0KCBXkheM6GMm",+ {+ "type": "local",+ "id": "y3sBN2gB0KCBXkheM6GMm"+ }+ ],+ [+ "NeVTA8c7vqOjhHotkd0Dv",+ {+ "type": "local",+ "id": "NeVTA8c7vqOjhHotkd0Dv"+ }+ ],+ [+ "ureLSWiLGOYeWpki2JUeu",+ {+ "type": "local",+ "id": "ureLSWiLGOYeWpki2JUeu"+ }+ ],+ [+ "7HeiD-PCsn4VW6_fz5Skr",+ {+ "type": "local",+ "id": "7HeiD-PCsn4VW6_fz5Skr"+ }+ ],+ [+ "8VVhDFG7dmCfwcwD4DH8D",+ {+ "type": "local",+ "id": "8VVhDFG7dmCfwcwD4DH8D"+ }+ ],+ [+ "_t7PW0R2Naz9Zy7J1f8eQ",+ {+ "type": "local",+ "id": "_t7PW0R2Naz9Zy7J1f8eQ"+ }+ ]+ ],+ "styleSourceSelections": [+ [+ "nVMWvMsaLCcb0o1wuNQgg",+ {+ "instanceId": "nVMWvMsaLCcb0o1wuNQgg",+ "values": ["y3sBN2gB0KCBXkheM6GMm"]+ }+ ],+ [+ "f0kF-WmL7DQg7MSyRvqY1",+ {+ "instanceId": "f0kF-WmL7DQg7MSyRvqY1",+ "values": ["NeVTA8c7vqOjhHotkd0Dv"]+ }+ ],+ [+ "5XDbqPrZDeCwq4YJ3CHsc",+ {+ "instanceId": "5XDbqPrZDeCwq4YJ3CHsc",+ "values": ["ureLSWiLGOYeWpki2JUeu"]+ }+ ],+ [+ "qPnkiFGDj8dITWb1kmpGl",+ {+ "instanceId": "qPnkiFGDj8dITWb1kmpGl",+ "values": ["7HeiD-PCsn4VW6_fz5Skr"]+ }+ ],+ [+ "pX1ovPI7NdC0HRjkw6Kpw",+ {+ "instanceId": "pX1ovPI7NdC0HRjkw6Kpw",+ "values": ["8VVhDFG7dmCfwcwD4DH8D"]+ }+ ],+ [+ "On9cvWCxr5rdZtY9O1Bv0",+ {+ "instanceId": "On9cvWCxr5rdZtY9O1Bv0",+ "values": ["_t7PW0R2Naz9Zy7J1f8eQ"]+ }+ ]+ ],+ "props": [+ [+ "rTRZFZEd03RBH4gUWj9LW",+ {+ "id": "rTRZFZEd03RBH4gUWj9LW",+ "instanceId": "pX1ovPI7NdC0HRjkw6Kpw",+ "name": "src",+ "type": "asset",+ "value": "cd939c56-bcdd-4e64-bd9c-567a9bccd3da"+ }+ ]+ ],+ "dataSources": [],+ "instances": [+ [+ "On9cvWCxr5rdZtY9O1Bv0",+ {+ "type": "instance",+ "id": "On9cvWCxr5rdZtY9O1Bv0",+ "component": "Body",+ "children": [+ {+ "type": "id",+ "value": "nVMWvMsaLCcb0o1wuNQgg"+ },+ {+ "type": "id",+ "value": "f0kF-WmL7DQg7MSyRvqY1"+ }+ ]+ }+ ],+ [+ "nVMWvMsaLCcb0o1wuNQgg",+ {+ "type": "instance",+ "id": "nVMWvMsaLCcb0o1wuNQgg",+ "component": "Heading",+ "children": [+ {+ "type": "text",+ "value": "DO NOT TOUCH THIS PROJECT, IT'S USED FOR FIXTURES"+ }+ ]+ }+ ],+ [+ "f0kF-WmL7DQg7MSyRvqY1",+ {+ "type": "instance",+ "id": "f0kF-WmL7DQg7MSyRvqY1",+ "component": "Box",+ "children": [+ {+ "type": "id",+ "value": "5XDbqPrZDeCwq4YJ3CHsc"+ },+ {+ "type": "id",+ "value": "qPnkiFGDj8dITWb1kmpGl"+ }+ ]+ }+ ],+ [+ "5XDbqPrZDeCwq4YJ3CHsc",+ {+ "type": "instance",+ "id": "5XDbqPrZDeCwq4YJ3CHsc",+ "component": "Box",+ "children": [+ {+ "type": "id",+ "value": "oLXYe1UQiVMhVnZGvJSMr"+ },+ {+ "type": "id",+ "value": "p34JHWcU6UNrd9FVnY80Q"+ }+ ]+ }+ ],+ [+ "qPnkiFGDj8dITWb1kmpGl",+ {+ "type": "instance",+ "id": "qPnkiFGDj8dITWb1kmpGl",+ "component": "Box",+ "children": [+ {+ "type": "id",+ "value": "pX1ovPI7NdC0HRjkw6Kpw"+ }+ ]+ }+ ],+ [+ "oLXYe1UQiVMhVnZGvJSMr",+ {+ "type": "instance",+ "id": "oLXYe1UQiVMhVnZGvJSMr",+ "component": "Heading",+ "children": [+ {+ "type": "text",+ "value": "Heading"+ }+ ]+ }+ ],+ [+ "p34JHWcU6UNrd9FVnY80Q",+ {+ "type": "instance",+ "id": "p34JHWcU6UNrd9FVnY80Q",+ "component": "Paragraph",+ "children": [+ {+ "type": "text",+ "value": "a little kitten painted in black and white gouache with a thick brush"+ }+ ]+ }+ ],+ [+ "pX1ovPI7NdC0HRjkw6Kpw",+ {+ "type": "instance",+ "id": "pX1ovPI7NdC0HRjkw6Kpw",+ "component": "Image",+ "children": []+ }+ ]+ ],+ "deployment": {+ "domains": [],+ "projectDomain": "webstudio-fixture-project-a-0su3o"+ }+ },+ "page": {+ "id": "7Db64ZXgYiRqKSQNR-qTQ",+ "name": "Home",+ "title": "Home",+ "meta": {},+ "rootInstanceId": "On9cvWCxr5rdZtY9O1Bv0",+ "path": ""+ },+ "pages": [+ {+ "id": "7Db64ZXgYiRqKSQNR-qTQ",+ "name": "Home",+ "title": "Home",+ "meta": {},+ "rootInstanceId": "On9cvWCxr5rdZtY9O1Bv0",+ "path": ""+ }+ ],+ "assets": [+ {+ "id": "cd939c56-bcdd-4e64-bd9c-567a9bccd3da",+ "name": "_937084ed-a798-49fe-8664-df93a2af605e_uiBk3o6UWdqolyakMvQJ9.jpeg",+ "description": null,+ "projectId": "cddc1d44-af37-4cb6-a430-d300cf6f932d",+ "size": 210614,+ "type": "image",+ "format": "jpeg",+ "createdAt": "2023-09-06T11:28:43.031Z",+ "meta": {+ "width": 1024,+ "height": 1024+ }+ }+ ],+ "user": {+ "email": "[email protected]"+ },+ "projectDomain": "webstudio-fixture-project-a-0su3o"+}diff --git a/fixtures/webstudio-remix-vercel/README.md b/fixtures/webstudio-remix-vercel/README.mdnew file mode 100644index 0000000000..6b6d12af60--- /dev/null+++ b/fixtures/webstudio-remix-vercel/README.md@@ -0,0 +1,21 @@+# Fixture to test/play with @webstudio/cli++## How to develop++```bash+# Terminal 1+cd packages/webstudio-cli+pnpm dev+```++```bash+# Terminal 2+pnpm webstudio link+# add following link https://webstudio-builder-git-main-webstudio-is.vercel.app/builder/cddc1d44-af37-4cb6-a430-d300cf6f932d?authToken=1cdc6026-dd5b-4624-b89b-9bd45e9bcc3d&mode=preview++pnpm webstudio sync+# data.json generated++pnpm webstudio build --preview && pnpm prettier --write ./app/+# exec `pnpm run dev` to see result+```diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsxnew file mode 100644index 0000000000..73f3ecfe87--- /dev/null+++ b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx@@ -0,0 +1,231 @@+/* eslint-disable */+/* This is a auto generated file for building the project */++import * as sdk from "@webstudio-is/react-sdk";+import type { PageData } from "~/routes/_index";+import type { Components } from "@webstudio-is/react-sdk";+import type { Asset } from "@webstudio-is/sdk";++import {+ Body as Body_0,+ Heading as Heading_0,+ Box as Box_0,+ Paragraph as Paragraph_0,+ Image as Image_0,+} from "@webstudio-is/sdk-components-react";+import * as remixComponents from "@webstudio-is/sdk-components-react-remix";+export const components = new Map(+ Object.entries(+ Object.assign(+ {+ Body: Body_0,+ Heading: Heading_0,+ Box: Box_0,+ Paragraph: Paragraph_0,+ Image: Image_0,+ },+ remixComponents+ )+ )+) as Components;+export const fontAssets: Asset[] = [];+export const pageData: PageData = {+ build: {+ props: [+ [+ "rTRZFZEd03RBH4gUWj9LW",+ {+ id: "rTRZFZEd03RBH4gUWj9LW",+ instanceId: "pX1ovPI7NdC0HRjkw6Kpw",+ name: "src",+ type: "asset",+ value: "cd939c56-bcdd-4e64-bd9c-567a9bccd3da",+ },+ ],+ ],+ instances: [+ [+ "On9cvWCxr5rdZtY9O1Bv0",+ {+ type: "instance",+ id: "On9cvWCxr5rdZtY9O1Bv0",+ component: "Body",+ children: [+ { type: "id", value: "nVMWvMsaLCcb0o1wuNQgg" },+ { type: "id", value: "f0kF-WmL7DQg7MSyRvqY1" },+ ],+ },+ ],+ [+ "nVMWvMsaLCcb0o1wuNQgg",+ {+ type: "instance",+ id: "nVMWvMsaLCcb0o1wuNQgg",+ component: "Heading",+ children: [+ {+ type: "text",+ value: "DO NOT TOUCH THIS PROJECT, IT'S USED FOR FIXTURES",+ },+ ],+ },+ ],+ [+ "f0kF-WmL7DQg7MSyRvqY1",+ {+ type: "instance",+ id: "f0kF-WmL7DQg7MSyRvqY1",+ component: "Box",+ children: [+ { type: "id", value: "5XDbqPrZDeCwq4YJ3CHsc" },+ { type: "id", value: "qPnkiFGDj8dITWb1kmpGl" },+ ],+ },+ ],+ [+ "5XDbqPrZDeCwq4YJ3CHsc",+ {+ type: "instance",+ id: "5XDbqPrZDeCwq4YJ3CHsc",+ component: "Box",+ children: [+ { type: "id", value: "oLXYe1UQiVMhVnZGvJSMr" },+ { type: "id", value: "p34JHWcU6UNrd9FVnY80Q" },+ ],+ },+ ],+ [+ "qPnkiFGDj8dITWb1kmpGl",+ {+ type: "instance",+ id: "qPnkiFGDj8dITWb1kmpGl",+ component: "Box",+ children: [{ type: "id", value: "pX1ovPI7NdC0HRjkw6Kpw" }],+ },+ ],+ [+ "oLXYe1UQiVMhVnZGvJSMr",+ {+ type: "instance",+ id: "oLXYe1UQiVMhVnZGvJSMr",+ component: "Heading",+ children: [{ type: "text", value: "Heading" }],+ },+ ],+ [+ "p34JHWcU6UNrd9FVnY80Q",+ {+ type: "instance",+ id: "p34JHWcU6UNrd9FVnY80Q",+ component: "Paragraph",+ children: [+ {+ type: "text",+ value:+ "a little kitten painted in black and white gouache with a thick brush",+ },+ ],+ },+ ],+ [+ "pX1ovPI7NdC0HRjkw6Kpw",+ {+ type: "instance",+ id: "pX1ovPI7NdC0HRjkw6Kpw",+ component: "Image",+ children: [],+ },+ ],+ ],+ dataSources: [],+ },+ pages: [+ {+ id: "7Db64ZXgYiRqKSQNR-qTQ",+ name: "Home",+ title: "Home",+ meta: {},+ rootInstanceId: "On9cvWCxr5rdZtY9O1Bv0",+ path: "",+ },+ ],+ page: {+ id: "7Db64ZXgYiRqKSQNR-qTQ",+ name: "Home",+ title: "Home",+ meta: {},+ rootInstanceId: "On9cvWCxr5rdZtY9O1Bv0",+ path: "",+ },+ assets: [+ {+ id: "cd939c56-bcdd-4e64-bd9c-567a9bccd3da",+ name: "_937084ed-a798-49fe-8664-df93a2af605e_uiBk3o6UWdqolyakMvQJ9.jpeg",+ description: null,+ projectId: "cddc1d44-af37-4cb6-a430-d300cf6f932d",+ size: 210614,+ type: "image",+ format: "jpeg",+ createdAt: "2023-09-06T11:28:43.031Z",+ meta: { width: 1024, height: 1024 },+ },+ ],+};+export const user: { email: string | null } | undefined = {+ email: "[email protected]",+};+export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";++/* eslint-disable */++const indexesWithinAncestors = new Map<string, number>([]);++const rawExecuteComputingExpressions = (+ _variables: Map<string, unknown>+): Map<string, unknown> => {+ return new Map([]);+};+const executeComputingExpressions = (variables: Map<string, unknown>) => {+ const encodedvariables = sdk.encodeVariablesMap(variables);+ const encodedResult = rawExecuteComputingExpressions(encodedvariables);+ return sdk.decodeVariablesMap(encodedResult);+};++const generatedEffectfulExpressions = new Map<+ string,+ (args: Map<string, any>, variables: Map<string, any>) => Map<string, unknown>+>([]);++const rawExecuteEffectfulExpression = (+ code: string,+ args: Map<string, unknown>,+ variables: Map<string, unknown>+): Map<string, unknown> => {+ if (generatedEffectfulExpressions.has(code)) {+ return generatedEffectfulExpressions.get(code)!(args, variables);+ }+ console.error("Effectful expression not found", code);+ throw new Error("Effectful expression not found");+};++const executeEffectfulExpression = (+ code: string,+ args: Map<string, unknown>,+ variables: Map<string, unknown>+) => {+ const encodedvariables = sdk.encodeVariablesMap(variables);+ const encodedResult = rawExecuteEffectfulExpression(+ code,+ args,+ encodedvariables+ );+ return sdk.decodeVariablesMap(encodedResult);+};++export const utils = {+ indexesWithinAncestors,+ executeComputingExpressions,+ executeEffectfulExpression,+};++/* eslint-enable */diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/index.css b/fixtures/webstudio-remix-vercel/app/__generated__/index.cssnew file mode 100644index 0000000000..8ceef24d08--- /dev/null+++ b/fixtures/webstudio-remix-vercel/app/__generated__/index.css@@ -0,0 +1,1018 @@+html {+ margin: 0;+ display: grid;+ min-height: 100%;+}+@media all {+ blockquote:where([data-ws-component="Blockquote"]) {+ margin-top: 0;+ margin-right: 0;+ margin-bottom: 10px;+ margin-left: 0;+ padding-top: 10px;+ padding-bottom: 10px;+ padding-left: 20px;+ padding-right: 20px;+ border-left-width: 5px;+ border-left-style: solid;+ border-left-color: rgba(226, 226, 226, 1);+ }+ body:where([data-ws-component="Body"]) {+ margin-top: 0;+ margin-right: 0;+ margin-bottom: 0;+ margin-left: 0;+ font-family: Arial, Roboto, sans-serif;+ font-size: 16px;+ line-height: 1.2;+ 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;+ }+ b:where([data-ws-component="Bold"]) {+ font-weight: 700;+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ }+ div:where([data-ws-component="Box"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ address:where([data-ws-component="Box"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ article:where([data-ws-component="Box"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ aside:where([data-ws-component="Box"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ figure:where([data-ws-component="Box"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ footer:where([data-ws-component="Box"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ header:where([data-ws-component="Box"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ main:where([data-ws-component="Box"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ nav:where([data-ws-component="Box"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ section:where([data-ws-component="Box"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ button:where([data-ws-component="Button"]) {+ font-family: inherit;+ font-size: 100%;+ line-height: 1.15;+ margin-top: 0;+ margin-right: 0;+ margin-bottom: 0;+ margin-left: 0;+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ text-transform: none;+ }+ input:where([data-ws-component="Checkbox"]) {+ font-family: inherit;+ font-size: 100%;+ line-height: 1.15;+ margin-top: 0;+ margin-right: 0.5em;+ margin-bottom: 0;+ margin-left: 0;+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ }+ code:where([data-ws-component="CodeText"]) {+ font-family: ui-monospace, SFMono-Regular, Consolas, "Liberation Mono",+ Menlo, monospace;+ font-size: 1em;+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ display: block;+ white-space: pre-wrap;+ padding-left: 0.2em;+ padding-right: 0.2em;+ background-color: rgba(238, 238, 238, 1);+ }+ form:where([data-ws-component="Form"]) {+ 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: 20px;+ }+ h1:where([data-ws-component="Heading"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ h2:where([data-ws-component="Heading"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ h3:where([data-ws-component="Heading"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ h4:where([data-ws-component="Heading"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ h5:where([data-ws-component="Heading"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ h6:where([data-ws-component="Heading"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ img:where([data-ws-component="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;+ }+ input:where([data-ws-component="Input"]) {+ font-family: inherit;+ font-size: 100%;+ line-height: 1.15;+ margin-top: 0;+ margin-right: 0;+ margin-bottom: 0;+ margin-left: 0;+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ display: block;+ }+ i:where([data-ws-component="Italic"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ font-style: italic;+ }+ label:where([data-ws-component="Label"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ display: block;+ }+ a:where([data-ws-component="Link"]) {+ 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;+ display: inline-block;+ }+ ol:where([data-ws-component="List"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ margin-top: 0;+ margin-bottom: 10px;+ padding-left: 40px;+ }+ ul:where([data-ws-component="List"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ margin-top: 0;+ margin-bottom: 10px;+ padding-left: 40px;+ }+ li:where([data-ws-component="ListItem"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ p:where([data-ws-component="Paragraph"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ input:where([data-ws-component="RadioButton"]) {+ font-family: inherit;+ font-size: 100%;+ line-height: 1.15;+ margin-top: 0;+ margin-right: 0.5em;+ margin-bottom: 0;+ margin-left: 0;+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ }+ a:where([data-ws-component="RichTextLink"]) {+ 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;+ display: inline-block;+ }+ hr:where([data-ws-component="Separator"]) {+ height: 1px;+ color: inherit;+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ background-color: gray;+ border-top-style: none;+ border-right-style: none;+ border-left-style: none;+ border-bottom-style: none;+ }+ span:where([data-ws-component="Span"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ sub:where([data-ws-component="Subscript"]) {+ font-size: 75%;+ line-height: 0;+ position: relative;+ vertical-align: baseline;+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ bottom: -0.25em;+ }+ sup:where([data-ws-component="Superscript"]) {+ font-size: 75%;+ line-height: 0;+ position: relative;+ vertical-align: baseline;+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ top: -0.5em;+ }+ div:where([data-ws-component="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;+ }+ textarea:where([data-ws-component="Textarea"]) {+ font-family: inherit;+ font-size: 100%;+ line-height: 1.15;+ margin-top: 0;+ margin-right: 0;+ margin-bottom: 0;+ margin-left: 0;+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ resize: none;+ display: block;+ }+ div:where([data-ws-component="Vimeo"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ button:where([data-ws-component="VimeoPlayButton"]) {+ font-family: inherit;+ font-size: 100%;+ line-height: 1.15;+ margin-top: 0;+ margin-right: 0;+ margin-bottom: 0;+ margin-left: 0;+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ text-transform: none;+ }+ img:where([data-ws-component="VimeoPreviewImage"]) {+ 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;+ }+ div:where([data-ws-component="VimeoSpinner"]) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:Accordion"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionContent"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ h3:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionHeader"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ margin-top: 0px;+ margin-bottom: 0px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionItem"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ button:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionTrigger"]+ ) {+ font-family: inherit;+ font-size: 100%;+ line-height: 1.15;+ margin-top: 0;+ margin-right: 0;+ margin-bottom: 0;+ margin-left: 0;+ box-sizing: border-box;+ border-top-width: 0px;+ border-right-width: 0px;+ border-bottom-width: 0px;+ border-left-width: 0px;+ text-transform: none;+ background-color: transparent;+ background-image: none;+ border-top-style: solid;+ border-right-style: solid;+ border-bottom-style: solid;+ border-left-style: solid;+ border-top-color: rgba(226, 232, 240, 1);+ border-right-color: rgba(226, 232, 240, 1);+ border-bottom-color: rgba(226, 232, 240, 1);+ border-left-color: rgba(226, 232, 240, 1);+ padding-left: 0px;+ padding-right: 0px;+ padding-top: 0px;+ padding-bottom: 0px;+ }+ button:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:Checkbox"]+ ) {+ font-family: inherit;+ font-size: 100%;+ line-height: 1.15;+ margin-top: 0;+ margin-right: 0;+ margin-bottom: 0;+ margin-left: 0;+ box-sizing: border-box;+ border-top-width: 0px;+ border-right-width: 0px;+ border-bottom-width: 0px;+ border-left-width: 0px;+ text-transform: none;+ background-color: transparent;+ background-image: none;+ border-top-style: solid;+ border-right-style: solid;+ border-bottom-style: solid;+ border-left-style: solid;+ border-top-color: rgba(226, 232, 240, 1);+ border-right-color: rgba(226, 232, 240, 1);+ border-bottom-color: rgba(226, 232, 240, 1);+ border-left-color: rgba(226, 232, 240, 1);+ padding-left: 0px;+ padding-right: 0px;+ padding-top: 0px;+ padding-bottom: 0px;+ }+ span:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:CheckboxIndicator"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:Collapsible"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:CollapsibleContent"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ button:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:DialogClose"]+ ) {+ background-color: transparent;+ background-image: none;+ border-top-style: solid;+ border-right-style: solid;+ border-bottom-style: solid;+ border-left-style: solid;+ border-top-color: rgba(226, 232, 240, 1);+ border-right-color: rgba(226, 232, 240, 1);+ border-bottom-color: rgba(226, 232, 240, 1);+ border-left-color: rgba(226, 232, 240, 1);+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ padding-left: 0px;+ padding-right: 0px;+ padding-top: 0px;+ padding-bottom: 0px;+ font-family: inherit;+ font-size: 100%;+ line-height: 1.15;+ margin-top: 0;+ margin-right: 0;+ margin-bottom: 0;+ margin-left: 0;+ box-sizing: border-box;+ text-transform: none;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:DialogContent"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ p:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:DialogDescription"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:DialogOverlay"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ h2:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:DialogTitle"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ label:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:Label"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:NavigationMenu"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:NavigationMenuContent"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:NavigationMenuItem"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:NavigationMenuLink"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:NavigationMenuList"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:NavigationMenuTrigger"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:NavigationMenuViewport"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:PopoverContent"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:RadioGroup"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ span:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:RadioGroupIndicator"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ button:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:RadioGroupItem"]+ ) {+ font-family: inherit;+ font-size: 100%;+ line-height: 1.15;+ margin-top: 0;+ margin-right: 0;+ margin-bottom: 0;+ margin-left: 0;+ box-sizing: border-box;+ border-top-width: 0px;+ border-right-width: 0px;+ border-bottom-width: 0px;+ border-left-width: 0px;+ text-transform: none;+ background-color: transparent;+ background-image: none;+ border-top-style: solid;+ border-right-style: solid;+ border-bottom-style: solid;+ border-left-style: solid;+ border-top-color: rgba(226, 232, 240, 1);+ border-right-color: rgba(226, 232, 240, 1);+ border-bottom-color: rgba(226, 232, 240, 1);+ border-left-color: rgba(226, 232, 240, 1);+ padding-left: 0px;+ padding-right: 0px;+ padding-top: 0px;+ padding-bottom: 0px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:SelectContent"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:SelectItem"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ span:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:SelectItemIndicator"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ span:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:SelectItemText"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ button:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:SelectTrigger"]+ ) {+ font-family: inherit;+ font-size: 100%;+ line-height: 1.15;+ margin-top: 0;+ margin-right: 0;+ margin-bottom: 0;+ margin-left: 0;+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ text-transform: none;+ }+ span:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:SelectValue"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:SelectViewport"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ button:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:Switch"]+ ) {+ font-family: inherit;+ font-size: 100%;+ line-height: 1.15;+ margin-top: 0;+ margin-right: 0;+ margin-bottom: 0;+ margin-left: 0;+ box-sizing: border-box;+ border-top-width: 0px;+ border-right-width: 0px;+ border-bottom-width: 0px;+ border-left-width: 0px;+ text-transform: none;+ background-color: transparent;+ background-image: none;+ border-top-style: solid;+ border-right-style: solid;+ border-bottom-style: solid;+ border-left-style: solid;+ border-top-color: rgba(226, 232, 240, 1);+ border-right-color: rgba(226, 232, 240, 1);+ border-bottom-color: rgba(226, 232, 240, 1);+ border-left-color: rgba(226, 232, 240, 1);+ padding-left: 0px;+ padding-right: 0px;+ padding-top: 0px;+ padding-bottom: 0px;+ }+ span:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:SwitchThumb"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:Tabs"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:TabsContent"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:TabsList"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+ button:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:TabsTrigger"]+ ) {+ font-family: inherit;+ font-size: 100%;+ line-height: 1.15;+ margin-top: 0;+ margin-right: 0;+ margin-bottom: 0;+ margin-left: 0;+ box-sizing: border-box;+ border-top-width: 0px;+ border-right-width: 0px;+ border-bottom-width: 0px;+ border-left-width: 0px;+ text-transform: none;+ background-color: transparent;+ background-image: none;+ border-top-style: solid;+ border-right-style: solid;+ border-bottom-style: solid;+ border-left-style: solid;+ border-top-color: rgba(226, 232, 240, 1);+ border-right-color: rgba(226, 232, 240, 1);+ border-bottom-color: rgba(226, 232, 240, 1);+ border-left-color: rgba(226, 232, 240, 1);+ padding-left: 0px;+ padding-right: 0px;+ padding-top: 0px;+ padding-bottom: 0px;+ }+ div:where(+ [data-ws-component="@webstudio-is/sdk-components-react-radix:TooltipContent"]+ ) {+ box-sizing: border-box;+ border-top-width: 1px;+ border-right-width: 1px;+ border-bottom-width: 1px;+ border-left-width: 1px;+ outline-width: 1px;+ }+}+@media all {+ [data-ws-id="nVMWvMsaLCcb0o1wuNQgg"] {+ font-size: 4em;+ }+ [data-ws-id="f0kF-WmL7DQg7MSyRvqY1"] {+ display: flex;+ justify-content: center;+ align-items: start;+ }+ [data-ws-id="5XDbqPrZDeCwq4YJ3CHsc"] {+ min-width: 0px;+ flex-grow: 1;+ flex-shrink: 0;+ flex-basis: 0px;+ }+ [data-ws-id="qPnkiFGDj8dITWb1kmpGl"] {+ min-width: 0px;+ flex-grow: 1;+ flex-shrink: 0;+ flex-basis: 0px;+ }+ [data-ws-id="pX1ovPI7NdC0HRjkw6Kpw"] {+ aspect-ratio: 1;+ }+ [data-ws-id="On9cvWCxr5rdZtY9O1Bv0"] {+ padding-top: 16px;+ padding-right: 16px;+ padding-left: 16px;+ padding-bottom: 16px;+ }+}diff --git a/fixtures/webstudio-remix-vercel/app/root.tsx b/fixtures/webstudio-remix-vercel/app/root.tsxnew file mode 100644index 0000000000..d873875663--- /dev/null+++ b/fixtures/webstudio-remix-vercel/app/root.tsx@@ -0,0 +1 @@+export { Root as default } from "@webstudio-is/react-sdk";diff --git a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx b/fixtures/webstudio-remix-vercel/app/routes/_index.tsxnew file mode 100644index 0000000000..70218710dd--- /dev/null+++ b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx@@ -0,0 +1,185 @@+/* eslint-disable camelcase */+import {+ V2_MetaFunction,+ LinksFunction,+ LinkDescriptor,+ ActionArgs,+ json,+} from "@remix-run/node";++import {+ InstanceRoot,+ type RootPropsData,+ type Params,+} from "@webstudio-is/react-sdk";+import { n8nHandler, getFormProperties } from "@webstudio-is/form-handlers";+import { Scripts, ScrollRestoration } from "@remix-run/react";+import {+ fontAssets,+ components,+ pageData,+ user,+ projectId,+ utils,+} from "../__generated__/_index.tsx";+import css from "../__generated__/index.css";+import type { Data } from "@webstudio-is/http-client";++export type PageData = Omit<Data, "build"> & {+ build: Pick<Data["build"], "props" | "instances" | "dataSources">;+};++export const meta: V2_MetaFunction = () => {+ const { page } = pageData;+ return [{ title: page?.title || "Webstudio", ...page?.meta }];+};++export const links: LinksFunction = () => {+ const result: LinkDescriptor[] = [];++ result.push({+ rel: "stylesheet",+ href: css,+ });++ for (const asset of fontAssets) {+ if (asset.type === "font") {+ result.push({+ rel: "preload",+ href: "/assets/" + asset.name,+ as: "font",+ crossOrigin: "anonymous",+ // @todo add mimeType+ // type: asset.mimeType,+ });+ }+ }++ return result;+};++const getRequestHost = (request: Request): string =>+ request.headers.get("x-forwarded-host") || request.headers.get("host") || "";++const getMethod = (value: string | undefined) => {+ if (value === undefined) {+ return "post";+ }++ switch (value.toLowerCase()) {+ case "get":+ return "get";+ default:+ return "post";+ }+};++export const action = async ({ request, context }: ActionArgs) => {+ const formData = await request.formData();++ const formProperties = getFormProperties(+ formData,+ pageData.build.instances,+ pageData.build.props+ );++ if (formProperties === undefined) {+ // We're throwing rather than returning { success: false }+ // because this isn't supposed to happen normally: bug or malicious user+ throw json("Form not found", { status: 404 });+ }++ const { action, method } = formProperties;++ const email = user?.email;++ if (email == null) {+ return { success: false };+ }++ // wrapped in try/catch just in cases new URL() throws+ // (should not happen)+ let pageUrl: URL;+ try {+ pageUrl = new URL(request.url);+ pageUrl.host = getRequestHost(request);+ } catch {+ return { success: false };+ }++ if (action !== undefined) {+ try {+ // Test that action is full URL+ new URL(action);+ } catch {+ return json(+ {+ success: false,+ error: "Invalid action URL, must be valid http/https protocol",+ },+ { status: 200 }+ );+ }+ }++ const formInfo = {+ formData,+ projectId,+ action: action ?? null,+ method: getMethod(method),+ pageUrl: pageUrl.toString(),+ toEmail: email,+ fromEmail: pageUrl.hostname + "@webstudio.email",+ } as const;++ const result = await n8nHandler({+ formInfo,+ hookUrl: context.N8N_FORM_EMAIL_HOOK as string,+ });++ return result;+};++const Outlet = () => {+ const pagesCanvasData: PageData = pageData;++ const page = pagesCanvasData.page;++ if (page === undefined) {+ throw json("Page not found", {+ status: 404,+ });+ }++ const assetBaseUrl = "/assets/";+ const imageBaseUrl = "/assets/";++ const params: Params = {+ assetBaseUrl,+ imageBaseUrl,+ };++ const data: RootPropsData = {+ build: pagesCanvasData.build,+ assets: pagesCanvasData.assets,+ page,+ pages: pagesCanvasData.pages,+ params,+ };++ return (+ <InstanceRoot+ data={data}+ components={components}+ utils={utils}+ scripts={+ <>+ <Scripts />+ <ScrollRestoration />+ </>+ }+ />+ );+};++export default Outlet;diff --git a/fixtures/webstudio-remix-vercel/package.json b/fixtures/webstudio-remix-vercel/package.jsonnew file mode 100644index 0000000000..03a924481e--- /dev/null+++ b/fixtures/webstudio-remix-vercel/package.json@@ -0,0 +1,44 @@+{+ "private": true,+ "sideEffects": false,+ "scripts": {+ "build": "remix build",+ "dev": "remix dev",+ "start": "remix-serve build",+ "typecheck": "tsc",+ "checks": "pnpm typecheck"+ },+ "dependencies": {+ "@remix-run/node": "^1.19.2",+ "@remix-run/react": "^1.19.2",+ "@webstudio-is/react-sdk": "workspace:^",+ "@webstudio-is/sdk-components-react-radix": "workspace:^",+ "@webstudio-is/sdk-components-react-remix": "workspace:^",+ "@webstudio-is/sdk-components-react": "workspace:^",+ "@webstudio-is/form-handlers": "workspace:^",+ "@webstudio-is/sdk": "workspace:^",+ "isbot": "^3.6.8",+ "react": "^18.2.0",+ "react-dom": "^18.2.0"+ },+ "devDependencies": {+ "@remix-run/serve": "^1.19.2",+ "@remix-run/dev": "^1.19.2",+ "@types/react": "^18.2.20",+ "@types/react-dom": "^18.2.7",+ "@webstudio-is/http-client": "workspace:^",+ "eslint": "^8.48.0",+ "typescript": "5.2.2",+ "@webstudio-is/cli": "workspace:^"+ },+ "engines": {+ "node": ">=18.0.0"+ },+ "name": "webstudio-remix-vercel",+ "version": "0.0.1",+ "description": "",+ "main": "index.js",+ "keywords": [],+ "author": "",+ "license": "AGPL-3.0-or-later"+}diff --git a/fixtures/webstudio-remix-vercel/public/assets/_937084ed-a798-49fe-8664-df93a2af605e_uiBk3o6UWdqolyakMvQJ9.jpeg b/fixtures/webstudio-remix-vercel/public/assets/_937084ed-a798-49fe-8664-df93a2af605e_uiBk3o6UWdqolyakMvQJ9.jpegnew file mode 100644index 0000000000..ba43ae9a7aBinary files /dev/null and b/fixtures/webstudio-remix-vercel/public/assets/_937084ed-a798-49fe-8664-df93a2af605e_uiBk3o6UWdqolyakMvQJ9.jpeg differdiff --git a/fixtures/webstudio-remix-vercel/public/favicon.ico b/fixtures/webstudio-remix-vercel/public/favicon.iconew file mode 100644index 0000000000..9cb8c815dcBinary files /dev/null and b/fixtures/webstudio-remix-vercel/public/favicon.ico differdiff --git a/fixtures/webstudio-remix-vercel/remix.config.js b/fixtures/webstudio-remix-vercel/remix.config.jsnew file mode 100644index 0000000000..b2da45dbbb--- /dev/null+++ b/fixtures/webstudio-remix-vercel/remix.config.js@@ -0,0 +1,18 @@+/** @type {import('@remix-run/dev').AppConfig} */+module.exports = {+ ignoredRouteFiles: ["**/.*"],+ serverModuleFormat: "cjs",+ serverDependenciesToBundle: [+ /@webstudio-is\/(?!prisma-client)/,+ "nanoevents",+ "nanostores",+ "@nanostores/react",+ ],+ future: {+ v2_errorBoundary: true,+ v2_headers: true,+ v2_meta: true,+ v2_normalizeFormMethod: true,+ v2_routeConvention: true,+ },+};diff --git a/fixtures/webstudio-remix-vercel/remix.env.d.ts b/fixtures/webstudio-remix-vercel/remix.env.d.tsnew file mode 100644index 0000000000..dcf8c45e1d--- /dev/null+++ b/fixtures/webstudio-remix-vercel/remix.env.d.ts@@ -0,0 +1,2 @@+/// <reference types="@remix-run/dev" />+/// <reference types="@remix-run/node" />diff --git a/fixtures/webstudio-remix-vercel/tsconfig.json b/fixtures/webstudio-remix-vercel/tsconfig.jsonnew file mode 100644index 0000000000..b0ec020d3a--- /dev/null+++ b/fixtures/webstudio-remix-vercel/tsconfig.json@@ -0,0 +1,25 @@+{+ "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],+ "compilerOptions": {+ "lib": ["DOM", "DOM.Iterable", "ES2022"],+ "isolatedModules": true,+ "esModuleInterop": true,+ "jsx": "react-jsx",+ "moduleResolution": "bundler",+ "resolveJsonModule": true,+ "target": "ES2022",+ "strict": true,+ "allowJs": true,+ "forceConsistentCasingInFileNames": true,+ "allowImportingTsExtensions": true,+ "baseUrl": ".",+ "paths": {+ "~/*": ["./app/*"]+ },+ "customConditions": ["source"],++ // Remix takes care of building everything in `remix build`.+ "noEmit": true,+ "skipLibCheck": true+ }+}diff --git a/packages/cli/package.json b/packages/cli/package.jsonindex 700d7db3a0..4d9d829dbc 100644--- a/packages/cli/package.json+++ b/packages/cli/package.json@@ -18,9 +18,10 @@"scripts": {"typecheck": "tsc","checks": "pnpm typecheck",- "build:templates": "tsx ./templates/build.ts",+ "build:templates": "tsx ./templates/build.ts && prettier --write src/__generated__","build": "rm -rf ./lib && esbuild ./src/**/*.ts --outdir=./lib",- "local-run": "tsx --no-warnings ./src/bin.ts"+ "local-run": "tsx --no-warnings ./src/bin.ts",+ "dev": "esbuild ./src/**/*.ts --watch --outdir=./lib"},"license": "AGPL-3.0-or-later","dependencies": {@@ -31,6 +32,7 @@"@webstudio-is/sdk-components-react": "workspace:^","@webstudio-is/sdk-components-react-radix": "workspace:^","@webstudio-is/sdk-components-react-remix": "workspace:^",+ "deepmerge": "^4.3.1","env-paths": "^3.0.0","ora": "^7.0.1","p-limit": "^4.0.0",diff --git a/packages/cli/src/__generated__/assets.ts b/packages/cli/src/__generated__/assets.tsindex 9b66e01a85..c51267f5ae 100644--- a/packages/cli/src/__generated__/assets.ts+++ b/packages/cli/src/__generated__/assets.ts@@ -17,6 +17,7 @@ export const assets: Folder = {content:"AAABAAMAMDAAAAEAIACoJQAANgAAACAgAAABACAAqBAAAN4lAAAQEAAAAQAgAGgEAACGNgAAKAAAADAAAABgAAAAAQAgAAAAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA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AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAA////////AAD///////8AAP///////wAA////////AAD///////8AAP///////wAA////////AAD/8P/+D/8AAP/gf/wH/wAA/+A//Af/AAD/wD/8B/8AAP/AP/wD/wAA/4A//AP/AAD/gD/4A/8AAP+AH/gB/wAA/wAf+AH/AAD/AB/4Af8AAP8AH/AA/wAA/gAP8AD/AAD+AA/wAP8AAP4AD+AAfwAA/AAH4AB/AAD8AAPAAH8AAPwAAYAAPwAA+AQAAAA/AAD4BgAAYD8AAPgGAADgHwAA8A8AAOAfAADwD4AB8B8AAPAPwAfwDwAA8B/wD/APAADgH///+A8AAOAf///4BwAA4D////gHAADAP////AcAAMA////8BwAA4H////wHAADgf////g8AAPn/////HwAA////////AAD///////8AAP///////wAA////////AAD///////8AAP///////wAA////////AAD///////8AACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA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",encoding: "base64",+ merge: false,},],subFolders: [],diff --git a/packages/cli/src/__generated__/router.ts b/packages/cli/src/__generated__/router.tsindex 57474af741..d98b133b1b 100644--- a/packages/cli/src/__generated__/router.ts+++ b/packages/cli/src/__generated__/router.ts@@ -8,7 +8,8 @@ If needed to make any changes. Add them to ./templates folder and run pnpm run bimport { ASSETS_BASE } from "../config";export const getRouteTemplate = () => {- return `import {+ return `/* eslint-disable camelcase */+import {V2_MetaFunction,LinksFunction,LinkDescriptor,@@ -19,9 +20,9 @@ export const getRouteTemplate = () => {import {InstanceRoot,type RootPropsData,- type Data,+ type Params,} from "@webstudio-is/react-sdk";-import { n8nHandler, hasMatchingForm } from "@webstudio-is/form-handlers";+import { n8nHandler, getFormProperties } from "@webstudio-is/form-handlers";import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,@@ -32,6 +33,7 @@ import {utils,} from "../__generated__/index";import css from "../__generated__/index.css";+import type { Data } from "@webstudio-is/http-client";export type PageData = Omit<Data, "build"> & {build: Pick<Data["build"], "props" | "instances" | "dataSources">;@@ -69,22 +71,43 @@ export const links: LinksFunction = () => {const getRequestHost = (request: Request): string =>request.headers.get("x-forwarded-host") || request.headers.get("host") || "";+const getMethod = (value: string | undefined) => {+ if (value === undefined) {+ return "post";+ }++ switch (value.toLowerCase()) {+ case "get":+ return "get";+ default:+ return "post";+ }+};+export const action = async ({ request, context }: ActionArgs) => {const formData = await request.formData();- // We're throwing rather than returning \`{ success: false }\`- // because this isn't supposed to happen normally: bug or malicious user- if (hasMatchingForm(formData, pageData.build.instances) === false) {+ const formProperties = getFormProperties(+ formData,+ pageData.build.instances,+ pageData.build.props+ );++ if (formProperties === undefined) {+ // We're throwing rather than returning { success: false }+ // because this isn't supposed to happen normally: bug or malicious userthrow json("Form not found", { status: 404 });}+ const { action, method } = formProperties;+const email = user?.email;if (email == null) {return { success: false };}- // wrapped in try/catch just in cases \`new URL()\` throws+ // wrapped in try/catch just in cases new URL() throws// (should not happen)let pageUrl: URL;try {@@ -94,13 +117,30 @@ export const action = async ({ request, context }: ActionArgs) => {return { success: false };}+ if (action !== undefined) {+ try {+ // Test that action is full URL+ new URL(action);+ } catch {+ return json(+ {+ success: false,+ error: "Invalid action URL, must be valid http/https protocol",+ },+ { status: 200 }+ );+ }+ }+const formInfo = {formData,projectId,+ action: action ?? null,+ method: getMethod(method),pageUrl: pageUrl.toString(),toEmail: email,fromEmail: pageUrl.hostname + "@webstudio.email",- };+ } as const;const result = await n8nHandler({formInfo,@@ -124,7 +164,7 @@ const Outlet = () => {const assetBaseUrl = "${ASSETS_BASE}";const imageBaseUrl = "${ASSETS_BASE}";- const params: Data["params"] = {+ const params: Params = {assetBaseUrl,imageBaseUrl,};diff --git a/packages/cli/src/__generated__/templates.ts b/packages/cli/src/__generated__/templates.tsindex 4f7c139eda..9f3bc19273 100644--- a/packages/cli/src/__generated__/templates.ts+++ b/packages/cli/src/__generated__/templates.ts@@ -14,14 +14,30 @@ export const templates: Record<ProjectTarget, Folder> = {{name: "package.json",content:- '{\n "private": true,\n "sideEffects": false,\n "scripts": {\n "build": "remix build",\n "dev": "remix dev",\n "start": "remix-serve build",\n "typecheck": "tsc"\n },\n "dependencies": {\n "@remix-run/css-bundle": "^1.19.2",\n "@remix-run/node": "^1.19.2",\n "@remix-run/react": "^1.19.2",\n "@webstudio-is/react-sdk": "^0.91.0",\n "@webstudio-is/sdk-components-react-radix": "^0.91.0",\n "@webstudio-is/sdk-components-react-remix": "^0.91.0",\n "@webstudio-is/sdk-components-react": "^0.91.0",\n "@webstudio-is/form-handlers": "^0.91.0",\n "isbot": "^3.6.8",\n "react": "^18.2.0",\n "react-dom": "^18.2.0"\n },\n "devDependencies": {\n "@remix-run/serve": "^1.19.2",\n "@remix-run/dev": "^1.19.2",\n "@remix-run/eslint-config": "^1.19.2",\n "@types/react": "^18.0.35",\n "@types/react-dom": "^18.0.11",\n "eslint": "^8.38.0",\n "typescript": "^5.0.4"\n },\n "engines": {\n "node": ">=18.0.0"\n }\n}\n',+ '{\n "private": true,\n "sideEffects": false,\n "scripts": {\n "build": "remix build",\n "dev": "remix dev",\n "start": "remix-serve build",\n "typecheck": "tsc"\n },\n "dependencies": {\n "@remix-run/node": "^1.19.2",\n "@remix-run/react": "^1.19.2",\n "@webstudio-is/react-sdk": "^0.91.0",\n "@webstudio-is/sdk-components-react-radix": "^0.91.0",\n "@webstudio-is/sdk-components-react-remix": "^0.91.0",\n "@webstudio-is/sdk-components-react": "^0.91.0",\n "@webstudio-is/form-handlers": "^0.91.0",\n "@webstudio-is/sdk": "^0.91.0",\n "isbot": "^3.6.8",\n "react": "^18.2.0",\n "react-dom": "^18.2.0"\n },\n "devDependencies": {\n "@remix-run/serve": "^1.19.2",\n "@remix-run/dev": "^1.19.2",\n "@types/react": "^18.2.20",\n "@types/react-dom": "^18.2.7",\n "@webstudio-is/http-client": "^0.91.0",\n "eslint": "^8.48.0",\n "typescript": "5.2.2"\n },\n "engines": {\n "node": ">=18.0.0"\n }\n}\n',encoding: "utf-8",+ merge: true,},{name: "remix.config.js",content:'/** @type {import(\'@remix-run/dev\').AppConfig} */\nmodule.exports = {\n ignoredRouteFiles: ["**/.*"],\n serverModuleFormat: "cjs",\n serverDependenciesToBundle: [\n /@webstudio-is\\/(?!prisma-client)/,\n "nanoevents",\n "nanostores",\n "@nanostores/react",\n ],\n future: {\n v2_errorBoundary: true,\n v2_headers: true,\n v2_meta: true,\n v2_normalizeFormMethod: true,\n v2_routeConvention: true,\n },\n};\n',encoding: "utf-8",+ merge: false,+ },+ {+ name: "remix.env.d.ts",+ content:+ '/// <reference types="@remix-run/dev" />\n/// <reference types="@remix-run/node" />\n',+ encoding: "utf-8",+ merge: false,+ },+ {+ name: "tsconfig.json",+ content:+ '{\n "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],\n "compilerOptions": {\n "lib": ["DOM", "DOM.Iterable", "ES2022"],\n "isolatedModules": true,\n "esModuleInterop": true,\n "jsx": "react-jsx",\n "moduleResolution": "bundler",\n "resolveJsonModule": true,\n "target": "ES2022",\n "strict": true,\n "allowJs": true,\n "forceConsistentCasingInFileNames": true,\n "allowImportingTsExtensions": true,\n "baseUrl": ".",\n "paths": {\n "~/*": ["./app/*"]\n },\n "customConditions": ["source"],\n\n // Remix takes care of building everything in `remix build`.\n "noEmit": true,\n "skipLibCheck": true\n }\n}\n',+ encoding: "utf-8",+ merge: false,},],subFolders: [@@ -33,6 +49,7 @@ export const templates: Record<ProjectTarget, Folder> = {content:'export { Root as default } from "@webstudio-is/react-sdk";\n',encoding: "utf-8",+ merge: false,},],subFolders: [],diff --git a/packages/cli/src/args.ts b/packages/cli/src/args.tsindex 6aa3c16f6a..ef96888213 100644--- a/packages/cli/src/args.ts+++ b/packages/cli/src/args.ts@@ -2,6 +2,7 @@ export type File = {name: string;content: string;encoding: "utf-8" | "base64";+ merge: boolean;};export type Folder = {diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.tsindex b1b1b95f5c..7aeb0f29eb 100644--- a/packages/cli/src/cli.ts+++ b/packages/cli/src/cli.ts@@ -51,7 +51,7 @@ export const main = async () => {link);cmd.command(["sync"], "sync your project", {}, sync);- cmd.command("$0", "setup the project", {}, initFlow);+ cmd.command("$0", "setup the project", buildOptions, initFlow);await cmd.parse();} catch (error) {diff --git a/packages/cli/src/commands/build.ts b/packages/cli/src/commands/build.tsindex 5af9920559..7ab4a02844 100644--- a/packages/cli/src/commands/build.ts+++ b/packages/cli/src/commands/build.ts@@ -7,17 +7,21 @@ import type {} from "./yargs-types";export const buildOptions = (yargs: CommonYargsArgv) =>- yargs.option("assets", {- type: "boolean",- default: true,- describe: "Download assets",- });+ yargs+ .option("assets", {+ type: "boolean",+ default: true,+ describe: "Download assets",+ })+ .option("preview", {+ type: "boolean",+ default: false,+ describe: "use preview (opensource) version of the project",+ });// @todo: use options.assets to define if we need to download assetsexport const build = async (- options:- | StrictYargsOptionsToInterface<typeof buildOptions>- | { assets?: boolean }+ options: StrictYargsOptionsToInterface<typeof buildOptions>) => {try {await access(LOCAL_DATA_FILE);@@ -31,5 +35,5 @@ export const build = async (throw error;}- await prebuild();+ await prebuild(options);};diff --git a/packages/cli/src/commands/init-flow.ts b/packages/cli/src/commands/init-flow.tsindex 16f886dd59..e64c557e9e 100644--- a/packages/cli/src/commands/init-flow.ts+++ b/packages/cli/src/commands/init-flow.ts@@ -4,9 +4,12 @@ import { chdir, cwd } from "node:process";import { join } from "node:path";import { link } from "./link";import { sync } from "./sync";-import { build } from "./build";+import { build, buildOptions } from "./build";+import type { StrictYargsOptionsToInterface } from "./yargs-types";-export const initFlow = async () => {+export const initFlow = async (+ options: StrictYargsOptionsToInterface<typeof buildOptions>+) => {const isProjectConfigured = await isFileExists(".webstudio/config.json");const prompsList: PromptObject[] = [];@@ -46,5 +49,5 @@ export const initFlow = async () => {If the project is already set up, we can sync and build it.*/await sync();- await build({ assets: true });+ await build(options);};diff --git a/packages/cli/src/commands/sync.ts b/packages/cli/src/commands/sync.tsindex 1e476139bb..6f6e98dee4 100644--- a/packages/cli/src/commands/sync.ts+++ b/packages/cli/src/commands/sync.ts@@ -38,7 +38,7 @@ export const sync = async () => {const { host, token } = globalConfig[localConfig.projectId];- spinner.text = "Loading project data from webstudio";+ spinner.text = "Loading project data from webstudio\n";const project = await loadProjectDataById({projectId: localConfig.projectId,authToken: token,diff --git a/packages/cli/src/fs-utils.ts b/packages/cli/src/fs-utils.tsindex 8c5f8d7d75..1c3928453e 100644--- a/packages/cli/src/fs-utils.ts+++ b/packages/cli/src/fs-utils.ts@@ -8,6 +8,7 @@ import {} from "node:fs/promises";import { join } from "node:path";import type { Folder } from "./args";+import merge from "deepmerge";export const isFileExists = async (filePath: string) => {try {@@ -54,7 +55,24 @@ export const parseFolderAndWriteFiles = async (for (const file of folder.files) {const filePath = join(path, file.name);await ensureFileInPath(filePath);- await writeFile(filePath, file.content, file.encoding);++ let content = file.content;++ if (file.merge) {+ let existingContent = await readFile(filePath, "utf8");++ if (existingContent === "") {+ existingContent = "{}";+ }++ content = JSON.stringify(+ merge(JSON.parse(file.content), JSON.parse(existingContent)),+ null,+ " "+ );+ }++ await writeFile(filePath, content, file.encoding);}for (const subFolder of folder.subFolders) {diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.tsindex 009f6dab3c..e030b9428b 100644--- a/packages/cli/src/prebuild.ts+++ b/packages/cli/src/prebuild.ts@@ -101,7 +101,16 @@ export const downloadAsset = async (}};-export const prebuild = async () => {+export const prebuild = async (options: {+ /**+ * Use preview (opensource) version of the project+ **/+ preview: boolean;+ /**+ * Do we need download assets+ **/+ assets: boolean;+}) => {const spinner = ora("Scaffolding the project files");spinner.start();@@ -221,7 +230,9 @@ export const prebuild = async () => {const assetsToDownload: Promise<void>[] = [];const fontAssets: FontAsset[] = [];- const assetBuildUrl = `https://${domain}.wstd.io/cgi/asset/`;++ const appDomain = options.preview ? "wstd.work" : "wstd.io";+ const assetBuildUrl = `https://${domain}.${appDomain}/cgi/asset/`;for (const asset of siteData.assets) {if (asset.type === "image") {@@ -329,16 +340,16 @@ import { ${Array.from(componentsSet)dataSources: new Map(pageData.build.dataSources),});- const pageExports = `/* eslint-disable camelcase */-/* eslint-disable prefer-const */+ const pageExports = `/* eslint-disable *//* This is a auto generated file for building the project */ \nimport * as sdk from "@webstudio-is/react-sdk";-import type { PageData } from "~/routes/template";+import type { PageData } from "~/routes/_index";import type { Components } from "@webstudio-is/react-sdk";+import type { Asset } from "@webstudio-is/sdk";${componentImports}import * as remixComponents from "@webstudio-is/sdk-components-react-remix";export const components = new Map(Object.entries(Object.assign({ ${assignComponent} }, remixComponents ))) as Components;-export const fontAssets = ${JSON.stringify(fontAssets)}+export const fontAssets: Asset[] = ${JSON.stringify(fontAssets)}export const pageData: PageData = ${JSON.stringify(pageData)};export const user: { email: string | null } | undefined = ${JSON.stringify(siteData.userdiff --git a/packages/cli/templates/build.ts b/packages/cli/templates/build.tsindex 0231be8886..d932916508 100644--- a/packages/cli/templates/build.ts+++ b/packages/cli/templates/build.ts@@ -59,10 +59,16 @@ const parseFolder = (folderPath: string): Folder | undefined => {if (isFile) {const content = readFileSync(filePath, "utf-8");+ let merge = false;+ if (file === "package.json") {+ merge = true;+ }+folder.files.push({name: file,content,encoding: "utf-8",+ merge,});}}@@ -155,6 +161,7 @@ const parseAssets = (folderPath: string): Folder | undefined => {name: file,content,encoding: "base64",+ merge: false,});}}diff --git a/packages/cli/templates/defaults/package.json b/packages/cli/templates/defaults/package.jsonindex 0b8658bdc2..149e86c49a 100644--- a/packages/cli/templates/defaults/package.json+++ b/packages/cli/templates/defaults/package.json@@ -8,7 +8,6 @@"typecheck": "tsc"},"dependencies": {- "@remix-run/css-bundle": "^1.19.2","@remix-run/node": "^1.19.2","@remix-run/react": "^1.19.2","@webstudio-is/react-sdk": "^0.91.0",@@ -16,6 +15,7 @@"@webstudio-is/sdk-components-react-remix": "^0.91.0","@webstudio-is/sdk-components-react": "^0.91.0","@webstudio-is/form-handlers": "^0.91.0",+ "@webstudio-is/sdk": "^0.91.0","isbot": "^3.6.8","react": "^18.2.0","react-dom": "^18.2.0"@@ -23,11 +23,11 @@"devDependencies": {"@remix-run/serve": "^1.19.2","@remix-run/dev": "^1.19.2",- "@remix-run/eslint-config": "^1.19.2",- "@types/react": "^18.0.35",- "@types/react-dom": "^18.0.11",- "eslint": "^8.38.0",- "typescript": "^5.0.4"+ "@types/react": "^18.2.20",+ "@types/react-dom": "^18.2.7",+ "@webstudio-is/http-client": "^0.91.0",+ "eslint": "^8.48.0",+ "typescript": "5.2.2"},"engines": {"node": ">=18.0.0"diff --git a/packages/cli/templates/defaults/remix.env.d.ts b/packages/cli/templates/defaults/remix.env.d.tsnew file mode 100644index 0000000000..dcf8c45e1d--- /dev/null+++ b/packages/cli/templates/defaults/remix.env.d.ts@@ -0,0 +1,2 @@+/// <reference types="@remix-run/dev" />+/// <reference types="@remix-run/node" />diff --git a/packages/cli/templates/defaults/tsconfig.json b/packages/cli/templates/defaults/tsconfig.jsonnew file mode 100644index 0000000000..b0ec020d3a--- /dev/null+++ b/packages/cli/templates/defaults/tsconfig.json@@ -0,0 +1,25 @@+{+ "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],+ "compilerOptions": {+ "lib": ["DOM", "DOM.Iterable", "ES2022"],+ "isolatedModules": true,+ "esModuleInterop": true,+ "jsx": "react-jsx",+ "moduleResolution": "bundler",+ "resolveJsonModule": true,+ "target": "ES2022",+ "strict": true,+ "allowJs": true,+ "forceConsistentCasingInFileNames": true,+ "allowImportingTsExtensions": true,+ "baseUrl": ".",+ "paths": {+ "~/*": ["./app/*"]+ },+ "customConditions": ["source"],++ // Remix takes care of building everything in `remix build`.+ "noEmit": true,+ "skipLibCheck": true+ }+}diff --git a/packages/cli/templates/route-template.tsx b/packages/cli/templates/route-template.tsxindex c0afbc29b8..5de2214fba 100644--- a/packages/cli/templates/route-template.tsx+++ b/packages/cli/templates/route-template.tsx@@ -1,3 +1,4 @@+/* eslint-disable camelcase */import {V2_MetaFunction,LinksFunction,@@ -9,9 +10,9 @@ import {import {InstanceRoot,type RootPropsData,- type Data,+ type Params,} from "@webstudio-is/react-sdk";-import { n8nHandler, hasMatchingForm } from "@webstudio-is/form-handlers";+import { n8nHandler, getFormProperties } from "@webstudio-is/form-handlers";import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,@@ -22,6 +23,7 @@ import {utils,} from "../__generated__/index";import css from "../__generated__/index.css";+import type { Data } from "@webstudio-is/http-client";export type PageData = Omit<Data, "build"> & {build: Pick<Data["build"], "props" | "instances" | "dataSources">;@@ -59,22 +61,43 @@ export const links: LinksFunction = () => {const getRequestHost = (request: Request): string =>request.headers.get("x-forwarded-host") || request.headers.get("host") || "";+const getMethod = (value: string | undefined) => {+ if (value === undefined) {+ return "post";+ }++ switch (value.toLowerCase()) {+ case "get":+ return "get";+ default:+ return "post";+ }+};+export const action = async ({ request, context }: ActionArgs) => {const formData = await request.formData();- // We're throwing rather than returning \`{ success: false }\`- // because this isn't supposed to happen normally: bug or malicious user- if (hasMatchingForm(formData, pageData.build.instances) === false) {+ const formProperties = getFormProperties(+ formData,+ pageData.build.instances,+ pageData.build.props+ );++ if (formProperties === undefined) {+ // We're throwing rather than returning { success: false }+ // because this isn't supposed to happen normally: bug or malicious userthrow json("Form not found", { status: 404 });}+ const { action, method } = formProperties;+const email = user?.email;if (email == null) {return { success: false };}- // wrapped in try/catch just in cases \`new URL()\` throws+ // wrapped in try/catch just in cases new URL() throws// (should not happen)let pageUrl: URL;try {@@ -84,13 +107,30 @@ export const action = async ({ request, context }: ActionArgs) => {return { success: false };}+ if (action !== undefined) {+ try {+ // Test that action is full URL+ new URL(action);+ } catch {+ return json(+ {+ success: false,+ error: "Invalid action URL, must be valid http/https protocol",+ },+ { status: 200 }+ );+ }+ }+const formInfo = {formData,projectId,+ action: action ?? null,+ method: getMethod(method),pageUrl: pageUrl.toString(),toEmail: email,fromEmail: pageUrl.hostname + "@webstudio.email",- };+ } as const;const result = await n8nHandler({formInfo,@@ -114,7 +154,7 @@ const Outlet = () => {const assetBaseUrl = ASSETS_BASE;const imageBaseUrl = ASSETS_BASE;- const params: Data["params"] = {+ const params: Params = {assetBaseUrl,imageBaseUrl,};diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 1759d8fb04..ec7ca34947 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -362,6 +362,67 @@ importers:specifier: 5.2.2version: 5.2.2+ fixtures/webstudio-remix-vercel:+ dependencies:+ '@remix-run/node':+ specifier: ^1.19.2+ version: 1.19.2+ '@remix-run/react':+ specifier: ^1.19.2+ version: 1.19.2([email protected])([email protected])+ '@webstudio-is/form-handlers':+ specifier: workspace:^+ version: link:../../packages/form-handlers+ '@webstudio-is/react-sdk':+ specifier: workspace:^+ version: link:../../packages/react-sdk+ '@webstudio-is/sdk':+ specifier: workspace:^+ version: link:../../packages/sdk+ '@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: ^3.6.8+ version: 3.6.13+ react:+ specifier: ^18.2.0+ version: 18.2.0+ react-dom:+ specifier: ^18.2.0+ version: 18.2.0([email protected])+ devDependencies:+ '@remix-run/dev':+ specifier: ^1.19.2+ version: 1.19.2(@remix-run/[email protected])+ '@remix-run/serve':+ specifier: ^1.19.2+ version: 1.19.2+ '@types/react':+ specifier: ^18.2.20+ version: 18.2.21+ '@types/react-dom':+ specifier: ^18.2.7+ version: 18.2.7+ '@webstudio-is/cli':+ specifier: workspace:^+ version: link:../../packages/cli+ '@webstudio-is/http-client':+ specifier: workspace:^+ version: link:../../packages/http-client+ eslint:+ specifier: ^8.48.0+ version: 8.48.0+ typescript:+ specifier: 5.2.2+ version: 5.2.2+packages/asset-uploader:dependencies:'@aws-crypto/sha256-js':@@ -468,6 +529,9 @@ importers:'@webstudio-is/sdk-components-react-remix':specifier: workspace:^version: link:../sdk-components-react-remix+ deepmerge:+ specifier: ^4.3.1+ version: 4.3.1env-paths:specifier: ^3.0.0version: 3.0.0@@ -1594,7 +1658,6 @@ packages:/@aashutoshrathi/[email protected]:resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}engines: {node: '>=0.10.0'}- dev: false/@alloc/[email protected]:resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}@@ -3729,12 +3792,10 @@ packages:dependencies:eslint: 8.48.0eslint-visitor-keys: 3.4.3- dev: false/@eslint-community/[email protected]:resolution: {integrity: sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==}engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}- dev: false/@eslint/[email protected]:resolution: {integrity: sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==}@@ -3751,12 +3812,10 @@ packages:strip-json-comments: 3.1.1transitivePeerDependencies:- supports-color- dev: false/@eslint/[email protected]:resolution: {integrity: sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}- dev: false/@fal-works/[email protected]:resolution: {integrity: sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==}@@ -3814,16 +3873,13 @@ packages:minimatch: 3.1.2transitivePeerDependencies:- supports-color- dev: false/@humanwhocodes/[email protected]:resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}engines: {node: '>=12.22'}- dev: false/@humanwhocodes/[email protected]:resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}- dev: false/@iarna/[email protected]:resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==}@@ -7902,7 +7958,6 @@ packages:fast-json-stable-stringify: 2.1.0json-schema-traverse: 0.4.1uri-js: 4.4.1- dev: falseresolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}@@ -9034,7 +9089,6 @@ packages:resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}- dev: falseresolution: {integrity: sha512-Rn+RuwkmkDwCi2/oXOFS9Gsr5lJZu/yTGpK7wAaAIE75CC+LCGEZHpY6VQJa/RoJcrmaA/docWJZvYohlNkWPA==}@@ -9748,12 +9802,10 @@ packages:dependencies:esrecurse: 4.3.0estraverse: 5.3.0- dev: falseresolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}- dev: falseresolution: {integrity: sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==}@@ -9799,7 +9851,6 @@ packages:text-table: 0.2.0transitivePeerDependencies:- supports-color- dev: falseresolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}@@ -9808,7 +9859,6 @@ packages:acorn: 8.10.0acorn-jsx: 5.3.2([email protected])eslint-visitor-keys: 3.4.3- dev: falseresolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}@@ -9820,14 +9870,12 @@ packages:engines: {node: '>=0.10'}dependencies:estraverse: 5.3.0- dev: falseresolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}engines: {node: '>=4.0'}dependencies:estraverse: 5.3.0- dev: falseresolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}@@ -10042,7 +10090,6 @@ packages:resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}- dev: falseresolution: {integrity: sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==}@@ -10070,7 +10117,6 @@ packages:resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}- dev: falseresolution: {integrity: sha512-HPtaa38cPgWvaCFmRNhlc6NG7pv6NUHqjPgVAkWGoB9mQMwYB27/K0CvOM5Czy+qpT3e8XJ6Q4aPAnzpNpzNaw==}@@ -10124,7 +10170,6 @@ packages:engines: {node: ^10.12.0 || >=12.0.0}dependencies:flat-cache: 3.0.4- dev: falseresolution: {integrity: sha512-l4DMNdsIPsVnKrgEXbJwDJsA5mB8rGwHYERMgqQx/xAUtChPJMre1bXBzDEqqVbWv9AIbFezXMxeEkZDSrXUOQ==}@@ -10204,11 +10249,9 @@ packages:dependencies:flatted: 3.2.7rimraf: 3.0.2- dev: falseresolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}- dev: falseresolution: {integrity: sha512-7YdhWfCsLRn31or7oK9M7Svd4WFk1qfj6VIFY/9S6HRyzBBiLlobNbUbitZHfdi0nhkik5S498UmF3phdzM6ug==}@@ -10552,7 +10595,6 @@ packages:engines: {node: '>=8'}dependencies:type-fest: 0.20.2- dev: falseresolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}@@ -10621,7 +10663,6 @@ packages:resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}- dev: falseresolution: {integrity: sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==}@@ -10850,7 +10891,6 @@ packages:dependencies:parent-module: 1.0.1resolve-from: 4.0.0- dev: falseresolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==}@@ -11862,11 +11902,9 @@ packages:resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}- dev: falseresolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}- dev: falseresolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}@@ -11942,7 +11980,6 @@ packages:dependencies:prelude-ls: 1.2.1type-check: 0.4.0- dev: falseresolution: {integrity: sha512-xsMKgx/Fa+QHg/nweemU04lCy7TnEr8LyeDtsKUC7fIDN9wH3GqbnQ0+e3Hbg4FmxlhDCiPPt0GcZAROq3R8uw==}@@ -12015,7 +12052,6 @@ packages:resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}- dev: falseresolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}@@ -13521,7 +13557,6 @@ packages:levn: 0.4.1prelude-ls: 1.2.1type-check: 0.4.0- dev: falseresolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}@@ -13646,7 +13681,6 @@ packages:engines: {node: '>=6'}dependencies:callsites: 3.1.0- dev: falseresolution: {integrity: sha512-5nk9Fn03x3rEhGaX1FU6IDwG/k+GxLXlFAkgrbM1asuAFl3BhdQWvASaIsmwWypRNcZKHPYnIuOSfIWEyEQnPQ==}@@ -13971,7 +14005,6 @@ packages:resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}engines: {node: '>= 0.8.0'}- dev: falseresolution: {integrity: sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==}@@ -14108,7 +14141,6 @@ packages:resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}engines: {node: '>=6'}- dev: falseresolution: {integrity: sha512-n13AWriBMPYxnpbb6bnaY5YoY6rGj8vPLrz6CZF3o0qJNEwlcfJVxBzYZ0NJsQ21UbdJoijPCDrM++SUVEz7+w==}@@ -14752,7 +14784,6 @@ packages:resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}engines: {node: '>=4'}- dev: falseresolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}@@ -15600,7 +15631,6 @@ packages:resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}- dev: falseresolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}@@ -15835,7 +15865,6 @@ packages:engines: {node: '>= 0.8.0'}dependencies:prelude-ls: 1.2.1- dev: falseresolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}@@ -15848,7 +15877,6 @@ packages:resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}engines: {node: '>=10'}- dev: falseresolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}@@ -16167,7 +16195,6 @@ packages:resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}dependencies:punycode: 2.3.0- dev: falseresolution: {integrity: sha512-DOE84vZT2fEcl9gqCUTcnAw5ZY5Id55ikUcziSUntuEFL3pRvavg5kwDmTEUJkeCHInTlV/HexFomgYnzO5kdQ==}diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yamlindex 4e708bd3c5..8ebae13188 100644--- a/pnpm-workspace.yaml+++ b/pnpm-workspace.yaml@@ -1,3 +1,4 @@packages:- - 'packages/*'- - 'apps/*'+ - "packages/*"+ - "apps/*"+ - "fixtures/*"