Merge branch 'dev' into tailwind-v4

Author: mitchuman

.gitignore

@@ -36,3 +36,5 @@ yarn-error.log*
 next-env.d.ts
 
 public/google*.html
+
+public/admin/static

README.md

@@ -26,7 +26,11 @@ npm create sanity@latest -- --template nuotsu/sanitypress
 
 Full instructions on the [docs](https://sanitypress.dev/docs).
 
-1. **Run the install command**:
+### 1. **Install with the Sanity CLI**
+
+Run the following command to initialize this template on your local computer.
+
+See the documentation if you are [having issues with the CLI](https://www.sanity.io/help/cli-errors).
 
 ```ini
 # .env.local
@@ -42,7 +46,9 @@ NEXT_PUBLIC_GITHUB_TOKEN = # used for Reputation blocks
 
 You can also clone or fork [the GitHub template](https://github.com/nuotsu/sanitypress) to set up manually.
 
-2. **Add content**: In your new Sanity Studio, publish the **required** `site` and `page` documents.
+### 2. **Add content**
+
+In your new Sanity Studio, publish the **required** `site` and `page` documents.
 
 | Document | Slug     | Use             | Required? | Notes                                                                                          |
 | -------- | -------- | --------------- | :-------: | ---------------------------------------------------------------------------------------------- |
@@ -52,19 +58,25 @@ You can also clone or fork [the GitHub template](https://github.com/nuotsu/sanit
 | `page`   | `blog`   | Blog listing    |           | Add the [**Blog frontpage**](https://sanitypress.dev/docs/modules/blog-frontpage) module       |
 | `page`   | `blog/*` | Blog post       |           | Add the [**Blog post content**](https://sanitypress.dev/docs/modules/blog-post-content) module |
 
+Read the [Getting Started docs](https://sanitypress.dev/docs/getting-started) for more information.
+
 Alternatively, you can import the [demo site](https://demo.sanitypress.dev) dataset:
 
 ```sh
 sanity dataset import src/sanity/demo.tar.gz
 ```
 
-3. **Set up deployments**: Add a [Vercel](https://www.sanity.io/plugins/vercel-dashboard-widget) or [Netlify](https://www.sanity.io/plugins/sanity-plugin-dashboard-widget-netlify) widget to enable deployments from the Studio.
+### 3. **Set up deployments**
+
+Add a [Vercel](https://www.sanity.io/plugins/vercel-dashboard-widget) or [Netlify](https://www.sanity.io/plugins/sanity-plugin-dashboard-widget-netlify) widget to enable deployments from the Studio.
+
+### 4. **Customize**
 
-4. **Customize**: Adjust frontend styles, edit/add Sanity schema and modules, and more.
+Adjust frontend styles, edit/add Sanity schema and modules, and [more](https://sanitypress.dev/blog/the-developers-guide-to-customizing-sanitypress).
 
 ## Resources
 
-- [The _Impressive_ Blog](https://sanitypress.dev/blog)
+- [_The Styled Heart_](https://sanitypress.dev/blog) — SanityPress Blog
 - [Visual Editing with Next.js and Sanity](https://www.sanity.io/guides/nextjs-app-router-live-preview)
 - [`next-sanity`](https://www.sanity.io/plugins/next-sanity) — Sanity toolkit for Next.js
 - [nuqs](https://nuqs.47ng.com/) — Type-safe search params state manager for React

package.json

@@ -7,9 +7,10 @@
 	"scripts": {
 		"dev": "next dev",
 		"dev:turbopack": "next dev --turbopack",
-		"build": "next build",
+		"build": "npm run manifest && next build",
 		"start": "next start",
 		"lint": "next lint",
+		"manifest": "sanity manifest extract --path public/admin/static",
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {

src/sanity/schemaTypes/modules/accordion-list.ts

@@ -14,6 +14,11 @@ export default defineType({
 			type: 'module-options',
 			group: 'options',
 		}),
+		defineField({
+			name: 'pretitle',
+			type: 'string',
+			group: 'content',
+		}),
 		defineField({
 			name: 'intro',
 			type: 'array',

src/sanity/schemaTypes/modules/blog-list.ts

@@ -13,6 +13,11 @@ export default defineType({
 		{ name: 'options' },
 	],
 	fields: [
+		defineField({
+			name: 'pretitle',
+			type: 'string',
+			group: 'content',
+		}),
 		defineField({
 			name: 'intro',
 			type: 'array',
@@ -49,6 +54,7 @@ export default defineType({
 			title: 'Number of posts to show',
 			description: 'Leave empty to show all posts',
 			type: 'number',
+			initialValue: 6,
 			validation: (Rule) => Rule.min(1).integer(),
 			group: 'filtering',
 		}),

src/sanity/schemaTypes/modules/creative/creativeCtas.ts src/sanity/schemaTypes/modules/creative/ctas.creative.ts

@@ -1,8 +1,8 @@
 import { defineArrayMember, defineField, defineType } from 'sanity'
-import creativeCtas from './creativeCtas'
-import creativeIcon from './creativeIcon'
-import creativeImage from './creativeImage'
-import creativeRichtext from './creativeRichtext'
+import creativeCtas from './ctas.creative'
+import creativeIcon from './icon.creative'
+import creativeImage from './image.creative'
+import creativeRichtext from './richtext.creative'
 import {
 	textAlign,
 	alignItems,

src/sanity/schemaTypes/modules/creative/creativeIcon.ts src/sanity/schemaTypes/modules/creative/icon.creative.ts

@@ -11,6 +11,11 @@ export default defineType({
 	type: 'object',
 	groups: [{ name: 'content', default: true }, { name: 'options' }],
 	fields: [
+		defineField({
+			name: 'pretitle',
+			type: 'string',
+			group: 'content',
+		}),
 		defineField({
 			name: 'intro',
 			type: 'array',

src/sanity/schemaTypes/modules/creative/creativeImage.ts src/sanity/schemaTypes/modules/creative/image.creative.ts

@@ -8,6 +8,10 @@ export default defineType({
 	icon: VscListOrdered,
 	type: 'object',
 	fields: [
+		defineField({
+			name: 'pretitle',
+			type: 'string',
+		}),
 		defineField({
 			name: 'intro',
 			type: 'array',

src/sanity/schemaTypes/modules/creative/index.ts

@@ -10,6 +10,11 @@ export default defineType({
 	type: 'object',
 	groups: [{ name: 'content', default: true }, { name: 'options' }],
 	fields: [
+		defineField({
+			name: 'pretitle',
+			type: 'string',
+			group: 'content',
+		}),
 		defineField({
 			name: 'intro',
 			type: 'array',

src/sanity/schemaTypes/modules/creative/creativeRichtext.ts src/sanity/schemaTypes/modules/creative/richtext.creative.ts

@@ -22,7 +22,10 @@ export default async function Announcement() {
 		<>
 			{announcements?.map(({ start, end, content, cta, _id }) => (
 				<Scheduler start={start} end={end} key={_id}>
-					<aside className="flex items-center justify-center gap-x-4 text-balance bg-accent p-2 text-center text-canvas max-md:text-sm md:gap-x-6">
+					<aside
+						id="announcement"
+						className="flex items-center justify-center gap-x-4 text-balance bg-accent p-2 text-center text-canvas max-md:text-sm md:gap-x-6"
+					>
 						<div className="anim-fade-to-r [&_a]:link">
 							<PortableText value={content} />
 						</div>

src/sanity/schemaTypes/modules/stat-list.ts

@@ -1,14 +1,17 @@
 import moduleProps from '@/lib/moduleProps'
+import Pretitle from '@/ui/Pretitle'
 import { PortableText } from 'next-sanity'
 import { cn } from '@/lib/utils'
 
 export default function AccordionList({
+	pretitle,
 	intro,
 	items,
 	layout = 'vertical',
 	generateSchema,
 	...props
 }: Partial<{
+	pretitle: string
 	intro: any
 	items: {
 		summary: string
@@ -39,6 +42,7 @@ export default function AccordionList({
 						: 'text-center',
 				)}
 			>
+				<Pretitle>{pretitle}</Pretitle>
 				<PortableText value={intro} />
 			</header>
 

src/sanity/schemaTypes/modules/step-list.ts

@@ -1,7 +1,7 @@
+import Pretitle from '@/ui/Pretitle'
 import { PortableText, stegaClean } from 'next-sanity'
 import Img from '@/ui/Img'
 import { cn } from '@/lib/utils'
-import Pretitle from '../Pretitle'
 
 export default function FlagList({
 	pretitle,

src/sanity/schemaTypes/modules/testimonial-list.ts

@@ -1,10 +1,13 @@
+import Pretitle from '@/ui/Pretitle'
 import { PortableText, stegaClean } from 'next-sanity'
 
 export default function StatList({
+	pretitle,
 	intro,
 	stats,
 	textAlign = 'center',
 }: Partial<{
+	pretitle: string
 	intro: any
 	stats: Partial<{
 		prefix: string
@@ -21,6 +24,7 @@ export default function StatList({
 		>
 			{intro && (
 				<header className="richtext text-center">
+					<Pretitle>{pretitle}</Pretitle>
 					<PortableText value={intro} />
 				</header>
 			)}

src/ui/Announcement.tsx

@@ -1,9 +1,12 @@
+import Pretitle from '@/ui/Pretitle'
 import { PortableText } from 'next-sanity'
 
 export default function StepList({
+	pretitle,
 	intro,
 	steps,
 }: Partial<{
+	pretitle: string
 	intro: any
 	steps: {
 		content: any
@@ -13,6 +16,7 @@ export default function StepList({
 		<section className="section space-y-8">
 			{intro && (
 				<header className="richtext text-center text-balance">
+					<Pretitle>{pretitle}</Pretitle>
 					<PortableText value={intro} />
 				</header>
 			)}

src/ui/modules/AccordionList.tsx

@@ -1,12 +1,15 @@
+import Pretitle from '@/ui/Pretitle'
 import { PortableText, stegaClean } from 'next-sanity'
 import Img from '@/ui/Img'
 import { cn } from '@/lib/utils'
 
 export default function TestimonialList({
+	pretitle,
 	intro,
 	testimonials,
 	layout,
 }: Partial<{
+	pretitle: string
 	intro: any
 	testimonials: Sanity.Testimonial[]
 	layout: 'grid' | 'carousel'
@@ -17,6 +20,7 @@ export default function TestimonialList({
 		<section className="section space-y-8 text-center">
 			{intro && (
 				<header className="richtext">
+					<Pretitle>{pretitle}</Pretitle>
 					<PortableText value={intro} />
 				</header>
 			)}

src/ui/modules/FlagList.tsx

@@ -1,20 +1,23 @@
 import { Suspense } from 'react'
 import { fetchSanity } from '@/sanity/lib/fetch'
 import { groq } from 'next-sanity'
+import Pretitle from '@/ui/Pretitle'
 import { PortableText, stegaClean } from 'next-sanity'
 import FilterList from '@/ui/modules/blog/BlogList/FilterList'
 import PostPreview from '../PostPreview'
 import List from './List'
 import { cn } from '@/lib/utils'
 
 export default async function BlogList({
+	pretitle,
 	intro,
 	layout,
 	limit,
 	showFeaturedPostsFirst,
 	displayFilters,
 	filteredCategory,
 }: Partial<{
+	pretitle: string
 	intro: any
 	layout: 'grid' | 'carousel'
 	limit: number
@@ -55,6 +58,7 @@ export default async function BlogList({
 		<section className="section space-y-8">
 			{intro && (
 				<header className="richtext">
+					<Pretitle>{pretitle}</Pretitle>
 					<PortableText value={intro} />
 				</header>
 			)}