From 231cd8642946d33c226bab8442b676dcfbfa712a Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 8 Jan 2024 12:54:28 +0000 Subject: [PATCH] Update govuk-frontend --- app/frontend/application.js | 2 +- package.json | 2 +- webpack.config.js | 8 ++++---- yarn.lock | 7 ++++++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/frontend/application.js b/app/frontend/application.js index fcaff2e92..45b6fd106 100644 --- a/app/frontend/application.js +++ b/app/frontend/application.js @@ -18,7 +18,7 @@ import './controllers' import './cookie-banner' import './styles/application.scss' -require.context('govuk-frontend/govuk/assets') +require.context('govuk-frontend/dist/govuk/assets') GOVUKFrontend() GOVUKPrototypeComponents() diff --git a/package.json b/package.json index bfc106d9a..b0dc193b7 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "css-loader": "^6.7.1", "custom-event-polyfill": "^1.0.7", "file-loader": "^6.2.0", - "govuk-frontend": "4.7.0", + "govuk-frontend": "5.0.0", "html5shiv": "^3.7.3", "intersection-observer": "^0.12.0", "mini-css-extract-plugin": "^2.6.0", diff --git a/webpack.config.js b/webpack.config.js index 597886870..8a4f8600b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -39,10 +39,10 @@ module.exports = { }, resolve: { alias: { - 'govuk-frontend-styles': path.resolve(__dirname, 'node_modules/govuk-frontend/govuk/all.scss'), + 'govuk-frontend-styles': path.resolve(__dirname, 'node_modules/govuk-frontend/dist/govuk/all.scss'), 'govuk-prototype-styles': path.resolve(__dirname, 'node_modules/@x-govuk/govuk-prototype-components/x-govuk/all.scss') }, - modules: ['node_modules', 'node_modules/govuk-frontend/govuk'] + modules: ['node_modules', 'node_modules/govuk-frontend/dist/govuk'] }, output: { filename: '[name].js', @@ -57,8 +57,8 @@ module.exports = { new webpack.optimize.LimitChunkCountPlugin({ maxChunks: 1 }), new CopyPlugin({ patterns: [ - { from: 'node_modules/govuk-frontend/govuk/assets/images', to: 'images' }, - { from: 'node_modules/govuk-frontend/govuk/assets/fonts', to: 'fonts' }, + { from: 'node_modules/govuk-frontend/dist/govuk/assets/images', to: 'images' }, + { from: 'node_modules/govuk-frontend/dist/govuk/assets/fonts', to: 'fonts' }, { from: 'node_modules/html5shiv/dist/html5shiv.min.js', to: 'vendor' }, { from: 'app/frontend/vendor/outerHTML.js', to: 'vendor' }, { from: 'app/frontend/vendor/polyfill-output-value.js', to: 'vendor' } diff --git a/yarn.lock b/yarn.lock index 678a5b8c3..5764e1eff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3240,7 +3240,12 @@ globjoin@^0.1.4: resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" integrity sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg== -govuk-frontend@4.7.0, govuk-frontend@^4.5.0: +govuk-frontend@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/govuk-frontend/-/govuk-frontend-5.0.0.tgz#c08a4d1115fb31eb39b6d19979c627f816185dd7" + integrity sha512-3WSfvQ+3kw/q/m8jrq/t8XnMUA8D2r0uhGyZaDbIh1gWTJBQzJBHbHiKYI9nc9ixIXdCFsc9RozkgEm57a795g== + +govuk-frontend@^4.5.0: version "4.7.0" resolved "https://registry.yarnpkg.com/govuk-frontend/-/govuk-frontend-4.7.0.tgz#69950b6c2e69f435ffe9aa60d8dee232dac977de" integrity sha512-0OsdCusF5qvLWwKziU8zqxiC0nq6WP0ZQuw51ymZ/1V0tO71oIKMlSLN2S9bm8RcEGSoidPt2A34gKxePrLjvg==