Merge branch 'main' into chore/update-env-template

Author: kenjonespizza

manual-installation.md

@@ -48,7 +48,7 @@ If you want to start with some sample content, you can import the provided datas
 To import the dataset, run the following command in your terminal:
 
 ```bash
-npx sanity dataset import demoData.tar.gz production
+npx sanity dataset import sample-data.tar.gz production
 ```
 
 This assumes your dataset is named `production`. If your dataset is named differently, replace `production` with the name of your dataset.

nextjs-app/app/sitemap.ts

@@ -0,0 +1,61 @@
+import { MetadataRoute } from "next";
+import { sanityFetch } from "@/sanity/lib/live";
+import { sitemapData } from "@/sanity/lib/queries";
+import { headers } from "next/headers";
+
+/**
+ * This file creates a sitemap (sitemap.xml) for the application. Learn more about sitemaps in Next.js here: https://nextjs.org/docs/app/api-reference/file-conventions/metadata/sitemap
+ * Be sure to update the `changeFrequency` and `priority` values to match your application's content.
+ */
+
+export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
+  const allPostsAndPages = await sanityFetch({
+    query: sitemapData,
+  });
+  const headersList = await headers();
+  const sitemap: MetadataRoute.Sitemap = [];
+  const domain: String = headersList.get("host") as string;
+  sitemap.push({
+    url: domain as string,
+    lastModified: new Date(),
+    priority: 1,
+    changeFrequency: "monthly",
+  });
+
+  if (allPostsAndPages != null && allPostsAndPages.data.length != 0) {
+    let priority: number;
+    let changeFrequency:
+      | "monthly"
+      | "always"
+      | "hourly"
+      | "daily"
+      | "weekly"
+      | "yearly"
+      | "never"
+      | undefined;
+    let url: string;
+
+    for (const p of allPostsAndPages.data) {
+      switch (p._type) {
+        case "page":
+          priority = 0.8;
+          changeFrequency = "monthly";
+          url = `${domain}/${p.slug}`;
+          break;
+        case "post":
+          priority = 0.5;
+          changeFrequency = "never";
+          url = `${domain}/posts/${p.slug}`;
+          break;
+      }
+      sitemap.push({
+        lastModified: p._updatedAt || new Date(),
+        priority,
+        changeFrequency,
+        url,
+      });
+    }
+  }
+
+  return sitemap;
+}

nextjs-app/sanity.types.ts

@@ -505,7 +505,7 @@ export type SettingsQueryResult = {
   };
 } | null;
 // Variable: getPageQuery
-// Query: *[_type == 'page' && slug.current == $slug][0]{    _id,    _type,    name,    slug,    heading,    subheading,    "pageBuilder": pageBuilder[]{      ...,      _type == "callToAction" => {          link {      ...,        _type == "link" => {    "page": page->slug.current,    "post": post->slug.current  }      },      },      _type == "infoSection" => {        content[]{          ...,          markDefs[]{            ...,              _type == "link" => {    "page": page->slug.current,    "post": post->slug.current  }          }        }      },    },  }
+// Query: *[_type == 'page' && slug.current == $slug][0]{    _id,    _type,    name,    slug,    heading,    subheading,    "pageBuilder": pageBuilder[]{      ...,      _type == "callToAction" => {        ...,          link {      ...,        _type == "link" => {    "page": page->slug.current,    "post": post->slug.current  }      },      }    },  }
 export type GetPageQueryResult = {
   _id: string;
   _type: "page";
@@ -556,6 +556,17 @@ export type GetPageQueryResult = {
     }> | null;
   }> | null;
 } | null;
+// Variable: sitemapData
+// Query: *[_type == "page" || _type == "post" && defined(slug.current)] | order(_type asc) {    "slug": slug.current,    _type,    _updatedAt,  }
+export type SitemapDataResult = Array<{
+  slug: string;
+  _type: "page";
+  _updatedAt: string;
+} | {
+  slug: string;
+  _type: "post";
+  _updatedAt: string;
+}>;
 // Variable: allPostsQuery
 // Query: *[_type == "post" && defined(slug.current)] | order(date desc, _updatedAt desc) {      _id,  "status": select(_originalId in path("drafts.**") => "draft", "published"),  "title": coalesce(title, "Untitled"),  "slug": slug.current,  excerpt,  coverImage,  "date": coalesce(date, _updatedAt),  "author": author->{firstName, lastName, picture},  }
 export type AllPostsQueryResult = Array<{
@@ -708,7 +719,8 @@ import "@sanity/client";
 declare module "@sanity/client" {
   interface SanityQueries {
     "*[_type == \"settings\"][0]": SettingsQueryResult;
-    "\n  *[_type == 'page' && slug.current == $slug][0]{\n    _id,\n    _type,\n    name,\n    slug,\n    heading,\n    subheading,\n    \"pageBuilder\": pageBuilder[]{\n      ...,\n      _type == \"callToAction\" => {\n        \n  link {\n      ...,\n      \n  _type == \"link\" => {\n    \"page\": page->slug.current,\n    \"post\": post->slug.current\n  }\n\n      }\n,\n      },\n      _type == \"infoSection\" => {\n        content[]{\n          ...,\n          markDefs[]{\n            ...,\n            \n  _type == \"link\" => {\n    \"page\": page->slug.current,\n    \"post\": post->slug.current\n  }\n\n          }\n        }\n      },\n    },\n  }\n": GetPageQueryResult;
+    "\n  *[_type == 'page' && slug.current == $slug][0]{\n    _id,\n    _type,\n    name,\n    slug,\n    heading,\n    subheading,\n    \"pageBuilder\": pageBuilder[]{\n      ...,\n      _type == \"callToAction\" => {\n        ...,\n        \n  link {\n      ...,\n      \n  _type == \"link\" => {\n    \"page\": page->slug.current,\n    \"post\": post->slug.current\n  }\n\n      }\n,\n      }\n    },\n  }\n": GetPageQueryResult;
+    "\n  *[_type == \"page\" || _type == \"post\" && defined(slug.current)] | order(_type asc) {\n    \"slug\": slug.current,\n    _type,\n    _updatedAt,\n  }\n": SitemapDataResult;
     "\n  *[_type == \"post\" && defined(slug.current)] | order(date desc, _updatedAt desc) {\n    \n  _id,\n  \"status\": select(_originalId in path(\"drafts.**\") => \"draft\", \"published\"),\n  \"title\": coalesce(title, \"Untitled\"),\n  \"slug\": slug.current,\n  excerpt,\n  coverImage,\n  \"date\": coalesce(date, _updatedAt),\n  \"author\": author->{firstName, lastName, picture},\n\n  }\n": AllPostsQueryResult;
     "\n  *[_type == \"post\" && _id != $skip && defined(slug.current)] | order(date desc, _updatedAt desc) [0...$limit] {\n    \n  _id,\n  \"status\": select(_originalId in path(\"drafts.**\") => \"draft\", \"published\"),\n  \"title\": coalesce(title, \"Untitled\"),\n  \"slug\": slug.current,\n  excerpt,\n  coverImage,\n  \"date\": coalesce(date, _updatedAt),\n  \"author\": author->{firstName, lastName, picture},\n\n  }\n": MorePostsQueryResult;
     "\n  *[_type == \"post\" && slug.current == $slug] [0] {\n    content[]{\n    ...,\n    markDefs[]{\n      ...,\n      \n  _type == \"link\" => {\n    \"page\": page->slug.current,\n    \"post\": post->slug.current\n  }\n\n    }\n  },\n    \n  _id,\n  \"status\": select(_originalId in path(\"drafts.**\") => \"draft\", \"published\"),\n  \"title\": coalesce(title, \"Untitled\"),\n  \"slug\": slug.current,\n  excerpt,\n  coverImage,\n  \"date\": coalesce(date, _updatedAt),\n  \"author\": author->{firstName, lastName, picture},\n\n  }\n": PostQueryResult;

nextjs-app/sanity/lib/queries.ts

@@ -53,6 +53,14 @@ export const getPageQuery = defineQuery(`
   }
 `);
 
+export const sitemapData = defineQuery(`
+  *[_type == "page" || _type == "post" && defined(slug.current)] | order(_type asc) {
+    "slug": slug.current,
+    _type,
+    _updatedAt,
+  }
+`);
+
 export const allPostsQuery = defineQuery(`
   *[_type == "post" && defined(slug.current)] | order(date desc, _updatedAt desc) {
     ${postFields}