diff --git a/dotcom-rendering/src/devServer/routers/amp.ts b/dotcom-rendering/src/devServer/routers/amp.tsx similarity index 59% rename from dotcom-rendering/src/devServer/routers/amp.ts rename to dotcom-rendering/src/devServer/routers/amp.tsx index f6b138097ad..d758988f172 100644 --- a/dotcom-rendering/src/devServer/routers/amp.ts +++ b/dotcom-rendering/src/devServer/routers/amp.tsx @@ -6,8 +6,8 @@ import { sendReact } from '../send'; const amp = express.Router(); -amp.get('/', sendReact('AMP', Amp)); -amp.get('/article', sendReact('Article', Article)); -amp.get('/interactive', sendReact('Interactive', Interactive)); +amp.get('/', sendReact('AMP', )); +amp.get('/article', sendReact('Article',
)); +amp.get('/interactive', sendReact('Interactive', )); export { amp }; diff --git a/dotcom-rendering/src/devServer/routers/dotcom.ts b/dotcom-rendering/src/devServer/routers/dotcom.tsx similarity index 52% rename from dotcom-rendering/src/devServer/routers/dotcom.ts rename to dotcom-rendering/src/devServer/routers/dotcom.tsx index 9df26080233..04ecb6b3d91 100644 --- a/dotcom-rendering/src/devServer/routers/dotcom.ts +++ b/dotcom-rendering/src/devServer/routers/dotcom.tsx @@ -15,26 +15,32 @@ import { sendReact } from '../send'; const dotcom = Router(); -dotcom.get('/', sendReact('Dotcom', Dotcom)); -dotcom.get('/article', sendReact('Article', Article)); -dotcom.get('/front', sendReact('Front', Front)); -dotcom.get('/tag-page', sendReact('Tag Page', TagPage)); -dotcom.get('/interactive', sendReact('Interactive', Interactive)); -dotcom.get('/newsletters', sendReact('All Newsletters', Newsletters)); -dotcom.get('/football-live', sendReact('Football Live', FootballLive)); +dotcom.get('/', sendReact('Dotcom', )); +dotcom.get('/article', sendReact('Article',
)); +dotcom.get('/front', sendReact('Front', )); +dotcom.get('/tag-page', sendReact('Tag Page', )); +dotcom.get('/interactive', sendReact('Interactive', )); +dotcom.get('/newsletters', sendReact('All Newsletters', )); +dotcom.get('/football-live', sendReact('Football Live', )); dotcom.get( '/football-fixtures', - sendReact('Football Fixtures', FootballFixtures), + sendReact('Football Fixtures', ), +); +dotcom.get( + '/football-results', + sendReact('Football Results', ), +); +dotcom.get( + '/football-tables', + sendReact('Football Tables', ), ); -dotcom.get('/football-results', sendReact('Football Results', FootballResults)); -dotcom.get('/football-tables', sendReact('Football Tables', FootballTables)); dotcom.get( '/football-match-summary', - sendReact('Football Match Summary', FootballMatchSummary), + sendReact('Football Match Summary', ), ); dotcom.get( '/cricket-scorecard', - sendReact('Cricket Scorecard', CricketScorecard), + sendReact('Cricket Scorecard', ), ); export { dotcom }; diff --git a/dotcom-rendering/src/devServer/routers/editionsApp.ts b/dotcom-rendering/src/devServer/routers/editionsApp.tsx similarity index 69% rename from dotcom-rendering/src/devServer/routers/editionsApp.ts rename to dotcom-rendering/src/devServer/routers/editionsApp.tsx index 20fc162921c..8cd201c929c 100644 --- a/dotcom-rendering/src/devServer/routers/editionsApp.ts +++ b/dotcom-rendering/src/devServer/routers/editionsApp.tsx @@ -5,10 +5,10 @@ import { sendReact } from '../send'; const editionsApp = express.Router(); -editionsApp.get('/', sendReact('Editions App', EditionsApp)); +editionsApp.get('/', sendReact('Editions App', )); editionsApp.get( '/crosswords', - sendReact('Editions Crosswords', EditionsCrosswords), + sendReact('Editions Crosswords', ), ); export { editionsApp }; diff --git a/dotcom-rendering/src/devServer/routers/liveApps.ts b/dotcom-rendering/src/devServer/routers/liveApps.tsx similarity index 58% rename from dotcom-rendering/src/devServer/routers/liveApps.ts rename to dotcom-rendering/src/devServer/routers/liveApps.tsx index ab77d7d434b..a52f339c5e7 100644 --- a/dotcom-rendering/src/devServer/routers/liveApps.ts +++ b/dotcom-rendering/src/devServer/routers/liveApps.tsx @@ -6,8 +6,8 @@ import { sendReact } from '../send'; const liveApps = express.Router(); -liveApps.get('/', sendReact('Live Apps', LiveApps)); -liveApps.get('/article', sendReact('Article', Article)); -liveApps.get('/interactive', sendReact('Interactive', Interactive)); +liveApps.get('/', sendReact('Live Apps', )); +liveApps.get('/article', sendReact('Article',
)); +liveApps.get('/interactive', sendReact('Interactive', )); export { liveApps }; diff --git a/dotcom-rendering/src/devServer/routers/pages.ts b/dotcom-rendering/src/devServer/routers/pages.tsx similarity index 53% rename from dotcom-rendering/src/devServer/routers/pages.ts rename to dotcom-rendering/src/devServer/routers/pages.tsx index 7f5304a126e..f4fb6c6a0da 100644 --- a/dotcom-rendering/src/devServer/routers/pages.ts +++ b/dotcom-rendering/src/devServer/routers/pages.tsx @@ -16,30 +16,33 @@ import { sendReact } from '../send'; const pages = Router(); -pages.get('/', sendReact('Pages', Pages)); -pages.get('/article', sendReact('Article', Article)); -pages.get('/front', sendReact('Front', Front)); -pages.get('/tag-page', sendReact('Tag Page', TagPage)); -pages.get('/interactive', sendReact('Interactive', Interactive)); -pages.get('/newsletters', sendReact('All Newsletters', Newsletters)); +pages.get('/', sendReact('Pages', )); +pages.get('/article', sendReact('Article',
)); +pages.get('/front', sendReact('Front', )); +pages.get('/tag-page', sendReact('Tag Page', )); +pages.get('/interactive', sendReact('Interactive', )); +pages.get('/newsletters', sendReact('All Newsletters', )); pages.get( '/editions-crosswords', - sendReact('Editions Crosswords', EditionsCrosswords), + sendReact('Editions Crosswords', ), ); -pages.get('/football-live', sendReact('Football Live', FootballLive)); +pages.get('/football-live', sendReact('Football Live', )); pages.get( '/football-fixtures', - sendReact('Football Fixtures', FootballFixtures), + sendReact('Football Fixtures', ), ); -pages.get('/football-results', sendReact('Football Results', FootballResults)); -pages.get('/football-tables', sendReact('Football Tables', FootballTables)); +pages.get( + '/football-results', + sendReact('Football Results', ), +); +pages.get('/football-tables', sendReact('Football Tables', )); pages.get( '/football-match-summary', - sendReact('Football Match Summary', FootballMatchSummary), + sendReact('Football Match Summary', ), ); pages.get( '/cricket-scorecard', - sendReact('Cricket Scorecard', CricketScorecard), + sendReact('Cricket Scorecard', ), ); export { pages }; diff --git a/dotcom-rendering/src/devServer/routers/targets.ts b/dotcom-rendering/src/devServer/routers/targets.tsx similarity index 89% rename from dotcom-rendering/src/devServer/routers/targets.ts rename to dotcom-rendering/src/devServer/routers/targets.tsx index a245e969957..7ce85f00ab6 100644 --- a/dotcom-rendering/src/devServer/routers/targets.ts +++ b/dotcom-rendering/src/devServer/routers/targets.tsx @@ -8,7 +8,7 @@ import { liveApps } from './liveApps'; const targets = Router(); -targets.get('/', sendReact('Targets', Targets)); +targets.get('/', sendReact('Targets', )); targets.use('/dotcom', dotcom); targets.use('/live-apps', liveApps); targets.use('/editions-app', editionsApp); diff --git a/dotcom-rendering/src/devServer/send.tsx b/dotcom-rendering/src/devServer/send.tsx index a9010a869ba..e3fbcac07f3 100644 --- a/dotcom-rendering/src/devServer/send.tsx +++ b/dotcom-rendering/src/devServer/send.tsx @@ -1,15 +1,14 @@ import path from 'node:path'; import type { RequestHandler } from 'express'; -import type { FunctionComponent } from 'react'; +import type { ReactNode } from 'react'; import { renderToPipeableStream } from 'react-dom/server'; import { Doc } from './docs/doc'; -export const sendReact = - (title: string, Component: FunctionComponent): RequestHandler => - (req, res) => { +export function sendReact(title: string, node: ReactNode): RequestHandler { + return (req, res) => { const element = ( - + {node} ); @@ -20,3 +19,4 @@ export const sendReact = }, }); }; +}