Merge branch 'latest' into upgrade-web-vitals

bbc · Nov 21, 2024 · 49d9ece · 49d9ece
2 parents 45b37ec + 18f1a77
commit 49d9ece
Show file tree

Hide file tree

Showing 8 changed files with 490 additions and 486 deletions.
diff --git a/src/app/lib/config/services/sinhala.ts b/src/app/lib/config/services/sinhala.ts
@@ -317,10 +317,6 @@ export const service: DefaultServiceConfig = {
         title: 'මුල් පිටුව',
         url: '/sinhala',
       },
-      {
-        title: 'මහ මැතිවරණය 2024',
-        url: '/sinhala/topics/c5y3ve4z2lkt',
-      },
       {
         title: 'ශ්‍රී ලංකා',
         url: '/sinhala/topics/cg7267dz901t',

diff --git a/src/integration/pages/liveRadio/sinhala/__snapshots__/canonical.test.js.snap b/src/integration/pages/liveRadio/sinhala/__snapshots__/canonical.test.js.snap
@@ -74,34 +74,27 @@ exports[`Canonical Sinhala Live Radio Page Header Navigation link should match t
 `;
 
 exports[`Canonical Sinhala Live Radio Page Header Navigation link should match text and url 2`] = `
-{
-  "text": "මහ මැතිවරණය 2024",
-  "url": "/sinhala/topics/c5y3ve4z2lkt",
-}
-`;
-
-exports[`Canonical Sinhala Live Radio Page Header Navigation link should match text and url 3`] = `
 {
   "text": "ශ්‍රී ලංකා",
   "url": "/sinhala/topics/cg7267dz901t",
 }
 `;
 
-exports[`Canonical Sinhala Live Radio Page Header Navigation link should match text and url 4`] = `
+exports[`Canonical Sinhala Live Radio Page Header Navigation link should match text and url 3`] = `
 {
   "text": "ලෝකය",
   "url": "/sinhala/topics/c83plvepnq1t",
 }
 `;
 
-exports[`Canonical Sinhala Live Radio Page Header Navigation link should match text and url 5`] = `
+exports[`Canonical Sinhala Live Radio Page Header Navigation link should match text and url 4`] = `
 {
   "text": "වීඩියෝ",
   "url": "/sinhala/topics/crldzm9n2lnt",
 }
 `;
 
-exports[`Canonical Sinhala Live Radio Page Header Navigation link should match text and url 6`] = `
+exports[`Canonical Sinhala Live Radio Page Header Navigation link should match text and url 5`] = `
 {
   "text": "කලා",
   "url": "/sinhala/topics/c7zp5zxk8jxt",

diff --git a/ws-nextjs-app/pages/[service]/[[...]].page.tsx b/ws-nextjs-app/pages/[service]/[[...]].page.tsx
@@ -1,14 +1,18 @@
 import React from 'react';
 import { GetServerSideProps } from 'next';
+import dynamic from 'next/dynamic';
 import logResponseTime from '#server/utilities/logResponseTime';
 import isLitePath from '#app/routes/utils/isLitePath';
 import extractHeaders from '#server/utilities/extractHeaders';
 // AV Embeds
 import { AV_EMBEDS } from '#app/routes/utils/pageTypes';
-import AvEmbedsPageLayout from './av-embeds/AvEmbedsPageLayout';
 import handleAvRoute from './av-embeds/handleAvRoute';
 import { AvEmbedsPageProps } from './av-embeds/types';
 
+const AvEmbedsPageLayout = dynamic(
+  () => import('./av-embeds/AvEmbedsPageLayout'),
+);
+
 type PageProps = {
   pageType?: typeof AV_EMBEDS | null;
 } & AvEmbedsPageProps;

diff --git a/ws-nextjs-app/pages/[service]/downloads/[[...variant]].page.tsx b/ws-nextjs-app/pages/[service]/downloads/[[...variant]].page.tsx
@@ -1,14 +1,16 @@
 import { GetServerSideProps } from 'next';
+import dynamic from 'next/dynamic';
 import { DOWNLOADS_PAGE } from '#app/routes/utils/pageTypes';
 import logResponseTime from '#server/utilities/logResponseTime';
 
 import PageDataParams from '#app/models/types/pageDataParams';
 import getToggles from '#app/lib/utilities/getToggles/withCache';
 import dataFetch from './dataFetch';
 
-import downloadsPageLayout from './downloadsPageLayout';
 import extractHeaders from '../../../../src/server/utilities/extractHeaders';
 
+const downloadsPageLayout = dynamic(() => import('./downloadsPageLayout'));
+
 const pageTitle = '다운로드 - BBC News 코리아';
 
 const atiData = {

diff --git a/ws-nextjs-app/pages/[service]/live/[id]/[[...variant]].page.tsx b/ws-nextjs-app/pages/[service]/live/[id]/[[...variant]].page.tsx
@@ -1,4 +1,6 @@
 import { GetServerSideProps } from 'next';
+import dynamic from 'next/dynamic';
+
 import { LIVE_PAGE } from '#app/routes/utils/pageTypes';
 import nodeLogger from '#lib/logger.node';
 import logResponseTime from '#server/utilities/logResponseTime';
@@ -11,11 +13,12 @@ import { NON_200_RESPONSE } from '#server/utilities/customMetrics/metrics.const'
 import isLitePath from '#app/routes/utils/isLitePath';
 import PageDataParams from '#app/models/types/pageDataParams';
 
-import LivePageLayout from './LivePageLayout';
 import extractHeaders from '../../../../../src/server/utilities/extractHeaders';
 import isValidPageNumber from '../../../../utilities/pageQueryValidator';
 import getPageData from '../../../../utilities/pageRequests/getPageData';
 
+const LivePageLayout = dynamic(() => import('./LivePageLayout'));
+
 const logger = nodeLogger(__filename);
 
 export const getServerSideProps: GetServerSideProps = async context => {

diff --git a/ws-nextjs-app/pages/[service]/send/[id]/[[...variant]].page.tsx b/ws-nextjs-app/pages/[service]/send/[id]/[[...variant]].page.tsx
@@ -1,12 +1,14 @@
 import { GetServerSideProps } from 'next';
+import dynamic from 'next/dynamic';
 import PageDataParams from '#models/types/pageDataParams';
 import { UGC_PAGE } from '#app/routes/utils/pageTypes';
 import isLitePath from '#app/routes/utils/isLitePath';
 import isAppPath from '#app/routes/utils/isAppPath';
 import getPageData from '../../../../utilities/pageRequests/getPageData';
-import UGCPageLayout from './UGCPageLayout';
 import extractHeaders from '../../../../../src/server/utilities/extractHeaders';
 
+const UGCPageLayout = dynamic(() => import('./UGCPageLayout'));
+
 export const getServerSideProps: GetServerSideProps = async context => {
   context.res.setHeader(
     'Cache-Control',