@defra/forms-engine-plugin 0.1.27 → 0.1.28

package/.server/client/stylesheets/_tag-env.scss

@@ -21,13 +21,4 @@
       margin: 0 0 0 govuk-spacing(2);
     }
   }
-
-  &-rebrand {
-    vertical-align: middle;
-
-    // Align with product name
-    @include govuk-media-query($from: tablet) {
-      margin: -3px 0 2px;
-    }
-  }
 }

package/.server/config/index.d.ts

@@ -11,7 +11,6 @@ export declare const config: convict.Config<{
     isProduction: boolean;
     isDevelopment: boolean;
     isTest: boolean;
-    showRebrand: boolean;
     serviceName: string;
     serviceVersion: SchemaObj<string>;
     feedbackLink: SchemaObj<string>;

package/.server/config/index.js

@@ -58,15 +58,6 @@ export const config = convict({
     format: Boolean,
     default: isTest
   },
-  /**
-   * Feature flags
-   */
-  showRebrand: {
-    doc: 'If this app should show the 2025 rebrand',
-    format: Boolean,
-    env: 'SHOW_GOVUK_REBRAND',
-    default: false
-  },
   /**
    * Service
    */

package/.server/config/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["resolve","convict","isProduction","process","env","NODE_ENV","isDev","isTest","oneMinute","oneHour","config","appDir","format","String","default","import","meta","dirname","publicDir","port","doc","cdpEnvironment","enforceCsrf","Boolean","isDevelopment","showRebrand","serviceName","serviceVersion","nullable","feedbackLink","phaseTag","sessionTimeout","Number","confirmationSessionTimeout","sessionCookiePassword","sensitive","redis","host","username","password","keyPrefix","tracing","header","notifyTemplateId","notifyAPIKey","designerUrl","submissionUrl","uploaderUrl","uploaderBucketName","log","enabled","level","redact","Array","safelist","stagingPrefix","submissionEmailAddress","validate","allowed"],"sources":["../../src/config/index.ts"],"sourcesContent":["import { resolve } from 'node:path'\n\nimport convict, { type SchemaObj } from 'convict'\nimport { type LevelWithSilent } from 'pino'\n\nimport 'dotenv/config'\n\nconst isProduction = process.env.NODE_ENV === 'production'\nconst isDev = process.env.NODE_ENV !== 'production'\nconst isTest = process.env.NODE_ENV === 'test'\n\nconst oneMinute = 1000 * 60\nconst oneHour = oneMinute * 60\n\nexport const config = convict({\n  appDir: {\n    format: String,\n    default: resolve(import.meta.dirname, '../server')\n  },\n  publicDir: {\n    format: String,\n    default: isTest\n      ? resolve(import.meta.dirname, '../../test/fixtures')\n      : resolve(import.meta.dirname, '../../.public')\n  },\n\n  /**\n   * Server\n   */\n  port: {\n    format: 'port',\n    default: 3009,\n    env: 'PORT'\n  },\n  env: {\n    doc: 'The application environment.',\n    format: ['production', 'development', 'test'],\n    default: 'development',\n    env: 'NODE_ENV'\n  },\n  cdpEnvironment: {\n    doc: 'The CDP environment the app is currently in, with the addition of \"local\"',\n    format: [\n      'local',\n      'infra-dev',\n      'management',\n      'dev',\n      'test',\n      'perf-test',\n      'ext-test',\n      'prod'\n    ],\n    default: 'local',\n    env: 'ENVIRONMENT'\n  },\n  enforceCsrf: {\n    format: Boolean,\n    default: isProduction,\n    env: 'ENFORCE_CSRF'\n  },\n\n  /**\n   * Helper flags\n   */\n  isProduction: {\n    doc: 'If this application running in the production environment',\n    format: Boolean,\n    default: isProduction\n  },\n  isDevelopment: {\n    doc: 'If this application running in the development environment',\n    format: Boolean,\n    default: isDev\n  },\n  isTest: {\n    doc: 'If this application running in the test environment',\n    format: Boolean,\n    default: isTest\n  },\n\n  /**\n   * Feature flags\n   */\n  showRebrand: {\n    doc: 'If this app should show the 2025 rebrand',\n    format: Boolean,\n    env: 'SHOW_GOVUK_REBRAND',\n    default: false\n  },\n\n  /**\n   * Service\n   */\n  serviceName: {\n    doc: 'Applications Service Name',\n    format: String,\n    default: 'Digital Express Toolkit'\n  },\n  serviceVersion: {\n    doc: 'The service version, this variable is injected into your docker container in CDP environments',\n    format: String,\n    nullable: true,\n    default: '',\n    env: 'SERVICE_VERSION'\n  } as SchemaObj<string>,\n  feedbackLink: {\n    doc: 'Used in your phase banner. Can be a URL or more commonly mailto mailto:feedback@department.gov.uk',\n    format: String,\n    default: '',\n    env: 'FEEDBACK_LINK'\n  } as SchemaObj<string>,\n  phaseTag: {\n    format: String,\n    default: 'beta', // Accepts \"alpha\" |\"beta\" | \"\"\n    env: 'PHASE_TAG'\n  },\n\n  /**\n   * Session storage\n   * Redis integration is optional, but recommended for production environments.\n   */\n  sessionTimeout: {\n    format: Number,\n    default: oneHour * 24, // 1 day\n    env: 'SESSION_TIMEOUT'\n  },\n  confirmationSessionTimeout: {\n    format: Number,\n    default: oneMinute * 20,\n    env: 'CONFIRMATION_SESSION_TIMEOUT'\n  },\n  sessionCookiePassword: {\n    format: String,\n    default: '',\n    sensitive: true,\n    env: 'SESSION_COOKIE_PASSWORD'\n  } as SchemaObj<string>,\n  redis: {\n    host: {\n      doc: 'Redis cache host',\n      format: String,\n      default: '',\n      env: 'REDIS_HOST'\n    } as SchemaObj<string>,\n    username: {\n      doc: 'Redis cache username',\n      format: String,\n      default: '',\n      env: 'REDIS_USERNAME'\n    } as SchemaObj<string>,\n    password: {\n      doc: 'Redis cache password',\n      format: '*',\n      default: '',\n      sensitive: true,\n      env: 'REDIS_PASSWORD'\n    } as SchemaObj<string>,\n    keyPrefix: {\n      doc: 'Redis cache key prefix name used to isolate the cached results across multiple clients',\n      format: String,\n      default: '',\n      env: 'REDIS_KEY_PREFIX'\n    } as SchemaObj<string>\n  },\n  tracing: {\n    header: {\n      doc: 'Tracing header name',\n      format: String,\n      default: 'x-cdp-request-id',\n      env: 'TRACING_HEADER'\n    } as SchemaObj<string>\n  },\n\n  /**\n   * Email outputs\n   * Email outputs will use notify to send an email to a single inbox.\n   */\n  notifyTemplateId: {\n    format: String,\n    default: '',\n    env: 'NOTIFY_TEMPLATE_ID'\n  } as SchemaObj<string>,\n  notifyAPIKey: {\n    format: String,\n    default: '',\n    env: 'NOTIFY_API_KEY'\n  } as SchemaObj<string>,\n\n  /**\n   * API integrations\n   */\n  designerUrl: {\n    format: String,\n    default: 'http://localhost:3000',\n    env: 'DESIGNER_URL'\n  } as SchemaObj<string>,\n\n  submissionUrl: {\n    format: String,\n    default: 'http://localhost:3002',\n    env: 'SUBMISSION_URL'\n  } as SchemaObj<string>,\n\n  uploaderUrl: {\n    format: String,\n    default: 'http://localhost:7337',\n    env: 'UPLOADER_URL'\n  } as SchemaObj<string>,\n\n  uploaderBucketName: {\n    format: String,\n    default: 'files',\n    env: 'UPLOADER_BUCKET_NAME'\n  },\n\n  /**\n   * Logging\n   */\n  log: {\n    enabled: {\n      doc: 'Is logging enabled',\n      format: Boolean,\n      default: !isTest,\n      env: 'LOG_ENABLED'\n    },\n    level: {\n      doc: 'Logging level',\n      format: ['fatal', 'error', 'warn', 'info', 'debug', 'trace', 'silent'],\n      default: 'info',\n      env: 'LOG_LEVEL'\n    } as SchemaObj<LevelWithSilent>,\n    format: {\n      doc: 'Format to output logs in.',\n      format: ['ecs', 'pino-pretty'],\n      default: isProduction ? 'ecs' : 'pino-pretty',\n      env: 'LOG_FORMAT'\n    } as SchemaObj<'ecs' | 'pino-pretty'>,\n    redact: {\n      doc: 'Log paths to redact',\n      format: Array,\n      default: isProduction\n        ? ['req.headers.authorization', 'req.headers.cookie', 'res.headers']\n        : ['req', 'res', 'responseTime']\n    }\n  },\n\n  safelist: {\n    format: Array,\n    default: ['61bca17e-fe74-40e0-9c15-a901ad120eca.mock.pstmn.io'],\n    env: 'SAFELIST'\n  },\n\n  stagingPrefix: {\n    doc: 'Prefix for staging files in S3',\n    format: String,\n    default: 'staging',\n    env: 'STAGING_PREFIX'\n  },\n\n  submissionEmailAddress: {\n    doc: 'Email address to send the form to (local devtool only)',\n    format: String,\n    default: '',\n    env: 'SUBMISSION_EMAIL_ADDRESS'\n  } as SchemaObj<string>\n})\n\nconfig.validate({ allowed: 'strict' })\n"],"mappings":"AAAA,SAASA,OAAO,QAAQ,WAAW;AAEnC,OAAOC,OAAO,MAA0B,SAAS;AAGjD,OAAO,eAAe;AAEtB,MAAMC,YAAY,GAAGC,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,YAAY;AAC1D,MAAMC,KAAK,GAAGH,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,YAAY;AACnD,MAAME,MAAM,GAAGJ,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,MAAM;AAE9C,MAAMG,SAAS,GAAG,IAAI,GAAG,EAAE;AAC3B,MAAMC,OAAO,GAAGD,SAAS,GAAG,EAAE;AAE9B,OAAO,MAAME,MAAM,GAAGT,OAAO,CAAC;EAC5BU,MAAM,EAAE;IACNC,MAAM,EAAEC,MAAM;IACdC,OAAO,EAAEd,OAAO,CAACe,MAAM,CAACC,IAAI,CAACC,OAAO,EAAE,WAAW;EACnD,CAAC;EACDC,SAAS,EAAE;IACTN,MAAM,EAAEC,MAAM;IACdC,OAAO,EAAEP,MAAM,GACXP,OAAO,CAACe,MAAM,CAACC,IAAI,CAACC,OAAO,EAAE,qBAAqB,CAAC,GACnDjB,OAAO,CAACe,MAAM,CAACC,IAAI,CAACC,OAAO,EAAE,eAAe;EAClD,CAAC;EAED;AACF;AACA;EACEE,IAAI,EAAE;IACJP,MAAM,EAAE,MAAM;IACdE,OAAO,EAAE,IAAI;IACbV,GAAG,EAAE;EACP,CAAC;EACDA,GAAG,EAAE;IACHgB,GAAG,EAAE,8BAA8B;IACnCR,MAAM,EAAE,CAAC,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC;IAC7CE,OAAO,EAAE,aAAa;IACtBV,GAAG,EAAE;EACP,CAAC;EACDiB,cAAc,EAAE;IACdD,GAAG,EAAE,2EAA2E;IAChFR,MAAM,EAAE,CACN,OAAO,EACP,WAAW,EACX,YAAY,EACZ,KAAK,EACL,MAAM,EACN,WAAW,EACX,UAAU,EACV,MAAM,CACP;IACDE,OAAO,EAAE,OAAO;IAChBV,GAAG,EAAE;EACP,CAAC;EACDkB,WAAW,EAAE;IACXV,MAAM,EAAEW,OAAO;IACfT,OAAO,EAAEZ,YAAY;IACrBE,GAAG,EAAE;EACP,CAAC;EAED;AACF;AACA;EACEF,YAAY,EAAE;IACZkB,GAAG,EAAE,2DAA2D;IAChER,MAAM,EAAEW,OAAO;IACfT,OAAO,EAAEZ;EACX,CAAC;EACDsB,aAAa,EAAE;IACbJ,GAAG,EAAE,4DAA4D;IACjER,MAAM,EAAEW,OAAO;IACfT,OAAO,EAAER;EACX,CAAC;EACDC,MAAM,EAAE;IACNa,GAAG,EAAE,qDAAqD;IAC1DR,MAAM,EAAEW,OAAO;IACfT,OAAO,EAAEP;EACX,CAAC;EAED;AACF;AACA;EACEkB,WAAW,EAAE;IACXL,GAAG,EAAE,0CAA0C;IAC/CR,MAAM,EAAEW,OAAO;IACfnB,GAAG,EAAE,oBAAoB;IACzBU,OAAO,EAAE;EACX,CAAC;EAED;AACF;AACA;EACEY,WAAW,EAAE;IACXN,GAAG,EAAE,2BAA2B;IAChCR,MAAM,EAAEC,MAAM;IACdC,OAAO,EAAE;EACX,CAAC;EACDa,cAAc,EAAE;IACdP,GAAG,EAAE,+FAA+F;IACpGR,MAAM,EAAEC,MAAM;IACde,QAAQ,EAAE,IAAI;IACdd,OAAO,EAAE,EAAE;IACXV,GAAG,EAAE;EACP,CAAsB;EACtByB,YAAY,EAAE;IACZT,GAAG,EAAE,mGAAmG;IACxGR,MAAM,EAAEC,MAAM;IACdC,OAAO,EAAE,EAAE;IACXV,GAAG,EAAE;EACP,CAAsB;EACtB0B,QAAQ,EAAE;IACRlB,MAAM,EAAEC,MAAM;IACdC,OAAO,EAAE,MAAM;IAAE;IACjBV,GAAG,EAAE;EACP,CAAC;EAED;AACF;AACA;AACA;EACE2B,cAAc,EAAE;IACdnB,MAAM,EAAEoB,MAAM;IACdlB,OAAO,EAAEL,OAAO,GAAG,EAAE;IAAE;IACvBL,GAAG,EAAE;EACP,CAAC;EACD6B,0BAA0B,EAAE;IAC1BrB,MAAM,EAAEoB,MAAM;IACdlB,OAAO,EAAEN,SAAS,GAAG,EAAE;IACvBJ,GAAG,EAAE;EACP,CAAC;EACD8B,qBAAqB,EAAE;IACrBtB,MAAM,EAAEC,MAAM;IACdC,OAAO,EAAE,EAAE;IACXqB,SAAS,EAAE,IAAI;IACf/B,GAAG,EAAE;EACP,CAAsB;EACtBgC,KAAK,EAAE;IACLC,IAAI,EAAE;MACJjB,GAAG,EAAE,kBAAkB;MACvBR,MAAM,EAAEC,MAAM;MACdC,OAAO,EAAE,EAAE;MACXV,GAAG,EAAE;IACP,CAAsB;IACtBkC,QAAQ,EAAE;MACRlB,GAAG,EAAE,sBAAsB;MAC3BR,MAAM,EAAEC,MAAM;MACdC,OAAO,EAAE,EAAE;MACXV,GAAG,EAAE;IACP,CAAsB;IACtBmC,QAAQ,EAAE;MACRnB,GAAG,EAAE,sBAAsB;MAC3BR,MAAM,EAAE,GAAG;MACXE,OAAO,EAAE,EAAE;MACXqB,SAAS,EAAE,IAAI;MACf/B,GAAG,EAAE;IACP,CAAsB;IACtBoC,SAAS,EAAE;MACTpB,GAAG,EAAE,wFAAwF;MAC7FR,MAAM,EAAEC,MAAM;MACdC,OAAO,EAAE,EAAE;MACXV,GAAG,EAAE;IACP;EACF,CAAC;EACDqC,OAAO,EAAE;IACPC,MAAM,EAAE;MACNtB,GAAG,EAAE,qBAAqB;MAC1BR,MAAM,EAAEC,MAAM;MACdC,OAAO,EAAE,kBAAkB;MAC3BV,GAAG,EAAE;IACP;EACF,CAAC;EAED;AACF;AACA;AACA;EACEuC,gBAAgB,EAAE;IAChB/B,MAAM,EAAEC,MAAM;IACdC,OAAO,EAAE,EAAE;IACXV,GAAG,EAAE;EACP,CAAsB;EACtBwC,YAAY,EAAE;IACZhC,MAAM,EAAEC,MAAM;IACdC,OAAO,EAAE,EAAE;IACXV,GAAG,EAAE;EACP,CAAsB;EAEtB;AACF;AACA;EACEyC,WAAW,EAAE;IACXjC,MAAM,EAAEC,MAAM;IACdC,OAAO,EAAE,uBAAuB;IAChCV,GAAG,EAAE;EACP,CAAsB;EAEtB0C,aAAa,EAAE;IACblC,MAAM,EAAEC,MAAM;IACdC,OAAO,EAAE,uBAAuB;IAChCV,GAAG,EAAE;EACP,CAAsB;EAEtB2C,WAAW,EAAE;IACXnC,MAAM,EAAEC,MAAM;IACdC,OAAO,EAAE,uBAAuB;IAChCV,GAAG,EAAE;EACP,CAAsB;EAEtB4C,kBAAkB,EAAE;IAClBpC,MAAM,EAAEC,MAAM;IACdC,OAAO,EAAE,OAAO;IAChBV,GAAG,EAAE;EACP,CAAC;EAED;AACF;AACA;EACE6C,GAAG,EAAE;IACHC,OAAO,EAAE;MACP9B,GAAG,EAAE,oBAAoB;MACzBR,MAAM,EAAEW,OAAO;MACfT,OAAO,EAAE,CAACP,MAAM;MAChBH,GAAG,EAAE;IACP,CAAC;IACD+C,KAAK,EAAE;MACL/B,GAAG,EAAE,eAAe;MACpBR,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC;MACtEE,OAAO,EAAE,MAAM;MACfV,GAAG,EAAE;IACP,CAA+B;IAC/BQ,MAAM,EAAE;MACNQ,GAAG,EAAE,2BAA2B;MAChCR,MAAM,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC;MAC9BE,OAAO,EAAEZ,YAAY,GAAG,KAAK,GAAG,aAAa;MAC7CE,GAAG,EAAE;IACP,CAAqC;IACrCgD,MAAM,EAAE;MACNhC,GAAG,EAAE,qBAAqB;MAC1BR,MAAM,EAAEyC,KAAK;MACbvC,OAAO,EAAEZ,YAAY,GACjB,CAAC,2BAA2B,EAAE,oBAAoB,EAAE,aAAa,CAAC,GAClE,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc;IACnC;EACF,CAAC;EAEDoD,QAAQ,EAAE;IACR1C,MAAM,EAAEyC,KAAK;IACbvC,OAAO,EAAE,CAAC,oDAAoD,CAAC;IAC/DV,GAAG,EAAE;EACP,CAAC;EAEDmD,aAAa,EAAE;IACbnC,GAAG,EAAE,gCAAgC;IACrCR,MAAM,EAAEC,MAAM;IACdC,OAAO,EAAE,SAAS;IAClBV,GAAG,EAAE;EACP,CAAC;EAEDoD,sBAAsB,EAAE;IACtBpC,GAAG,EAAE,wDAAwD;IAC7DR,MAAM,EAAEC,MAAM;IACdC,OAAO,EAAE,EAAE;IACXV,GAAG,EAAE;EACP;AACF,CAAC,CAAC;AAEFM,MAAM,CAAC+C,QAAQ,CAAC;EAAEC,OAAO,EAAE;AAAS,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"index.js","names":["resolve","convict","isProduction","process","env","NODE_ENV","isDev","isTest","oneMinute","oneHour","config","appDir","format","String","default","import","meta","dirname","publicDir","port","doc","cdpEnvironment","enforceCsrf","Boolean","isDevelopment","serviceName","serviceVersion","nullable","feedbackLink","phaseTag","sessionTimeout","Number","confirmationSessionTimeout","sessionCookiePassword","sensitive","redis","host","username","password","keyPrefix","tracing","header","notifyTemplateId","notifyAPIKey","designerUrl","submissionUrl","uploaderUrl","uploaderBucketName","log","enabled","level","redact","Array","safelist","stagingPrefix","submissionEmailAddress","validate","allowed"],"sources":["../../src/config/index.ts"],"sourcesContent":["import { resolve } from 'node:path'\n\nimport convict, { type SchemaObj } from 'convict'\nimport { type LevelWithSilent } from 'pino'\n\nimport 'dotenv/config'\n\nconst isProduction = process.env.NODE_ENV === 'production'\nconst isDev = process.env.NODE_ENV !== 'production'\nconst isTest = process.env.NODE_ENV === 'test'\n\nconst oneMinute = 1000 * 60\nconst oneHour = oneMinute * 60\n\nexport const config = convict({\n  appDir: {\n    format: String,\n    default: resolve(import.meta.dirname, '../server')\n  },\n  publicDir: {\n    format: String,\n    default: isTest\n      ? resolve(import.meta.dirname, '../../test/fixtures')\n      : resolve(import.meta.dirname, '../../.public')\n  },\n\n  /**\n   * Server\n   */\n  port: {\n    format: 'port',\n    default: 3009,\n    env: 'PORT'\n  },\n  env: {\n    doc: 'The application environment.',\n    format: ['production', 'development', 'test'],\n    default: 'development',\n    env: 'NODE_ENV'\n  },\n  cdpEnvironment: {\n    doc: 'The CDP environment the app is currently in, with the addition of \"local\"',\n    format: [\n      'local',\n      'infra-dev',\n      'management',\n      'dev',\n      'test',\n      'perf-test',\n      'ext-test',\n      'prod'\n    ],\n    default: 'local',\n    env: 'ENVIRONMENT'\n  },\n  enforceCsrf: {\n    format: Boolean,\n    default: isProduction,\n    env: 'ENFORCE_CSRF'\n  },\n\n  /**\n   * Helper flags\n   */\n  isProduction: {\n    doc: 'If this application running in the production environment',\n    format: Boolean,\n    default: isProduction\n  },\n  isDevelopment: {\n    doc: 'If this application running in the development environment',\n    format: Boolean,\n    default: isDev\n  },\n  isTest: {\n    doc: 'If this application running in the test environment',\n    format: Boolean,\n    default: isTest\n  },\n\n  /**\n   * Service\n   */\n  serviceName: {\n    doc: 'Applications Service Name',\n    format: String,\n    default: 'Digital Express Toolkit'\n  },\n  serviceVersion: {\n    doc: 'The service version, this variable is injected into your docker container in CDP environments',\n    format: String,\n    nullable: true,\n    default: '',\n    env: 'SERVICE_VERSION'\n  } as SchemaObj<string>,\n  feedbackLink: {\n    doc: 'Used in your phase banner. Can be a URL or more commonly mailto mailto:feedback@department.gov.uk',\n    format: String,\n    default: '',\n    env: 'FEEDBACK_LINK'\n  } as SchemaObj<string>,\n  phaseTag: {\n    format: String,\n    default: 'beta', // Accepts \"alpha\" |\"beta\" | \"\"\n    env: 'PHASE_TAG'\n  },\n\n  /**\n   * Session storage\n   * Redis integration is optional, but recommended for production environments.\n   */\n  sessionTimeout: {\n    format: Number,\n    default: oneHour * 24, // 1 day\n    env: 'SESSION_TIMEOUT'\n  },\n  confirmationSessionTimeout: {\n    format: Number,\n    default: oneMinute * 20,\n    env: 'CONFIRMATION_SESSION_TIMEOUT'\n  },\n  sessionCookiePassword: {\n    format: String,\n    default: '',\n    sensitive: true,\n    env: 'SESSION_COOKIE_PASSWORD'\n  } as SchemaObj<string>,\n  redis: {\n    host: {\n      doc: 'Redis cache host',\n      format: String,\n      default: '',\n      env: 'REDIS_HOST'\n    } as SchemaObj<string>,\n    username: {\n      doc: 'Redis cache username',\n      format: String,\n      default: '',\n      env: 'REDIS_USERNAME'\n    } as SchemaObj<string>,\n    password: {\n      doc: 'Redis cache password',\n      format: '*',\n      default: '',\n      sensitive: true,\n      env: 'REDIS_PASSWORD'\n    } as SchemaObj<string>,\n    keyPrefix: {\n      doc: 'Redis cache key prefix name used to isolate the cached results across multiple clients',\n      format: String,\n      default: '',\n      env: 'REDIS_KEY_PREFIX'\n    } as SchemaObj<string>\n  },\n  tracing: {\n    header: {\n      doc: 'Tracing header name',\n      format: String,\n      default: 'x-cdp-request-id',\n      env: 'TRACING_HEADER'\n    } as SchemaObj<string>\n  },\n\n  /**\n   * Email outputs\n   * Email outputs will use notify to send an email to a single inbox.\n   */\n  notifyTemplateId: {\n    format: String,\n    default: '',\n    env: 'NOTIFY_TEMPLATE_ID'\n  } as SchemaObj<string>,\n  notifyAPIKey: {\n    format: String,\n    default: '',\n    env: 'NOTIFY_API_KEY'\n  } as SchemaObj<string>,\n\n  /**\n   * API integrations\n   */\n  designerUrl: {\n    format: String,\n    default: 'http://localhost:3000',\n    env: 'DESIGNER_URL'\n  } as SchemaObj<string>,\n\n  submissionUrl: {\n    format: String,\n    default: 'http://localhost:3002',\n    env: 'SUBMISSION_URL'\n  } as SchemaObj<string>,\n\n  uploaderUrl: {\n    format: String,\n    default: 'http://localhost:7337',\n    env: 'UPLOADER_URL'\n  } as SchemaObj<string>,\n\n  uploaderBucketName: {\n    format: String,\n    default: 'files',\n    env: 'UPLOADER_BUCKET_NAME'\n  },\n\n  /**\n   * Logging\n   */\n  log: {\n    enabled: {\n      doc: 'Is logging enabled',\n      format: Boolean,\n      default: !isTest,\n      env: 'LOG_ENABLED'\n    },\n    level: {\n      doc: 'Logging level',\n      format: ['fatal', 'error', 'warn', 'info', 'debug', 'trace', 'silent'],\n      default: 'info',\n      env: 'LOG_LEVEL'\n    } as SchemaObj<LevelWithSilent>,\n    format: {\n      doc: 'Format to output logs in.',\n      format: ['ecs', 'pino-pretty'],\n      default: isProduction ? 'ecs' : 'pino-pretty',\n      env: 'LOG_FORMAT'\n    } as SchemaObj<'ecs' | 'pino-pretty'>,\n    redact: {\n      doc: 'Log paths to redact',\n      format: Array,\n      default: isProduction\n        ? ['req.headers.authorization', 'req.headers.cookie', 'res.headers']\n        : ['req', 'res', 'responseTime']\n    }\n  },\n\n  safelist: {\n    format: Array,\n    default: ['61bca17e-fe74-40e0-9c15-a901ad120eca.mock.pstmn.io'],\n    env: 'SAFELIST'\n  },\n\n  stagingPrefix: {\n    doc: 'Prefix for staging files in S3',\n    format: String,\n    default: 'staging',\n    env: 'STAGING_PREFIX'\n  },\n\n  submissionEmailAddress: {\n    doc: 'Email address to send the form to (local devtool only)',\n    format: String,\n    default: '',\n    env: 'SUBMISSION_EMAIL_ADDRESS'\n  } as SchemaObj<string>\n})\n\nconfig.validate({ allowed: 'strict' })\n"],"mappings":"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","ignoreList":[]}

package/.server/server/plugins/engine/index.js

@@ -1,13 +1,14 @@
 import { engine } from "./helpers.js";
 import { plugin } from "./plugin.js";
-import { checkComponentTemplates, checkErrorTemplates, evaluate } from "../nunjucks/environment.js";
+import { checkComponentTemplates, checkErrorTemplates, evaluate, govukRebrand } from "../nunjucks/environment.js";
 import * as filters from "../nunjucks/filters/index.js";
 export { getPageHref } from "./helpers.js";
 export { context } from "../nunjucks/context.js";
 const globals = {
   checkComponentTemplates,
   checkErrorTemplates,
-  evaluate
+  evaluate,
+  govukRebrand
 };
 export const VIEW_PATH = 'src/server/plugins/engine/views';
 export const PLUGIN_PATH = 'node_modules/@defra/forms-engine-plugin';

package/.server/server/plugins/engine/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["engine","plugin","checkComponentTemplates","checkErrorTemplates","evaluate","filters","getPageHref","context","globals","VIEW_PATH","PLUGIN_PATH","prepareNunjucksEnvironment","env","additionalFilters","name","nunjucksFilter","Object","entries","addFilter","nunjucksGlobal","addGlobal","filter","registerFilter"],"sources":["../../../../src/server/plugins/engine/index.ts"],"sourcesContent":["import { type Environment } from 'nunjucks'\n\nimport { engine } from '~/src/server/plugins/engine/helpers.js'\nimport { plugin } from '~/src/server/plugins/engine/plugin.js'\nimport { type FilterFunction } from '~/src/server/plugins/engine/types.js'\nimport {\n  checkComponentTemplates,\n  checkErrorTemplates,\n  evaluate\n} from '~/src/server/plugins/nunjucks/environment.js'\nimport * as filters from '~/src/server/plugins/nunjucks/filters/index.js'\n\nexport { getPageHref } from '~/src/server/plugins/engine/helpers.js'\nexport { context } from '~/src/server/plugins/nunjucks/context.js'\n\nconst globals = {\n  checkComponentTemplates,\n  checkErrorTemplates,\n  evaluate\n}\n\nexport const VIEW_PATH = 'src/server/plugins/engine/views'\nexport const PLUGIN_PATH = 'node_modules/@defra/forms-engine-plugin'\n\nexport const prepareNunjucksEnvironment = function (\n  env: Environment,\n  additionalFilters?: Record<string, FilterFunction>\n) {\n  for (const [name, nunjucksFilter] of Object.entries(filters)) {\n    env.addFilter(name, nunjucksFilter)\n  }\n\n  for (const [name, nunjucksGlobal] of Object.entries(globals)) {\n    env.addGlobal(name, nunjucksGlobal)\n  }\n\n  // Apply any additional filters to both the liquid and nunjucks engines\n  if (additionalFilters) {\n    for (const [name, filter] of Object.entries(additionalFilters)) {\n      env.addFilter(name, filter)\n      engine.registerFilter(name, filter)\n    }\n  }\n}\n\nexport default plugin\n"],"mappings":"AAEA,SAASA,MAAM;AACf,SAASC,MAAM;AAEf,SACEC,uBAAuB,EACvBC,mBAAmB,EACnBC,QAAQ;AAEV,OAAO,KAAKC,OAAO;AAEnB,SAASC,WAAW;AACpB,SAASC,OAAO;AAEhB,MAAMC,OAAO,GAAG;EACdN,uBAAuB;EACvBC,mBAAmB;EACnBC;AACF,CAAC;AAED,OAAO,MAAMK,SAAS,GAAG,iCAAiC;AAC1D,OAAO,MAAMC,WAAW,GAAG,yCAAyC;AAEpE,OAAO,MAAMC,0BAA0B,GAAG,SAAAA,CACxCC,GAAgB,EAChBC,iBAAkD,EAClD;EACA,KAAK,MAAM,CAACC,IAAI,EAAEC,cAAc,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACZ,OAAO,CAAC,EAAE;IAC5DO,GAAG,CAACM,SAAS,CAACJ,IAAI,EAAEC,cAAc,CAAC;EACrC;EAEA,KAAK,MAAM,CAACD,IAAI,EAAEK,cAAc,CAAC,IAAIH,MAAM,CAACC,OAAO,CAACT,OAAO,CAAC,EAAE;IAC5DI,GAAG,CAACQ,SAAS,CAACN,IAAI,EAAEK,cAAc,CAAC;EACrC;;EAEA;EACA,IAAIN,iBAAiB,EAAE;IACrB,KAAK,MAAM,CAACC,IAAI,EAAEO,MAAM,CAAC,IAAIL,MAAM,CAACC,OAAO,CAACJ,iBAAiB,CAAC,EAAE;MAC9DD,GAAG,CAACM,SAAS,CAACJ,IAAI,EAAEO,MAAM,CAAC;MAC3BrB,MAAM,CAACsB,cAAc,CAACR,IAAI,EAAEO,MAAM,CAAC;IACrC;EACF;AACF,CAAC;AAED,eAAepB,MAAM","ignoreList":[]}
+{"version":3,"file":"index.js","names":["engine","plugin","checkComponentTemplates","checkErrorTemplates","evaluate","govukRebrand","filters","getPageHref","context","globals","VIEW_PATH","PLUGIN_PATH","prepareNunjucksEnvironment","env","additionalFilters","name","nunjucksFilter","Object","entries","addFilter","nunjucksGlobal","addGlobal","filter","registerFilter"],"sources":["../../../../src/server/plugins/engine/index.ts"],"sourcesContent":["import { type Environment } from 'nunjucks'\n\nimport { engine } from '~/src/server/plugins/engine/helpers.js'\nimport { plugin } from '~/src/server/plugins/engine/plugin.js'\nimport { type FilterFunction } from '~/src/server/plugins/engine/types.js'\nimport {\n  checkComponentTemplates,\n  checkErrorTemplates,\n  evaluate,\n  govukRebrand\n} from '~/src/server/plugins/nunjucks/environment.js'\nimport * as filters from '~/src/server/plugins/nunjucks/filters/index.js'\n\nexport { getPageHref } from '~/src/server/plugins/engine/helpers.js'\nexport { context } from '~/src/server/plugins/nunjucks/context.js'\n\nconst globals = {\n  checkComponentTemplates,\n  checkErrorTemplates,\n  evaluate,\n  govukRebrand\n}\n\nexport const VIEW_PATH = 'src/server/plugins/engine/views'\nexport const PLUGIN_PATH = 'node_modules/@defra/forms-engine-plugin'\n\nexport const prepareNunjucksEnvironment = function (\n  env: Environment,\n  additionalFilters?: Record<string, FilterFunction>\n) {\n  for (const [name, nunjucksFilter] of Object.entries(filters)) {\n    env.addFilter(name, nunjucksFilter)\n  }\n\n  for (const [name, nunjucksGlobal] of Object.entries(globals)) {\n    env.addGlobal(name, nunjucksGlobal)\n  }\n\n  // Apply any additional filters to both the liquid and nunjucks engines\n  if (additionalFilters) {\n    for (const [name, filter] of Object.entries(additionalFilters)) {\n      env.addFilter(name, filter)\n      engine.registerFilter(name, filter)\n    }\n  }\n}\n\nexport default plugin\n"],"mappings":"AAEA,SAASA,MAAM;AACf,SAASC,MAAM;AAEf,SACEC,uBAAuB,EACvBC,mBAAmB,EACnBC,QAAQ,EACRC,YAAY;AAEd,OAAO,KAAKC,OAAO;AAEnB,SAASC,WAAW;AACpB,SAASC,OAAO;AAEhB,MAAMC,OAAO,GAAG;EACdP,uBAAuB;EACvBC,mBAAmB;EACnBC,QAAQ;EACRC;AACF,CAAC;AAED,OAAO,MAAMK,SAAS,GAAG,iCAAiC;AAC1D,OAAO,MAAMC,WAAW,GAAG,yCAAyC;AAEpE,OAAO,MAAMC,0BAA0B,GAAG,SAAAA,CACxCC,GAAgB,EAChBC,iBAAkD,EAClD;EACA,KAAK,MAAM,CAACC,IAAI,EAAEC,cAAc,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACZ,OAAO,CAAC,EAAE;IAC5DO,GAAG,CAACM,SAAS,CAACJ,IAAI,EAAEC,cAAc,CAAC;EACrC;EAEA,KAAK,MAAM,CAACD,IAAI,EAAEK,cAAc,CAAC,IAAIH,MAAM,CAACC,OAAO,CAACT,OAAO,CAAC,EAAE;IAC5DI,GAAG,CAACQ,SAAS,CAACN,IAAI,EAAEK,cAAc,CAAC;EACrC;;EAEA;EACA,IAAIN,iBAAiB,EAAE;IACrB,KAAK,MAAM,CAACC,IAAI,EAAEO,MAAM,CAAC,IAAIL,MAAM,CAACC,OAAO,CAACJ,iBAAiB,CAAC,EAAE;MAC9DD,GAAG,CAACM,SAAS,CAACJ,IAAI,EAAEO,MAAM,CAAC;MAC3BtB,MAAM,CAACuB,cAAc,CAACR,IAAI,EAAEO,MAAM,CAAC;IACrC;EACF;AACF,CAAC;AAED,eAAerB,MAAM","ignoreList":[]}

package/.server/server/plugins/engine/views/components/tag-env/template.njk

@@ -1,32 +1,9 @@
 {%- from "govuk/components/tag/macro.njk" import govukTag -%}
-{% if govukRebrand %}
-  {% set tagEnv = " app-tag--env app-tag--env-rebrand" %}
-{% else %}
-  {% set tagEnv = " app-tag--env" %}
-{% endif %}
-{%- switch params.env %}
-  {% case "local" %}
-    {% set text = "Local" %}
-    {% set classes = "govuk-tag--green" %}
-  {% case "dev" %}
-    {% set text = "Development" %}
-    {% set classes = "govuk-tag--grey" %}
-  {% case "test" %}
-    {% set text = "Test" %}
-    {% set classes = "govuk-tag--yellow" %}
-  {% case "ext-test" %}
-    {% set text = "External test" %}
-    {% set classes = "govuk-tag--yellow" %}
-  {% case "perf-test" %}
-    {% set text = "Performance test" %}
-    {% set classes = "govuk-tag--yellow" %}
-  {% case "prod" %}
-    {% set text = "Production" %}
-    {% set classes = "govuk-tag--red" %}
-  {% default %}
-    {% set text = params.env | replace("-", " ") | capitalize %}
-    {% set classes = "govuk-tag--grey" %}
-{% endswitch -%}
+
+{% set tagEnv = " app-tag--env" %}
+
+{% set text = params.env | replace("-", " ") | capitalize %}
+{% set classes = "govuk-tag--grey" %}
 
 {{ govukTag({
   text: text,

package/.server/server/plugins/engine/views/components/tag-env/template.test.js

@@ -1,59 +1,25 @@
 import { renderMacro } from "../../../../../../../test/helpers/component-helpers.js";
 describe('Tag environment component', () => {
-  describe.each([{
-    text: 'Local',
-    env: 'local',
-    colour: 'green'
-  }, {
-    text: 'Development',
-    env: 'dev',
-    colour: 'grey'
-  }, {
-    text: 'Test',
-    env: 'test',
-    colour: 'yellow'
-  }, {
-    text: 'External test',
-    env: 'ext-test',
-    colour: 'yellow'
-  }, {
-    text: 'Performance test',
-    env: 'perf-test',
-    colour: 'yellow'
-  }, {
-    text: 'Production',
-    env: 'prod',
-    colour: 'red'
-  }, {
-    text: 'Unknown environment',
-    env: 'unknown-environment',
-    colour: 'grey'
-  }])('Environment: $text', ({
-    text,
-    env,
-    colour
-  }) => {
-    let $component = /** @type {HTMLElement | null} */null;
-    beforeEach(() => {
-      const {
-        container
-      } = renderMacro('appTagEnv', 'components/tag-env/macro.njk', {
-        params: {
-          env
-        }
-      });
-      $component = container.getByRole('strong');
-    });
-    it('should render contents', () => {
-      expect($component).toBeInTheDocument();
-      expect($component).toHaveClass('govuk-tag');
-    });
-    it('should have text content', () => {
-      expect($component).toHaveTextContent(text);
-    });
-    it('should use environment colour', () => {
-      expect($component).toHaveClass(`govuk-tag--${colour}`);
+  let $component = /** @type {HTMLElement | null} */null;
+  beforeEach(() => {
+    const {
+      container
+    } = renderMacro('appTagEnv', 'components/tag-env/macro.njk', {
+      params: {
+        env: 'Devtool'
+      }
     });
+    $component = container.getByRole('strong');
+  });
+  it('should render contents', () => {
+    expect($component).toBeInTheDocument();
+    expect($component).toHaveClass('govuk-tag');
+  });
+  it('should have text content', () => {
+    expect($component).toHaveTextContent('Devtool');
+  });
+  it('should use environment colour', () => {
+    expect($component).toHaveClass(`govuk-tag--grey`);
   });
 });
 //# sourceMappingURL=template.test.js.map

package/.server/server/plugins/engine/views/components/tag-env/template.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.test.js","names":["renderMacro","describe","each","text","env","colour","$component","beforeEach","container","params","getByRole","it","expect","toBeInTheDocument","toHaveClass","toHaveTextContent"],"sources":["../../../../../../../src/server/plugins/engine/views/components/tag-env/template.test.js"],"sourcesContent":["import { renderMacro } from '~/test/helpers/component-helpers.js'\n\ndescribe('Tag environment component', () => {\n  describe.each([\n    {\n      text: 'Local',\n      env: 'local',\n      colour: 'green'\n    },\n    {\n      text: 'Development',\n      env: 'dev',\n      colour: 'grey'\n    },\n    {\n      text: 'Test',\n      env: 'test',\n      colour: 'yellow'\n    },\n    {\n      text: 'External test',\n      env: 'ext-test',\n      colour: 'yellow'\n    },\n    {\n      text: 'Performance test',\n      env: 'perf-test',\n      colour: 'yellow'\n    },\n    {\n      text: 'Production',\n      env: 'prod',\n      colour: 'red'\n    },\n    {\n      text: 'Unknown environment',\n      env: 'unknown-environment',\n      colour: 'grey'\n    }\n  ])('Environment: $text', ({ text, env, colour }) => {\n    let $component = /** @type {HTMLElement | null} */ (null)\n\n    beforeEach(() => {\n      const { container } = renderMacro(\n        'appTagEnv',\n        'components/tag-env/macro.njk',\n        { params: { env } }\n      )\n\n      $component = container.getByRole('strong')\n    })\n\n    it('should render contents', () => {\n      expect($component).toBeInTheDocument()\n      expect($component).toHaveClass('govuk-tag')\n    })\n\n    it('should have text content', () => {\n      expect($component).toHaveTextContent(text)\n    })\n\n    it('should use environment colour', () => {\n      expect($component).toHaveClass(`govuk-tag--${colour}`)\n    })\n  })\n})\n"],"mappings":"AAAA,SAASA,WAAW;AAEpBC,QAAQ,CAAC,2BAA2B,EAAE,MAAM;EAC1CA,QAAQ,CAACC,IAAI,CAAC,CACZ;IACEC,IAAI,EAAE,OAAO;IACbC,GAAG,EAAE,OAAO;IACZC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,aAAa;IACnBC,GAAG,EAAE,KAAK;IACVC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,MAAM;IACZC,GAAG,EAAE,MAAM;IACXC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,eAAe;IACrBC,GAAG,EAAE,UAAU;IACfC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,kBAAkB;IACxBC,GAAG,EAAE,WAAW;IAChBC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,YAAY;IAClBC,GAAG,EAAE,MAAM;IACXC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,qBAAqB;IAC3BC,GAAG,EAAE,qBAAqB;IAC1BC,MAAM,EAAE;EACV,CAAC,CACF,CAAC,CAAC,oBAAoB,EAAE,CAAC;IAAEF,IAAI;IAAEC,GAAG;IAAEC;EAAO,CAAC,KAAK;IAClD,IAAIC,UAAU,GAAG,iCAAmC,IAAK;IAEzDC,UAAU,CAAC,MAAM;MACf,MAAM;QAAEC;MAAU,CAAC,GAAGR,WAAW,CAC/B,WAAW,EACX,8BAA8B,EAC9B;QAAES,MAAM,EAAE;UAAEL;QAAI;MAAE,CACpB,CAAC;MAEDE,UAAU,GAAGE,SAAS,CAACE,SAAS,CAAC,QAAQ,CAAC;IAC5C,CAAC,CAAC;IAEFC,EAAE,CAAC,wBAAwB,EAAE,MAAM;MACjCC,MAAM,CAACN,UAAU,CAAC,CAACO,iBAAiB,CAAC,CAAC;MACtCD,MAAM,CAACN,UAAU,CAAC,CAACQ,WAAW,CAAC,WAAW,CAAC;IAC7C,CAAC,CAAC;IAEFH,EAAE,CAAC,0BAA0B,EAAE,MAAM;MACnCC,MAAM,CAACN,UAAU,CAAC,CAACS,iBAAiB,CAACZ,IAAI,CAAC;IAC5C,CAAC,CAAC;IAEFQ,EAAE,CAAC,+BAA+B,EAAE,MAAM;MACxCC,MAAM,CAACN,UAAU,CAAC,CAACQ,WAAW,CAAC,cAAcT,MAAM,EAAE,CAAC;IACxD,CAAC,CAAC;EACJ,CAAC,CAAC;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"template.test.js","names":["renderMacro","describe","$component","beforeEach","container","params","env","getByRole","it","expect","toBeInTheDocument","toHaveClass","toHaveTextContent"],"sources":["../../../../../../../src/server/plugins/engine/views/components/tag-env/template.test.js"],"sourcesContent":["import { renderMacro } from '~/test/helpers/component-helpers.js'\n\ndescribe('Tag environment component', () => {\n  let $component = /** @type {HTMLElement | null} */ (null)\n\n  beforeEach(() => {\n    const { container } = renderMacro(\n      'appTagEnv',\n      'components/tag-env/macro.njk',\n      { params: { env: 'Devtool' } }\n    )\n\n    $component = container.getByRole('strong')\n  })\n\n  it('should render contents', () => {\n    expect($component).toBeInTheDocument()\n    expect($component).toHaveClass('govuk-tag')\n  })\n\n  it('should have text content', () => {\n    expect($component).toHaveTextContent('Devtool')\n  })\n\n  it('should use environment colour', () => {\n    expect($component).toHaveClass(`govuk-tag--grey`)\n  })\n})\n"],"mappings":"AAAA,SAASA,WAAW;AAEpBC,QAAQ,CAAC,2BAA2B,EAAE,MAAM;EAC1C,IAAIC,UAAU,GAAG,iCAAmC,IAAK;EAEzDC,UAAU,CAAC,MAAM;IACf,MAAM;MAAEC;IAAU,CAAC,GAAGJ,WAAW,CAC/B,WAAW,EACX,8BAA8B,EAC9B;MAAEK,MAAM,EAAE;QAAEC,GAAG,EAAE;MAAU;IAAE,CAC/B,CAAC;IAEDJ,UAAU,GAAGE,SAAS,CAACG,SAAS,CAAC,QAAQ,CAAC;EAC5C,CAAC,CAAC;EAEFC,EAAE,CAAC,wBAAwB,EAAE,MAAM;IACjCC,MAAM,CAACP,UAAU,CAAC,CAACQ,iBAAiB,CAAC,CAAC;IACtCD,MAAM,CAACP,UAAU,CAAC,CAACS,WAAW,CAAC,WAAW,CAAC;EAC7C,CAAC,CAAC;EAEFH,EAAE,CAAC,0BAA0B,EAAE,MAAM;IACnCC,MAAM,CAACP,UAAU,CAAC,CAACU,iBAAiB,CAAC,SAAS,CAAC;EACjD,CAAC,CAAC;EAEFJ,EAAE,CAAC,+BAA+B,EAAE,MAAM;IACxCC,MAAM,CAACP,UAAU,CAAC,CAACS,WAAW,CAAC,iBAAiB,CAAC;EACnD,CAAC,CAAC;AACJ,CAAC,CAAC","ignoreList":[]}

package/.server/server/plugins/nunjucks/environment.d.ts

@@ -13,6 +13,7 @@ export function checkComponentTemplates(this: NunjucksContext, component: Compon
  * @param {string} template
  */
 export function evaluate(this: NunjucksContext, template: string): string;
+export function govukRebrand(): boolean;
 export const paths: string[];
 export const environment: nunjucks.Environment;
 import type { FormSubmissionError } from '~/src/server/plugins/engine/types.js';

package/.server/server/plugins/nunjucks/environment.js

@@ -86,7 +86,10 @@ export function evaluate(template) {
   return context ? evaluateTemplate(template, context) : template;
 }
 environment.addGlobal('evaluate', evaluate);
-environment.addGlobal('govukRebrand', config.get('showRebrand'));
+export function govukRebrand() {
+  return true;
+}
+environment.addGlobal('govukRebrand', govukRebrand());
 
 /**
  * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'

package/.server/server/plugins/nunjucks/environment.js.map

@@ -1 +1 @@
-{"version":3,"file":"environment.js","names":["dirname","join","ComponentType","nunjucks","resolvePkg","config","evaluateTemplate","filters","govukFrontendPath","sync","paths","get","environment","configure","trimBlocks","lstripBlocks","watch","noCache","name","nunjucksFilter","Object","entries","addFilter","checkErrorTemplates","errors","context","ctx","forEach","error","text","addGlobal","checkComponentTemplates","component","isFormComponent","model","fieldset","legend","label","errorMessage","message","type","Html","content","evaluate","template"],"sources":["../../../../src/server/plugins/nunjucks/environment.js"],"sourcesContent":["import { dirname, join } from 'node:path'\n\nimport { ComponentType } from '@defra/forms-model'\nimport nunjucks from 'nunjucks'\nimport resolvePkg from 'resolve'\n\nimport { config } from '~/src/config/index.js'\nimport { evaluateTemplate } from '~/src/server/plugins/engine/helpers.js'\nimport * as filters from '~/src/server/plugins/nunjucks/filters/index.js'\n\nconst govukFrontendPath = dirname(\n  resolvePkg.sync('govuk-frontend/package.json')\n)\n\nexport const paths = [\n  join(config.get('appDir'), 'plugins/engine/views'),\n  join(config.get('appDir'), 'views')\n]\n\nexport const environment = nunjucks.configure(\n  [...paths, join(govukFrontendPath, 'dist')],\n  {\n    trimBlocks: true,\n    lstripBlocks: true,\n    watch: config.get('isDevelopment'),\n    noCache: config.get('isDevelopment')\n  }\n)\n\nfor (const [name, nunjucksFilter] of Object.entries(filters)) {\n  environment.addFilter(name, nunjucksFilter)\n}\n\n/**\n * @this {NunjucksContext}\n * @param {FormSubmissionError[]} errors\n */\nexport function checkErrorTemplates(errors) {\n  const { context } = this.ctx\n\n  if (!context) {\n    return errors\n  }\n\n  errors.forEach((error) => {\n    error.text = evaluateTemplate(error.text, context)\n  })\n\n  return errors\n}\n\nenvironment.addGlobal('checkErrorTemplates', checkErrorTemplates)\n\n/**\n * @this {NunjucksContext}\n * @param {ComponentViewModel} component\n */\nexport function checkComponentTemplates(component) {\n  const { context } = this.ctx\n\n  if (!context) {\n    return component\n  }\n\n  if (component.isFormComponent) {\n    // Evaluate label/legend text\n    if (component.model.fieldset?.legend?.text) {\n      const legend = component.model.fieldset.legend\n\n      legend.text = evaluateTemplate(legend.text, context)\n    } else if (component.model.label?.text) {\n      const label = component.model.label\n\n      label.text = evaluateTemplate(label.text, context)\n    } else {\n      // No template evaluation needed for other component types\n    }\n\n    // Evaluate error message\n    if (component.model.errorMessage?.text) {\n      const message = component.model.errorMessage\n\n      message.text = evaluateTemplate(message.text, context)\n    }\n  } else if (component.type === ComponentType.Html) {\n    const content = component.model.content\n\n    if (typeof content === 'string') {\n      component.model.content = evaluateTemplate(content, context)\n    }\n  } else {\n    // No template evaluation needed for other component types\n  }\n\n  return component\n}\n\nenvironment.addGlobal('checkComponentTemplates', checkComponentTemplates)\n\n/**\n * @this {NunjucksContext}\n * @param {string} template\n */\nexport function evaluate(template) {\n  const { context } = this.ctx\n\n  return context ? evaluateTemplate(template, context) : template\n}\n\nenvironment.addGlobal('evaluate', evaluate)\nenvironment.addGlobal('govukRebrand', config.get('showRebrand'))\n\n/**\n * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'\n * @import { FormSubmissionError } from '~/src/server/plugins/engine/types.js'\n * @import { ComponentViewModel } from '~/src/server/plugins/engine/components/types.js'\n */\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"environment.js","names":["dirname","join","ComponentType","nunjucks","resolvePkg","config","evaluateTemplate","filters","govukFrontendPath","sync","paths","get","environment","configure","trimBlocks","lstripBlocks","watch","noCache","name","nunjucksFilter","Object","entries","addFilter","checkErrorTemplates","errors","context","ctx","forEach","error","text","addGlobal","checkComponentTemplates","component","isFormComponent","model","fieldset","legend","label","errorMessage","message","type","Html","content","evaluate","template","govukRebrand"],"sources":["../../../../src/server/plugins/nunjucks/environment.js"],"sourcesContent":["import { dirname, join } from 'node:path'\n\nimport { ComponentType } from '@defra/forms-model'\nimport nunjucks from 'nunjucks'\nimport resolvePkg from 'resolve'\n\nimport { config } from '~/src/config/index.js'\nimport { evaluateTemplate } from '~/src/server/plugins/engine/helpers.js'\nimport * as filters from '~/src/server/plugins/nunjucks/filters/index.js'\n\nconst govukFrontendPath = dirname(\n  resolvePkg.sync('govuk-frontend/package.json')\n)\n\nexport const paths = [\n  join(config.get('appDir'), 'plugins/engine/views'),\n  join(config.get('appDir'), 'views')\n]\n\nexport const environment = nunjucks.configure(\n  [...paths, join(govukFrontendPath, 'dist')],\n  {\n    trimBlocks: true,\n    lstripBlocks: true,\n    watch: config.get('isDevelopment'),\n    noCache: config.get('isDevelopment')\n  }\n)\n\nfor (const [name, nunjucksFilter] of Object.entries(filters)) {\n  environment.addFilter(name, nunjucksFilter)\n}\n\n/**\n * @this {NunjucksContext}\n * @param {FormSubmissionError[]} errors\n */\nexport function checkErrorTemplates(errors) {\n  const { context } = this.ctx\n\n  if (!context) {\n    return errors\n  }\n\n  errors.forEach((error) => {\n    error.text = evaluateTemplate(error.text, context)\n  })\n\n  return errors\n}\n\nenvironment.addGlobal('checkErrorTemplates', checkErrorTemplates)\n\n/**\n * @this {NunjucksContext}\n * @param {ComponentViewModel} component\n */\nexport function checkComponentTemplates(component) {\n  const { context } = this.ctx\n\n  if (!context) {\n    return component\n  }\n\n  if (component.isFormComponent) {\n    // Evaluate label/legend text\n    if (component.model.fieldset?.legend?.text) {\n      const legend = component.model.fieldset.legend\n\n      legend.text = evaluateTemplate(legend.text, context)\n    } else if (component.model.label?.text) {\n      const label = component.model.label\n\n      label.text = evaluateTemplate(label.text, context)\n    } else {\n      // No template evaluation needed for other component types\n    }\n\n    // Evaluate error message\n    if (component.model.errorMessage?.text) {\n      const message = component.model.errorMessage\n\n      message.text = evaluateTemplate(message.text, context)\n    }\n  } else if (component.type === ComponentType.Html) {\n    const content = component.model.content\n\n    if (typeof content === 'string') {\n      component.model.content = evaluateTemplate(content, context)\n    }\n  } else {\n    // No template evaluation needed for other component types\n  }\n\n  return component\n}\n\nenvironment.addGlobal('checkComponentTemplates', checkComponentTemplates)\n\n/**\n * @this {NunjucksContext}\n * @param {string} template\n */\nexport function evaluate(template) {\n  const { context } = this.ctx\n\n  return context ? evaluateTemplate(template, context) : template\n}\n\nenvironment.addGlobal('evaluate', evaluate)\n\nexport function govukRebrand() {\n  return true\n}\n\nenvironment.addGlobal('govukRebrand', govukRebrand())\n\n/**\n * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'\n * @import { FormSubmissionError } from '~/src/server/plugins/engine/types.js'\n * @import { ComponentViewModel } from '~/src/server/plugins/engine/components/types.js'\n */\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-engine-plugin",
-  "version": "0.1.27",
+  "version": "0.1.28",
   "description": "Defra forms engine",
   "type": "module",
   "files": [

package/src/client/stylesheets/_tag-env.scss

@@ -21,13 +21,4 @@
       margin: 0 0 0 govuk-spacing(2);
     }
   }
-
-  &-rebrand {
-    vertical-align: middle;
-
-    // Align with product name
-    @include govuk-media-query($from: tablet) {
-      margin: -3px 0 2px;
-    }
-  }
 }

package/src/config/index.ts

@@ -78,16 +78,6 @@ export const config = convict({
     default: isTest
   },
 
-  /**
-   * Feature flags
-   */
-  showRebrand: {
-    doc: 'If this app should show the 2025 rebrand',
-    format: Boolean,
-    env: 'SHOW_GOVUK_REBRAND',
-    default: false
-  },
-
   /**
    * Service
    */

package/src/server/plugins/engine/index.ts

@@ -6,7 +6,8 @@ import { type FilterFunction } from '~/src/server/plugins/engine/types.js'
 import {
   checkComponentTemplates,
   checkErrorTemplates,
-  evaluate
+  evaluate,
+  govukRebrand
 } from '~/src/server/plugins/nunjucks/environment.js'
 import * as filters from '~/src/server/plugins/nunjucks/filters/index.js'
 
@@ -16,7 +17,8 @@ export { context } from '~/src/server/plugins/nunjucks/context.js'
 const globals = {
   checkComponentTemplates,
   checkErrorTemplates,
-  evaluate
+  evaluate,
+  govukRebrand
 }
 
 export const VIEW_PATH = 'src/server/plugins/engine/views'

package/src/server/plugins/engine/views/components/tag-env/template.njk

@@ -1,32 +1,9 @@
 {%- from "govuk/components/tag/macro.njk" import govukTag -%}
-{% if govukRebrand %}
-  {% set tagEnv = " app-tag--env app-tag--env-rebrand" %}
-{% else %}
-  {% set tagEnv = " app-tag--env" %}
-{% endif %}
-{%- switch params.env %}
-  {% case "local" %}
-    {% set text = "Local" %}
-    {% set classes = "govuk-tag--green" %}
-  {% case "dev" %}
-    {% set text = "Development" %}
-    {% set classes = "govuk-tag--grey" %}
-  {% case "test" %}
-    {% set text = "Test" %}
-    {% set classes = "govuk-tag--yellow" %}
-  {% case "ext-test" %}
-    {% set text = "External test" %}
-    {% set classes = "govuk-tag--yellow" %}
-  {% case "perf-test" %}
-    {% set text = "Performance test" %}
-    {% set classes = "govuk-tag--yellow" %}
-  {% case "prod" %}
-    {% set text = "Production" %}
-    {% set classes = "govuk-tag--red" %}
-  {% default %}
-    {% set text = params.env | replace("-", " ") | capitalize %}
-    {% set classes = "govuk-tag--grey" %}
-{% endswitch -%}
+
+{% set tagEnv = " app-tag--env" %}
+
+{% set text = params.env | replace("-", " ") | capitalize %}
+{% set classes = "govuk-tag--grey" %}
 
 {{ govukTag({
   text: text,

package/src/server/plugins/engine/views/components/tag-env/template.test.js

@@ -1,66 +1,28 @@
 import { renderMacro } from '~/test/helpers/component-helpers.js'
 
 describe('Tag environment component', () => {
-  describe.each([
-    {
-      text: 'Local',
-      env: 'local',
-      colour: 'green'
-    },
-    {
-      text: 'Development',
-      env: 'dev',
-      colour: 'grey'
-    },
-    {
-      text: 'Test',
-      env: 'test',
-      colour: 'yellow'
-    },
-    {
-      text: 'External test',
-      env: 'ext-test',
-      colour: 'yellow'
-    },
-    {
-      text: 'Performance test',
-      env: 'perf-test',
-      colour: 'yellow'
-    },
-    {
-      text: 'Production',
-      env: 'prod',
-      colour: 'red'
-    },
-    {
-      text: 'Unknown environment',
-      env: 'unknown-environment',
-      colour: 'grey'
-    }
-  ])('Environment: $text', ({ text, env, colour }) => {
-    let $component = /** @type {HTMLElement | null} */ (null)
+  let $component = /** @type {HTMLElement | null} */ (null)
 
-    beforeEach(() => {
-      const { container } = renderMacro(
-        'appTagEnv',
-        'components/tag-env/macro.njk',
-        { params: { env } }
-      )
+  beforeEach(() => {
+    const { container } = renderMacro(
+      'appTagEnv',
+      'components/tag-env/macro.njk',
+      { params: { env: 'Devtool' } }
+    )
 
-      $component = container.getByRole('strong')
-    })
+    $component = container.getByRole('strong')
+  })
 
-    it('should render contents', () => {
-      expect($component).toBeInTheDocument()
-      expect($component).toHaveClass('govuk-tag')
-    })
+  it('should render contents', () => {
+    expect($component).toBeInTheDocument()
+    expect($component).toHaveClass('govuk-tag')
+  })
 
-    it('should have text content', () => {
-      expect($component).toHaveTextContent(text)
-    })
+  it('should have text content', () => {
+    expect($component).toHaveTextContent('Devtool')
+  })
 
-    it('should use environment colour', () => {
-      expect($component).toHaveClass(`govuk-tag--${colour}`)
-    })
+  it('should use environment colour', () => {
+    expect($component).toHaveClass(`govuk-tag--grey`)
   })
 })

package/src/server/plugins/nunjucks/environment.js

@@ -108,7 +108,12 @@ export function evaluate(template) {
 }
 
 environment.addGlobal('evaluate', evaluate)
-environment.addGlobal('govukRebrand', config.get('showRebrand'))
+
+export function govukRebrand() {
+  return true
+}
+
+environment.addGlobal('govukRebrand', govukRebrand())
 
 /**
  * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'