Remove GOV.UK Frontend hard-coded paths

Adds new Nunjucks locals from `govukFrontendPaths()` utility
alphagov · Sep 14, 2023 · 9159606 · 9159606
1 parent 15f8aff
commit 9159606
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/lib/errorServer.js b/lib/errorServer.js
@@ -111,7 +111,10 @@ function runErrorServer (error) {
         path.join(__dirname, 'nunjucks'),
         ...govukFrontendNunjucksPaths
       ])
-      res.end(nunjucksAppEnv.render('views/error-handling/server-error', getErrorModel(error)))
+      res.end(nunjucksAppEnv.render('views/error-handling/server-error', {
+        govukFrontendInternal, // Add GOV.UK Frontend paths to Nunjucks context
+        ...getErrorModel(error)
+      }))
     } catch (ignoreThisError) {
       console.log(JSON.stringify({ ignoreThisError }, null, 2))
       fileContentsParts.push('<h1 class="govuk-heading-l">There is an error</h1>')

diff --git a/lib/nunjucks/govuk-prototype-kit/layouts/govuk-branded.njk b/lib/nunjucks/govuk-prototype-kit/layouts/govuk-branded.njk
@@ -1,4 +1,4 @@
-{%- set assetPath = assetPath | default('/plugin-assets/govuk-frontend/govuk/assets') -%}
+{%- set assetPath = assetPath | default('/plugin-assets/govuk-frontend' + govukFrontend.assetPath) -%}
 
 {% extends "govuk/template.njk" %}
 

diff --git a/lib/nunjucks/views/error-handling/server-error.njk b/lib/nunjucks/views/error-handling/server-error.njk
@@ -1,4 +1,4 @@
-{%- set assetPath = '/manage-prototype/dependencies/govuk-frontend/govuk/assets' -%}
+{%- set assetPath = '/manage-prototype/dependencies/govuk-frontend' + govukFrontendInternal.assetPath -%}
 {% extends "govuk-prototype-kit/layouts/govuk-branded.njk" %}
 
 {% block pageTitle %}

diff --git a/lib/nunjucks/views/manage-prototype/layout.njk b/lib/nunjucks/views/manage-prototype/layout.njk
@@ -1,4 +1,4 @@
-{%- set assetPath = '/manage-prototype/dependencies/govuk-frontend/govuk/assets' -%}
+{%- set assetPath = '/manage-prototype/dependencies/govuk-frontend' + govukFrontendInternal.assetPath -%}
 {% extends "govuk-prototype-kit/layouts/govuk-branded.njk" %}
 
 {% block pageTitle %}

diff --git a/server.js b/server.js
@@ -39,6 +39,9 @@ if (isSecure) {
   app.set('trust proxy', 1) // needed for secure cookies on heroku
 }
 
+// Find GOV.UK Frontend (via project, internal package fallback)
+const govukFrontend = govukFrontendPaths([projectDir, packageDir])
+
 // Find GOV.UK Frontend (via internal package, project fallback)
 const govukFrontendInternal = govukFrontendPaths([packageDir, projectDir])
 
@@ -58,6 +61,11 @@ if (plugins.legacyGovukFrontendFixesNeeded()) {
 app.locals.pluginConfig = plugins.getAppConfig({
   scripts: utils.prototypeAppScripts
 })
+
+// Add GOV.UK Frontend paths to Nunjucks locals
+app.locals.govukFrontend = govukFrontend
+app.locals.govukFrontendInternal = govukFrontendInternal
+
 // keep extensionConfig around for backwards compatibility
 // TODO: remove in v14
 app.locals.extensionConfig = app.locals.pluginConfig