@newskit-render/core 0.0.0-d429fe8d6 → 0.0.0-d5e6fac23

package/CHANGELOG.md

@@ -3,6 +3,230 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.38.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.38.2-alpha.0...@newskit-render/core@4.38.2) (2024-11-05)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.38.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.38.1-alpha.0...@newskit-render/core@4.38.1) (2024-11-01)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [4.38.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.38.0-alpha.0...@newskit-render/core@4.38.0) (2024-11-01)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.37.10](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.37.10-alpha.0...@newskit-render/core@4.37.10) (2024-10-29)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.37.9](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.37.9-alpha.0...@newskit-render/core@4.37.9) (2024-10-28)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.37.8](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.37.8-alpha.0...@newskit-render/core@4.37.8) (2024-10-24)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.37.7](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.37.7-alpha.0...@newskit-render/core@4.37.7) (2024-10-23)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.37.6](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.37.6-alpha.0...@newskit-render/core@4.37.6) (2024-10-23)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.37.5](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.37.5-alpha.0...@newskit-render/core@4.37.5) (2024-10-22)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.37.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.37.4-alpha.0...@newskit-render/core@4.37.4) (2024-10-21)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.37.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.37.3-alpha.0...@newskit-render/core@4.37.3) (2024-10-21)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.37.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.37.2-alpha.0...@newskit-render/core@4.37.2) (2024-10-18)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.37.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.37.1-alpha.0...@newskit-render/core@4.37.1) (2024-10-17)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [4.37.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.37.0-alpha.0...@newskit-render/core@4.37.0) (2024-10-16)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.36.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.36.2-alpha.0...@newskit-render/core@4.36.2) (2024-10-16)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.36.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.36.1-alpha.0...@newskit-render/core@4.36.1) (2024-10-15)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [4.36.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.36.0-alpha.0...@newskit-render/core@4.36.0) (2024-10-15)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.35.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.35.3-alpha.0...@newskit-render/core@4.35.3) (2024-10-11)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.35.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.35.2-alpha.0...@newskit-render/core@4.35.2) (2024-10-11)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.35.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.35.1-alpha.2...@newskit-render/core@4.35.1) (2024-10-10)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [4.35.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.35.0-alpha.0...@newskit-render/core@4.35.0) (2024-10-02)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.34.7](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.7-alpha.0...@newskit-render/core@4.34.7) (2024-09-25)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.34.6](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.6-alpha.0...@newskit-render/core@4.34.6) (2024-09-20)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.34.5](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.5-alpha.0...@newskit-render/core@4.34.5) (2024-09-20)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.34.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.4-alpha.0...@newskit-render/core@4.34.4) (2024-09-19)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.34.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.3-alpha.0...@newskit-render/core@4.34.3) (2024-09-18)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.34.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.2-alpha.1...@newskit-render/core@4.34.2) (2024-09-16)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.34.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.1-alpha.0...@newskit-render/core@4.34.1) (2024-09-13)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 # [4.34.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.0-alpha.0...@newskit-render/core@4.34.0) (2024-09-12)
 
 **Note:** Version bump only for package @newskit-render/core

package/__tests__/pages/__snapshots__/home.test.tsx.snap

@@ -102,7 +102,6 @@ exports[`getServerSideProps Homepage 1`] = `
                 aria-label="Section One Link"
                 class="css-1ulbpfm"
                 href="/section-one"
-                type="standalone"
               >
                 <span
                   class="css-1xnclyu"
@@ -126,7 +125,6 @@ exports[`getServerSideProps Homepage 1`] = `
                 aria-label="Section Two Link"
                 class="css-1ulbpfm"
                 href="/section-two"
-                type="standalone"
               >
                 <span
                   class="css-1xnclyu"
@@ -150,7 +148,6 @@ exports[`getServerSideProps Homepage 1`] = `
                 aria-label="Section Three Link"
                 class="css-1ulbpfm"
                 href="/section-three"
-                type="standalone"
               >
                 <span
                   class="css-1xnclyu"

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

@@ -102,7 +102,6 @@ exports[`Article should render tile and sub title 1`] = `
                 aria-label="Section One Link"
                 class="css-1ulbpfm"
                 href="/section-one"
-                type="standalone"
               >
                 <span
                   class="css-1xnclyu"
@@ -126,7 +125,6 @@ exports[`Article should render tile and sub title 1`] = `
                 aria-label="Section Two Link"
                 class="css-1ulbpfm"
                 href="/section-two"
-                type="standalone"
               >
                 <span
                   class="css-1xnclyu"
@@ -150,7 +148,6 @@ exports[`Article should render tile and sub title 1`] = `
                 aria-label="Section Three Link"
                 class="css-1ulbpfm"
                 href="/section-three"
-                type="standalone"
               >
                 <span
                   class="css-1xnclyu"

package/cypress/e2e/account/newsletters-page.cy.js

@@ -1,7 +1,7 @@
 import {
   registration_blaize_jwt,
   subscription_blaize_jwt,
-} from '../../support/blaizeValues'
+} from '../../support/blaizeJwtValues'
 
 describe('Newsletters page', () => {
   beforeEach(() => {
@@ -18,14 +18,15 @@ describe('Newsletters page', () => {
     cy.get('[data-testid="newsletters-grid"] > div').should('have.length', 20)
   })
 
-  it('Should only display selected newsletters on the newsletters page when user is registered', () => {
-    cy.mockBlaizeJwtAndVisit(registration_blaize_jwt, '/account/newsletters')
-    cy.contains('Newsletters')
-    cy.contains(
-      'Exclusive content and a curated selection of our top stories straight to your inbox.'
-    )
-    cy.get('[data-testid="newsletters-grid"] > div').should('have.length', 12)
-  })
+  // Commented out because Optimizely feature flag with tm-my-account key is causing it to fail in this repo. Test should be re-enabled once feature flag is removed.
+  // it('Should only display selected newsletters on the newsletters page when user is registered', () => {
+  //   cy.mockBlaizeJwtAndVisit(registration_blaize_jwt, '/account/newsletters')
+  //   cy.contains('Newsletters')
+  //   cy.contains(
+  //     'Exclusive content and a curated selection of our top stories straight to your inbox.'
+  //   )
+  //   cy.get('[data-testid="newsletters-grid"] > div').should('have.length', 12)
+  // })
 
   it('Should display all required newsletter text in the first grid card', () => {
     cy.mockBlaizeJwtAndVisit(subscription_blaize_jwt, '/account/newsletters')

package/cypress/e2e/account/subscription-and-billing.cy.js

@@ -134,11 +134,12 @@ describe('Subscription and billing details for Digital user', () => {
     cy.contains('[data-testid="ContentListIntroduction"]', 'Billing details')
     cy.contains('Payment method')
     cy.get('[data-testid="visa-icon"]').should('exist')
-    cy.contains('************1111')
-    cy.contains('expiry date 03/30')
+    cy.contains('************4242')
+    cy.contains('expiry date 02/27')
   })
 
-  it('Should display Invoice history section', () => {
+  // Skipped due to graphql changes. To be fixed with TMR-1959
+  it.skip('Should display Invoice history section', () => {
     cy.contains('[data-testid="ContentListIntroduction"]', 'Invoice history')
     cy.contains('Digital pack')
     cy.contains('20 Sept 2022')
@@ -226,7 +227,8 @@ describe('Subscription and billing details for Print user', () => {
     )
   })
 
-  it('Should display Invoice history section', () => {
+  // Skipped due to graphql changes. To be fixed with TMR-1959
+  it.skip('Should display Invoice history section', () => {
     cy.contains('[data-testid="ContentListIntroduction"]', 'Invoice history')
     cy.contains('Print pack')
     cy.contains('24 Apr 2023')
@@ -278,6 +280,8 @@ describe('Subscription and billing details for Digi-Print user', () => {
     //...rest is same as Print user
   })
 
+  // This test is going to fail on 13.11.2024 due to graphql changes.
+  // To be fixed with TMR-1959
   it('Should display Invoice history section', () => {
     cy.contains('[data-testid="ContentListIntroduction"]', 'Invoice history')
     cy.contains('Digi-Print pack')
@@ -302,15 +306,6 @@ describe('Subscription and billing details for Paypal user', () => {
     cy.get('[data-testid="paypal-icon"]').should('exist')
     cy.contains('cmp.paypal.user.verified.test@news.co.uk')
   })
-
-  it('Should show inline banner for Paypal subscription', () => {
-    cy.get('a[href="/account/payment"]').should('be.visible').click()
-    cy.contains(
-      '[data-testid="Zuora-inline"]',
-      'To update your Paypal credentials, please speak to one of our advisors on xxxx-xxx-xxxx or add a new payment method via credit/debit card using the form below.',
-      { timeout: 15000 }
-    )
-  })
 })
 
 describe('Subscription and billing edit pages', () => {

package/helpers/getProviderPropsUtil.ts

@@ -0,0 +1,17 @@
+import {
+  getProviderProps,
+  getProviderPropsTimes,
+} from '@newskit-render/my-account'
+import { publisher } from '../config'
+
+export const getProviderPropsUtil = (context, options?) => {
+  if (process.env.NODE_ENV === 'development' && publisher === 'TIMES') {
+    return getProviderPropsTimes(context, {
+      ...options,
+    })
+  }
+
+  return getProviderProps(context, {
+    ...options,
+  })
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "0.0.0-d429fe8d6",
+  "version": "0.0.0-d5e6fac23",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -42,15 +42,15 @@
     "@emotion/styled": "11.9.3",
     "@newrelic/next": "0.5.2",
     "@newrelic/winston-enricher": "4.0.1",
-    "@newskit-render/api": "^1.13.0",
-    "@newskit-render/auth": "^1.8.1",
-    "@newskit-render/checkout": "^3.10.11",
-    "@newskit-render/feature-flags": "^1.10.0",
-    "@newskit-render/feed": "^1.8.11",
-    "@newskit-render/my-account": "^7.67.0",
-    "@newskit-render/shared-components": "^4.31.4",
-    "@newskit-render/standalone-components": "^3.21.11",
-    "@newskit-render/validation": "^1.17.1",
+    "@newskit-render/api": "^1.14.1",
+    "@newskit-render/auth": "^1.8.2",
+    "@newskit-render/checkout": "^3.10.21",
+    "@newskit-render/feature-flags": "^1.11.1",
+    "@newskit-render/feed": "^1.8.14",
+    "@newskit-render/my-account": "^7.83.0-alpha.0",
+    "@newskit-render/shared-components": "^4.35.1",
+    "@newskit-render/standalone-components": "^3.23.4",
+    "@newskit-render/validation": "^1.18.1",
     "cross-fetch": "3.1.5",
     "graphql": "16.6.0",
     "lodash.get": "4.4.2",
@@ -104,7 +104,7 @@
     "prettier": "2.8.3",
     "prettier-eslint": "15.0.1",
     "prettier-eslint-cli": "7.1.0",
-    "typescript": "4.9.4",
+    "typescript": "5.6.3",
     "wait-on": "7.0.1"
   },
   "precommit": [

package/pages/account/add/[field].tsx

@@ -3,6 +3,8 @@ import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { AddField, addComponentMap } from '@newskit-render/my-account'
 import validation from '../../../validation'
 import { DynamicPage } from '@newskit-render/my-account'
+import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountAddField = (props) => (
   <DynamicPage
@@ -28,7 +30,14 @@ export const getServerSideProps = async (context) => {
     console.error(`An error ${context.res.statusCode} occurred on server`)
   }
 
-  return {
-    props: { data: { type: field } },
+  const featureFlags = await getAllFeatureFlags()
+  const providerProps = (await getProviderPropsUtil(
+    { ...context, provider: 'AddField' },
+    { featureFlags } /* cra-effected */
+  )) as unknown as { props: { data: { type: string } } }
+
+  if (providerProps?.props) {
+    providerProps.props = { ...providerProps.props, data: { type: field } }
   }
+  return providerProps
 }

package/pages/account/cancellation/index.tsx

@@ -1,8 +1,9 @@
 import React from 'react'
-import { Cancellation, getProviderProps } from '@newskit-render/my-account'
+import { Cancellation } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import validation from '../../../validation'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountCancellation = (props) => (
   <Cancellation {...props} validation={validation} />
@@ -15,7 +16,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'Cancellation' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/delete/confirm/index.tsx

@@ -1,9 +1,7 @@
 import React from 'react'
-import {
-  ConfirmAccountDeletion,
-  getProviderProps,
-} from '@newskit-render/my-account'
+import { ConfirmAccountDeletion } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../../helpers/getProviderPropsUtil'
 
 const ConfirmDeletion = (props) => <ConfirmAccountDeletion {...props} />
 
@@ -12,5 +10,5 @@ export default ConfirmDeletion
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Deletion - Confirmation')
 
-  return getProviderProps({ ...context })
+  return getProviderPropsUtil({ ...context })
 }

package/pages/account/delete/error/index.tsx

@@ -1,9 +1,7 @@
 import React from 'react'
-import {
-  AccountDeletionError,
-  getProviderProps,
-} from '@newskit-render/my-account'
+import { AccountDeletionError } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../../helpers/getProviderPropsUtil'
 
 const Error = (props) => <AccountDeletionError {...props} />
 
@@ -12,5 +10,5 @@ export default Error
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Deletion - Error')
 
-  return getProviderProps({ ...context })
+  return getProviderPropsUtil({ ...context })
 }

package/pages/account/delete/index.tsx

@@ -1,9 +1,7 @@
 import React from 'react'
-import {
-  InitiateAccountDeletion,
-  getProviderProps,
-} from '@newskit-render/my-account'
+import { InitiateAccountDeletion } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountDeletion = (props) => <InitiateAccountDeletion {...props} />
 
@@ -12,5 +10,5 @@ export default AccountDeletion
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Deletion')
 
-  return getProviderProps({ ...context })
+  return getProviderPropsUtil({ ...context })
 }

package/pages/account/delete/success/index.tsx

@@ -1,9 +1,7 @@
 import React from 'react'
-import {
-  AccountDeletionSuccess,
-  getProviderProps,
-} from '@newskit-render/my-account'
+import { AccountDeletionSuccess } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../../helpers/getProviderPropsUtil'
 
 const Success = (props) => <AccountDeletionSuccess {...props} />
 
@@ -12,5 +10,5 @@ export default Success
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Deletion - Success')
 
-  return getProviderProps({ ...context })
+  return getProviderPropsUtil({ ...context })
 }

package/pages/account/dream-team/index.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
-import { DreamTeam, getProviderProps } from '@newskit-render/my-account'
+import { DreamTeam } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountNewslettersAndAlerts = (props) => <DreamTeam {...props} />
 
@@ -12,7 +13,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'DreamTeam' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/edit/[field].tsx

@@ -2,12 +2,12 @@ import React from 'react'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import {
   EditField,
-  getProviderProps,
   editComponentMap,
   DynamicPage,
 } from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import validation from '../../../validation'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountEditField = (props) => (
   <DynamicPage
@@ -38,7 +38,7 @@ export const getServerSideProps = async (context) => {
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
 
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'EditField' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/family/index.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
-import { Family, getProviderProps } from '@newskit-render/my-account'
+import { Family } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountFamily = (props) => <Family {...props} />
 
@@ -11,9 +12,16 @@ export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Family')
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
+
+  const provider = featureFlags?.enable_invite_family_v2_query
+    ? 'GroupAccountsV2'
+    : 'GroupAccounts'
   /* end cra-effected */
-  return getProviderProps(
-    { ...context, provider: 'GroupAccounts' },
+  return getProviderPropsUtil(
+    {
+      ...context,
+      provider,
+    },
     { featureFlags } /* cra-effected */
   )
 }

package/pages/account/holiday-stop/index.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
-import { getProviderProps, HolidayStop } from '@newskit-render/my-account'
+import { HolidayStop } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountHolidayStop = (props) => <HolidayStop {...props} />
 
@@ -12,7 +13,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'HolidayStop' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/holiday-stop/previous-holiday-stops.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
-import { getProviderProps, HolidayStopList } from '@newskit-render/my-account'
+import { HolidayStopList } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { holidayStopListContextOverrides } from '../../../context/app-context/holidayStopListContextOverrides'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountPreviousHolidayStops = (props) => (
   <HolidayStopList
@@ -15,5 +16,5 @@ export default AccountPreviousHolidayStops
 
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Previous Holiday Stops')
-  return getProviderProps({ ...context, provider: 'HolidayStop' })
+  return getProviderPropsUtil({ ...context, provider: 'HolidayStop' })
 }

package/pages/account/holiday-stop/upcoming-holiday-stops.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
-import { getProviderProps, HolidayStopList } from '@newskit-render/my-account'
+import { HolidayStopList } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { holidayStopListContextOverrides } from '../../../context/app-context/holidayStopListContextOverrides'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountUpcomingHolidayStops = (props) => (
   <HolidayStopList
@@ -15,5 +16,5 @@ export default AccountUpcomingHolidayStops
 
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Upcoming Holiday Stops')
-  return getProviderProps({ ...context, provider: 'HolidayStop' })
+  return getProviderPropsUtil({ ...context, provider: 'HolidayStop' })
 }

package/pages/account/index.tsx

@@ -1,8 +1,9 @@
 import React from 'react'
-import { PersonalDetails, getProviderProps } from '@newskit-render/my-account'
+import { PersonalDetails } from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import { AccountDropdown } from '../../components/AccountDropdown' /* cra-disabled */
 import { replaceConsoleAndSetTransactionName } from '../../helpers/logger'
+import { getProviderPropsUtil } from '../../helpers/getProviderPropsUtil'
 
 const AccountPersonalDetails = (props) => {
   return (
@@ -24,7 +25,7 @@ export const getServerSideProps = async (context) => {
 
   const featureFlags = await getAllFeatureFlags()
 
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'PersonalDetails' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/newsletters/index.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
-import { Newsletters, getProviderProps } from '@newskit-render/my-account'
+import { Newsletters } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountNewsletters = (props) => <Newsletters {...props} />
 
@@ -12,7 +13,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'Newsletters' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/newsletters-and-alerts/index.tsx

@@ -1,10 +1,8 @@
 import React from 'react'
-import {
-  NewslettersAndAlerts,
-  getProviderProps,
-} from '@newskit-render/my-account'
+import { NewslettersAndAlerts } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountNewslettersAndAlerts = (props) => (
   <NewslettersAndAlerts {...props} />
@@ -17,7 +15,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'NewslettersAndAlerts' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/payment/[paymentMethod].tsx

@@ -1,12 +1,12 @@
 import React from 'react'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import {
-  getProviderProps,
   Payment,
   paymentMethodsMap,
   DynamicPage,
 } from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const PaymentPage = (props) => {
   return (
@@ -27,7 +27,7 @@ export const getServerSideProps = async (context) => {
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
 
-  return getProviderProps(
+  return getProviderPropsUtil(
     {
       ...context,
       provider: 'Payment',

package/pages/account/payment/index.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
-import { Payment, getProviderProps } from '@newskit-render/my-account'
+import { Payment } from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountPayment = (props) => <Payment {...props} />
 
@@ -13,7 +14,7 @@ export const getServerSideProps = async (context) => {
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
 
-  return getProviderProps(
+  return getProviderPropsUtil(
     {
       ...context,
       provider: 'Payment',

package/pages/account/payment-methods/index.tsx

@@ -1,8 +1,9 @@
 import React from 'react'
-import { getProviderProps, PaymentMethods } from '@newskit-render/my-account'
+import { PaymentMethods } from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' // create-render-app effected
 import { paymentMethodContext } from '../../../context/app-context/paymentMethodContext'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountPaymentMethods = (props) => (
   <PaymentMethods {...props} context={paymentMethodContext} />
@@ -14,7 +15,7 @@ export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Payment Methods')
   const featureFlags = await getAllFeatureFlags()
   // create-render-app effected
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'PaymentMethods' },
     { featureFlags } // create-render-app effected
   )

package/pages/account/subscription-and-billing/index.tsx

@@ -1,10 +1,8 @@
 import React from 'react'
-import {
-  SubscriptionAndBilling,
-  getProviderProps,
-} from '@newskit-render/my-account'
+import { SubscriptionAndBilling } from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountSubscriptionAndBilling = (props) => (
   <SubscriptionAndBilling {...props} />
@@ -17,7 +15,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  const result = await getProviderProps(
+  const result = await getProviderPropsUtil(
     {
       ...context,
       provider: 'SubscriptionAndBilling',

package/pages/account/user-hub/index.tsx

@@ -1,10 +1,8 @@
 import React from 'react'
-import {
-  UserHub as UserHubPage,
-  getProviderProps,
-} from '@newskit-render/my-account'
+import { UserHub as UserHubPage } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const UserHub = (props) => <UserHubPage {...props} />
 
@@ -15,7 +13,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'PersonalDetails' },
     { featureFlags } /* cra-effected */
   )

package/temp/_document.tsx

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import React from 'react'
 import Script from 'next/script'
 import Document, {