Merge pull request #14159 from guardian/ravi/express-5.1

arelra · web-flow · commit 29dbd64ee39d · 2025-07-08T10:23:20.000+01:00
Express 5.1
diff --git a/apps-rendering/package.json b/apps-rendering/package.json
@@ -63,8 +63,8 @@
 		"@storybook/react-webpack5": "8.6.14",
 		"@storybook/theming": "8.6.14",
 		"@types/clean-css": "4.2.11",
-		"@types/compression": "1.7.5",
-		"@types/express": "4.17.21",
+		"@types/compression": "1.8.1",
+		"@types/express": "5.0.1",
 		"@types/html-webpack-plugin": "3.2.9",
 		"@types/jest": "29.5.14",
 		"@types/jsdom": "16.2.15",
@@ -79,13 +79,13 @@
 		"buffer": "6.0.3",
 		"clean-css": "5.3.3",
 		"compare-versions": "6.1.0",
-		"compression": "1.7.4",
+		"compression": "1.8.0",
 		"constructs": "10.4.2",
 		"core-js": "3.33.3",
 		"eslint": "8.56.0",
 		"eslint-plugin-jsx-a11y": "6.7.1",
 		"eslint-plugin-react": "7.33.2",
-		"express": "4.21.2",
+		"express": "5.1.0",
 		"html-webpack-plugin": "5.6.3",
 		"jest": "29.7.0",
 		"jest-environment-jsdom": "29.7.0",
diff --git a/apps-rendering/src/server/server.ts b/apps-rendering/src/server/server.ts
@@ -396,7 +396,7 @@ app.use('/assets', express.static(path.resolve(__dirname, '../assets')));
 app.use('/assets', express.static(path.resolve(__dirname, '../dist/assets')));
 app.use(compression());
 
-app.all('*', (request, response, next) => {
+app.all('/{*splat}', (request, response, next) => {
 	const start = Date.now();
 
 	response.once('finish', () => {
@@ -409,22 +409,29 @@ app.all('*', (request, response, next) => {
 	next();
 });
 
-app.get('/healthcheck', (_req, res) => res.send('Ok'));
+app.get('/healthcheck', (_req, res) => {
+	res.status(200).send('Ok');
+});
 
-app.get('/favicon.ico', (_, res) => res.status(404).end());
-app.get('/fontSize.css', (_, res) => res.status(404).end());
+app.get('/favicon.ico', (_, res) => {
+	res.sendStatus(404);
+});
+
+app.get('/fontSize.css', (_, res) => {
+	res.sendStatus(404);
+});
 
 /**
 To enable testing in the mobile device emulators,
 this route handler adds compatability with DCR's route for apps articles.
 The DCR route follows the pattern:
-/AppsArticle/https://www.theguardian.com/cities/2019/sep/13/reclaimed-lakes-and-giant-airports-how-mexico-city-might-have-looked
+AppsArticle/https://www.theguardian.com/food/2020/mar/15/easter-taste-test-dan-lepard-hot-cross-bun-milk-dark-chocolate-mini-eggs-bunny-sloth
 */
 app.get(
-	'/AppsArticle/*',
+	'/AppsArticle/*url',
 	express.raw(),
 	(req, res, next) => {
-		const contentWebUrl = req.params[0];
+		const contentWebUrl = req.originalUrl.split('/').slice(2).join('/');
 		const articleId = new URL(contentWebUrl).pathname;
 		req.params = {
 			0: articleId,
@@ -436,16 +443,13 @@ app.get(
 );
 
 app.get(
-	'/:edition(uk|us|au|europe|international)?/rendered-items/*',
-	express.raw(),
-	serveArticleGet,
-);
-app.get(
-	'/:edition(uk|us|au|europe|international)?/*',
+	['/:edition/rendered-items/*path', '/rendered-items/*path'],
 	express.raw(),
 	serveArticleGet,
 );
 
+app.get(['/:edition/*path', '/*path'], express.raw(), serveArticleGet);
+
 app.post('/article', express.raw(), serveArticlePost);
 
 app.post('/editions-article', express.raw(), serveEditionsArticlePost);
diff --git a/dotcom-rendering/package.json b/dotcom-rendering/package.json
@@ -73,7 +73,7 @@
 		"@types/compression": "1.7.5",
 		"@types/connect": "3.4.38",
 		"@types/dompurify": "3.0.2",
-		"@types/express": "4.17.21",
+		"@types/express": "5.0.1",
 		"@types/he": "1.2.0",
 		"@types/html-minifier-terser": "7.0.2",
 		"@types/jest": "29.5.14",
@@ -130,7 +130,7 @@
 		"eslint-plugin-unicorn": "48.0.1",
 		"eslint-stats": "1.0.1",
 		"execa": "5.1.1",
-		"express": "4.21.2",
+		"express": "5.1.0",
 		"find": "0.3.0",
 		"he": "1.2.0",
 		"html-minifier-terser": "7.2.0",
diff --git a/dotcom-rendering/src/server/server.dev.ts b/dotcom-rendering/src/server/server.dev.ts
@@ -96,25 +96,25 @@ const renderer = Router();
 // populates req.body with the content data from a production
 // URL if req.params.url is present
 renderer.use(getContentFromURLMiddleware);
-renderer.get('/Article/*', handleArticle);
-renderer.get('/ArticleJson/*', handleArticleJson);
-renderer.get('/AMPArticle/*', handleAMPArticle);
-renderer.get('/Interactive/*', handleInteractive);
-renderer.get('/AMPInteractive/*', handleAMPArticle);
-renderer.get('/Blocks/*', handleBlocks);
-renderer.get('/Front/*', handleFront);
-renderer.get('/FrontJSON/*', handleFrontJson);
-renderer.get('/TagPage/*', handleTagPage);
-renderer.get('/TagPageJSON/*', handleTagPageJson);
-renderer.get('/EmailNewsletters/*', handleAllEditorialNewslettersPage);
-renderer.get('/AppsArticle/*', handleAppsArticle);
-renderer.get('/AppsInteractive/*', handleAppsInteractive);
-renderer.get('/AppsBlocks/*', handleAppsBlocks);
-renderer.get('/EditionsCrossword/*', handleEditionsCrossword);
-renderer.get('/FootballMatchListPage/*', handleFootballMatchListPage);
-renderer.get('/FootballTablesPage/*', handleFootballTablesPage);
-renderer.get('/CricketMatchPage/*', handleCricketMatchPage);
-renderer.get('/FootballMatchSummaryPage/*', handleFootballMatchPage);
+renderer.get('/Article/*url', handleArticle);
+renderer.get('/ArticleJson/*url', handleArticleJson);
+renderer.get('/AMPArticle/*url', handleAMPArticle);
+renderer.get('/Interactive/*url', handleInteractive);
+renderer.get('/AMPInteractive/*url', handleAMPArticle);
+renderer.get('/Blocks/*url', handleBlocks);
+renderer.get('/Front/*url', handleFront);
+renderer.get('/FrontJSON/*url', handleFrontJson);
+renderer.get('/TagPage/*url', handleTagPage);
+renderer.get('/TagPageJSON/*url', handleTagPageJson);
+renderer.get('/EmailNewsletters/*url', handleAllEditorialNewslettersPage);
+renderer.get('/AppsArticle/*url', handleAppsArticle);
+renderer.get('/AppsInteractive/*url', handleAppsInteractive);
+renderer.get('/AppsBlocks/*url', handleAppsBlocks);
+renderer.get('/EditionsCrossword/*url', handleEditionsCrossword);
+renderer.get('/FootballMatchListPage/*url', handleFootballMatchListPage);
+renderer.get('/FootballTablesPage/*url', handleFootballTablesPage);
+renderer.get('/CricketMatchPage/*url', handleCricketMatchPage);
+renderer.get('/FootballMatchSummaryPage/*url', handleFootballMatchPage);
 // POST routes for running frontend locally
 renderer.post('/Article', handleArticle);
 renderer.post('/ArticleJson', handleArticleJson);
diff --git a/dotcom-rendering/src/server/server.prod.ts b/dotcom-rendering/src/server/server.prod.ts
@@ -99,41 +99,41 @@ export const prodServer = (): void => {
 
 	// These GET's are for checking any given URL directly from PROD
 	app.get(
-		'/Article/*',
+		'/Article/*url',
 		logRenderTime,
 		getContentFromURLMiddleware,
 		handleArticle,
 	);
-	app.use('/ArticleJson/*', handleArticleJson);
+	app.use('/ArticleJson/*url', handleArticleJson);
 
 	app.get(
-		'/AMPArticle/*',
+		'/AMPArticle/*url',
 		logRenderTime,
 		getContentFromURLMiddleware,
 		handleAMPArticle,
 	);
 
 	app.get(
-		'/Front/*',
+		'/Front/*url',
 		logRenderTime,
 		getContentFromURLMiddleware,
 		handleFront,
 	);
 	app.get(
-		'/FrontJSON/*',
+		'/FrontJSON/*url',
 		logRenderTime,
 		getContentFromURLMiddleware,
 		handleFrontJson,
 	);
 
 	app.get(
-		'/TagPage/*',
+		'/TagPage/*url',
 		logRenderTime,
 		getContentFromURLMiddleware,
 		handleTagPage,
 	);
 	app.get(
-		'/TagPageJSON/*',
+		'/TagPageJSON/*url',
 		logRenderTime,
 		getContentFromURLMiddleware,
 		handleTagPageJson,
@@ -147,14 +147,14 @@ export const prodServer = (): void => {
 	);
 
 	app.get(
-		'/AppsArticle/*',
+		'/AppsArticle/*url',
 		logRenderTime,
 		getContentFromURLMiddleware,
 		handleAppsArticle,
 	);
 
 	app.get(
-		'/AppsInteractive/*',
+		'/AppsInteractive/*url',
 		logRenderTime,
 		getContentFromURLMiddleware,
 		handleAppsInteractive,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
