diff --git a/Dockerfile b/Dockerfile index 2f14865a..512bde97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN npm run build CMD [ "npm", "run", "docker:dev" ] -FROM development as productionBuild +FROM development AS productionBuild ENV NODE_ENV production diff --git a/src/server/data/cy/constants.js b/src/server/data/constants.js similarity index 100% rename from src/server/data/cy/constants.js rename to src/server/data/constants.js diff --git a/src/server/data/cy/cy.js b/src/server/data/cy/cy.js index 5aea7e44..76bca331 100644 --- a/src/server/data/cy/cy.js +++ b/src/server/data/cy/cy.js @@ -1,4 +1,4 @@ -import { WELSH_TITLE } from './constants' +import { WELSH_TITLE } from '~/src/server/data/constants' export const welsh = { checkLocalAirQuality: { @@ -327,7 +327,7 @@ export const welsh = { footer: { privacy: { pageTitle: 'Gwiriwch ansawdd aer lleol - GOV.UK', - title: 'Gwiriwch hysbysiad preifatrwydd ansawdd aer lleol', + title: 'Hysbysiad preifatrwydd Gwirio ansawdd aer lleol', heading: 'Gwiriwch ansawdd aer lleol', headings: { a: 'Pwy sy’n casglu’ch data personol', diff --git a/src/server/privacy/controller.js b/src/server/privacy/controller.js index 993dea01..4768feae 100644 --- a/src/server/privacy/controller.js +++ b/src/server/privacy/controller.js @@ -9,7 +9,7 @@ const privacyController = { cookieBanner, phaseBanner, footerTxt, - multipleLocations: serviceName + multipleLocations: { serviceName } } = english /* eslint-disable camelcase */ const { diff --git a/webpack.config.js b/webpack.config.js index 0ca76587..b997ae44 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -9,6 +9,7 @@ const webpackConfig = { components: path.resolve(__dirname, 'src', 'server', 'common', 'components') } } +const ASSETS_RESOURCE_PATH = 'asset/resource' module.exports = { entry: { @@ -74,21 +75,21 @@ module.exports = { }, { test: /\.(png|svg|jpe?g|gif)$/, - type: 'asset/resource', + type: ASSETS_RESOURCE_PATH, generator: { filename: 'images/[name].[contenthash][ext]' } }, { test: /\.(ico)$/, - type: 'asset/resource', + type: ASSETS_RESOURCE_PATH, generator: { filename: 'images/[name][ext]' } }, { test: /\.(woff|woff2|eot|ttf|otf)$/, - type: 'asset/resource', + type: ASSETS_RESOURCE_PATH, generator: { filename: 'fonts/[name].[contenthash][ext]' }