@newskit-render/core 1.4.5 → 1.9.3

package/.eslintignore

@@ -13,3 +13,4 @@ next-env.d.ts
 helpers/setupTests.ts
 newrelic.js
 infrastructure/helm/*
+infrastructure/terraform-newrelic/*.js

package/CHANGELOG.md

@@ -3,6 +3,165 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.9.2...@newskit-render/core@1.9.3) (2022-01-05)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [1.9.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.9.1...@newskit-render/core@1.9.2) (2022-01-04)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [1.9.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.9.0...@newskit-render/core@1.9.1) (2022-01-04)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [1.9.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.8.0...@newskit-render/core@1.9.0) (2022-01-04)
+
+
+### Features
+
+* **PPDSR-518:** add basic page context ([#544](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/544)) ([16d3cbd](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/16d3cbd561aadd124c1856a3297b515c1b164935))
+
+
+
+
+
+# [1.8.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.7.1...@newskit-render/core@1.8.0) (2021-12-21)
+
+
+### Features
+
+* **PPDSR-559:** Replace go MAIN with newest version  ([#536](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/536)) ([ba9a571](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/ba9a571f8c6ce27c93d6d7ad9e35df6f61d627eb))
+
+
+
+
+
+## [1.7.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.7.0...@newskit-render/core@1.7.1) (2021-12-16)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [1.7.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.6.1...@newskit-render/core@1.7.0) (2021-12-16)
+
+
+### Features
+
+* **PPDSR-590:** Commenting preferences page redesign ([#540](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/540)) ([0ac17d0](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/0ac17d0c1682a6a1497f8705017cefc0fc7c3bb1))
+
+
+
+
+
+## [1.6.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.6.0...@newskit-render/core@1.6.1) (2021-12-16)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [1.6.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.5.7...@newskit-render/core@1.6.0) (2021-12-15)
+
+
+### Features
+
+* **PPDSR-520:** Add SEO Component ([#539](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/539)) ([f9a7103](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/f9a71034e9e7224975d785fb47c68b907b4e5935))
+
+
+
+
+
+## [1.5.7](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.5.6...@newskit-render/core@1.5.7) (2021-12-14)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [1.5.6](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.5.5...@newskit-render/core@1.5.6) (2021-12-13)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [1.5.5](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.5.4...@newskit-render/core@1.5.5) (2021-12-13)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [1.5.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.5.3...@newskit-render/core@1.5.4) (2021-12-10)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [1.5.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.5.2...@newskit-render/core@1.5.3) (2021-12-08)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [1.5.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.5.1...@newskit-render/core@1.5.2) (2021-12-03)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [1.5.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.5.0...@newskit-render/core@1.5.1) (2021-12-02)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [1.5.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.4.6...@newskit-render/core@1.5.0) (2021-12-02)
+
+
+### Features
+
+* **PPDSR-517:** Add Grid Component ([#528](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/528)) ([0f8082d](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/0f8082d1490750f408c0c5ec2c7bd6af3a1ace18))
+
+
+
+
+
+## [1.4.6](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.4.5...@newskit-render/core@1.4.6) (2021-11-30)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 ## [1.4.5](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.4.4...@newskit-render/core@1.4.5) (2021-11-30)
 
 **Note:** Version bump only for package @newskit-render/core

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

@@ -93,14 +93,12 @@ jest.mock('@newskit-render/api', () => ({
       }),
     })
   }),
-  sessionParser: jest.fn(),
   getMainSession: jest.fn(),
 }))
 
 jest.mock('@newskit-render/my-account', () => {
   return {
     PastDueBannerExternal: 'PastDueBannerExternal',
-    sessionParser: jest.fn(),
     getMainSession: jest.fn(),
   }
 })
@@ -140,7 +138,7 @@ describe('Article', () => {
         req: { headers: { cookie: 'some-cookie' } },
         res: { setHeader: setHeaderMock },
       })
-      expect(response).toEqual({ props: { ...props, user: userMock } })
+      expect(response).toEqual({ props: { ...props } })
       expect(setHeaderMock).toHaveBeenCalledWith(
         'Cache-Control',
         'public, s-maxage=10, stale-while-revalidate=59'

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

@@ -881,8 +881,8 @@ exports[`getServerSideProps Homepage 1`] = `
   position: relative;
   width: 100%;
   display: block;
-  height: auto;
   padding-top: 0;
+  height: auto;
   width: 100%;
   border-radius: 0;
 }

package/__tests__/pages/home.test.tsx

@@ -19,7 +19,6 @@ jest.mock('@newskit-render/api', () => ({
       }),
     })
   }),
-  sessionParser: jest.fn(),
   getMainSession: jest.fn(),
 }))
 
@@ -37,7 +36,6 @@ jest.mock('cross-fetch', () =>
 jest.mock('@newskit-render/my-account', () => {
   return {
     PastDueBannerExternal: 'PastDueBannerExternal',
-    sessionParser: jest.fn(),
   }
 })
 
@@ -63,9 +61,6 @@ describe('getServerSideProps', () => {
               title: 'Test title',
             },
           },
-          user: {
-            vxInstances: null,
-          },
         },
       })
     )

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

@@ -2503,9 +2503,8 @@ exports[`Article should render tile and sub title 1`] = `
   position: relative;
   width: 100%;
   display: block;
-  padding-top: 66%;
-  height: 0;
   width: 150px;
+  height: 100px;
   border-radius: 0;
   background-color: #F4F4F4;
 }

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

@@ -95,7 +95,6 @@ const articleData: ArticleProps = {
 jest.mock('@newskit-render/my-account', () => {
   return {
     PastDueBannerExternal: 'PastDueBannerExternal',
-    sessionParser: jest.fn(),
   }
 })
 

package/components/article/index.tsx

@@ -13,13 +13,13 @@ import {
   TextBlock,
   Divider,
 } from 'newskit'
+import { SEOComponent } from '@newskit-render/shared-components'
 import MetaBoxComponent from './MetaBox'
 import Ad from '../ad'
 import Highlights from './Highlights'
 import RelatedArticles from './RelatedArticles'
 import RelatedTopics from './RelatedTopics'
 import ShareBarComponent from './ShareBarComponent'
-import SEOComponent from '../seo'
 import {
   URL,
   Slug,

package/components/section/layouts/__tests__/__snapshots__/Lead.test.tsx.snap

@@ -134,8 +134,8 @@ exports[`Lead 1`] = `
   position: relative;
   width: 100%;
   display: block;
-  height: auto;
   padding-top: 0;
+  height: auto;
   width: 100%;
   border-radius: 0;
 }

package/infrastructure/terraform-newrelic/dashboards.tf

@@ -169,3 +169,179 @@ resource "newrelic_one_dashboard" "frontend_dashboard" {
     }
   }
 }
+
+resource "newrelic_one_dashboard" "lighthouse_dashboard" {
+  name = "${data.newrelic_entity.render_app.name} Lighthouse Dashboard"
+
+  page {
+    name = "${data.newrelic_entity.render_app.name} Lighthouse Metrics Dashboard"
+
+    widget_billboard {
+      title  = "Lighthouse Metrics"
+      row    = 1
+      column = 1
+      height = 3
+      width = 4
+
+      nrql_query {
+        query = "FROM SyntheticCheck SELECT average(custom.firstContentfulPaint) as 'FCP', average(custom.largestContentfulPaint) as 'LCP', average(custom.interactive) as 'TTI', average(custom.totalBlockingTime) as 'TBT', average(custom.cumulativeLayoutShift) as 'CLS', average(custom.speedIndex) as 'Speed Index'"
+      }
+    }
+
+    widget_line {
+      title  = "Lighthouse Metrics-trending"
+      row    = 1
+      column = 5
+      height = 3
+      width = 8
+
+      nrql_query {
+        query = "FROM SyntheticCheck SELECT average(custom.firstContentfulPaint) as 'FCP', average(custom.largestContentfulPaint) as 'LCP', average(custom.interactive) as 'TTI', average(custom.totalBlockingTime) as 'TBT', average(custom.cumulativeLayoutShift) as 'CLS', average(custom.speedIndex) as 'Speed Index' TIMESERIES AUTO"
+      }
+    }
+
+    widget_bar {
+      title  = "First Contentful Paint"
+      row    = 4
+      column = 1
+      height = 3
+      width = 4
+
+      nrql_query {
+        query = "FROM SyntheticCheck SELECT average(custom.firstContentfulPaint) FACET custom.url"
+      }
+    }
+
+    widget_line {
+      title  = "First Contentful Paint"
+      row    = 4
+      column = 5
+      height = 3
+      width = 8
+
+      nrql_query {
+        query = "FROM SyntheticCheck SELECT average(custom.firstContentfulPaint) FACET custom.url TIMESERIES AUTO"
+      }
+    }
+
+    widget_bar {
+      title  = "Largest Contentful Paint"
+      row    = 7
+      column = 1
+      height = 3
+      width = 4
+
+      nrql_query {
+        query = "FROM SyntheticCheck SELECT average(custom.largestContentfulPaint) FACET custom.url"
+      }
+    }
+
+    widget_line {
+      title  = "Largest Contentful Paint"
+      row    = 7
+      column = 5
+      height = 3
+      width = 8
+
+      nrql_query {
+        query = "FROM SyntheticCheck SELECT average(custom.largestContentfulPaint) FACET custom.url TIMESERIES AUTO"
+      }
+    }
+
+    widget_bar {
+      title  = "TTI"
+      row    = 10
+      column = 1
+      height = 3
+      width = 4
+
+      nrql_query {
+        query = "FROM SyntheticCheck SELECT average(custom.interactive) as 'TTI' FACET custom.url"
+      }
+    }
+
+    widget_line {
+      title  = "TTI - trending"
+      row    = 10
+      column = 5
+      height = 3
+      width = 8
+
+      nrql_query {
+        query = "FROM SyntheticCheck SELECT average(custom.interactive) FACET custom.url TIMESERIES AUTO"
+      }
+    }
+
+    widget_bar {
+      title  = "Total Blocking Time (TBT)"
+      row    = 13
+      column = 1
+      height = 3
+      width = 4
+
+      nrql_query {
+        query = "FROM SyntheticCheck SELECT average(custom.totalBlockingTime) FACET custom.url"
+      }
+    }
+
+    widget_line {
+      title = "Total Blocking Time (TBT) - trending"
+      row = 13
+      column = 5
+      height = 3
+      width = 8
+
+      nrql_query {
+        query = "FROM SyntheticCheck SELECT average(custom.totalBlockingTime) FACET custom.url TIMESERIES AUTO"
+      }
+    }
+
+    widget_bar {
+      title = "Cumulative Layout Shift (CLS)"
+      row = 16
+      column = 1
+      height = 3
+      width = 4
+
+      nrql_query {
+        query = "FROM SyntheticCheck SELECT average(custom.cumulativeLayoutShift) FACET custom.url"
+      }
+    }
+
+    widget_line {
+      title = "Cumulative Layout Shift (CLS)"
+      row = 16
+      column = 5
+      height = 3
+      width = 8
+
+      nrql_query {
+        query = "FROM SyntheticCheck SELECT average(custom.cumulativeLayoutShift) FACET custom.url TIMESERIES AUTO"
+      }
+    }
+
+    widget_bar {
+      title = "Speed Index"
+      row = 19
+      column = 1
+      height = 3
+      width = 4
+
+      nrql_query {
+        query = "FROM SyntheticCheck SELECT average(custom.speedIndex) FACET custom.url"  
+      }
+    }
+
+    widget_line {
+      title = "Speed Index - trading"
+      row = 19
+      column = 5
+      height = 3
+      width = 8
+
+      nrql_query {
+        query = "FROM SyntheticCheck SELECT average(custom.speedIndex) FACET custom.url TIMESERIES AUTO"
+      }
+    }
+  }
+}

package/infrastructure/terraform-newrelic/lighthouse-script-prod.js

@@ -0,0 +1,46 @@
+/** API SETUP - remove this section to run in New Relic Synthetics **/
+// if ($http == null) { var $http = require('request'); }
+/** API SETUP - remove this section to run in New Relic Synthetics **/
+
+var settings = {
+  url: 'https://newskit-render.prod.ceng.newsuk.tech/',
+  category: 'performance',
+  strategy: 'desktop',
+}
+
+var options = {
+  method: 'GET',
+  url: 'https://www.googleapis.com/pagespeedonline/v5/runPagespeed',
+  headers: null,
+  qs: settings,
+  json: true,
+}
+
+$http(options, function (error, response, body) {
+  if (!error && response.statusCode == 200) {
+    if (response.statusCode == 200) {
+      var lighthouseMetrics =
+        body.lighthouseResult.audits.metrics.details.items[0]
+      $util.insights.set('url', settings.url)
+      $util.insights.set('deviceType', settings.strategy)
+      $util.insights.set(
+        'performanceScore',
+        body.lighthouseResult.categories.performance.score
+      )
+
+      for (var attributeName in lighthouseMetrics) {
+        if (lighthouseMetrics.hasOwnProperty(attributeName)) {
+          if (!attributeName.includes('Ts')) {
+            console.log(attributeName + ': ' + lighthouseMetrics[attributeName])
+            $util.insights.set(attributeName, lighthouseMetrics[attributeName])
+          }
+        }
+      }
+    } else {
+      console.log('Non-200 HTTP response: ' + response.statusCode)
+    }
+  } else {
+    console.log('rsp code: ' + response.statusCode)
+    console.log(error)
+  }
+})

package/infrastructure/terraform-newrelic/lighthouse-script.js

@@ -0,0 +1,46 @@
+/** API SETUP - remove this section to run in New Relic Synthetics **/
+// if ($http == null) { var $http = require('request'); }
+/** API SETUP - remove this section to run in New Relic Synthetics **/
+
+var settings = {
+  url: 'https://newskit-render.ceng-dev.newsuk.tech/',
+  category: 'performance',
+  strategy: 'desktop',
+}
+
+var options = {
+  method: 'GET',
+  url: 'https://www.googleapis.com/pagespeedonline/v5/runPagespeed',
+  headers: null,
+  qs: settings,
+  json: true,
+}
+
+$http(options, function (error, response, body) {
+  if (!error && response.statusCode == 200) {
+    if (response.statusCode == 200) {
+      var lighthouseMetrics =
+        body.lighthouseResult.audits.metrics.details.items[0]
+      $util.insights.set('url', settings.url)
+      $util.insights.set('deviceType', settings.strategy)
+      $util.insights.set(
+        'performanceScore',
+        body.lighthouseResult.categories.performance.score
+      )
+
+      for (var attributeName in lighthouseMetrics) {
+        if (lighthouseMetrics.hasOwnProperty(attributeName)) {
+          if (!attributeName.includes('Ts')) {
+            console.log(attributeName + ': ' + lighthouseMetrics[attributeName])
+            $util.insights.set(attributeName, lighthouseMetrics[attributeName])
+          }
+        }
+      }
+    } else {
+      console.log('Non-200 HTTP response: ' + response.statusCode)
+    }
+  } else {
+    console.log('rsp code: ' + response.statusCode)
+    console.log(error)
+  }
+})

package/infrastructure/terraform-newrelic/monitors.tf

@@ -0,0 +1,12 @@
+resource "newrelic_synthetics_monitor" "lighthouse-monitor" {
+  name = "${data.newrelic_entity.render_app.name} Lighthouse Monitor"
+  type = "SCRIPT_API"
+  frequency = 30
+  status = "ENABLED"
+  locations = ["AWS_EU_WEST_2"]
+}
+
+resource "newrelic_synthetics_monitor_script" "lighthouse-script" {
+  monitor_id = newrelic_synthetics_monitor.lighthouse-monitor.id
+  text = "${var.environment}" == "prod" ? file("${path.module}/lighthouse-script-prod.js") : file("${path.module}/lighthouse-script.js")
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "1.4.5",
+  "version": "1.9.3",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -28,23 +28,22 @@
   },
   "dependencies": {
     "@apollo/client": "^3.4.16",
-    "@newskit-render/api": "^0.4.1",
-    "@newskit-render/auth": "^0.22.1",
-    "@newskit-render/checkout": "^0.5.2",
-    "@newskit-render/my-account": "^0.109.1",
-    "@newskit-render/shared-components": "^0.10.3",
-    "@newskit-render/sitemap": "^0.25.1",
-    "@newskit-render/validation": "^0.26.1",
+    "@newskit-render/api": "^0.5.0",
+    "@newskit-render/auth": "^0.22.2",
+    "@newskit-render/checkout": "^0.9.0",
+    "@newskit-render/my-account": "^0.116.2",
+    "@newskit-render/shared-components": "^0.20.0",
+    "@newskit-render/sitemap": "^0.25.3",
+    "@newskit-render/validation": "^0.27.0",
     "cross-fetch": "^3.1.4",
     "graphql": "^15.6.0",
     "newrelic": "^7.1.0",
-    "newskit": "4.0.1",
+    "newskit": "4.3.1",
     "next": "^12.0.2",
     "react": "^17.0.1",
     "react-dom": "^17.0.2",
     "react-helmet": "^6.1.0",
-    "react-hook-form": "7.8.4",
-    "striptags": "^3.1.1"
+    "react-hook-form": "7.8.4"
   },
   "devDependencies": {
     "@apollo/react-testing": "^4.0.0",

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

@@ -1,17 +1,12 @@
 import React from 'react'
 import newrelic from 'newrelic'
-import {
-  createApolloClient,
-  sessionParser,
-  getMainSession,
-  ClientTypes,
-} from '@newskit-render/api'
+import { createApolloClient, ClientTypes } from '@newskit-render/api'
 import { GET_UNIVERSAL_ARTICLE } from '../../../queries'
 import ArticlePage, { UniversalArticle } from '../../../components/article'
 import { highlights, relatedArticles } from '../../../helpers/mocks/articleMock'
 import { UserData } from '../../../helpers/global-types'
-import { fetchUser } from '../../../helpers/getUser'
-import { ACCOUNT_QUERY_URL } from '../../../constants'
+// import { fetchUser } from '../../../helpers/getUser'
+// import { ACCOUNT_QUERY_URL } from '../../../constants'
 import { addCacheHeaders } from '../../../helpers/addCacheHeaders'
 
 export type ArticleSlug = {
@@ -46,8 +41,7 @@ const Article: React.FC<ArticleSlug> = ({
 
 export async function getServerSideProps(context) {
   const apolloClient = await createApolloClient(ClientTypes.nkapi)
-  const mainSession = getMainSession(context.req.headers.cookie)
-  const session = sessionParser(mainSession)
+  // const mainSession = getMainSession(context.req.headers.cookie)
 
   const {
     params: { articleId, section, articleSlug },
@@ -57,12 +51,15 @@ export async function getServerSideProps(context) {
     `Article: /${section}/${articleId}/${articleSlug}`
   )
 
-  const [{ data }, user] = await Promise.all([
+  const [
+    { data },
+    // user
+  ] = await Promise.all([
     apolloClient.query({
       query: GET_UNIVERSAL_ARTICLE,
       variables: { publisher: 'DEMO', id: articleId },
     }),
-    await fetchUser(session, ACCOUNT_QUERY_URL),
+    // await fetchUser(mainSession, ACCOUNT_QUERY_URL),
   ])
 
   addCacheHeaders(context.res)
@@ -73,7 +70,7 @@ export async function getServerSideProps(context) {
       twitterUsername: process.env.TWITTER_USERNAME || '',
       siteHost: process.env.SITE_HOST || '',
       gscId: process.env.GSC_ID || '',
-      user,
+      // user,
     },
   }
 }

package/pages/[section]/index.tsx

@@ -1,14 +1,13 @@
 import newrelic from 'newrelic'
 import {
   createApolloClient,
-  sessionParser,
-  getMainSession,
+  // getMainSession,
   ClientTypes,
 } from '@newskit-render/api'
 import { GET_PAGE } from '../../queries'
 import SectionPage from '../../components/section'
-import { fetchUser } from '../../helpers/getUser'
-import { ACCOUNT_QUERY_URL } from '../../constants'
+// import { fetchUser } from '../../helpers/getUser'
+// import { ACCOUNT_QUERY_URL } from '../../constants'
 import { addCacheHeaders } from '../../helpers/addCacheHeaders'
 
 export async function getServerSideProps(context) {
@@ -18,16 +17,20 @@ export async function getServerSideProps(context) {
     params: { section },
   } = context
 
-  const mainSession = getMainSession(context.req.headers.cookie)
-  const session = sessionParser(mainSession)
+  // const mainSession = getMainSession(context.req.headers.cookie)
 
   newrelic.setTransactionName(`Section: ${section}`)
-  const [{ data }, user] = await Promise.all([
+  const [
+    { data },
+    //  user
+  ] = await Promise.all([
     apolloClient.query({
       query: GET_PAGE,
       variables: { channel: section, publisher: 'DEMO' },
     }),
-    await fetchUser(session, ACCOUNT_QUERY_URL),
+
+    // TODO: Enable once Main add Subscriptions
+    // await fetchUser(mainSession, ACCOUNT_QUERY_URL),
   ])
 
   addCacheHeaders(context.res)
@@ -35,7 +38,7 @@ export async function getServerSideProps(context) {
     props: {
       page: data.page,
       isIndexPage: true,
-      user,
+      //  user,
     },
   }
 }

package/pages/checkout/account-creation/index.tsx

@@ -0,0 +1,7 @@
+import { AccountCreation, getProviderProps } from '@newskit-render/checkout'
+
+export default AccountCreation
+
+export const getServerSideProps = async (context) => {
+  return getProviderProps({ ...context, provider: 'accountCreation' })
+}

package/pages/checkout/payment-details/index.tsx

@@ -0,0 +1,7 @@
+import { PaymentDetails, getProviderProps } from '@newskit-render/checkout'
+
+export default PaymentDetails
+
+export const getServerSideProps = async (context) => {
+  return getProviderProps({ ...context, provider: 'paymentDetails' })
+}

package/pages/index.tsx

@@ -1,14 +1,13 @@
 import newrelic from 'newrelic'
 import {
   createApolloClient,
-  sessionParser,
-  getMainSession,
+  // getMainSession,
   ClientTypes,
 } from '@newskit-render/api'
 import { GET_PAGE } from '../queries'
 import SectionPage from '../components/section'
-import { fetchUser } from '../helpers/getUser'
-import { ACCOUNT_QUERY_URL } from '../constants'
+// import { fetchUser } from '../helpers/getUser'
+// import { ACCOUNT_QUERY_URL } from '../constants'
 import { addCacheHeaders } from '../helpers/addCacheHeaders'
 
 export async function getServerSideProps(context) {
@@ -17,15 +16,18 @@ export async function getServerSideProps(context) {
   console.warn(context.req && context.req.headers)
 
   const apolloClient = await createApolloClient(ClientTypes.nkapi)
-  const mainSession = getMainSession(context.req.headers.cookie)
-  const session = sessionParser(mainSession)
+  // const mainSession = getMainSession(context.req.headers.cookie)
 
-  const [{ data }, user] = await Promise.all([
+  const [
+    { data },
+    // user
+  ] = await Promise.all([
     apolloClient.query({
       query: GET_PAGE,
       variables: { channel: 'homepage', publisher: 'DEMO' },
     }),
-    await fetchUser(session, ACCOUNT_QUERY_URL),
+    // TODO: Enable once Main add Subscriptions
+    // await fetchUser(mainSession, ACCOUNT_QUERY_URL),
   ])
 
   addCacheHeaders(context.res)
@@ -33,7 +35,7 @@ export async function getServerSideProps(context) {
   return {
     props: {
       page,
-      user,
+      // user: (user || null),
     },
   }
 }

package/queries/getUserSubscription.ts

@@ -4,19 +4,6 @@ export const GET_USER_SUBSCRIPTION = gql`
   query UserSubscription {
     user {
       email
-      vxInstances {
-        isActive
-        expiryDate
-        interactions {
-          ... on SubscriptionPaymentInstance {
-            startAt
-            pastDue {
-              isPastDue
-              since
-            }
-          }
-        }
-      }
     }
   }
 `

package/tsconfig.json

@@ -41,6 +41,6 @@
     "node_modules",
     "build",
     ".circleci",
-    "temp"
+    "temp",
   ]
 }

package/components/seo/index.test.tsx

@@ -1,106 +0,0 @@
-import React from 'react'
-import { render } from '@testing-library/react'
-import SEOComponent, { limitString } from './index'
-
-const getMeta = (metaName: string) => {
-  const metas = document.getElementsByTagName('meta')
-  for (let i = 0; i < metas.length; i += 1) {
-    if (
-      metas[i].getAttribute('name') === metaName ||
-      metas[i].getAttribute('property') === metaName
-    ) {
-      return metas[i].getAttribute('content')
-    }
-  }
-  return false
-}
-
-const getLink = (linkRel: string, attr: string) => {
-  const link = document.getElementsByTagName('link')
-  for (let i = 0; i < link.length; i += 1) {
-    if (link[i].getAttribute('rel') === linkRel) {
-      return link[i].getAttribute(attr)
-    }
-  }
-  return false
-}
-
-jest.mock('next/head', () => {
-  return {
-    __esModule: true,
-    default: ({ children }: { children: Array<React.ReactElement> }) => {
-      return <>{children}</>
-    },
-  }
-})
-
-describe('SEOComponent tests', () => {
-  const Props = {
-    title: 'test title for SEOComponent',
-    description:
-      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed tincidunt blandit orci vel elementum. Integer malesuada quam in ullamcorper condimentum. Integer sollicitudin non enim sed posuere.',
-    url: 'https://test-url/test',
-    siteHost: 'https://siteHost.co.uk',
-    fbType: 'article',
-    fbImageUrl: 'https://test-uri/image',
-  }
-
-  test('SEOComponent with mandatory props', () => {
-    render(<SEOComponent {...Props} />, {
-      container: document.head,
-    })
-    expect(document.title).toBe(Props.title)
-    expect(getMeta('description')).toBe(limitString(Props.description, 155))
-    expect(getMeta('robots')).toBe('max-image-preview:large')
-    expect(getMeta('og:title')).toBe(Props.title)
-    expect(getMeta('og:type')).toBe(Props.fbType)
-    expect(getMeta('og:url')).toBe(Props.url)
-    expect(getMeta('twitter:card')).toBe('summary')
-    expect(getMeta('twitter:title')).toBe(Props.title)
-    expect(getMeta('twitter:site')).toBe(false)
-    expect(getMeta('twitter:description')).toBe(false)
-    expect(getMeta('twitter:image')).toBe(false)
-    expect(getMeta('twitter:image:alt')).toBe(false)
-    expect(getLink('canonical', 'href')).toBe(Props.url)
-    expect(getLink('alternate', 'href')).toBe(Props.siteHost)
-    expect(getLink('alternate', 'hreflang')).toBe('en')
-  })
-
-  test('SEOComponent with optional props', () => {
-    const extraProps = {
-      ...Props,
-      gscId: 'asfdrtsdvs',
-      fbTitle: 'test facebook title',
-      twUsername: '@username',
-      twTitle: 'test twitter title',
-      twDescription:
-        'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed tincidunt blandit orci vel elementum. Integer malesuada quam in ullamcorper condimentum.',
-      twImageUrl: 'https://test-uri/image-twitter',
-      twImageAlt: 'test alt',
-      hrefLang: 'en-GB',
-      maxImagePreview: 'standard' as 'none' | 'standard' | 'large',
-    }
-    render(<SEOComponent {...extraProps} />, {
-      container: document.head,
-    })
-    expect(document.title).toBe(extraProps.title)
-    expect(getMeta('description')).toBe(
-      limitString(extraProps.description, 155)
-    )
-    expect(getMeta('robots')).toBe(
-      `max-image-preview:${extraProps.maxImagePreview}`
-    )
-    expect(getMeta('og:title')).toBe(extraProps.fbTitle)
-    expect(getMeta('og:type')).toBe(extraProps.fbType)
-    expect(getMeta('og:url')).toBe(extraProps.url)
-    expect(getMeta('twitter:card')).toBe('summary')
-    expect(getMeta('twitter:title')).toBe(extraProps.twTitle)
-    expect(getMeta('twitter:site')).toBe(extraProps.twUsername)
-    expect(getMeta('twitter:description')).toBe(extraProps.twDescription)
-    expect(getMeta('twitter:image')).toBe(extraProps.twImageUrl)
-    expect(getMeta('twitter:image:alt')).toBe(extraProps.twImageAlt)
-    expect(getLink('canonical', 'href')).toBe(extraProps.url)
-    expect(getLink('alternate', 'href')).toBe(extraProps.siteHost)
-    expect(getLink('alternate', 'hreflang')).toBe(extraProps.hrefLang)
-  })
-})

package/components/seo/index.tsx

@@ -1,89 +0,0 @@
-import React from 'react'
-import Head from 'next/head'
-import striptags from 'striptags'
-
-export const limitString = (text: string, limit: number) =>
-  text.length > limit ? text.substr(0, limit) : text
-
-type Props = {
-  title: string
-  description: string
-  url: string
-  siteHost: string
-  hrefLang?: string
-  maxImagePreview?: 'none' | 'standard' | 'large'
-  gscId?: string
-  fbTitle?: string
-  fbType: string
-  fbImageUrl: string
-  twUsername?: string
-  twTitle?: string
-  twDescription?: string
-  twImageUrl?: string
-  twImageAlt?: string
-}
-
-const SEOComponent: React.FC<Props> = ({
-  title,
-  description,
-  url,
-  siteHost,
-  hrefLang = 'en',
-  maxImagePreview = 'large',
-  gscId,
-  fbTitle,
-  fbType,
-  fbImageUrl,
-  twUsername,
-  twTitle,
-  twDescription,
-  twImageUrl,
-  twImageAlt,
-}) => (
-  <Head>
-    <title>{title}</title>
-    <meta
-      name="description"
-      content={limitString(striptags(description), 155)}
-      key="description"
-    />
-    <link rel="canonical" href={url} />
-    <link rel="alternate" href={siteHost} hrefLang={hrefLang} />
-    <meta
-      name="robots"
-      content={`max-image-preview:${maxImagePreview}`}
-      key="max-image-preview"
-    />
-    {gscId && <meta name="google-site-verification" content={gscId} />}
-
-    <meta property="og:title" content={fbTitle || title} key="ogtitle" />
-    <meta property="og:type" content={fbType} key="ogtype" />
-    <meta property="og:url" content={url} key="ogurl" />
-    <meta property="og:image" content={fbImageUrl} key="ogimage" />
-
-    <meta name="twitter:card" content="summary" key="twcard" />
-    <meta
-      name="twitter:title"
-      content={limitString(twTitle || title, 70)}
-      key="twtitle"
-    />
-    {twUsername && (
-      <meta name="twitter:site" content={twUsername} key="twsite" />
-    )}
-    {twDescription && (
-      <meta
-        name="twitter:description"
-        content={limitString(striptags(twDescription), 200)}
-        key="twdescription"
-      />
-    )}
-    {twImageUrl && (
-      <meta name="twitter:image" content={twImageUrl} key="twImage" />
-    )}
-    {twImageAlt && (
-      <meta name="twitter:image:alt" content={twImageAlt} key="twImageAlt" />
-    )}
-  </Head>
-)
-
-export default SEOComponent