Skip to content

sendReact takes node not component #14292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JamieB-gu merged 1 commit into from
Jul 29, 2025
Merged

sendReact takes node not component #14292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...om-rendering/src/devServer/routers/amp.ts → ...m-rendering/src/devServer/routers/amp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />));
amp.get('/article', sendReact('Article', <Article />));
amp.get('/interactive', sendReact('Interactive', <Interactive />));

export { amp };
30 changes: 18 additions & 12 deletions ...rendering/src/devServer/routers/dotcom.ts → ...endering/src/devServer/routers/dotcom.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />));
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(
'/football-fixtures',
sendReact('Football Fixtures', FootballFixtures),
sendReact('Football Fixtures', <FootballFixtures />),
);
dotcom.get(
'/football-results',
sendReact('Football Results', <FootballResults />),
);
dotcom.get(
'/football-tables',
sendReact('Football Tables', <FootballTables />),
);
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', <FootballMatchSummary />),
);
dotcom.get(
'/cricket-scorecard',
sendReact('Cricket Scorecard', CricketScorecard),
sendReact('Cricket Scorecard', <CricketScorecard />),
);

export { dotcom };
4 changes: 2 additions & 2 deletions ...ring/src/devServer/routers/editionsApp.ts → ...ing/src/devServer/routers/editionsApp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import { sendReact } from '../send';

const editionsApp = express.Router();

editionsApp.get('/', sendReact('Editions App', EditionsApp));
editionsApp.get('/', sendReact('Editions App', <EditionsApp />));
editionsApp.get(
'/crosswords',
sendReact('Editions Crosswords', EditionsCrosswords),
sendReact('Editions Crosswords', <EditionsCrosswords />),
);

export { editionsApp };
6 changes: 3 additions & 3 deletions ...ndering/src/devServer/routers/liveApps.ts → ...dering/src/devServer/routers/liveApps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />));
liveApps.get('/article', sendReact('Article', <Article />));
liveApps.get('/interactive', sendReact('Interactive', <Interactive />));

export { liveApps };
29 changes: 16 additions & 13 deletions ...-rendering/src/devServer/routers/pages.ts → ...rendering/src/devServer/routers/pages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />));
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(
'/editions-crosswords',
sendReact('Editions Crosswords', EditionsCrosswords),
sendReact('Editions Crosswords', <EditionsCrosswords />),
);
pages.get('/football-live', sendReact('Football Live', FootballLive));
pages.get('/football-live', sendReact('Football Live', <FootballLive />));
pages.get(
'/football-fixtures',
sendReact('Football Fixtures', FootballFixtures),
sendReact('Football Fixtures', <FootballFixtures />),
);
pages.get('/football-results', sendReact('Football Results', FootballResults));
pages.get('/football-tables', sendReact('Football Tables', FootballTables));
pages.get(
'/football-results',
sendReact('Football Results', <FootballResults />),
);
pages.get('/football-tables', sendReact('Football Tables', <FootballTables />));
pages.get(
'/football-match-summary',
sendReact('Football Match Summary', FootballMatchSummary),
sendReact('Football Match Summary', <FootballMatchSummary />),
);
pages.get(
'/cricket-scorecard',
sendReact('Cricket Scorecard', CricketScorecard),
sendReact('Cricket Scorecard', <CricketScorecard />),
);

export { pages };
2 changes: 1 addition & 1 deletion ...endering/src/devServer/routers/targets.ts → ...ndering/src/devServer/routers/targets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { liveApps } from './liveApps';

const targets = Router();

targets.get('/', sendReact('Targets', Targets));
targets.get('/', sendReact('Targets', <Targets />));
targets.use('/dotcom', dotcom);
targets.use('/live-apps', liveApps);
targets.use('/editions-app', editionsApp);
Expand Down
10 changes: 5 additions & 5 deletions dotcom-rendering/src/devServer/send.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = (
<Doc title={title} path={path.join(req.baseUrl, req.path, '/')}>
<Component />
{node}
</Doc>
);

Expand All @@ -20,3 +19,4 @@ export const sendReact =
},
});
};
}