Update Angular

angular.json

@@ -15,12 +15,11 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular/build:application",
           "options": {
             "baseHref": "/",
             "outputPath": "dist/oracc",
             "index": "src/index.html",
-            "main": "src/main.ts",
             "polyfills": ["zone.js"],
             "tsConfig": "tsconfig.app.json",
             "inlineStyleLanguage": "scss",
@@ -29,7 +28,10 @@
               "src/styles.scss",
               "./node_modules/@fortawesome/fontawesome-free/css/all.min.css"
             ],
-            "scripts": ["src/scripts/p4.js"]
+            "scripts": [
+              "src/scripts/p4.js"
+            ],
+            "browser": "src/main.ts"
           },
           "configurations": {
             "github-pages": {
@@ -76,9 +78,7 @@
             },
             "development": {
               "baseHref": "/",
-              "buildOptimizer": false,
               "optimization": false,
-              "vendorChunk": true,
               "extractLicenses": false,
               "sourceMap": true,
               "namedChunks": true,
@@ -93,25 +93,25 @@
           "defaultConfiguration": "production"
         },
         "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
+          "builder": "@angular/build:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "oracc:build:production"
+              "buildTarget": "oracc:build:production"
             },
             "development": {
-              "browserTarget": "oracc:build:development"
+              "buildTarget": "oracc:build:development"
             }
           },
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "builder": "@angular/build:extract-i18n",
           "options": {
-            "browserTarget": "oracc:build"
+            "buildTarget": "oracc:build"
           }
         },
         "test": {
-          "builder": "@angular-devkit/build-angular:karma",
+          "builder": "@angular/build:karma",
           "options": {
             "polyfills": ["zone.js", "zone.js/testing"],
             "tsConfig": "tsconfig.spec.json",
@@ -129,5 +129,31 @@
   },
   "cli": {
     "analytics": false
+  },
+  "schematics": {
+    "@schematics/angular:component": {
+      "type": "component"
+    },
+    "@schematics/angular:directive": {
+      "type": "directive"
+    },
+    "@schematics/angular:service": {
+      "type": "service"
+    },
+    "@schematics/angular:guard": {
+      "typeSeparator": "."
+    },
+    "@schematics/angular:interceptor": {
+      "typeSeparator": "."
+    },
+    "@schematics/angular:module": {
+      "typeSeparator": "."
+    },
+    "@schematics/angular:pipe": {
+      "typeSeparator": "."
+    },
+    "@schematics/angular:resolver": {
+      "typeSeparator": "."
+    }
   }
 }

cypress/e2e/journey.cy.ts

@@ -369,7 +369,7 @@ function check_page_is_project_texts() {
 
 function checkSelectedWordIsHighlighted(){
   // annoyingly, cy.get() stops the scroll, so we have to wait for the scroll to finish first
-  cy.wait(350);
+  cy.wait(500);
   cy.get('span.selected').should('be.visible').then(($selected) => {
     if ($selected.parents('table.transliteration').length) {
       // If the 'span.selected' is within a 'table.transliteration', check for yellow