Merge branch 'latest' into cleanup-post-media-pages

cypress/e2e/pages/homePage/urls.js

@@ -15,11 +15,25 @@ const urls = [
     service: 'serbian',
     local: '/serbian/lat',
     test: '/serbian/lat',
+    live: '/serbian/lat',
   },
   {
     service: 'serbian',
     local: '/serbian/cyr',
     test: '/serbian/cyr',
+    live: '/serbian/cyr',
+  },
+  {
+    service: 'uzbek',
+    local: '/uzbek/lat',
+    test: '/uzbek/lat',
+    live: '/uzbek/lat',
+  },
+  {
+    service: 'uzbek',
+    local: '/uzbek/cyr',
+    test: '/uzbek/cyr',
+    live: '/uzbek/cyr',
   },
 ];
 

cypress/support/config/settings.js

@@ -314,7 +314,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/afrique/region-23278969', // CPS MAP
-              '/afrique/nos_emissions/2016/06/160622_tc2_testmap1', // TC2 MAP
+              '/afrique/nos_emissions/2016/06/160622_tc2_testmap1?renderer_env=test', // TC2 MAP
             ],
             enabled: true,
           },
@@ -731,7 +731,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/arabic/world-23278971', // CPS audio
-              '/arabic/worldnews/2015/11/151120_t_arabic_av', // TC2 video
+              '/arabic/worldnews/2015/11/151120_t_arabic_av?renderer_env=test', // TC2 video
             ],
             enabled: true,
           },
@@ -2018,7 +2018,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/hausa/23269030', // CPS MAP with video clip
-              '/hausa/multimedia/2016/07/160714_tc2_audiomap', // TC2 MAP with audio clip
+              '/hausa/multimedia/2016/07/160714_tc2_audiomap?renderer_env=test', // TC2 MAP with audio clip
             ],
             enabled: true,
           },
@@ -2246,7 +2246,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/hindi/23201477', // CPS video
-              '/hindi/sport/2016/08/160822_tc2_testmap1', // TC2 video
+              '/hindi/sport/2016/08/160822_tc2_testmap1?renderer_env=test', // TC2 video
             ],
             enabled: true,
           },
@@ -4241,7 +4241,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/pashto/media-23257523', // CPS MAP with video clip
-              '/pashto/world/2016/09/160921_tc2_testmap1', // TC2 MAP with video clip
+              '/pashto/world/2016/09/160921_tc2_testmap1?renderer_env=test', // TC2 MAP with video clip
             ],
             enabled: false,
           },
@@ -4349,7 +4349,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', // TC2 MAP
+              '/pashto/world/2016/09/160921_tc2_testmap1?renderer_env=test', // TC2 MAP
               '/pashto/23289748', // CPS STY
               '/pashto/23092924', // CPS PGL
               '/pashto/bbc_pashto_radio/programmes/p0340yr4', // On Demand Radio Brand
@@ -4527,7 +4527,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/persian/iran-23231114', // CPS MAP with audio clip
-              '/persian/iran/2016/09/160907_tc2_testmap1', // TC2 MAP with video clip
+              '/persian/iran/2016/09/160907_tc2_testmap1?renderer_env=test', // TC2 MAP with video clip
             ],
             enabled: true,
           },
@@ -4637,7 +4637,7 @@ module.exports = () => ({
               // '/persian', // Front Page
               // '/persian/popular/read', // Most Read
               // '/persian/iran-23231114', // CPS MAP
-              // '/persian/iran/2016/09/160907_tc2_testmap1', // TC2 MAP
+              // '/persian/iran/2016/09/160907_tc2_testmap1?renderer_env=test', // TC2 MAP
               // '/persian/23104784', // CPS PGL
               // '/persian/bbc_persian_radio/liveradio', // Live Radio
               // '/persian/bbc_dari_radio/liveradio', // Live Radio
@@ -5268,7 +5268,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/russian/av/media-23320267', // CPS video with redirect
-              '/russian/news/2016/05/160510_tc2_testmap3', // TC2 video
+              '/russian/news/2016/05/160510_tc2_testmap3?renderer_env=test', // TC2 video
             ],
             enabled: true,
           },
@@ -5485,21 +5485,8 @@ module.exports = () => ({
         smoke: true,
       },
       frontPage: {
-        environments: {
-          live: {
-            paths: ['/serbian/cyr'],
-            enabled: true,
-          },
-          test: {
-            paths: ['/serbian/cyr'],
-            enabled: false,
-          },
-          local: {
-            paths: ['/serbian/cyr'],
-            enabled: false,
-          },
-        },
-        smoke: true,
+        environments: undefined,
+        smoke: false,
       },
       liveRadio: { environments: undefined, smoke: false },
       onDemandAudio: { environments: undefined, smoke: false },
@@ -5655,20 +5642,7 @@ module.exports = () => ({
         smoke: true,
       },
       frontPage: {
-        environments: {
-          live: {
-            paths: ['/serbian/lat'],
-            enabled: true,
-          },
-          test: {
-            paths: ['/serbian/lat'],
-            enabled: false,
-          },
-          local: {
-            paths: ['/serbian/lat'],
-            enabled: false,
-          },
-        },
+        environments: undefined,
         smoke: true,
       },
       liveRadio: { environments: undefined, smoke: false },
@@ -6359,7 +6333,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/swahili/media-23268999', // CPS MAP with live stream
-              '/swahili/michezo/2016/07/160713_tc2_testmap2', // TC2 MAP with audio clip
+              '/swahili/michezo/2016/07/160713_tc2_testmap2?renderer_env=test', // TC2 MAP with audio clip
             ],
             enabled: true,
           },
@@ -8846,21 +8820,8 @@ module.exports = () => ({
         smoke: true,
       },
       frontPage: {
-        environments: {
-          live: {
-            paths: ['/zhongwen/simp'],
-            enabled: false,
-          },
-          test: {
-            paths: ['/zhongwen/simp'],
-            enabled: false,
-          },
-          local: {
-            paths: ['/zhongwen/simp'],
-            enabled: false,
-          },
-        },
-        smoke: true,
+        environments: undefined,
+        smoke: false,
       },
       liveRadio: { environments: undefined, smoke: false },
       onDemandAudio: {
@@ -8908,7 +8869,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/zhongwen/simp/uk-23283128', // CPS Audio
-              '/zhongwen/simp/multimedia/2016/11/161107_tc2_testmap1', // TC2 Video
+              '/zhongwen/simp/multimedia/2016/11/161107_tc2_testmap1?renderer_env=test', // TC2 Video
             ],
             enabled: true,
           },
@@ -9053,21 +9014,8 @@ module.exports = () => ({
         smoke: true,
       },
       frontPage: {
-        environments: {
-          live: {
-            paths: ['/zhongwen/trad'],
-            enabled: false,
-          },
-          test: {
-            paths: ['/zhongwen/trad'],
-            enabled: false,
-          },
-          local: {
-            paths: ['/zhongwen/trad'],
-            enabled: false,
-          },
-        },
-        smoke: true,
+        environments: undefined,
+        smoke: false,
       },
       liveRadio: { environments: undefined, smoke: false },
       onDemandAudio: {
@@ -9115,7 +9063,7 @@ module.exports = () => ({
           test: {
             paths: [
               '/zhongwen/trad/uk-23283128', // CPS Audio
-              '/zhongwen/trad/multimedia/2016/11/161107_tc2_testmap1', // TC2 Video
+              '/zhongwen/trad/multimedia/2016/11/161107_tc2_testmap1?renderer_env=test', // TC2 Video
             ],
             enabled: true,
           },

dirAlias.js

@@ -8,6 +8,8 @@ const resolvePath = relativePath => path.resolve(appDirectory, relativePath);
 module.exports = {
   webpackDirAlias: {
     '#app': resolvePath('src/app'),
+    '#src': resolvePath('src'),
+    '#nextjs': resolvePath('ws-nextjs-app/'),
     '#contexts': resolvePath('src/app/contexts'),
     '#components': resolvePath('src/app/legacy/components'),
     '#containers': resolvePath('src/app/legacy/containers'),
@@ -23,6 +25,8 @@ module.exports = {
   },
   jestDirAlias: {
     '^#app(.*)$': '<rootDir>/src/app$1',
+    '^#src(.*)$': '<rootDir>/src$1',
+    '^#nextjs(.*)$': '<rootDir>/ws-nextjs-app$1',
     '^#contexts(.*)$': '<rootDir>/src/app/contexts$1',
     '^#components(.*)$': '<rootDir>/src/app/legacy/components$1',
     '^#containers(.*)$': '<rootDir>/src/app/legacy/containers$1',
@@ -39,6 +43,8 @@ module.exports = {
   eslintDirAlias: {
     map: [
       ['#app', './src/app'],
+      ['#src', './src'],
+      ['#nextjs', './ws-nextjs-app'],
       ['#contexts', './src/app/contexts'],
       ['#components', './src/app/legacy/components'],
       ['#containers', './src/app/legacy/containers'],

envConfig/preview.env → envConfig/preview1.env

@@ -1,7 +1,7 @@
 ## NB only variables prefixed with SIMORGH_ are available on both the server and client
 SIMORGH_BASE_URL=https://www.test.bbc.com
 SIMORGH_PUBLIC_STATIC_ASSETS_ORIGIN=https://static.test.files.bbci.co.uk
-SIMORGH_PUBLIC_STATIC_ASSETS_PATH=/ws/simorgh-preview-assets/public/
+SIMORGH_PUBLIC_STATIC_ASSETS_PATH=/ws/simorgh1-preview-assets/public/
 SIMORGH_ATI_BASE_URL=https://logws1363.ati-host.net?
 SIMORGH_CONFIG_URL=https://config.test.api.bbci.co.uk/
 SIMORGH_INCLUDES_BASE_URL=https://www.test.bbc.com/ws/includes

envConfig/preview2.env

@@ -0,0 +1,32 @@
+## NB only variables prefixed with SIMORGH_ are available on both the server and client
+SIMORGH_BASE_URL=https://www.test.bbc.com
+SIMORGH_PUBLIC_STATIC_ASSETS_ORIGIN=https://static.test.files.bbci.co.uk
+SIMORGH_PUBLIC_STATIC_ASSETS_PATH=/ws/simorgh2-preview-assets/public/
+SIMORGH_ATI_BASE_URL=https://logws1363.ati-host.net?
+SIMORGH_CONFIG_URL=https://config.test.api.bbci.co.uk/
+SIMORGH_INCLUDES_BASE_URL=https://www.test.bbc.com/ws/includes
+SIMORGH_INCLUDES_BASE_AMP_URL=https://news.test.files.bbci.co.uk
+SIMORGH_ICHEF_BASE_URL=https://ichef.test.bbci.co.uk
+LOG_DIR='/var/log/simorgh'
+LOG_LEVEL='debug'
+LOG_TO_CONSOLE=false
+SIMORGH_APP_ENV=test
+SIMORGH_CONFIG_CACHE_ITEMS=400
+SIMORGH_CONFIG_CACHE_MAX_AGE_SECONDS=300
+SIMORGH_CONFIG_TIMEOUT_SECONDS=1
+SERVER_KEEP_ALIVE_TIMEOUT=61000
+SERVER_HEADERS_TIMEOUT=65000
+SIMORGH_MOST_READ_CDN_URL=https://web-cdn.test.api.bbci.co.uk
+
+## CW Custom Metrics Configuration
+AWS_EMF_SERVICE_NAME=Simorgh
+AWS_EMF_LOG_GROUP_NAME=SimorghServer
+AWS_EMF_ENVIRONMENT=EC2
+
+## WebVitals Reporting
+SIMORGH_WEBVITALS_REPORTING_ENDPOINT=https://ws.bbc-reporting-api.app/report-endpoint 
+SIMORGH_WEBVITALS_DEFAULT_SAMPLING_RATE=100
+
+SIMORGH_CSP_REPORTING_ENDPOINT=https://ws.bbc-reporting-api.app/report-endpoint
+
+SIMORGH_OPTIMIZELY_SDK_KEY=LptPKDnHyAFu9V12s5xCz

lighthouse/lighthouserc.js

@@ -1,8 +1,4 @@
 const AUDIT_URLS = {
-  FRONT_PAGE: {
-    live: ['https://www.bbc.com/serbian/cyr'],
-    test: [],
-  },
   FIX: {
     live: ['https://www.bbc.com/persian/science-52004647'],
     test: [
@@ -57,7 +53,7 @@ const AUDIT_URLS = {
   },
 
   TIPO_HOME_PAGE: {
-    live: ['https://www.bbc.com/kyrgyz'],
+    live: ['https://www.bbc.com/kyrgyz', 'https://www.bbc.com/serbian/lat', 'https://www.bbc.com/uzbek/lat'],
     test: [
       'https://www.test.bbc.com/kyrgyz?renderer_env=live',
       'https://www.test.bbc.com/serbian/lat?renderer_env=live',