@newskit-render/core 0.136.0 → 0.138.1

package/CHANGELOG.md

@@ -3,6 +3,63 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.138.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@0.138.0...@newskit-render/core@0.138.1) (2021-11-15)
+
+
+### Bug Fixes
+
+* **PPDSR-541:** revert CRA to commonjs ([#505](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/505)) ([4cb288f](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/4cb288fbccc43cd40de4f06d3543de5bd7ad8706))
+
+
+
+
+
+# [0.138.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@0.137.0...@newskit-render/core@0.138.0) (2021-11-10)
+
+
+### Features
+
+* **PPDSR-496:** add next link wrapper component ([#500](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/500)) ([a8ca436](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/a8ca436f6f8061d58e857eb83d7d3ee9cfb449a6))
+
+
+
+
+
+# [0.137.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@0.136.3...@newskit-render/core@0.137.0) (2021-11-10)
+
+
+### Features
+
+* **PPDSR-500:** Up next version and switch to es2015 ([#496](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/496)) ([1e41435](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/1e414351247e4c069a829a0a2210a8e6da0e0287))
+
+
+
+
+
+## [0.136.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@0.136.2...@newskit-render/core@0.136.3) (2021-11-09)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [0.136.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@0.136.1...@newskit-render/core@0.136.2) (2021-11-09)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [0.136.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@0.136.0...@newskit-render/core@0.136.1) (2021-11-08)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 # [0.136.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@0.135.0...@newskit-render/core@0.136.0) (2021-11-05)
 
 

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

@@ -94,12 +94,14 @@ 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(),
   }
 })
 

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

@@ -2384,7 +2384,7 @@ exports[`getServerSideProps Homepage 1`] = `
             <p>
               <a
                 class="emotion-112"
-                href="catagory-one/demo-1/test-headline"
+                href="/catagory-one/demo-1/test-headline"
               >
                 <span
                   class="emotion-113"
@@ -2400,7 +2400,7 @@ exports[`getServerSideProps Homepage 1`] = `
             <p>
               <a
                 class="emotion-112"
-                href="catagory-two/demo-2/test-headline-2"
+                href="/catagory-two/demo-2/test-headline-2"
               >
                 <span
                   class="emotion-113"
@@ -2426,7 +2426,7 @@ exports[`getServerSideProps Homepage 1`] = `
             <p>
               <a
                 class="emotion-112"
-                href="uncategorized"
+                href="/uncategorized"
               >
                 <span
                   class="emotion-113"
@@ -2442,7 +2442,7 @@ exports[`getServerSideProps Homepage 1`] = `
             <p>
               <a
                 class="emotion-112"
-                href="uncategorized"
+                href="/uncategorized"
               >
                 <span
                   class="emotion-113"
@@ -2458,7 +2458,7 @@ exports[`getServerSideProps Homepage 1`] = `
             <p>
               <a
                 class="emotion-112"
-                href="uncategorized"
+                href="/uncategorized"
               >
                 <span
                   class="emotion-113"

package/__tests__/pages/home.test.tsx

@@ -20,6 +20,7 @@ jest.mock('@newskit-render/api', () => ({
     })
   }),
   sessionParser: jest.fn(),
+  getMainSession: jest.fn(),
 }))
 
 jest.mock('cross-fetch', () =>

package/components/404/404.tsx

@@ -4,13 +4,13 @@ import {
   Cell,
   Image,
   TextBlock,
-  LinkStandalone,
   IconFilledKeyboardArrowLeft,
   styled,
   getMediaQueryFromTheme,
   getSizingCssFromTheme,
 } from 'newskit'
 import Head from 'next/head'
+import { NextLink } from '@newskit-render/shared-components'
 import Layout from '../layout'
 import { headerSize } from '../header'
 
@@ -46,9 +46,12 @@ const StyledMain = styled.main`
     max-width: 440px;
   }
 `
+const paddingCB = (size: string) => ({
+  padding: `${size} 0`,
+})
 
-const StyledLinkStandalone = styled(LinkStandalone)`
-  padding: 14px 0;
+const StyledLink = styled(NextLink)`
+  ${getSizingCssFromTheme(paddingCB, 'sizing030')}
 `
 
 const gridOverride = {
@@ -101,7 +104,8 @@ const FourOhFour = () => (
           <Block
             spaceStack={{ xs: 'space070', sm: 'space080', md: 'space090' }}
           >
-            <StyledLinkStandalone
+            <StyledLink
+              type="standalone"
               data-test-id="StyledLinkStandalone"
               href="/"
               external={false}
@@ -114,7 +118,7 @@ const FourOhFour = () => (
                 }}
               />
               Back to ...
-            </StyledLinkStandalone>
+            </StyledLink>
           </Block>
         </StyledMain>
       </Cell>

package/components/common/NavLink.tsx

@@ -1,5 +1,5 @@
-import { LinkStandalone } from 'newskit'
 import React from 'react'
+import { NextLink } from '@newskit-render/shared-components'
 
 const NavLink = ({
   href,
@@ -10,7 +10,8 @@ const NavLink = ({
   href: string
   ariaLabel?: string
 }) => (
-  <LinkStandalone
+  <NextLink
+    type="standalone"
     overrides={{
       typographyPreset: 'utilityMeta020',
       stylePreset: 'linkStandaloneInverse',
@@ -19,7 +20,7 @@ const NavLink = ({
     aria-label={ariaLabel}
   >
     {buttonText}
-  </LinkStandalone>
+  </NextLink>
 )
 
 export default NavLink

package/components/header/index.tsx

@@ -1,7 +1,6 @@
 import React, { useContext, useState } from 'react'
 import {
   Cell,
-  LinkStandalone,
   styled,
   getColorCssFromTheme,
   getSizingCssFromTheme,
@@ -13,6 +12,7 @@ import {
   IconFilledMenu,
 } from 'newskit'
 import { PastDueBannerExternal } from '@newskit-render/my-account'
+import { NextLink } from '@newskit-render/shared-components'
 import {
   renderCustomLightTheme as LightTheme,
   renderCustomDarkTheme as DarkTheme,
@@ -180,7 +180,8 @@ const Header: React.FC<{ user: UserData }> = ({ user }) => {
               stackDistribution="space-between"
               wrap="nowrap"
             >
-              <LinkStandalone
+              <NextLink
+                type="standalone"
                 overrides={{ stylePreset: 'linkStandaloneInverse' }}
                 href="/"
                 aria-label="Home Page"
@@ -191,7 +192,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/components/section/__tests__/ArticleSlice.test.tsx

@@ -94,11 +94,11 @@ describe('ArticleSlice', () => {
     expect(getByText('Layout: LEAD_1_AND_1')).toBeInTheDocument()
     expect(getByText('test headline').closest('a')).toHaveAttribute(
       'href',
-      'catagory-one/demo-1/test-headline'
+      '/catagory-one/demo-1/test-headline'
     )
     expect(getByText('test headline 2').closest('a')).toHaveAttribute(
       'href',
-      'catagory-two/demo-2/test-headline-2'
+      '/catagory-two/demo-2/test-headline-2'
     )
   })
 

package/components/section/layouts/FallBack.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { LinkStandalone } from 'newskit'
+import { NextLink } from '@newskit-render/shared-components'
 import { getBlockProps } from './Block'
 import { teaserURL } from '../sectionUtils'
 import { LayoutProps } from './types'
@@ -14,9 +14,9 @@ export const FallBack: React.FC<LayoutProps> = ({ slice }) => (
       const { id, headline } = teaserProps
       return (
         <p key={id || i}>
-          <LinkStandalone href={teaserURL(teaserProps)}>
+          <NextLink href={teaserURL(teaserProps)} type="standalone">
             {headline}
-          </LinkStandalone>
+          </NextLink>
         </p>
       )
     })}

package/components/section/layouts/SectionRow.tsx

@@ -1,12 +1,12 @@
 import React from 'react'
 import {
-  LinkStandalone,
   styled,
   getColorCssFromTheme,
   Block,
   Divider,
   BlockProps,
 } from 'newskit'
+import { NextLink } from '@newskit-render/shared-components'
 import { LayoutProps } from './types'
 import { CollectionBlock } from '../../../helpers/global-types'
 import StyledIconFilledChevronRight from '../../common/icons/StyledIconFilledChevronRight'
@@ -30,7 +30,8 @@ const StyledDivider = styled(Divider)`
 `
 
 const link = (href: string, stylePreset?: string) => (
-  <LinkStandalone
+  <NextLink
+    type="standalone"
     href={href}
     overrides={{
       stylePreset: stylePreset || 'inkInverse',
@@ -40,7 +41,7 @@ const link = (href: string, stylePreset?: string) => (
   >
     Link
     <StyledIconFilledChevronRight overrides={{ size: 'iconSize020' }} />
-  </LinkStandalone>
+  </NextLink>
 )
 
 type SectionRowProps = {

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.136.0",
+  "version": "0.138.1",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -28,17 +28,18 @@
   },
   "dependencies": {
     "@apollo/client": "^3.4.16",
-    "@newskit-render/api": "^0.2.0",
-    "@newskit-render/auth": "^0.19.0",
-    "@newskit-render/checkout": "^0.2.0",
-    "@newskit-render/my-account": "^0.102.0",
-    "@newskit-render/sitemap": "^0.22.0",
-    "@newskit-render/validation": "^0.22.0",
+    "@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": "^4.0.1",
-    "next": "^11.1.2",
+    "next": "^12.0.2",
     "react": "^17.0.1",
     "react-dom": "^17.0.2",
     "react-helmet": "^6.1.0",

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

@@ -3,6 +3,7 @@ import newrelic from 'newrelic'
 import {
   createApolloClient,
   sessionParser,
+  getMainSession,
   ClientTypes,
 } from '@newskit-render/api'
 import { GET_UNIVERSAL_ARTICLE } from '../../../queries'
@@ -45,7 +46,8 @@ const Article: React.FC<ArticleSlug> = ({
 
 export async function getServerSideProps(context) {
   const apolloClient = await createApolloClient(ClientTypes.nkapi)
-  const session = sessionParser(context.req.headers.cookie)
+  const mainSession = getMainSession(context.req.headers.cookie)
+  const session = sessionParser(mainSession)
 
   const {
     params: { articleId, section, articleSlug },

package/pages/[section]/index.tsx

@@ -2,6 +2,7 @@ import newrelic from 'newrelic'
 import {
   createApolloClient,
   sessionParser,
+  getMainSession,
   ClientTypes,
 } from '@newskit-render/api'
 import { GET_PAGE } from '../../queries'
@@ -17,7 +18,8 @@ export async function getServerSideProps(context) {
     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([

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

@@ -2,6 +2,7 @@ import newrelic from 'newrelic'
 import {
   createApolloClient,
   sessionParser,
+  getMainSession,
   ClientTypes,
 } from '@newskit-render/api'
 import { GET_PAGE } from '../queries'
@@ -15,8 +16,9 @@ export async function getServerSideProps(context) {
   console.warn('context:')
   console.warn(context.req && context.req.headers)
 
-  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 [{ data }, user] = await Promise.all([
     apolloClient.query({

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"
   ]
-}
+}