Merge branch 'update-node' into 'main'

Update node See merge request reportcreator/reportcreator!814
Syslifters · Jan 2, 2025 · 042d6a3 · 042d6a3
2 parents 63966e2 + 0bbf32e
commit 042d6a3
Show file tree

Hide file tree

Showing 14 changed files with 2,578 additions and 1,936 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 ARG TESTED_API_IMAGE=undefined_test_image_used_in_ci
 ARG PROD_API_IMAGE=undefined_prod_image_used_in_ci
 
-FROM --platform=$BUILDPLATFORM node:20-alpine3.19 AS frontend-dev
+FROM --platform=$BUILDPLATFORM node:22-alpine3.20 AS frontend-dev
 ENV NODE_OPTIONS="--max-old-space-size=4096"
 # Install curl
 RUN apk add --no-cache curl
@@ -140,7 +140,7 @@ ENV PYTHONUNBUFFERED=on \
 
 WORKDIR /app/api/
 COPY api/pyproject.toml api/poetry.lock /app/api/
-RUN pip install --no-cache poetry==1.8.3 && \
+RUN pip install --no-cache poetry==1.8.5 && \
     poetry config virtualenvs.create false && \
     poetry install --no-cache --no-interaction --no-root
 

diff --git a/api/poetry.lock b/api/poetry.lock
diff --git a/api/pyproject.toml b/api/pyproject.toml
@@ -6,7 +6,7 @@ authors = []
 packages = [{include = "reportcreator_api", from = "src"}]
 
 [tool.poetry.dependencies]
-python = "~3.12"
+python = "^3.12"
 django = { extras = ["argon2"], version = "~5.1" }
 djangorestframework = "~3.15.0"
 weasyprint = "~63.1"
@@ -22,7 +22,7 @@ adrf = "^0.1.6"
 
 psycopg = { extras = ["binary", "pool"], version = "^3.1.8" }
 gunicorn = "^23.0.0"
-uvicorn = { extras = ["standard"], version = "^0.32.0" }
+uvicorn = { extras = ["standard"], version = "^0.34.0" }
 whitenoise = "^6.4.0"
 brotli = "^1.0.9"
 channels = { "extras" = ["daphne"], version = "^4.1.0" }
@@ -55,7 +55,7 @@ django-debug-toolbar = "^4.4.5"
 debugpy = "^1.6.7"
 watchdog = "^6.0.0"
 pytest-django = "^4.5.2"
-pytest-asyncio = "^0.24.0"
+pytest-asyncio = "^0.25.0"
 pytest-xdist = "^3.2.1"
 pytest-cov = "^6.0.0"
 elastic-apm = "^6.20.0"

diff --git a/api/start.sh b/api/start.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -e
+
 # Add custom CA certificates
 if [[ -n "$CA_CERTIFICATES" ]]; then
     echo "${CA_CERTIFICATES}" >> /usr/local/share/ca-certificates/custom-user-cert.crt

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
@@ -31,7 +31,6 @@ services:
     image: mcr.microsoft.com/playwright:v1.49.0-noble
     working_dir: /app/packages/frontend/
     environment:
-      DEBUG: pw:browser
       # DISPLAY: :0 # for running with --ui in WSL 2 with XServer
       FRONTEND_ADMIN_USER: "reptor"
     env_file: ../deploy/app.env

diff --git a/packages/NOTICE b/packages/NOTICE
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -36,7 +36,10 @@
     "eslint": "^9.0.0",
     "vitest": "^2.0.4",
     "happy-dom": "^15.11.2",
-    "vue-tsc": "^2.0.11"
+    "vue-tsc": "^2.0.11",
+    "@playwright/test": "^1.49.1",
+    "form-data": "^4.0.1",
+    "node-fetch": "^3.3.2"
   },
   "overrides": {
     "vue": "latest"

diff --git a/packages/frontend/playwright.config.ts b/packages/frontend/playwright.config.ts
@@ -30,4 +30,4 @@ export default defineConfig({
     reuseExistingServer: true,
     stdout: "pipe",
   },
-});
+});
diff --git a/packages/frontend/test/e2e/util/import_demodata.ts b/packages/frontend/test/e2e/util/import_demodata.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import type { Page } from '@playwright/test';
 import FormData from 'form-data';
 import fs from 'fs';
@@ -39,7 +40,7 @@ const importFile = async (url: string, filePath: string, headers: any) => {
   }
 };
 
-export const downloadDemoData = async (page: Page) => {
+export const downloadDemoData = async () => {
   const urls = [
     'https://docs.sysreptor.com/assets/demo-projects.tar.gz',
     'https://docs.sysreptor.com/assets/demo-designs.tar.gz',
@@ -140,4 +141,4 @@ export const importDemoData = async (page: Page) => {
   } catch (error) {
     console.error('Error importing files:', error);
   }
-};
+};
diff --git a/packages/nuxt-base-layer/package.json b/packages/nuxt-base-layer/package.json
@@ -34,7 +34,7 @@
     "nuxt": "~3.14",
     "vuetify": "~3.7",
 
-    "@types/node": "^20",
+    "@types/node": "^22",
     "@types/uuid": "^10.0.0",
     "@types/zxcvbn": "^4.4.2",
     "@types/lodash-es": "^4.17.12",
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,4 +30,4 @@ export default defineConfig({ @@
         reuseExistingServer: true,
         stdout: "pipe",
       },
-    });
+    });