@newskit-render/core 1.5.2 → 1.11.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,190 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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)
+
+
+### Bug Fixes
+
+* update release cli version ([#556](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/556)) ([d613fe1](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/d613fe1f5b96fc3f66547f2310a12c0b3810e940))
+
+
+
+
+
+## [1.11.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.11.1...@newskit-render/core@1.11.2) (2022-01-11)
+
+
+### Bug Fixes
+
+* bump release-cli to latest to fix pipeline ([#554](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/554)) ([46a0c13](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/46a0c13231f89445360126bc596476ca13716b37))
+
+
+
+
+
+## [1.11.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.11.0...@newskit-render/core@1.11.1) (2022-01-07)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [1.11.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.10.1...@newskit-render/core@1.11.0) (2022-01-06)
+
+
+### Features
+
+* **PPDSR-605:** Move PrimaryNavigation to Shared Components ([#550](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/550)) ([fcc1cda](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/fcc1cda59d4cfcc42b1487ee8ba782c7d5f83bb7))
+
+
+
+
+
+## [1.10.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.10.0...@newskit-render/core@1.10.1) (2022-01-05)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [1.10.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.9.3...@newskit-render/core@1.10.0) (2022-01-05)
+
+
+### Features
+
+* **PPDSR-594:** Add themes to account package ([#538](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/538)) ([e34a53a](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/e34a53a944ae8d1420c27459f1ef5ca3ba4160d0))
+
+
+
+
+
+## [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

package/README.md

@@ -1,6 +1,6 @@
 # @newskit-render/core
 
-А website blueprint built with Next.js.
+А template website built using Next.js.
 
 This package is used by [@newskit-render/create-render-app](https://www.npmjs.com/package/@newskit-render/create-render-app) as a template structure to scaffold the newly created projects which the users of @newskit-render/create-render-app can use and modify for their purposes.
 

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/{context → app-context}/AppContext.test.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
 import { render } from 'react-dom'
 import { act } from 'react-dom/test-utils'
-import { renderCustomLightTheme, renderCustomDarkTheme } from '../theme'
+import { sharedTheme } from '@newskit-render/shared-components'
+import { renderCustomDarkTheme } from '../theme'
 import { AppContextProvider, AppContext } from './AppContext'
 
 const container = document.createElement('div')
@@ -30,7 +31,7 @@ describe('AppContext tests', () => {
       container
     )
 
-    expect(container.textContent).toBe(JSON.stringify(renderCustomLightTheme))
+    expect(container.textContent).toBe(JSON.stringify(sharedTheme))
   })
 
   it('setTheme should switch the theme', () => {

package/{context → app-context}/AppContext.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react'
 import { UncompiledTheme } from 'newskit'
-import { renderCustomLightTheme } from '../theme'
+import { sharedTheme } from '@newskit-render/shared-components'
 
 type AppContextType = {
   theme: UncompiledTheme
@@ -8,11 +8,11 @@ type AppContextType = {
 }
 
 const AppContext = React.createContext({
-  theme: renderCustomLightTheme,
+  theme: sharedTheme,
 } as AppContextType)
 
 const AppContextProvider = ({ children }: { children: JSX.Element }) => {
-  const [theme, setTheme] = useState(renderCustomLightTheme)
+  const [theme, setTheme] = useState(sharedTheme)
 
   return (
     <AppContext.Provider value={{ theme, setTheme }}>

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/header/index.tsx

@@ -21,7 +21,7 @@ import { MainGrid } from '../layout/MainGrid'
 import NewsKitLogoFull from '../common/NewskitLogo'
 import NewsKitLogoShort from '../common/NewskitLogoShort'
 import NavLink from '../common/NavLink'
-import { AppContext } from '../../context/AppContext'
+import { AppContext } from '../../app-context/AppContext'
 import { getKey } from '../../helpers/articleUtil'
 import { handleEnterKeyPress } from '../../helpers/a11y'
 import { UserData, VxInstance } from '../../helpers/global-types'

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/next-env.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited