Revert "[DNM] React 19 (#12374)"

This reverts commit 7529531.

.eslintrc.js

@@ -51,6 +51,9 @@ module.exports = {
           'custom-element',
           'custom-template',
           'fallback',
+          'fetchpriority',
+          'imagesizes',
+          'imagesrcset',
         ],
       },
     ],

.github/dependabot.yml

@@ -23,6 +23,15 @@ updates:
       - dependency-name: 'react-router'
       # https://jira.dev.bbc.co.uk/browse/NEWSWORLDSERVICE-2099: Delete path-to-regexp dependency
       - dependency-name: 'path-to-regexp'
+      # https://jira.dev.bbc.co.uk/browse/NEWSWORLDSERVICE-2187: Latest major version of react has breaking changes
+      - dependency-name: 'react'
+        update-types: ['version-update:semver-major']
+      - dependency-name: 'react-dom'
+        update-types: ['version-update:semver-major']
+      - dependency-name: '@types/react'
+        update-types: ['version-update:semver-major']
+      - dependency-name: '@types/react-dom'
+        update-types: ['version-update:semver-major']
     labels:
       - 'dependencies'
     groups:

.storybook/DocsDecorator/index.tsx

@@ -1,4 +1,4 @@
-import React, { type JSX } from 'react';
+import React from 'react';
 import {
   DocsContainer,
   DocsContextProps,

.storybook/withServicesDecorator/index.tsx

@@ -1,4 +1,4 @@
-import React, { type JSX } from 'react';
+import React from 'react';
 import { Helmet } from 'react-helmet';
 import { StoryProps } from '#app/models/types/storybook';
 import { Services, Variants } from '#app/models/types/global';

cypress/e2e/pages/articles/testsForCanonicalOnly.js

@@ -11,7 +11,7 @@ const serviceHasCaption = service => service === 'news';
 export default ({ service, pageType, variant = 'default' }) =>
   describe(`Canonical Tests for ${service} ${pageType}`, () => {
     if (appToggles.chartbeatAnalytics.enabled) {
-      describe('Chartbeat', { retries: 3 }, () => {
+      describe('Chartbeat', () => {
         if (envConfig.chartbeatEnabled) {
           it('should have a script with src value set to chartbeat source', () => {
             cy.hasScriptWithChartbeatSrc();

cypress/e2e/pages/homePage/testsForCanonicalOnly.js

@@ -43,7 +43,7 @@ export default ({ service }) => {
     runAdsTests({ service });
   }
 
-  describe(`Chartbeat analytics`, { retries: 3 }, () => {
+  describe(`Chartbeat analytics`, () => {
     it('should have a script with src value set to chartbeat source', () => {
       cy.hasScriptWithChartbeatSrc();
     });

cypress/e2e/pages/liveRadio/tests.js

@@ -30,7 +30,7 @@ export default ({ service, pageType }) =>
       },
     );
 
-    describe('Chartbeat', { retries: 3 }, () => {
+    describe('Chartbeat', () => {
       if (envConfig.chartbeatEnabled) {
         it('should have a script with src value set to chartbeat source', () => {
           cy.hasScriptWithChartbeatSrc();

cypress/e2e/pages/mediaAssetPage/testsForCanonicalOnly.js

@@ -9,7 +9,7 @@ export const testsThatFollowSmokeTestConfigForCanonicalOnly = ({
 }) => {
   describe(`testsThatFollowSmokeTestConfigForCanonicalOnly for ${service} ${pageType}`, () => {
     if (appToggles.chartbeatAnalytics.enabled && envConfig.chartbeatEnabled) {
-      describe('Chartbeat', { retries: 3 }, () => {
+      describe('Chartbeat', () => {
         it('should have a script with correct src', () => {
           cy.hasScriptWithChartbeatSrc();
         });

cypress/e2e/pages/mostReadPage/testsForCanonicalOnly.js

@@ -2,7 +2,7 @@ import envConfig from '../../../support/config/envs';
 
 export default ({ service, pageType, variant }) => {
   describe(`testsForCanonicalOnly for ${service} ${pageType} ${variant}`, () => {
-    describe('Chartbeat', { retries: 3 }, () => {
+    describe('Chartbeat', () => {
       if (envConfig.chartbeatEnabled) {
         it('should have a script with src value set to chartbeat source', () => {
           cy.hasScriptWithChartbeatSrc();

cypress/e2e/pages/onDemandAudio/tests.js

@@ -104,7 +104,7 @@ export default ({ service, pageType, variant }) => {
         });
       });
     });
-    describe('Chartbeat', { retries: 3 }, () => {
+    describe('Chartbeat', () => {
       if (envConfig.chartbeatEnabled) {
         it('should have a script with src value set to chartbeat source', () => {
           cy.hasScriptWithChartbeatSrc();

cypress/e2e/pages/onDemandTV/tests.js

@@ -33,7 +33,7 @@ export default ({ service, pageType, variant }) => {
           });
         });
       },
-      describe('Chartbeat', { retries: 3 }, () => {
+      describe('Chartbeat', () => {
         if (envConfig.chartbeatEnabled) {
           it('should have a script with src value set to chartbeat source', () => {
             cy.hasScriptWithChartbeatSrc();

cypress/support/commands/analytics.js

@@ -15,14 +15,12 @@ Cypress.Commands.add('hasNoscriptImgAtiUrl', atiUrl => {
 
 // Should be moved into integration/pages/index.js once all pages have Chartbeat
 Cypress.Commands.add('hasScriptWithChartbeatSrc', () => {
-  cy.reload(true);
   cy.get(`script[src="//static.chartbeat.com/js/chartbeat.js"]`).should(
     'exist',
   );
 });
 
 // Should be moved into integration/pages/index.js once all pages have Chartbeat
 Cypress.Commands.add('hasGlobalChartbeatConfig', () => {
-  cy.reload(true);
   cy.window().should('have.property', '_sf_async_config');
 });

package.json

@@ -13,8 +13,7 @@
     "@optimizely/js-sdk-utils": "0.4.0",
     "uuid": "3.4.0",
     "[email protected]": "patch:winston@npm:3.8.2#.yarn/patches/winston-npm-3.8.2-2035e9cac4.patch",
-    "cookie": "0.7.1",
-    "react-is": "19.0.0"
+    "cookie": "0.7.1"
   },
   "workspaces": {
     "packages": [
@@ -121,8 +120,8 @@
     "morgan": "1.10.0",
     "polyfill-crypto.getrandomvalues": "1.0.0",
     "ramda": "0.30.1",
-    "react": "19.0.0",
-    "react-dom": "19.0.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-helmet": "6.1.0",
     "react-lazyload": "3.2.1",
     "react-router-config": "5.1.1",
@@ -186,8 +185,8 @@
     "@types/jsdom": "21.1.7",
     "@types/loadable__component": "5.13.9",
     "@types/ramda": "0.30.2",
-    "@types/react": "19.0.8",
-    "@types/react-dom": "19.0.3",
+    "@types/react": "18.3.3",
+    "@types/react-dom": "18.3.1",
     "@types/react-helmet": "6.1.11",
     "@types/react-lazyload": "^3.2.0",
     "@types/react-router-dom": "5.3.3",

scripts/bundleSize/bundleSizeConfig.js

@@ -7,5 +7,5 @@
  * We are allowing a variance of -5 on `MIN_SIZE` and +5 on `MAX_SIZE` to avoid the need for frequent changes, as bundle sizes can fluctuate
  */
 
-export const MIN_SIZE = 680 - 5;
-export const MAX_SIZE = 1207 + 5;
+export const MIN_SIZE = 640 - 5;
+export const MAX_SIZE = 1174 + 5;

src/app/components/ATIAnalytics/amp/types.d.ts

@@ -1,4 +1,4 @@
-declare namespace React.JSX {
+declare namespace JSX {
   /*
    * AMP currently doesn't have built-in types for TypeScript, but it's in their roadmap (https://github.com/ampproject/amphtml/issues/13791).
    * As a workaround you can manually create custom types (https://stackoverflow.com/a/50601125).

src/app/components/Ad/Amp/types.d.ts

@@ -1,4 +1,4 @@
-declare namespace React.JSX {
+declare namespace JSX {
   /*
    * AMP currently doesn't have built-in types for TypeScript, but it's in their roadmap (https://github.com/ampproject/amphtml/issues/13791).
    * As a workaround you can manually create custom types (https://stackoverflow.com/a/50601125).

src/app/components/AmpExperiment/types.d.ts

@@ -1,4 +1,4 @@
-declare namespace React.JSX {
+declare namespace JSX {
   interface IntrinsicElements {
     'amp-experiment': React.PropsWithChildren<
       ScriptHTMLAttributes<HTMLScriptElement>

src/app/components/AmpIframe/index.tsx

@@ -75,7 +75,7 @@ const AmpIframe = ({
               Show more
             </button>
           </div>
-          <amp-img layout="fill" src={image} placeholder="true" />
+          <amp-img layout="fill" src={image} placeholder />
         </AmpIframeElement>
       </GridItemMedium>
     </>

src/app/components/Billboard/index.tsx

@@ -1,6 +1,6 @@
 /** @jsx jsx */
 /* @jsxFrag React.Fragment */
-import { ForwardedRef, forwardRef } from 'react';
+import { forwardRef } from 'react';
 import { jsx } from '@emotion/react';
 import useViewTracker from '#app/hooks/useViewTracker';
 import useClickTrackerHandler from '#app/hooks/useClickTrackerHandler';
@@ -35,7 +35,7 @@ const Billboard = forwardRef(
       eventTrackingData,
       showLiveLabel,
     }: BillboardProps,
-    viewRef: ForwardedRef<HTMLDivElement>,
+    viewRef,
   ) => {
     const clickTrackerHandler = useClickTrackerHandler(eventTrackingData);
 

src/app/components/ChartbeatAnalytics/amp/types.d.ts

@@ -1,4 +1,4 @@
-declare namespace React.JSX {
+declare namespace JSX {
   /*
    * AMP currently doesn't have built-in types for TypeScript, but it's in their roadmap (https://github.com/ampproject/amphtml/issues/13791).
    * As a workaround you can manually create custom types (https://stackoverflow.com/a/50601125).

src/app/components/ChartbeatAnalytics/index.test.tsx

@@ -119,7 +119,7 @@ describe('Charbeats Analytics Container', () => {
       {
         chartbeatConfig: expectedConfig,
       },
-      undefined,
+      {},
     );
     expect(testUtils.getConfig).toHaveBeenCalledTimes(1);
     expect(container.firstChild).not.toBeNull();

src/app/components/Curation/CurationPromo/index.tsx

@@ -46,20 +46,13 @@ const CurationPromo = ({
 
   return (
     <Promo>
-      {imageUrl && (
-        <Promo.Image
-          src={imageUrl}
-          alt={imageAlt}
-          lazyLoad={lazy}
-          isAmp={isAmp}
-        >
-          {isMedia && (
-            <Promo.MediaIcon type={type}>
-              {showDuration ? mediaDuration : ''}
-            </Promo.MediaIcon>
-          )}
-        </Promo.Image>
-      )}
+      <Promo.Image src={imageUrl} alt={imageAlt} lazyLoad={lazy} isAmp={isAmp}>
+        {isMedia && (
+          <Promo.MediaIcon type={type}>
+            {showDuration ? mediaDuration : ''}
+          </Promo.MediaIcon>
+        )}
+      </Promo.Image>
       <Promo.Heading as={`h${headingLevel}`}>
         {isMedia ? (
           <Promo.A href={link} aria-labelledby={id}>

src/app/components/Curation/HierarchicalGrid/index.test.tsx

@@ -82,7 +82,7 @@ describe('Hierarchical Grid Curation', () => {
 
   it('should render the last published date', async () => {
     const { getByText } = render(
-      <HierarchicalGrid headingLevel={headingLevel} summaries={mediaFixture} />,
+      <HierarchicalGrid summaries={mediaFixture} />,
       {
         service: 'mundo',
       },
@@ -109,22 +109,16 @@ describe('Hierarchical Grid Curation', () => {
   });
 
   it('should display LiveLabel on a Live Promo', () => {
-    const container = render(
-      <HierarchicalGrid headingLevel={headingLevel} summaries={mediaFixture} />,
-      {
-        service: 'mundo',
-      },
-    );
+    const container = render(<HierarchicalGrid summaries={mediaFixture} />, {
+      service: 'mundo',
+    });
     expect(container.getByText('EN VIVO')).toBeInTheDocument();
   });
 
   it('should not display a timestamp on a Live Promo', () => {
-    const container = render(
-      <HierarchicalGrid headingLevel={headingLevel} summaries={liveFixtures} />,
-      {
-        service: 'mundo',
-      },
-    );
+    const container = render(<HierarchicalGrid summaries={liveFixtures} />, {
+      service: 'mundo',
+    });
     expect(container.queryByText('13 noviembre 2022')).not.toBeInTheDocument();
   });
 });

src/app/components/Curation/HierarchicalGrid/index.tsx

@@ -87,10 +87,10 @@ const HiearchicalGrid = ({
               <Promo>
                 <Promo.Image
                   useLargeImages={useLargeImages}
-                  src={promo.imageUrl || null}
+                  src={promo.imageUrl || ''}
                   alt={promo.imageAlt}
                   lazyLoad={lazyLoadImages}
-                  fetchPriority={fetchpriority}
+                  fetchpriority={fetchpriority}
                   isAmp={isAmp}
                 >
                   {isMedia && (
@@ -124,11 +124,9 @@ const HiearchicalGrid = ({
                     <Promo.A href={promo.link}>
                       {isLive ? (
                         <LiveLabel
-                          {...(isFirstPromo
-                            ? {
-                                className: 'first-promo',
-                              }
-                            : undefined)}
+                          {...(isFirstPromo && {
+                            className: 'first-promo',
+                          })}
                         >
                           {promo.title}
                         </LiveLabel>

src/app/components/EmbedConsentBanner/index.tsx

@@ -1,4 +1,4 @@
-import React, { useState, PropsWithChildren, type JSX } from 'react';
+import React, { useState, PropsWithChildren } from 'react';
 import ConsentBanner from './ConsentBanner';
 
 import { SocialEmbedProviders } from '../../models/types/global';

src/app/components/FrostedGlassPromo/types.ts

@@ -1,4 +1,3 @@
-import type { JSX } from 'react';
 import { EventTrackingBlock } from '../../models/types/eventTracking';
 
 export type ImageProps = {

src/app/components/Image/index.tsx

@@ -30,7 +30,7 @@ type Props = {
   sizes?: string;
   src: string;
   width?: number;
-  fetchPriority?: 'high';
+  fetchpriority?: 'high';
   hasCaption?: boolean;
 };
 
@@ -59,7 +59,7 @@ const Image = ({
   src,
   width,
   children,
-  fetchPriority,
+  fetchpriority,
   hasCaption,
 }: PropsWithChildren<Props>) => {
   const { pageType, isLite } = useContext(RequestContext);
@@ -109,8 +109,8 @@ const Image = ({
             rel="preload"
             as="image"
             href={src}
-            imageSrcSet={srcSet}
-            imageSizes={sizes}
+            imagesrcset={srcSet}
+            imagesizes={sizes}
           />
         </Helmet>
       )}
@@ -159,7 +159,7 @@ const Image = ({
               attribution={attribution}
               {...(srcSet && { srcSet: imgSrcSet })}
               {...(imgSizes && { sizes: imgSizes })}
-              {...(preload && { 'data-hero': 'true' })}
+              {...(preload && { 'data-hero': true })}
             />
           </>
         ) : (
@@ -190,7 +190,7 @@ const Image = ({
                   ? styles.imageFixedAspectRatio
                   : styles.imageResponsiveRatio,
               ]}
-              fetchPriority={fetchPriority}
+              fetchpriority={fetchpriority}
               style={{
                 aspectRatio: hasFixedAspectRatio
                   ? `${aspectRatioX} / ${aspectRatioY}`

src/app/components/Image/types.d.ts

@@ -1,4 +1,4 @@
-declare namespace React.JSX {
+declare namespace JSX {
   /*
    * AMP currently doesn't have built-in types for TypeScript, but it's in their roadmap (https://github.com/ampproject/amphtml/issues/13791).
    * As a workaround you can manually create custom types (https://stackoverflow.com/a/50601125).
@@ -15,14 +15,21 @@ declare namespace React.JSX {
     src?: string;
     srcSet?: string;
     width?: number;
-    placeholder?: string | boolean;
+    placeholder?: boolean;
+  }
+  /*
+   * Overrides type for link with missing imagesrcset and imagesizes attributes
+   */
+  interface LinkProps extends React.LinkHTMLAttributes<HTMLLinkElement> {
+    imagesrcset?: string;
+    imagesizes?: string;
   }
-
   interface ImageProps extends React.ImgHTMLAttributes<HTMLImageElement> {
-    fetchPriority?: string;
+    fetchpriority?: string;
   }
   interface IntrinsicElements {
     'amp-img': AmpImgProps;
+    link: LinkProps;
     img: ImageProps;
   }
 }