Skip to content

Commit

Permalink
Merge branch 'master' into renovate/eslint-monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
RomuDeuxfois authored Dec 19, 2024
2 parents d1db6d7 + 3a1c813 commit a40888a
Show file tree
Hide file tree
Showing 6 changed files with 127 additions and 123 deletions.
4 changes: 2 additions & 2 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ steps:
- mvn test -q

- name: frontend-tests
image: node:22.11.0-alpine
image: node:22.12.0-alpine
volumes:
- name: cache-node-frontend
path: /drone/src/openbas-front/node_modules
Expand Down Expand Up @@ -65,7 +65,7 @@ steps:
- frontend-tests

- name: frontend-e2e-tests
image: node:22.11.0
image: node:22.12.0
volumes:
- name: cache-node-frontend-e2e
path: /drone/src/openbas-front/node_modules
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.11.0-alpine3.20 AS front-builder
FROM node:22.12.0-alpine3.20 AS front-builder

WORKDIR /opt/openbas-build/openbas-front
COPY openbas-front/packages ./packages
Expand Down
4 changes: 2 additions & 2 deletions openbas-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,12 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.5.12</version>
<version>1.5.13</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.5.12</version>
<version>1.5.13</version>
</dependency>
<dependency>
<groupId>ch.qos.logback.contrib</groupId>
Expand Down
16 changes: 8 additions & 8 deletions openbas-front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"@dagrejs/dagre": "1.1.4",
"@emotion/react": "11.13.3",
"@emotion/styled": "11.13.0",
"@fontsource/geologica": "5.0.6",
"@fontsource/ibm-plex-sans": "5.0.21",
"@fontsource/geologica": "5.1.0",
"@fontsource/ibm-plex-sans": "5.1.0",
"@hookform/resolvers": "3.9.1",
"@microsoft/fetch-event-source": "2.0.1",
"@mui/icons-material": "6.2.0",
Expand Down Expand Up @@ -63,7 +63,7 @@
"react-markdown": "9.0.1",
"react-redux": "9.2.0",
"react-router": "7.0.1",
"react-syntax-highlighter": "15.5.0",
"react-syntax-highlighter": "15.6.1",
"redux": "5.0.1",
"redux-thunk": "3.1.0",
"remark-flexible-markers": "1.2.1",
Expand All @@ -74,7 +74,7 @@
"usehooks-ts": "3.1.0",
"uuid": "11.0.3",
"xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
"zod": "3.23.8",
"zod": "3.24.1",
"zustand": "5.0.1"
},
"devDependencies": {
Expand All @@ -85,7 +85,7 @@
"@testing-library/react": "16.1.0",
"@types/d3-hierarchy": "3.1.7",
"@types/eslint__js": "8.42.3",
"@types/node": "22.9.3",
"@types/node": "22.10.2",
"@types/pdfmake": "0.2.9",
"@types/qs": "6",
"@types/react": "18.3.14",
Expand All @@ -94,7 +94,7 @@
"@types/react-syntax-highlighter": "15",
"@types/seamless-immutable": "7.1.19",
"@types/uuid": "10.0.0",
"@typescript-eslint/parser": "8.16.0",
"@typescript-eslint/parser": "8.18.1",
"@vitejs/plugin-react": "4.3.4",
"chokidar": "4.0.1",
"cross-env": "7.0.3",
Expand All @@ -111,13 +111,13 @@
"eslint-plugin-simple-import-sort": "12.1.1",
"express": "4.21.1",
"fs-extra": "11.2.0",
"globals": "15.13.0",
"globals": "15.14.0",
"jsdom": "25.0.1",
"monocart-coverage-reports": "2.11.3",
"monocart-reporter": "2.9.11",
"swagger-typescript-api": "13.0.22",
"typescript": "5.7.2",
"typescript-eslint": "8.16.0",
"typescript-eslint": "8.18.1",
"vite": "6.0.3",
"vitest": "2.1.1"
},
Expand Down
Loading

0 comments on commit a40888a

Please sign in to comment.