Wsteama 1522 header investigation incorporating ojs into nav

.eslintrc.js

@@ -57,12 +57,6 @@ module.exports = {
     'linebreak-style': process.platform === 'win32' ? 'off' : ['error', 'unix'],
     'react-hooks/rules-of-hooks': 'error',
     'react-hooks/exhaustive-deps': 'warn',
-    'import/no-import-module-exports': [
-      'error',
-      {
-        exceptions: ['**/*/startServer.js'],
-      },
-    ],
     'import/no-extraneous-dependencies': [
       'off',
       {
@@ -100,14 +94,6 @@ module.exports = {
         // adds support for type, interface and enum declarations https://typescript-eslint.io/rules/no-use-before-define/#how-to-use
         'no-use-before-define': 'off',
         '@typescript-eslint/no-use-before-define': ['error'],
-        '@typescript-eslint/no-unused-vars': [
-          'warn',
-          {
-            argsIgnorePattern: '^_',
-            varsIgnorePattern: '^_',
-            caughtErrorsIgnorePattern: '^_',
-          },
-        ],
         'react/require-default-props': 'off',
         'react/no-unused-prop-types': 'off',
       },

.github/dependabot.yml

@@ -10,11 +10,10 @@ updates:
       - dependency-name: 'webpack'
         update-types: ['version-update:semver-major']
       - dependency-name: 'winston'
-      # https://jira.dev.bbc.co.uk/browse/NEWSWORLDSERVICE-2185: Latest version of eslint has breaking changes
       - dependency-name: eslint
         update-types: ['version-update:semver-major']
-      - dependency-name: '@typescript-eslint/eslint-plugin'
-        update-types: ['version-update:semver-major']
+      # Latest version of Emotion contains a memory leak that needs resolved: https://github.com/emotion-js/emotion/issues/3221
+      - dependency-name: '@emotion/*'
       # Opera Mini unsupported packages
       - dependency-name: 'uuid' # https://github.com/bbc/simorgh/pull/11840
       - dependency-name: '@types/uuid' # https://github.com/bbc/simorgh/pull/11840
@@ -30,9 +29,6 @@ updates:
         patterns:
           - '@babel/*'
           - 'babel-*'
-      bbc:
-        patterns:
-          - '@bbc/*'
       emotion:
         patterns:
           - '@emotion/*'
@@ -41,21 +37,17 @@ updates:
           - '@next/*'
           - 'next'
           - 'next-*'
-          - '@img-sharp-*'
-      loadable-minor-patch:
-        patterns:
-          - '@loadable/*'
-      react:
-        patterns:
-          - 'react'
-          - 'react-dom'
-          - '@types/react'
-          - '@types/react-dom'
       storybook:
         patterns:
           - '@storybook/*'
           - 'storybook'
           - '@esbuild/*'
+      bbc:
+        patterns:
+          - '@bbc/*'
+      loadable-minor-patch:
+        patterns:
+          - '@loadable/*'
       webpack-minor-patch:
         patterns:
           - 'webpack'

.yarnrc.yml

@@ -16,5 +16,3 @@ yarnPath: .yarn/releases/yarn-4.1.1.cjs
 npmAuditExcludePackages: []
 
 npmAuditIgnoreAdvisories: []
-
-defaultSemverRangePrefix: ""

cypress/e2e/pages/topicPage/tests.js

@@ -2,6 +2,7 @@ import idSanitiser from '../../../../src/app/lib/utilities/idSanitiser';
 
 export default ({ service, pageType, variant, currentPath }) => {
   let topicId;
+  let variantTopicId;
   let topicTitle;
   let firstItemHeadline;
   let pageCount;
@@ -34,6 +35,7 @@ export default ({ service, pageType, variant, currentPath }) => {
         cy.getPageDataFromWindow().then(data => {
           const { pageData } = data;
           topicTitle = pageData.title;
+          variantTopicId = pageData.scriptSwitchId;
           pageCount = pageData.pageCount;
           numberOfItems = pageData.curations?.[0]?.summaries.length;
           firstItemHeadline = pageData.curations?.[0]?.summaries?.[0]?.title;
@@ -269,7 +271,7 @@ export default ({ service, pageType, variant, currentPath }) => {
           // URL contains correct variant after click
           cy.url().should('contain', otherVariant);
           // URL contains the correct topic ID
-          cy.url().should('contain', topicId);
+          cy.url().should('contain', variantTopicId);
           // clicks script switch
           cy.get(`[data-variant="${variant}"]`).click();
           // URL contains correct variant after click

cypress/support/config/settings.js

@@ -280,7 +280,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/afrique/region-23278969', // CPS MAP
-              '/afrique/nos_emissions/2016/06/160622_tc2_testmap1?renderer_env=test', // TC2 MAP
+              '/afrique/nos_emissions/2016/06/160622_tc2_testmap1', // TC2 MAP
             ],
             enabled: true,
           },
@@ -663,7 +663,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/arabic/world-23278971', // CPS audio
-              '/arabic/worldnews/2015/11/151120_t_arabic_av?renderer_env=test', // TC2 video
+              '/arabic/worldnews/2015/11/151120_t_arabic_av', // TC2 video
             ],
             enabled: true,
           },
@@ -1831,7 +1831,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/hausa/23269030', // CPS MAP with video clip
-              '/hausa/multimedia/2016/07/160714_tc2_audiomap?renderer_env=test', // TC2 MAP with audio clip
+              '/hausa/multimedia/2016/07/160714_tc2_audiomap', // TC2 MAP with audio clip
             ],
             enabled: true,
           },
@@ -2042,7 +2042,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/hindi/23201477', // CPS video
-              '/hindi/sport/2016/08/160822_tc2_testmap1?renderer_env=test', // TC2 video
+              '/hindi/sport/2016/08/160822_tc2_testmap1', // TC2 video
             ],
             enabled: true,
           },
@@ -3845,7 +3845,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/pashto/media-23257523', // CPS MAP with video clip
-              '/pashto/world/2016/09/160921_tc2_testmap1?renderer_env=test', // TC2 MAP with video clip
+              '/pashto/world/2016/09/160921_tc2_testmap1', // TC2 MAP with video clip
             ],
             enabled: false,
           },
@@ -3953,7 +3953,7 @@ module.exports = () => ({
               // '/pashto', // Front Page
               '/pashto/bbc_pashto_radio/liveradio', // Live Radio
               // '/pashto/media-23257523', // CPS MAP
-              '/pashto/world/2016/09/160921_tc2_testmap1?renderer_env=test', // TC2 MAP
+              '/pashto/world/2016/09/160921_tc2_testmap1', // TC2 MAP
               '/pashto/23289748', // CPS STY
               '/pashto/23092924', // CPS PGL
               '/pashto/bbc_pashto_radio/programmes/p0340yr4', // On Demand Radio Brand
@@ -4013,15 +4013,24 @@ module.exports = () => ({
       liveRadio: {
         environments: {
           live: {
-            paths: ['/persian/bbc_dari_radio/liveradio'],
+            paths: [
+              '/persian/bbc_persian_radio/liveradio',
+              '/persian/bbc_dari_radio/liveradio',
+            ],
             enabled: true,
           },
           test: {
-            paths: ['/persian/bbc_dari_radio/liveradio?renderer_env=live'],
+            paths: [
+              '/persian/bbc_persian_radio/liveradio?renderer_env=live',
+              '/persian/bbc_dari_radio/liveradio?renderer_env=live',
+            ],
             enabled: true,
           },
           local: {
-            paths: ['/persian/bbc_dari_radio/liveradio'],
+            paths: [
+              '/persian/bbc_persian_radio/liveradio',
+              '/persian/bbc_dari_radio/liveradio',
+            ],
             enabled: true,
           },
         },
@@ -4032,7 +4041,9 @@ module.exports = () => ({
           live: {
             paths: [
               '/persian/bbc_dari_radio/programmes/p0340v0s', // On Demand Brand Dari
+              '/persian/bbc_persian_radio/programmes/p0340vyx', // On Demand Brand Persian
               '/persian/bbc_dari_radio/w172y2n5p9pfj6x', // On Demand Episode Dari
+              '/persian/bbc_persian_radio/w3ct2cv6', // On Demand Episode Persian
               '/persian/podcasts/p02pc9wf', // Podcast Brand
               '/persian/podcasts/p02pc9wf/p09knl1v', // Podcast Episode
             ],
@@ -4041,14 +4052,17 @@ module.exports = () => ({
           test: {
             paths: [
               '/persian/bbc_dari_radio/programmes/p0364sj5', // On Demand Brand Dari
+              '/persian/bbc_persian_radio/programmes/p0340vyw', // On Demand Brand Persian
               '/persian/bbc_dari_radio/w172y2n5p9pfj6x', // On Demand Episode Dari
+              '/persian/bbc_persian_radio/w3ct2cv6', // On Demand Episode Persian
               '/persian/podcasts/p02pc9wf', // Podcast Brand
               '/persian/podcasts/p02pc9wf/p09knl1v', // Podcast Episode
             ],
             enabled: false,
           },
           local: {
             paths: [
+              '/persian/bbc_persian_radio/w172x32355t5635',
               '/persian/bbc_dari_radio/w3csz7mf',
               '/persian/podcasts/p02pc9wf', // Podcast Brand
               '/persian/podcasts/p02pc9wf/p095lyj1', // Podcast Episode
@@ -4097,7 +4111,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/persian/iran-23231114', // CPS MAP with audio clip
-              '/persian/iran/2016/09/160907_tc2_testmap1?renderer_env=test', // TC2 MAP with video clip
+              '/persian/iran/2016/09/160907_tc2_testmap1', // TC2 MAP with video clip
             ],
             enabled: true,
           },
@@ -4192,9 +4206,12 @@ module.exports = () => ({
               // '/persian/world-51497110', // CPS MAP
               // '/persian/media-49522521', // CPS MAP with live stream
               // '/persian/world/2016/06/160613_om_naked_dining', // TC2 MAP
+              // '/persian/bbc_persian_radio/liveradio', // Live Radio
               // '/persian/bbc_dari_radio/liveradio', // Live Radio
               // '/persian/bbc_dari_radio/programmes/p0340v0s', // On Demand Radio Brand
+              // '/persian/bbc_persian_radio/programmes/p0340vyx', // On Demand Radio Brand
               // '/persian/bbc_dari_radio/w3ct0bst', // On Demand Radio Episode
+              // '/persian/bbc_persian_radio/w3ct0s49', // On Demand Radio Episode
             ],
             enabled: false,
           },
@@ -4204,11 +4221,14 @@ module.exports = () => ({
               // '/persian', // Front Page
               // '/persian/popular/read', // Most Read
               // '/persian/iran-23231114', // CPS MAP
-              // '/persian/iran/2016/09/160907_tc2_testmap1?renderer_env=test', // TC2 MAP
+              // '/persian/iran/2016/09/160907_tc2_testmap1', // TC2 MAP
               // '/persian/23104784', // CPS PGL
+              // '/persian/bbc_persian_radio/liveradio', // Live Radio
               // '/persian/bbc_dari_radio/liveradio', // Live Radio
               // '/persian/bbc_dari_radio/programmes/p0340v0s', // On Demand Radio Brand
+              // '/persian/bbc_persian_radio/programmes/p0340vyx', // On Demand Radio Brand
               // '/persian/bbc_dari_radio/w3ct0bst', // On Demand Radio Episode
+              // '/persian/bbc_persian_radio/w3ct0s49', // On Demand Radio Episode
             ],
             enabled: false,
           },
@@ -4221,9 +4241,11 @@ module.exports = () => ({
               // '/persian/iran/2016/09/160907_tc2_testmap1', // TC2 MAP
               // '/persian/magazine-49281981', // CPS PGL
               // '/persian/arts-52166891', // CPS STY
+              // '/persian/bbc_persian_radio/liveradio', // Live Radio
               // '/persian/bbc_dari_radio/liveradio', // Live Radio
               // // '', // On Demand Radio Brand
               // // '', // On Demand Radio Brand
+              // '/persian/bbc_persian_radio/w172x32355t5635', // On Demand Radio Episode
               // '/persian/bbc_dari_radio/w3csz7mf', // On Demand Radio Episode
             ],
             enabled: false,
@@ -4756,7 +4778,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/russian/av/media-23320267', // CPS video with redirect
-              '/russian/news/2016/05/160510_tc2_testmap3?renderer_env=test', // TC2 video
+              '/russian/news/2016/05/160510_tc2_testmap3', // TC2 video
             ],
             enabled: true,
           },
@@ -5718,7 +5740,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/swahili/media-23268999', // CPS MAP with live stream
-              '/swahili/michezo/2016/07/160713_tc2_testmap2?renderer_env=test', // TC2 MAP with audio clip
+              '/swahili/michezo/2016/07/160713_tc2_testmap2', // TC2 MAP with audio clip
             ],
             enabled: true,
           },
@@ -7996,7 +8018,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/zhongwen/simp/uk-23283128', // CPS Audio
-              '/zhongwen/simp/multimedia/2016/11/161107_tc2_testmap1?renderer_env=test', // TC2 Video
+              '/zhongwen/simp/multimedia/2016/11/161107_tc2_testmap1', // TC2 Video
             ],
             enabled: true,
           },
@@ -8173,7 +8195,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/zhongwen/trad/uk-23283128', // CPS Audio
-              '/zhongwen/trad/multimedia/2016/11/161107_tc2_testmap1?renderer_env=test', // TC2 Video
+              '/zhongwen/trad/multimedia/2016/11/161107_tc2_testmap1', // TC2 Video
             ],
             enabled: true,
           },

cypress/support/helpers/ampOnlyServices.js

@@ -1,2 +1,2 @@
 const ampOnlyServices = ['news', 'sport', 'newsround'];
-export default ampOnlyServices;
+export { ampOnlyServices as default };

data/arabic/live/67574192.json

@@ -32,7 +32,7 @@
     "sportDataEvent": { "id": null },
     "eavisEvent": { "id": null },
     "article": { "id": null },
-    "mediaCollections": null,
+    "mediaCollections": [],
     "keyHighlight": { "id": null },
     "electionBanner": { "id": null },
     "supportingLinks": { "id": null },