webstudio 0.143.0 → 0.143.1

package/lib/cli.js

@@ -514,12 +514,6 @@ var prebuild = async (options) => {
     backgroundImageAssetsByPage[page.id] = backgroundImageAssets;
   }
   const assetsToDownload = [];
-  const imageAssets = [];
-  for (const asset of siteData.assets) {
-    if (asset.type === "image") {
-      imageAssets.push(asset);
-    }
-  }
   const appDomain = options.preview ? "wstd.work" : "wstd.io";
   const assetBuildUrl = `https://${domain}.${appDomain}/cgi/asset/`;
   const imageLoader = createImageLoader({
@@ -549,6 +543,7 @@ var prebuild = async (options) => {
       }
     }
   }
+  const assets = new Map(siteData.assets.map((asset) => [asset.id, asset]));
   spinner.text = "Generating css file";
   const { cssText, classesMap } = generateCss(
     {
@@ -641,9 +636,10 @@ var prebuild = async (options) => {
         [rootInstanceId]
       )
     });
-    const favIconAsset = imageAssets.find(
-      (asset) => asset.id === siteData.build.pages.meta?.faviconAssetId
-    );
+    const projectMeta = siteData.build.pages.meta;
+    const pageMeta = pageData.page.meta;
+    const favIconAsset = assets.get(projectMeta?.faviconAssetId ?? "");
+    const socialImageAsset = assets.get(pageMeta.socialImageAssetId ?? "");
     const pageExports = `/* eslint-disable */
 /* This is a auto generated file for building the project */ 
 
@@ -652,14 +648,19 @@ import { Fragment, useState } from "react";
 import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";
 import { useResource } from "@webstudio-is/react-sdk";
 ${componentImports}
-export const favIconAsset: ImageAsset | undefined = ${favIconAsset ? JSON.stringify(favIconAsset) : "undefined"};
+
+export const favIconAsset: ImageAsset | undefined =
+  ${JSON.stringify(favIconAsset)};
+
+export const socialImageAsset: ImageAsset | undefined =
+  ${JSON.stringify(socialImageAsset)};
 
 // Font assets on current page (can be preloaded)
-export const pageFontAssets: FontAsset[] = ${JSON.stringify(pageFontAssets)}
+export const pageFontAssets: FontAsset[] =
+  ${JSON.stringify(pageFontAssets)}
 
-export const pageBackgroundImageAssets: ImageAsset[] = ${JSON.stringify(
-      pageBackgroundImageAssets
-    )}
+export const pageBackgroundImageAssets: ImageAsset[] =
+  ${JSON.stringify(pageBackgroundImageAssets)}
 
 
 
@@ -671,7 +672,7 @@ export { Page }
 /* This is a auto generated file for building the project */ 
 
 
-import type { ImageAsset, ProjectMeta, PageMeta } from "@webstudio-is/sdk";
+import type { ProjectMeta, PageMeta } from "@webstudio-is/sdk";
 ${generateResourcesLoader({
       scope,
       page: pageData.page,
@@ -691,16 +692,11 @@ ${generateRemixParams(pageData.page.path)}
 
 export const projectId = "${siteData.build.projectId}";
 
-export const user: { email: string | null } | undefined = ${JSON.stringify(
-      siteData.user
-    )};
-
-export const projectMeta: ProjectMeta = ${JSON.stringify(
-      siteData.build.pages.meta
-    )};
-
-export const imageAssets: ImageAsset[] = ${JSON.stringify(imageAssets)}
+export const user: { email: string | null } | undefined =
+  ${JSON.stringify(siteData.user)};
 
+export const projectMeta: ProjectMeta =
+  ${JSON.stringify(projectMeta)};
 `;
     const pagePath = getPagePath(pageData.page.id, siteData.build.pages);
     const remixRoute = generateRemixRoute(pagePath);
@@ -925,7 +921,7 @@ import makeCLI from "yargs";
 // package.json
 var package_default = {
   name: "webstudio",
-  version: "0.143.0",
+  version: "0.143.1",
   description: "Webstudio CLI",
   author: "Webstudio <github@webstudio.is>",
   homepage: "https://webstudio.is",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webstudio",
-  "version": "0.143.0",
+  "version": "0.143.1",
   "description": "Webstudio CLI",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -28,21 +28,21 @@
     "title-case": "^4.1.0",
     "yargs": "^17.7.2",
     "zod": "^3.22.4",
-    "@webstudio-is/http-client": "0.143.0",
-    "@webstudio-is/image": "0.143.0",
-    "@webstudio-is/react-sdk": "0.143.0",
-    "@webstudio-is/sdk": "0.143.0",
-    "@webstudio-is/sdk-components-react-radix": "0.143.0",
-    "@webstudio-is/sdk-components-react-remix": "0.143.0",
-    "@webstudio-is/sdk-components-react": "0.143.0"
+    "@webstudio-is/image": "0.143.1",
+    "@webstudio-is/http-client": "0.143.1",
+    "@webstudio-is/react-sdk": "0.143.1",
+    "@webstudio-is/sdk": "0.143.1",
+    "@webstudio-is/sdk-components-react-radix": "0.143.1",
+    "@webstudio-is/sdk-components-react": "0.143.1",
+    "@webstudio-is/sdk-components-react-remix": "0.143.1"
   },
   "devDependencies": {
     "@types/node": "^18.17.1",
     "@types/prompts": "^2.4.5",
     "tsx": "^3.12.8",
     "typescript": "5.2.2",
-    "@webstudio-is/tsconfig": "1.0.7",
-    "@webstudio-is/form-handlers": "0.143.0"
+    "@webstudio-is/form-handlers": "0.143.1",
+    "@webstudio-is/tsconfig": "1.0.7"
   },
   "scripts": {
     "typecheck": "tsc",

package/templates/defaults/__templates__/route-template.tsx

@@ -15,6 +15,7 @@ import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";
 import {
   Page,
   favIconAsset,
+  socialImageAsset,
   pageFontAssets,
   pageBackgroundImageAssets,
 } from "../../../__generated__/_index";
@@ -26,7 +27,6 @@ import {
   projectId,
   user,
   projectMeta,
-  imageAssets,
 } from "../../../__generated__/_index.server";
 
 import css from "../__generated__/index.css";
@@ -150,21 +150,15 @@ export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {
     });
   }
 
-  if (pageMeta.socialImageAssetId) {
-    const imageAsset = imageAssets.find(
-      (asset) => asset.id === pageMeta.socialImageAssetId
-    );
-
-    if (imageAsset) {
-      metas.push({
-        property: "og:image",
-        content: `https://${data.host}${imageLoader({
-          src: imageAsset.name,
-          // Do not transform social image (not enough information do we need to do this)
-          format: "raw",
-        })}`,
-      });
-    }
+  if (socialImageAsset) {
+    metas.push({
+      property: "og:image",
+      content: `https://${data.host}${imageLoader({
+        src: socialImageAsset.name,
+        // Do not transform social image (not enough information do we need to do this)
+        format: "raw",
+      })}`,
+    });
   } else if (pageMeta.socialImageUrl) {
     metas.push({
       property: "og:image",

package/templates/defaults/package.json

@@ -10,13 +10,13 @@
     "@remix-run/react": "^1.19.2",
     "@remix-run/server-runtime": "^1.19.2",
     "@remix-run/node": "^1.19.2",
-    "@webstudio-is/react-sdk": "0.143.0",
-    "@webstudio-is/sdk-components-react-radix": "0.143.0",
-    "@webstudio-is/sdk-components-react-remix": "0.143.0",
-    "@webstudio-is/sdk-components-react": "0.143.0",
-    "@webstudio-is/form-handlers": "0.143.0",
-    "@webstudio-is/image": "0.143.0",
-    "@webstudio-is/sdk": "0.143.0",
+    "@webstudio-is/react-sdk": "0.143.1",
+    "@webstudio-is/sdk-components-react-radix": "0.143.1",
+    "@webstudio-is/sdk-components-react-remix": "0.143.1",
+    "@webstudio-is/sdk-components-react": "0.143.1",
+    "@webstudio-is/form-handlers": "0.143.1",
+    "@webstudio-is/image": "0.143.1",
+    "@webstudio-is/sdk": "0.143.1",
     "isbot": "^3.6.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"