@newskit-render/core 0.0.0-f053e67a8 → 0.0.0-f099b3f2f

package/CHANGELOG.md

@@ -3,6 +3,222 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.42.7](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.42.7-alpha.0...@newskit-render/core@4.42.7) (2025-02-27)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.42.6](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.42.6-alpha.1...@newskit-render/core@4.42.6) (2025-02-24)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.42.5](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.42.5-alpha.0...@newskit-render/core@4.42.5) (2025-02-14)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.42.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.42.4-alpha.0...@newskit-render/core@4.42.4) (2025-02-14)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.42.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.42.3-alpha.0...@newskit-render/core@4.42.3) (2025-02-12)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.42.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.42.2-alpha.0...@newskit-render/core@4.42.2) (2025-02-12)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.42.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.42.1-alpha.1...@newskit-render/core@4.42.1) (2025-02-12)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [4.42.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.42.0-alpha.0...@newskit-render/core@4.42.0) (2025-02-06)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.15](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.15-alpha.0...@newskit-render/core@4.41.15) (2025-02-05)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.14](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.14-alpha.0...@newskit-render/core@4.41.14) (2025-02-05)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.13](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.13-alpha.0...@newskit-render/core@4.41.13) (2025-01-30)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.12](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.12-alpha.0...@newskit-render/core@4.41.12) (2025-01-30)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.11](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.11-alpha.0...@newskit-render/core@4.41.11) (2025-01-29)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.10](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.10-alpha.0...@newskit-render/core@4.41.10) (2025-01-28)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.9](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.9-alpha.0...@newskit-render/core@4.41.9) (2025-01-28)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.8](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.8-alpha.0...@newskit-render/core@4.41.8) (2025-01-28)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.7](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.7-alpha.0...@newskit-render/core@4.41.7) (2025-01-28)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.6](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.6-alpha.0...@newskit-render/core@4.41.6) (2025-01-27)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.5](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.5-alpha.0...@newskit-render/core@4.41.5) (2025-01-22)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.4-alpha.1...@newskit-render/core@4.41.4) (2025-01-22)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.3-alpha.0...@newskit-render/core@4.41.3) (2025-01-17)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.1...@newskit-render/core@4.41.2) (2025-01-16)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.1-alpha.5...@newskit-render/core@4.41.1) (2025-01-16)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [4.41.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.0-alpha.0...@newskit-render/core@4.41.0) (2025-01-13)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.40.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.40.3-alpha.0...@newskit-render/core@4.40.3) (2025-01-08)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.40.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.40.2-alpha.0...@newskit-render/core@4.40.2) (2025-01-07)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.40.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.40.1-alpha.0...@newskit-render/core@4.40.1) (2025-01-06)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 # [4.40.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.40.0-alpha.0...@newskit-render/core@4.40.0) (2024-12-12)
 
 **Note:** Version bump only for package @newskit-render/core

package/Dockerfile.withNewRelic

@@ -4,7 +4,6 @@ WORKDIR /app
 
 ENV NEXT_TELEMETRY_DISABLED 1
 
-RUN npm install @newrelic/next
 COPY .next/standalone ./standalone
 COPY public ./standalone/public
 COPY .next/static ./standalone/.next/static
@@ -12,4 +11,4 @@ COPY .next/static ./standalone/.next/static
 EXPOSE 3000
 ENV PORT 3000
 
-CMD ["node", "-r", "@newrelic/next", "./standalone/server.js"]
+CMD ["node", "./standalone/server.js"]

package/cypress/e2e/account/newsletters-page.cy.js

@@ -12,7 +12,7 @@ describe('Newsletters page', () => {
     )
     cy.get('[data-testid="newsletters-grid"] > div > div').should(
       'have.length',
-      20
+      22
     )
   })
 
@@ -25,20 +25,20 @@ describe('Newsletters page', () => {
     )
     cy.get('[data-testid="newsletters-grid"] > div > div').should(
       'have.length',
-      2
+      6
     )
   })
 
   it('Should display all required newsletter text in the first grid card', () => {
     cy.mockConsentAndVisit('/account/newsletters')
-    cy.get('[data-testid="newsletters-grid"]').then(($parentDiv) => {
+    cy.get('[data-testid="newsletters-grid-featured"]').then(($parentDiv) => {
       const firstNewsletter = $parentDiv.find('div:first-child')
 
-      cy.wrap(firstNewsletter).contains('Business').should('be.visible')
+      cy.wrap(firstNewsletter).contains('Daily Briefing').should('be.visible')
       cy.wrap(firstNewsletter).contains('Daily').should('be.visible')
       cy.wrap(firstNewsletter)
         .contains(
-          "The business editor's exclusive analysis of all the latest financial and economic news."
+          'Our flagship newsletter with our top stories and exclusive analysis every morning.'
         )
         .should('be.visible')
     })
@@ -46,7 +46,7 @@ describe('Newsletters page', () => {
 
   it('Should successfully subscribe to a newsletter', () => {
     cy.mockConsentAndVisit('/account/newsletters')
-    cy.get('[data-testid="newsletters-grid"]').then(($parentDiv) => {
+    cy.get('[data-testid="newsletters-grid-featured"]').then(($parentDiv) => {
       cy.intercept('POST', '/api/account/mutate', { statusCode: 200, ok: true })
 
       const firstNewsletter = $parentDiv.find('div:first-child')
@@ -59,14 +59,14 @@ describe('Newsletters page', () => {
 
       cy.contains(
         '[data-testid="toast-container"]',
-        'Thank you, you are now signed up to the Business newsletter'
+        'Thank you, you are now signed up to the Daily Briefing newsletter'
       )
     })
   })
 
   it('Should show the error toast on server error', () => {
     cy.mockConsentAndVisit('/account/newsletters')
-    cy.get('[data-testid="newsletters-grid"]').then(($parentDiv) => {
+    cy.get('[data-testid="newsletters-grid-featured"]').then(($parentDiv) => {
       cy.intercept('POST', '/api/account/mutate', {
         statusCode: 500,
         ok: false,
@@ -82,7 +82,7 @@ describe('Newsletters page', () => {
 
       cy.contains(
         '[data-testid="toast-container"]',
-        'Sorry we were unable to sign you up to the Business newsletter, please try again'
+        'Sorry we were unable to sign you up to the Daily Briefing newsletter, please try again'
       )
     })
   })

package/next.config.js

@@ -29,67 +29,65 @@ module.exports = (phase) => {
   }
 
   const path = require('path')
-  const withTM = require('next-transpile-modules')([
-    '@newskit-render/auth',
-    '@newskit-render/my-account',
-    '@newskit-render/validation',
-  ])
   const withBundleAnalyzer = require('@next/bundle-analyzer')({
     enabled: process.env.ANALYZE === 'true',
   })
 
-  return withBundleAnalyzer(
-    withTM({
-      webpack: (config, options) => {
-        if (options.isServer) {
-          config.externals = ['react', ...config.externals]
-        }
+  return withBundleAnalyzer({
+    transpilePackages: [
+      '@newskit-render/auth',
+      '@newskit-render/my-account',
+      '@newskit-render/validation',
+    ],
+    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
-      },
-      images,
-      output: 'standalone',
-      async rewrites() {
-        return [
-          {
-            source: '/sitemap.xml',
-            destination: '/api/sitemap',
-          },
-          {
-            source: '/pages-sitemap.xml',
-            destination: '/api/pages-sitemap',
-          },
-          {
-            source: '/competitions-sitemap.xml',
-            destination: '/api/competitions-sitemap',
-          },
-          {
-            source: '/news-sitemap.xml',
-            destination: '/api/news-sitemap',
-          },
-          {
-            source: '/feed',
-            destination: '/api/feed',
-          },
-          {
-            source: '/robots.txt',
-            destination: '/api/robots',
-          },
-        ]
-      },
-    })
-  )
+      return config
+    },
+    images,
+    output: 'standalone',
+    async rewrites() {
+      return [
+        {
+          source: '/sitemap.xml',
+          destination: '/api/sitemap',
+        },
+        {
+          source: '/pages-sitemap.xml',
+          destination: '/api/pages-sitemap',
+        },
+        {
+          source: '/competitions-sitemap.xml',
+          destination: '/api/competitions-sitemap',
+        },
+        {
+          source: '/news-sitemap.xml',
+          destination: '/api/news-sitemap',
+        },
+        {
+          source: '/feed',
+          destination: '/api/feed',
+        },
+        {
+          source: '/robots.txt',
+          destination: '/api/robots',
+        },
+      ]
+    },
+  })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "0.0.0-f053e67a8",
+  "version": "0.0.0-f099b3f2f",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -42,21 +42,21 @@
     "@emotion/styled": "11.9.3",
     "@newrelic/next": "0.5.2",
     "@newrelic/winston-enricher": "4.0.1",
-    "@newskit-render/api": "^1.15.0",
-    "@newskit-render/auth": "^1.8.2",
-    "@newskit-render/checkout": "^3.10.29",
-    "@newskit-render/feature-flags": "^1.11.1",
-    "@newskit-render/feed": "^1.8.16",
-    "@newskit-render/my-account": "^7.89.0",
-    "@newskit-render/shared-components": "^4.40.0",
-    "@newskit-render/standalone-components": "^3.23.12",
-    "@newskit-render/validation": "^1.18.1",
+    "@newskit-render/api": "^1.15.2",
+    "@newskit-render/auth": "^1.8.5",
+    "@newskit-render/checkout": "^3.10.39-alpha.0",
+    "@newskit-render/feature-flags": "^1.11.3",
+    "@newskit-render/feed": "^1.8.19",
+    "@newskit-render/my-account": "^7.100.5-alpha.0",
+    "@newskit-render/shared-components": "^4.45.3-alpha.0",
+    "@newskit-render/standalone-components": "^3.25.9-alpha.0",
+    "@newskit-render/validation": "^1.19.2",
     "cross-fetch": "3.1.5",
     "graphql": "16.6.0",
     "lodash.get": "4.4.2",
     "newrelic": "10.6.1",
     "newskit": "7.7.0",
-    "next": "13.4.4",
+    "next": "13.5.8",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-helmet": "6.1.0",
@@ -100,7 +100,6 @@
     "jest-junit": "15.0.0",
     "jest-watch-typeahead": "2.2.1",
     "lint-staged": "13.1.0",
-    "next-transpile-modules": "10.0.0",
     "prettier": "2.8.3",
     "prettier-eslint": "15.0.1",
     "prettier-eslint-cli": "7.1.0",

package/pages/account/{family → bonus-accounts}/index.tsx

@@ -9,18 +9,15 @@ const AccountFamily = (props) => <Family {...props} />
 export default AccountFamily
 
 export const getServerSideProps = async (context) => {
-  replaceConsoleAndSetTransactionName('Account: Family')
+  replaceConsoleAndSetTransactionName('Account: Bonus Accounts')
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
 
-  const provider = featureFlags?.enable_invite_family_v2_query
-    ? 'GroupAccountsV2'
-    : 'GroupAccounts'
   /* end cra-effected */
   return getProviderPropsUtil(
     {
       ...context,
-      provider,
+      provider: 'GroupAccountsV2',
     },
     { featureFlags } /* cra-effected */
   )

package/pages/account/edit/[field].tsx

@@ -3,15 +3,19 @@ import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import {
   EditField,
   editComponentMap,
+  broadcastingOnlyEditComponentMap,
   DynamicPage,
 } from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import validation from '../../../validation'
 import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
+import { publisher } from '../../../config'
+import { Publisher } from '@newskit-render/api'
 
 const AccountEditField = (props) => (
   <DynamicPage
     objectMap={editComponentMap}
+    isPageRestricted={props.isPageRestricted}
     pageName={props.data.type}
     Component={EditField}
     componentProps={props}
@@ -27,9 +31,15 @@ export const getServerSideProps = async (context) => {
   } = context
   const doesEditPageExist = Object.keys(editComponentMap).includes(field)
 
+  const isBroadcasting = publisher === Publisher.BROADCASTING
+  const broadcastingOnlyPages = Object.keys(broadcastingOnlyEditComponentMap)
+
+  const isPageRestricted =
+    !isBroadcasting && broadcastingOnlyPages.includes(field)
+
   replaceConsoleAndSetTransactionName(`Account: edit ${field}`)
 
-  if (!doesEditPageExist) {
+  if (!doesEditPageExist || isPageRestricted) {
     context.res.statusCode = 404
     // Logging the error for being captured by New Relic
     console.error(`An error ${context.res.statusCode} occurred on server`)
@@ -40,6 +50,9 @@ export const getServerSideProps = async (context) => {
 
   return getProviderPropsUtil(
     { ...context, provider: 'EditField' },
-    { featureFlags } /* cra-effected */
+    {
+      featureFlags,
+      isPageRestricted,
+    } /* cra-effected */
   )
 }