Merge branch 'refs/heads/main' into dev

# Conflicts:
#	pnpm-lock.yaml

.gitignore

@@ -11,3 +11,4 @@ dist/**
 .DS_Store
 /.eslintcache
 hooks/
+package-lock.json

package.json

@@ -26,7 +26,7 @@
   "devDependencies": {
     "@biomejs/biome": "1.8.3",
     "@changesets/cli": "^2.27.7",
-    "@types/node": "22.2.0",
+    "@types/node": "22.3.0",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
     "cross-env": "7.0.3",
@@ -35,12 +35,12 @@
     "react-dom": "18.3.1",
     "rimraf": "6.0.1",
     "tsup": "8.2.4",
-    "turbo": "2.0.12",
+    "turbo": "2.0.13",
     "typescript": "5.5.4"
   },
   "optionalDependencies": {
     "@esbuild/darwin-x64": "^0.23.0",
-    "turbo-darwin-arm64": "^2.0.12"
+    "turbo-darwin-arm64": "^2.0.13"
   },
   "engines": {
     "node": ">=18"

packages/hydrogen/src/types.ts

@@ -288,6 +288,43 @@ export type RootRouteData = {
   [key: string]: any
 }
 
+export type OptionDisplayType =
+  | 'dropdown'
+  | 'button'
+  | 'color'
+  | 'variant-image'
+  | 'custom-image'
+export type OptionSize = 'sm' | 'md' | 'lg'
+export type OptionShape = 'square' | 'round' | 'circle'
+
+export type OptionData = {
+  id: string
+  name: string
+  displayName: string
+  type: OptionDisplayType
+  size: OptionSize
+  shape: OptionShape
+}
+
+export type SwatchesConfigs = {
+  options: OptionData[]
+  swatches: {
+    colors: ColorSwatch[]
+    images: ImageSwatch[]
+  }
+}
+
+export type ColorSwatch = {
+  id: string
+  name: string
+  value: string
+}
+export type ImageSwatch = {
+  id: string
+  name: string
+  value: WeaverseImage | string
+}
+
 export type WeaverseProduct = WeaverseResourcePickerData
 export type WeaverseCollection = WeaverseResourcePickerData
 export type WeaverseBlog = WeaverseResourcePickerData

packages/hydrogen/src/utils.ts

@@ -94,7 +94,7 @@ export function generateDataFromSchema({
  */
 export function resizeShopifyImage(imageURL: string, size: string): string {
   try {
-    if (size === 'original') {
+    if (!imageURL.includes('cdn.shopify.com') || size === 'original') {
       return imageURL
     }
     let [, path, ext] = imageURL.match(/(.*\/[\w-_.]+)\.(\w{2,4})/)