diff --git a/packages/shopify/src/utils/get-search-variables.ts b/packages/shopify/src/utils/get-search-variables.ts index 41f0f0493..26c7d3faa 100644 --- a/packages/shopify/src/utils/get-search-variables.ts +++ b/packages/shopify/src/utils/get-search-variables.ts @@ -11,7 +11,7 @@ export const getSearchVariables = ({ let query = '' if (search) { - query += `product_type:"${search}" OR title:"${search}" OR tag:"${search}" ` + query += `(product_type:${search}) OR (title:${search}) OR (tag:${search}) ` } if (brandId) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 02515ed23..adb0c5bde 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -626,7 +626,7 @@ importers: lint-staged: ^13.0.3 lodash.random: ^3.2.0 lodash.throttle: ^4.1.1 - next: ^12.3.0 + next: ^13.0.0 next-themes: ^0.2.0 postcss: ^8.3.5 postcss-flexbugs-fixes: ^5.0.2 @@ -664,8 +664,8 @@ importers: keen-slider: 6.8.0 lodash.random: 3.2.0 lodash.throttle: 4.1.1 - next: 12.3.0_biqbaboplfbrettd7655fr4n2y - next-themes: 0.2.1_c3hne4hwj64hb7tofigd3bvkji + next: 13.0.0_biqbaboplfbrettd7655fr4n2y + next-themes: 0.2.1_r5sq4deac3rmm2d5onhwvomqve postcss: 8.4.16 postcss-nesting: 10.1.10_postcss@8.4.16 react: 18.2.0 @@ -2286,6 +2286,11 @@ packages: /@next/env/12.3.0: resolution: {integrity: sha512-PTJpjAFVbzBQ9xXpzMTroShvD5YDIIy46jQ7d4LrWpY+/5a8H90Tm8hE3Hvkc5RBRspVo7kvEOnqQms0A+2Q6w==} + dev: true + + /@next/env/13.0.0: + resolution: {integrity: sha512-65v9BVuah2Mplohm4+efsKEnoEuhmlGm8B2w6vD1geeEP2wXtlSJCvR/cCRJ3fD8wzCQBV41VcMBQeYET6MRkg==} + dev: false /@next/eslint-plugin-next/12.3.0: resolution: {integrity: sha512-jVdq1qYTNDjUtulnE8/hkPv0pHILV4jMg5La99iaY/FFm20WxVnsAZtbNnMvlPbf8dc010oO304SX9yXbg5PAw==} @@ -2299,6 +2304,16 @@ packages: cpu: [arm] os: [android] requiresBuild: true + dev: true + optional: true + + /@next/swc-android-arm-eabi/13.0.0: + resolution: {integrity: sha512-+DUQkYF93gxFjWY+CYWE1QDX6gTgnUiWf+W4UqZjM1Jcef8U97fS6xYh+i+8rH4MM0AXHm7OSakvfOMzmjU6VA==} + engines: {node: '>= 10'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: false optional: true /@next/swc-android-arm64/12.3.0: @@ -2307,6 +2322,16 @@ packages: cpu: [arm64] os: [android] requiresBuild: true + dev: true + optional: true + + /@next/swc-android-arm64/13.0.0: + resolution: {integrity: sha512-RW9Uy3bMSc0zVGCa11klFuwfP/jdcdkhdruqnrJ7v+7XHm6OFKkSRzX6ee7yGR1rdDZvTnP4GZSRSpzjLv/N0g==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: false optional: true /@next/swc-darwin-arm64/12.3.0: @@ -2315,6 +2340,16 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true + dev: true + optional: true + + /@next/swc-darwin-arm64/13.0.0: + resolution: {integrity: sha512-APA26nps1j4qyhOIzkclW/OmgotVHj1jBxebSpMCPw2rXfiNvKNY9FA0TcuwPmUCNqaTnm703h6oW4dvp73A4Q==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: false optional: true /@next/swc-darwin-x64/12.3.0: @@ -2323,6 +2358,16 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true + dev: true + optional: true + + /@next/swc-darwin-x64/13.0.0: + resolution: {integrity: sha512-qsUhUdoFuRJiaJ7LnvTQ6GZv1QnMDcRXCIjxaN0FNVXwrjkq++U7KjBUaxXkRzLV4C7u0NHLNOp0iZwNNE7ypw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: false optional: true /@next/swc-freebsd-x64/12.3.0: @@ -2331,6 +2376,16 @@ packages: cpu: [x64] os: [freebsd] requiresBuild: true + dev: true + optional: true + + /@next/swc-freebsd-x64/13.0.0: + resolution: {integrity: sha512-sCdyCbboS7CwdnevKH9J6hkJI76LUw1jVWt4eV7kISuLiPba3JmehZSWm80oa4ADChRVAwzhLAo2zJaYRrInbg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: false optional: true /@next/swc-linux-arm-gnueabihf/12.3.0: @@ -2339,6 +2394,16 @@ packages: cpu: [arm] os: [linux] requiresBuild: true + dev: true + optional: true + + /@next/swc-linux-arm-gnueabihf/13.0.0: + resolution: {integrity: sha512-/X/VxfFA41C9jrEv+sUsPLQ5vbDPVIgG0CJrzKvrcc+b+4zIgPgtfsaWq9ockjHFQi3ycvlZK4TALOXO8ovQ6Q==} + engines: {node: '>= 10'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: false optional: true /@next/swc-linux-arm64-gnu/12.3.0: @@ -2347,6 +2412,16 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true + dev: true + optional: true + + /@next/swc-linux-arm64-gnu/13.0.0: + resolution: {integrity: sha512-x6Oxr1GIi0ZtNiT6jbw+JVcbEi3UQgF7mMmkrgfL4mfchOwXtWSHKTSSPnwoJWJfXYa0Vy1n8NElWNTGAqoWFw==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: false optional: true /@next/swc-linux-arm64-musl/12.3.0: @@ -2355,6 +2430,16 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true + dev: true + optional: true + + /@next/swc-linux-arm64-musl/13.0.0: + resolution: {integrity: sha512-SnMH9ngI+ipGh3kqQ8+mDtWunirwmhQnQeZkEq9e/9Xsgjf04OetqrqRHKM1HmJtG2qMUJbyXFJ0F81TPuT+3g==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: false optional: true /@next/swc-linux-x64-gnu/12.3.0: @@ -2363,6 +2448,16 @@ packages: cpu: [x64] os: [linux] requiresBuild: true + dev: true + optional: true + + /@next/swc-linux-x64-gnu/13.0.0: + resolution: {integrity: sha512-VSQwTX9EmdbotArtA1J67X8964oQfe0xHb32x4tu+JqTR+wOHyG6wGzPMdXH2oKAp6rdd7BzqxUXXf0J+ypHlw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: false optional: true /@next/swc-linux-x64-musl/12.3.0: @@ -2371,6 +2466,16 @@ packages: cpu: [x64] os: [linux] requiresBuild: true + dev: true + optional: true + + /@next/swc-linux-x64-musl/13.0.0: + resolution: {integrity: sha512-xBCP0nnpO0q4tsytXkvIwWFINtbFRyVY5gxa1zB0vlFtqYR9lNhrOwH3CBrks3kkeaePOXd611+8sjdUtrLnXA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: false optional: true /@next/swc-win32-arm64-msvc/12.3.0: @@ -2379,6 +2484,16 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true + dev: true + optional: true + + /@next/swc-win32-arm64-msvc/13.0.0: + resolution: {integrity: sha512-NutwDafqhGxqPj/eiUixJq9ImS/0sgx6gqlD7jRndCvQ2Q8AvDdu1+xKcGWGNnhcDsNM/n1avf1e62OG1GaqJg==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: false optional: true /@next/swc-win32-ia32-msvc/12.3.0: @@ -2387,6 +2502,16 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true + dev: true + optional: true + + /@next/swc-win32-ia32-msvc/13.0.0: + resolution: {integrity: sha512-zNaxaO+Kl/xNz02E9QlcVz0pT4MjkXGDLb25qxtAzyJL15aU0+VjjbIZAYWctG59dvggNIUNDWgoBeVTKB9xLg==} + engines: {node: '>= 10'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: false optional: true /@next/swc-win32-x64-msvc/12.3.0: @@ -2395,6 +2520,16 @@ packages: cpu: [x64] os: [win32] requiresBuild: true + dev: true + optional: true + + /@next/swc-win32-x64-msvc/13.0.0: + resolution: {integrity: sha512-FFOGGWwTCRMu9W7MF496Urefxtuo2lttxF1vwS+1rIRsKvuLrWhVaVTj3T8sf2EBL6gtJbmh4TYlizS+obnGKA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: false optional: true /@nodelib/fs.scandir/2.1.5: @@ -3918,6 +4053,10 @@ packages: /caniuse-lite/1.0.30001399: resolution: {integrity: sha512-4vQ90tMKS+FkvuVWS5/QY1+d805ODxZiKFzsU8o/RsVJz49ZSRR8EjykLJbqhzdPgadbX6wB538wOzle3JniRA==} + /caniuse-lite/1.0.30001422: + resolution: {integrity: sha512-hSesn02u1QacQHhaxl/kNMZwqVG35Sz/8DgvmgedxSH8z9UUpcDYSPYgsj3x5dQNRcNp6BwpSfQfVzYUTm+fog==} + dev: false + /capital-case/1.0.4: resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==} dependencies: @@ -4089,6 +4228,10 @@ packages: engines: {node: '>= 10'} dev: true + /client-only/0.0.1: + resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==} + dev: false + /cliui/6.0.0: resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==} dependencies: @@ -7065,14 +7208,14 @@ packages: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: true - /next-themes/0.2.1_c3hne4hwj64hb7tofigd3bvkji: + /next-themes/0.2.1_r5sq4deac3rmm2d5onhwvomqve: resolution: {integrity: sha512-B+AKNfYNIzh0vqQQKqQItTS8evEouKD7H5Hj3kmuPERwddR2TxvDSFZuTj6T7Jfn1oyeUyJMydPl1Bkxkh0W7A==} peerDependencies: next: '*' react: '*' react-dom: '*' dependencies: - next: 12.3.0_biqbaboplfbrettd7655fr4n2y + next: 13.0.0_biqbaboplfbrettd7655fr4n2y react: 18.2.0 react-dom: 18.2.0_react@18.2.0 dev: false @@ -7120,6 +7263,52 @@ packages: transitivePeerDependencies: - '@babel/core' - babel-plugin-macros + dev: true + + /next/13.0.0_biqbaboplfbrettd7655fr4n2y: + resolution: {integrity: sha512-puH1WGM6rGeFOoFdXXYfUxN9Sgi4LMytCV5HkQJvVUOhHfC1DoVqOfvzaEteyp6P04IW+gbtK2Q9pInVSrltPA==} + engines: {node: '>=14.6.0'} + hasBin: true + peerDependencies: + fibers: '>= 3.1.0' + node-sass: ^6.0.0 || ^7.0.0 + react: ^18.0.0-0 + react-dom: ^18.0.0-0 + sass: ^1.3.0 + peerDependenciesMeta: + fibers: + optional: true + node-sass: + optional: true + sass: + optional: true + dependencies: + '@next/env': 13.0.0 + '@swc/helpers': 0.4.11 + caniuse-lite: 1.0.30001422 + postcss: 8.4.14 + react: 18.2.0 + react-dom: 18.2.0_react@18.2.0 + styled-jsx: 5.1.0_react@18.2.0 + use-sync-external-store: 1.2.0_react@18.2.0 + optionalDependencies: + '@next/swc-android-arm-eabi': 13.0.0 + '@next/swc-android-arm64': 13.0.0 + '@next/swc-darwin-arm64': 13.0.0 + '@next/swc-darwin-x64': 13.0.0 + '@next/swc-freebsd-x64': 13.0.0 + '@next/swc-linux-arm-gnueabihf': 13.0.0 + '@next/swc-linux-arm64-gnu': 13.0.0 + '@next/swc-linux-arm64-musl': 13.0.0 + '@next/swc-linux-x64-gnu': 13.0.0 + '@next/swc-linux-x64-musl': 13.0.0 + '@next/swc-win32-arm64-msvc': 13.0.0 + '@next/swc-win32-ia32-msvc': 13.0.0 + '@next/swc-win32-x64-msvc': 13.0.0 + transitivePeerDependencies: + - '@babel/core' + - babel-plugin-macros + dev: false /no-case/3.0.4: resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==} @@ -8863,6 +9052,24 @@ packages: optional: true dependencies: react: 18.2.0 + dev: true + + /styled-jsx/5.1.0_react@18.2.0: + resolution: {integrity: sha512-/iHaRJt9U7T+5tp6TRelLnqBqiaIT0HsO0+vgyj8hK2KUk7aejFqRrumqPUlAqDwAj8IbS/1hk3IhBAAK/FCUQ==} + engines: {node: '>= 12.0.0'} + peerDependencies: + '@babel/core': '*' + babel-plugin-macros: '*' + react: '>= 16.8.0 || 17.x.x || ^18.0.0-0' + peerDependenciesMeta: + '@babel/core': + optional: true + babel-plugin-macros: + optional: true + dependencies: + client-only: 0.0.1 + react: 18.2.0 + dev: false /supports-color/2.0.0: resolution: {integrity: sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==} diff --git a/site/components/cart/CartItem/CartItem.tsx b/site/components/cart/CartItem/CartItem.tsx index d76ccbaee..f338d831f 100644 --- a/site/components/cart/CartItem/CartItem.tsx +++ b/site/components/cart/CartItem/CartItem.tsx @@ -86,29 +86,25 @@ const CartItem = ({
- - closeSidebarIfPresent()} - className={s.productImage} - width={150} - height={150} - src={item.variant.image?.url || placeholderImg} - alt={item.variant.image?.alt || 'Product Image'} - unoptimized - /> - + closeSidebarIfPresent()} + className={s.productImage} + width={150} + height={150} + src={item.variant.image?.url || placeholderImg} + alt={item.variant.image?.alt || 'Product Image'} + unoptimized + />
- - closeSidebarIfPresent()} - > - {item.name} - - + closeSidebarIfPresent()} + > + {item.name} + {options && options.length > 0 && (
diff --git a/site/components/cart/CartSidebarView/CartSidebarView.tsx b/site/components/cart/CartSidebarView/CartSidebarView.tsx index 327602c0b..2198615cd 100644 --- a/site/components/cart/CartSidebarView/CartSidebarView.tsx +++ b/site/components/cart/CartSidebarView/CartSidebarView.tsx @@ -74,11 +74,9 @@ const CartSidebarView: FC = () => { <>
- - - My Cart - - + + My Cart +
    {data!.lineItems.map((item: any) => ( diff --git a/site/components/checkout/CheckoutSidebarView/CheckoutSidebarView.tsx b/site/components/checkout/CheckoutSidebarView/CheckoutSidebarView.tsx index 21a20c429..a865e65ab 100644 --- a/site/components/checkout/CheckoutSidebarView/CheckoutSidebarView.tsx +++ b/site/components/checkout/CheckoutSidebarView/CheckoutSidebarView.tsx @@ -55,9 +55,7 @@ const CheckoutSidebarView: FC = () => { >
    - - Checkout - + Checkout = ({ className, pages }) => {
    - - - - - - ACME - + + + + + ACME
    {[...links, ...sitePages].map((page) => ( - - - {page.name} - + + {page.name} ))} diff --git a/site/components/common/HomeAllProductsGrid/HomeAllProductsGrid.tsx b/site/components/common/HomeAllProductsGrid/HomeAllProductsGrid.tsx index 63ec5698c..9da01e225 100644 --- a/site/components/common/HomeAllProductsGrid/HomeAllProductsGrid.tsx +++ b/site/components/common/HomeAllProductsGrid/HomeAllProductsGrid.tsx @@ -24,29 +24,21 @@ const HomeAllProductsGrid: FC = ({
    • - - All Designers - + All Designers
      • {brands?.map(({ path, name }) => (
    • - - {name} - + {name}
      • ))}
    diff --git a/site/components/common/I18nWidget/I18nWidget.tsx b/site/components/common/I18nWidget/I18nWidget.tsx index 7c9124e3e..11d0c8f1a 100644 --- a/site/components/common/I18nWidget/I18nWidget.tsx +++ b/site/components/common/I18nWidget/I18nWidget.tsx @@ -81,13 +81,13 @@ const I18nWidget: FC = () => {