Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/client/javascripts/maps.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { initMaps } from '@defra/forms-engine-plugin/shared.js'

initMaps()
11 changes: 9 additions & 2 deletions src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,19 @@ export const config = convict({
},

ordnanceSurveyApiKey: {
doc: 'The ordnance survey api key used by the postcode lookup plugin',
doc: 'The ordnance survey api key used by the postcode lookup and maps plugin',
format: String,
nullable: true,
default: undefined,
env: 'ORDNANCE_SURVEY_API_KEY'
} as SchemaObj<string | undefined>
} as SchemaObj<string | undefined>,

useMapsFeature: {
doc: 'Feature flag to control maps',
format: Boolean,
default: false,
env: 'USE_MAPS_FEATURE'
}
})

config.validate({ allowed: 'strict' })
4 changes: 3 additions & 1 deletion src/server/plugins/blankie.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export const configureBlankiePlugin = (): ServerRegisterPluginObject<
fontSrc: ['self', 'data:'],
connectSrc: [
['self'],
['https://api.os.uk'],
gaTrackingId ? googleAnalyticsOptions.connectSrc : [],
uploaderUrl ? [uploaderUrl] : []
].flat(),
Expand All @@ -38,10 +39,11 @@ export const configureBlankiePlugin = (): ServerRegisterPluginObject<
].flat(),
styleSrc: ['self', 'unsafe-inline'],
imgSrc: [
['self'],
['self', 'data:'],
gaTrackingId ? googleAnalyticsOptions.imgSrc : []
].flat(),
frameSrc: ['self', 'data:'],
workerSrc: ['self', 'blob:'],
generateNonces: true
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/server/plugins/nunjucks/context.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ export function context(request) {
phaseTag: config.get('phaseTag'),
serviceBannerText: config.get('serviceBannerText'),
serviceName: config.get('serviceName'),
serviceVersion: config.get('serviceVersion')
serviceVersion: config.get('serviceVersion'),
useMapsFeature: config.get('useMapsFeature')
},
cspNonce: request?.plugins.blankie?.nonces?.script,
currentPath: request ? `${request.path}${request.url.search}` : undefined,
Expand Down
19 changes: 19 additions & 0 deletions src/server/views/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@
<link rel="preload" as="font" href="{{ assetPath }}/fonts/bold-b542beb274-v2.woff2" type="font/woff2" crossorigin="anonymous">
<link rel="preload" as="font" href="{{ assetPath }}/fonts/light-94a07e06a1-v2.woff2" type="font/woff2" crossorigin="anonymous">
<link rel="stylesheet" href="{{ getAssetPath("stylesheets/application.scss") }}">
<link href="{{assetPath}}/defra-map/css/index.css" rel="stylesheet" type="text/css">
<link href="{{assetPath}}/defra-map/plugins/map-styles/dist/css/index.css" rel="stylesheet" type="text/css">
<link href="{{assetPath}}/defra-map/plugins/search/dist/css/index.css" rel="stylesheet" type="text/css">
<link href="{{assetPath}}/defra-map/plugins/scale-bar/dist/css/index.css" rel="stylesheet" type="text/css">
<link href="{{assetPath}}/defra-map/plugins/data-layers-ml/dist/css/index.css" rel="stylesheet" type="text/css">
<link href="{{assetPath}}/defra-map/plugins/interact/dist/css/index.css" rel="stylesheet" type="text/css">
{% endblock %}

{% block pageTitle -%}
Expand Down Expand Up @@ -158,6 +164,19 @@ <h1 class="govuk-heading-l">Default page template</h1>
{% block bodyEnd %}
<script type="module" nonce="{{ cspNonce }}" src="{{ getAssetPath("application.js") }}"></script>

{% if config.useMapsFeature %}
<script nonce="{{ cspNonce }}" src="{{assetPath}}/defra-map/umd/index.js"></script>
<script nonce="{{ cspNonce }}" src="{{assetPath}}/defra-map/providers/maplibre/dist/umd/index.js"></script>
<script nonce="{{ cspNonce }}" src="{{assetPath}}/defra-map/providers/open-names/dist/umd/index.js"></script>
<script nonce="{{ cspNonce }}" src="{{assetPath}}/defra-map/plugins/map-styles/dist/umd/index.js"></script>
<script nonce="{{ cspNonce }}" src="{{assetPath}}/defra-map/plugins/search/dist/umd/index.js"></script>
<script nonce="{{ cspNonce }}" src="{{assetPath}}/defra-map/plugins/zoom-controls/dist/umd/index.js"></script>
<script nonce="{{ cspNonce }}" src="{{assetPath}}/defra-map/plugins/scale-bar/dist/umd/index.js"></script>
<script nonce="{{ cspNonce }}" src="{{assetPath}}/defra-map/plugins/data-layers-ml/dist/umd/index.js"></script>
<script nonce="{{ cspNonce }}" src="{{assetPath}}/defra-map/plugins/interact/dist/umd/index.js"></script>
<script type="module" nonce="{{ cspNonce }}" src="{{ getAssetPath("maps.js") }}"></script>
{% endif %}

{% if config.googleAnalyticsTrackingId and cookieConsent.analytics === true %}
<script id="ga-tag-js-main" nonce="{{ cspNonce }}" src="https://www.googletagmanager.com/gtag/js?id={{ config.googleAnalyticsTrackingId }}" defer></script>
<script id="ga-tag-js-init" nonce="{{ cspNonce }}">
Expand Down
27 changes: 25 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ const govukFrontendPath = dirname(
require.resolve('govuk-frontend/package.json')
)

const pluginPath = dirname(
require.resolve('@defra/forms-engine-plugin/package.json')
)

/**
* @type {Configuration}
*/
Expand All @@ -22,6 +26,9 @@ export default {
entry: {
application: {
import: ['./javascripts/application.js', './stylesheets/application.scss']
},
maps: {
import: ['./javascripts/maps.js']
}
},
experiments: { outputModule: true },
Expand Down Expand Up @@ -172,7 +179,23 @@ export default {
new WebpackAssetsManifest(),
new CopyPlugin({
patterns: [
{ from: join(govukFrontendPath, 'dist/govuk/assets'), to: 'assets' }
{ from: join(govukFrontendPath, 'dist/govuk/assets'), to: 'assets' },
{
from: join(pluginPath, 'node_modules/@defra/defra-map/dist'),
to: 'assets/defra-map'
},
{
from: join(pluginPath, 'node_modules/@defra/defra-map/providers'),
to: 'assets/defra-map/providers'
},
{
from: join(pluginPath, 'node_modules/@defra/defra-map/plugins'),
to: 'assets/defra-map/plugins'
},
{
from: join(pluginPath, 'node_modules/@defra/defra-map/assets'),
to: 'assets/defra-map/assets'
}
]
})
],
Expand All @@ -185,5 +208,5 @@ export default {
}

/**
* @import { Configuration, NormalModule } from 'webpack'
* @import { Configuration } from 'webpack'
*/
Loading