@sanity/cli 3.36.4 → 3.36.5-canary.34

package/templates/shopify/schemaTypes/documents/product.tsx

@@ -1,29 +1,12 @@
 import {TagIcon} from '@sanity/icons'
 import pluralize from 'pluralize-esm'
-import ShopifyIcon from '../../components/icons/Shopify'
 import ProductHiddenInput from '../../components/inputs/ProductHidden'
 import ShopifyDocumentStatus from '../../components/media/ShopifyDocumentStatus'
 import {defineField, defineType} from 'sanity'
 import {getPriceRange} from '../../utils/getPriceRange'
+import { GROUPS } from '../../constants'
 
-const GROUPS = [
-  {
-    name: 'editorial',
-    title: 'Editorial',
-    default: true,
-  },
-  {
-    name: 'shopifySync',
-    title: 'Shopify sync',
-    icon: ShopifyIcon,
-  },
-  {
-    name: 'seo',
-    title: 'SEO',
-  },
-]
-
-export default defineType({
+export const productType = defineType({
   name: 'product',
   title: 'Product',
   type: 'document',
@@ -43,37 +26,31 @@ export default defineType({
         return !parent?.store || (isActive && !isDeleted)
       },
     }),
-    // Title (proxy)
     defineField({
       name: 'titleProxy',
       title: 'Title',
       type: 'proxyString',
       options: {field: 'store.title'},
     }),
-    // Slug (proxy)
     defineField({
       name: 'slugProxy',
       title: 'Slug',
       type: 'proxyString',
       options: {field: 'store.slug.current'},
     }),
-    // Color theme
     defineField({
       name: 'colorTheme',
-      title: 'Color theme',
       type: 'reference',
       to: [{type: 'colorTheme'}],
       group: 'editorial',
     }),
     defineField({
       name: 'body',
-      title: 'Body',
-      type: 'body',
+      type: 'portableText',
       group: 'editorial',
     }),
     defineField({
       name: 'store',
-      title: 'Shopify',
       type: 'shopifyProduct',
       description: 'Product data from Shopify (read-only)',
       group: 'shopifySync',
@@ -81,7 +58,7 @@ export default defineType({
     defineField({
       name: 'seo',
       title: 'SEO',
-      type: 'seo.shopify',
+      type: 'seo',
       group: 'seo',
     }),
   ],

package/templates/shopify/schemaTypes/documents/productVariant.tsx

@@ -1,25 +1,18 @@
-import React from 'react'
+
 import { CopyIcon } from '@sanity/icons'
 import {defineField, defineType} from 'sanity'
 
-import ShopifyIcon from '../../components/icons/Shopify'
 import ProductVariantHiddenInput from '../../components/inputs/ProductVariantHidden'
 import ShopifyDocumentStatus from '../../components/media/ShopifyDocumentStatus'
+import { GROUPS } from '../../constants'
 
-export default defineType({
+export const productVariantType = defineType({
   name: 'productVariant',
   title: 'Product variant',
   type: 'document',
   icon: CopyIcon,
-  groups: [
-    {
-      name: 'shopifySync',
-      title: 'Shopify sync',
-      icon: ShopifyIcon,
-    },
-  ],
+  groups: GROUPS,
   fields: [
-    // Product variant hidden status
     defineField({
       name: 'hidden',
       type: 'string',
@@ -32,14 +25,12 @@ export default defineType({
         return !isDeleted
       },
     }),
-    // Title (proxy)
     defineField({
       title: 'Title',
       name: 'titleProxy',
       type: 'proxyString',
       options: {field: 'store.title'},
     }),
-    // Shopify product variant
     defineField({
       name: 'store',
       title: 'Shopify',

package/templates/shopify/schemaTypes/index.ts

@@ -1,135 +1,106 @@
-// Rich text annotations used in the block content editor
-import annotationLinkEmail from './annotations/linkEmail'
-import annotationLinkExternal from './annotations/linkExternal'
-import annotationLinkInternal from './annotations/linkInternal'
-import annotationProduct from './annotations/product'
+import {accordionGroupType} from './objects/module/accordionGroupType'
+import {accordionType} from './objects/module/accordionType'
+import {calloutType} from './objects/module/calloutType'
+import {callToActionType} from './objects/module/callToActionType'
+import {collectionGroupType} from './objects/collection/collectionGroupType'
+import {collectionLinksType} from './objects/collection/collectionLinksType'
+import {collectionReferenceType} from './objects/module/collectionReferenceType'
+import {collectionRuleType} from './objects/shopify/collectionRuleType'
+import {customProductOptionColorObjectType} from './objects/customProductOption/customProductOptionColorObjectType'
+import {customProductOptionColorType} from './objects/customProductOption/customProductOptionColorType'
+import {customProductOptionSizeObjectType} from './objects/customProductOption/customProductOptionSizeObjectType'
+import {customProductOptionSizeType} from './objects/customProductOption/customProductOptionSizeType'
+import {footerType} from './objects/global/footerType'
+import {gridItemType} from './objects/module/gridItemType'
+import {gridType} from './objects/module/gridType'
+import {heroType} from './objects/module/heroType'
+import {imageCallToActionType} from './objects/module/imageCallToActionType'
+import {imageFeaturesType} from './objects/module/imageFeaturesType'
+import {imageFeatureType} from './objects/module/imageFeatureType'
+import {imageWithProductHotspotsType} from './objects/hotspot/imageWithProductHotspotsType'
+import {instagramType} from './objects/module/instagramType'
+import {inventoryType} from './objects/shopify/inventoryType'
+import {linkEmailType} from './objects/link/linkEmailType'
+import {linkExternalType} from './objects/link/linkExternalType'
+import {linkInternalType} from './objects/link/linkInternalType'
+import {linkProductType} from './objects/link/linkProductType'
+import {menuLinksType} from './objects/global/menuLinksType'
+import {menuType} from './objects/global/menuType'
+import {notFoundPageType} from './objects/global/notFoundPageType'
+import {optionType} from './objects/shopify/optionType'
+import {placeholderStringType} from './objects/shopify/placeholderStringType'
+import {priceRangeType} from './objects/shopify/priceRangeType'
+import {productFeaturesType} from './objects/module/productFeaturesType'
+import {productHotspotsType} from './objects/hotspot/productHotspotsType'
+import {productReferenceType} from './objects/module/productReferenceType'
+import {productWithVariantType} from './objects/shopify/productWithVariantType'
+import {proxyStringType} from './objects/shopify/proxyStringType'
+import {seoType} from './objects/seoType'
+import {shopifyCollectionType} from './objects/shopify/shopifyCollectionType'
+import {shopifyProductType} from './objects/shopify/shopifyProductType'
+import {shopifyProductVariantType} from './objects/shopify/shopifyProductVariantType'
+import {spotType} from './objects/hotspot/spotType'
 
-const annotations = [
-  annotationLinkEmail,
-  annotationLinkExternal,
-  annotationLinkInternal,
-  annotationProduct,
-]
-
-// Document types
-import collection from './documents/collection'
-import colorTheme from './documents/colorTheme'
-import page from './documents/page'
-import product from './documents/product'
-import productVariant from './documents/productVariant'
+// Objects used as annotations must be imported first
+const annotations = [linkEmailType, linkExternalType, linkInternalType, linkProductType]
 
-const documents = [collection, colorTheme, page, product, productVariant]
-
-// Singleton document types
-import home from './singletons/home'
-import settings from './singletons/settings'
+const objects = [
+  accordionGroupType,
+  accordionType,
+  calloutType,
+  callToActionType,
+  collectionGroupType,
+  collectionLinksType,
+  collectionReferenceType,
+  collectionRuleType,
+  customProductOptionColorObjectType,
+  customProductOptionColorType,
+  customProductOptionSizeObjectType,
+  customProductOptionSizeType,
+  footerType,
+  gridItemType,
+  gridType,
+  heroType,
+  imageCallToActionType,
+  imageFeaturesType,
+  imageFeatureType,
+  imageWithProductHotspotsType,
+  instagramType,
+  inventoryType,
+  menuLinksType,
+  menuType,
+  notFoundPageType,
+  optionType,
+  placeholderStringType,
+  priceRangeType,
+  productFeaturesType,
+  productHotspotsType,
+  productReferenceType,
+  productWithVariantType,
+  proxyStringType,
+  seoType,
+  shopifyCollectionType,
+  shopifyProductType,
+  shopifyProductVariantType,
+  spotType,
+]
 
-const singletons = [home, settings]
+import {portableTextType} from './portableText/portableTextType'
+import {portableTextSimpleType} from './portableText/portableTextSimpleType'
 
-// Block content
-import body from './blocks/body'
+const blocks = [portableTextType, portableTextSimpleType]
 
-const blocks = [body]
+import {collectionType} from './documents/collection'
+import {colorThemeType} from './documents/colorTheme'
+import {pageType} from './documents/page'
+import {productType} from './documents/product'
+import {productVariantType} from './documents/productVariant'
 
-// Object types
-import customProductOptionColor from './objects/customProductOption/color'
-import customProductOptionColorObject from './objects/customProductOption/colorObject'
-import customProductOptionSize from './objects/customProductOption/size'
-import customProductOptionSizeObject from './objects/customProductOption/sizeObject'
-import footer from './objects/global/footer'
-import imageWithProductHotspots from './objects/hotspot/imageWithProductHotspots'
-import inventory from './objects/shopify/inventory'
-import linkExternal from './objects/global/linkExternal'
-import linkInternal from './objects/global/linkInternal'
-import links from './objects/global/links'
-import notFoundPage from './objects/global/notFoundPage'
-import heroCollection from './objects/hero/collection'
-import heroHome from './objects/hero/home'
-import heroPage from './objects/hero/page'
-import moduleAccordion from './objects/module/accordion'
-import accordionBody from './objects/module/accordionBody'
-import accordionGroup from './objects/module/accordionGroup'
-import moduleCallout from './objects/module/callout'
-import moduleCallToAction from './objects/module/callToAction'
-import moduleCollection from './objects/module/collection'
-import moduleGrid from './objects/module/grid'
-import gridItems from './objects/module/gridItem'
-import menu from './objects/global/menu'
-import moduleImage from './objects/module/image'
-import moduleImageAction from './objects/module/imageCallToAction'
-import moduleImages from './objects/module/images'
-import moduleInstagram from './objects/module/instagram'
-import moduleProduct from './objects/module/product'
-import moduleProducts from './objects/module/products'
-import placeholderString from './objects/shopify/placeholderString'
-import priceRange from './objects/shopify/priceRange'
-import spot from './objects/hotspot/spot'
-import productHotspots from './objects/hotspot/productHotspots'
-import option from './objects/shopify/option'
-import productWithVariant from './objects/shopify/productWithVariant'
-import proxyString from './objects/shopify/proxyString'
-import seo from './objects/seo/seo'
-import seoHome from './objects/seo/home'
-import seoPage from './objects/seo/page'
-import seoDescription from './objects/seo/description'
-import seoShopify from './objects/seo/shopify'
-import shopifyCollection from './objects/shopify/shopifyCollection'
-import shopifyCollectionRule from './objects/shopify/shopifyCollectionRule'
-import shopifyProduct from './objects/shopify/shopifyProduct'
-import shopifyProductVariant from './objects/shopify/shopifyProductVariant'
+const documents = [collectionType, colorThemeType, pageType, productType, productVariantType]
 
-// Collections
-import collectionGroup from './objects/collection/group'
-import collectionLinks from './objects/collection/links'
+import {homeType} from './singletons/homeType'
+import {settingsType} from './singletons/settingsType'
 
-const objects = [
-  customProductOptionColor,
-  customProductOptionColorObject,
-  customProductOptionSize,
-  customProductOptionSizeObject,
-  footer,
-  imageWithProductHotspots,
-  inventory,
-  links,
-  linkExternal,
-  linkInternal,
-  notFoundPage,
-  heroCollection,
-  heroHome,
-  heroPage,
-  moduleAccordion,
-  accordionBody,
-  accordionGroup,
-  menu,
-  moduleCallout,
-  moduleCallToAction,
-  moduleCollection,
-  moduleGrid,
-  gridItems,
-  moduleImage,
-  moduleImageAction,
-  moduleImages,
-  moduleInstagram,
-  moduleProduct,
-  moduleProducts,
-  placeholderString,
-  priceRange,
-  spot,
-  productHotspots,
-  option,
-  productWithVariant,
-  proxyString,
-  seo,
-  seoHome,
-  seoPage,
-  seoDescription,
-  seoShopify,
-  shopifyCollection,
-  shopifyCollectionRule,
-  shopifyProduct,
-  shopifyProductVariant,
-  collectionGroup,
-  collectionLinks,
-]
+const singletons = [homeType, settingsType]
 
-export const schemaTypes = [...annotations, ...singletons, ...objects, ...blocks, ...documents]
+export const schemaTypes = [...annotations, ...objects, ...singletons, ...blocks, ...documents]

package/templates/shopify/schemaTypes/objects/collection/{group.ts → collectionGroupType.ts}

@@ -1,30 +1,27 @@
 import {PackageIcon} from '@sanity/icons'
 import {defineField} from 'sanity'
 
-export default defineField({
+export const collectionGroupType = defineField({
   name: 'collectionGroup',
   title: 'Collection group',
   type: 'object',
   icon: PackageIcon,
   fields: [
-    {
+    defineField({
       name: 'title',
-      title: 'Title',
       type: 'string',
       validation: (Rule) => Rule.required(),
-    },
-    {
+    }),
+    defineField({
       name: 'collectionLinks',
-      title: 'Collection links',
       type: 'collectionLinks',
-    },
-    {
+    }),
+    defineField({
       name: 'collectionProducts',
-      title: 'Collection products',
       type: 'reference',
       description: 'Products from this collection will be listed',
       weak: true,
       to: [{type: 'collection'}],
-    },
+    }),
   ],
 })

package/templates/shopify/schemaTypes/objects/collection/{links.ts → collectionLinksType.ts}

@@ -1,16 +1,16 @@
-import {defineField} from 'sanity'
+import {defineArrayMember, defineField} from 'sanity'
 
-export default defineField({
+export const collectionLinksType = defineField({
   name: 'collectionLinks',
   title: 'Collection links',
   type: 'array',
   validation: (Rule) => Rule.unique().max(4),
   of: [
-    {
+    defineArrayMember({
       name: 'collection',
       type: 'reference',
       weak: true,
       to: [{type: 'collection'}],
-    },
+    }),
   ],
 })

package/templates/shopify/schemaTypes/objects/customProductOption/{colorObject.tsx → customProductOptionColorObjectType.tsx}

@@ -1,4 +1,4 @@
-import React from 'react'
+
 import {defineField} from 'sanity'
 
 const ColorPreview = ({color}: {color: string}) => {
@@ -15,21 +15,19 @@ const ColorPreview = ({color}: {color: string}) => {
   )
 }
 
-export default defineField({
+export const customProductOptionColorObjectType = defineField({
   name: 'customProductOption.colorObject',
   title: 'Color',
   type: 'object',
   fields: [
     defineField({
       name: 'title',
-      title: 'Title',
       type: 'string',
       description: 'Shopify product option value (case sensitive)',
       validation: (Rule) => Rule.required(),
     }),
     defineField({
       name: 'color',
-      title: 'Color',
       type: 'color',
       options: {disableAlpha: true},
       validation: (Rule) => Rule.required(),
@@ -40,8 +38,7 @@ export default defineField({
       color: 'color.hex',
       title: 'title',
     },
-    prepare(selection) {
-      const {color, title} = selection
+    prepare({color, title}) {
       return {
         media: <ColorPreview color={color} />,
         subtitle: color,

package/templates/shopify/schemaTypes/objects/customProductOption/{color.tsx → customProductOptionColorType.tsx}

@@ -5,30 +5,22 @@ interface ColorOption {
   title: string
 }
 
-export default defineField({
+export const customProductOptionColorType = defineField({
   name: 'customProductOption.color',
   title: 'Color',
   type: 'object',
   icon: false,
   fields: [
-    // Title
     defineField({
       name: 'title',
-      title: 'Title',
       type: 'string',
       description: 'Shopify product option name (case sensitive)',
       validation: (Rule) => Rule.required(),
     }),
-    // Colors
     defineField({
       name: 'colors',
-      title: 'Colors',
       type: 'array',
-      of: [
-        {
-          type: 'customProductOption.colorObject',
-        },
-      ],
+      of: [{type: 'customProductOption.colorObject'}],
       validation: (Rule) =>
         Rule.custom((options: ColorOption[] | undefined) => {
           // Each size must have a unique title

package/templates/shopify/schemaTypes/objects/customProductOption/{sizeObject.ts → customProductOptionSizeObjectType.ts}

@@ -1,27 +1,24 @@
 import {defineField} from 'sanity'
 
-export default defineField({
+export const customProductOptionSizeObjectType = defineField({
   name: 'customProductOption.sizeObject',
   title: 'Size',
   type: 'object',
   fields: [
     defineField({
       name: 'title',
-      title: 'Title',
       type: 'string',
       description: 'Shopify product option value (case sensitive)',
       validation: (Rule) => Rule.required(),
     }),
     defineField({
       name: 'width',
-      title: 'Width',
       type: 'number',
       description: 'In mm',
       validation: (Rule) => Rule.required().precision(2),
     }),
     defineField({
       name: 'height',
-      title: 'Height',
       type: 'number',
       description: 'In mm',
       validation: (Rule) => Rule.required().precision(2),
@@ -33,10 +30,9 @@ export default defineField({
       title: 'title',
       width: 'width',
     },
-    prepare(selection) {
-      const {height, title, width} = selection
+    prepare({height, title, width}) {
       return {
-        subtitle: `${width || '??'}cm x ${height || '??'}cm`,
+        subtitle: `${width || '??'}mm x ${height || '??'}mm`,
         title,
       }
     },

package/templates/shopify/schemaTypes/objects/customProductOption/{size.ts → customProductOptionSizeType.ts}

@@ -5,30 +5,22 @@ interface SizeOption {
   title: string
 }
 
-export default defineField({
+export const customProductOptionSizeType = defineField({
   name: 'customProductOption.size',
   title: 'Size',
   type: 'object',
   icon: false,
   fields: [
-    // Title
     defineField({
       name: 'title',
-      title: 'Title',
       type: 'string',
       description: 'Shopify product option name (case sensitive)',
       validation: (Rule) => Rule.required(),
     }),
-    // Sizes
     defineField({
       name: 'sizes',
-      title: 'Sizes',
       type: 'array',
-      of: [
-        {
-          type: 'customProductOption.sizeObject',
-        },
-      ],
+      of: [{type: 'customProductOption.sizeObject'}],
       validation: (Rule) =>
         Rule.custom((options: SizeOption[] | undefined) => {
           // Each size must have a unique title
@@ -47,8 +39,7 @@ export default defineField({
       sizes: 'sizes',
       title: 'title',
     },
-    prepare(selection) {
-      const {sizes, title} = selection
+    prepare({sizes, title}) {
       return {
         subtitle: sizes.length > 0 ? pluralize('size', sizes.length, true) : 'No sizes',
         title,

package/templates/shopify/schemaTypes/objects/global/footerType.ts

@@ -0,0 +1,22 @@
+import {defineField} from 'sanity'
+
+export const footerType = defineField({
+  name: 'footerSettings',
+  title: 'Footer',
+  type: 'object',
+  options: {
+    collapsed: false,
+    collapsible: true,
+  },
+  fields: [
+    defineField({
+      name: 'links',
+      type: 'array',
+      of: [{type: 'linkInternal'}, {type: 'linkExternal'}],
+    }),
+    defineField({
+      name: 'text',
+      type: 'portableTextSimple',
+    }),
+  ],
+})

package/templates/shopify/schemaTypes/objects/global/menuLinksType.ts

@@ -0,0 +1,21 @@
+import {defineField} from 'sanity'
+
+export const menuLinksType = defineField({
+  name: 'menuLinks',
+  title: 'Menu Links',
+  type: 'array',
+  of: [
+    defineField({
+      name: 'collectionGroup',
+      type: 'collectionGroup',
+    }),
+    defineField({
+      name: 'linkInternal',
+      type: 'linkInternal',
+    }),
+    defineField({
+      name: 'linkExternal',
+      type: 'linkExternal',
+    }),
+  ],
+})

package/templates/shopify/schemaTypes/objects/global/{menu.ts → menuType.ts}

@@ -1,7 +1,7 @@
 import {defineField} from 'sanity'
 
-export default defineField({
-  name: 'menuSettings',
+export const menuType = defineField({
+  name: 'menu',
   title: 'Menu',
   type: 'object',
   options: {
@@ -9,10 +9,8 @@ export default defineField({
     collapsible: true,
   },
   fields: [
-    // Links
     defineField({
       name: 'links',
-      title: 'Links',
       type: 'menuLinks',
     }),
   ],