@newskit-render/core 1.11.3 → 1.17.4

package/.eslintignore

@@ -13,4 +13,8 @@ next-env.d.ts
 helpers/setupTests.ts
 newrelic.js
 infrastructure/helm/*
-infrastructure/terraform-newrelic/*.js
+infrastructure/terraform-newrelic/*.js
+
+# for after scaffold
+helm/*
+terraform-newrelic/*.js

package/CHANGELOG.md

@@ -3,6 +3,174 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.17.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.17.3...@newskit-render/core@1.17.4) (2022-01-27)
+
+
+### Bug Fixes
+
+* **PPDSR-654:** change logo aria-label ([#574](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/574)) ([7562b5f](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/7562b5f5deb4a857881db3d06dfbbeb36e69701f))
+
+
+
+
+
+## [1.17.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.17.2...@newskit-render/core@1.17.3) (2022-01-27)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [1.17.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.17.1...@newskit-render/core@1.17.2) (2022-01-27)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [1.17.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.17.0...@newskit-render/core@1.17.1) (2022-01-25)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [1.17.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.16.0...@newskit-render/core@1.17.0) (2022-01-25)
+
+
+### Features
+
+* **PPDSR-618:** Fix lint errors when cra is scaffold ([#568](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/568)) ([a9e176a](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/a9e176a5f6f944eb8755624ebb5c692a86b2207d))
+
+
+
+
+
+# [1.16.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.15.0...@newskit-render/core@1.16.0) (2022-01-25)
+
+
+### Features
+
+* **PPDSR-566:** remove carrot from dependencies ([#572](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/572)) ([a00f25a](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/a00f25a871f023b6008fe06a1391e83328d3ad58))
+
+
+
+
+
+# [1.15.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.14.2...@newskit-render/core@1.15.0) (2022-01-25)
+
+
+### Features
+
+* **PPDSR-638:** Remove ads from Account/Checkout ([#570](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/570)) ([03400f6](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/03400f6cf4bd63a54c5c6720b8a12e120d30bbff))
+
+
+
+
+
+## [1.14.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.14.1...@newskit-render/core@1.14.2) (2022-01-24)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [1.14.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.14.0...@newskit-render/core@1.14.1) (2022-01-20)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [1.14.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.13.4...@newskit-render/core@1.14.0) (2022-01-20)
+
+
+### Features
+
+* **PPDSR-543:** Update newskitAPI  session ([#564](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/564)) ([1e60be8](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/1e60be84984fc5fa163a9ab2e29d1e6a4eb4a935))
+
+
+
+
+
+## [1.13.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.13.3...@newskit-render/core@1.13.4) (2022-01-19)
+
+
+### Bug Fixes
+
+* **PPDSR-628:** add new fonts ([#557](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/557)) ([541bc58](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/541bc5832dea4abd7d94f93f9c5ff32704da2326))
+
+
+
+
+
+## [1.13.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.13.2...@newskit-render/core@1.13.3) (2022-01-19)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [1.13.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.13.1...@newskit-render/core@1.13.2) (2022-01-18)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [1.13.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.13.0...@newskit-render/core@1.13.1) (2022-01-18)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [1.13.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.12.1...@newskit-render/core@1.13.0) (2022-01-14)
+
+
+### Features
+
+* **PPDSR-604:** Add husky & commitlint ([#558](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/558)) ([c67fc76](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/c67fc76276c8607f7604ae6ac0d0cae1ecb5b4f0))
+
+
+
+
+
+## [1.12.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.12.0...@newskit-render/core@1.12.1) (2022-01-13)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [1.12.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.11.4...@newskit-render/core@1.12.0) (2022-01-13)
+
+
+### Features
+
+* **PPDSR-632:** Fix newsletter query ([#559](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/559)) ([38085d1](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/38085d1418bb42237a41b4bad0394fc8cabdf2a4))
+
+
+
+
+
+## [1.11.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.11.3...@newskit-render/core@1.11.4) (2022-01-13)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 ## [1.11.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.11.2...@newskit-render/core@1.11.3) (2022-01-11)
 
 

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

@@ -138,7 +138,7 @@ describe('Article', () => {
         req: { headers: { cookie: 'some-cookie' } },
         res: { setHeader: setHeaderMock },
       })
-      expect(response).toEqual({ props: { ...props } })
+      expect(response).toEqual({ props: { ...props, showAds: true } })
       expect(setHeaderMock).toHaveBeenCalledWith(
         'Cache-Control',
         'public, s-maxage=10, stale-while-revalidate=59'

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

@@ -475,7 +475,7 @@ exports[`getServerSideProps Homepage 1`] = `
             class="emotion-4"
           >
             <a
-              aria-label="Home Page"
+              aria-label="Logo Link"
               class="emotion-5"
               href="/"
             >

package/__tests__/pages/home.test.tsx

@@ -61,6 +61,7 @@ describe('getServerSideProps', () => {
               title: 'Test title',
             },
           },
+          showAds: true,
         },
       })
     )

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

@@ -475,7 +475,7 @@ exports[`Article should render tile and sub title 1`] = `
             class="emotion-4"
           >
             <a
-              aria-label="Home Page"
+              aria-label="Logo Link"
               class="emotion-5"
               href="/"
             >

package/components/header/index.test.tsx

@@ -37,7 +37,7 @@ describe('Header tests', () => {
 
   test('render links', () => {
     const { getByLabelText } = renderWithTheme(Header)
-    expect(getByLabelText('Home Page')).toHaveAttribute('href', '/')
+    expect(getByLabelText('Logo Link')).toHaveAttribute('href', '/')
     expect(getByLabelText('Section One Link')).toHaveAttribute(
       'href',
       '/section-one'

package/components/header/index.tsx

@@ -54,21 +54,25 @@ const StyledHeader = styled.div`
 const pastDueBanner = {
   firstNotice: {
     title: "We haven't been able to take payment",
-    text: 'You may need to update your payment details to keep your subscription.',
+    text:
+      'You may need to update your payment details to keep your subscription.',
     button: 'Update payment details',
   },
   secondNotice: {
     title: 'Act now to keep your subscription',
-    text: 'We’ve tried several times, but haven’t been able to take payment. Please update your payment details to keep your subscription.',
+    text:
+      'We’ve tried several times, but haven’t been able to take payment. Please update your payment details to keep your subscription.',
     button: 'Update payment details',
   },
   terminated: {
     title: 'Your subscription has been terminated',
-    text: 'We didn’t receive payment for your subscription. To reactivate it, please call 0800 018 5177.',
+    text:
+      'We didn’t receive payment for your subscription. To reactivate it, please call 0800 018 5177.',
   },
   cancelled: {
     title: 'Your subscription has been cancelled.',
-    text: 'You’ll no longer have access to subscription benefits. To re-activate call 0800 555 1234.',
+    text:
+      'You’ll no longer have access to subscription benefits. To re-activate call 0800 555 1234.',
   },
   treshold: {
     firstNotice: 26,
@@ -184,7 +188,7 @@ const Header: React.FC<{ user: UserData }> = ({ user }) => {
                 type="standalone"
                 overrides={{ stylePreset: 'linkStandaloneInverse' }}
                 href="/"
-                aria-label="Home Page"
+                aria-label="Logo Link"
               >
                 <Visible md lg xl>
                   <NewsKitLogoFull color="white" size="sizing120" />

package/components/section/__tests__/ArticleSlice.test.tsx

@@ -34,18 +34,22 @@ describe('ArticleSlice', () => {
   })
 
   test('Handle SECONDARY_4 article-block Index Page', () => {
-    const { getByTestId, getAllByTestId, getAllByRole, queryByTestId } =
-      renderWithTheme(SectionContext.Provider, {
-        value: {
-          isIndexPage: true,
-        },
-        children: (
-          <ArticleSlice
-            slice={getPageMock.page.body[0].children[1]}
-            collection={getPageMock.page.body[0]}
-          />
-        ),
-      })
+    const {
+      getByTestId,
+      getAllByTestId,
+      getAllByRole,
+      queryByTestId,
+    } = renderWithTheme(SectionContext.Provider, {
+      value: {
+        isIndexPage: true,
+      },
+      children: (
+        <ArticleSlice
+          slice={getPageMock.page.body[0].children[1]}
+          collection={getPageMock.page.body[0]}
+        />
+      ),
+    })
     expect(queryByTestId('SectionTitleBar')).not.toBeInTheDocument()
     expect(getByTestId('SECONDARY_4-Grid')).toBeInTheDocument()
     expect(getAllByTestId(/titleTeaserVertical-/).length).toEqual(4)
@@ -67,18 +71,22 @@ describe('ArticleSlice', () => {
   })
 
   test('Handle SECONDARY_4_ODD article-block Index Page', () => {
-    const { getByTestId, getAllByTestId, getAllByRole, queryByTestId } =
-      renderWithTheme(SectionContext.Provider, {
-        value: {
-          isIndexPage: true,
-        },
-        children: (
-          <ArticleSlice
-            slice={getPageMock.page.body[0].children[5]}
-            collection={getPageMock.page.body[0]}
-          />
-        ),
-      })
+    const {
+      getByTestId,
+      getAllByTestId,
+      getAllByRole,
+      queryByTestId,
+    } = renderWithTheme(SectionContext.Provider, {
+      value: {
+        isIndexPage: true,
+      },
+      children: (
+        <ArticleSlice
+          slice={getPageMock.page.body[0].children[5]}
+          collection={getPageMock.page.body[0]}
+        />
+      ),
+    })
     expect(getByTestId('SectionTitleBar')).toBeInTheDocument()
     expect(queryByTestId('addTopSpace')).toBeInTheDocument()
     expect(getByTestId('SECONDARY_4_ODD-Grid')).toBeInTheDocument()

package/helpers/a11y.ts

@@ -1,7 +1,9 @@
-export const handleEnterKeyPress =
-  (onClick: () => void) =>
-  ({ key }: { key: string }) => {
-    if (key === 'Enter') {
-      onClick()
-    }
+export const handleEnterKeyPress = (onClick: () => void) => ({
+  key,
+}: {
+  key: string
+}) => {
+  if (key === 'Enter') {
+    onClick()
   }
+}

package/helpers/mocks/articleMock.ts

@@ -26,25 +26,29 @@ export const relatedArticles = [
   {
     title: 'Prince Harry',
     tag: 'NEWS',
-    text: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut a sodales leo. Cras egestas nisl libero, vitae viverra justo gravida quis.',
+    text:
+      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut a sodales leo. Cras egestas nisl libero, vitae viverra justo gravida quis.',
     href: imagePlaceholderHref('70x50'),
   },
   {
     title: 'Meghan Markle',
     tag: 'SPORT',
-    text: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut a sodales leo. Cras egestas nisl libero, vitae viverra justo gravida quis.',
+    text:
+      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut a sodales leo. Cras egestas nisl libero, vitae viverra justo gravida quis.',
     href: imagePlaceholderHref('70x50'),
   },
   {
     title: 'Royal Family',
     tag: 'CULTURE',
-    text: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut a sodales leo. Cras egestas nisl libero, vitae viverra justo gravida quis.',
+    text:
+      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut a sodales leo. Cras egestas nisl libero, vitae viverra justo gravida quis.',
     href: imagePlaceholderHref('70x50'),
   },
   {
     title: 'Royal Family',
     tag: 'CORONAVIRUS',
-    text: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut a sodales leo. Cras egestas nisl libero, vitae viverra justo gravida quis.',
+    text:
+      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut a sodales leo. Cras egestas nisl libero, vitae viverra justo gravida quis.',
     href: imagePlaceholderHref('70x50'),
   },
 ]

package/helpers/mocks/getRadioPostMock.ts

@@ -29,7 +29,8 @@ export default [
                     italic: false,
                     underline: false,
                     monospace: false,
-                    text: 'Proin eget tortor risus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; ',
+                    text:
+                      'Proin eget tortor risus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; ',
                   },
                   {
                     type: 'text',
@@ -45,7 +46,8 @@ export default [
                     italic: false,
                     underline: false,
                     monospace: false,
-                    text: ', auctor sit amet aliquam vel, ullamcorper sit amet ligula. Donec rutrum congue leo eget malesuada. Proin eget tortor risus. Sed porttitor lectus nibh. Donec sollicitudin molestie malesuada.',
+                    text:
+                      ', auctor sit amet aliquam vel, ullamcorper sit amet ligula. Donec rutrum congue leo eget malesuada. Proin eget tortor risus. Sed porttitor lectus nibh. Donec sollicitudin molestie malesuada.',
                   },
                 ],
               },

package/helpers/mocks/getUniversalArticleMock.ts

@@ -51,17 +51,21 @@ export default [
           summary: {
             children: [
               {
-                text: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis eget lorem vel nunc feugiat malesuada ut ac nisi. Morbi odio ipsum, dignissim nec turpis vel, laoreet condimentum tortor. Duis laoreet tincidunt ullamcorper.',
+                text:
+                  'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis eget lorem vel nunc feugiat malesuada ut ac nisi. Morbi odio ipsum, dignissim nec turpis vel, laoreet condimentum tortor. Duis laoreet tincidunt ullamcorper.',
               },
               {
-                text: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis eget lorem vel nunc feugiat malesuada ut ac nisi. Morbi odio ipsum, dignissim nec turpis vel, laoreet condimentum tortor. Duis laoreet tincidunt ullamcorper.',
+                text:
+                  'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis eget lorem vel nunc feugiat malesuada ut ac nisi. Morbi odio ipsum, dignissim nec turpis vel, laoreet condimentum tortor. Duis laoreet tincidunt ullamcorper.',
               },
               {
                 url: 'http://this-is-a-url/',
-                text: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis eget lorem vel nunc feugiat malesuada ut ac nisi. Morbi odio ipsum, dignissim nec turpis vel, laoreet condimentum tortor. Duis laoreet tincidunt ullamcorper.',
+                text:
+                  'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis eget lorem vel nunc feugiat malesuada ut ac nisi. Morbi odio ipsum, dignissim nec turpis vel, laoreet condimentum tortor. Duis laoreet tincidunt ullamcorper.',
               },
               {
-                text: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis eget lorem vel nunc feugiat malesuada ut ac nisi. Morbi odio ipsum, dignissim nec turpis vel, laoreet condimentum tortor. Duis laoreet tincidunt ullamcorper.',
+                text:
+                  'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis eget lorem vel nunc feugiat malesuada ut ac nisi. Morbi odio ipsum, dignissim nec turpis vel, laoreet condimentum tortor. Duis laoreet tincidunt ullamcorper.',
               },
             ],
           },

package/infrastructure/.circleci/config.yml

@@ -239,6 +239,7 @@ orbs:
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set envs.TEALIUM_ENV=${TEALIUM_ENV}"' >> $BASH_ENV
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.NEW_RELIC_LICENSE_KEY=${NEW_RELIC_LICENSE_KEY}"' >> $BASH_ENV
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.MAIN_GRAPHQL_URL=${MAIN_GRAPHQL_URL}"' >> $BASH_ENV
+                echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.MAIN_COOKIE_NAME=${MAIN_COOKIE_NAME}"' >> $BASH_ENV
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.MAIN_USER_ID=${MAIN_USER_ID}"' >> $BASH_ENV
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.MAIN_AUDIENCE=${MAIN_AUDIENCE}"' >> $BASH_ENV
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.MAIN_OAUTH_TOKEN=${MAIN_OAUTH_TOKEN}"' >> $BASH_ENV

package/next.config.js

@@ -5,38 +5,43 @@ const withTM = require('next-transpile-modules')([
   '@newskit-render/my-account',
   '@newskit-render/validation',
 ])
+const withBundleAnalyzer = require('@next/bundle-analyzer')({
+  enabled: process.env.ANALYZE === 'true',
+})
 
-module.exports = withTM({
-  webpack: (config, options) => {
-    if (options.isServer) {
-      config.externals = ['react', ...config.externals]
-    }
+module.exports = withBundleAnalyzer(
+  withTM({
+    webpack: (config, options) => {
+      if (options.isServer) {
+        config.externals = ['react', ...config.externals]
+      }
 
-    config.resolve.alias.newskit = path.resolve(
-      __dirname,
-      '.',
-      'node_modules',
-      'newskit'
-    )
-    config.resolve.alias.react = path.resolve(
-      __dirname,
-      '.',
-      'node_modules',
-      'react'
-    )
+      config.resolve.alias.newskit = path.resolve(
+        __dirname,
+        '.',
+        'node_modules',
+        'newskit'
+      )
+      config.resolve.alias.react = path.resolve(
+        __dirname,
+        '.',
+        'node_modules',
+        'react'
+      )
 
-    return config
-  },
-  async rewrites() {
-    return [
-      {
-        source: '/sitemap.xml',
-        destination: '/api/sitemap',
-      },
-      {
-        source: '/news-sitemap.xml',
-        destination: '/api/news-sitemap',
-      },
-    ]
-  },
-})
+      return config
+    },
+    async rewrites() {
+      return [
+        {
+          source: '/sitemap.xml',
+          destination: '/api/sitemap',
+        },
+        {
+          source: '/news-sitemap.xml',
+          destination: '/api/news-sitemap',
+        },
+      ]
+    },
+  })
+)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "1.11.3",
+  "version": "1.17.4",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -24,64 +24,77 @@
     "pact:test": "NEWSKIT_API_ENV_URL='http://localhost:4343' jest --config=jest.config.pact.js",
     "pact:publish": "pact-broker publish ./__pacts__/pacts --consumer-app-version=$(git describe --match '*core*' --abbrev=0) --tag='dev' --broker-base-url=$PACT_BROKER_URL --broker-token=$PACT_BROKER_TOKEN",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx . --color && prettier --check './**/*.{js,jsx,ts,tsx,json}'",
-    "lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --color --fix && prettier --write './**/*.{js,jsx,ts,tsx,json}'"
+    "lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --color --fix && prettier --write './**/*.{js,jsx,ts,tsx,json}'",
+    "precommit:lint": "eslint",
+    "precommit": "lint-staged",
+    "analyze": "ANALYZE=true next build"
   },
   "dependencies": {
-    "@apollo/client": "^3.4.16",
-    "@newskit-render/api": "^0.6.0",
-    "@newskit-render/auth": "^0.23.0",
-    "@newskit-render/checkout": "^0.12.0",
-    "@newskit-render/my-account": "^0.119.0",
-    "@newskit-render/shared-components": "^0.22.0",
-    "@newskit-render/sitemap": "^0.26.0",
-    "@newskit-render/validation": "^0.28.0",
-    "cross-fetch": "^3.1.4",
-    "graphql": "^15.6.0",
-    "newrelic": "^7.1.0",
+    "@apollo/client": "3.4.16",
+    "@newskit-render/api": "^0.10.1",
+    "@newskit-render/auth": "^0.26.1",
+    "@newskit-render/checkout": "^0.16.1",
+    "@newskit-render/my-account": "^0.126.1",
+    "@newskit-render/shared-components": "^0.27.1",
+    "@newskit-render/sitemap": "^0.29.1",
+    "@newskit-render/validation": "^0.31.1",
+    "cross-fetch": "3.1.5",
+    "graphql": "15.6.0",
+    "newrelic": "7.1.0",
     "newskit": "4.3.1",
-    "next": "^12.0.2",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.2",
-    "react-helmet": "^6.1.0",
+    "next": "12.0.8",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
+    "react-helmet": "6.1.0",
     "react-hook-form": "7.8.4"
   },
   "devDependencies": {
-    "@apollo/react-testing": "^4.0.0",
-    "@emotion/jest": "^11.3.0",
-    "@pact-foundation/pact": "^9.12.1",
-    "@testing-library/jest-dom": "^5.11.4",
-    "@testing-library/react": "^11.0.2",
-    "@types/newrelic": "^7.0.0",
-    "@types/react": "^16.9.49",
-    "@types/react-helmet": "^6.1.0",
-    "@typescript-eslint/eslint-plugin": "^3.7.1",
-    "@typescript-eslint/parser": "^3.7.1",
-    "babel-jest": "^26.3.0",
+    "@apollo/react-testing": "4.0.0",
+    "@emotion/jest": "11.3.0",
+    "@next/bundle-analyzer": "12.0.8",
+    "@pact-foundation/pact": "9.12.1",
+    "@testing-library/jest-dom": "5.11.4",
+    "@testing-library/react": "11.0.2",
+    "@types/newrelic": "7.0.0",
+    "@types/react": "17.0.2",
+    "@types/react-helmet": "6.1.0",
+    "@typescript-eslint/eslint-plugin": "3.7.1",
+    "@typescript-eslint/parser": "3.7.1",
+    "babel-jest": "26.3.0",
     "cypress": "9.0.0",
-    "eslint": "^6.6.0",
-    "eslint-config-airbnb": "^18.2.0",
-    "eslint-config-airbnb-typescript": "^9.0.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-config-react-app": "^5.2.1",
-    "eslint-import-resolver-typescript": "^2.0.0",
-    "eslint-loader": "^4.0.2",
-    "eslint-plugin-cypress": "^2.11.2",
-    "eslint-plugin-flowtype": "^5.2.0",
-    "eslint-plugin-import": "^2.22.1",
+    "eslint": "6.6.0",
+    "eslint-config-airbnb": "18.2.0",
+    "eslint-config-airbnb-typescript": "9.0.0",
+    "eslint-config-prettier": "6.11.0",
+    "eslint-config-react-app": "5.2.1",
+    "eslint-import-resolver-typescript": "2.0.0",
+    "eslint-loader": "4.0.2",
+    "eslint-plugin-cypress": "2.11.2",
+    "eslint-plugin-flowtype": "5.2.0",
+    "eslint-plugin-import": "2.22.1",
     "eslint-plugin-jsx-a11y": "6.2.3",
-    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-prettier": "3.1.4",
     "eslint-plugin-react": "7.19.0",
-    "eslint-plugin-react-hooks": "^1.6.1",
-    "jest": "^27.2.4",
-    "jest-junit": "^12.0.0",
-    "jest-watch-typeahead": "^0.6.3",
-    "next-transpile-modules": "^8.0.0",
-    "prettier": "^2.0.5",
-    "prettier-eslint": "^11.0.0",
-    "prettier-eslint-cli": "^5.0.0",
-    "ts-jest": "^27.0.5",
-    "typescript": "^4.4.3",
-    "wait-on": "^5.3.0"
+    "eslint-plugin-react-hooks": "1.6.1",
+    "jest": "27.2.4",
+    "jest-junit": "12.0.0",
+    "jest-watch-typeahead": "0.6.3",
+    "lint-staged": "12.1.7",
+    "next-transpile-modules": "8.0.0",
+    "prettier": "2.0.5",
+    "prettier-eslint": "11.0.0",
+    "prettier-eslint-cli": "5.0.0",
+    "ts-jest": "27.0.5",
+    "typescript": "4.4.3",
+    "wait-on": "5.3.0"
+  },
+  "precommit": [
+    "precommit"
+  ],
+  "lint-staged": {
+    "**/*.(ts|tsx)": [
+      "yarn run precommit:lint"
+    ]
   },
   "publishConfig": {
     "access": "public"

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

@@ -70,6 +70,7 @@ export async function getServerSideProps(context) {
       twitterUsername: process.env.TWITTER_USERNAME || '',
       siteHost: process.env.SITE_HOST || '',
       gscId: process.env.GSC_ID || '',
+      showAds: true,
       // user,
     },
   }

package/pages/[section]/index.tsx

@@ -38,6 +38,7 @@ export async function getServerSideProps(context) {
     props: {
       page: data.page,
       isIndexPage: true,
+      showAds: true,
       //  user,
     },
   }

package/pages/_app.tsx

@@ -49,6 +49,178 @@ const GlobalStyling = css`
     font-family: TheSun-Medium;
     src: url('/fonts/TheSun-Medium.ttf') format('truetype');
   }
+  @font-face {
+    font-family: 'DM Sans';
+    src: url('/fonts/dmsans-regular-webfont.woff2') format('woff2'),
+      url('/fonts/dmsans-regular-webfont.woff') format('woff');
+    font-style: normal;
+    font-weight: 400;
+    font-display: swap;
+  }
+  @font-face {
+    font-family: 'DM Sans';
+    src: url('/fonts/dmsans-italic-webfont.woff2') format('woff2'),
+      url('/fonts/dmsans-italic-webfont.woff') format('woff');
+    font-style: italic;
+    font-weight: 400;
+    font-display: swap;
+  }
+  @font-face {
+    font-family: 'DM Sans';
+    src: url('/fonts/dmsans-medium-webfont.woff2') format('woff2'),
+      url('/fonts/dmsans-medium-webfont.woff') format('woff');
+    font-style: normal;
+    font-weight: 500;
+    font-display: swap;
+  }
+  @font-face {
+    font-family: 'DM Sans';
+    src: url('/fonts/dmsans-mediumitalic-webfont.woff2') format('woff2'),
+      url('/fonts/dmsans-mediumitalic-webfont.woff') format('woff');
+    font-style: italic;
+    font-weight: 500;
+    font-display: swap;
+  }
+  @font-face {
+    font-family: 'DM Sans';
+    src: url('/fonts/dmsans-bold-webfont.woff2') format('woff2'),
+      url('/fonts/dmsans-bold-webfont.woff') format('woff');
+    font-style: normal;
+    font-weight: 700;
+    font-display: swap;
+  }
+  @font-face {
+    font-family: 'DM Sans';
+    src: url('/fonts/dmsans-bolditalic-webfont.woff2') format('woff2'),
+      url('/fonts/dmsans-bolditalic-webfont.woff') format('woff');
+    font-style: italic;
+    font-weight: 700;
+    font-display: swap;
+  }
+  @font-face {
+    font-family: 'Poppins';
+    src: url('/fonts/poppins-bold-webfont.woff2') format('woff2'),
+      url('/fonts/poppins-bold-webfont.woff') format('woff');
+    font-weight: 700;
+    font-style: normal;
+  }
+  @font-face {
+    font-family: 'Poppins';
+    src: url('/fonts/poppins-bolditalic-webfont.woff2') format('woff2'),
+      url('/fonts/poppins-bolditalic-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: italic;
+  }
+  @font-face {
+    font-family: 'Poppins';
+    src: url('/fonts/poppins-extrabold-webfont.woff2') format('woff2'),
+      url('/fonts/poppins-extrabold-webfont.woff') format('woff');
+    font-weight: 800;
+    font-style: normal;
+  }
+  @font-face {
+    font-family: 'Poppins';
+    src: url('/fonts/poppins-extrabolditalic-webfont.woff2') format('woff2'),
+      url('/fonts/poppins-extrabolditalic-webfont.woff') format('woff');
+    font-weight: 800;
+    font-style: italic;
+  }
+  @font-face {
+    font-family: 'Poppins';
+    src: url('/fonts/poppins-italic-webfont.woff2') format('woff2'),
+      url('/fonts/poppins-italic-webfont.woff') format('woff');
+    font-weight: 400;
+    font-style: italic;
+  }
+  @font-face {
+    font-family: 'Poppins';
+    src: url('/fonts/poppins-light-webfont.woff2') format('woff2'),
+      url('/fonts/poppins-light-webfont.woff') format('woff');
+    font-weight: 300;
+    font-style: normal;
+  }
+  @font-face {
+    font-family: 'Poppins';
+    src: url('/fonts/poppins-lightitalic-webfont.woff2') format('woff2'),
+      url('/fonts/poppins-lightitalic-webfont.woff') format('woff');
+    font-weight: 300;
+    font-style: italic;
+  }
+  @font-face {
+    font-family: 'Poppins';
+    src: url('/fonts/poppins-medium-webfont.woff2') format('woff2'),
+      url('/fonts/poppins-medium-webfont.woff') format('woff');
+    font-weight: 500;
+    font-style: normal;
+  }
+  @font-face {
+    font-family: 'Poppins';
+    src: url('/fonts/poppins-mediumitalic-webfont.woff2') format('woff2'),
+      url('/fonts/poppins-mediumitalic-webfont.woff') format('woff');
+    font-weight: 500;
+    font-style: italic;
+  }
+  @font-face {
+    font-family: 'Poppins';
+    src: url('/fonts/poppins-regular-webfont.woff2') format('woff2'),
+      url('/fonts/poppins-regular-webfont.woff') format('woff');
+    font-weight: 400;
+    font-style: normal;
+  }
+  @font-face {
+    font-family: 'Poppins';
+    src: url('/fonts/poppins-semibold-webfont.woff2') format('woff2'),
+      url('/fonts/poppins-semibold-webfont.woff') format('woff');
+    font-weight: 600;
+    font-style: normal;
+  }
+  @font-face {
+    font-family: 'Poppins';
+    src: url('/fonts/poppins-semibolditalic-webfont.woff2') format('woff2'),
+      url('/fonts/poppins-semibolditalic-webfont.woff') format('woff');
+    font-weight: 600;
+    font-style: italic;
+  }
+  @font-face {
+    font-family: 'DM Mono';
+    src: url('/fonts/dmmono-medium.woff2') format('woff2'),
+      url('/fonts/dmmono-medium.woff') format('woff');
+    font-style: normal;
+    font-weight: 500;
+    font-display: swap;
+  }
+  @font-face {
+    font-family: 'Bitter';
+    src: url('/fonts/bitter-regular.woff2') format('woff2'),
+      url('/fonts/bitter-regular.woff') format('woff');
+    font-style: normal;
+    font-weight: 400;
+    font-display: swap;
+  }
+  @font-face {
+    font-family: 'Bitter';
+    src: url('/fonts/bitter-medium.woff2') format('woff2'),
+      url('/fonts/bitter-medium.woff') format('woff');
+    font-style: normal;
+    font-weight: 500;
+    font-display: swap;
+  }
+  @font-face {
+    font-family: 'Bitter';
+    src: url('/fonts/bitter-mediumitalic.woff2') format('woff2'),
+      url('/fonts/bitter-mediumitalic.woff') format('woff');
+    font-style: italic;
+    font-weight: 500;
+    font-display: swap;
+  }
+  @font-face {
+    font-family: 'Bitter';
+    src: url('/fonts/bitter-semibold.woff2') format('woff2'),
+      url('/fonts/bitter-semibold.woff') format('woff');
+    font-style: normal;
+    font-weight: 600;
+    font-display: swap;
+  }
 
   html,
   body {

package/pages/_document.tsx

@@ -32,6 +32,7 @@ export default class MyDocument extends Document {
 
   render() {
     const helmet = Helmet.rewind()
+    const { showAds } = this.props.__NEXT_DATA__.props.pageProps
     return (
       <Html lang="en">
         <Head>
@@ -62,14 +63,18 @@ export default class MyDocument extends Document {
             />
           )}
           <meta name="robots" content="noindex" />
-          <script
-            type="text/javascript"
-            src="https://ads.newskit.co.uk/prebid.newskit.min.js"
-          />
-          <script
-            type="text/javascript"
-            src="https://ads.newskit.co.uk/ads.newskit.min.js"
-          />
+          {showAds && (
+            <>
+              <script
+                type="text/javascript"
+                src="https://ads.newskit.co.uk/prebid.newskit.min.js"
+              />
+              <script
+                type="text/javascript"
+                src="https://ads.newskit.co.uk/ads.newskit.min.js"
+              />
+            </>
+          )}
         </Head>
         <body>
           {TEALIUM_ACCOUNT_ID && (

package/pages/index.tsx

@@ -35,6 +35,7 @@ export async function getServerSideProps(context) {
   return {
     props: {
       page,
+      showAds: true,
       // user: (user || null),
     },
   }

package/public/prebid.min.js

@@ -0,0 +1 @@
+console.log('Please speak to commercial to get a link to your ad library CDN link')

package/temp/_document.tsx

@@ -23,7 +23,7 @@ export default class MyDocument extends Document {
 
   render() {
     const helmet = Helmet.rewind()
-
+    <% SHOWADS >
     return (
       <Html lang="en">
         <Head>