Bump the tools group with 6 updates

.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,6 +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/*"
@@ -78,9 +70,9 @@
     "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
-    "@storybook/addon-docs": "9.1.10",
-    "@storybook/addon-links": "^9.1.10",
-    "@storybook/react-vite": "^9.1.10",
+    "@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",
@@ -114,12 +106,12 @@
     "react-dom": "^19.2.0",
     "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.2",
-    "vite": "^7.1.11",
+    "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', () => {

src/components/content-presentation/do-and-dont-list/DoAndDontList.tsx

@@ -2,10 +2,12 @@
 
 import classNames from 'classnames';
 import { forwardRef, type ComponentPropsWithoutRef } from 'react';
-import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel.js';
+
 import { DoAndDontListContext, type DoAndDontListType } from './DoAndDontListContext.js';
 import { DoAndDontListItem } from './components/index.js';
 
+import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel.js';
+
 export interface DoAndDontListProps
   extends ComponentPropsWithoutRef<'div'>,
     Pick<HeadingLevelProps, 'headingLevel'> {

src/components/content-presentation/do-and-dont-list/__tests__/DoAndDontList.test.tsx

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

src/components/content-presentation/do-and-dont-list/components/DoAndDontListItem.tsx

@@ -1,6 +1,7 @@
 'use client';
 
 import { useContext, type ComponentPropsWithoutRef, type FC, type ReactNode } from 'react';
+
 import { CrossIcon, TickIcon } from '../../icons/index.js';
 import { DoAndDontListContext, type DoAndDontListType } from '../DoAndDontListContext.js';
 

src/components/content-presentation/hero/Hero.tsx

@@ -1,5 +1,6 @@
 import classNames from 'classnames';
 import { forwardRef, type ComponentPropsWithoutRef, type FC } from 'react';
+
 import { Col, Container, Row } from '#components/layout/index.js';
 import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel.js';
 

src/components/content-presentation/hero/__tests__/Hero.test.tsx

@@ -1,5 +1,6 @@
 import { render } from '@testing-library/react';
 import { createRef } from 'react';
+
 import { Hero } from '..';
 
 describe('Hero', () => {

src/components/content-presentation/icons/__tests__/Icons.test.tsx

@@ -1,4 +1,5 @@
 import { render } from '@testing-library/react';
+
 import * as Icons from '..';
 
 describe('Icons', () => {

src/components/content-presentation/icons/individual/ArrowLeftIcon.tsx

@@ -1,4 +1,5 @@
 import { type FC } from 'react';
+
 import { Icon, type IconProps } from '../Icon.js';
 
 export const ArrowLeftIcon: FC<IconProps> = (props) => (

src/components/content-presentation/icons/individual/ArrowRightCircleIcon.tsx

@@ -1,4 +1,5 @@
 import { type FC } from 'react';
+
 import { Icon, type IconProps } from '../Icon.js';
 
 export const ArrowRightCircleIcon: FC<IconProps> = (props) => (

src/components/content-presentation/icons/individual/ArrowRightIcon.tsx

@@ -1,4 +1,5 @@
 import { type FC } from 'react';
+
 import { Icon, type IconProps } from '../Icon.js';
 
 export const ArrowRightIcon: FC<IconProps> = (props) => (

src/components/content-presentation/icons/individual/ChevronRightCircleIcon.tsx

@@ -1,4 +1,5 @@
 import { type FC } from 'react';
+
 import { Icon, type IconProps } from '../Icon.js';
 
 export const ChevronRightCircleIcon: FC<IconProps> = (props) => (

src/components/content-presentation/icons/individual/CrossIcon.tsx

@@ -1,4 +1,5 @@
 import { type FC } from 'react';
+
 import { Icon, type IconProps } from '../Icon.js';
 
 export const CrossIcon: FC<IconProps> = (props) => (

src/components/content-presentation/icons/individual/SearchIcon.tsx

@@ -1,4 +1,5 @@
 import { type FC } from 'react';
+
 import { Icon, type IconProps } from '../Icon.js';
 
 export const SearchIcon: FC<IconProps> = (props) => (

src/components/content-presentation/icons/individual/TickIcon.tsx

@@ -1,4 +1,5 @@
 import { type FC } from 'react';
+
 import { Icon, type IconProps } from '../Icon.js';
 
 export const TickIcon: FC<IconProps> = (props) => (

src/components/content-presentation/icons/individual/UserIcon.tsx

@@ -1,4 +1,5 @@
 import { type FC } from 'react';
+
 import { Icon, type IconProps } from '../Icon.js';
 
 export const UserIcon: FC<IconProps> = (props) => (

src/components/content-presentation/images/__tests__/Images.test.tsx

@@ -1,5 +1,6 @@
 import { render } from '@testing-library/react';
 import { createRef } from 'react';
+
 import { Images } from '..';
 
 describe('Images', () => {

src/components/content-presentation/inset-text/__tests__/InsetText.test.tsx

@@ -1,5 +1,6 @@
 import { render } from '@testing-library/react';
 import { createRef } from 'react';
+
 import { InsetText } from '..';
 
 describe('InsetText', () => {

src/components/content-presentation/notification-banner/NotificationBanner.tsx

@@ -1,5 +1,7 @@
 'use client';
 
+import classNames from 'classnames';
+import { type NotificationBanner as NotificationBannerModule } from 'nhsuk-frontend';
 import {
   Children,
   forwardRef,
@@ -9,13 +11,13 @@ import {
   useState,
   type ComponentPropsWithoutRef,
 } from 'react';
-import classNames from 'classnames';
+
 import {
   NotificationBannerHeading,
   NotificationBannerLink,
   NotificationBannerTitle,
 } from './components/index.js';
-import { type NotificationBanner as NotificationBannerModule } from 'nhsuk-frontend';
+
 import { childIsOfComponentType } from '#util/types/TypeGuards.js';
 
 export interface NotificationBannerProps extends ComponentPropsWithoutRef<'div'> {

src/components/content-presentation/notification-banner/__tests__/NotificationBanner.test.tsx

@@ -1,7 +1,8 @@
-import { renderClient, renderServer } from '#util/components';
-import { NotificationBanner } from '#components/content-presentation/notification-banner';
 import { createRef } from 'react';
+
+import { NotificationBanner } from '#components/content-presentation/notification-banner';
 import { NotificationBannerLink } from '#components/content-presentation/notification-banner/components';
+import { renderClient, renderServer } from '#util/components';
 
 describe('NotificationBanner', () => {
   it('matches snapshot', async () => {

src/components/content-presentation/notification-banner/components/NotificationBannerHeading.tsx

@@ -1,8 +1,9 @@
 'use client';
 
-import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel.js';
 import type { FC } from 'react';
 
+import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel.js';
+
 export type NotificationBannerHeadingProps = HeadingLevelProps;
 
 export const NotificationBannerHeading: FC<NotificationBannerHeadingProps> = ({

src/components/content-presentation/notification-banner/components/NotificationBannerLink.tsx

@@ -1,6 +1,7 @@
-import type { AsElementLink } from '#util/types/index.js';
-import { forwardRef } from 'react';
 import classNames from 'classnames';
+import { forwardRef } from 'react';
+
+import type { AsElementLink } from '#util/types/index.js';
 
 export type NotificationBannerLinkProps = AsElementLink<HTMLAnchorElement>;
 

src/components/content-presentation/notification-banner/components/NotificationBannerTitle.tsx

@@ -1,6 +1,7 @@
-import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel.js';
 import type { FC } from 'react';
 
+import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel.js';
+
 export interface NotificationBannerTitleProps extends HeadingLevelProps {
   success?: boolean;
 }

src/components/content-presentation/panel/Panel.tsx

@@ -1,8 +1,10 @@
 import classNames from 'classnames';
 import { Children, forwardRef, type ComponentPropsWithoutRef } from 'react';
-import { childIsOfComponentType } from '#util/types/TypeGuards.js';
+
 import { PanelTitle } from './components/index.js';
 
+import { childIsOfComponentType } from '#util/types/TypeGuards.js';
+
 export type PanelProps = ComponentPropsWithoutRef<'div'>;
 
 const PanelComponent = forwardRef<HTMLDivElement, PanelProps>(

src/components/content-presentation/panel/__tests__/Panel.test.tsx

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

src/components/content-presentation/panel/components/PanelTitle.tsx

@@ -1,4 +1,5 @@
 import { type FC } from 'react';
+
 import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel.js';
 
 export type PanelTitleProps = HeadingLevelProps;

src/components/content-presentation/summary-list/__tests__/SummaryList.test.tsx

@@ -1,5 +1,6 @@
 import { render } from '@testing-library/react';
 import { createRef } from 'react';
+
 import { SummaryList } from '..';
 
 describe('SummaryList', () => {

src/components/content-presentation/table/Table.tsx

@@ -8,6 +8,8 @@ import {
   type ComponentPropsWithoutRef,
   type ReactNode,
 } from 'react';
+
+import { TableContext, type ITableContext } from './TableContext.js';
 import {
   TableBody,
   TableCaption,
@@ -18,7 +20,6 @@ import {
   TableRow,
   type TableCaptionProps,
 } from './components/index.js';
-import { TableContext, type ITableContext } from './TableContext.js';
 
 export interface TableProps extends ComponentPropsWithoutRef<'table'> {
   firstCellIsHeader?: boolean;

src/components/content-presentation/table/TableHelpers.ts

@@ -1,5 +1,7 @@
 import { Children, type ReactElement, type ReactNode } from 'react';
+
 import { TableCell, type TableCellProps } from './components/TableCell.js';
+
 import { childIsOfComponentType } from '#util/types/TypeGuards.js';
 
 export const isTableCell = (

src/components/content-presentation/table/components/TableBody.tsx

@@ -2,6 +2,7 @@
 
 import classNames from 'classnames';
 import { type ComponentPropsWithoutRef, type FC } from 'react';
+
 import { TableSection, TableSectionContext } from '../TableSectionContext.js';
 
 export type TableBodyProps = ComponentPropsWithoutRef<'tbody'>;