Merge pull request #13570 from guardian/improve-dev

Fix url regex and optimise clipboard on dev server

Author: DanielCliftonGuardian

dotcom-rendering/src/server/dev-index.html

@@ -647,9 +647,14 @@ <h2>Test Articles By Element (Missing)</h2>
 			const getPageType = (url) => {
 				// All interactive pages include this in the URL
 				if (url.includes('/ng-interactive/')) return 'Interactive';
-				// We're looking for the date string, e.g /2022/jul/30
-				else if (url.match(/[0-9]{4}\/[a-z]{3}\/[0-9]{2}\/.+/))
+				else if (
+					url.match(/\/\d{4}\/[a-z]{3}\/\d{2}\//) || // Standard article date format e.g /2022/jul/30
+					url.match(/\/[a-z-]+\/\d+$/) // Crossword format e.g /crosswords/quick/17117
+				)
 					return 'Article';
+				// This is imperfect, but covers some cases of tag pages, consider expanding in the future
+				else if (url.match(/\/(tone|series|profile)\/[a-z-]+/))
+					return 'TagPage';
 				// Fall back to fronts for all other page types
 				else return 'Front';
 			};

dotcom-rendering/src/server/server.dev.ts

@@ -22,7 +22,9 @@ import {
 } from './handler.front.web';
 
 /** article URLs contain a part that looks like “2022/nov/25” */
-const ARTICLE_URL = /\/\d{4}\/[a-z]{3}\/\d{2}\//;
+const ARTICLE_URL = /(\/\d{4}\/[a-z]{3}\/\d{2}\/)/;
+/** Crossword URLs end with e.g /crosswords/quick/17117 */
+const CROSSWORD_URL = /(\/[a-z-]+\/\d+$)/;
 /** fronts are a series of lowercase strings, dashes and forward slashes */
 const FRONT_URL = /^\/[a-z-/]+(?<!\.css)$/;
 /** This is imperfect, but covers *some* cases of tag pages, consider expanding in the future */
@@ -98,7 +100,10 @@ export const devServer = (): Handler => {
 				// Do not redirect assets urls
 				if (req.url.match(ASSETS_URL)) return next();
 
-				if (req.url.match(ARTICLE_URL)) {
+				if (
+					req.url.match(ARTICLE_URL) ??
+					req.url.match(CROSSWORD_URL)
+				) {
 					const url = new URL(
 						req.url,
 						'https://www.theguardian.com/',