Merge pull request #155 from medusajs/fix/404

fix: proper handling of 404 in routes

Author: VariableVic

src/app/(main)/collections/[handle]/page.tsx

@@ -1,5 +1,6 @@
 import CollectionTemplate from "@modules/collections/templates"
 import { Metadata } from "next"
+import { notFound } from "next/navigation"
 
 type Props = {
   params: { handle: string }
@@ -11,7 +12,7 @@ async function getCollection(handle: string) {
   const res = await fetch(`${BASEURL}/collections?handle=${handle}`)
 
   if (!res.ok) {
-    throw new Error(`Failed to fetch collection: ${handle}`)
+    notFound()
   }
 
   return res.json()
@@ -20,6 +21,10 @@ async function getCollection(handle: string) {
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { collection } = await getCollection(params.handle)
 
+  if (!collection) {
+    notFound()
+  }
+
   return {
     title: `${collection.title} | Acme Store`,
     description: `${collection.title} collection`,

src/app/(main)/products/[handle]/page.tsx

@@ -1,6 +1,7 @@
 import medusaRequest from "@lib/medusa-fetch"
 import ProductTemplate from "@modules/products/templates"
 import { Metadata } from "next"
+import { notFound } from "next/navigation"
 
 type Props = {
   params: { handle: string }
@@ -14,7 +15,7 @@ async function getProducts(handle: string) {
   })
 
   if (!res.ok) {
-    throw new Error(`Failed to fetch product: ${handle}`)
+    notFound()
   }
 
   return res.body
@@ -23,6 +24,10 @@ async function getProducts(handle: string) {
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { products } = await getProducts(params.handle)
 
+  if (!products.length) {
+    notFound()
+  }
+
   const product = products[0]
 
   return {