Merge branch 'main' into dependabot/github_actions/docker/build-push-…

…action-6.7.0

.eslintrc.js

@@ -8,11 +8,13 @@ module.exports = {
     '@vue/standard'
   ],
   parserOptions: {
-    parser: 'babel-eslint'
+    parser: '@babel/eslint-parser'
   },
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'vue/multi-word-component-names': 'warn',
+    'vue/no-reserved-component-names': 'warn'
   },
   overrides: [
     {

.github/workflows/docker.build.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
     - main
+  pull_request:
+
 jobs:
   docker-build:
     runs-on: ubuntu-latest
@@ -44,20 +46,23 @@ jobs:
           platforms: linux/amd64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,mode=max,dest=/tmp/.buildx-cache
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
-          push: true
       - name: Check out `wmde/wbaas-deploy` repository in staging child directory
+        if: github.event_name != 'pull_request'
         uses: actions/[email protected]
         with:
           repository: wmde/wbaas-deploy
           path: ./repos/wbaas-deploy-staging
       - name: Check out `wmde/wbaas-deploy` repository in production child directory
+        if: github.event_name != 'pull_request'
         uses: actions/[email protected]
         with:
           repository: wmde/wbaas-deploy
           path: ./repos/wbaas-deploy-production
       - name: Update helmfile values for local, staging and production
+        if: github.event_name != 'pull_request'
         id: update-helmfile-values
         run: |
           TAG="$(echo ${{ steps.docker_meta.outputs.tags }} | cut -d':' -f2)"
@@ -67,6 +72,7 @@ jobs:
           sed -i "/image:/{n;s/tag:.*/tag: $TAG/;}" ./repos/wbaas-deploy-production/k8s/helmfile/env/production/ui.values.yaml.gotmpl
           # run the values script for local, prod and staging
       - name: Update argo values for local, staging and production
+        if: github.event_name != 'pull_request'
         id: update-argo-values
         run: |
           cd ./repos/wbaas-deploy-staging
@@ -78,12 +84,14 @@ jobs:
           cd ../wbaas-deploy-production
           ./bin/generate-values production ui
       - name: Truncate commit message
+        if: github.event_name != 'pull_request'
         id: truncate-commit-message
         run: |
           MSG=$(git log -1 --pretty=format:%s)
           echo "msg=$MSG" >> $GITHUB_OUTPUT
       - name: Create Staging+Local Pull Request
         uses: peter-evans/create-pull-request@v5
+        if: github.event_name != 'pull_request'
         with:
           path: ./repos/wbaas-deploy-staging
           commit-message: 'Staging+Local: Deploy new UI image ${{ steps.docker_meta.outputs.tags }}'
@@ -99,6 +107,7 @@ jobs:
             **Changes**: [${{ steps.truncate-commit-message.outputs.msg }}](https://github.com/wbstack/ui/commit/${{ github.sha }})
       - name: Create Production Pull Request
         uses: peter-evans/create-pull-request@v5
+        if: github.event_name != 'pull_request'
         with:
           path: ./repos/wbaas-deploy-production
           commit-message: 'Production: Deploy new UI image ${{ steps.docker_meta.outputs.tags }}'

.github/workflows/netlify-preview.yml

@@ -14,10 +14,10 @@ jobs:
       with:
         env-file: .env.development.mock
 
-    - name: Use Node.js 14.x
-      uses: actions/setup-node@v3.7.0
+    - name: Use Node.js 22.x
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 14.x
+        node-version: 22.x
     - run: npm ci
     - run: npm run build
 
@@ -48,10 +48,10 @@ jobs:
       with:
         env-file: .env.development.prod
 
-    - name: Use Node.js 14.x
-      uses: actions/setup-node@v3.7.0
+    - name: Use Node.js 22.x
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 14.x
+        node-version: 22.x
     - run: npm ci
     - run: npm run build
 

.github/workflows/node.js.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12, 14, 15]
+        node-version: [22]
 
     steps:
     - uses: actions/[email protected]

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:15 as builder
+FROM node:22 as builder
 
 WORKDIR /src/app
 COPY ./package.json ./package-lock.json ./

docker-compose.yml

@@ -3,7 +3,7 @@ services:
   ui:
     env_file:
       - .env
-    image: node:15
+    image: node:22
     user: "node"
     working_dir: /home/node/app
     volumes: