From b203382e3fde5c14b1ee2b6609c1e262b8235fa0 Mon Sep 17 00:00:00 2001 From: Ruslan Matkovskyi Date: Wed, 24 May 2023 16:14:53 +0200 Subject: [PATCH 1/3] #585891: fixed 404/500 added DISABLE_SSG_FETCH params --- .../src/templates/nextjs-sxa/src/pages/404.tsx | 17 +++++++++++++++-- .../src/templates/nextjs-sxa/src/pages/500.tsx | 17 +++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/404.tsx b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/404.tsx index 9019aa2e7f..068d6f77c6 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/404.tsx +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/404.tsx @@ -1,5 +1,9 @@ import config from 'temp/config'; -import { GraphQLErrorPagesService, SitecoreContext } from '@sitecore-jss/sitecore-jss-nextjs'; +import { + GraphQLErrorPagesService, + SitecoreContext, + ErrorPages, +} from '@sitecore-jss/sitecore-jss-nextjs'; import { SitecorePageProps } from 'lib/page-props'; import NotFound from 'src/NotFound'; import { componentFactory } from 'temp/componentFactory'; @@ -27,8 +31,17 @@ export const getStaticProps: GetStaticProps = async (context) => { siteName: site.name, language: context.locale || config.defaultLanguage, }); + let resultErrorPages: ErrorPages | null = null; - const resultErrorPages = await errorPagesService.fetchErrorPages(); + if (process.env.NODE_ENV !== 'development' && !process.env.DISABLE_SSG_FETCH) { + try { + // Note: Next.js runs export in production mode + resultErrorPages = await errorPagesService.fetchErrorPages(); + } catch (error) { + console.log('Error occurred while fetching error pages'); + console.log(error); + } + } return { props: { diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/500.tsx b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/500.tsx index fc69f0840e..13c850349f 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/500.tsx +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/500.tsx @@ -1,5 +1,9 @@ import Head from 'next/head'; -import { GraphQLErrorPagesService, SitecoreContext } from '@sitecore-jss/sitecore-jss-nextjs'; +import { + GraphQLErrorPagesService, + SitecoreContext, + ErrorPages, +} from '@sitecore-jss/sitecore-jss-nextjs'; import { SitecorePageProps } from 'lib/page-props'; import Layout from 'src/Layout'; import { componentFactory } from 'temp/componentFactory'; @@ -43,8 +47,17 @@ export const getStaticProps: GetStaticProps = async (context) => { siteName: site.name, language: context.locale || context.defaultLocale || config.defaultLanguage, }); + let resultErrorPages: ErrorPages | null = null; - const resultErrorPages = await errorPagesService.fetchErrorPages(); + if (process.env.NODE_ENV !== 'development' && !process.env.DISABLE_SSG_FETCH) { + try { + // Note: Next.js runs export in production mode + resultErrorPages = await errorPagesService.fetchErrorPages(); + } catch (error) { + console.log('Error occurred while fetching error pages'); + console.log(error); + } + } return { props: { From 46ff78287d4b9461a4cc7574e83c42205df798f2 Mon Sep 17 00:00:00 2001 From: Ruslan Matkovskyi Date: Wed, 24 May 2023 16:22:42 +0200 Subject: [PATCH 2/3] #585891: updated CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30e43f8deb..a3f81c5475 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ Our versioning strategy is as follows: * `[angular]` Avoid sending two dictionary service calls when switching language and refreshing the page ([#1473](https://github.com/Sitecore/jss/pull/1473)) * Fix installed sitecore-jss-* dependency version ([#1478](https://github.com/Sitecore/jss/pull/1478)) * [node-headless-ssr-experience-edge] Add helper comment for rootItemId ([#1491](https://github.com/Sitecore/jss/pull/1491)) +* `[templates/nextjs-sxa]` Add condition DISABLE_SSG_FETCH for 404/500 pages to enable full ISR (Incremental Static Regeneration) flow ([#1496](https://github.com/Sitecore/jss/pull/1496)) ## 21.1.5 From 1b7ed5ab120e2d2d6a6057b648b7cbfc814f3a3d Mon Sep 17 00:00:00 2001 From: Ruslan Matkovskyi Date: Thu, 25 May 2023 09:28:42 +0200 Subject: [PATCH 3/3] #585891: fixed comments --- .../src/templates/nextjs-sxa/src/pages/404.tsx | 3 +-- .../src/templates/nextjs-sxa/src/pages/500.tsx | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/404.tsx b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/404.tsx index 068d6f77c6..4549517700 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/404.tsx +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/404.tsx @@ -33,9 +33,8 @@ export const getStaticProps: GetStaticProps = async (context) => { }); let resultErrorPages: ErrorPages | null = null; - if (process.env.NODE_ENV !== 'development' && !process.env.DISABLE_SSG_FETCH) { + if (!process.env.DISABLE_SSG_FETCH) { try { - // Note: Next.js runs export in production mode resultErrorPages = await errorPagesService.fetchErrorPages(); } catch (error) { console.log('Error occurred while fetching error pages'); diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/500.tsx b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/500.tsx index 13c850349f..d5aba8d260 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/500.tsx +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/500.tsx @@ -49,9 +49,8 @@ export const getStaticProps: GetStaticProps = async (context) => { }); let resultErrorPages: ErrorPages | null = null; - if (process.env.NODE_ENV !== 'development' && !process.env.DISABLE_SSG_FETCH) { + if (!process.env.DISABLE_SSG_FETCH) { try { - // Note: Next.js runs export in production mode resultErrorPages = await errorPagesService.fetchErrorPages(); } catch (error) { console.log('Error occurred while fetching error pages');