Merge branch 'main' into patch-1

Author: colinrotherham

.github/dependabot.yml

@@ -13,6 +13,7 @@ updates:
           - '@rollup/*'
           - '@types/react'
           - '@types/react-*'
+          - 'caniuse-lite'
           - 'classnames'
           - 'nhsuk-frontend'
           - 'react'

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
         run: corepack enable
 
       - name: Set up Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           cache: yarn
           node-version-file: .nvmrc

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
         run: corepack enable
 
       - name: Set up Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           cache: yarn
           node-version-file: .nvmrc

.storybook/manager.ts

@@ -1,6 +1,7 @@
-import { addons } from 'storybook/manager-api';
-import nhsTheme from './theme';
 import { startCase, upperFirst } from 'lodash';
+import { addons } from 'storybook/manager-api';
+
+import nhsTheme from './theme.js';
 
 const sentenceCase = (name = '') => {
   if (!name || typeof name !== 'string') {

.storybook/theme.ts

@@ -1,4 +1,5 @@
 import { create } from 'storybook/theming/create';
+
 import packageJson from '../package.json' with { type: 'json' };
 
 export default create({

.yarnrc.yml

@@ -13,3 +13,8 @@ packageExtensions:
   storybook@*:
     peerDependencies:
       "@testing-library/dom": "*"
+      react: "*"
+      react-dom: "*"
+  vite@*:
+    peerDependencies:
+      rollup: "*"

eslint.config.js

@@ -1,13 +1,14 @@
 import { join } from 'node:path';
+
+import { includeIgnoreFile } from '@eslint/compat';
+import eslint from '@eslint/js';
+import { defineConfig, globalIgnores } from 'eslint/config';
 import configPrettier from 'eslint-config-prettier/flat';
+import pluginImport from 'eslint-plugin-import';
+import pluginJsxA11y from 'eslint-plugin-jsx-a11y';
 import pluginReact from 'eslint-plugin-react';
 import pluginReactHooks from 'eslint-plugin-react-hooks';
-import eslint from '@eslint/js';
-import pluginJsxA11y from 'eslint-plugin-jsx-a11y';
-import { includeIgnoreFile } from '@eslint/compat';
-import { defineConfig, globalIgnores } from 'eslint/config';
 import globals from 'globals';
-import pluginImport from 'eslint-plugin-import';
 import pluginTypeScript from 'typescript-eslint';
 
 const rootPath = import.meta.dirname;
@@ -44,8 +45,23 @@ export default defineConfig([
       'import/no-unresolved': 'off',
       'import/no-unused-modules': 'off',
 
+      // Always import Node.js packages from `node:*`
+      'import/enforce-node-protocol-usage': ['error', 'always'],
+
+      // Check import or require statements are A-Z ordered
+      'import/order': [
+        'error',
+        {
+          'alphabetize': { order: 'asc' },
+          'newlines-between': 'always',
+        },
+      ],
+
       // Prefer rules that are type aware
+      'no-redeclare': 'off',
+      'no-undef': 'off',
       'no-unused-vars': 'off',
+      '@typescript-eslint/no-redeclare': 'error',
       '@typescript-eslint/no-unused-vars': [
         'error',
         {

package.json

@@ -12,18 +12,10 @@
       "import": "./dist/esm/components/*",
       "require": "./dist/cjs/components/*"
     },
-    "#components": {
-      "import": "./dist/esm/components/index.js",
-      "require": "./dist/cjs/components/index.cjs"
-    },
     "#patterns/*": {
       "import": "./dist/esm/patterns/*",
       "require": "./dist/cjs/patterns/*"
     },
-    "#patterns": {
-      "import": "./dist/esm/patterns/index.js",
-      "require": "./dist/cjs/patterns/index.cjs"
-    },
     "#util/*": {
       "import": "./dist/esm/util/*",
       "require": "./dist/cjs/util/*"
@@ -68,41 +60,41 @@
     "prepublishOnly": "yarn storybook --smoke-test"
   },
   "devDependencies": {
-    "@babel/core": "^7.28.4",
-    "@babel/preset-env": "^7.28.3",
-    "@babel/preset-react": "^7.27.1",
-    "@babel/preset-typescript": "^7.27.1",
-    "@eslint/compat": "^1.4.0",
-    "@eslint/js": "^9.37.0",
+    "@babel/core": "^7.28.5",
+    "@babel/preset-env": "^7.28.5",
+    "@babel/preset-react": "^7.28.5",
+    "@babel/preset-typescript": "^7.28.5",
+    "@eslint/compat": "^1.4.1",
+    "@eslint/js": "^9.39.0",
     "@rollup/plugin-babel": "^6.1.0",
-    "@rollup/plugin-commonjs": "^28.0.6",
+    "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
-    "@rollup/plugin-typescript": "^12.1.4",
-    "@storybook/addon-docs": "9.1.10",
-    "@storybook/addon-links": "^9.1.10",
-    "@storybook/react-vite": "^9.1.10",
+    "@rollup/plugin-typescript": "^12.3.0",
+    "@storybook/addon-docs": "10.0.3",
+    "@storybook/addon-links": "^10.0.3",
+    "@storybook/react-vite": "^10.0.3",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.0",
     "@types/eslint": "^9.6.1",
     "@types/jest": "^30.0.0",
     "@types/jest-axe": "^3.5.9",
     "@types/lodash": "^4.17.20",
-    "@types/node": "^24.7.2",
+    "@types/node": "^24.10.0",
     "@types/react": "^19.2.2",
     "@types/react-dom": "^19.2.2",
     "babel-jest": "^30.2.0",
     "babel-plugin-module-resolver": "^5.0.2",
     "babel-plugin-replace-import-extension": "^1.1.5",
     "classnames": "^2.5.1",
-    "eslint": "^9.37.0",
+    "eslint": "^9.39.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-react": "^7.37.5",
-    "eslint-plugin-react-hooks": "^7.0.0",
-    "globals": "^16.4.0",
+    "eslint-plugin-react-hooks": "^7.0.1",
+    "globals": "^16.5.0",
     "jest": "^30.2.0",
     "jest-axe": "^10.0.0",
     "jest-environment-jsdom": "^30.2.0",
@@ -112,14 +104,14 @@
     "prettier": "^3.6.2",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
-    "rollup": "^4.52.4",
+    "rollup": "^4.52.5",
     "rollup-preserve-directives": "^1.1.3",
-    "sass-embedded": "^1.93.2",
-    "storybook": "^9.1.10",
+    "sass-embedded": "^1.93.3",
+    "storybook": "^10.0.3",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.46.1",
-    "vite": "^7.1.11",
+    "typescript-eslint": "^8.46.2",
+    "vite": "^7.1.12",
     "vite-tsconfig-paths": "^5.1.4"
   },
   "peerDependencies": {

rollup.config.js

@@ -1,11 +1,13 @@
-import { join } from 'node:path';
+import { dirname, join, relative, resolve } from 'node:path';
+
 import { DEFAULT_EXTENSIONS as extensions } from '@babel/core';
 import { babel } from '@rollup/plugin-babel';
 import commonjs from '@rollup/plugin-commonjs';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import typescript from '@rollup/plugin-typescript';
-import preserveDirectives from 'rollup-preserve-directives';
 import { defineConfig } from 'rollup';
+import preserveDirectives from 'rollup-preserve-directives';
+
 import packageJson from './package.json' with { type: 'json' };
 import tsBuildConfig from './tsconfig.build.json' with { type: 'json' };
 
@@ -38,6 +40,12 @@ export default defineConfig(
           preserveModulesRoot: 'src',
           sourcemap: true,
           sourcemapExcludeSources: true,
+
+          // Fix source map relative paths to sources
+          sourcemapPathTransform: (relativeSourcePath, sourcemapPath) => {
+            const sourcePath = resolve(sourcemapPath, relativeSourcePath);
+            return relative(dirname(sourcemapPath), sourcePath);
+          },
         },
       ],
       external: ['react/jsx-runtime', ...external],

src/components/content-presentation/details/__tests__/Details.test.tsx

@@ -1,6 +1,8 @@
 import { render } from '@testing-library/react';
 import { createRef } from 'react';
+
 import { Details } from '..';
+
 import { renderClient, renderServer } from '#util/components';
 
 describe('Details', () => {