@newskit-render/core 0.131.1 → 0.138.1

package/helpers/addCacheHeaders.ts

@@ -0,0 +1,8 @@
+import { ServerResponse } from 'http'
+
+export const addCacheHeaders = (res: ServerResponse) => {
+  res.setHeader(
+    'Cache-Control',
+    'public, s-maxage=10, stale-while-revalidate=59'
+  )
+}

package/infrastructure/.circleci/config.yml

@@ -643,7 +643,7 @@ orbs:
                 source $BASH_ENV
                 CURRENT_VERSION=$(jq -r .version ./package.json)
 
-                npm install --no-save release-documentation-cli@4.11.6
+                npm install --no-save release-documentation-cli@5.2.0
 
                 # If your tags are prefixed (i.e. lerna) check the --tagFilter parameter
                 echo "Creating a release request for $CURRENT_VERSION to be deployed to production."
@@ -668,7 +668,7 @@ orbs:
                 export CURRENT_VERSION=$(jq -r .version ./package.json)
                 echo "export CURRENT_VERSION=$CURRENT_VERSION" >> $BASH_ENV
 
-                npm install --no-save release-documentation-cli@4.11.6
+                npm install --no-save release-documentation-cli@5.2.0
 
                 # If your tags are prefixed (i.e. lerna) check the --tagFilter parameter
                 $(npm bin)/release promote

package/jest.config.js

@@ -29,4 +29,8 @@ module.exports = {
     'jest-watch-typeahead/filename',
     'jest-watch-typeahead/testname',
   ],
+  moduleNameMapper: {
+    '^react$': '<rootDir>/node_modules/react',
+    '^newskit$': '<rootDir>/node_modules/newskit',
+  },
 }

package/jest.config.pact.js

@@ -6,12 +6,13 @@ module.exports = {
     ],
     globals: {
         'ts-jest': {
-            tsConfig: 'tsconfig.test.json'
+            tsconfig: 'tsconfig.test.json'
         }
     },
     transform: {
         '^.+\\.(ts|tsx)$': 'ts-jest',
     },
     modulePathIgnorePatterns: [],
-    moduleFileExtensions: ['ts', 'tsx', 'js', 'json']
+    moduleFileExtensions: ['ts', 'tsx', 'js', 'json'],
+    preset: 'ts-jest/presets/js-with-ts',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "0.131.1",
+  "version": "0.138.1",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -27,17 +27,19 @@
     "lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --color --fix && prettier --write './**/*.{js,jsx,ts,tsx,json}'"
   },
   "dependencies": {
-    "@apollo/client": "^3.1.4",
-    "@newskit-render/auth": "^0.18.0",
-    "@newskit-render/checkout": "^0.1.0",
-    "@newskit-render/my-account": "^0.97.1",
-    "@newskit-render/sitemap": "^0.21.0",
-    "@newskit-render/validation": "^0.21.0",
+    "@apollo/client": "^3.4.16",
+    "@newskit-render/api": "^0.3.0",
+    "@newskit-render/auth": "^0.21.0",
+    "@newskit-render/checkout": "^0.4.0",
+    "@newskit-render/my-account": "^0.104.1",
+    "@newskit-render/shared-components": "^0.8.0",
+    "@newskit-render/sitemap": "^0.24.0",
+    "@newskit-render/validation": "^0.24.0",
     "cross-fetch": "^3.1.4",
     "graphql": "^15.6.0",
     "newrelic": "^7.1.0",
-    "newskit": "^3.13.0",
-    "next": "^11.1.2",
+    "newskit": "^4.0.1",
+    "next": "^12.0.2",
     "react": "^17.0.1",
     "react-dom": "^17.0.2",
     "react-helmet": "^6.1.0",

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

@@ -1,13 +1,18 @@
 import React from 'react'
 import newrelic from 'newrelic'
-import { sessionParser } from '@newskit-render/my-account'
+import {
+  createApolloClient,
+  sessionParser,
+  getMainSession,
+  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 createApolloClient from '../../../helpers/createApolloClient'
 import { UserData } from '../../../helpers/global-types'
 import { fetchUser } from '../../../helpers/getUser'
 import { ACCOUNT_QUERY_URL } from '../../../constants'
+import { addCacheHeaders } from '../../../helpers/addCacheHeaders'
 
 export type ArticleSlug = {
   universalArticle: UniversalArticle
@@ -40,8 +45,9 @@ const Article: React.FC<ArticleSlug> = ({
 }
 
 export async function getServerSideProps(context) {
-  const apolloClient = createApolloClient({})
-  const session = sessionParser(context.req.headers.cookie)
+  const apolloClient = await createApolloClient(ClientTypes.nkapi)
+  const mainSession = getMainSession(context.req.headers.cookie)
+  const session = sessionParser(mainSession)
 
   const {
     params: { articleId, section, articleSlug },
@@ -59,6 +65,7 @@ export async function getServerSideProps(context) {
     await fetchUser(session, ACCOUNT_QUERY_URL),
   ])
 
+  addCacheHeaders(context.res)
   return {
     props: {
       universalArticle: data.universalArticle,

package/pages/[section]/index.tsx

@@ -1,19 +1,25 @@
 import newrelic from 'newrelic'
-import { sessionParser } from '@newskit-render/my-account'
-import createApolloClient from '../../helpers/createApolloClient'
+import {
+  createApolloClient,
+  sessionParser,
+  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 { addCacheHeaders } from '../../helpers/addCacheHeaders'
 
 export async function getServerSideProps(context) {
-  const apolloClient = createApolloClient({})
+  const apolloClient = await createApolloClient(ClientTypes.nkapi)
 
   const {
     params: { section },
   } = context
 
-  const session = sessionParser(context.req.headers.cookie)
+  const mainSession = getMainSession(context.req.headers.cookie)
+  const session = sessionParser(mainSession)
 
   newrelic.setTransactionName(`Section: ${section}`)
   const [{ data }, user] = await Promise.all([
@@ -24,6 +30,7 @@ export async function getServerSideProps(context) {
     await fetchUser(session, ACCOUNT_QUERY_URL),
   ])
 
+  addCacheHeaders(context.res)
   return {
     props: {
       page: data.page,

package/pages/api/account/zuora/generate-rsa.ts

@@ -0,0 +1,5 @@
+import { NextApiRequest, NextApiResponse } from 'next'
+import { generateRSASignature } from '@newskit-render/my-account'
+
+export default (req: NextApiRequest, res: NextApiResponse) =>
+  generateRSASignature(req, res)

package/pages/index.tsx

@@ -1,18 +1,24 @@
 import newrelic from 'newrelic'
-import { sessionParser } from '@newskit-render/my-account'
-import createApolloClient from '../helpers/createApolloClient'
+import {
+  createApolloClient,
+  sessionParser,
+  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 { addCacheHeaders } from '../helpers/addCacheHeaders'
 
 export async function getServerSideProps(context) {
   newrelic.setTransactionName('Homepage')
   console.warn('context:')
   console.warn(context.req && context.req.headers)
 
-  const session = sessionParser(context.req.headers.cookie)
-  const apolloClient = createApolloClient({})
+  const apolloClient = await createApolloClient(ClientTypes.nkapi)
+  const mainSession = getMainSession(context.req.headers.cookie)
+  const session = sessionParser(mainSession)
 
   const [{ data }, user] = await Promise.all([
     apolloClient.query({
@@ -22,6 +28,7 @@ export async function getServerSideProps(context) {
     await fetchUser(session, ACCOUNT_QUERY_URL),
   ])
 
+  addCacheHeaders(context.res)
   const { page } = data
   return {
     props: {

package/pages/preview/[articleId]/version/[versionId]/index.tsx

@@ -14,13 +14,14 @@ import {
   signOut,
   CookieView,
 } from '@newskit-render/auth'
+import { createApolloClient, ClientTypes } from '@newskit-render/api'
 import { GET_UNIVERSAL_ARTICLE } from '../../../../../queries'
 import ArticlePage from '../../../../../components/article'
 import {
   highlights,
   relatedArticles,
 } from '../../../../../helpers/mocks/articleMock'
-import createApolloClient from '../../../../../helpers/createApolloClient'
+import { addCacheHeaders } from '../../../../../helpers/addCacheHeaders'
 
 const PreviewArticle = ({
   universalArticle,
@@ -80,7 +81,7 @@ const PreviewArticle = ({
 }
 
 export async function getServerSideProps(context) {
-  const apolloClient = createApolloClient({})
+  const apolloClient = await createApolloClient(ClientTypes.nkapi)
   const session = await getSession(context)
   if (!session) {
     return {
@@ -96,6 +97,7 @@ export async function getServerSideProps(context) {
     variables: { publisher: 'DEMO', id: articleId, version: versionId },
   })
 
+  addCacheHeaders(context.res)
   return {
     props: {
       universalArticle: data.universalArticle,

package/temp/header.tsx

@@ -1,7 +1,6 @@
 import React, { useState } from 'react'
 import {
   Cell,
-  LinkStandalone,
   styled,
   getColorCssFromTheme,
   getSizingCssFromTheme,
@@ -12,6 +11,7 @@ import {
   Block,
   IconFilledMenu,
 } from 'newskit'
+import { NextLink } from '@newskit-render/shared-components'
 import { PastDueBannerExternal } from '@newskit-render/my-account'
 import { MainGrid } from '../layout/MainGrid'
 import NewsKitLogoFull from '../common/NewskitLogo'
@@ -160,7 +160,8 @@ const Header: React.FC<{ user: UserData }> = ({ user }) => {
             stackDistribution="space-between"
             wrap="nowrap"
           >
-            <LinkStandalone
+            <NextLink
+              type="standalone"
               overrides={{ stylePreset: 'linkStandaloneInverse' }}
               href="/"
               aria-label="Logo Link"
@@ -171,7 +172,7 @@ const Header: React.FC<{ user: UserData }> = ({ user }) => {
               <Visible xs sm>
                 <NewsKitLogoShort color="white" size="sizing120" />
               </Visible>
-            </LinkStandalone>
+            </NextLink>
             <Stack
               flow="horizontal-center"
               stackDistribution="flex-end"

package/tsconfig.json

@@ -18,7 +18,8 @@
     "useUnknownInCatchVariables": false,
     "exactOptionalPropertyTypes": false,
     "isolatedModules": true,
-    "jsx": "preserve"
+    "jsx": "preserve",
+    "incremental": true
   },
   "paths": {
     "@newskit-render/*": [
@@ -42,4 +43,4 @@
     ".circleci",
     "temp"
   ]
-}
+}

package/helpers/createApolloClient.tsx

@@ -1,28 +0,0 @@
-import {
-  ApolloClient,
-  createHttpLink,
-  InMemoryCache,
-  NormalizedCacheObject,
-} from '@apollo/client'
-import fetch from 'cross-fetch'
-
-export default ({
-  initialState = {},
-  addTypename = true,
-}: {
-  initialState?: NormalizedCacheObject
-  addTypename?: boolean
-}) =>
-  new ApolloClient({
-    ssrMode: true,
-    link: createHttpLink({
-      uri: process.env.NEWSKIT_API_ENV_URL,
-      headers: {
-        'x-api-key': process.env.NEWSKIT_API_X_API_KEY,
-      },
-      fetch,
-    }),
-    name: 'ncu-newskit-render',
-    version: '0.1.0',
-    cache: new InMemoryCache({ addTypename }).restore(initialState),
-  })