Update to v8.0.0

.devcontainer/devcontainer.json

@@ -25,7 +25,7 @@
   "postCreateCommand": "npm install",
   // A command to run each time a tool has successfully attached to the container
   "postAttachCommand": {
-    "server": "npm run watch"
+    "server": "npm start"
   },
   // codespace customisations
   "customizations": {

app.js

@@ -1,37 +1,36 @@
-const { join } = require('node:path')
-
 const NHSPrototypeKit = require('nhsuk-prototype-kit')
 
 // Local dependencies
 const config = require('./app/config')
 const sessionDataDefaults = require('./app/data/session-data-defaults')
 const filters = require('./app/filters')
-//const locals = require('./app/locals')
+const locals = require('./app/locals')
 const routes = require('./app/routes')
 
-const SERVICE_NAME = config.serviceName
-
-// Set configuration variables
-const port = parseInt(process.env.PORT, 10) || 2000
-
 const viewsPath = [
-  join(__dirname, 'app/views/'),
-  join(__dirname, 'app/views/layouts/'),
+  'app/views/',
+  'app/views/layouts/',
 ]
 
-const prototype = NHSPrototypeKit.init({
-  serviceName: SERVICE_NAME,
-  routes: routes,
-  //locals: locals,
-  sessionDataDefaults: sessionDataDefaults,
-  viewsPath: viewsPath,
-  buildOptions: {
-    entryPoints: ['app/assets/sass/main.scss']
-  }
-})
+const entryPoints = [
+  'app/assets/sass/main.scss',
+  'app/assets/javascript/*.js'
+]
 
-for (const [name, filter] of Object.entries(filters())) {
-  prototype.nunjucks.addFilter(name, filter)
+async function init() {
+  const prototype = await NHSPrototypeKit.init({
+    serviceName: config.serviceName,
+    buildOptions: {
+      entryPoints
+    },
+    viewsPath,
+    routes,
+    locals,
+    filters,
+    sessionDataDefaults
+  })
+
+  prototype.start(config.port)
 }
 
-prototype.start(port)
+init()

app/locals.js

@@ -1,19 +1,11 @@
-/**
- * @param {typeof config} config
- */
-module.exports =
-  (config) =>
-  /**
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  (req, res, next) => {
-    res.locals.serviceName = config.serviceName
-    next()
-  }
+module.exports = function(req, res, next) {
 
-/**
- * @import { NextFunction, Request, Response } from 'express'
- * @import config from './config.js'
- */
+  // You can set any additional local variables here.
+  // These will be made available to any views
+  //
+  // For example:
+  //
+  // req.locals.organisationName = 'NHS'
+
+  next()
+}

app/views/layouts/hero.html

@@ -64,14 +64,9 @@ <h1 class="nhsuk-heading-xl">{{ heroText or pageName }}</h1>
 {% endblock %}
 
 {% block bodyEnd %}
-  <script src="/nhsuk-frontend/nhsuk-frontend.min.js" type="module"></script>
-  <script type="module">
-    import { initAll } from '/nhsuk-frontend/nhsuk-frontend.min.js'
-    initAll()
-  </script>
+  {{ super() }}
+  <script type="module" src="/assets/javascript/main.js"></script>
   {% block scripts %}
-    <!-- Custom JavaScript files can be added to this file -->
-    {% include "includes/scripts.html" %}
     <script>
       const data = {{ data | dump | safe }}
       console.log("session data:", data);

app/views/layouts/layout.html

@@ -2,7 +2,7 @@
 
 {% block head %}
   <!-- Add your custom CSS or Sass in /app/assets/sass/main.scss -->
-  <link href="/main.css" rel="stylesheet">
+  <link href="/assets/sass/main.css" rel="stylesheet">
 {% endblock %}
 
 {% block header %}
@@ -45,14 +45,10 @@
 {% endblock %}
 
 {% block bodyEnd %}
-  <script src="/nhsuk-frontend/nhsuk-frontend.min.js" type="module"></script>
-  <script type="module">
-    import { initAll } from '/nhsuk-frontend/nhsuk-frontend.min.js'
-    initAll()
-  </script>
+  {{ super() }}
   {% block scripts %}
-    <!-- Custom JavaScript files can be added to this file -->
-    {% include "includes/scripts.html" %}
+    <script type="module" src="/assets/javascript/main.js"></script>
+
     {% set dataForScript %}{% if data %}{{ data | dump | safe }}{% else %}{}{% endif %}{% endset %}
     {% set slotsForScript %}{% if slots %}{{ slots | dump | safe }}{% else %}{}{% endif %}{% endset %}
     {% set groupsForScript %}{% if availabilityGroups %}{{ availabilityGroups | dump | safe }}{% else %}{}{% endif %}{% endset %}