@graphcommerce/magento-store 5.1.0-canary.2 → 5.1.0-canary.4

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change Log
 
+## 5.1.0-canary.4
+
+### Minor Changes
+
+- [#1755](https://github.com/graphcommerce-org/graphcommerce/pull/1755) [`472486194`](https://github.com/graphcommerce-org/graphcommerce/commit/472486194f4a085e8a4dc0251b862024fb62ec86) - Magento URL Rewrites support to GraphCommerce compatible URL's. ([@paales](https://github.com/paales))
+
+- [#1755](https://github.com/graphcommerce-org/graphcommerce/pull/1755) [`472486194`](https://github.com/graphcommerce-org/graphcommerce/commit/472486194f4a085e8a4dc0251b862024fb62ec86) - Magento URL Rewrites redirect 301 and 302 support ([@paales](https://github.com/paales))
+
+### Patch Changes
+
+- [#1755](https://github.com/graphcommerce-org/graphcommerce/pull/1755) [`dbe103963`](https://github.com/graphcommerce-org/graphcommerce/commit/dbe10396363313908858de5d681d4e38db94d132) - Redirect URL suffixes to their non suffix counterpart and vice versa ([@paales](https://github.com/paales))
+
+## 5.1.0-canary.3
+
+### Patch Changes
+
+- [#1752](https://github.com/graphcommerce-org/graphcommerce/pull/1752) [`2a6a4d9ec`](https://github.com/graphcommerce-org/graphcommerce/commit/2a6a4d9ecfa1b58a66ba9b9d00016d6feda9aa95) - Updated dependencies to latest versions, except for nextjs; Solve tons of peer dependency issues.
+
+  - Updated the @mui/material package
+  - Removed dependencies on react-hook-form-mui and @playwright/test
+  - Upgraded dependencies including type-fest and graphql-mesh
+  - Solved peer dependency issues ([@paales](https://github.com/paales))
+
 ## 5.1.0-canary.2
 
 ## 5.1.0-canary.1

package/index.ts

@@ -11,3 +11,4 @@ export * from './StoreConfig.gql'
 export * from './components/StoreSwitcherButton/StoreSwitcherButton'
 export * from './components/StoreSwitcherList/StoreSwitcherList'
 export * from './components/StoreSwitcherList/StoreSwitcherList.gql'
+export * from './utils/redirectOrNotFound'

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-store",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "5.1.0-canary.2",
+  "version": "5.1.0-canary.4",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,24 +12,22 @@
     }
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^5.1.0-canary.2",
-    "@graphcommerce/prettier-config-pwa": "^5.1.0-canary.2",
-    "@graphcommerce/typescript-config-pwa": "^5.1.0-canary.2",
-    "@playwright/test": "^1.21.1",
-    "type-fest": "^2.12.2"
+    "@graphcommerce/eslint-config-pwa": "5.1.0-canary.4",
+    "@graphcommerce/prettier-config-pwa": "5.1.0-canary.4",
+    "@graphcommerce/typescript-config-pwa": "5.1.0-canary.4"
   },
   "dependencies": {
-    "@graphcommerce/graphql": "5.1.0-canary.2",
-    "@graphcommerce/graphql-mesh": "5.1.0-canary.2",
-    "@graphcommerce/image": "5.1.0-canary.2",
-    "@graphcommerce/next-ui": "5.1.0-canary.2"
+    "@graphcommerce/graphql": "5.1.0-canary.4",
+    "@graphcommerce/graphql-mesh": "5.1.0-canary.4",
+    "@graphcommerce/image": "5.1.0-canary.4",
+    "@graphcommerce/next-ui": "5.1.0-canary.4"
   },
   "peerDependencies": {
     "@lingui/react": "^3.13.2",
     "@lingui/core": "^3.13.2",
-    "@mui/material": "5.5.3",
+    "@mui/material": "^5.10.16",
     "next": "^12.1.2",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   }
 }

package/utils/HandleRedirect.graphql

@@ -0,0 +1,20 @@
+query HandleRedirect($url: String!) {
+  route(url: $url) {
+    __typename
+    redirect_code
+    relative_url
+    type
+    ... on ProductInterface {
+      uid
+      url_key
+    }
+    ... on CategoryInterface {
+      uid
+      url_key
+    }
+    ... on CmsPage {
+      url_key
+      identifier
+    }
+  }
+}

package/utils/redirectOrNotFound.ts

@@ -0,0 +1,87 @@
+import { ParsedUrlQuery } from 'querystring'
+import { ApolloClient, flushMeasurePerf, NormalizedCacheObject } from '@graphcommerce/graphql'
+import { nonNullable } from '@graphcommerce/next-ui'
+import { Redirect } from 'next'
+import { StoreConfigDocument } from '../StoreConfig.gql'
+import { defaultLocale } from '../localeToStore'
+import { HandleRedirectDocument } from './HandleRedirect.gql'
+
+export type RedirectOr404Return = Promise<
+  | { redirect: Redirect; revalidate?: number | boolean }
+  | { notFound: true; revalidate?: number | boolean }
+>
+
+const notFound = () => {
+  flushMeasurePerf()
+  return { notFound: true, revalidate: 60 * 20 } as const
+}
+
+const redirect = (to: string, permanent: boolean, locale?: string) => {
+  const prefix = locale === defaultLocale() ? '' : `/${locale}`
+  const destination = `${prefix}${to}`
+
+  flushMeasurePerf()
+
+  if (process.env.NODE_ENV === 'development') {
+    // eslint-disable-next-line no-console
+    console.log(`${permanent ? 'Permanent' : 'Temporary'} redirect to ${to}`)
+    // eslint-disable-next-line no-param-reassign
+    permanent = false
+  }
+
+  return { redirect: { destination, permanent }, revalidate: 60 * 20 }
+}
+
+export async function redirectOrNotFound(
+  client: ApolloClient<NormalizedCacheObject>,
+  params?: ParsedUrlQuery,
+  locale?: string,
+): RedirectOr404Return {
+  try {
+    // Create a URL from the params provided.
+    const urlKey = Object.values(params ?? {})
+      .map((v) => (Array.isArray(v) ? v.join('/') : v))
+      .join('/')
+
+    // Get the configured suffixes from the store config
+    const { product_url_suffix: prodSuffix, category_url_suffix: catSuffix } =
+      (await client.query({ query: StoreConfigDocument })).data.storeConfig ?? {}
+
+    const candidates = new Set([urlKey])
+
+    // If the incomming URL contains a suffix, we check if the URL without the suffix exists
+    // if the incomming URL does not contain a suffix, we check if the URL with the suffix exists
+    const suffixes = [prodSuffix, catSuffix].filter(nonNullable)
+    suffixes.forEach((suffix) => {
+      candidates.add(
+        urlKey.endsWith(suffix) ? urlKey.slice(0, -suffix.length) : `${urlKey}${suffix}`,
+      )
+    })
+
+    const routePromises = [...candidates].map(async (url) => {
+      const result = await client.query({ query: HandleRedirectDocument, variables: { url } })
+      if (!result.data.route) throw Error('No data')
+      return result.data.route
+    })
+
+    const route = await Promise.any(routePromises)
+
+    // There is a URL, so we need to check if it can be found in the database.
+    const permanent = route?.redirect_code === 301
+
+    // Add special handling for the homepage.
+    if (route?.url_key && route.__typename.endsWith('Product')) {
+      if (process.env.NEXT_PUBLIC_SINGLE_PRODUCT_PAGE !== '1') {
+        console.warn('Redirects are only supported for NEXT_PUBLIC_SINGLE_PRODUCT_PAGE')
+      }
+      return redirect(`/p/${route.url_key}`, permanent, locale)
+    }
+
+    // The default URL for categories or CMS pages is handled by the pages/[...url].tsx file.
+    if (route?.url_key) return redirect(`/${route.url_key}`, permanent, locale)
+  } catch (e) {
+    // We're done
+  }
+
+  return notFound()
+}