diff --git a/.github/workflows/deploy-prod&demo.yaml b/.github/workflows/deploy-prod&demo.yaml index c1abb0eb..97a32808 100644 --- a/.github/workflows/deploy-prod&demo.yaml +++ b/.github/workflows/deploy-prod&demo.yaml @@ -78,9 +78,9 @@ jobs: cache_path: ./dist cache_key: cache-dist-${{ github.sha }} dockerfile: apps/${{ matrix.appname }}/Dockerfile + monorepo_app: true secrets: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GCP_SA_DIGDIR_FDK_GCR_KEY: ${{ secrets.GCP_SA_DIGDIR_FDK_GCR_KEY }} deploy-prod: name: Deploy affected apps to production environment diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml index 38b65ee5..563fc0e1 100644 --- a/.github/workflows/deploy-staging.yaml +++ b/.github/workflows/deploy-staging.yaml @@ -78,9 +78,9 @@ jobs: cache_path: ./dist cache_key: cache-dist-${{ github.sha }} dockerfile: apps/${{ matrix.appname }}/Dockerfile + monorepo_app: true secrets: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GCP_SA_DIGDIR_FDK_GCR_KEY: ${{ secrets.GCP_SA_DIGDIR_FDK_GCR_KEY }} deploy: name: Deploy affected apps to staging environment with reusable workflow diff --git a/deploy/base/data-norge-frontend/kustomization.yaml b/deploy/base/data-norge-frontend/kustomization.yaml index ade2a495..9e95ed8c 100644 --- a/deploy/base/data-norge-frontend/kustomization.yaml +++ b/deploy/base/data-norge-frontend/kustomization.yaml @@ -6,5 +6,5 @@ resources: - data-norge-frontend-service.yaml images: - name: data-norge-frontend - newName: eu.gcr.io/digdir-fdk-infra/data-norge-frontend + newName: ghcr.io/informasjonsforvaltning/fdk-frontend/data-norge-frontend newTag: $(GIT_COMMIT_SHA) diff --git a/package.json b/package.json index d333d43f..5daf0860 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "zod": "^3.23.8" }, "devDependencies": { - "@axe-core/playwright": "^4.10.0", + "@axe-core/playwright": "^4.10.1", "@babel/core": "^7.25.2", "@babel/preset-react": "^7.24.7", "@emotion/is-prop-valid": "^1.3.1", diff --git a/yarn.lock b/yarn.lock index edb72b9d..9c5a0b12 100644 --- a/yarn.lock +++ b/yarn.lock @@ -29,14 +29,14 @@ __metadata: languageName: node linkType: hard -"@axe-core/playwright@npm:^4.10.0": - version: 4.10.0 - resolution: "@axe-core/playwright@npm:4.10.0" +"@axe-core/playwright@npm:^4.10.1": + version: 4.10.1 + resolution: "@axe-core/playwright@npm:4.10.1" dependencies: - axe-core: "npm:~4.10.0" + axe-core: "npm:~4.10.2" peerDependencies: playwright-core: ">= 1.0.0" - checksum: 10c0/dd0e7bc4f59092ae5f204ab1e181406dbbc31adef47e9c3c7cfaa3b566f516d0665cab3ef5cc1a54885defc82a88018e61c2ad94f0d83dcb49f10c0ee2566bc0 + checksum: 10c0/d6ca04bfb4d8d01238f2c3b9899a806da4975e847ed017ee03fe147226f55b3c94d21ee6e59a4419708a1c581176f4b3f18fb76f27b2c23ec5dd8405f4d383a0 languageName: node linkType: hard @@ -9103,20 +9103,13 @@ __metadata: languageName: node linkType: hard -"axe-core@npm:^4.10.0": +"axe-core@npm:^4.10.0, axe-core@npm:~4.10.2": version: 4.10.2 resolution: "axe-core@npm:4.10.2" checksum: 10c0/0e20169077de96946a547fce0df39d9aeebe0077f9d3eeff4896518b96fde857f80b98f0d4279274a7178791744dd5a54bb4f322de45b4f561ffa2586ff9a09d languageName: node linkType: hard -"axe-core@npm:~4.10.0": - version: 4.10.0 - resolution: "axe-core@npm:4.10.0" - checksum: 10c0/732c171d48caaace5e784895c4dacb8ca6155e9d98045138ebe3952f78457dd05b92c57d05b41ce2a570aff87dbd0471e8398d2c0f6ebe79617b746c8f658998 - languageName: node - linkType: hard - "axios@npm:^1.7.5": version: 1.7.5 resolution: "axios@npm:1.7.5" @@ -12946,7 +12939,7 @@ __metadata: version: 0.0.0-use.local resolution: "fdk-frontend@workspace:." dependencies: - "@axe-core/playwright": "npm:^4.10.0" + "@axe-core/playwright": "npm:^4.10.1" "@babel/core": "npm:^7.25.2" "@babel/preset-react": "npm:^7.24.7" "@digdir/designsystemet-css": "npm:^0.10.0"