Merge branch 'dev'

app.js

@@ -126,6 +126,8 @@ function create(env, ctx) {
     }));
 
     const clockviews = require('./lib/server/clocks.js')(env, ctx);
+    clockviews.setLocals(app.locals);
+
     app.use("/clock", clockviews);
 
     app.get("/", (req, res) => {

lib/server/clocks.js

@@ -7,6 +7,7 @@ const path = require('path');
 function clockviews(env, ctx) {
 
   const app = new express();
+  let locals = {};
 
   app.set('view engine', 'ejs');
   app.engine('html', require('ejs').renderFile);
@@ -18,11 +19,16 @@ function clockviews(env, ctx) {
     console.log('Clockface requested:', face);
 
     res.render('shared.html', {
-      face
+      face,
+      locals
     });
 
   });
 
+  app.setLocals = function (_locals) {
+    locals = _locals;
+  }
+
   return app;
 }
 

views/clockviews/shared.html

@@ -36,7 +36,7 @@
   </main>
 
   <script src="/api/v1/status.js"></script>
-  <script src="/js/bundle.clock.js?v=<%= locals.cachebuster %>"></script>
+  <script src="<%= locals.bundle %>/js/bundle.clock.js?v=<%= locals.cachebuster %>"></script>
 
   <script type="text/javascript">
     let clockFace = "<%= face  %>"; // can now be used in scripts