vendor upgrade

chubbyts · Jan 5, 2025 · f61551c · f61551c
1 parent 4b2a847
commit f61551c
Show file tree

Hide file tree

Showing 20 changed files with 2,549 additions and 3,342 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   docker-compose:
     name: docker-compose (production container)
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -25,7 +25,7 @@ jobs:
         run: docker compose -f docker-compose.ci.yml stop
   docker:
     name: docker (development container)
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -47,7 +47,7 @@ jobs:
         run: docker container run -v ${GITHUB_WORKSPACE}:/app node /bin/bash -c 'source ~/.bashrc && pnpm run build'
   node18:
     name: Node 18
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -60,7 +60,7 @@ jobs:
       - run: pnpm run test --run
   node20:
     name: Node 20
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -70,6 +70,19 @@ jobs:
           node-version: '20'
       - run: corepack enable pnpm
       - run: pnpm install
+      - run: pnpm run test --run
+  node22:
+    name: Node 22
+    runs-on: ubuntu-24.04
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+      - name: checkout node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+      - run: corepack enable pnpm
+      - run: pnpm install
       - run: pnpm run cs
       - run: pnpm run lint
       - run: pnpm run test --run --coverage --no-cache
@@ -83,7 +96,7 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: sonarcloud.io
-        uses: sonarsource/sonarcloud-github-action@master
+        uses: sonarsource/sonarqube-scan-action@v4.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2024 Dominik Zogg
+Copyright (c) 2025 Dominik Zogg
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -22,30 +22,30 @@ An api skeleton using mongodb for [chubbyts-framework][8].
 
 ## Requirements
 
- * node: 16
- * [@asteasolutions/zod-to-openapi][1]: ^7.1.1
- * [@chubbyts/chubbyts-api][2]: ^4.1.1
- * [@chubbyts/chubbyts-decode-encode][3]: ^1.3.3
- * [@chubbyts/chubbyts-dic][4]: ^1.2.0
- * [@chubbyts/chubbyts-dic-config][5]: ^1.2.0
- * [@chubbyts/chubbyts-dic-types][6]: ^1.2.1
- * [@chubbyts/chubbyts-framework][7]: ^1.9.4
- * [@chubbyts/chubbyts-framework-router-path-to-regexp][8]: ^1.4.1
- * [@chubbyts/chubbyts-http][9]: ^1.2.1
- * [@chubbyts/chubbyts-http-cors][10]: ^1.2.1
- * [@chubbyts/chubbyts-http-error][11]: ^2.3.1
- * [@chubbyts/chubbyts-http-node-bridge][12]: ^1.2.0
- * [@chubbyts/chubbyts-http-types][13]: ^1.2.3
- * [@chubbyts/chubbyts-log-types][14]: ^1.3.2
- * [@chubbyts/chubbyts-mongodb][15]: ^1.4.0
- * [@chubbyts/chubbyts-negotiation][16]: ^3.2.2
- * [@chubbyts/chubbyts-pino-adapter][17]: ^1.3.1
- * [commander][18]: ^12.1.0
- * [mongodb][19]: ^6.8.0
- * [openapi3-ts][20]: ^4.3.3
- * [pino][21]: ^9.2.0
- * [uuid][22]: ^10.0.0
- * [zod][23]: ^3.23.8
+ * node: 18
+ * [@asteasolutions/zod-to-openapi][1]: ^7.3.0
+ * [@chubbyts/chubbyts-api][2]: ^4.2.1
+ * [@chubbyts/chubbyts-decode-encode][3]: ^1.4.1
+ * [@chubbyts/chubbyts-dic][4]: ^1.3.1
+ * [@chubbyts/chubbyts-dic-config][5]: ^1.3.1
+ * [@chubbyts/chubbyts-dic-types][6]: ^1.3.1
+ * [@chubbyts/chubbyts-framework][7]: ^1.10.1
+ * [@chubbyts/chubbyts-framework-router-path-to-regexp][8]: ^1.5.1
+ * [@chubbyts/chubbyts-http][9]: ^1.3.1
+ * [@chubbyts/chubbyts-http-cors][10]: ^1.3.1
+ * [@chubbyts/chubbyts-http-error][11]: ^2.4.1
+ * [@chubbyts/chubbyts-http-node-bridge][12]: ^1.3.1
+ * [@chubbyts/chubbyts-http-types][13]: ^1.3.1
+ * [@chubbyts/chubbyts-log-types][14]: ^1.4.2
+ * [@chubbyts/chubbyts-mongodb][15]: ^1.5.1
+ * [@chubbyts/chubbyts-negotiation][16]: ^3.3.1
+ * [@chubbyts/chubbyts-pino-adapter][17]: ^1.4.1
+ * [commander][18]: ^13.0.0
+ * [mongodb][19]: ^6.12.0
+ * [openapi3-ts][20]: ^4.4.0
+ * [pino][21]: ^9.6.0
+ * [uuid][22]: ^11.0.4
+ * [zod][23]: ^3.24.1
 
 ## Environment
 
@@ -186,7 +186,7 @@ docker run -it -e NODE_ENV=production -e MONGO_URI="<see docker-compose.yml, rep
 
 ## Copyright
 
-2024 Dominik Zogg
+2025 Dominik Zogg
 
 [1]: https://www.npmjs.com/package/@asteasolutions/zod-to-openapi
 [2]: https://www.npmjs.com/package/@chubbyts/chubbyts-api

diff --git a/bootstrap/container.ts b/bootstrap/container.ts
@@ -4,7 +4,6 @@ import { createContainerByConfigFactory } from '@chubbyts/chubbyts-dic-config/di
 import type { Config } from '../config/production.js';
 
 export const containerFactory = async (env: string): Promise<Container> => {
-  /* eslint-disable @typescript-eslint/no-var-requires */
   const config: Config = (await import(`../config/${env}.js`)).configFactory(env);
 
   config.directories.forEach((directory) => {

diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
@@ -15,21 +15,21 @@ services:
   mongo:
     container_name: chubbyts-petstore-mongo
     hostname: chubbyts-petstore-mongo
-    image: mongo:6.0.11
+    image: mongo:7.0.16
     environment:
       MONGO_INITDB_ROOT_USERNAME: petstore
       MONGO_INITDB_ROOT_PASSWORD: KVKtkrTHhKuTJTor8pCP
   swagger-ui:
     container_name: chubbyts-petstore-swagger-ui
     hostname: chubbyts-petstore-swagger-ui
-    image: swaggerapi/swagger-ui:v5.10.3
+    image: swaggerapi/swagger-ui:v5.18.2
     environment:
       BASE_URL: /swagger
       URLS: '[ { url: "/openapi" } ]'
   nginx:
     container_name: chubbyts-petstore-nginx
     hostname: chubbyts-petstore-nginx
-    image: nginx:1.21.6
+    image: nginx:1.25.5
     environment:
       SERVER_PORT: '443'
       NODE_SERVER_HOST: 'node'

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -45,7 +45,7 @@ services:
   mongo:
     container_name: chubbyts-petstore-mongo
     hostname: chubbyts-petstore-mongo
-    image: mongo:7.0.7
+    image: mongo:7.0.16
     environment:
       MONGO_INITDB_ROOT_USERNAME: petstore
       MONGO_INITDB_ROOT_PASSWORD: 4aAUfBjDACcdZxNwJgJ6
@@ -56,7 +56,7 @@ services:
   nginx:
     container_name: chubbyts-petstore-nginx
     hostname: chubbyts-petstore-nginx
-    image: nginx:1.25.3
+    image: nginx:1.25.5
     environment:
       SERVER_PORT: '443'
       NODE_SERVER_HOST: 'node'
@@ -73,7 +73,7 @@ services:
   opensearch:
     container_name: chubbyts-petstore-opensearch
     hostname: chubbyts-petstore-opensearch
-    image: opensearchproject/opensearch:2.15.0
+    image: opensearchproject/opensearch:2.18.0
     environment:
       ES_JAVA_OPTS: '-Xms512m -Xmx512m'
       OPENSEARCH_INITIAL_ADMIN_PASSWORD: 't9V02zfj!NMj?LugFsOi'
@@ -96,15 +96,15 @@ services:
   opensearch-dashboard:
     container_name: chubbyts-petstore-opensearch-dashboard
     hostname: chubbyts-petstore-opensearch-dashboard
-    image: opensearchproject/opensearch-dashboards:2.15.0
+    image: opensearchproject/opensearch-dashboards:2.18.0
     environment:
       OPENSEARCH_HOSTS: '["https://opensearch:9200"]'
     ports:
       - 5601:5601
   swagger-ui:
     container_name: chubbyts-petstore-swagger-ui
     hostname: chubbyts-petstore-swagger-ui
-    image: swaggerapi/swagger-ui:v5.17.4
+    image: swaggerapi/swagger-ui:v5.18.2
     environment:
       BASE_URL: /swagger
       URLS: '[ { url: "/openapi" } ]'

diff --git a/docker/development/node/Dockerfile b/docker/development/node/Dockerfile
@@ -1,4 +1,4 @@
-FROM rockylinux/rockylinux:9.4
+FROM rockylinux/rockylinux:9.5
 
 SHELL ["/bin/bash", "-c"]
 
@@ -43,9 +43,9 @@ WORKDIR /home/node
 
 RUN curl -fsSL https://fnm.vercel.app/install | bash -s -- --install-dir "$HOME/.fnm" --skip-shell \
     && source ~/.bashrc \
-    && fnm install 20 \
-    && fnm default 20 \
-    && fnm use 20 \
+    && fnm install 22 \
+    && fnm default 22 \
+    && fnm use 22 \
     && npm uninstall -g npm \
     && corepack enable pnpm
 

diff --git a/docker/production/node-fluentd/Dockerfile b/docker/production/node-fluentd/Dockerfile
@@ -1,4 +1,4 @@
-FROM fluent/fluentd:v1.17
+FROM fluent/fluentd:v1.18-1
 
 # Use root account to use apk
 USER root

diff --git a/docker/production/node/Dockerfile b/docker/production/node/Dockerfile
@@ -1,5 +1,5 @@
 # base
-FROM rockylinux/rockylinux:9.3 AS base
+FROM rockylinux/rockylinux:9.5 AS base
 
 SHELL ["/bin/bash", "-c"]
 
@@ -36,9 +36,9 @@ WORKDIR /home/node
 
 RUN curl -fsSL https://fnm.vercel.app/install | bash -s -- --install-dir "$HOME/.fnm" --skip-shell \
     && source ~/.bashrc \
-    && fnm install 20 \
-    && fnm default 20 \
-    && fnm use 20 \
+    && fnm install 22 \
+    && fnm default 22 \
+    && fnm use 22 \
     && npm uninstall -g npm \
     && corepack enable pnpm
 

diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1 @@
+export { default } from '@chubbyts/chubbyts-eslint/dist/eslint.config';
diff --git a/nodemon.json b/nodemon.json
diff --git a/package.json b/package.json
@@ -16,12 +16,12 @@
   "scripts": {
     "build": "rm -Rf dist && tsc",
     "command": "ts-node bin/console.ts",
-    "cs-fix": "prettier --write bin bootstrap config src tests *.cjs *.ts",
-    "cs": "prettier --check bin bootstrap config src tests *.cjs *.ts",
-    "develop:debug": "CHUBBYTS_NODE_OPTIONS='--inspect=0.0.0.0:8888' nodemon",
-    "develop": "nodemon",
+    "cs-fix": "prettier --write bin bootstrap config src tests *.js *.ts",
+    "cs": "prettier --check bin bootstrap config src tests *.js *.ts",
+    "develop:debug": "tsx watch --inspect=0.0.0.0:8888 bootstrap/index.ts",
+    "develop": "tsx watch bootstrap/index.ts",
     "infection": "stryker run",
-    "lint-fix": "eslint bin bootstrap config src tests --fix",
+    "lint-fix": "eslint bin bootstrap config src tests *.js *.ts --fix",
     "lint": "eslint bin bootstrap config src tests",
     "start:debug": "pnpm install && pnpm run lint-fix && pnpm run cs-fix && pnpm run develop:debug",
     "start": "pnpm install && pnpm run lint-fix && pnpm run cs-fix && pnpm run develop",
@@ -41,48 +41,45 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@asteasolutions/zod-to-openapi": "^7.1.1",
-    "@chubbyts/chubbyts-api": "^4.1.1",
-    "@chubbyts/chubbyts-decode-encode": "^1.3.3",
-    "@chubbyts/chubbyts-dic": "^1.2.0",
-    "@chubbyts/chubbyts-dic-config": "^1.2.0",
-    "@chubbyts/chubbyts-dic-types": "^1.2.1",
-    "@chubbyts/chubbyts-framework": "^1.9.4",
-    "@chubbyts/chubbyts-framework-router-path-to-regexp": "^1.4.1",
-    "@chubbyts/chubbyts-http": "^1.2.1",
-    "@chubbyts/chubbyts-http-cors": "^1.2.1",
-    "@chubbyts/chubbyts-http-error": "^2.3.1",
-    "@chubbyts/chubbyts-http-node-bridge": "^1.2.0",
-    "@chubbyts/chubbyts-http-types": "^1.2.3",
-    "@chubbyts/chubbyts-log-types": "^1.3.2",
-    "@chubbyts/chubbyts-mongodb": "^1.4.0",
-    "@chubbyts/chubbyts-negotiation": "^3.2.2",
-    "@chubbyts/chubbyts-pino-adapter": "^1.3.2",
-    "commander": "^12.1.0",
-    "mongodb": "^6.8.0",
-    "openapi3-ts": "^4.3.3",
-    "pino": "^9.2.0",
-    "uuid": "^10.0.0",
-    "zod": "^3.23.8"
+    "@asteasolutions/zod-to-openapi": "^7.3.0",
+    "@chubbyts/chubbyts-api": "^4.2.1",
+    "@chubbyts/chubbyts-decode-encode": "^1.4.1",
+    "@chubbyts/chubbyts-dic": "^1.3.1",
+    "@chubbyts/chubbyts-dic-config": "^1.3.1",
+    "@chubbyts/chubbyts-dic-types": "^1.3.1",
+    "@chubbyts/chubbyts-framework": "^1.10.1",
+    "@chubbyts/chubbyts-framework-router-path-to-regexp": "^1.5.1",
+    "@chubbyts/chubbyts-http": "^1.3.1",
+    "@chubbyts/chubbyts-http-cors": "^1.3.1",
+    "@chubbyts/chubbyts-http-error": "^2.4.1",
+    "@chubbyts/chubbyts-http-node-bridge": "^1.3.1",
+    "@chubbyts/chubbyts-http-types": "^1.3.1",
+    "@chubbyts/chubbyts-log-types": "^1.4.3",
+    "@chubbyts/chubbyts-mongodb": "^1.5.1",
+    "@chubbyts/chubbyts-negotiation": "^3.3.1",
+    "@chubbyts/chubbyts-pino-adapter": "^1.4.1",
+    "commander": "^13.0.0",
+    "mongodb": "^6.12.0",
+    "openapi3-ts": "^4.4.0",
+    "pino": "^9.6.0",
+    "uuid": "^11.0.4",
+    "zod": "^3.24.1"
   },
   "devDependencies": {
-    "@chubbyts/chubbyts-eslint": "^2.0.7",
-    "@chubbyts/chubbyts-function-mock": "^1.4.3",
-    "@stryker-mutator/core": "^8.2.6",
-    "@stryker-mutator/typescript-checker": "^8.2.6",
-    "@stryker-mutator/vitest-runner": "^8.2.6",
-    "@swc/cli": "^0.4.0",
-    "@swc/core": "^1.6.7",
-    "@types/node": "^20.14.9",
+    "@chubbyts/chubbyts-eslint": "^3.0.3",
+    "@chubbyts/chubbyts-function-mock": "^1.5.2",
+    "@stryker-mutator/core": "^8.7.1",
+    "@stryker-mutator/typescript-checker": "^8.7.1",
+    "@stryker-mutator/vitest-runner": "^8.7.1",
+    "@types/node": "^22.10.5",
     "@types/uuid": "^10.0.0",
-    "@vitest/coverage-v8": "^1.6.0",
-    "cross-fetch": "^4.0.0",
-    "mongodb-memory-server": "^9.4.0",
-    "nodemon": "^3.1.4",
-    "prettier": "^3.3.2",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.5.3",
-    "vitest": "^1.6.0"
+    "@vitest/coverage-v8": "^2.1.8",
+    "cross-fetch": "^4.1.0",
+    "mongodb-memory-server": "^10.1.3",
+    "prettier": "^3.4.2",
+    "tsx": "^4.19.2",
+    "typescript": "^5.7.2",
+    "vitest": "^2.1.8"
   },
-  "packageManager": "pnpm@9.4.0+sha512.f549b8a52c9d2b8536762f99c0722205efc5af913e77835dbccc3b0b0b2ca9e7dc8022b78062c17291c48e88749c70ce88eb5a74f1fa8c4bf5e18bb46c8bd83a"
+  "packageManager": "pnpm@9.15.2+sha512.93e57b0126f0df74ce6bff29680394c0ba54ec47246b9cf321f0121d8d9bb03f750a705f24edc3c1180853afd7c2c3b94196d0a3d53d3e069d9e2793ef11f321"
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export { default } from '@chubbyts/chubbyts-eslint/dist/eslint.config';