@newskit-render/core 1.6.0 → 1.9.0

package/CHANGELOG.md

@@ -3,6 +3,55 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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)
 
 

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "1.6.0",
+  "version": "1.9.0",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -28,17 +28,17 @@
   },
   "dependencies": {
     "@apollo/client": "^3.4.16",
-    "@newskit-render/api": "^0.4.2",
+    "@newskit-render/api": "^0.5.0",
     "@newskit-render/auth": "^0.22.2",
-    "@newskit-render/checkout": "^0.7.0",
-    "@newskit-render/my-account": "^0.114.2",
-    "@newskit-render/shared-components": "^0.18.0",
+    "@newskit-render/checkout": "^0.9.0",
+    "@newskit-render/my-account": "^0.116.1",
+    "@newskit-render/shared-components": "^0.20.0",
     "@newskit-render/sitemap": "^0.25.2",
-    "@newskit-render/validation": "^0.26.2",
+    "@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",

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

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