Skip to content

Commit 98cbe4f

Browse files
Replace NHS.UK frontend CommonJS workarounds
1 parent 919a3b6 commit 98cbe4f

File tree

12 files changed

+11
-977
lines changed

12 files changed

+11
-977
lines changed

bundle-base.tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
"@navigation/*": ["src/components/navigation/*"],
2424
"@typography/*": ["src/components/typography/*"],
2525
"@util/*": ["src/util/*"],
26-
"@patterns/*": ["src/patterns/*"],
27-
"@resources/*": ["src/resources/*"]
26+
"@patterns/*": ["src/patterns/*"]
2827
}
2928
},
3029
"include": ["src"],

src/components/content-presentation/tabs/Tabs.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
import classNames from 'classnames';
33
import React, { FC, HTMLAttributes, useEffect } from 'react';
44
import HeadingLevel, { HeadingLevelType } from '@components/utils/HeadingLevel';
5-
import TabsJs from '@resources/tabs';
5+
// @ts-expect-error -- No types available
6+
import TabsJs from 'nhsuk-frontend/packages/components/tabs/tabs';
67

78
type TabsProps = HTMLAttributes<HTMLDivElement>;
89

src/components/form-elements/character-count/CharacterCount.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use client';
22
import React, { FC, useEffect } from 'react';
3-
import CharacterCountJs from '@resources/character-count';
3+
// @ts-expect-error -- No types available
4+
import CharacterCountJs from 'nhsuk-frontend/packages/components/character-count/character-count';
45
import { HTMLAttributesWithData } from '@util/types/NHSUKTypes';
56

67
export enum CharacterCountType {

src/components/form-elements/checkboxes/Checkboxes.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import CheckboxContext, { ICheckboxContext } from './CheckboxContext';
88
import Box from './components/Box';
99
import Divider from './components/Divider';
1010
import { generateRandomName } from '@util/RandomID';
11-
import CheckboxJs from '@resources/checkboxes';
11+
// @ts-expect-error -- No types available
12+
import CheckboxesJs from 'nhsuk-frontend/packages/components/checkboxes/checkboxes';
1213

1314
interface CheckboxesProps extends HTMLProps<HTMLDivElement>, FormElementProps {
1415
idPrefix?: string;

src/components/navigation/header/Header.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import NavDropdownMenu from './components/NavDropdownMenu';
1111
import { Container } from '@components/layout';
1212
import Content from './components/Content';
1313
import TransactionalServiceName from './components/TransactionalServiceName';
14-
import HeaderJs from '@resources/header';
14+
// @ts-expect-error -- No types available
15+
import HeaderJs from 'nhsuk-frontend/packages/components/header/header';
1516

1617
const BaseHeaderLogo: FC<OrganisationalLogoProps & NHSLogoNavProps> = (props) => {
1718
const { orgName } = useContext<IHeaderContext>(HeaderContext);

src/components/navigation/header/__tests__/__snapshots__/Header.test.tsx.snap

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ exports[`The header component Matches the snapshot 1`] = `
174174
>
175175
<button
176176
aria-expanded="false"
177-
class="nhsuk-header__menu-toggle nhsuk-header__navigation-link"
177+
class="nhsuk-header__menu-toggle nhsuk-header__navigation-link "
178178
>
179179
<span
180180
class="nhsuk-u-visually-hidden"
@@ -195,9 +195,6 @@ exports[`The header component Matches the snapshot 1`] = `
195195
/>
196196
</svg>
197197
</button>
198-
<ul
199-
class="nhsuk-header__drop-down nhsuk-header__drop-down--hidden"
200-
/>
201198
</li>
202199
</ul>
203200
</nav>

src/resources/character-count.js

Lines changed: 0 additions & 262 deletions
This file was deleted.

0 commit comments

Comments
 (0)