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.

chore: Update fixtures date (#4138)

Ivan Starkovf653a116e7fd
diff --git a/.github/workflows/fixtures-test.yml b/.github/workflows/fixtures-test.yml
index b9920971a6..7d77b098c2 100644
--- a/.github/workflows/fixtures-test.yml
+++ b/.github/workflows/fixtures-test.yml
@@ -54,8 +54,9 @@ jobs:
# This command will fail if there are uncommitted changes, i.e something has broken
run: git diff --name-only HEAD --exit-code
- - name: Show changed files
+ - name: Show changed files and diff
if: ${{ failure() }}
run: |
echo "Changed files are:"
git diff --name-only HEAD
+ git diff HEAD | head -n 1000
diff --git a/apps/builder/app/routes/rest.assets.tsx b/apps/builder/app/routes/rest.assets.tsx
index 9e37c996a8..7b710b38fb 100644
--- a/apps/builder/app/routes/rest.assets.tsx
+++ b/apps/builder/app/routes/rest.assets.tsx
@@ -12,6 +12,7 @@ import { createContext } from "~/shared/context.server";
import env from "~/env/env.server";
import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";
import { checkCsrf } from "~/services/csrf-session.server";
+import { parseError } from "~/shared/error/error-parse";
export const loader = async ({
params,
@@ -55,11 +56,10 @@ export const action = async (props: ActionFunctionArgs) => {
};
}
} catch (error) {
- if (error instanceof Error) {
- console.error({ error });
- return {
- errors: error.message,
- };
- }
+ console.error(error);
+
+ return {
+ errors: parseError(error).message,
+ };
}
};
diff --git a/apps/builder/app/routes/rest.assets_.$name.tsx b/apps/builder/app/routes/rest.assets_.$name.tsx
index 9e14047fe5..ca54b16bb2 100644
--- a/apps/builder/app/routes/rest.assets_.$name.tsx
+++ b/apps/builder/app/routes/rest.assets_.$name.tsx
@@ -7,6 +7,7 @@ import { createAssetClient } from "~/shared/asset-client";
import { createContext } from "~/shared/context.server";
import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";
import { checkCsrf } from "~/services/csrf-session.server";
+import { parseError } from "~/shared/error/error-parse";
const UrlBody = z.object({
url: z.string(),
@@ -68,11 +69,10 @@ export const action = async (
};
}
} catch (error) {
- if (error instanceof Error) {
- console.error({ error });
- return {
- errors: error.message,
- };
- }
+ console.error(error);
+
+ return {
+ errors: parseError(error).message,
+ };
}
};
diff --git a/apps/builder/app/routes/rest.build.$buildId.tsx b/apps/builder/app/routes/rest.build.$buildId.tsx
index e6c8b643d1..89fd71f466 100644
--- a/apps/builder/app/routes/rest.build.$buildId.tsx
+++ b/apps/builder/app/routes/rest.build.$buildId.tsx
@@ -1,4 +1,8 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import {
+ json,
+ type LoaderFunctionArgs,
+ type TypedResponse,
+} from "@remix-run/server-runtime";
import type { Data } from "@webstudio-is/http-client";
import { db as projectDb } from "@webstudio-is/project/index.server";
import { loadProductionCanvasData } from "~/shared/db";
@@ -7,15 +11,17 @@ import { getUserById, type User } from "~/shared/db/user.server";
import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";
import { allowedDestinations } from "~/services/destinations.server";
import { isDashboard } from "~/shared/router-utils";
+import { parseError } from "~/shared/error/error-parse";
export const loader = async ({
params,
request,
}: LoaderFunctionArgs): Promise<
- Data & { user: { email: User["email"] } | undefined } & {
- projectDomain: string;
- projectTitle: string;
- }
+ | (Data & { user: { email: User["email"] } | undefined } & {
+ projectDomain: string;
+ projectTitle: string;
+ })
+ | TypedResponse<{ error: string; message: string }>
> => {
if (false === isDashboard(request)) {
throw new Response("Not Found", {
@@ -63,10 +69,10 @@ export const loader = async ({
throw error;
}
- console.error({ error });
+ console.error(error);
// We have no idea what happened, so we'll return a 500 error.
- throw json(error instanceof Error ? error.message : String(error), {
+ throw json(parseError(error), {
status: 500,
});
}
diff --git a/apps/builder/app/routes/rest.buildId.$projectId.tsx b/apps/builder/app/routes/rest.buildId.$projectId.tsx
index 360315fec0..a6d43b6efe 100644
--- a/apps/builder/app/routes/rest.buildId.$projectId.tsx
+++ b/apps/builder/app/routes/rest.buildId.$projectId.tsx
@@ -1,8 +1,13 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import {
+ json,
+ type LoaderFunctionArgs,
+ type TypedResponse,
+} from "@remix-run/server-runtime";
import { db as projectDb } from "@webstudio-is/project/index.server";
import { allowedDestinations } from "~/services/destinations.server";
import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";
import { createContext } from "~/shared/context.server";
+import { parseError } from "~/shared/error/error-parse";
import { isDashboard } from "~/shared/router-utils";
// This loader is only accessible from the dashboard origin
@@ -10,7 +15,9 @@ import { isDashboard } from "~/shared/router-utils";
export const loader = async ({
params,
request,
-}: LoaderFunctionArgs): Promise<{ buildId: string | null }> => {
+}: LoaderFunctionArgs): Promise<
+ { buildId: string | null } | TypedResponse<{ error: string; message: string }>
+> => {
if (false === isDashboard(request)) {
throw new Response("Not Found", {
status: 404,
@@ -46,10 +53,9 @@ export const loader = async ({
throw error;
}
- console.error({ error });
+ console.error(error);
- // We have no idea what happened, so we'll return a 500 error.
- throw json(error instanceof Error ? error.message : String(error), {
+ throw json(parseError(error), {
status: 500,
});
}
diff --git a/apps/builder/app/shared/error/error-boundary.tsx b/apps/builder/app/shared/error/error-boundary.tsx
index 3757afd2a7..041d2b5a6d 100644
--- a/apps/builder/app/shared/error/error-boundary.tsx
+++ b/apps/builder/app/shared/error/error-boundary.tsx
@@ -1,75 +1,17 @@
-import { isRouteErrorResponse, useRouteError } from "@remix-run/react";
+import { useRouteError } from "@remix-run/react";
import { ClientOnly } from "../client-only";
import { lazy } from "react";
-import { z } from "zod";
+import { parseError } from "./error-parse";
const ErrorMessage = lazy(async () => {
const { ErrorMessage } = await import("./error-message.client");
return { default: ErrorMessage };
});
-const PageError = z.union([
- z.string().transform((message) => ({ message, description: undefined })),
- z.object({
- message: z.string(),
- description: z.string().optional(),
- }),
-]);
-
-const parseErrorObject = (
- error: unknown
-): {
- status: number;
- statusText?: string;
- message: string;
- description?: string;
-} => {
- if (error instanceof Error) {
- return {
- message: error.message,
- status: 500,
- };
- }
-
- if (isRouteErrorResponse(error)) {
- const parsed = PageError.safeParse(error.data);
-
- if (parsed.success) {
- return {
- message: parsed.data.message,
- description: parsed.data.description,
- status: error.status,
- statusText: error.statusText,
- };
- }
-
- return {
- message: error.data ? JSON.stringify(error.data) : "unknown error",
- status: error.status,
- statusText: error.statusText,
- };
- }
-
- const parsed = PageError.safeParse(error);
- if (parsed.success) {
- return {
- message: parsed.data.message,
- description: parsed.data.description,
- status: 1001,
- };
- }
-
- return {
- message: JSON.stringify(error ?? "unknown error"),
- status: 1001,
- statusText: undefined,
- };
-};
-
export const ErrorBoundary = () => {
const rawError = useRouteError();
- const error = parseErrorObject(rawError);
+ const error = parseError(rawError);
return (
<ClientOnly>
diff --git a/apps/builder/app/shared/error/error-parse.ts b/apps/builder/app/shared/error/error-parse.ts
new file mode 100644
index 0000000000..188d4d5e9e
--- /dev/null
+++ b/apps/builder/app/shared/error/error-parse.ts
@@ -0,0 +1,73 @@
+import { isRouteErrorResponse } from "@remix-run/react";
+import { z } from "zod";
+
+// Currently, we have multiple error formats, and not all of them are covered here.
+// We should consolidate these formats into a single, unified format for consistency.
+const PageError = z.union([
+ z.string().transform((message) => ({ message, description: undefined })),
+ z
+ .object({
+ message: z.string(),
+ details: z.string(),
+ hint: z.string().nullable(),
+ code: z.string(),
+ })
+ .transform(({ message, details, hint, code }) => ({
+ message,
+ description: `details: ${details}; hint: ${hint}; code: ${code}`,
+ })),
+ z.object({
+ message: z.string(),
+ description: z.string().optional(),
+ }),
+]);
+
+export const parseError = (
+ error: unknown
+): {
+ status: number;
+ statusText?: string;
+ message: string;
+ description?: string;
+} => {
+ if (error instanceof Error) {
+ return {
+ message: error.message,
+ status: 500,
+ };
+ }
+
+ if (isRouteErrorResponse(error)) {
+ const parsed = PageError.safeParse(error.data);
+
+ if (parsed.success) {
+ return {
+ message: parsed.data.message,
+ description: parsed.data.description,
+ status: error.status,
+ statusText: error.statusText,
+ };
+ }
+
+ return {
+ message: error.data ? JSON.stringify(error.data) : "unknown error",
+ status: error.status,
+ statusText: error.statusText,
+ };
+ }
+
+ const parsed = PageError.safeParse(error);
+ if (parsed.success) {
+ return {
+ message: parsed.data.message,
+ description: parsed.data.description,
+ status: 1001,
+ };
+ }
+
+ return {
+ message: JSON.stringify(error ?? "unknown error"),
+ status: 1001,
+ statusText: undefined,
+ };
+};
diff --git a/fixtures/ssg-netlify-by-project-id/.webstudio/data.json b/fixtures/ssg-netlify-by-project-id/.webstudio/data.json
index f17781884c..de8de364db 100644
--- a/fixtures/ssg-netlify-by-project-id/.webstudio/data.json
+++ b/fixtures/ssg-netlify-by-project-id/.webstudio/data.json
@@ -3,7 +3,7 @@
"id": "1e6d93b8-3faa-4155-8628-dd31cafaf00e",
"projectId": "8a7358b1-7de3-459d-b7b1-56dddfb6ce1e",
"version": 2,
- "createdAt": "2024-09-03T04:32:12.506",
+ "createdAt": "2024-09-03T04:32:12.506+00:00",
"updatedAt": "2024-09-03T04:32:12.506+00:00",
"pages": {
"meta": {},
diff --git a/fixtures/ssg/.webstudio/data.json b/fixtures/ssg/.webstudio/data.json
index 56bf884ddf..055165a01f 100644
--- a/fixtures/ssg/.webstudio/data.json
+++ b/fixtures/ssg/.webstudio/data.json
@@ -3,7 +3,7 @@
"id": "a2e8de30-03d5-4514-a3a6-406b3266a3af",
"projectId": "d845c167-ea07-4875-b08d-83e97c09dcce",
"version": 38,
- "createdAt": "2024-07-29T12:50:07.515",
+ "createdAt": "2024-07-29T12:50:07.515+00:00",
"updatedAt": "2024-07-29T12:50:07.515+00:00",
"pages": {
"meta": {
@@ -468,7 +468,7 @@
"size": 999,
"type": "image",
"format": "svg",
- "createdAt": "2024-07-26T13:39:48.678",
+ "createdAt": "2024-07-26T13:39:48.678+00:00",
"meta": {
"width": 14,
"height": 16
diff --git a/fixtures/webstudio-cloudflare-template/.webstudio/data.json b/fixtures/webstudio-cloudflare-template/.webstudio/data.json
index 56bf884ddf..055165a01f 100644
--- a/fixtures/webstudio-cloudflare-template/.webstudio/data.json
+++ b/fixtures/webstudio-cloudflare-template/.webstudio/data.json
@@ -3,7 +3,7 @@
"id": "a2e8de30-03d5-4514-a3a6-406b3266a3af",
"projectId": "d845c167-ea07-4875-b08d-83e97c09dcce",
"version": 38,
- "createdAt": "2024-07-29T12:50:07.515",
+ "createdAt": "2024-07-29T12:50:07.515+00:00",
"updatedAt": "2024-07-29T12:50:07.515+00:00",
"pages": {
"meta": {
@@ -468,7 +468,7 @@
"size": 999,
"type": "image",
"format": "svg",
- "createdAt": "2024-07-26T13:39:48.678",
+ "createdAt": "2024-07-26T13:39:48.678+00:00",
"meta": {
"width": 14,
"height": 16
diff --git a/fixtures/webstudio-custom-template/.webstudio/data.json b/fixtures/webstudio-custom-template/.webstudio/data.json
index d6144ae77d..dfd7519593 100644
--- a/fixtures/webstudio-custom-template/.webstudio/data.json
+++ b/fixtures/webstudio-custom-template/.webstudio/data.json
@@ -3,7 +3,7 @@
"id": "d48c7c5e-fdd3-4ef6-9173-ff2eaaf851d9",
"projectId": "0d856812-61d8-4014-a20a-82e01c0eb8ee",
"version": 244,
- "createdAt": "2024-05-06T21:23:44.086",
+ "createdAt": "2024-05-06T21:23:44.086+00:00",
"updatedAt": "2024-05-06T21:23:44.086+00:00",
"pages": {
"meta": {
@@ -2290,7 +2290,7 @@
"projectId": "0d856812-61d8-4014-a20a-82e01c0eb8ee",
"size": 156212,
"type": "font",
- "createdAt": "2024-02-22T05:36:52.004",
+ "createdAt": "2024-02-22T05:36:52.004+00:00",
"format": "woff2",
"meta": {
"family": "Cormorant Garamond",
@@ -2306,7 +2306,7 @@
"size": 3350,
"type": "image",
"format": "svg",
- "createdAt": "2023-10-30T20:35:47.113",
+ "createdAt": "2023-10-30T20:35:47.113+00:00",
"meta": {
"width": 16,
"height": 16
@@ -2320,7 +2320,7 @@
"size": 210614,
"type": "image",
"format": "jpg",
- "createdAt": "2024-03-26T18:31:04.086",
+ "createdAt": "2024-03-26T18:31:04.086+00:00",
"meta": {
"width": 1024,
"height": 1024
diff --git a/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx b/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx
index 1c00232bbd..a3f0332849 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx
+++ b/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx
@@ -23,7 +23,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 3350,
type: "image",
format: "svg",
- createdAt: "2023-10-30T20:35:47.113",
+ createdAt: "2023-10-30T20:35:47.113+00:00",
meta: { width: 16, height: 16 },
};
diff --git a/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.tsx b/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.tsx
index 786df3d03e..a8befd76df 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.tsx
+++ b/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.tsx
@@ -16,7 +16,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 3350,
type: "image",
format: "svg",
- createdAt: "2023-10-30T20:35:47.113",
+ createdAt: "2023-10-30T20:35:47.113+00:00",
meta: { width: 16, height: 16 },
};
diff --git a/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx b/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx
index 9ccb72d281..6f3314924c 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx
+++ b/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx
@@ -17,7 +17,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 3350,
type: "image",
format: "svg",
- createdAt: "2023-10-30T20:35:47.113",
+ createdAt: "2023-10-30T20:35:47.113+00:00",
meta: { width: 16, height: 16 },
};
diff --git a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx b/fixtures/webstudio-custom-template/app/__generated__/_index.tsx
index 358631c4c8..862b5f704c 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx
+++ b/fixtures/webstudio-custom-template/app/__generated__/_index.tsx
@@ -29,7 +29,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 3350,
type: "image",
format: "svg",
- createdAt: "2023-10-30T20:35:47.113",
+ createdAt: "2023-10-30T20:35:47.113+00:00",
meta: { width: 16, height: 16 },
};
@@ -42,7 +42,7 @@ export const pageFontAssets: FontAsset[] = [
projectId: "0d856812-61d8-4014-a20a-82e01c0eb8ee",
size: 156212,
type: "font",
- createdAt: "2024-02-22T05:36:52.004",
+ createdAt: "2024-02-22T05:36:52.004+00:00",
format: "woff2",
meta: { family: "Cormorant Garamond", style: "normal", weight: 500 },
},
@@ -57,7 +57,7 @@ export const pageBackgroundImageAssets: ImageAsset[] = [
size: 3350,
type: "image",
format: "svg",
- createdAt: "2023-10-30T20:35:47.113",
+ createdAt: "2023-10-30T20:35:47.113+00:00",
meta: { width: 16, height: 16 },
},
];
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/data.json b/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/data.json
index 56bf884ddf..055165a01f 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/data.json
+++ b/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/data.json
@@ -3,7 +3,7 @@
"id": "a2e8de30-03d5-4514-a3a6-406b3266a3af",
"projectId": "d845c167-ea07-4875-b08d-83e97c09dcce",
"version": 38,
- "createdAt": "2024-07-29T12:50:07.515",
+ "createdAt": "2024-07-29T12:50:07.515+00:00",
"updatedAt": "2024-07-29T12:50:07.515+00:00",
"pages": {
"meta": {
@@ -468,7 +468,7 @@
"size": 999,
"type": "image",
"format": "svg",
- "createdAt": "2024-07-26T13:39:48.678",
+ "createdAt": "2024-07-26T13:39:48.678+00:00",
"meta": {
"width": 14,
"height": 16
diff --git a/fixtures/webstudio-remix-netlify-functions/.webstudio/data.json b/fixtures/webstudio-remix-netlify-functions/.webstudio/data.json
index 56bf884ddf..055165a01f 100644
--- a/fixtures/webstudio-remix-netlify-functions/.webstudio/data.json
+++ b/fixtures/webstudio-remix-netlify-functions/.webstudio/data.json
@@ -3,7 +3,7 @@
"id": "a2e8de30-03d5-4514-a3a6-406b3266a3af",
"projectId": "d845c167-ea07-4875-b08d-83e97c09dcce",
"version": 38,
- "createdAt": "2024-07-29T12:50:07.515",
+ "createdAt": "2024-07-29T12:50:07.515+00:00",
"updatedAt": "2024-07-29T12:50:07.515+00:00",
"pages": {
"meta": {
@@ -468,7 +468,7 @@
"size": 999,
"type": "image",
"format": "svg",
- "createdAt": "2024-07-26T13:39:48.678",
+ "createdAt": "2024-07-26T13:39:48.678+00:00",
"meta": {
"width": 14,
"height": 16
diff --git a/fixtures/webstudio-remix-vercel/.webstudio/data.json b/fixtures/webstudio-remix-vercel/.webstudio/data.json
index 33f754bda1..f287c2d2ec 100644
--- a/fixtures/webstudio-remix-vercel/.webstudio/data.json
+++ b/fixtures/webstudio-remix-vercel/.webstudio/data.json
@@ -1,10 +1,10 @@
{
"build": {
- "id": "0f80ffe8-7059-4577-8ef3-232f3aded028",
+ "id": "5df1744d-0383-4775-819c-1648300d55cd",
"projectId": "cddc1d44-af37-4cb6-a430-d300cf6f932d",
"version": 300,
- "createdAt": "2024-08-07T15:25:00.822",
- "updatedAt": "2024-08-07T15:25:00.822+00:00",
+ "createdAt": "2024-09-19T19:27:53.953+00:00",
+ "updatedAt": "2024-09-19T19:27:53.953+00:00",
"pages": {
"meta": {
"siteName": "KittyGuardedZone",
@@ -3498,8 +3498,7 @@
"destination": "saas",
"domains": [],
"projectDomain": "webstudio-fixture-project-a-0su3o"
- },
- "marketplaceProduct": {}
+ }
},
"page": {
"id": "7Db64ZXgYiRqKSQNR-qTQ",
@@ -3653,7 +3652,7 @@
"size": 268326,
"type": "image",
"format": "png",
- "createdAt": "2023-10-30T13:51:08.416",
+ "createdAt": "2023-10-30T13:51:08.416+00:00",
"meta": {
"width": 790,
"height": 786
@@ -3667,7 +3666,7 @@
"size": 2906,
"type": "image",
"format": "webp",
- "createdAt": "2023-09-12T09:44:22.12",
+ "createdAt": "2023-09-12T09:44:22.12+00:00",
"meta": {
"width": 100,
"height": 100
@@ -3681,7 +3680,7 @@
"size": 210614,
"type": "image",
"format": "jpeg",
- "createdAt": "2023-09-06T11:28:43.031",
+ "createdAt": "2023-09-06T11:28:43.031+00:00",
"meta": {
"width": 1024,
"height": 1024
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/$resources.sitemap.xml.ts b/fixtures/webstudio-remix-vercel/app/__generated__/$resources.sitemap.xml.ts
index 9b9443cc7d..b67b1cd10c 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/$resources.sitemap.xml.ts
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/$resources.sitemap.xml.ts
@@ -1,26 +1,26 @@
export const sitemap = [
{
path: "/",
- lastModified: "2024-08-07",
+ lastModified: "2024-09-19",
},
{
path: "/_route_with_symbols_",
- lastModified: "2024-08-07",
+ lastModified: "2024-09-19",
},
{
path: "/form",
- lastModified: "2024-08-07",
+ lastModified: "2024-09-19",
},
{
path: "/heading-with-id",
- lastModified: "2024-08-07",
+ lastModified: "2024-09-19",
},
{
path: "/resources",
- lastModified: "2024-08-07",
+ lastModified: "2024-09-19",
},
{
path: "/nested/nested-page",
- lastModified: "2024-08-07",
+ lastModified: "2024-09-19",
},
];
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx
index e6a7b6696f..3234e4ad59 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx
@@ -17,7 +17,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 268326,
type: "image",
format: "png",
- createdAt: "2023-10-30T13:51:08.416",
+ createdAt: "2023-10-30T13:51:08.416+00:00",
meta: { width: 790, height: 786 },
};
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[expressions]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[expressions]._index.tsx
index 3801a35a0e..24c431a0f1 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[expressions]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[expressions]._index.tsx
@@ -20,7 +20,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 268326,
type: "image",
format: "png",
- createdAt: "2023-10-30T13:51:08.416",
+ createdAt: "2023-10-30T13:51:08.416+00:00",
meta: { width: 790, height: 786 },
};
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx
index a597124dc4..bdb5313926 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx
@@ -26,7 +26,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 268326,
type: "image",
format: "png",
- createdAt: "2023-10-30T13:51:08.416",
+ createdAt: "2023-10-30T13:51:08.416+00:00",
meta: { width: 790, height: 786 },
};
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx
index ca4b2018dc..c7239c7f85 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx
@@ -17,7 +17,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 268326,
type: "image",
format: "png",
- createdAt: "2023-10-30T13:51:08.416",
+ createdAt: "2023-10-30T13:51:08.416+00:00",
meta: { width: 790, height: 786 },
};
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx
index 30d94830ee..36902bb991 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx
@@ -17,7 +17,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 268326,
type: "image",
format: "png",
- createdAt: "2023-10-30T13:51:08.416",
+ createdAt: "2023-10-30T13:51:08.416+00:00",
meta: { width: 790, height: 786 },
};
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx
index cba34ac6b2..0b5afb1ce4 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx
@@ -28,7 +28,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 268326,
type: "image",
format: "png",
- createdAt: "2023-10-30T13:51:08.416",
+ createdAt: "2023-10-30T13:51:08.416+00:00",
meta: { width: 790, height: 786 },
};
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx
index 504cf3c5c7..e8ed028308 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx
@@ -20,7 +20,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 268326,
type: "image",
format: "png",
- createdAt: "2023-10-30T13:51:08.416",
+ createdAt: "2023-10-30T13:51:08.416+00:00",
meta: { width: 790, height: 786 },
};
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx
index 151eca28c3..af3fb0025f 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx
@@ -26,7 +26,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 268326,
type: "image",
format: "png",
- createdAt: "2023-10-30T13:51:08.416",
+ createdAt: "2023-10-30T13:51:08.416+00:00",
meta: { width: 790, height: 786 },
};
diff --git a/fixtures/webstudio-remix-vercel/package.json b/fixtures/webstudio-remix-vercel/package.json
index a30463d4b3..a41b39d7cc 100644
--- a/fixtures/webstudio-remix-vercel/package.json
+++ b/fixtures/webstudio-remix-vercel/package.json
@@ -6,7 +6,7 @@
"typecheck": "tsc",
"cli": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio",
"fixtures:link": "pnpm cli link --link https://p-cddc1d44-af37-4cb6-a430-d300cf6f932d-dot-${BUILDER_HOST:-main.development.webstudio.is}'?authToken=1cdc6026-dd5b-4624-b89b-9bd45e9bcc3d'",
- "fixtures:sync": "pnpm cli sync --buildId 0f80ffe8-7059-4577-8ef3-232f3aded028 && pnpm prettier --write ./.webstudio/",
+ "fixtures:sync": "pnpm cli sync --buildId 5df1744d-0383-4775-819c-1648300d55cd && pnpm prettier --write ./.webstudio/",
"fixtures:build": "pnpm cli build --template vercel --template internal --preview && pnpm prettier --write ./app/ ./package.json ./tsconfig.json"
},
"private": true,
diff --git a/package.json b/package.json
index 6c07c61806..831536c750 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "packageManager": "[email protected]",
+ "packageManager": "[email protected]",
"name": "webstudio-root",
"version": "0.0.0",
"private": true,
@@ -57,7 +57,7 @@
},
"engines": {
"node": "20",
- "pnpm": "9.0",
+ "pnpm": "9.10.0",
"yarn": "This project is configured to use pnpm"
},
"nano-staged": {
diff --git a/packages/cli/src/commands/link.ts b/packages/cli/src/commands/link.ts
index 5d2dd4a56b..a0580dcdfe 100644
--- a/packages/cli/src/commands/link.ts
+++ b/packages/cli/src/commands/link.ts
@@ -17,7 +17,11 @@ import type {
} from "./yargs-types";
const parseShareLink = (value: string) => {
- const url = new URL(value);
+ // value.replaceAll("'", "") is used to remove single quotes from the URL on Windows.
+ // This is necessary because the following pnpm script works on macOS and Linux but fails here on Windows:
+ // "fixtures:link": "pnpm cli link --link https://p-cddc1d44-af37-4cb6-a430-d300cf6f932d-dot-${BUILDER_HOST:-main.development.webstudio.is}'?authToken=1cdc6026-dd5b-4624-b89b-9bd45e9bcc3d'",
+ // On Windows, single quotes are incorrectly included in the URL.
+ const url = new URL(value.replaceAll("'", ""));
const token = url.searchParams.get("authToken");
diff --git a/packages/cli/src/commands/sync.ts b/packages/cli/src/commands/sync.ts
index 8779ddbc7e..3e28da3aec 100644
--- a/packages/cli/src/commands/sync.ts
+++ b/packages/cli/src/commands/sync.ts
@@ -103,7 +103,8 @@ export const sync = async (
} catch (error) {
// catch errors about unpublished project
syncing.stop((error as Error).message, 2);
- return;
+
+ throw error;
}
}