fix: merge conflicts, hds cookie shim Refs: PL-240

Author: mikkojamG

README.md

@@ -36,6 +36,12 @@ Launches Vitest test runner.<br>
 ### `pnpm test:e2e`
 Launches [Playwright](playwright.config.js) test runner and performs browser tests. 
 
+### `pnpm fix-hds-shim`
+
+Workaround for a packaging issue in `hds-core@6.x`: generates a missing `cookieConsent.js` file that `hds-react` expects but the package does not ship.
+This is run automatically by `pnpm dev` and `pnpm build`. Run it manually if you encounter a `MODULE_NOT_FOUND` error for `hds-core/lib/components/cookie-consent/cookieConsent` after installing dependencies.
+Can be removed once HDS publishes a fixed release.
+
 ## How to use
 For development: 
 - Make sure packages are installed by running `pnpm install` in project root.

package.json

@@ -64,10 +64,10 @@
     "vitest": "^4.1.0"
   },
   "scripts": {
-    "build": "rm -rf dist && pnpm update-runtime-env && pnpm build:client && pnpm build:server",
+    "build": "rm -rf dist && pnpm fix-hds-shim && pnpm update-runtime-env && pnpm build:client && pnpm build:server",
     "build:client": "vite build --outDir dist/client --ssrManifest",
     "build:server": "vite build --ssr server/server-entry.js --outDir dist/server",
-    "dev": "pnpm update-runtime-env && node server.mjs",
+    "dev": "pnpm fix-hds-shim && pnpm update-runtime-env && node server.mjs",
     "lint": "eslint src/ server/ server.mjs --ext .js,.jsx,.mjs && prettier src/ server/ server.mjs --check",
     "lint:fix": "eslint src/ server/ server.mjs --ext .js,.jsx,.mjs --fix && prettier src/ server/ server.mjs --write",
     "preview": "NODE_ENV=production node server.mjs",
@@ -76,7 +76,8 @@
     "test:coverage": "pnpm test --coverage",
     "test:e2e:install": "playwright install",
     "test:e2e": "playwright test",
-    "update-runtime-env": "esrun scripts/update-runtime-env.js"
+    "update-runtime-env": "esrun scripts/update-runtime-env.js",
+    "fix-hds-shim": "node scripts/fix-hds-core-cookie-consent.js"
   },
   "browserslist": [
     ">0.2%",

scripts/fix-hds-core-cookie-consent.js

@@ -0,0 +1,51 @@
+/* eslint-disable no-console */
+import fs from 'fs';
+import path from 'path';
+
+const targetDir = path.join(
+  process.cwd(),
+  'node_modules',
+  'hds-core',
+  'lib',
+  'components',
+  'cookie-consent'
+);
+
+const targetFile = path.join(targetDir, 'cookieConsent.js');
+const cssFile = path.join(targetDir, 'cookieConsent.css');
+
+if (!fs.existsSync(targetDir)) {
+  console.error(
+    '[fix-hds-core-cookie-consent] Failed: hds-core cookie-consent directory not found.'
+  );
+  process.exit(1);
+}
+if (!fs.existsSync(cssFile)) {
+  console.error(
+    '[fix-hds-core-cookie-consent] Failed: cookieConsent.css not found; cannot create shim.'
+  );
+  process.exit(1);
+}
+
+const cssContent = fs.readFileSync(cssFile, 'utf8');
+const shimContent = `'use strict';\n\nconst css = ${JSON.stringify(cssContent)};\n\nmodule.exports = { __esModule: true, default: css };\n`;
+
+if (!fs.existsSync(targetFile)) {
+  fs.writeFileSync(targetFile, shimContent, 'utf8');
+  console.log(
+    '[fix-hds-core-cookie-consent] Created cookieConsent.js shim for hds-react compatibility.'
+  );
+} else {
+  const currentContent = fs.readFileSync(targetFile, 'utf8');
+
+  if (currentContent !== shimContent) {
+    fs.writeFileSync(targetFile, shimContent, 'utf8');
+    console.log(
+      '[fix-hds-core-cookie-consent] Updated cookieConsent.js shim for hds-react compatibility.'
+    );
+  } else {
+    console.log(
+      '[fix-hds-core-cookie-consent] cookieConsent.js shim already up to date.'
+    );
+  }
+}

server.mjs

@@ -119,7 +119,10 @@ const normalizeHeadMarkup = (headMarkup) => {
   if (titleTags.length <= 1) return headMarkup;
 
   const lastTitleTag = titleTags[titleTags.length - 1][0];
-  const markupWithoutTitles = headMarkup.replace(/<title[\s\S]*?<\/title>\s*/gi, '');
+  const markupWithoutTitles = headMarkup.replace(
+    /<title[\s\S]*?<\/title>\s*/gi,
+    ''
+  );
   return `${lastTitleTag}\n${markupWithoutTitles}`;
 };
 
@@ -369,7 +372,12 @@ const createServer = async () => {
       const cspHeaders = generateCSPHeaders(nonce);
 
       const entry = await getEntry();
-      const { render, getRequestFullUrl, parseInitialMapPositionFromHostname, ogImage } = entry;
+      const {
+        render,
+        getRequestFullUrl,
+        parseInitialMapPositionFromHostname,
+        ogImage,
+      } = entry;
 
       let template;
       if (isProd) {
@@ -395,8 +403,13 @@ const createServer = async () => {
         initialMapPosition: parseInitialMapPositionFromHostname(req, Sentry),
       };
 
-      const { html: rawHtml, helmet, emotionCss } = await render(req.url, { store, nonce, locale });
-      const { headMarkup: reactHeadMarkup, appMarkup } = extractHeadMarkupFromReactDom(rawHtml);
+      const {
+        html: rawHtml,
+        helmet,
+        emotionCss,
+      } = await render(req.url, { store, nonce, locale });
+      const { headMarkup: reactHeadMarkup, appMarkup } =
+        extractHeadMarkupFromReactDom(rawHtml);
       // React 19 hoists head tags into render output; fall back to Helmet context for older behaviour.
       const helmetHeadMarkup = helmet
         ? `${helmet.title.toString()}${helmet.meta.toString()}`

src/store.js

@@ -1,5 +1,5 @@
 import { applyMiddleware, createStore } from 'redux';
-import thunk from 'redux-thunk';
+import { thunk } from 'redux-thunk';
 
 import rootReducer from './redux/rootReducer';
 

vite.config.js

@@ -19,10 +19,11 @@ export default defineConfig(({ isSsrBuild }) => ({
     }),
     // Fix CJS/ESM interop for packages that use lazy-getter or module.exports patterns
     // that don't survive Vite's SSR externalization (named ESM imports would fail at runtime).
+    // Note: react-helmet-async and redux-thunk both ship proper ESM via their exports map
+    // and must NOT be listed here — cjsInterop would emit `import default` which has no
+    // default export in their ESM entries.
     cjsInterop({
       dependencies: [
-        'react-helmet-async',
-        'redux-thunk',
         '@mui/styled-engine',
       ],
     }),