Merge branch 'main' into test/forms-1621

.devcontainer/Dockerfile

@@ -1,10 +1,11 @@
-ARG VARIANT="18.20.4-bookworm"
+ARG VARIANT="20.18.1-bookworm"
 FROM node:${VARIANT}
 
-# not much in here, could acheive this another way for sure...
-# but this allows us a prepared place to add other things to the container OS.
-
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
+        # Cypress prerequisites for running in Debian containers:
+        # https://docs.cypress.io/app/get-started/install-cypress#UbuntuDebian
+        libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 \
+        libasound2 libxtst6 xauth xvfb \
         # For interactive git rebases
         vim

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
     "dockerfile": "Dockerfile",
     "context": "..",
     "args": {
-      "VARIANT": "18.20.4-bookworm"
+      "VARIANT": "20.18.1-bookworm"
     }
   },
 

.github/workflows/on_push.yaml

@@ -98,7 +98,7 @@ jobs:
     name: Deploy to Prod
     environment:
       name: prod
-      url: https://${{ env.ACRONYM }}.apps.silver.devops.gov.bc.ca/app
+      url: https://submit.digital.gov.bc.ca
     runs-on: ubuntu-latest
     needs:
       - build

.github/workflows/unit-tests.yaml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        version: [18]
+        version: [20]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -49,14 +49,14 @@ jobs:
         env:
           CI: true
       - name: Save Coverage Results
-        if: matrix.version == 18
+        if: matrix.version == 20
         uses: actions/upload-artifact@v4
         with:
           name: coverage-app
           path: ${{ github.workspace }}/app/coverage
           retention-days: 1
       - name: Monitor Coverage
-        if: "matrix.version == 18 && ! github.event.pull_request.head.repo.fork"
+        if: "matrix.version == 20 && ! github.event.pull_request.head.repo.fork"
         uses: slavcodev/coverage-monitor-action@v1
         with:
           comment_mode: update
@@ -78,7 +78,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        version: [18]
+        version: [20]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -106,14 +106,14 @@ jobs:
         env:
           CI: true
       - name: Save Coverage Results
-        if: matrix.version == 18
+        if: matrix.version == 20
         uses: actions/upload-artifact@v4
         with:
           name: coverage-frontend
           path: ${{ github.workspace }}/app/frontend/coverage
           retention-days: 1
       - name: Monitor Coverage
-        if: "matrix.version == 18 && ! github.event.pull_request.head.repo.fork"
+        if: "matrix.version == 20 && ! github.event.pull_request.head.repo.fork"
         uses: slavcodev/coverage-monitor-action@v1
         with:
           comment_mode: update

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/node:18.20.4-alpine3.20
+FROM docker.io/node:20.18.1-alpine3.21
 
 ENV NO_UPDATE_NOTIFIER=true
 WORKDIR /opt/app-root/src/app

app/frontend/tests/unit/components/designer/settings/FormEventStreamSettings.spec.js

@@ -8,10 +8,6 @@ import { useFormStore } from '~/store/form';
 import FormEventStreamSettings from '~/components/designer/settings/FormEventStreamSettings.vue';
 
 describe('FormEventStreamSettings.vue', () => {
-  const crypto = require('crypto').webcrypto;
-  // Shims the crypto property onto global
-  global.crypto = crypto;
-
   const pinia = createTestingPinia();
   setActivePinia(pinia);
 

app/frontend/vite.config.mjs

@@ -33,8 +33,6 @@ export default defineConfig(({ command, mode }) => {
         '~formiojs': resolve(__dirname, './node_modules/formiojs'),
         '~font-awesome': resolve(__dirname, './node_modules/font-awesome'),
         '~vuetify': resolve(__dirname, './node_modules/vuetify'),
-        // no clue why crypto is required, but unit tests will not run without it
-        crypto: 'crypto-js',
       },
     },
     test: {

app/package.json

@@ -59,7 +59,7 @@
     "config": "^3.3.9",
     "cors": "^2.8.5",
     "cryptr": "^6.3.0",
-    "express": "^4.21.1",
+    "express": "^4.21.2",
     "express-basic-auth": "^1.2.1",
     "express-rate-limit": "^7.4.0",
     "express-winston": "^4.2.0",