Skip to content

Commit d1f739a

Browse files
committed
Split out shared SCSS from devtool application
1 parent 867488e commit d1f739a

6 files changed

Lines changed: 23 additions & 122 deletions

File tree

package-lock.json

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
],
1111
"exports": {
1212
".": {
13-
"sass": "./.server/client/stylesheets/application.scss",
13+
"sass": "./.server/client/stylesheets/shared.scss",
1414
"import": "./.server/server/plugins/engine/index.js",
1515
"default": "./.server/server/plugins/engine/index.js"
1616
},
@@ -20,9 +20,9 @@
2020
"./file-upload.js": "./.server/client/javascripts/file-upload.js",
2121
"./file-upload.min.js": "./.public/javascripts/file-upload.min.js",
2222
"./file-upload.min.js.map": "./.public/javascripts/file-upload.min.js.map",
23-
"./application.min.css": "./.public/stylesheets/application.min.css",
2423
"./file-form-service.js": "./.server/server/utils/file-form-service.js",
2524
"./controllers/*": "./.server/server/plugins/engine/pageControllers/*",
25+
"./application.min.css": "./.public/stylesheets/application.min.css",
2626
"./services/*": "./.server/server/plugins/engine/services/*",
2727
"./engine/*": "./.server/server/plugins/engine/*",
2828
"./package.json": "./package.json"
@@ -181,7 +181,7 @@
181181
"tsx": "^4.19.3",
182182
"typescript": "^5.7.2",
183183
"webpack": "^5.97.1",
184-
"webpack-assets-manifest": "^5.2.1",
184+
"webpack-assets-manifest": "^6.0.2",
185185
"webpack-cli": "^6.0.1"
186186
}
187187
}

src/client/stylesheets/_service-banner.scss

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

src/client/stylesheets/application.scss

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
@use "govuk-frontend" as *;
2-
@use "pkg:accessible-autocomplete";
2+
@use "shared";
33
@use "code";
4-
@use "prose";
5-
@use "service-banner";
6-
@use "summary-list";
74
@use "tag-env";
85

9-
// Use default GDS Transport font for autocomplete
10-
.autocomplete__hint,
11-
.autocomplete__input,
12-
.autocomplete__option {
13-
@include govuk-typography-common;
14-
}
15-
166
// An example of some user-supplied styling
177
// Not great practice but it illustrates the point
188
.govuk-header {

src/client/stylesheets/shared.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@use "govuk-frontend" as *;
2+
@use "pkg:accessible-autocomplete";
3+
@use "prose";
4+
@use "summary-list";
5+
6+
// Use default GDS Transport font for autocomplete
7+
.autocomplete__hint,
8+
.autocomplete__input,
9+
.autocomplete__option {
10+
@include govuk-typography-common;
11+
}

webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { dirname, join } from 'node:path'
44
import { CleanWebpackPlugin } from 'clean-webpack-plugin'
55
import CopyPlugin from 'copy-webpack-plugin'
66
import TerserPlugin from 'terser-webpack-plugin'
7-
import WebpackAssetsManifest from 'webpack-assets-manifest'
7+
import { WebpackAssetsManifest } from 'webpack-assets-manifest'
88

99
const { NODE_ENV = 'development' } = process.env
1010

0 commit comments

Comments
 (0)