Skip to content

Commit 112517c

Browse files
Merge pull request #1545 from nhsuk/dependabot/npm_and_yarn/build-ea47a8fa3a
Bump the build group with 6 updates
2 parents e65cb3d + d0c6424 commit 112517c

File tree

16 files changed

+577
-333
lines changed

16 files changed

+577
-333
lines changed

.github/workflows/pull-request.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ jobs:
153153
# Run existing "Sass" workflow
154154
# (after build has been cached)
155155
uses: ./.github/workflows/sass.yml
156-
secrets: inherit
157156

158157
regression:
159158
name: Visual regression tests

package-lock.json

Lines changed: 254 additions & 246 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"test:visual:cli": "concurrently \"npm start --workspace @nhsuk/frontend-review\" \"wait-on --config wait-on.config.js && backstop --color --config backstop.config.js {@}\" --kill-others --passthrough-arguments --prefix none --success first"
5454
},
5555
"devDependencies": {
56-
"@babel/core": "^7.28.0",
56+
"@babel/core": "^7.28.3",
5757
"@nhsuk/frontend-config": "*",
5858
"@nhsuk/frontend-helpers": "*",
5959
"@nhsuk/frontend-lib": "*",

packages/nhsuk-frontend/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@
5252
"start": "npm run watch"
5353
},
5454
"devDependencies": {
55-
"@babel/preset-env": "^7.28.0",
55+
"@babel/preset-env": "^7.28.3",
5656
"@nhsuk/frontend-config": "*",
5757
"@nhsuk/frontend-helpers": "*",
5858
"@nhsuk/frontend-lib": "*",
5959
"@nhsuk/frontend-tasks": "*",
6060
"@testing-library/dom": "^10.4.1",
6161
"@testing-library/user-event": "^14.6.1",
6262
"autoprefixer": "^10.4.21",
63-
"cssnano": "^7.1.0",
63+
"cssnano": "^7.1.1",
6464
"del-cli": "^6.0.0",
6565
"gulp": "^5.0.1",
6666
"gulp-zip": "^6.1.0",
@@ -69,7 +69,7 @@
6969
"postcss": "^8.5.6",
7070
"postcss-scss": "^4.0.9",
7171
"puppeteer": "^24.16.2",
72-
"sass-embedded": "^1.90.0"
72+
"sass-embedded": "^1.91.0"
7373
},
7474
"engines": {
7575
"node": "^20.9.0 || ^22.11.0"

packages/nhsuk-frontend/src/nhsuk/components/components.unit.test.mjs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
import { outdent } from 'outdent'
12
import { compileStringAsync } from 'sass-embedded'
23

34
describe('Components', () => {
45
describe('importing using index file', () => {
56
it('forwards all components', async () => {
6-
const sass = `
7+
const sass = outdent`
78
@forward "components";
89
`
910

@@ -17,7 +18,7 @@ describe('Components', () => {
1718

1819
describe('importing using legacy paths', () => {
1920
it('forwards all components', async () => {
20-
const sass = `
21+
const sass = outdent`
2122
@forward "components/action-link/action-link";
2223
@forward "components/back-link/back-link";
2324
@forward "components/breadcrumb/breadcrumb";

packages/nhsuk-frontend/src/nhsuk/core/core.unit.test.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ describe('Core', () => {
8888
`
8989

9090
it('forwards core styles', async () => {
91-
const sass = `
91+
const sass = outdent`
9292
@forward "core";
9393
`
9494

@@ -112,7 +112,7 @@ describe('Core', () => {
112112
})
113113

114114
it('forwards core styles (with settings)', async () => {
115-
const sass = `
115+
const sass = outdent`
116116
@forward "core" with (
117117
$nhsuk-breakpoints: (
118118
mobile: 110px,
@@ -153,7 +153,7 @@ describe('Core', () => {
153153

154154
describe('importing using "all" files', () => {
155155
it('outputs a warning when importing the core "all" file', async () => {
156-
const sass = `
156+
const sass = outdent`
157157
@forward "core/all";
158158
`
159159

@@ -169,7 +169,7 @@ describe('Core', () => {
169169
})
170170

171171
it('outputs a warning for each layer that has an "all" file', async () => {
172-
const sass = `
172+
const sass = outdent`
173173
@forward "core/settings/all";
174174
@forward "core/tools/all";
175175
`

packages/nhsuk-frontend/src/nhsuk/core/helpers/colour.unit.test.mjs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import { outdent } from 'outdent'
22
import { compileStringAsync } from 'sass-embedded'
33

44
describe('Colour helpers', () => {
5-
const sassModules = `
5+
const sassModules = outdent`
66
@use "core/helpers" as *;
77
`
88

99
describe('@function nhsuk-colour', () => {
1010
let sassBootstrap = ''
1111

1212
beforeEach(() => {
13-
sassBootstrap = `
13+
sassBootstrap = outdent`
1414
@use "core/settings/colours-palette" as * with (
1515
$nhsuk-colours: (
1616
"red": #ff0000,
@@ -24,7 +24,7 @@ describe('Colour helpers', () => {
2424
})
2525

2626
it('returns a colour from the colour palette', async () => {
27-
const sass = `
27+
const sass = outdent`
2828
${sassBootstrap}
2929
3030
.foo {
@@ -46,7 +46,7 @@ describe('Colour helpers', () => {
4646
})
4747

4848
it('works with unquoted strings', async () => {
49-
const sass = `
49+
const sass = outdent`
5050
${sassBootstrap}
5151
5252
.foo {
@@ -68,7 +68,7 @@ describe('Colour helpers', () => {
6868
})
6969

7070
it('throws an error if a non-existent colour is requested', async () => {
71-
const sass = `
71+
const sass = outdent`
7272
${sassBootstrap}
7373
7474
.foo {

packages/nhsuk-frontend/src/nhsuk/core/objects/width-container.unit.test.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import { outdent } from 'outdent'
22
import { compileStringAsync } from 'sass-embedded'
33

44
describe('Page width container', () => {
5-
const sassBootstrap = `
5+
const sassModules = outdent`
66
@use "core/objects/width-container" as *;
77
`
88

99
describe('@mixin nhsuk-width-container', () => {
1010
it('allows different widths to be specified using $width', async () => {
11-
const sass = `
12-
${sassBootstrap}
11+
const sass = outdent`
12+
${sassModules}
1313
1414
.app-width-container--wide {
1515
@include nhsuk-width-container(1200px);

packages/nhsuk-frontend/src/nhsuk/core/settings/spacing.unit.test.mjs

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ import { outdent } from 'outdent'
22
import { compileStringAsync } from 'sass-embedded'
33

44
describe('Spacing settings', () => {
5-
const sassBootstrap = `
5+
const sassModules = outdent`
6+
@use "core/tools/spacing" as *;
7+
`
8+
9+
const sassBootstrap = outdent`
610
$spacing-point: 2;
711
812
@use "core/settings/breakpoints" as * with (
@@ -24,12 +28,12 @@ describe('Spacing settings', () => {
2428
)
2529
);
2630
27-
@use "core/tools/spacing" as *;
31+
${sassModules}
2832
`
2933

3034
describe('@function nhsuk-spacing', () => {
3135
it('returns CSS for a property based on the given spacing point', async () => {
32-
const sass = `
36+
const sass = outdent`
3337
${sassBootstrap}
3438
3539
.foo {
@@ -51,7 +55,7 @@ describe('Spacing settings', () => {
5155
})
5256

5357
it('returns CSS for a property based on a negative spacing point', async () => {
54-
const sass = `
58+
const sass = outdent`
5559
${sassBootstrap}
5660
5761
.foo {
@@ -73,7 +77,7 @@ describe('Spacing settings', () => {
7377
})
7478

7579
it('throws an error when passed anything other than a number', async () => {
76-
const sass = `
80+
const sass = outdent`
7781
${sassBootstrap}
7882
7983
.foo {
@@ -91,7 +95,7 @@ describe('Spacing settings', () => {
9195
})
9296

9397
it('throws an error when passed a non-existent point', async () => {
94-
const sass = `
98+
const sass = outdent`
9599
${sassBootstrap}
96100
97101
.foo {
@@ -109,7 +113,7 @@ describe('Spacing settings', () => {
109113
})
110114

111115
it('throws an error when passed a non-existent negative point', async () => {
112-
const sass = `
116+
const sass = outdent`
113117
${sassBootstrap}
114118
115119
.foo {
@@ -127,7 +131,7 @@ describe('Spacing settings', () => {
127131
})
128132

129133
it('handles negative zero', async () => {
130-
const sass = `
134+
const sass = outdent`
131135
${sassBootstrap}
132136
133137
.foo {
@@ -151,7 +155,7 @@ describe('Spacing settings', () => {
151155

152156
describe('@mixin nhsuk-responsive-spacing', () => {
153157
it('outputs CSS for a property based on the given spacing map', async () => {
154-
const sass = `
158+
const sass = outdent`
155159
${sassBootstrap}
156160
157161
.foo {
@@ -178,7 +182,7 @@ describe('Spacing settings', () => {
178182
})
179183

180184
it('outputs CSS for a property and direction based on the spacing map', async () => {
181-
const sass = `
185+
const sass = outdent`
182186
${sassBootstrap}
183187
184188
.foo {
@@ -205,7 +209,7 @@ describe('Spacing settings', () => {
205209
})
206210

207211
it('throws an exception when passed a non-existent point', async () => {
208-
const sass = `
212+
const sass = outdent`
209213
${sassBootstrap}
210214
211215
.foo {
@@ -224,7 +228,7 @@ describe('Spacing settings', () => {
224228

225229
describe('when $important is set to true', () => {
226230
it('marks the rule as important for the property', async () => {
227-
const sass = `
231+
const sass = outdent`
228232
${sassBootstrap}
229233
230234
.foo {
@@ -255,7 +259,7 @@ describe('Spacing settings', () => {
255259
})
256260

257261
it('marks the rule as important for the property and direction', async () => {
258-
const sass = `
262+
const sass = outdent`
259263
${sassBootstrap}
260264
261265
.foo {
@@ -289,7 +293,7 @@ describe('Spacing settings', () => {
289293

290294
describe('when an adjustment is provided', () => {
291295
it('adjusts the value for the property', async () => {
292-
const sass = `
296+
const sass = outdent`
293297
${sassBootstrap}
294298
295299
.foo {
@@ -320,7 +324,7 @@ describe('Spacing settings', () => {
320324
})
321325

322326
it('adjusts the value for the property and direction', async () => {
323-
const sass = `
327+
const sass = outdent`
324328
${sassBootstrap}
325329
326330
.foo {
@@ -355,7 +359,7 @@ describe('Spacing settings', () => {
355359

356360
describe('@mixin nhsuk-responsive-margin', () => {
357361
it('outputs simple responsive margins', async () => {
358-
const sass = `
362+
const sass = outdent`
359363
${sassBootstrap}
360364
361365
.foo {
@@ -382,7 +386,7 @@ describe('Spacing settings', () => {
382386
})
383387

384388
it('outputs extreme responsive margins', async () => {
385-
const sass = `
389+
const sass = outdent`
386390
${sassBootstrap}
387391
388392
.foo {
@@ -416,7 +420,7 @@ describe('Spacing settings', () => {
416420

417421
describe('@mixin nhsuk-responsive-padding', () => {
418422
it('outputs simple responsive padding', async () => {
419-
const sass = `
423+
const sass = outdent`
420424
${sassBootstrap}
421425
422426
.foo {
@@ -443,7 +447,7 @@ describe('Spacing settings', () => {
443447
})
444448

445449
it('outputs extreme responsive padding', async () => {
446-
const sass = `
450+
const sass = outdent`
447451
${sassBootstrap}
448452
449453
.foo {

packages/nhsuk-frontend/src/nhsuk/core/settings/warnings.unit.test.mjs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import { outdent } from 'outdent'
12
import { compileStringAsync, sassNull } from 'sass-embedded'
23

34
describe('Warnings settings', () => {
4-
const sassModules = `
5+
const sassModules = outdent`
56
@use "sass:list";
67
@use "core/settings/warnings" as *;
78
`
@@ -16,7 +17,7 @@ describe('Warnings settings', () => {
1617
})
1718

1819
it('Fires a @warn with the message plus the key suffix text', async () => {
19-
const sass = `
20+
const sass = outdent`
2021
${sassModules}
2122
2223
@include nhsuk-warning('test', 'This is a warning.');
@@ -37,7 +38,7 @@ describe('Warnings settings', () => {
3738
})
3839

3940
it('Only fires one @warn per warning key', async () => {
40-
const sass = `
41+
const sass = outdent`
4142
${sassModules}
4243
4344
@include nhsuk-warning('test', 'This is a warning.');
@@ -55,7 +56,7 @@ describe('Warnings settings', () => {
5556
})
5657

5758
it('fires every @warn if $silence-further-warnings is false', async () => {
58-
const sass = `
59+
const sass = outdent`
5960
${sassModules}
6061
6162
@include nhsuk-warning('test', 'This is a warning.', $silence-further-warnings: false);
@@ -71,7 +72,7 @@ describe('Warnings settings', () => {
7172
})
7273

7374
it('Does not fire a @warn if the key is already in $nhsuk-suppressed-warnings', async () => {
74-
const sass = `
75+
const sass = outdent`
7576
${sassModules}
7677
7778
$nhsuk-suppressed-warnings: list.append($nhsuk-suppressed-warnings, 'test');

0 commit comments

Comments
 (0)