Merge pull request #90 from gisktzh/develop

Release
gisktzh · Dec 19, 2024 · a51b8f4 · a51b8f4
2 parents 6d4df2b + 0cd35b7
commit a51b8f4
Show file tree

Hide file tree

Showing 54 changed files with 2,889 additions and 3,752 deletions.
diff --git a/.azure-pipelines/deploy-web-app-without-checks.yml b/.azure-pipelines/deploy-web-app-without-checks.yml
diff --git a/.azure-pipelines/deploy-web-app.yml b/.azure-pipelines/deploy-web-app.yml
diff --git a/.azure-pipelines/dry-run-docker-build.yml b/.azure-pipelines/dry-run-docker-build.yml
diff --git a/.azure-pipelines/run-sonar-cloud-analysis.yml b/.azure-pipelines/run-sonar-cloud-analysis.yml
diff --git a/.azure-pipelines/run-tests-and-sonar-cloud-analysis.yml b/.azure-pipelines/run-tests-and-sonar-cloud-analysis.yml
diff --git a/.azure-pipelines/run-tests.yml b/.azure-pipelines/run-tests.yml
diff --git a/.azure-pipelines/templates/build-docker.yml b/.azure-pipelines/templates/build-docker.yml
diff --git a/.azure-pipelines/templates/deploy-static-web-app.yml b/.azure-pipelines/templates/deploy-static-web-app.yml
diff --git a/.azure-pipelines/templates/git-checkout-code.yml b/.azure-pipelines/templates/git-checkout-code.yml
diff --git a/.azure-pipelines/templates/publish-coverage.yml b/.azure-pipelines/templates/publish-coverage.yml
diff --git a/.azure-pipelines/templates/sonar-cloud-analysis.yml b/.azure-pipelines/templates/sonar-cloud-analysis.yml
diff --git a/.azure-pipelines/templates/unit-tests.yml b/.azure-pipelines/templates/unit-tests.yml
diff --git a/.azure-pipelines/templates/variables.yml b/.azure-pipelines/templates/variables.yml
diff --git a/.github/workflows/node-deploy.yml b/.github/workflows/node-deploy.yml
@@ -1,12 +1,11 @@
 name: Deploy to GH Pages
 
-on: 
+on:
   workflow_call:
-  workflow_dispatch: 
-
+  workflow_dispatch:
 
 env:
-  NODE_VERSION: '20'
+  NODE_VERSION: '22'
 
 jobs:
   build:

diff --git a/.github/workflows/node-tests.yml b/.github/workflows/node-tests.yml
@@ -9,7 +9,7 @@ on:
         type: string
 
 env:
-  NODE_VERSION: '20'
+  NODE_VERSION: '22'
 
 jobs:
   build-and-test:

diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -6,7 +6,7 @@ echo ""
 
 echo "🚀 Checking branchname!"
 local_branch_name=$(git rev-parse --abbrev-ref HEAD)
-valid_branch_regex='^(feature|hotfix)/gb3-[0-9]+-[a-zA-Z0-9\-]+$'
+valid_branch_regex='^(feature|hotfix|bugfix)/gb3-[0-9]+-[a-zA-Z0-9\-]+$'
 
 if ! echo "$local_branch_name" | grep -Eq "$valid_branch_regex"; then
     printf "\033[31m⚠️ Branchname does not adhere to naming convention %s! \033[0m\n" "$valid_branch_regex"

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-20.18
+22.12
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.10-alpine AS build-app
+FROM node:22.11-alpine AS build-app
 
 # Provide overrides for APP_VERSION and APP_RELEASE as build-args and expose them as ENV variables for the update-version.js script
 ARG APP_VERSION

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ This project was generated with [Angular CLI](https://github.com/angular/angular
 We strive to use the most recent LTS version. Whenever an update is due, make sure you adjust the following:
 
 - `Dockerfile`
-- `.azure-pipelines/templates/variables.yaml` (**Warning!** There are cases where the pipeline does not yet have the
+- `.github/workflows/node*.yml` (**Warning!** There are cases where the pipeline does not yet have the
   newest node version; in that case, leave it as before and ignore the pipeline warnings)
 - `.nvmrc`
 - `package.json`, update the `@typed/node` package to the matching version; run `npm install` afterwards to freshly generate the `package-lock.json`
@@ -327,13 +327,13 @@ Within the runtime configurations there are API configurations used to configure
 
 #### Available URL configurations
 
-| Stagename |      Subdomain      |        Verwendung        |     GB2 Backend     |    WMS Backend     |        Geolion         |                 Bemerkung                  |
-| :-------: | :-----------------: | :----------------------: | :-----------------: | :----------------: | :--------------------: | :----------------------------------------: |
-|    DEV    |    dev.geo.zh.ch    |           EBP            |                     |                    |                        | calm-plant-0ecbec603.2.azurestaticapps.net |
-|   PROD    |      geo.zh.ch      |        öffentlich        |     maps.zh.ch      |     wms.zh.ch      |     geolion.zh.ch      |                                            |
-|   PROD    |     geo.ktzh.ch     |        Verwaltung        |   web.maps.zh.ch    |   web.wms.zh.ch    |    geolion.ktzh.ch     |                                            |
-|    UAT    |   uat.geo.ktzh.ch   | Verwaltungsinterne Tests | uatmaps.kt.ktzh.ch  | uatwms.kt.ktzh.ch  | uatgeolion.kt.ktzh.ch  |                                            |
-|  STAGING  | staging.geo.ktzh.ch | Produktionsvorbereitung  | testmaps.kt.ktzh.ch | testwms.kt.ktzh.ch | testgeolion.kt.ktzh.ch |                                            |
+| Stagename |      Subdomain      |        Verwendung        |     GB2 Backend     |    WMS Backend     |        Geolion         | Bemerkung |
+| :-------: | :-----------------: | :----------------------: | :-----------------: | :----------------: | :--------------------: | :-------: |
+|    DEV    |    dev.geo.zh.ch    |           EBP            |                     |                    |                        |           |
+|   PROD    |      geo.zh.ch      |        öffentlich        |     maps.zh.ch      |     wms.zh.ch      |     geolion.zh.ch      |           |
+|   PROD    |     geo.ktzh.ch     |        Verwaltung        |   web.maps.zh.ch    |   web.wms.zh.ch    |    geolion.ktzh.ch     |           |
+|    UAT    |   uat.geo.ktzh.ch   | Verwaltungsinterne Tests | uatmaps.kt.ktzh.ch  | uatwms.kt.ktzh.ch  | uatgeolion.kt.ktzh.ch  |           |
+|  STAGING  | staging.geo.ktzh.ch | Produktionsvorbereitung  | testmaps.kt.ktzh.ch | testwms.kt.ktzh.ch | testgeolion.kt.ktzh.ch |           |
 
 ### (S)CSS structure