@newskit-render/core 1.44.2 → 1.45.0

package/CHANGELOG.md

@@ -3,6 +3,52 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.45.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.44.6...@newskit-render/core@1.45.0) (2022-04-01)
+
+
+### Features
+
+* **PPDSR-694:** Ensure sitemap works on demo site ([#664](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/664)) ([ba3d10f](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/ba3d10f296f50ba40a9684041f10ce2f9c0b3424))
+
+
+
+
+
+## [1.44.6](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.44.5...@newskit-render/core@1.44.6) (2022-04-01)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [1.44.5](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.44.4...@newskit-render/core@1.44.5) (2022-04-01)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [1.44.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.44.3...@newskit-render/core@1.44.4) (2022-03-31)
+
+
+### Bug Fixes
+
+* **PPDSR-747:** Add dob data to profile ([#660](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/660)) ([8ebd19b](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/8ebd19b7d5003074e4d25c457c0c0747c7796cc7))
+
+
+
+
+
+## [1.44.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.44.2...@newskit-render/core@1.44.3) (2022-03-31)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 ## [1.44.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.44.1...@newskit-render/core@1.44.2) (2022-03-30)
 
 **Note:** Version bump only for package @newskit-render/core

package/__tests__/pages/[articleSlug].test.tsx

@@ -1,10 +1,7 @@
-import { within } from '@testing-library/react'
-import Article, {
+import {
   ArticleSlug,
   getServerSideProps,
 } from '../../pages/[section]/[articleId]/[articleSlug]'
-import { renderWithQuery } from '../../helpers/test-utils'
-import { getUniversalArticleMock } from '../../helpers/mocks'
 import { URL, Slug } from '../../helpers/global-types'
 
 const props: ArticleSlug = {
@@ -57,6 +54,31 @@ const props: ArticleSlug = {
   twitterUsername: 'D_Trump',
   siteHost: 'hostname',
   gscId: '4320982',
+  recommendations: [
+    {
+      href:
+        'https://www.thesun.co.uk/wp-content/uploads/2022/03/image-656eaa885d.jpg?strip=all&w=600&h=338&crop=1',
+      tag: 'FOOT ON THE GAZ',
+      text:
+        'Bale considering short deal with new club before RETIRING after World Cup',
+      title: 'FOOT ON THE GAZ',
+    },
+    {
+      href:
+        'https://www.thesun.co.uk/wp-content/uploads/2022/03/image-a21f115694-1.jpg?strip=all&w=600&h=338&crop=1',
+      tag: 'TOUGH TIMES',
+      text:
+        'I only made £5k last year - I sold £801k villa for cash, says Claire Sweeney',
+      title: 'TOUGH TIMES',
+    },
+    {
+      href: null,
+      tag: 'TOUGH TIMES',
+      text:
+        'I only made £5k last year - I sold £801k villa for cash, says Claire Sweeney',
+      title: 'TOUGH TIMES',
+    },
+  ],
 }
 
 const user = {
@@ -87,6 +109,9 @@ jest.mock('@newskit-render/api', () => ({
     })
   }),
   getAcsCookie: jest.fn().mockReturnValue({ Cookie: 'something' }),
+  Publisher: {
+    SUN_UK: 'SUN_UK',
+  },
 }))
 
 jest.mock('@newskit-render/my-account', () => {
@@ -94,21 +119,37 @@ jest.mock('@newskit-render/my-account', () => {
     PastDueBannerExternal: 'PastDueBannerExternal',
   }
 })
+jest.mock('@newskit-render/standalone-components', () => {
+  return {
+    recommendationsProvider: jest.fn().mockResolvedValueOnce([
+      {
+        href:
+          'https://www.thesun.co.uk/wp-content/uploads/2022/03/image-656eaa885d.jpg?strip=all&w=600&h=338&crop=1',
+        tag: 'FOOT ON THE GAZ',
+        text:
+          'Bale considering short deal with new club before RETIRING after World Cup',
+        title: 'FOOT ON THE GAZ',
+      },
+      {
+        href:
+          'https://www.thesun.co.uk/wp-content/uploads/2022/03/image-a21f115694-1.jpg?strip=all&w=600&h=338&crop=1',
+        tag: 'TOUGH TIMES',
+        text:
+          'I only made £5k last year - I sold £801k villa for cash, says Claire Sweeney',
+        title: 'TOUGH TIMES',
+      },
+      {
+        href: null,
+        tag: 'TOUGH TIMES',
+        text:
+          'I only made £5k last year - I sold £801k villa for cash, says Claire Sweeney',
+        title: 'TOUGH TIMES',
+      },
+    ]),
+  }
+})
 
 describe('Article', () => {
-  test('should load ArticleDisplay component and pass it query data', async () => {
-    const { getByTestId } = renderWithQuery(
-      Article,
-      getUniversalArticleMock,
-      props
-    )
-
-    const headLine = within(getByTestId('HeadLine')).getByText(
-      'Mock Article: Lorem ipsum dolor sit amet consectetur adipiscing elit'
-    )
-    expect(headLine).toBeInTheDocument()
-  })
-
   describe('getServerSideProps', () => {
     beforeAll(() => {
       process.env = Object.assign(process.env, {
@@ -118,7 +159,7 @@ describe('Article', () => {
       })
     })
 
-    test('should return props', async () => {
+    it('should return props', async () => {
       const setHeaderMock = jest.fn()
 
       const response = await getServerSideProps({

package/components/article/Highlights.tsx

@@ -12,6 +12,7 @@ import {
   Visible,
   TitleBar,
 } from 'newskit'
+import { ArticleRecommendation } from '@newskit-render/standalone-components'
 import ViewMoreButton from '../common/ViewMoreButton'
 
 const Highlights: React.FC<{
@@ -60,40 +61,10 @@ const Highlights: React.FC<{
 
     <Block spaceStack="space040">
       <Grid xsMargin="space000">
-        {highlightsArticles.map(({ title, href }) => (
-          <Cell key={title} xs={12} sm={6} lg={12}>
+        {highlightsArticles.map((article) => (
+          <Cell key={article.title} xs={12} sm={6} lg={12}>
             <Block spaceStack="space040" data-testid="HighlightsHorizontalCard">
-              <Card
-                href="https://newskit.co.uk/"
-                layout="horizontal"
-                media={{
-                  src: href,
-                  alt: 'Card Media',
-                  loadingAspectRatio: '3:2',
-                  overrides: {
-                    width: '150px',
-                    height: '100px',
-                  },
-                }}
-                overrides={{
-                  stylePreset: 'cardContainer',
-                  mediaContainer: {
-                    spaceInline: 'space030',
-                  },
-                }}
-              >
-                <Headline
-                  headingAs="h4"
-                  overrides={{
-                    typographyPreset: {
-                      xs: 'editorialHeadline040',
-                      xl: 'editorialHeadline020',
-                    },
-                  }}
-                >
-                  {title}
-                </Headline>
-              </Card>
+              <ArticleRecommendation article={article} size="small" />
             </Block>
           </Cell>
         ))}

package/components/article/RelatedArticles.tsx

@@ -13,6 +13,7 @@ import {
   Headline,
   Visible,
 } from 'newskit'
+import { ArticleRecommendation } from '@newskit-render/standalone-components'
 import ViewMoreButton from '../common/ViewMoreButton'
 
 const viewMoreButton = () => <ViewMoreButton href="/" />
@@ -48,65 +49,15 @@ const RelatedArticles: React.FC<{
     </Block>
 
     <Grid xsMargin="space000">
-      {relatedArticles.map(({ title, href, text, tag }) => (
+      {relatedArticles.map((article) => (
         <Cell
-          key={title}
+          key={article.title}
           xs={12}
           sm={6}
           lg={3}
           data-testid="RelatedArticlesVerticalCard"
         >
-          <Card
-            media={{
-              src: href,
-              alt: title,
-              loadingAspectRatio: '3:2',
-            }}
-            overrides={{
-              stylePreset: 'cardContainer',
-              mediaContainer: {
-                spaceInline: 'space030',
-              },
-            }}
-          >
-            <Block spaceStack="space060">
-              <Block
-                spaceStack={{
-                  xs: 'space040',
-                  md: 'space050',
-                }}
-              >
-                <Headline
-                  headingAs="h6"
-                  overrides={{
-                    typographyPreset: {
-                      xs: 'editorialHeadline020',
-                      md: 'editorialHeadline030',
-                      xl: 'editorialHeadline040',
-                    },
-                  }}
-                >
-                  {title}
-                </Headline>
-              </Block>
-              <Block
-                spaceStack={{
-                  xs: 'space040',
-                  md: 'space050',
-                }}
-              >
-                <TextBlock
-                  stylePreset="inkContrast"
-                  typographyPreset={{
-                    xs: 'editorialParagraph010',
-                    md: 'editorialParagraph020',
-                  }}
-                >
-                  {text}
-                </TextBlock>
-              </Block>
-            </Block>
-          </Card>
+          <ArticleRecommendation article={article} size="large" />
         </Cell>
       ))}
       <Cell xs={12}>

package/components/article/__tests__/__snapshots__/index.test.tsx.snap

@@ -2747,7 +2747,7 @@ exports[`Article should render tile and sub title 1`] = `
 }
 
 @media screen and (max-width: 767px) {
-  .emotion-221 {
+  .emotion-222 {
     font-family: "Bitter",serif;
     font-size: 20px;
     line-height: 22.5px;
@@ -2756,13 +2756,13 @@ exports[`Article should render tile and sub title 1`] = `
     padding: 0.5px 0px;
   }
 
-  .emotion-221::before {
+  .emotion-222::before {
     content: '';
     margin-bottom: -0.2055em;
     display: block;
   }
 
-  .emotion-221::after {
+  .emotion-222::after {
     content: '';
     margin-top: -0.2275em;
     display: block;
@@ -2770,7 +2770,7 @@ exports[`Article should render tile and sub title 1`] = `
 }
 
 @media screen and (min-width: 768px) and (max-width: 1439px) {
-  .emotion-221 {
+  .emotion-222 {
     font-family: "Bitter",serif;
     font-size: 22px;
     line-height: 24.75px;
@@ -2779,13 +2779,13 @@ exports[`Article should render tile and sub title 1`] = `
     padding: 0.5px 0px;
   }
 
-  .emotion-221::before {
+  .emotion-222::before {
     content: '';
     margin-bottom: -0.2055em;
     display: block;
   }
 
-  .emotion-221::after {
+  .emotion-222::after {
     content: '';
     margin-top: -0.2275em;
     display: block;
@@ -2793,7 +2793,7 @@ exports[`Article should render tile and sub title 1`] = `
 }
 
 @media screen and (min-width: 1440px) {
-  .emotion-221 {
+  .emotion-222 {
     font-family: "Bitter",serif;
     font-size: 24px;
     line-height: 27px;
@@ -2802,30 +2802,30 @@ exports[`Article should render tile and sub title 1`] = `
     padding: 0.5px 0px;
   }
 
-  .emotion-221::before {
+  .emotion-222::before {
     content: '';
     margin-bottom: -0.2055em;
     display: block;
   }
 
-  .emotion-221::after {
+  .emotion-222::after {
     content: '';
     margin-top: -0.2275em;
     display: block;
   }
 }
 
-.emotion-224 {
+.emotion-225 {
   margin: 0;
   color: #0A0A0A;
 }
 
-.emotion-224 svg {
+.emotion-225 svg {
   fill: #0A0A0A;
 }
 
 @media screen and (max-width: 767px) {
-  .emotion-224 {
+  .emotion-225 {
     font-family: "DM Sans",sans-serif;
     font-size: 14px;
     line-height: 21px;
@@ -2834,13 +2834,13 @@ exports[`Article should render tile and sub title 1`] = `
     padding: 0.5px 0px;
   }
 
-  .emotion-224::before {
+  .emotion-225::before {
     content: '';
     margin-bottom: -0.391em;
     display: block;
   }
 
-  .emotion-224::after {
+  .emotion-225::after {
     content: '';
     margin-top: -0.409em;
     display: block;
@@ -2848,7 +2848,7 @@ exports[`Article should render tile and sub title 1`] = `
 }
 
 @media screen and (min-width: 768px) {
-  .emotion-224 {
+  .emotion-225 {
     font-family: "DM Sans",sans-serif;
     font-size: 16px;
     line-height: 24px;
@@ -2857,13 +2857,13 @@ exports[`Article should render tile and sub title 1`] = `
     padding: 0.5px 0px;
   }
 
-  .emotion-224::before {
+  .emotion-225::before {
     content: '';
     margin-bottom: -0.391em;
     display: block;
   }
 
-  .emotion-224::after {
+  .emotion-225::after {
     content: '';
     margin-top: -0.409em;
     display: block;
@@ -2871,37 +2871,37 @@ exports[`Article should render tile and sub title 1`] = `
 }
 
 @media screen {
-  .emotion-240 {
+  .emotion-242 {
     display: block;
   }
 }
 
 @media screen and (min-width: 480px) {
-  .emotion-240 {
+  .emotion-242 {
     display: none;
   }
 }
 
 @media screen and (min-width: 768px) {
-  .emotion-240 {
+  .emotion-242 {
     display: none;
   }
 }
 
 @media screen and (min-width: 1024px) {
-  .emotion-240 {
+  .emotion-242 {
     display: block;
   }
 }
 
 @media screen and (min-width: 1440px) {
-  .emotion-240 {
+  .emotion-242 {
     display: none;
   }
 }
 
 @media screen {
-  .emotion-253 {
+  .emotion-255 {
     margin-bottom: 64px;
   }
 }
@@ -3740,7 +3740,7 @@ exports[`Article should render tile and sub title 1`] = `
                           >
                             <a
                               class="nk-card-link emotion-166"
-                              href="https://newskit.co.uk/"
+                              href="undefined"
                             >
                               <section
                                 class="emotion-167"
@@ -3791,7 +3791,7 @@ exports[`Article should render tile and sub title 1`] = `
                           >
                             <a
                               class="nk-card-link emotion-166"
-                              href="https://newskit.co.uk/"
+                              href="undefined"
                             >
                               <section
                                 class="emotion-167"
@@ -3991,21 +3991,26 @@ exports[`Article should render tile and sub title 1`] = `
                           <div
                             class="emotion-220"
                           >
-                            <section
-                              class="emotion-221"
+                            <a
+                              class="nk-card-link emotion-166"
+                              href="undefined"
                             >
-                              <h6
-                                class="nk-headline-heading emotion-8"
+                              <section
+                                class="emotion-222"
                               >
-                                Prince Harry
-                              </h6>
-                            </section>
+                                <h6
+                                  class="nk-headline-heading emotion-168"
+                                >
+                                  Prince Harry
+                                </h6>
+                              </section>
+                            </a>
                           </div>
                           <div
                             class="emotion-220"
                           >
                             <p
-                              class="emotion-224"
+                              class="emotion-225"
                             >
                               news
                             </p>
@@ -4050,21 +4055,26 @@ exports[`Article should render tile and sub title 1`] = `
                           <div
                             class="emotion-220"
                           >
-                            <section
-                              class="emotion-221"
+                            <a
+                              class="nk-card-link emotion-166"
+                              href="undefined"
                             >
-                              <h6
-                                class="nk-headline-heading emotion-8"
+                              <section
+                                class="emotion-222"
                               >
-                                Meghan Markle
-                              </h6>
-                            </section>
+                                <h6
+                                  class="nk-headline-heading emotion-168"
+                                >
+                                  Meghan Markle
+                                </h6>
+                              </section>
+                            </a>
                           </div>
                           <div
                             class="emotion-220"
                           >
                             <p
-                              class="emotion-224"
+                              class="emotion-225"
                             >
                               news
                             </p>
@@ -4078,7 +4088,7 @@ exports[`Article should render tile and sub title 1`] = `
                   class="emotion-181"
                 >
                   <div
-                    class="emotion-240"
+                    class="emotion-242"
                   >
                     <hr
                       aria-hidden="true"
@@ -4148,7 +4158,7 @@ exports[`Article should render tile and sub title 1`] = `
           data-testid="PageLayout"
         >
           <div
-            class="emotion-253"
+            class="emotion-255"
           />
         </div>
       </div>

package/cypress/e2e/account/account-page.spec.js

@@ -1,3 +1,25 @@
+describe('Account without user', () => {
+  beforeEach(() => {
+    cy.mockConsentAndVisit('/account')
+  })
+
+  it('Should Display default fallback values', () => {
+    cy.get('[data-testid="ContentListIntroduction"]').should('have.length', 3)
+    cy.get('[data-testid="ContentListItems"]').should('have.length', 3)
+    cy.contains('Please enter your name')
+    cy.contains('Please call customer service on xxxx-xxx-xxxx')
+    cy.contains('Please enter your display name')
+    cy.contains(
+      'Your display name is used across our websites or apps when leaving comments on articles'
+    )
+    cy.contains('[email@address]')
+    cy.contains('******************')
+    cy.contains('Please enter your mobile telephone number')
+    cy.contains('Please enter your landline telephone number')
+    cy.contains('Please enter your address')
+  })
+})
+
 describe('My account personal details', () => {
   beforeEach(() => {
     cy.GetAcsSession()
@@ -77,6 +99,10 @@ describe('My account personal details', () => {
     )
   })
 
+  it.only('Should Display date of birth', () => {
+    cy.contains('21/03/1988')
+  })
+
   it('Should go to edit page and change display name ', () => {
     cy.get('a[href="/account/edit/displayName"]')
       .should('be.visible')
@@ -176,7 +202,7 @@ describe('My account personal details', () => {
       .children()
       .should(
         'contain',
-        'Email sent to temp.account@tempaccount.com with a password reset link. If you haven’t received it in a couple of minutes, you may request a new link by clicking on the button below.'
+        'Email sent to render.e2e.default@yopmail.com with a password reset link. If you haven’t received it in a couple of minutes, you may request a new link by clicking on the button below.'
       )
   })
 

package/cypress/e2e/account/main-api.spec.js

@@ -21,7 +21,7 @@ describe('MAIN API', () => {
       cy.get('@mutateUser').then((updatedUser) => {
         expect(updatedUser.status).to.eq(200)
         expect(updatedUser.body.data.updateUser.email).to.eq(
-          'temp.account@tempaccount.com'
+          'render.e2e.default@yopmail.com'
         )
       })
     })
@@ -43,7 +43,7 @@ describe('MAIN API', () => {
       cy.get('@mutateUser').then((updatedUser) => {
         expect(updatedUser.status).to.eq(200)
         expect(updatedUser.body.data.updateUser.email).to.eq(
-          'temp.account@tempaccount.com'
+          'render.e2e.default@yopmail.com'
         )
       })
     })
@@ -63,7 +63,7 @@ describe('MAIN API', () => {
       }).as('user')
       cy.get('@user').then((response) => {
         expect(response.status).to.eq(200)
-        expect(response.body.email).to.eq('temp.account@tempaccount.com')
+        expect(response.body.email).to.eq('render.e2e.default@yopmail.com')
         expect(response.body.mobile).to.eq('+447777777778')
         expect(response.body.firstName).to.eq('John')
         expect(response.body.lastName).to.eq('Smith')
@@ -85,7 +85,7 @@ describe('MAIN API', () => {
       }).as('userSubscription')
       cy.get('@userSubscription').then((response) => {
         expect(response.status).to.eq(200)
-        expect(response.body.cpn).to.eq('4AAA038732032')
+        expect(response.body.cpn).to.eq('4AAA038765003')
         assert.isArray(response.body.subscriptions)
       })
     })

package/cypress/support/commands.js

@@ -11,8 +11,8 @@ Cypress.Commands.add('mockConsent', () => {
 
 const userMap = {
   default: {
-    username: 'temp.account@tempaccount.com',
-    password: 'asdasd1A',
+    username: 'render.e2e.default@yopmail.com',
+    password: 'Ad45p0-swq151@',
   },
   noSub: {
     username: 'render.e2e.no-sub@yopmail.com',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "1.44.2",
+  "version": "1.45.0",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -33,13 +33,14 @@
   },
   "dependencies": {
     "@apollo/client": "3.4.16",
-    "@newskit-render/api": "^0.18.0",
+    "@newskit-render/api": "^0.18.1",
     "@newskit-render/auth": "^0.31.3",
-    "@newskit-render/checkout": "^0.26.3",
+    "@newskit-render/checkout": "^0.26.4",
     "@newskit-render/feature-flags": "^0.13.0",
-    "@newskit-render/feed": "^0.5.2",
-    "@newskit-render/my-account": "^0.152.0",
-    "@newskit-render/shared-components": "^0.45.0",
+    "@newskit-render/feed": "^0.5.3",
+    "@newskit-render/my-account": "^0.152.4",
+    "@newskit-render/shared-components": "^0.45.1",
+    "@newskit-render/standalone-components": "^0.2.1",
     "@newskit-render/validation": "^0.39.1",
     "cross-fetch": "3.1.5",
     "graphql": "15.6.0",

package/pages/[section]/[articleId]/[articleSlug].tsx

@@ -4,11 +4,15 @@ import {
   createApolloClient,
   ClientTypes,
   getAcsCookie,
+  Publisher,
 } from '@newskit-render/api'
 import { UserData } from '@newskit-render/my-account'
+import {
+  recommendationsProvider,
+  Article,
+} from '@newskit-render/standalone-components'
 import { GET_UNIVERSAL_ARTICLE } from '../../../queries'
 import ArticlePage, { UniversalArticle } from '../../../components/article'
-import { highlights, relatedArticles } from '../../../helpers/mocks/articleMock'
 import { fetchUser } from '../../../helpers/getUser'
 import { ACCOUNT_QUERY_URL } from '../../../constants'
 import { addCacheHeaders } from '../../../helpers/addCacheHeaders'
@@ -20,6 +24,7 @@ export type ArticleSlug = {
   siteHost: string
   gscId?: string
   user?: UserData
+  recommendations: Article[]
 }
 const Article: React.FC<ArticleSlug> = ({
   universalArticle,
@@ -28,7 +33,11 @@ const Article: React.FC<ArticleSlug> = ({
   siteHost,
   gscId,
   user,
+  recommendations,
 }) => {
+  const highlitedArticles = recommendations.slice(0, 4)
+  const relatedArticles = recommendations.slice(4, 12)
+
   return (
     <ArticlePage
       articleURL={articleURL}
@@ -36,7 +45,7 @@ const Article: React.FC<ArticleSlug> = ({
       siteHost={siteHost}
       gscId={gscId}
       twitterUsername={twitterUsername}
-      highlights={highlights}
+      highlights={highlitedArticles}
       relatedArticles={relatedArticles}
       user={user}
     />
@@ -57,11 +66,12 @@ export async function getServerSideProps(context) {
     `Article: /${section}/${articleId}/${articleSlug}`
   )
 
-  const [{ data }, user] = await Promise.all([
+  const [{ data }, recommendations, user] = await Promise.all([
     apolloClient.query({
       query: GET_UNIVERSAL_ARTICLE,
       variables: { publisher: 'DEMO', id: articleId },
     }),
+    await recommendationsProvider({ articleId, publisher: Publisher.SUN_UK }),
     await fetchUser(acsCookie, ACCOUNT_QUERY_URL),
   ])
 
@@ -74,6 +84,7 @@ export async function getServerSideProps(context) {
       siteHost: process.env.SITE_HOST || '',
       gscId: process.env.GSC_ID || '',
       showAds: true,
+      recommendations,
       user,
     },
   }

package/pages/api/news-sitemap.ts

@@ -1,10 +1,18 @@
 import { NextApiRequest, NextApiResponse } from 'next'
-import { newsSitemap, PublisherGroup } from '@newskit-render/feed'
+import { newsSitemap } from '@newskit-render/feed'
+import { Publisher } from '@newskit-render/api'
+
+/* We do not have sitemap date for Demo so using Virgin,
+ * This can be removed and replace with just - publisher: process.env.PUBLISHER as PublisherGroup, in created projects
+ */
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) =>
   newsSitemap({
     res,
-    publisher: process.env.PUBLISHER as PublisherGroup,
+    publisher:
+      process.env.PUBLISHER === 'DEMO'
+        ? Publisher.VIRGIN
+        : (process.env.PUBLISHER as Publisher),
     domain: new URL(process.env.SITE_HOST as string).host,
     publicationName: process.env.SITEMAP_PUBLICATION_NAME as string,
   })

package/pages/api/sitemap.ts

@@ -1,9 +1,10 @@
 import { NextApiRequest, NextApiResponse } from 'next'
-import {
-  genericSitemap,
-  PublisherGroup,
-  CustomStaticPage,
-} from '@newskit-render/feed'
+import { genericSitemap, CustomStaticPage } from '@newskit-render/feed'
+import { Publisher } from '@newskit-render/api'
+
+/* We do not have sitemap date for Demo so using Virgin,
+ * This can be removed and replace with just - publisher: process.env.PUBLISHER as PublisherGroup, in created projects
+ */
 
 const defaultCustomStaticPagesCollection: CustomStaticPage[] = [
   {
@@ -14,7 +15,10 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) =>
   genericSitemap({
     res,
     query: req.query,
-    publisher: process.env.PUBLISHER as PublisherGroup,
+    publisher:
+      process.env.PUBLISHER === 'DEMO'
+        ? Publisher.VIRGIN
+        : (process.env.PUBLISHER as Publisher),
     domain: new URL(process.env.SITE_HOST as string).host,
     firstArticleDate: process.env.SITEMAP_FIRST_PUBLICATION_DATE as string,
     publicationName: process.env.SITEMAP_PUBLICATION_NAME as string,