fix merge conflict. Merge in main

Author: kenjonespizza

.prettierignore

@@ -1 +1,19 @@
-.github/**
+.github/**
+
+# Generated files
+package-lock.json
+**/package-lock.json
+yarn.lock
+**/yarn.lock
+pnpm-lock.yaml
+**/pnpm-lock.yaml
+
+# Build outputs
+dist/
+build/
+out/
+.next/
+
+# Other generated files
+*.min.js
+*.min.css

frontend/.env.example

@@ -1,5 +1,5 @@
 NEXT_PUBLIC_SANITY_PROJECT_ID="<paste your project here>" # Required - The ID of your Sanity project
 NEXT_PUBLIC_SANITY_DATASET="production" # Required - The dataset of your Sanity project
-NEXT_PUBLIC_SANITY_API_VERSION="2024-10-28" # Optional - The API version provided to the Sanity Client
+NEXT_PUBLIC_SANITY_API_VERSION="2025-09-25" # Optional - The API version provided to the Sanity Client
 NEXT_PUBLIC_SANITY_STUDIO_URL="" #Optional, defaults to http://localhost:3333
 SANITY_API_READ_TOKEN="<paste your token here>" # Required - The read token for your Sanity project

frontend/sanity/lib/api.ts

@@ -24,7 +24,7 @@ export const projectId = assertValue(
 /**
  * see https://www.sanity.io/docs/api-versioning for how versioning works
  */
-export const apiVersion = process.env.NEXT_PUBLIC_SANITY_API_VERSION || '2024-10-28'
+export const apiVersion = process.env.NEXT_PUBLIC_SANITY_API_VERSION || '2025-09-25'
 
 /**
  * Used to configure edit intent links, for Presentation Mode, as well as to configure where the Studio is mounted in the router.