Skip to content

Commit c836de9

Browse files
committed
Merge branch 'update-dependencies' into 'main'
Update dependencies See merge request reportcreator/reportcreator!1037
2 parents f5d6dc8 + a6dd737 commit c836de9

File tree

19 files changed

+4932
-3439
lines changed

19 files changed

+4932
-3439
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ integration-test-frontend:
191191
# Setup
192192
- docker network create mynet
193193
- docker pull postgres:15 -q
194-
- docker pull mcr.microsoft.com/playwright:v1.54.1-noble -q
194+
- docker pull mcr.microsoft.com/playwright:v1.55.0-noble -q
195195
- docker pull $CI_REGISTRY_IMAGE/api-test:$CI_COMMIT_SHORT_SHA -q
196196
- docker pull $CI_REGISTRY_IMAGE/frontend-test:$CI_COMMIT_SHORT_SHA -q
197197
- docker cp $(docker create --name temp $CI_REGISTRY_IMAGE/frontend-test:$CI_COMMIT_SHORT_SHA):/app/packages/ packages2 && docker rm temp
@@ -203,7 +203,7 @@ integration-test-frontend:
203203
# Add Superuser
204204
- docker exec api python3 manage.py createsuperuser --noinput --username=$SYSREPTOR_INTEGRATION_USER
205205
# Run E2E Tests
206-
- docker run --name=playwright --rm --network=mynet --mount=type=bind,source=$PWD/packages2/,target=/app/packages/ -w /app/packages/frontend/ -e FRONTEND_ADMIN_PASSWORD=$SYSREPTOR_INTEGRATION_PASSWORD -e FRONTEND_ADMIN_USER=$SYSREPTOR_INTEGRATION_USER -e LICENSE=$SYSREPTOR_INTEGRATION_LICENSE mcr.microsoft.com/playwright:v1.54.1-noble bash -c 'npx playwright test'
206+
- docker run --name=playwright --rm --network=mynet --mount=type=bind,source=$PWD/packages2/,target=/app/packages/ -w /app/packages/frontend/ -e FRONTEND_ADMIN_PASSWORD=$SYSREPTOR_INTEGRATION_PASSWORD -e FRONTEND_ADMIN_USER=$SYSREPTOR_INTEGRATION_USER -e LICENSE=$SYSREPTOR_INTEGRATION_LICENSE mcr.microsoft.com/playwright:v1.55.0-noble bash -c 'npx playwright test'
207207
build-release:
208208
stage: build-release
209209
extends: .depends_docker

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ RUN /app/plugins/build.sh
8989

9090

9191

92-
FROM python:3.13-slim-bookworm AS api-dev
92+
FROM python:3.13-slim-trixie AS api-dev
9393

9494
# Get a list a preinstalled apt packages
9595
RUN mkdir /src && \
@@ -118,8 +118,8 @@ RUN apt-get update \
118118
unzip \
119119
wget \
120120
postgresql-client \
121-
&& echo 'Types: deb\nURIs: http://snapshot.debian.org/archive/debian/20250301T010101Z/\nSuites: testing\nComponents: main\nSigned-By: /usr/share/keyrings/debian-archive-keyring.gpg' > /etc/apt/sources.list.d/snapshot.sources \
122-
&& echo 'Package: ghostscript\nPin: version 10.04.0~dfsg-2\nPin-Priority: 1001' > /etc/apt/preferences.d/ghostscript \
121+
&& echo 'Types: deb\nURIs: http://snapshot.debian.org/archive/debian/20250301T010101Z/\nSuites: trixie\nComponents: main\nSigned-By: /usr/share/keyrings/debian-archive-keyring.gpg' > /etc/apt/sources.list.d/snapshot.sources \
122+
&& echo 'Package: ghostscript libgs10 libgs10-common libgs-common\nPin: version 10.04.0*\nPin-Priority: 1001' > /etc/apt/preferences.d/ghostscript \
123123
&& echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/10no-check-valid-until \
124124
&& apt-get update \
125125
&& apt-get install -y --no-install-recommends ghostscript \
@@ -143,7 +143,7 @@ ENV PYTHONUNBUFFERED=on \
143143

144144
COPY api/pyproject.toml api/poetry.lock /app/api/
145145
RUN python3 -m venv /opt/poetry \
146-
&& /opt/poetry/bin/pip install --no-cache poetry==2.1.2 \
146+
&& /opt/poetry/bin/pip install --no-cache poetry==2.1.4 \
147147
&& /opt/poetry/bin/poetry config virtualenvs.create false \
148148
&& /opt/poetry/bin/poetry install --directory=/app/api --no-cache --no-interaction --no-root \
149149
&& rm -rf /opt/poetry

api/poetry.lock

Lines changed: 763 additions & 721 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ services:
2929
- 6379
3030
integration-tests:
3131
profiles: [test]
32-
image: mcr.microsoft.com/playwright:v1.54.1-noble
32+
image: mcr.microsoft.com/playwright:v1.55.0-noble
3333
working_dir: /app/packages/frontend/
3434
environment:
3535
# DISPLAY: :0 # for running with --ui in WSL 2 with XServer

packages/frontend/nuxt.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default defineNuxtConfig({
1010
future: {
1111
compatibilityVersion: 4,
1212
},
13-
compatibilityDate: '2024-07-08',
13+
compatibilityDate: '2025-08-26',
1414

1515
// Source code directory
1616
srcDir: 'src/',

packages/frontend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
"@he-tree/vue": "^2.9.4"
3535
},
3636
"devDependencies": {
37-
"@nuxt/test-utils": "^3.10.0",
37+
"@nuxt/test-utils": "3.19.1",
3838
"@types/lodash-es": "^4.17.0",
3939
"@types/dompurify": "^3.0.5",
4040
"@types/randomcolor": "^0.5.9",
4141
"eslint": "^9.0.0",
4242
"vitest": "^3.0.4",
4343
"happy-dom": "^17.0.0",
4444
"vue-tsc": "^3.0.4",
45-
"@playwright/test": "1.54.1",
45+
"@playwright/test": "1.55.0",
4646
"form-data": "^4.0.1",
4747
"node-fetch": "^3.3.2"
4848
},

packages/frontend/src/pages/projects/index.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ watch(() => listViewRef.value?.items?.data.value as PentestProject[]|undefined,
6363
if (!items) { return; }
6464
suggestedMembers.value = sortBy(uniq(items.flatMap(p => p.members.map(member => member.username)).concat(suggestedMembers.value)));
6565
suggestedTags.value = sortBy(uniq(items.flatMap(p => p.tags).concat(suggestedTags.value)));
66-
console.log('Suggested members', suggestedMembers.value, suggestedTags.value);
6766
}, { immediate: true, deep: 1 });
6867
const filterProperties = computed((): FilterProperties[] => [
6968
{ id: 'member', name: 'Member', icon: 'mdi-account', type: 'combobox', options: suggestedMembers.value, allow_exclude: true, allow_regex: false, default: '', multiple: true },

packages/frontend/test/e2e/util/integration_flows.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { getIntegrationAdmin } from "./admin";
33

44
export const integrationLogin = async (page: Page, baseURL: string|undefined) => {
55
await page.goto(baseURL + '/login/local/');
6-
await expect(page).toHaveTitle("Login | SysReptor");
6+
await expect(page).toHaveTitle("Login | SysReptor", { timeout: 60000 });
77
await page.getByLabel('Username').fill(getIntegrationAdmin().username);
88
await page.getByLabel('Password').fill(getIntegrationAdmin().password);
99
await page.getByTestId('login-submit').click();

packages/frontend/tsconfig.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
{
2-
// https://nuxt.com/docs/guide/concepts/typescript
3-
"extends": "./.nuxt/tsconfig.json"
4-
}
2+
"files": [],
3+
"references": [
4+
{ "path": "./.nuxt/tsconfig.app.json" },
5+
{ "path": "./.nuxt/tsconfig.server.json" },
6+
{ "path": "./.nuxt/tsconfig.shared.json" },
7+
{ "path": "./.nuxt/tsconfig.node.json" }
8+
]
9+
}

packages/nuxt-base-layer/nuxt.config.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default defineNuxtConfig({
77
future: {
88
compatibilityVersion: 4,
99
},
10-
compatibilityDate: '2024-07-08',
10+
compatibilityDate: '2025-08-26',
1111
devtools: { enabled: false },
1212

1313
// Build as SPA application
@@ -64,13 +64,6 @@ export default defineNuxtConfig({
6464
optimizeDeps: {
6565
include: ['splitpanes', 'js-file-download', 'base64-arraybuffer', 'uuid', 'zxcvbn', 'emoji-mart-vue-fast/src'],
6666
},
67-
css: {
68-
preprocessorOptions: {
69-
scss: {
70-
api: 'modern',
71-
},
72-
},
73-
},
7467
},
7568
nitro: {
7669
publicAssets: [

0 commit comments

Comments
 (0)