Move devtool view context into separate function

Author: alexluckett

src/server/plugins/engine/configureEnginePlugin.ts

@@ -9,6 +9,7 @@ import {
   type PluginOptions
 } from '~/src/server/plugins/engine/plugin.js'
 import { findPackageRoot } from '~/src/server/plugins/engine/plugin.js'
+import { devtoolContext } from '~/src/server/plugins/nunjucks/context.js'
 import { type RouteConfig } from '~/src/server/types.js'
 
 export const configureEnginePlugin = async ({
@@ -36,9 +37,7 @@ export const configureEnginePlugin = async ({
       nunjucks: {
         paths: [join(findPackageRoot(), 'src/server/devserver')] // custom layout to make it really clear this is not the same as the runner
       },
-      viewContext: () => ({
-        baseLayoutPath: 'dxt-devtool-baselayout.html' // from plugin.options.nunjucks.paths
-      })
+      viewContext: devtoolContext
     }
   }
 }

src/server/plugins/nunjucks/context.js

@@ -22,17 +22,6 @@ let webpackManifest
  * @param {FormRequest | FormRequestPayload | null} request
  */
 export function context(request) {
-  const manifestPath = join(config.get('publicDir'), 'assets-manifest.json')
-
-  if (!webpackManifest) {
-    try {
-      // eslint-disable-next-line -- Allow JSON type 'any'
-      webpackManifest = JSON.parse(readFileSync(manifestPath, 'utf-8'))
-    } catch {
-      logger.error(`Webpack ${basename(manifestPath)} not found`)
-    }
-  }
-
   const { params, path, response } = request ?? {}
 
   const isPreviewMode = path?.startsWith(PREVIEW_PATH_PREFIX)
@@ -54,7 +43,6 @@ export function context(request) {
     // take consumers props first so we can override it
     ...consumerViewContext,
     appVersion: pkg.version,
-    assetPath: '/assets',
     config: {
       cdpEnvironment: config.get('cdpEnvironment'),
       designerUrl: config.get('designerUrl'),
@@ -66,14 +54,34 @@ export function context(request) {
     crumb: safeGenerateCrumb(request),
     currentPath: request ? `${request.path}${request.url.search}` : undefined,
     previewMode: isPreviewMode ? params?.state : undefined,
-    slug: isResponseOK ? params?.slug : undefined,
+    slug: isResponseOK ? params?.slug : undefined
+  }
+
+  return ctx
+}
 
+/**
+ * Returns the context for the devtool. Consumers won't have access to this.
+ */
+export function devtoolContext() {
+  const manifestPath = join(config.get('publicDir'), 'assets-manifest.json')
+
+  if (!webpackManifest) {
+    try {
+      // eslint-disable-next-line -- Allow JSON type 'any'
+      webpackManifest = JSON.parse(readFileSync(manifestPath, 'utf-8'))
+    } catch {
+      logger.error(`Webpack ${basename(manifestPath)} not found`)
+    }
+  }
+
+  return {
+    baseLayoutPath: 'dxt-devtool-baselayout.html', // from plugin.options.nunjucks.paths
+    assetPath: '/assets',
     getDxtAssetPath: (asset = '') => {
       return `/${webpackManifest?.[asset] ?? asset}`
     }
   }
-
-  return ctx
 }
 
 /**

src/server/plugins/nunjucks/types.js

@@ -12,14 +12,12 @@
 /**
  * @typedef {object} ViewContext - Nunjucks view context
  * @property {string} appVersion - Application version
- * @property {string} assetPath - Asset path
  * @property {Partial<Config>} config - Application config properties
  * @property {string} [crumb] - Cross-Site Request Forgery (CSRF) token
  * @property {string} [cspNonce] - Content Security Policy (CSP) nonce
  * @property {string} [currentPath] - Current path
  * @property {string} [previewMode] - Preview mode
  * @property {string} [slug] - Form slug
- * @property {(asset?: string) => string} getDxtAssetPath - Asset path resolver
  * @property {FormContext} [context] - the current form context
  * @property {PluginOptions['viewContext']} [injectedViewContext] - the current form context
  */