Fs 3456 node upgrade

.dockerignore

@@ -7,6 +7,7 @@
 */README.md
 **/node_modules
 **/dist
-.yarn/cache
 .yarn/build-state.yml
 .yarn/install-state.gz
+*.jest.*
+jest

.eslintrc.json

@@ -1,8 +1,5 @@
 {
-  "extends": [
-    "prettier",
-    "plugin:json/recommended"
-  ],
+  "extends": ["plugin:json/recommended", "plugin:prettier/recommended"],
   "plugins": ["@babel", "prettier"],
   "parser": "babel-eslint",
   "env": {
@@ -38,7 +35,12 @@
     {
       "files": ["*.ts", "*.tsx"],
       "parser": "@typescript-eslint/parser",
-      "plugins": ["@babel", "prettier", "@typescript-eslint", "eslint-plugin-tsdoc"],
+      "plugins": [
+        "@babel",
+        "prettier",
+        "@typescript-eslint",
+        "eslint-plugin-tsdoc"
+      ],
       "parserOptions": {
         "ecmaFeatures": { "jsx": true }
       }

.github/dependabot.yml

@@ -1,56 +1,9 @@
 version: 2
 updates:
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-  reviewers:
-  - gstevenson
-  ignore:
-  - dependency-name: webpack
-    versions:
-    - 5.26.0
-    - 5.36.2
-    - 5.37.0
-    - 5.37.1
-    - 5.38.1
-    - 5.39.1
-  - dependency-name: i18next
-    versions:
-    - 19.9.2
-    - 20.2.2
-    - 20.2.4
-    - 20.3.1
-  - dependency-name: prismjs
-    versions:
-    - 1.23.0
-  - dependency-name: "@wdio/local-runner"
-    versions:
-    - 7.0.0
-  - dependency-name: "@babel/plugin-transform-runtime"
-    versions:
-    - 7.13.10
-    - 7.13.15
-    - 7.14.3
-  - dependency-name: "@babel/register"
-    versions:
-    - 7.12.13
-    - 7.13.14
-    - 7.13.16
-  - dependency-name: sass-loader
-    versions:
-    - 11.0.1
-    - 11.1.0
-    - 11.1.1
-    - 12.0.0
-  - dependency-name: copy-webpack-plugin
-    versions:
-    - 7.0.0
-    - 8.1.1
-  - dependency-name: lodash
-    versions:
-    - 4.17.21
-  - dependency-name: node-sass
-    versions:
-    - 5.0.0
+  - package-ecosystem: npm
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    reviewers:
+      - jenbutongit

.github/pull_request_template.md

@@ -20,21 +20,12 @@ Please delete options that are not relevant.
 Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce
 the testing if necessary.
 
-Before PR's can be merged they will need to be tested by QA and approved where
-applicable. To flag the change to QA assign **@XGovFormBuilder/qa** as one of the reviewers.
-
 - [ ] Test A
 - [ ] Test B
 
 # Checklist:
 
-- [ ] My changes do not introduce any new linting errors
 - [ ] I have performed a self-review of my own code
 - [ ] I have commented my code, particularly in hard-to-understand areas
 - [ ] I have made corresponding changes to the documentation and versioning
-- [ ] My changes generate no new warnings
-- [ ] I have added tests that prove my fix is effective or that my feature works
-- [ ] New and existing unit tests pass locally with my changes
-- [ ] I have rebased onto main and there are no code conflicts
-- [ ] I have checked deployments are working in all environments
-- [ ] I have updated the architecture diagrams as per Contribute.md
+- [ ] I have updated the architecture diagrams as per Contribute.md OR added an architectural decision record entry

.github/workflows/branch--lint-unit-and-smoke-test.yml

@@ -2,143 +2,46 @@ name: Branch QA
 on:
   pull_request:
     branches:
-      - master
       - main
     paths-ignore:
       - "docs/**"
       - "**/README.md"
       - "python/**"
   workflow_dispatch:
+
 jobs:
+  dependencies:
+    uses: ./.github/workflows/dependabot.yml
+    secrets: inherit #pragma: allowlist secret
   lint-and-test:
-    runs-on: ubuntu-latest
+    needs: [dependencies]
+    if: ${{!contains(github.event.head_commit.message, 'chore(deps-dev)')}}
+    name: Workspace
     strategy:
       matrix:
-        app: [designer, runner, model]
-    name: lint-and-test-${{matrix.app}}
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: "12.x"
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
-
-      - name: Configure yarn caching
-        uses: actions/cache@v2
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install dependencies
-        run: yarn install
-
-      - name: Check existing forms
-        if: ${{ matrix.app == 'runner' }}
-        run: yarn runner check-forms
-
-      - name: Build dependencies
-        run: yarn build:dependencies
-
-      - name: Lint
-        run: yarn ${{matrix.app}} lint
-
-      - name: Test
-        run: yarn ${{matrix.app}} test-cov
-
-      - name: Upload test results artifacts
-        uses: actions/upload-artifact@v2
-        if: ${{ success() || failure() }}
-        with:
-          name: test-results-${{matrix.app}}
-          path: ${{matrix.app}}/test-results
-          retention-days: 14
-
-      - name: Upload test coverage artifacts
-        uses: actions/upload-artifact@v2
-        if: ${{ success() || failure() }}
-        with:
-          name: test-coverage-${{matrix.app}}
-          path: ${{matrix.app}}/test-coverage
-          retention-days: 14
+        workspace: [model, designer, runner]
+    uses: ./.github/workflows/lint-and-test.yml
+    with:
+      workspace: ${{ matrix.workspace }}
+
+  build-designer:
+    name: Designer
+    uses: ./.github/workflows/build.yml
+    with:
+      app: designer
+    secrets: inherit #pragma: allowlist secret
+
+  build-runner:
+    name: Runner
+    uses: ./.github/workflows/build.yml
+    with:
+      app: runner
+    secrets: inherit #pragma: allowlist secret
 
   smoke-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: "12.x"
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
-      - uses: actions/cache@v2
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Docker compose pull
-        run: docker-compose pull
-        # DAYOFYEAR key is used to rotate docker-layer-caching to avoid the layers dandle issue
-        # see https://github.com/satackey/action-docker-layer-caching/issues/55
-        # if you change this, please remember to apply the same changes to main--lint-unit-build-and-publish-images.yml
-        # so main branch cache can be shared with branches
-      - run: echo "DAYOFYEAR = $(date +%j)"
-      - run: echo "DAYOFYEAR=$(date +%j)" >> $GITHUB_ENV
-      - name: Docker layer caching
-        uses: satackey/action-docker-layer-caching@v0.0.11
-        continue-on-error: true
-        with:
-          key: digital-form-builder-${{ env.DAYOFYEAR }}-{hash}
-          restore-keys: |
-            digital-form-builder-${{ env.DAYOFYEAR }}
-      - name: Create .env for ${{ matrix.app }} workspace
-        run: |
-          touch ./${{ matrix.app }}/.env
-          echo LAST_TAG_GH=2.0.${{ github.run_number }}-rc >> ./${{ matrix.app }}/.env
-          echo LAST_COMMIT_GH=${{ github.sha }} >> ./${{ matrix.app }}/.env
-          cat ./${{ matrix.app }}/.env
-      - name: Docker compose build
-        run: |
-          docker-compose build --parallel
-      - name: Docker compose up
-        run: docker-compose up -d
-      - name: Install smoke tests dependencies
-        run: yarn workspaces focus @xgovformbuilder/test
-      - name: Check designer container is running
-        run: |
-          docker ps
-          docker run --network container:designer appropriate/curl -4 --retry 10 --retry-connrefused --retry-delay 10 http://localhost:3000/
-      - name: Check runner container is running
-        run: |
-          docker ps
-          docker run --network container:runner appropriate/curl -4 --retry 10 --retry-connrefused --retry-delay 10 http://localhost:3009/
-      - name: Smoke Test
-        run: |
-          yarn smoke-tests/designer smoke-test-headless
-          ls -lah smoke-tests/designer/reports/
-      - name: Run pa11y
-        run: yarn designer dlx pa11y-ci
-      - name: Run Lighthouse on urls and validate with lighthouserc
-        uses: treosh/lighthouse-ci-action@v8
-        with:
-          configPath: "./lighthouserc.js"
-          uploadArtifacts: true
-      - name: "Tar files"
-        if: ${{ success() || failure() }}
-        run: tar -cvf smoke-tests.tar smoke-tests/designer/reports
-      - uses: actions/upload-artifact@v2
-        if: ${{ success() || failure() }}
-        with:
-          name: smoke-tests
-          path: smoke-tests.tar
-          retention-days: 14
+    needs: [build-runner, build-designer]
+    uses: ./.github/workflows/smoke-test.yml
+    with:
+      runner-cache-ref: ${{needs.build-runner.outputs.tag}}
+      designer-cache-ref: ${{needs.build-designer.outputs.tag}}
+    secrets: inherit #pragma: allowlist secret

.github/workflows/build.yml

@@ -0,0 +1,98 @@
+name: build app
+
+on:
+  workflow_call:
+    inputs:
+      app:
+        description: the app to build "designer" or "runner"
+        required: true
+        type: string
+      publish:
+        description: Set to true to publish to GHCR. Defaults to false
+        type: boolean
+        required: false
+      semver:
+        description: The semantic version you wish to publish with
+        required: false
+        type: string
+    outputs:
+      tag:
+        description: tag used for docker caching
+        value: ${{ jobs.build-app.outputs.tag }}
+      hash:
+        description: hash used for docker caching
+        value: ${{ jobs.build-app.outputs.hash }}
+
+jobs:
+  build-app:
+    if: ${{!contains(github.event.head_commit.message, 'chore(deps-dev)')}}
+    runs-on: ubuntu-latest
+    name: Docker build
+    outputs:
+      tag: ${{ steps.hashFile.outputs.tag }}
+      hash: ${{ steps.hashFile.outputs.hash }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "16.x"
+          cache: yarn
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
+
+      - uses: actions/cache@v3
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{inputs.app}}-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-${{inputs.app}}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          config-inline: |
+            [registry."ghcr.io"]
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+        # The hash is a function of the Dockerfile and the yarn.lock Packages take up the bulk of the time during a docker build. The hash is used to cache the docker builds.
+        # As long as the yarn.lock and dockerfiles are the same, you will be able to share this cache with another commit/branch.
+      - id: hashFile
+        env:
+          HASH_TARGET: "${{inputs.app}}/Dockerfile"
+        run: |
+          echo "::set-output name=hash::${{hashFiles(env.HASH_TARGET, 'yarn.lock')}}"
+          echo "::set-output name=tag::ghcr.io/xgovformbuilder/cache-digital-form-builder-${{inputs.app}}:${{hashFiles(env.HASH_TARGET)}}"
+
+      - name: Build ${{inputs.app}}
+        if: ${{inputs.publish != true }}
+        uses: docker/build-push-action@v3
+        with:
+          file: ${{inputs.app}}/Dockerfile
+          push: false
+          context: .
+          tags: ${{ steps.hashFile.outputs.tag }}
+          cache-from: type=registry,ref=${{ steps.hashFile.outputs.tag }}
+
+      - name: Build ${{inputs.app}} and push
+        if: ${{inputs.semver && inputs.publish == true }}
+        uses: docker/build-push-action@v3
+        with:
+          file: ${{inputs.app}}/Dockerfile
+          push: false
+          context: .
+          tags: |
+            ghcr.io/xgovformbuilder/digital-form-builder-${{inputs.app}}:${{inputs.semver}}
+            ghcr.io/xgovformbuilder/digital-form-builder-${{inputs.app}}:latest
+          build-args: |
+            LAST_TAG_GH=${{inputs.semver}}
+            LAST_COMMIT=${{github.sha}}