Skip to content

Commit b2eae7d

Browse files
Bump the tools group with 6 updates (#299)
* Bump the tools group with 6 updates Bumps the tools group with 6 updates: | Package | From | To | | --- | --- | --- | | [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/code/addons/docs) | `9.1.10` | `10.0.2` | | [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/code/addons/links) | `9.1.10` | `10.0.2` | | [@storybook/react-vite](https://github.com/storybookjs/storybook/tree/HEAD/code/frameworks/react-vite) | `9.1.10` | `10.0.2` | | [sass-embedded](https://github.com/sass/embedded-host-node) | `1.93.2` | `1.93.3` | | [storybook](https://github.com/storybookjs/storybook/tree/HEAD/code/core) | `9.1.10` | `10.0.2` | | [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) | `7.1.11` | `7.1.12` | Updates `@storybook/addon-docs` from 9.1.10 to 10.0.2 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v10.0.2/code/addons/docs) Updates `@storybook/addon-links` from 9.1.10 to 10.0.2 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v10.0.2/code/addons/links) Updates `@storybook/react-vite` from 9.1.10 to 10.0.2 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v10.0.2/code/frameworks/react-vite) Updates `sass-embedded` from 1.93.2 to 1.93.3 - [Changelog](https://github.com/sass/embedded-host-node/blob/main/CHANGELOG.md) - [Commits](sass/embedded-host-node@1.93.2...1.93.3) Updates `storybook` from 9.1.10 to 10.0.2 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v10.0.2/code/core) Updates `vite` from 7.1.11 to 7.1.12 - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v7.1.12/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v7.1.12/packages/vite) --- updated-dependencies: - dependency-name: "@storybook/addon-docs" dependency-version: 10.0.2 dependency-type: direct:development update-type: version-update:semver-major dependency-group: tools - dependency-name: "@storybook/addon-links" dependency-version: 10.0.2 dependency-type: direct:development update-type: version-update:semver-major dependency-group: tools - dependency-name: "@storybook/react-vite" dependency-version: 10.0.2 dependency-type: direct:development update-type: version-update:semver-major dependency-group: tools - dependency-name: sass-embedded dependency-version: 1.93.3 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: tools - dependency-name: storybook dependency-version: 10.0.2 dependency-type: direct:development update-type: version-update:semver-major dependency-group: tools - dependency-name: vite dependency-version: 7.1.12 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: tools ... Signed-off-by: dependabot[bot] <[email protected]> * Fix resolutions * Fix source map relative paths to sources * Use ES modules for Storybook * Sync ESLint rules with NHS.UK frontend * ESLint fix --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Colin Rotherham <[email protected]>
1 parent 3bce6fd commit b2eae7d

File tree

176 files changed

+533
-438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+533
-438
lines changed

.storybook/manager.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { addons } from 'storybook/manager-api';
2-
import nhsTheme from './theme';
31
import { startCase, upperFirst } from 'lodash';
2+
import { addons } from 'storybook/manager-api';
3+
4+
import nhsTheme from './theme.js';
45

56
const sentenceCase = (name = '') => {
67
if (!name || typeof name !== 'string') {

.storybook/theme.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { create } from 'storybook/theming/create';
2+
23
import packageJson from '../package.json' with { type: 'json' };
34

45
export default create({

.yarnrc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ packageExtensions:
1313
storybook@*:
1414
peerDependencies:
1515
"@testing-library/dom": "*"
16+
react: "*"
17+
react-dom: "*"
1618
vite@*:
1719
peerDependencies:
1820
rollup: "*"

eslint.config.js

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import { join } from 'node:path';
2+
3+
import { includeIgnoreFile } from '@eslint/compat';
4+
import eslint from '@eslint/js';
5+
import { defineConfig, globalIgnores } from 'eslint/config';
26
import configPrettier from 'eslint-config-prettier/flat';
7+
import pluginImport from 'eslint-plugin-import';
8+
import pluginJsxA11y from 'eslint-plugin-jsx-a11y';
39
import pluginReact from 'eslint-plugin-react';
410
import pluginReactHooks from 'eslint-plugin-react-hooks';
5-
import eslint from '@eslint/js';
6-
import pluginJsxA11y from 'eslint-plugin-jsx-a11y';
7-
import { includeIgnoreFile } from '@eslint/compat';
8-
import { defineConfig, globalIgnores } from 'eslint/config';
911
import globals from 'globals';
10-
import pluginImport from 'eslint-plugin-import';
1112
import pluginTypeScript from 'typescript-eslint';
1213

1314
const rootPath = import.meta.dirname;
@@ -44,8 +45,23 @@ export default defineConfig([
4445
'import/no-unresolved': 'off',
4546
'import/no-unused-modules': 'off',
4647

48+
// Always import Node.js packages from `node:*`
49+
'import/enforce-node-protocol-usage': ['error', 'always'],
50+
51+
// Check import or require statements are A-Z ordered
52+
'import/order': [
53+
'error',
54+
{
55+
'alphabetize': { order: 'asc' },
56+
'newlines-between': 'always',
57+
},
58+
],
59+
4760
// Prefer rules that are type aware
61+
'no-redeclare': 'off',
62+
'no-undef': 'off',
4863
'no-unused-vars': 'off',
64+
'@typescript-eslint/no-redeclare': 'error',
4965
'@typescript-eslint/no-unused-vars': [
5066
'error',
5167
{

package.json

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,10 @@
1212
"import": "./dist/esm/components/*",
1313
"require": "./dist/cjs/components/*"
1414
},
15-
"#components": {
16-
"import": "./dist/esm/components/index.js",
17-
"require": "./dist/cjs/components/index.cjs"
18-
},
1915
"#patterns/*": {
2016
"import": "./dist/esm/patterns/*",
2117
"require": "./dist/cjs/patterns/*"
2218
},
23-
"#patterns": {
24-
"import": "./dist/esm/patterns/index.js",
25-
"require": "./dist/cjs/patterns/index.cjs"
26-
},
2719
"#util/*": {
2820
"import": "./dist/esm/util/*",
2921
"require": "./dist/cjs/util/*"
@@ -78,9 +70,9 @@
7870
"@rollup/plugin-commonjs": "^29.0.0",
7971
"@rollup/plugin-node-resolve": "^16.0.3",
8072
"@rollup/plugin-typescript": "^12.3.0",
81-
"@storybook/addon-docs": "9.1.10",
82-
"@storybook/addon-links": "^9.1.10",
83-
"@storybook/react-vite": "^9.1.10",
73+
"@storybook/addon-docs": "10.0.3",
74+
"@storybook/addon-links": "^10.0.3",
75+
"@storybook/react-vite": "^10.0.3",
8476
"@testing-library/dom": "^10.4.1",
8577
"@testing-library/jest-dom": "^6.9.1",
8678
"@testing-library/react": "^16.3.0",
@@ -114,12 +106,12 @@
114106
"react-dom": "^19.2.0",
115107
"rollup": "^4.52.5",
116108
"rollup-preserve-directives": "^1.1.3",
117-
"sass-embedded": "^1.93.2",
118-
"storybook": "^9.1.10",
109+
"sass-embedded": "^1.93.3",
110+
"storybook": "^10.0.3",
119111
"tslib": "^2.8.1",
120112
"typescript": "^5.9.3",
121113
"typescript-eslint": "^8.46.2",
122-
"vite": "^7.1.11",
114+
"vite": "^7.1.12",
123115
"vite-tsconfig-paths": "^5.1.4"
124116
},
125117
"peerDependencies": {

rollup.config.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
import { join } from 'node:path';
1+
import { dirname, join, relative, resolve } from 'node:path';
2+
23
import { DEFAULT_EXTENSIONS as extensions } from '@babel/core';
34
import { babel } from '@rollup/plugin-babel';
45
import commonjs from '@rollup/plugin-commonjs';
56
import { nodeResolve } from '@rollup/plugin-node-resolve';
67
import typescript from '@rollup/plugin-typescript';
7-
import preserveDirectives from 'rollup-preserve-directives';
88
import { defineConfig } from 'rollup';
9+
import preserveDirectives from 'rollup-preserve-directives';
10+
911
import packageJson from './package.json' with { type: 'json' };
1012
import tsBuildConfig from './tsconfig.build.json' with { type: 'json' };
1113

@@ -38,6 +40,12 @@ export default defineConfig(
3840
preserveModulesRoot: 'src',
3941
sourcemap: true,
4042
sourcemapExcludeSources: true,
43+
44+
// Fix source map relative paths to sources
45+
sourcemapPathTransform: (relativeSourcePath, sourcemapPath) => {
46+
const sourcePath = resolve(sourcemapPath, relativeSourcePath);
47+
return relative(dirname(sourcemapPath), sourcePath);
48+
},
4149
},
4250
],
4351
external: ['react/jsx-runtime', ...external],

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { render } from '@testing-library/react';
22
import { createRef } from 'react';
3+
34
import { Details } from '..';
5+
46
import { renderClient, renderServer } from '#util/components';
57

68
describe('Details', () => {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
import classNames from 'classnames';
44
import { forwardRef, type ComponentPropsWithoutRef } from 'react';
5-
import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel.js';
5+
66
import { DoAndDontListContext, type DoAndDontListType } from './DoAndDontListContext.js';
77
import { DoAndDontListItem } from './components/index.js';
88

9+
import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel.js';
10+
911
export interface DoAndDontListProps
1012
extends ComponentPropsWithoutRef<'div'>,
1113
Pick<HeadingLevelProps, 'headingLevel'> {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { render } from '@testing-library/react';
22
import { createRef } from 'react';
3+
34
import { DoAndDontList } from '..';
5+
46
import { renderClient, renderServer } from '#util/components';
57

68
describe('DoAndDontList', () => {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use client';
22

33
import { useContext, type ComponentPropsWithoutRef, type FC, type ReactNode } from 'react';
4+
45
import { CrossIcon, TickIcon } from '../../icons/index.js';
56
import { DoAndDontListContext, type DoAndDontListType } from '../DoAndDontListContext.js';
67

0 commit comments

Comments
 (0)