Merge branch 'main' into dev: resolve conflicts preserving Astro SSR and Sanity 6 architecture

Author: codercatdev

apps/sanity/extract.json

@@ -572,6 +572,7 @@
     }
   },
   {
+<<<<<<< HEAD
     "name": "syndication",
     "type": "document",
     "attributes": {
@@ -703,6 +704,8 @@
     }
   },
   {
+=======
+>>>>>>> origin/main
     "type": "type",
     "name": "page.reference",
     "value": {
@@ -13642,6 +13645,7 @@
     }
   },
   {
+<<<<<<< HEAD
     "type": "type",
     "name": "media.folder.reference",
     "value": {
@@ -13724,6 +13728,8 @@
     }
   },
   {
+=======
+>>>>>>> origin/main
     "name": "media.tag",
     "type": "document",
     "attributes": {

apps/web/sanity.cli.ts

@@ -0,0 +1,16 @@
+import { defineCliConfig } from "sanity/cli";
+
+/** Minimal CLI config for Sanity typegen in the Next.js app (Studio lives in apps/sanity). */
+export default defineCliConfig({
+	api: {
+		projectId: process.env.SANITY_STUDIO_PROJECT_ID || "hfh83o0w",
+		dataset: process.env.SANITY_STUDIO_DATASET || "production",
+	},
+	// Replaces the deprecated sanity-typegen.json. The schema is extracted in
+	// apps/sanity (sanity schema extract --> ../sanity/extract.json).
+	typegen: {
+		path: "./**/*.{ts,tsx,js,jsx}",
+		schema: "../sanity/extract.json",
+		generates: "./sanity/types.ts",
+	},
+});