Merge pull request #220 from europeana/feat/MET-6365-Angular-19-Upgrade

Feat/met 6365 angular 19 upgrade
europeana · Feb 4, 2025 · 559b86f · 559b86f
2 parents 39fd3d0 + f1b2388
commit 559b86f
Show file tree

Hide file tree

Showing 82 changed files with 8,819 additions and 8,457 deletions.
diff --git a/.github/workflows/node.js.yaml b/.github/workflows/node.js.yaml
@@ -64,9 +64,10 @@ jobs:
       - name: Build Artifact
         uses: actions/setup-node@v4
         with:
-          node-version: '18.18.0'
+          node-version: '18.19.1'
       - run: npm install
       - run: npm run dist-localised
+      - run: mv ./dist/statistics-dashboard/browser/* ./dist/statistics-dashboard
       - uses: actions/upload-artifact@master
         with:
           name: dist

diff --git a/.github/workflows/run-tests-e2e.yaml b/.github/workflows/run-tests-e2e.yaml
@@ -11,7 +11,7 @@ jobs:
           ref: ${{ github.event.inputs.tag_name }}
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.18.0'
+          node-version: '18.19.1'
       - run: npm install
       - name: Run Cypress Tests
         run: |
@@ -32,7 +32,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.18.0'
+          node-version: '18.19.1'
 
       - run: npm install
 

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
@@ -10,7 +10,7 @@ jobs:
           ref: ${{ github.event.inputs.tag_name || github.event.pull_request.head.ref }}
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.18.0'
+          node-version: '18.19.1'
       - run: npm install
       - run: |
           npm run test:dev

diff --git a/angular.json b/angular.json
@@ -28,12 +28,13 @@
       },
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "dist/statistics-dashboard",
+            "outputPath": {
+              "base": "dist/statistics-dashboard"
+            },
             "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": ["src/polyfills.ts"],
             "tsConfig": "tsconfig.app.json",
             "allowedCommonJsDependencies": [
               "rgbcolor",
@@ -50,12 +51,11 @@
               "src/styles.scss"
             ],
             "scripts": [],
-            "vendorChunk": true,
             "extractLicenses": false,
-            "buildOptimizer": false,
             "sourceMap": true,
             "optimization": false,
-            "namedChunks": true
+            "namedChunks": true,
+            "browser": "src/main.ts"
           },
           "configurations": {
             "production": {
@@ -70,8 +70,6 @@
               "sourceMap": false,
               "namedChunks": false,
               "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",

diff --git a/cypress/e2e/app.cy.ts b/cypress/e2e/app.cy.ts
@@ -23,6 +23,7 @@ context('Statistics Dashboard', () => {
       const selFilterOpener = '.filter-opener';
       const selFilterValueLabel = `${selFilter} .checkbox-label`;
       const selFilterRemove = '.rm-filter .checkbox-label';
+      const waitInterval = 500;
 
       cy.visit(urlContentTier);
       cy.location('href').should('equal', baseUrl);
@@ -108,6 +109,7 @@ context('Statistics Dashboard', () => {
 
       // go forward (re-add Country)
       cy.go('forward');
+      cy.wait(waitInterval);
 
       cy.get(selFilterRemove).contains('Belgium').should('exist');
       cy.get(selFilterRemove).contains('IMAGE').should('not.exist');
@@ -116,6 +118,7 @@ context('Statistics Dashboard', () => {
       // go forward (re-add Tier 0)
 
       cy.go('forward');
+      cy.wait(waitInterval);
 
       cy.get(selFilterRemove).contains('Belgium').should('exist');
       cy.get(selFilterRemove).contains('Tier 0').should('exist');
@@ -127,6 +130,7 @@ context('Statistics Dashboard', () => {
 
       // go forward (re-add IMAGE)
       cy.go('forward');
+      cy.wait(waitInterval);
 
       cy.get(selFilterRemove).contains('Belgium').should('exist');
       cy.get(selFilterRemove).contains('Tier 0').should('exist');

diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
@@ -22,5 +22,5 @@ import './commands';
 
 Cypress.on('uncaught:exception', (err, runnable) => {
   // returning false here prevents Cypress from failing the test
-  return false
-})
+  return false;
+});