@akinon/projectzero 1.92.0-rc.32 → 1.92.0-rc.34

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @akinon/projectzero
 
+## 1.92.0-rc.34
+
+## 1.92.0-rc.33
+
 ## 1.92.0-rc.32
 
 ## 1.92.0-rc.31

package/app-template/CHANGELOG.md

@@ -1,5 +1,57 @@
 # projectzeronext
 
+## 1.92.0-rc.34
+
+### Minor Changes
+
+- 0ad91bbd: ZERO-3489: Improve error handling in data fetching across multiple pages and server functions
+
+### Patch Changes
+
+- Updated dependencies [0ad91bbd]
+  - @akinon/next@1.92.0-rc.34
+  - @akinon/pz-akifast@1.92.0-rc.34
+  - @akinon/pz-b2b@1.92.0-rc.34
+  - @akinon/pz-basket-gift-pack@1.92.0-rc.34
+  - @akinon/pz-bkm@1.92.0-rc.34
+  - @akinon/pz-checkout-gift-pack@1.92.0-rc.34
+  - @akinon/pz-click-collect@1.92.0-rc.34
+  - @akinon/pz-credit-payment@1.92.0-rc.34
+  - @akinon/pz-gpay@1.92.0-rc.34
+  - @akinon/pz-hepsipay@1.92.0-rc.34
+  - @akinon/pz-masterpass@1.92.0-rc.34
+  - @akinon/pz-one-click-checkout@1.92.0-rc.34
+  - @akinon/pz-otp@1.92.0-rc.34
+  - @akinon/pz-pay-on-delivery@1.92.0-rc.34
+  - @akinon/pz-saved-card@1.92.0-rc.34
+  - @akinon/pz-similar-products@1.92.0-rc.34
+  - @akinon/pz-tabby-extension@1.92.0-rc.34
+  - @akinon/pz-tamara-extension@1.92.0-rc.34
+
+## 1.92.0-rc.33
+
+### Patch Changes
+
+- Updated dependencies [59b275c]
+  - @akinon/pz-similar-products@1.92.0-rc.33
+  - @akinon/next@1.92.0-rc.33
+  - @akinon/pz-akifast@1.92.0-rc.33
+  - @akinon/pz-b2b@1.92.0-rc.33
+  - @akinon/pz-basket-gift-pack@1.92.0-rc.33
+  - @akinon/pz-bkm@1.92.0-rc.33
+  - @akinon/pz-checkout-gift-pack@1.92.0-rc.33
+  - @akinon/pz-click-collect@1.92.0-rc.33
+  - @akinon/pz-credit-payment@1.92.0-rc.33
+  - @akinon/pz-gpay@1.92.0-rc.33
+  - @akinon/pz-hepsipay@1.92.0-rc.33
+  - @akinon/pz-masterpass@1.92.0-rc.33
+  - @akinon/pz-one-click-checkout@1.92.0-rc.33
+  - @akinon/pz-otp@1.92.0-rc.33
+  - @akinon/pz-pay-on-delivery@1.92.0-rc.33
+  - @akinon/pz-saved-card@1.92.0-rc.33
+  - @akinon/pz-tabby-extension@1.92.0-rc.33
+  - @akinon/pz-tamara-extension@1.92.0-rc.33
+
 ## 1.92.0-rc.32
 
 ### Patch Changes

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.92.0-rc.32",
+  "version": "1.92.0-rc.34",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,24 +24,24 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "1.92.0-rc.32",
-    "@akinon/pz-akifast": "1.92.0-rc.32",
-    "@akinon/pz-b2b": "1.92.0-rc.32",
-    "@akinon/pz-basket-gift-pack": "1.92.0-rc.32",
-    "@akinon/pz-bkm": "1.92.0-rc.32",
-    "@akinon/pz-checkout-gift-pack": "1.92.0-rc.32",
-    "@akinon/pz-click-collect": "1.92.0-rc.32",
-    "@akinon/pz-credit-payment": "1.92.0-rc.32",
-    "@akinon/pz-gpay": "1.92.0-rc.32",
-    "@akinon/pz-hepsipay": "1.92.0-rc.32",
-    "@akinon/pz-masterpass": "1.92.0-rc.32",
-    "@akinon/pz-one-click-checkout": "1.92.0-rc.32",
-    "@akinon/pz-otp": "1.92.0-rc.32",
-    "@akinon/pz-pay-on-delivery": "1.92.0-rc.32",
-    "@akinon/pz-saved-card": "1.92.0-rc.32",
-    "@akinon/pz-similar-products": "1.92.0-rc.32",
-    "@akinon/pz-tabby-extension": "1.92.0-rc.32",
-    "@akinon/pz-tamara-extension": "1.92.0-rc.32",
+    "@akinon/next": "1.92.0-rc.34",
+    "@akinon/pz-akifast": "1.92.0-rc.34",
+    "@akinon/pz-b2b": "1.92.0-rc.34",
+    "@akinon/pz-basket-gift-pack": "1.92.0-rc.34",
+    "@akinon/pz-bkm": "1.92.0-rc.34",
+    "@akinon/pz-checkout-gift-pack": "1.92.0-rc.34",
+    "@akinon/pz-click-collect": "1.92.0-rc.34",
+    "@akinon/pz-credit-payment": "1.92.0-rc.34",
+    "@akinon/pz-gpay": "1.92.0-rc.34",
+    "@akinon/pz-hepsipay": "1.92.0-rc.34",
+    "@akinon/pz-masterpass": "1.92.0-rc.34",
+    "@akinon/pz-one-click-checkout": "1.92.0-rc.34",
+    "@akinon/pz-otp": "1.92.0-rc.34",
+    "@akinon/pz-pay-on-delivery": "1.92.0-rc.34",
+    "@akinon/pz-saved-card": "1.92.0-rc.34",
+    "@akinon/pz-similar-products": "1.92.0-rc.34",
+    "@akinon/pz-tabby-extension": "1.92.0-rc.34",
+    "@akinon/pz-tamara-extension": "1.92.0-rc.34",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -64,7 +64,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.92.0-rc.32",
+    "@akinon/eslint-plugin-projectzero": "1.92.0-rc.34",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/src/app/[commerce]/[locale]/[currency]/category/[pk]/page.tsx

@@ -2,12 +2,25 @@ import { getCategoryData } from '@akinon/next/data/server';
 import { withSegmentDefaults } from '@akinon/next/hocs/server';
 import { PageProps } from '@akinon/next/types';
 import CategoryLayout from '@theme/views/category/layout';
+import { notFound } from 'next/navigation';
 
 async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
-  const { data, breadcrumbData } = await getCategoryData({
-    pk: params.pk,
-    searchParams
-  });
+  let categoryData;
+
+  try {
+    categoryData = await getCategoryData({
+      pk: params.pk,
+      searchParams
+    });
+  } catch (error) {
+    return notFound();
+  }
+
+  if (!categoryData || !categoryData.data) {
+    return notFound();
+  }
+
+  const { data, breadcrumbData } = categoryData;
 
   return (
     <>

package/app-template/src/app/[commerce]/[locale]/[currency]/flat-page/[pk]/page.tsx

@@ -1,9 +1,20 @@
 import { getFlatPageData } from '@akinon/next/data/server';
 import { withSegmentDefaults } from '@akinon/next/hocs/server';
 import { PageProps } from '@akinon/next/types';
+import { notFound } from 'next/navigation';
 
 async function Page({ params }: PageProps<{ pk: number }>) {
-  const data = await getFlatPageData({ pk: params.pk });
+  let data;
+
+  try {
+    data = await getFlatPageData({ pk: params.pk });
+  } catch (error) {
+    return notFound();
+  }
+
+  if (!data || !data.flat_page) {
+    return notFound();
+  }
 
   return (
     <div className="container mx-auto py-6">

package/app-template/src/app/[commerce]/[locale]/[currency]/group-product/[pk]/page.tsx

@@ -4,6 +4,7 @@ import { getProductData, getWidgetData } from '@akinon/next/data/server';
 import { withSegmentDefaults } from '@akinon/next/hocs/server';
 import { PageProps, Metadata } from '@akinon/next/types';
 import { generateJsonLd } from '@theme/utils/generate-jsonld';
+import { notFound } from 'next/navigation';
 
 export async function generateMetadata({
   params,
@@ -12,14 +13,19 @@ export async function generateMetadata({
   let result: Metadata = {};
 
   try {
-    const {
-      data: { product }
-    } = await getProductData({
+    const productData = await getProductData({
       pk: params.pk,
       searchParams,
       groupProduct: true
     });
 
+    // If product data is not found, return empty metadata
+    if (!productData || !productData.data || !productData.data.product) {
+      return result;
+    }
+
+    const { product } = productData.data;
+
     result = {
       title: product.name,
       description: String(product.attributes.description),
@@ -42,15 +48,27 @@ export async function generateMetadata({
 }
 
 async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
-  const [{ data, breadcrumbData }, deliveryReturn] = await Promise.all([
-    getProductData({
-      pk: params.pk,
-      searchParams,
-      groupProduct: true
-    }),
-    getWidgetData({ slug: 'product-delivery-returns' })
-  ]);
+  let productData;
+  let deliveryReturn;
+
+  try {
+    [productData, deliveryReturn] = await Promise.all([
+      getProductData({
+        pk: params.pk,
+        searchParams,
+        groupProduct: true
+      }),
+      getWidgetData({ slug: 'product-delivery-returns' })
+    ]);
+  } catch (error) {
+    return notFound();
+  }
+
+  if (!productData || !productData.data || !productData.data.product) {
+    return notFound();
+  }
 
+  const { data, breadcrumbData } = productData;
   const jsonLd = generateJsonLd(data.product);
 
   return (

package/app-template/src/app/[commerce]/[locale]/[currency]/landing-page/[pk]/page.tsx

@@ -1,9 +1,20 @@
 import { getLandingPageData } from '@akinon/next/data/server';
 import { withSegmentDefaults } from '@akinon/next/hocs/server';
 import { PageProps } from '@akinon/next/types';
+import { notFound } from 'next/navigation';
 
 async function Page({ params }: PageProps<{ pk: number }>) {
-  const data = await getLandingPageData({ pk: params.pk });
+  let data;
+
+  try {
+    data = await getLandingPageData({ pk: params.pk });
+  } catch (error) {
+    return notFound();
+  }
+
+  if (!data || !data.landing_page) {
+    return notFound();
+  }
 
   const content = data.landing_page;
 

package/app-template/src/app/[commerce]/[locale]/[currency]/product/[pk]/page.tsx

@@ -4,6 +4,7 @@ import { PageProps, Metadata } from '@akinon/next/types';
 import { generateJsonLd } from '@theme/utils/generate-jsonld';
 import { AccordionWrapper, ProductInfo } from '@theme/views/product';
 import ProductLayout from '@theme/views/product/layout';
+import { notFound } from 'next/navigation';
 
 export async function generateMetadata({
   params,
@@ -12,13 +13,17 @@ export async function generateMetadata({
   let result: Metadata = {};
 
   try {
-    const {
-      data: { product }
-    } = await getProductData({
+    const productData = await getProductData({
       pk: params.pk,
       searchParams
     });
 
+    if (!productData || !productData.data || !productData.data.product) {
+      return result;
+    }
+
+    const { product } = productData.data;
+
     result = {
       title: product.name,
       description: String(product.attributes.description),
@@ -41,14 +46,27 @@ export async function generateMetadata({
 }
 
 async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
-  const [{ data, breadcrumbData }, deliveryReturn] = await Promise.all([
-    getProductData({
-      pk: params.pk,
-      searchParams
-    }),
-    getWidgetData({ slug: 'product-delivery-returns' })
-  ]);
+  let productData;
+  let deliveryReturn;
+
+  try {
+    [productData, deliveryReturn] = await Promise.all([
+      getProductData({
+        pk: params.pk,
+        searchParams
+      }),
+      getWidgetData({ slug: 'product-delivery-returns' })
+    ]);
+  } catch (error) {
+    return notFound();
+  }
+
+  // If product data is not found, return 404
+  if (!productData || !productData.data || !productData.data.product) {
+    return notFound();
+  }
 
+  const { data, breadcrumbData } = productData;
   const jsonLd = generateJsonLd(data.product);
 
   return (

package/app-template/src/app/[commerce]/[locale]/[currency]/special-page/[pk]/page.tsx

@@ -4,9 +4,20 @@ import { PageProps } from '@akinon/next/types';
 import CategoryLayout from '@theme/views/category/layout';
 import SpecialPageBanner from '@theme/widgets/special-page-banner';
 import SpecialPageCarousel from '@theme/widgets/special-page-carousel';
+import { notFound } from 'next/navigation';
 
 async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
-  const data = await getSpecialPageData({ pk: params.pk, searchParams });
+  let data;
+
+  try {
+    data = await getSpecialPageData({ pk: params.pk, searchParams });
+  } catch (error) {
+    return notFound();
+  }
+
+  if (!data) {
+    return notFound();
+  }
 
   return (
     <>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.92.0-rc.32",
+  "version": "1.92.0-rc.34",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {