Bump the lint group with 5 updates (#364)

* Bump the lint group with 5 updates

Bumps the lint group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [@eslint/compat](https://github.com/eslint/rewrite/tree/HEAD/packages/compat) | `2.0.3` | `2.0.5` |
| [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `24.12.0` | `24.12.2` |
| [globals](https://github.com/sindresorhus/globals) | `17.4.0` | `17.5.0` |
| [prettier](https://github.com/prettier/prettier) | `3.8.1` | `3.8.3` |
| [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) | `8.58.0` | `8.58.2` |

Updates `@eslint/compat` from 2.0.3 to 2.0.5
- [Release notes](https://github.com/eslint/rewrite/releases)
- [Changelog](https://github.com/eslint/rewrite/blob/main/packages/compat/CHANGELOG.md)
- [Commits](https://github.com/eslint/rewrite/commits/compat-v2.0.5/packages/compat)

Updates `@types/node` from 24.12.0 to 24.12.2
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `globals` from 17.4.0 to 17.5.0
- [Release notes](https://github.com/sindresorhus/globals/releases)
- [Commits](sindresorhus/globals@v17.4.0...v17.5.0)

Updates `prettier` from 3.8.1 to 3.8.3
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.8.1...3.8.3)

Updates `typescript-eslint` from 8.58.0 to 8.58.2
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.58.2/packages/typescript-eslint)

---
updated-dependencies:
- dependency-name: "@eslint/compat"
  dependency-version: 2.0.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: lint
- dependency-name: "@types/node"
  dependency-version: 24.12.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: lint
- dependency-name: globals
  dependency-version: 17.5.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: lint
- dependency-name: prettier
  dependency-version: 3.8.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: lint
- dependency-name: typescript-eslint
  dependency-version: 8.58.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: lint
...

Signed-off-by: dependabot[bot] <support@github.com>

* Configure Prettier to sort imports

* Run `npm run lint:prettier:fix`

* Migrate to `eslint-plugin-node-import`

* Update Dependabot config

* Remove ESLint import plugin

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Colin Rotherham <work@colinr.com>

Author: dependabot[bot]

.github/dependabot.yml

@@ -25,6 +25,7 @@ updates:
       lint:
         patterns:
           - '@eslint/*'
+          - '@trivago/prettier-plugin-*'
           - '@types/*'
           - 'eslint'
           - 'eslint-*'

.prettierrc

@@ -1,4 +1,8 @@
 {
+  "importOrder": ["<BUILTIN_MODULES>", "<THIRD_PARTY_MODULES>", "^#(.*)$", "^[./]"],
+  "importOrderSeparation": true,
+  "importOrderSortSpecifiers": true,
+  "plugins": ["@trivago/prettier-plugin-sort-imports"],
   "printWidth": 100,
   "quoteProps": "consistent",
   "semi": true,

.storybook/main.ts

@@ -1,6 +1,6 @@
 import { type StorybookConfig } from '@storybook/react-vite';
 import preserveDirectives from 'rollup-preserve-directives';
-import { mergeConfig, type InlineConfig } from 'vite';
+import { type InlineConfig, mergeConfig } from 'vite';
 import tsConfigPaths from 'vite-tsconfig-paths';
 
 const config: StorybookConfig = {

.storybook/preview.tsx

@@ -1,8 +1,9 @@
-import './storybook.scss';
 import { type Preview } from '@storybook/react-vite';
 
 import { Col, Container, Row } from '#components/layout/index.js';
 
+import './storybook.scss';
+
 const preview: Preview = {
   decorators: (Story, { parameters }) =>
     parameters.width === false ? (

eslint.config.js

@@ -2,12 +2,12 @@ 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 pluginNodeImport from 'eslint-plugin-node-import';
 import pluginReact from 'eslint-plugin-react';
 import pluginReactHooks from 'eslint-plugin-react-hooks';
+import { defineConfig, globalIgnores } from 'eslint/config';
 import globals from 'globals';
 import pluginTypeScript from 'typescript-eslint';
 
@@ -19,9 +19,8 @@ export default defineConfig([
     files: ['**/*.{js,mjs,ts,tsx}'],
     extends: [
       eslint.configs.recommended,
-      pluginImport.flatConfigs.recommended,
-      pluginImport.flatConfigs.typescript,
       pluginTypeScript.configs.recommended,
+      pluginNodeImport.configs['flat/recommended'],
       configPrettier,
     ],
     languageOptions: {
@@ -33,30 +32,6 @@ export default defineConfig([
       },
     },
     rules: {
-      // Turn off rules that are handled by TypeScript
-      // https://typescript-eslint.io/troubleshooting/typed-linting/performance/#eslint-plugin-import
-      'import/default': 'off',
-      'import/named': 'off',
-      'import/namespace': 'off',
-      'import/no-cycle': 'off',
-      'import/no-deprecated': 'off',
-      'import/no-named-as-default': 'off',
-      'import/no-named-as-default-member': 'off',
-      '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',
@@ -71,12 +46,6 @@ export default defineConfig([
         },
       ],
     },
-    settings: {
-      'import/resolver': {
-        node: true,
-        typescript: true,
-      },
-    },
   },
   {
     files: ['**/*.{ts,tsx}'],

package.json

@@ -68,7 +68,7 @@
     "@babel/preset-env": "^7.29.2",
     "@babel/preset-react": "^7.28.5",
     "@babel/preset-typescript": "^7.28.5",
-    "@eslint/compat": "^2.0.3",
+    "@eslint/compat": "^2.0.5",
     "@eslint/js": "^9.39.4",
     "@rollup/plugin-babel": "^7.0.0",
     "@rollup/plugin-commonjs": "^29.0.2",
@@ -80,11 +80,12 @@
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",
+    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "@types/eslint": "^9.6.1",
     "@types/eslint-plugin-jsx-a11y": "^6.10.1",
     "@types/jest": "^30.0.0",
     "@types/jest-axe": "^3.5.9",
-    "@types/node": "^24.12.0",
+    "@types/node": "^24.12.2",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "babel-jest": "^30.3.0",
@@ -94,17 +95,17 @@
     "eslint": "^9.39.4",
     "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-node-import": "^1.2.0",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.0.1",
-    "globals": "^17.3.0",
+    "globals": "^17.5.0",
     "jest": "^30.3.0",
     "jest-axe": "^10.0.0",
     "jest-environment-jsdom": "^30.3.0",
     "nhsuk-frontend": "^10.3.1",
     "outdent": "^0.8.0",
-    "prettier": "^3.8.0",
+    "prettier": "^3.8.3",
     "react": "^19.2.5",
     "react-dom": "^19.2.5",
     "rollup": "^4.60.0",
@@ -113,7 +114,7 @@
     "storybook": "^10.2.14",
     "tslib": "^2.8.1",
     "typescript": "^6.0.2",
-    "typescript-eslint": "^8.58.0",
+    "typescript-eslint": "^8.58.2",
     "vite": "^7.3.2",
     "vite-tsconfig-paths": "^6.1.1"
   },

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

@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import { forwardRef, type ComponentPropsWithoutRef, type FC } from 'react';
+import { type ComponentPropsWithoutRef, type FC, forwardRef } from 'react';
 
 export interface DetailsProps extends ComponentPropsWithoutRef<'details'> {
   expander?: boolean;

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

@@ -1,10 +1,10 @@
 import { render } from '@testing-library/react';
 import { createRef } from 'react';
 
-import { Details } from '..';
-
 import { renderClient, renderServer } from '#util/components';
 
+import { Details } from '..';
+
 describe('Details', () => {
   it('matches snapshot', async () => {
     const { container } = await renderClient(<Details />, {

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

@@ -1,13 +1,13 @@
 'use client';
 
 import classNames from 'classnames';
-import { forwardRef, type ComponentPropsWithoutRef } from 'react';
+import { type ComponentPropsWithoutRef, forwardRef } from 'react';
+
+import { Heading, type HeadingProps } from '#components/typography/Heading.js';
 
 import { DoAndDontListContext, type DoAndDontListType } from './DoAndDontListContext.js';
 import { DoAndDontListItem } from './components/index.js';
 
-import { Heading, type HeadingProps } from '#components/typography/Heading.js';
-
 export interface DoAndDontListProps
   extends ComponentPropsWithoutRef<'div'>, Pick<HeadingProps, 'headingLevel'> {
   listType: DoAndDontListType;

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

@@ -1,10 +1,10 @@
 import { render } from '@testing-library/react';
 import { createRef } from 'react';
 
-import { DoAndDontList } from '..';
-
 import { renderClient, renderServer } from '#util/components';
 
+import { DoAndDontList } from '..';
+
 describe('DoAndDontList', () => {
   describe('list type "do"', () => {
     it('matches snapshot', async () => {