Feature/65678 upgrade angular

.circleci/config.yml

@@ -13,8 +13,7 @@ jobs:
     environment:
       TZ: Europe/London
     steps:
-      - browser-tools/install-browser-tools:
-          chrome-version: 126.0.6478.182 # TODO: remove when chromedriver downloads are fixed
+      - browser-tools/install-browser-tools
       - browser-tools/install-chrome
       - browser-tools/install-chromedriver
       - checkout
@@ -37,7 +36,7 @@ jobs:
           environment:
             JEST_JUNIT_OUTPUT_DIR: "reports/junit/js-test-results.xml"
       - run: export NVM_DIR=${HOME}/.nvm && source ${NVM_DIR}/nvm.sh; cd pupil-spa;     nvm use; yarn install --frozen-lockfile
-      - run: export NVM_DIR=${HOME}/.nvm && source ${NVM_DIR}/nvm.sh; cd pupil-spa;     nvm use; yarn run test-single
+      - run: export NVM_DIR=${HOME}/.nvm && source ${NVM_DIR}/nvm.sh; cd pupil-spa;     nvm use; yarn test:single
       - run: export NVM_DIR=${HOME}/.nvm && source ${NVM_DIR}/nvm.sh; cd tslib;         nvm use; yarn install --frozen-lockfile
       - run: export NVM_DIR=${HOME}/.nvm && source ${NVM_DIR}/nvm.sh; cd tslib;         nvm use; yarn test:throttle
       - run: export NVM_DIR=${HOME}/.nvm && source ${NVM_DIR}/nvm.sh; cd admin;         nvm use; yarn test:frontend

.prettierrc

@@ -0,0 +1,6 @@
+{
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "semi": false,
+  "singleQuote": true
+}

pupil-spa/.browserslistrc

@@ -8,8 +8,7 @@
 > 0.5%
 last 4 versions
 Firefox ESR
-not dead
-not IE 11
-Safari >= 13
-iOS >= 13
+Safari >= 14
+iOS >= 14
 not OperaMini all
+not dead

pupil-spa/.eslintrc.json

@@ -1,49 +1,41 @@
 {
   "root": true,
-  "ignorePatterns": [
-    "projects/**/*"
-  ],
+  "ignorePatterns": ["projects/**/*"],
   "overrides": [
     {
-      "files": [
-        "*.ts"
-      ],
-      "parserOptions": {
-        "project": [
-          "./tsconfig.json",
-          "e2e/tsconfig.json"
-        ],
-        "createDefaultProgram": true
-      },
+      "files": ["*.ts"],
       "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
         "plugin:@angular-eslint/recommended",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
-        "@angular-eslint/component-selector": [
+        "@angular-eslint/directive-selector": [
           "error",
           {
+            "type": "attribute",
             "prefix": "app",
-            "style": "kebab-case",
-            "type": "element"
+            "style": "camelCase"
           }
         ],
-        "@angular-eslint/directive-selector": [
+        "@angular-eslint/component-selector": [
           "error",
           {
+            "type": "element",
             "prefix": "app",
-            "style": "camelCase",
-            "type": "attribute"
+            "style": "kebab-case"
           }
-        ]
+        ],
+        "@typescript-eslint/no-explicit-any": "off",
+        "@angular-eslint/prefer-standalone": "off"
       }
     },
     {
-      "files": [
-        "*.html"
-      ],
+      "files": ["*.html"],
       "extends": [
-        "plugin:@angular-eslint/template/recommended"
+        "plugin:@angular-eslint/template/recommended",
+        "plugin:@angular-eslint/template/accessibility"
       ],
       "rules": {}
     }

pupil-spa/.nvmrc

@@ -1 +1 @@
-v16.17.1
+v20.18.0

pupil-spa/Dockerfile

@@ -1,12 +1,13 @@
 ### STAGE 1: Build ###
 
 # We label our stage as 'builder'
-FROM node:16-alpine AS builder
+FROM node:20-alpine AS builder
 
 # `yarn install` needs to be able to find `git` for lz-string which uses a github.com URL for the version.
 RUN apk update && \
     apk upgrade && \
-    apk add git
+    apk add git && \
+    apk add alpine-sdk python3 py3-distutils-extra py3-pip
 
 COPY package.json .
 COPY yarn.lock .

pupil-spa/angular.json

@@ -9,18 +9,23 @@
       "projectType": "application",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "dist",
+            "outputPath": {
+              "base": "dist",
+              "browser": ""
+            },
             "index": "src/index.html",
-            "main": "src/main.ts",
             "tsConfig": "src/tsconfig.app.json",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "src/polyfills.ts",
+              "@angular/localize/init"
+            ],
             "stylePreprocessorOptions": {
               "includePaths": [
-                "src/lib",
-                "node_modules/govuk-elements-sass/public/sass/",
-                "node_modules/govuk_frontend_toolkit/"
+                "./src/lib",
+                "./node_modules/govuk-elements-sass/public/sass/",
+                "./node_modules/govuk_frontend_toolkit/"
               ]
             },
             "assets": [
@@ -31,13 +36,19 @@
               "src/styles.scss"
             ],
             "scripts": [],
-            "vendorChunk": true,
             "extractLicenses": false,
-            "buildOptimizer": false,
-            "sourceMap": true,
+            "sourceMap": {
+              "scripts": true,
+              "styles": false,
+              "vendor": true
+            },
             "optimization": true,
-            "namedChunks": true
-          },
+            "namedChunks": true,
+            "allowedCommonJsDependencies": [
+              "polly-js"
+            ],
+            "browser": "src/main.ts"
+           },
           "configurations": {
             "production": {
               "budgets": [
@@ -48,11 +59,13 @@
               ],
               "optimization": true,
               "outputHashing": "all",
-              "sourceMap": true,
+              "sourceMap": {
+                "scripts": true,
+                "styles": false,
+                "vendor": true
+              },
               "namedChunks": false,
               "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
@@ -66,24 +79,27 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "pupil-spa:build"
+            "buildTarget": "pupil-spa:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "pupil-spa:build:production"
+              "buildTarget": "pupil-spa:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "pupil-spa:build"
+            "buildTarget": "pupil-spa:build"
           }
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
+            "builderMode": "application",
+            "include": [
+              "**/*.spec.ts"
+            ],
             "karmaConfig": "./karma.conf.js",
             "stylePreprocessorOptions": {
               "includePaths": [
@@ -92,7 +108,11 @@
                 "node_modules/govuk_frontend_toolkit/"
               ]
             },
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "src/polyfills.ts",
+              "zone.js/testing",
+              "@angular/localize/init"
+            ],
             "tsConfig": "src/tsconfig.spec.json",
             "scripts": [],
             "styles": [

pupil-spa/gen_config.sh

@@ -5,7 +5,7 @@ set -e
 # set -x
 scriptDir="$( cd "$( dirname "$0" )" >/dev/null && pwd )"
 envFile=${scriptDir}/../.env
-[[ -f ${envFile} ]] && source ${envFile}
+test -f "${envFile}" && . ${envFile}
 applicationInsightsConnectionString=${APPINSIGHTS_CONNECTION_STRING}
 apiBaseUrl=${PUPIL_API_BASE_URL:-"http://localhost:3003"}
 checkStartAPIErrorDelay=${CHECK_START_ERROR_DELAY:-"2000"}

pupil-spa/nginx/browsers-map.conf

@@ -15,18 +15,21 @@ map $http_user_agent $outdated {
   # -------------------------------------------
   # Safari
   # Disallow
-  # safari 12 (Mojave) and below
-  #
-  # Allow:
-  # safari 15 (Monterey)
+  # safari 13 (Catalina) and below
+
+  # Allow (everything else by default)
   # safari 14 (Big Sur)
-  # safari 13 (Catalina)
+  # safari 15 (Monterey)
+  # safari 16 (Ventura)
+  # safari 17 (Sonoma)
+  # safari 18 (Ventura)
+
   #
   "~AppleWebKit.*Version/[0-9]\..*Safari"  1; # Safari version 1 to 9
   "~AppleWebKit.*Version/10\..*Safari"     1; # safari 10
   "~AppleWebKit.*Version/11\..*Safari"     1; # safari 11
   "~AppleWebKit.*Version/12\..*Safari"     1; # safari 12
-
+  "~AppleWebKit.*Version/13\..*Safari"     1; # safari 13
   # -------------------------------------------
   # ie 1-10
   #