@sanity/cli 3.36.4 → 3.36.5-canary.34

package/templates/shopify/schemaTypes/objects/shopify/{shopifyProduct.ts → shopifyProductType.ts}

@@ -1,6 +1,6 @@
-import {defineField} from 'sanity'
+import {defineArrayMember, defineField} from 'sanity'
 
-export default defineField({
+export const shopifyProductType = defineField({
   name: 'shopifyProduct',
   title: 'Shopify',
   type: 'object',
@@ -31,131 +31,101 @@ export default defineField({
     },
   ],
   fields: [
-    // Created at
     defineField({
       fieldset: 'status',
       name: 'createdAt',
-      title: 'Created at',
       type: 'string',
     }),
-    // Updated at
     defineField({
       fieldset: 'status',
       name: 'updatedAt',
-      title: 'Updated at',
       type: 'string',
     }),
-    // Product status
     defineField({
       fieldset: 'status',
       name: 'status',
-      title: 'Product status',
       type: 'string',
       options: {
         layout: 'dropdown',
         list: ['active', 'archived', 'draft'],
       },
     }),
-    // Deleted
     defineField({
       fieldset: 'status',
       name: 'isDeleted',
       title: 'Deleted from Shopify?',
       type: 'boolean',
     }),
-    // Title
     defineField({
       name: 'title',
-      title: 'Title',
       type: 'string',
       description: 'Title displayed in both cart and checkout',
     }),
-    // Product ID
     defineField({
       name: 'id',
       title: 'ID',
       type: 'number',
       description: 'Shopify Product ID',
     }),
-    // Product ID
     defineField({
       name: 'gid',
       title: 'GID',
       type: 'string',
       description: 'Shopify Product GID',
     }),
-    // Slug
     defineField({
       name: 'slug',
-      title: 'Slug',
       type: 'slug',
       description: 'Shopify Product handle',
     }),
-    // Description
     defineField({
       name: 'descriptionHtml',
       title: 'HTML Description',
       type: 'text',
       rows: 5,
     }),
-    // Product Type
     defineField({
       fieldset: 'organization',
       name: 'productType',
-      title: 'Product type',
       type: 'string',
     }),
-    // Vendor
     defineField({
       fieldset: 'organization',
       name: 'vendor',
-      title: 'Vendor',
       type: 'string',
     }),
-    // Tags
     defineField({
       fieldset: 'organization',
       name: 'tags',
-      title: 'Tags',
       type: 'string',
     }),
-    // Price range
     defineField({
       name: 'priceRange',
-      title: 'Price range',
       type: 'priceRange',
     }),
-    // Preview Image URL
     defineField({
       name: 'previewImageUrl',
       title: 'Preview Image URL',
       type: 'string',
       description: 'Image displayed in both cart and checkout',
     }),
-    // Options
     defineField({
       name: 'options',
-      title: 'Options',
       type: 'array',
-      of: [
-        {
-          type: 'option',
-        },
+      of: [{type: 'option'},
       ],
     }),
-    // Variants
     defineField({
       fieldset: 'variants',
       name: 'variants',
-      title: 'Variants',
       type: 'array',
       of: [
-        {
+        defineArrayMember({
           title: 'Variant',
           type: 'reference',
           weak: true,
           to: [{type: 'productVariant'}],
-        },
+        }),
       ],
     }),
   ],

package/templates/shopify/schemaTypes/objects/shopify/{shopifyProductVariant.ts → shopifyProductVariantType.ts}

@@ -1,6 +1,6 @@
 import {defineField} from 'sanity'
 
-export default defineField({
+export const shopifyProductVariantType = defineField({
   name: 'shopifyProductVariant',
   title: 'Shopify',
   type: 'object',
@@ -22,25 +22,19 @@ export default defineField({
     },
   ],
   fields: [
-    // Created at
     defineField({
       fieldset: 'status',
       name: 'createdAt',
-      title: 'Created at',
       type: 'string',
     }),
-    // Updated at
     defineField({
       fieldset: 'status',
       name: 'updatedAt',
-      title: 'Updated at',
       type: 'string',
     }),
-    // Product status
     defineField({
       fieldset: 'status',
       name: 'status',
-      title: 'Product status',
       type: 'string',
       options: {
         layout: 'dropdown',
@@ -48,91 +42,71 @@ export default defineField({
       },
       validation: (Rule) => Rule.required(),
     }),
-    // Deleted
     defineField({
       fieldset: 'status',
       name: 'isDeleted',
       title: 'Deleted from Shopify?',
       type: 'boolean',
     }),
-    // Title
     defineField({
       name: 'title',
-      title: 'Title',
       type: 'string',
     }),
-    // SKU
     defineField({
       name: 'sku',
       title: 'SKU',
       type: 'string',
     }),
-    // ID
     defineField({
       name: 'id',
       title: 'ID',
       type: 'number',
       description: 'Shopify Product Variant ID',
     }),
-    // GID
     defineField({
       name: 'gid',
       title: 'GID',
       type: 'string',
       description: 'Shopify Product Variant GID',
     }),
-    // Product ID
     defineField({
       name: 'productId',
       title: 'Product ID',
       type: 'number',
     }),
-    // Product GID
     defineField({
       name: 'productGid',
       title: 'Product GID',
       type: 'string',
     }),
-    // Price
     defineField({
       name: 'price',
-      title: 'Price',
       type: 'number',
     }),
-    // Compare at price
     defineField({
       name: 'compareAtPrice',
-      title: 'Compare at price',
       type: 'number',
     }),
-    // Inventory
     defineField({
       name: 'inventory',
-      title: 'Inventory',
       type: 'inventory',
       options: {
         columns: 3,
       },
     }),
-    // Option 1
     defineField({
       fieldset: 'options',
       name: 'option1',
-      title: 'Option 1',
       type: 'string',
     }),
-    // Option 2
     defineField({
       fieldset: 'options',
       name: 'option2',
-      title: 'Option 2',
       type: 'string',
     }),
-    // Option 3
     defineField({
       fieldset: 'options',
       name: 'option3',
-      title: 'Option 3',
       type: 'string',
     }),
     // Preview Image URL

package/templates/shopify/schemaTypes/portableText/portableTextSimpleType.tsx

@@ -0,0 +1,45 @@
+import {defineArrayMember, defineField} from 'sanity'
+
+export const portableTextSimpleType = defineField({
+  name: 'portableTextSimple',
+  type: 'array',
+  of: [
+    defineArrayMember({
+      lists: [
+        {title: 'Bullet', value: 'bullet'},
+        {title: 'Numbered', value: 'number'},
+      ],
+      marks: {
+        decorators: [
+          {
+            title: 'Italic',
+            value: 'em',
+          },
+          {
+            title: 'Strong',
+            value: 'strong',
+          },
+        ],
+        annotations: [
+          {
+            name: 'linkProduct',
+            type: 'linkProduct',
+          },
+          {
+            name: 'linkEmail',
+            type: 'linkEmail',
+          },
+          {
+            name: 'linkInternal',
+            type: 'linkInternal',
+          },
+          {
+            name: 'linkExternal',
+            type: 'linkExternal',
+          },
+        ],
+      },
+      type: 'block',
+    }),
+  ],
+})

package/templates/shopify/schemaTypes/portableText/portableTextType.tsx

@@ -0,0 +1,52 @@
+import {defineArrayMember, defineField} from 'sanity'
+
+export const portableTextType = defineField({
+  name: 'portableText',
+  type: 'array',
+  of: [
+    defineArrayMember({
+      lists: [
+        {title: 'Bullet', value: 'bullet'},
+        {title: 'Numbered', value: 'number'},
+      ],
+      marks: {
+        decorators: [
+          {
+            title: 'Italic',
+            value: 'em',
+          },
+          {
+            title: 'Strong',
+            value: 'strong',
+          },
+        ],
+        annotations: [
+          {
+            name: 'linkProduct',
+            type: 'linkProduct',
+          },
+          {
+            name: 'linkEmail',
+            type: 'linkEmail',
+          },
+          {
+            name: 'linkInternal',
+            type: 'linkInternal',
+          },
+          {
+            name: 'linkExternal',
+            type: 'linkExternal',
+          },
+        ],
+      },
+      type: 'block',
+    }),
+    defineArrayMember({ type: 'accordion' }),
+    defineArrayMember({ type: 'callout' }),
+    defineArrayMember({ type: 'grid' }),
+    defineArrayMember({ type: 'images' }),
+    defineArrayMember({ type: 'imageWithProductHotspots', title: 'Image with Hotspots' }),
+    defineArrayMember({ type: 'instagram' }),
+    defineArrayMember({ type: 'products' }),
+  ],
+})

package/templates/shopify/schemaTypes/singletons/homeType.ts

@@ -0,0 +1,49 @@
+import {HomeIcon} from '@sanity/icons'
+import {defineArrayMember, defineField} from 'sanity'
+import { GROUPS } from '../../constants'
+
+const TITLE = 'Home'
+
+export const homeType = defineField({
+  name: 'home',
+  title: TITLE,
+  type: 'document',
+  icon: HomeIcon,
+  groups: GROUPS,
+  fields: [
+    defineField({
+      name: 'hero',
+      type: 'hero',
+      group: 'editorial',
+    }),
+    defineField({
+      name: 'modules',
+      type: 'array',
+      of: [
+        defineArrayMember({ type: 'accordion' }),
+        defineArrayMember({ type: 'callout' }),
+        defineArrayMember({ type: 'grid' }),
+        defineArrayMember({ type: 'images' }),
+        defineArrayMember({ type: 'imageWithProductHotspots', title: 'Image with Hotspots' }),
+        defineArrayMember({ type: 'instagram' }),
+        defineArrayMember({ type: 'products' }),
+      ],
+      group: 'editorial',
+    }),
+    defineField({
+      name: 'seo',
+      title: 'SEO',
+      type: 'seo',
+      group: 'seo',
+    }),
+  ],
+  preview: {
+    prepare() {
+      return {
+        media: HomeIcon,
+        subtitle: 'Index',
+        title: TITLE,
+      }
+    },
+  },
+})

package/templates/shopify/schemaTypes/singletons/{settings.ts → settingsType.ts}

@@ -1,4 +1,4 @@
-import {CogIcon} from '@sanity/icons'
+import {CogIcon, ControlsIcon, ErrorOutlineIcon, MenuIcon, SearchIcon} from '@sanity/icons'
 import {defineType, defineField} from 'sanity'
 
 const TITLE = 'Settings'
@@ -6,7 +6,7 @@ interface ProductOptions {
   title: string
 }
 
-export default defineType({
+export const settingsType = defineType({
   name: 'settings',
   title: TITLE,
   type: 'document',
@@ -16,39 +16,37 @@ export default defineType({
       default: true,
       name: 'navigation',
       title: 'Navigation',
+      icon: MenuIcon,
     },
     {
       name: 'productOptions',
       title: 'Product options',
+      icon: ControlsIcon,
     },
     {
       name: 'notFoundPage',
       title: '404 page',
+      icon: ErrorOutlineIcon,
     },
     {
       name: 'seo',
       title: 'SEO',
+      icon: SearchIcon,
     },
   ],
   fields: [
-    // Menu
     defineField({
       name: 'menu',
-      title: 'Menu',
-      type: 'menuSettings',
+      type: 'menu',
       group: 'navigation',
     }),
-    // Footer
     defineField({
       name: 'footer',
-      title: 'Footer',
       type: 'footerSettings',
       group: 'navigation',
     }),
-    // Custom product options
     defineField({
       name: 'customProductOptions',
-      title: 'Custom product options',
       type: 'array',
       group: 'productOptions',
       of: [

package/templates/shopify/utils/shopifyUrls.ts

@@ -4,19 +4,19 @@ export const collectionUrl = (collectionId: number) => {
   if (!SHOPIFY_STORE_ID) {
     return null
   }
-  return `https://${SHOPIFY_STORE_ID}/admin/collections/${collectionId}`
+  return `https://admin.shopify.com/store/${SHOPIFY_STORE_ID}/collections/${collectionId}`
 }
 
 export const productUrl = (productId: number) => {
   if (!SHOPIFY_STORE_ID) {
     return null
   }
-  return `https://${SHOPIFY_STORE_ID}/admin/products/${productId}`
+  return `https://admin.shopify.com/store/${SHOPIFY_STORE_ID}/products/${productId}`
 }
 
 export const productVariantUrl = (productId: number, productVariantId: number) => {
   if (!SHOPIFY_STORE_ID) {
     return null
   }
-  return `https://${SHOPIFY_STORE_ID}/admin/products/${productId}/variants/${productVariantId}`
+  return `https://admin.shopify.com/store/${SHOPIFY_STORE_ID}/products/${productId}/variants/${productVariantId}`
 }

package/templates/shopify/utils/validateSlug.ts

@@ -1,10 +1,9 @@
-import {Rule, Slug} from 'sanity'
-import slug from 'slug'
+import {SlugRule} from 'sanity'
 
 const MAX_LENGTH = 96
 
-export const validateSlug = (Rule: Rule) => {
-  return Rule.required().custom(async (value: Slug) => {
+export const validateSlug = (Rule: SlugRule) => {
+  return Rule.required().custom((value) => {
     const currentSlug = value && value.current
     if (!currentSlug) {
       return true
@@ -14,9 +13,6 @@ export const validateSlug = (Rule: Rule) => {
       return `Must be less than ${MAX_LENGTH} characters`
     }
 
-    if (currentSlug !== slug(currentSlug, {lower: true})) {
-      return 'Must be a valid slug'
-    }
     return true
   })
 }