diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/Container.tsx b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/Container.tsx index 5656b1adb3..963ef6d2fe 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/Container.tsx +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/Container.tsx @@ -20,7 +20,7 @@ const Container = (props: ComponentProps): JSX.Element => { const styles = `${props.params.GridParameters} ${props.params.Styles}`.trimEnd(); const phKey = `container-${props.params.DynamicPlaceholderId}`; const backgroundImage = props.params.BackgroundImage as string; - let backgroundStyle: { [key: string]: string }; + let backgroundStyle: { [key: string]: string } = { backgroundImage: ''}; if (backgroundImage) { const prefix = `${sitecoreContext.pageState !== 'normal' ? '/sitecore/shell' : ''}/-/media/`; diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/PageContent.tsx b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/PageContent.tsx index 95d066c142..c94b2b0240 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/PageContent.tsx +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/PageContent.tsx @@ -39,10 +39,12 @@ export const Default = (props: PageContentProps): JSX.Element => { ); } - const field = + const field = ( props.fields && props.fields.Content ? props.fields.Content - : sitecoreContext?.route?.fields?.Content; + : sitecoreContext?.route?.fields?.Content + ) as RichTextField; + return ( diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/PartialDesignDynamicPlaceholder.tsx b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/PartialDesignDynamicPlaceholder.tsx index 008563bdef..7b2a9577e1 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/PartialDesignDynamicPlaceholder.tsx +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/PartialDesignDynamicPlaceholder.tsx @@ -1,13 +1,12 @@ import React from 'react'; -import { Placeholder } from '@sitecore-jss/sitecore-jss-nextjs'; -import { ComponentRendering, RouteData } from '@sitecore-jss/sitecore-jss/layout'; +import { Placeholder, ComponentRendering } from '@sitecore-jss/sitecore-jss-nextjs'; type DynamicPlaceholderProps = { - rendering: ComponentRendering | RouteData; + rendering: ComponentRendering; }; const PartialDesignDynamicPlaceholder = (props: DynamicPlaceholderProps): JSX.Element => ( - + ); export default PartialDesignDynamicPlaceholder; diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/api/sitemap.ts b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/api/sitemap.ts index 36e1f7cb67..7f5aefc86d 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/api/sitemap.ts +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/api/sitemap.ts @@ -6,7 +6,9 @@ import { AxiosDataFetcher, GraphQLSitemapXmlService } from '@sitecore-jss/siteco const ABSOLUTE_URL_REGEXP = '^(?:[a-z]+:)?//'; const sitemapApi = async (req: NextApiRequest, res: NextApiResponse): Promise => { - const { query: { id } } = req; + const { + query: { id }, + } = req; // create sitemap graphql service const sitemapXmlService = new GraphQLSitemapXmlService({ endpoint: config.graphQLEndpoint, @@ -21,13 +23,14 @@ const sitemapApi = async (req: NextApiRequest, res: NextApiResponse): Promise { - response.data.pipe(res); - }) - .catch(() => res.redirect('/404')); + return new AxiosDataFetcher() + .get(sitemapUrl, { + responseType: 'stream', + }) + .then((response: AxiosResponse) => { + response.data.pipe(res); + }) + .catch(() => res.redirect('/404')); } res.redirect('/404');