webstudio 0.111.1-3138155.0 → 0.113.0

package/lib/cli.js

@@ -357,6 +357,11 @@ var prebuild = async (options) => {
   const spinner = ora2("Scaffolding the project files");
   spinner.start();
   spinner.text = "Generating files";
+  const appRoot = "app";
+  const generatedDir = join4(appRoot, "__generated__");
+  await rm(generatedDir, { recursive: true, force: true });
+  const routesDir = join4(appRoot, "routes");
+  await rm(routesDir, { recursive: true, force: true });
   await copyTemplates();
   if (options.template !== void 0) {
     await copyTemplates(options.template);
@@ -497,11 +502,6 @@ var prebuild = async (options) => {
     }
   }
   spinner.text = "Generating routes and pages";
-  const appRoot = "app";
-  const generatedDir = join4(appRoot, "__generated__");
-  await rm(generatedDir, { recursive: true, force: true });
-  const routesDir = join4(appRoot, "routes");
-  await rm(routesDir, { recursive: true, force: true });
   const routeFileTemplate = await readFile4(
     normalize(
       join4(
@@ -627,6 +627,21 @@ ${utilsExport}
     }
   );
   await ensureFileInPath(join4(generatedDir, "index.css"), cssText);
+  await writeFile4(
+    join4(generatedDir, "[sitemap.xml].ts"),
+    `
+      export const sitemap = ${JSON.stringify(
+      {
+        pages: siteData.pages.map((page) => ({
+          path: page.path,
+          lastModified: siteData.build.updatedAt
+        }))
+      },
+      null,
+      2
+    )};
+    `
+  );
   spinner.text = "Downloading fonts and images";
   await Promise.all(assetsToDownload);
   spinner.succeed("Build finished");
@@ -791,7 +806,7 @@ import makeCLI from "yargs";
 // package.json
 var package_default = {
   name: "webstudio",
-  version: "0.111.1-3138155.0",
+  version: "0.113.0",
   description: "Webstudio CLI",
   author: "Webstudio <github@webstudio.is>",
   homepage: "https://webstudio.is",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webstudio",
-  "version": "0.111.1-3138155.0",
+  "version": "0.113.0",
   "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.21.4",
-    "@webstudio-is/http-client": "0.111.1-3138155.0",
-    "@webstudio-is/image": "0.111.1-3138155.0",
-    "@webstudio-is/react-sdk": "0.111.1-3138155.0",
-    "@webstudio-is/sdk": "0.111.1-3138155.0",
-    "@webstudio-is/sdk-components-react": "0.111.1-3138155.0",
-    "@webstudio-is/sdk-components-react-radix": "0.111.1-3138155.0",
-    "@webstudio-is/sdk-components-react-remix": "0.111.1-3138155.0"
+    "@webstudio-is/http-client": "0.113.0",
+    "@webstudio-is/image": "0.113.0",
+    "@webstudio-is/react-sdk": "0.113.0",
+    "@webstudio-is/sdk": "0.113.0",
+    "@webstudio-is/sdk-components-react": "0.113.0",
+    "@webstudio-is/sdk-components-react-radix": "0.113.0",
+    "@webstudio-is/sdk-components-react-remix": "0.113.0"
   },
   "devDependencies": {
     "@types/node": "^18.17.1",
     "@types/prompts": "^2.4.5",
     "tsx": "^3.12.8",
     "typescript": "5.2.2",
-    "@webstudio-is/form-handlers": "0.111.1-3138155.0",
-    "@webstudio-is/tsconfig": "1.0.8-3138155.0"
+    "@webstudio-is/form-handlers": "0.113.0",
+    "@webstudio-is/tsconfig": "1.0.7"
   },
   "scripts": {
     "typecheck": "tsc",

package/templates/defaults/app/__generated__/[sitemap.xml].ts

@@ -0,0 +1,11 @@
+/**
+ * The only intent of this file is to support typings inside ../routes/[sitemap.xml].tsx for easier development.
+ **/
+export const sitemap = {
+  pages: [
+    {
+      path: "",
+      lastModified: "2021-10-13T12:00:00.000Z",
+    },
+  ],
+};

package/templates/defaults/app/extension.ts

@@ -0,0 +1,9 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import { AppLoadContext } from "@remix-run/server-runtime";
+
+declare module "@remix-run/server-runtime" {
+  interface AppLoadContext {
+    EXCLUDE_FROM_SEARCH: boolean;
+  }
+}

package/templates/defaults/app/routes/[robots.txt].tsx

@@ -0,0 +1,24 @@
+import type { LoaderArgs } from "@remix-run/server-runtime";
+
+export const loader = (arg: LoaderArgs) => {
+  const host =
+    arg.request.headers.get("x-forwarded-host") ||
+    arg.request.headers.get("host") ||
+    "";
+
+  return new Response(
+    `
+User-agent: *
+Disallow: /api/
+
+Sitemap: https://${host}/sitemap.xml
+
+  `,
+    {
+      headers: {
+        "Content-Type": "text/plain",
+      },
+      status: 200,
+    }
+  );
+};

package/templates/defaults/app/routes/[sitemap.xml].tsx

@@ -0,0 +1,34 @@
+import type { LoaderArgs } from "@remix-run/server-runtime";
+import { sitemap } from "../__generated__/[sitemap.xml]";
+
+export const loader = (arg: LoaderArgs) => {
+  const host =
+    arg.request.headers.get("x-forwarded-host") ||
+    arg.request.headers.get("host") ||
+    "";
+
+  const urls = sitemap.pages.map((page) => {
+    const url = new URL(`https://${host}${page.path}`);
+
+    return `
+  <url>
+    <loc>${url.href}</loc>
+    <lastmod>${page.lastModified.split("T")[0]}</lastmod>
+  </url>
+    `;
+  });
+
+  return new Response(
+    `<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+${urls.join("")}
+</urlset>
+  `,
+    {
+      headers: {
+        "Content-Type": "application/xml",
+      },
+      status: 200,
+    }
+  );
+};

package/templates/route-template.tsx

@@ -34,19 +34,56 @@ export const loader = async (arg: LoaderArgs) => {
     arg.request.headers.get("x-forwarded-host") ||
     arg.request.headers.get("host") ||
     "";
-  return json({ host });
+
+  const url = new URL(arg.request.url);
+  url.host = host;
+  url.protocol = "https";
+
+  // typecheck
+  arg.context.EXCLUDE_FROM_SEARCH satisfies boolean;
+
+  return json(
+    {
+      host,
+      url: url.href,
+      excludeFromSearch: arg.context.EXCLUDE_FROM_SEARCH,
+    },
+    // No way for current information to change, so add cache for 10 minutes
+    // In case of CRM Data, this should be set to 0
+    { headers: { "Cache-Control": "public, max-age=600" } }
+  );
+};
+
+export const headers = () => {
+  return {
+    "Cache-Control": "public, max-age=0, must-revalidate",
+  };
 };
 
 export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {
   const { page, site } = pageData;
 
-  const metas: ReturnType<V2_ServerRuntimeMetaFunction> = [
-    { title: page.title },
-    {
+  const metas: ReturnType<V2_ServerRuntimeMetaFunction> = [];
+
+  if (data?.url) {
+    metas.push({
+      property: "og:url",
+      content: data.url,
+    });
+  }
+
+  if (page.title) {
+    metas.push({ title: page.title });
+
+    metas.push({
       property: "og:title",
       content: page.title,
-    },
-  ];
+    });
+  }
+
+  metas.push({ property: "og:type", content: "website" });
+
+  const origin = `https://${data?.host}`;
 
   if (site?.siteName) {
     metas.push({
@@ -56,13 +93,20 @@ export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {
     metas.push({
       "script:ld+json": {
         "@context": "https://schema.org",
-        "@type": "Organization",
+        "@type": "WebSite",
         name: site.siteName,
-        url: `https://${data?.host}`,
+        url: origin,
       },
     });
   }
 
+  if (page.meta.excludePageFromSearch || data?.excludeFromSearch) {
+    metas.push({
+      name: "robots",
+      content: "noindex, nofollow",
+    });
+  }
+
   if (page.meta.description) {
     metas.push({
       name: "description",
@@ -82,15 +126,22 @@ export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {
     if (imageAsset) {
       metas.push({
         property: "og:image",
-        content: imageLoader({
+        content: `https://${data?.host}${imageLoader({
           src: imageAsset.name,
           // Do not transform social image (not enough information do we need to do this)
           format: "raw",
-        }),
+        })}`,
       });
     }
   }
 
+  for (const customMeta of page.meta.custom ?? []) {
+    if (customMeta.property.trim().length === 0) {
+      continue;
+    }
+    metas.push(customMeta);
+  }
+
   return metas;
 };