@sanity/cli 3.36.4 → 3.36.5-canary.34

package/templates/shopify/schemaTypes/objects/global/{notFoundPage.ts → notFoundPageType.ts}

@@ -1,6 +1,6 @@
 import {defineField} from 'sanity'
 
-export default defineField({
+export const notFoundPageType = defineField({
   name: 'notFoundPage',
   title: '404 page',
   type: 'object',
@@ -8,19 +8,16 @@ export default defineField({
   fields: [
     defineField({
       name: 'title',
-      title: 'Title',
       type: 'string',
       validation: (Rule) => Rule.required(),
     }),
     defineField({
       name: 'body',
-      title: 'Body',
       type: 'text',
       rows: 2,
     }),
     defineField({
       name: 'collection',
-      title: 'Collection',
       type: 'reference',
       description: 'Collection products displayed on this page',
       weak: true,
@@ -31,10 +28,8 @@ export default defineField({
         },
       ],
     }),
-    // Color theme
     defineField({
       name: 'colorTheme',
-      title: 'Color theme',
       type: 'reference',
       to: [{type: 'colorTheme'}],
     }),

package/templates/shopify/schemaTypes/objects/hotspot/{imageWithProductHotspots.ts → imageWithProductHotspotsType.ts}

@@ -2,7 +2,7 @@ import {ImageIcon} from '@sanity/icons'
 import pluralize from 'pluralize-esm'
 import {defineField} from 'sanity'
 
-export default defineField({
+export const imageWithProductHotspotsType = defineField({
   icon: ImageIcon,
   name: 'imageWithProductHotspots',
   title: 'Image',
@@ -10,20 +10,19 @@ export default defineField({
   fields: [
     defineField({
       name: 'image',
-      title: 'Image',
       options: {hotspot: true},
       type: 'image',
       validation: (Rule) => Rule.required(),
+      // Hide original image when showHotspots is true and an image is set
+      hidden: ({value, parent}) => parent.showHotspots && value,
     }),
     defineField({
       name: 'showHotspots',
-      title: 'Show product hotspots',
       type: 'boolean',
       initialValue: false,
     }),
     defineField({
       name: 'productHotspots',
-      title: 'Product hotspots',
       type: 'productHotspots',
       hidden: ({parent}) => !parent.showHotspots,
     }),
@@ -35,8 +34,7 @@ export default defineField({
       image: 'image',
       showHotspots: 'showHotspots',
     },
-    prepare(selection) {
-      const {fileName, hotspots, image, showHotspots} = selection
+    prepare({fileName, hotspots, image, showHotspots}) {
       return {
         media: image,
         subtitle:

package/templates/shopify/schemaTypes/objects/hotspot/{productHotspots.tsx → productHotspotsType.tsx}

@@ -1,15 +1,13 @@
-import {defineField} from 'sanity'
+import {defineArrayMember, defineField} from 'sanity'
 
 import ProductTooltip from '../../../components/hotspots/ProductTooltip'
 
-export default defineField({
+export const productHotspotsType = defineField({
   name: 'productHotspots',
   title: 'Hotspots',
   type: 'array',
   of: [
-    {
-      type: 'spot',
-    },
+    defineArrayMember({type: 'spot'}),
   ],
   options: {
     imageHotspot: {

package/templates/shopify/schemaTypes/objects/hotspot/{spot.tsx → spotType.tsx}

@@ -1,9 +1,8 @@
-import React from 'react'
 import {defineField} from 'sanity'
 
 import ShopifyDocumentStatus from '../../../components/media/ShopifyDocumentStatus'
 
-export default defineField({
+export const spotType = defineField({
   name: 'spot',
   title: 'Spot',
   type: 'object',
@@ -11,7 +10,6 @@ export default defineField({
   fields: [
     defineField({
       name: 'productWithVariant',
-      title: 'Product + Variant',
       type: 'productWithVariant',
     }),
     defineField({

package/templates/shopify/schemaTypes/{annotations/linkEmail.tsx → objects/link/linkEmailType.tsx}

@@ -1,15 +1,9 @@
-/**
- * Annotations are ways of marking up text in the block content editor.
- *
- * Read more: https://www.sanity.io/docs/customization#f924645007e1
- */
 import {EnvelopeIcon} from '@sanity/icons'
-import React from 'react'
 import {defineField} from 'sanity'
 
-export default defineField({
+export const linkEmailType = defineField({
   title: 'Email link',
-  name: 'annotationLinkEmail',
+  name: 'linkEmail',
   type: 'object',
   icon: EnvelopeIcon,
   components: {
@@ -27,16 +21,14 @@ export default defineField({
     ),
   },
   fields: [
-    // Email
-    {
-      title: 'Email',
+    defineField({
       name: 'email',
       type: 'email',
-    },
+    }),
   ],
   preview: {
     select: {
-      email: 'email',
+      title: 'email',
     },
   },
 })

package/templates/shopify/schemaTypes/{annotations/linkExternal.tsx → objects/link/linkExternalType.tsx}

@@ -1,15 +1,9 @@
-/**
- * Annotations are ways of marking up text in the block content editor.
- *
- * Read more: https://www.sanity.io/docs/customization#f924645007e1
- */
 import {EarthGlobeIcon} from '@sanity/icons'
-import React from 'react'
 import {defineField} from 'sanity'
 
-export default defineField({
+export const linkExternalType = defineField({
   title: 'External Link',
-  name: 'annotationLinkExternal',
+  name: 'linkExternal',
   type: 'object',
   icon: EarthGlobeIcon,
   components: {
@@ -27,18 +21,17 @@ export default defineField({
     ),
   },
   fields: [
-    {
+    defineField({
       name: 'url',
       title: 'URL',
       type: 'url',
       validation: (Rule) => Rule.required().uri({scheme: ['http', 'https']}),
-    },
-    // Open in a new window
-    {
+    }),
+    defineField({
       title: 'Open in a new window?',
       name: 'newWindow',
       type: 'boolean',
       initialValue: true,
-    },
+    }),
   ],
 })

package/templates/shopify/schemaTypes/{annotations/linkInternal.tsx → objects/link/linkInternalType.tsx}

@@ -1,16 +1,10 @@
-/**
- * Annotations are ways of marking up text in the block content editor.
- *
- * Read more: https://www.sanity.io/docs/customization#f924645007e1
- */
 import {LinkIcon} from '@sanity/icons'
-import React from 'react'
 import {defineField} from 'sanity'
-import {PAGE_REFERENCES} from '../../constants'
+import {PAGE_REFERENCES} from '../../../constants'
 
-export default defineField({
+export const linkInternalType = defineField({
   title: 'Internal Link',
-  name: 'annotationLinkInternal',
+  name: 'linkInternal',
   type: 'object',
   icon: LinkIcon,
   components: {
@@ -28,13 +22,12 @@ export default defineField({
     ),
   },
   fields: [
-    // Reference
-    {
+    defineField({
       name: 'reference',
       type: 'reference',
       weak: true,
       validation: (Rule) => Rule.required(),
       to: PAGE_REFERENCES,
-    },
+    }),
   ],
 })

package/templates/shopify/schemaTypes/{annotations/product.tsx → objects/link/linkProductType.tsx}

@@ -1,15 +1,9 @@
-/**
- * Annotations are ways of marking up text in the block content editor.
- *
- * Read more: https://www.sanity.io/docs/customization#f924645007e1
- */
 import {TagIcon} from '@sanity/icons'
-import React from 'react'
 import {defineField} from 'sanity'
 
-export default defineField({
+export const linkProductType = defineField({
   title: 'Product',
-  name: 'annotationProduct',
+  name: 'linkProduct',
   type: 'object',
   icon: TagIcon,
   components: {
@@ -27,17 +21,13 @@ export default defineField({
     ),
   },
   fields: [
-    // Product
-    {
+    defineField({
       name: 'productWithVariant',
-      title: 'Product + Variant',
       type: 'productWithVariant',
       validation: (Rule) => Rule.required(),
-    },
-    // Link action
+    }),
     defineField({
       name: 'linkAction',
-      title: 'Link action',
       type: 'string',
       initialValue: 'link',
       options: {
@@ -59,10 +49,8 @@ export default defineField({
       },
       validation: (Rule) => Rule.required(),
     }),
-    // Quantity
     defineField({
       name: 'quantity',
-      title: 'Quantity',
       type: 'number',
       initialValue: 1,
       hidden: ({parent}) => parent.linkAction === 'link',

package/templates/shopify/schemaTypes/objects/module/{accordionGroup.ts → accordionGroupType.ts}

@@ -1,35 +1,32 @@
 import {defineField} from 'sanity'
 import blocksToText from '../../../utils/blocksToText'
 
-export default defineField({
+export const accordionGroupType = defineField({
   name: 'accordionGroup',
-  title: 'Object',
+  title: 'Accordion Group',
   type: 'object',
   icon: false,
   fields: [
     defineField({
       name: 'title',
-      title: 'Title',
       type: 'string',
       validation: (Rule) => Rule.required(),
     }),
     defineField({
       name: 'body',
-      title: 'Body',
-      type: 'accordionBody',
+      type: 'portableTextSimple',
       validation: (Rule) => Rule.required(),
     }),
   ],
   preview: {
     select: {
-      body: 'body',
       title: 'title',
+      body: 'body',
     },
-    prepare(selection) {
-      const {body, title} = selection
+    prepare({title, body}) {
       return {
-        subtitle: body && blocksToText(body),
         title,
+        subtitle: body && blocksToText(body),
       }
     },
   },

package/templates/shopify/schemaTypes/objects/module/{accordion.ts → accordionType.ts}

@@ -2,30 +2,23 @@ import {StackCompactIcon} from '@sanity/icons'
 import pluralize from 'pluralize-esm'
 import {defineField} from 'sanity'
 
-export default defineField({
-  name: 'module.accordion',
+export const accordionType = defineField({
+  name: 'accordion',
   title: 'Accordion',
   type: 'object',
   icon: StackCompactIcon,
   fields: [
-    // Groups
     defineField({
       name: 'groups',
-      title: 'Groups',
       type: 'array',
-      of: [
-        {
-          type: 'accordionGroup',
-        },
-      ],
+      of: [{type: 'accordionGroup'}],
     }),
   ],
   preview: {
     select: {
       groups: 'groups',
     },
-    prepare(selection) {
-      const {groups} = selection
+    prepare({groups}) {
       return {
         subtitle: 'Accordion',
         title: groups?.length > 0 ? pluralize('group', groups.length, true) : 'No groups',

package/templates/shopify/schemaTypes/objects/module/{callToAction.tsx → callToActionType.tsx}

@@ -1,8 +1,8 @@
 import {BlockElementIcon, ImageIcon} from '@sanity/icons'
-import {defineField} from 'sanity'
+import {defineArrayMember, defineField} from 'sanity'
 
-export default defineField({
-  name: 'module.callToAction',
+export const callToActionType = defineField({
+  name: 'callToAction',
   title: 'Call to action',
   type: 'object',
   icon: BlockElementIcon,
@@ -13,10 +13,8 @@ export default defineField({
     },
   ],
   fields: [
-    // Layout
     defineField({
       name: 'layout',
-      title: 'Layout direction',
       type: 'string',
       initialValue: 'left',
       options: {
@@ -35,50 +33,40 @@ export default defineField({
       },
       validation: (Rule) => Rule.required(),
     }),
-    // Title
     defineField({
       name: 'title',
-      title: 'Title',
       type: 'string',
       validation: (Rule) => Rule.required(),
       fieldset: 'copy',
     }),
-    // Body
     defineField({
-      name: 'body',
-      title: 'Body',
+      name: 'portableText',
       type: 'text',
       rows: 2,
       fieldset: 'copy',
     }),
-    // Link
     defineField({
-      name: 'links',
-      title: 'Link',
+      name: 'link',
       type: 'array',
       of: [{type: 'linkInternal'}, {type: 'linkExternal'}],
       validation: (Rule) => Rule.max(1),
       fieldset: 'copy',
     }),
-    // Content
     defineField({
       name: 'content',
-      title: 'Content',
       type: 'array',
       validation: (Rule) => Rule.required().max(1),
       of: [
-        {
+        defineArrayMember({
           icon: ImageIcon,
           type: 'image',
-          title: 'Image',
           options: {hotspot: true},
-        },
-        {
+        }),
+        defineArrayMember({
           name: 'productWithVariant',
-          title: 'Product + Variant',
           type: 'productWithVariant',
           validation: (Rule) => Rule.required(),
-        },
+        }),
       ],
     }),
   ],
@@ -86,8 +74,7 @@ export default defineField({
     select: {
       title: 'title',
     },
-    prepare(selection) {
-      const {title} = selection
+    prepare({title}) {
       return {
         subtitle: 'Call to action',
         title,

package/templates/shopify/schemaTypes/objects/module/{callout.ts → calloutType.ts}

@@ -1,16 +1,14 @@
 import {BulbOutlineIcon} from '@sanity/icons'
 import {defineField} from 'sanity'
 
-export default defineField({
-  name: 'module.callout',
+export const calloutType = defineField({
+  name: 'callout',
   title: 'Callout',
   type: 'object',
   icon: BulbOutlineIcon,
   fields: [
-    // Text
     defineField({
       name: 'text',
-      title: 'Text',
       type: 'text',
       rows: 2,
       validation: (Rule) => [
@@ -18,10 +16,8 @@ export default defineField({
         Rule.max(70).warning(`Callout length shouldn't be more than 70 characters.`),
       ],
     }),
-    // Link
     defineField({
-      name: 'links',
-      title: 'Link',
+      name: 'link',
       type: 'array',
       of: [{type: 'linkInternal'}, {type: 'linkExternal'}],
       validation: (Rule) => Rule.max(1),
@@ -30,10 +26,8 @@ export default defineField({
   preview: {
     select: {
       text: 'text',
-      url: 'url',
     },
-    prepare(selection) {
-      const {text, url} = selection
+    prepare({text}) {
       return {
         subtitle: 'Callout',
         title: text,

package/templates/shopify/schemaTypes/objects/module/{collection.tsx → collectionReferenceType.tsx}

@@ -1,28 +1,24 @@
-import React from 'react'
+
 import {PackageIcon} from '@sanity/icons'
 import {defineField} from 'sanity'
 
 import ShopifyDocumentStatus from '../../../components/media/ShopifyDocumentStatus'
 
-export default defineField({
-  name: 'module.collection',
+export const collectionReferenceType = defineField({
+  name: 'collectionReference',
   title: 'Collection',
   type: 'object',
   icon: PackageIcon,
   fields: [
-    // Collection
     defineField({
       name: 'collection',
-      title: 'Collection',
       type: 'reference',
       weak: true,
       to: [{type: 'collection'}],
       validation: (Rule) => Rule.required(),
     }),
-    // Show background
     defineField({
       name: 'showBackground',
-      title: 'Show background',
       type: 'boolean',
       description: 'Use Shopify collection image as background (if available)',
       initialValue: false,
@@ -34,8 +30,7 @@ export default defineField({
       imageUrl: 'collection.store.imageUrl',
       isDeleted: 'collection.store.isDeleted',
     },
-    prepare(selection) {
-      const {collectionTitle, imageUrl, isDeleted} = selection
+    prepare({collectionTitle, imageUrl, isDeleted}) {
       return {
         media: (
           <ShopifyDocumentStatus

package/templates/shopify/schemaTypes/objects/module/gridItemType.ts

@@ -0,0 +1,41 @@
+import {defineField} from 'sanity'
+
+import blocksToText from '../../../utils/blocksToText'
+
+export const gridItemType = defineField({
+  name: 'gridItem',
+  title: 'Grid Item',
+  type: 'object',
+  fields: [
+    defineField({
+      name: 'title',
+      type: 'string',
+      validation: (Rule) => Rule.required(),
+    }),
+    defineField({
+      name: 'image',
+      type: 'image',
+      options: {hotspot: true},
+      validation: (Rule) => Rule.required(),
+    }),
+    defineField({
+      name: 'body',
+      type: 'portableTextSimple',
+      validation: (Rule) => Rule.required(),
+    }),
+  ],
+  preview: {
+    select: {
+      body: 'body',
+      image: 'image',
+      title: 'title',
+    },
+    prepare({body, image, title}) {
+      return {
+        media: image,
+        subtitle: body && blocksToText(body),
+        title,
+      }
+    },
+  },
+})

package/templates/shopify/schemaTypes/objects/module/{grid.ts → gridType.ts}

@@ -1,32 +1,24 @@
 import {ThLargeIcon} from '@sanity/icons'
 import pluralize from 'pluralize-esm'
-import {defineField} from 'sanity'
+import {defineArrayMember, defineField} from 'sanity'
 
-export default defineField({
-  name: 'module.grid',
+export const gridType = defineField({
+  name: 'grid',
   title: 'Grid',
   type: 'object',
   icon: ThLargeIcon,
   fields: [
-    // Items
-    {
+    defineField({
       name: 'items',
-      title: 'Items',
       type: 'array',
-      of: [
-        {
-          type: 'gridItem',
-        },
-      ],
-    },
+      of: [defineArrayMember({type: 'gridItem'})],
+    }),
   ],
   preview: {
     select: {
       items: 'items',
-      url: 'url',
     },
-    prepare(selection) {
-      const {items} = selection
+    prepare({items}) {
       return {
         subtitle: 'Grid',
         title: items?.length > 0 ? pluralize('item', items.length, true) : 'No items',

package/templates/shopify/schemaTypes/objects/{hero/home.tsx → module/heroType.tsx}

@@ -1,42 +1,39 @@
-import {defineField} from 'sanity'
+import {defineArrayMember, defineField} from 'sanity'
 
-export default defineField({
-  name: 'hero.home',
-  title: 'Home hero',
+export const heroType = defineField({
+  name: 'hero',
+  title: 'Hero',
   type: 'object',
   fields: [
-    // Title
     defineField({
       name: 'title',
-      title: 'Title',
       type: 'text',
       rows: 3,
     }),
-    // Link
     defineField({
-      name: 'links',
-      title: 'Link',
+      name: 'description',
+      type: 'text',
+      rows: 3,
+    }),
+    defineField({
+      name: 'link',
       type: 'array',
       of: [{type: 'linkInternal'}, {type: 'linkExternal'}],
       validation: (Rule) => Rule.max(1),
     }),
-    // Content
     defineField({
       name: 'content',
-      title: 'Content',
       type: 'array',
       validation: (Rule) => Rule.max(1),
       of: [
-        {
+        defineArrayMember({
           name: 'productWithVariant',
-          title: 'Product with variant',
           type: 'productWithVariant',
-        },
-        {
+        }),
+        defineArrayMember({
           name: 'imageWithProductHotspots',
-          title: 'Image',
           type: 'imageWithProductHotspots',
-        },
+        }),
       ],
     }),
   ],