Merge pull request #4413 from mendersoftware/master

staging alignment
mendersoftware · May 15, 2024 · 4346082 · 4346082
2 parents 97f051e + 7a67f24
commit 4346082
Show file tree

Hide file tree

Showing 17 changed files with 543 additions and 587 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -11,7 +11,7 @@
     "plugin:import/warnings",
     "plugin:react-hooks/recommended",
     "plugin:react/recommended",
-    "plugin:sonarjs/recommended"
+    "plugin:sonarjs/recommended-legacy"
   ],
   "settings": {
     "import/resolver": {

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -21,7 +21,7 @@ updates:
           - '@emotion*'
           - '@mui*'
     reviewers:
-      - "mendersoftware/frontend-dependabot-reviewers"
+      - 'mendersoftware/frontend-dependabot-reviewers'
   - commit-message:
       prefix: chore
     directory: /
@@ -38,8 +38,14 @@ updates:
       interval: monthly
       day: saturday
     groups:
+      playwright:
+        patterns:
+          - '@playwright*'
+          - 'playwright*'
       e2e-test-dependencies:
+        dependency-type: development
         exclude-patterns:
-          - '*'
+          - '@playwright*'
+          - 'playwright*'
     reviewers:
-      - "mendersoftware/frontend-dependabot-reviewers"
+      - 'mendersoftware/frontend-dependabot-reviewers'
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: node:20-alpine
+image: node:22-alpine
 
 stages:
   - pre-test
@@ -11,8 +11,8 @@ stages:
 variables:
   DOCKER_REPOSITORY: mendersoftware/gui
   DOCS_VERSION: development
-  MULTIPLATFORM_BUILD: "true"
-  MULTIPLATFORM_PLATFORMS: "linux/amd64,linux/arm64"
+  MULTIPLATFORM_BUILD: 'true'
+  MULTIPLATFORM_PLATFORMS: 'linux/amd64,linux/arm64'
 
 include:
   - project: 'Northern.tech/Mender/mendertesting'
@@ -503,8 +503,8 @@ coveralls:done:
     SYNC_IMAGE_TAG: $DOCKER_PUBLISH_COMMIT_TAG
     CONTAINER: gui
     DOCKER_PUBLISH_COMMIT_TAG: ${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHA}
-    GITHUB_HELM_REPO: "github.com/mendersoftware/mender-helm.git"
-    CHART_DIR: "mender"
+    GITHUB_HELM_REPO: 'github.com/mendersoftware/mender-helm.git'
+    CHART_DIR: 'mender'
 
 trigger:mender-helm-version-bump:staging:
   extends:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM node:22.0.0-alpine AS base
+FROM --platform=$BUILDPLATFORM node:22.1.0-alpine AS base
 WORKDIR /usr/src/app
 COPY package-lock.json package.json ./
 RUN npm ci