Skip to content

Commit

Permalink
Merge pull request #501 from cloud-pi-native/chore/upgrade-dependencies
Browse files Browse the repository at this point in the history
chore: ⬆️ upgrade dependencies
  • Loading branch information
this-is-tobi authored Jul 13, 2023
2 parents ac93518 + 8eeabcc commit 6b0da80
Show file tree
Hide file tree
Showing 17 changed files with 805 additions and 955 deletions.
3 changes: 0 additions & 3 deletions apps/client/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/* eslint-env node */
require('@rushstack/eslint-patch/modern-module-resolution')

module.exports = {
root: true,
extends: [
Expand Down
2 changes: 1 addition & 1 deletion apps/client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Base stage
FROM docker.io/node:18.16.0-bullseye-slim AS base
FROM docker.io/node:18.16.1-bullseye-slim AS base

RUN npm install --location=global pnpm
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion apps/client/cypress/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/cypress/included:12.14.0
FROM docker.io/cypress/included:12.17.1

RUN npm install --location=global pnpm
WORKDIR /app
Expand Down
28 changes: 14 additions & 14 deletions apps/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,33 +23,33 @@
"type-check": "vue-tsc --noEmit -p tsconfig.json --composite false || exit 0"
},
"dependencies": {
"@gouvfr/dsfr": "1.10.0-rc.1",
"@gouvfr/dsfr": "^1.9.3",
"@gouvminint/vue-dsfr": "^4.0.2",
"@vue/tsconfig": "^0.4.0",
"axios": "^1.4.0",
"js-yaml": "^4.1.0",
"jszip": "^3.10.1",
"keycloak-js": "^21.1.2",
"keycloak-js": "^22.0.0",
"nanoid": "4.0.2",
"oh-vue-icons": "^1.0.0-rc3",
"pinia": "^2.1.4",
"shared": "workspace:^",
"typescript": "^5.1.6",
"vue": "^3.3.4",
"vue-router": "^4.2.2",
"vue-router": "^4.2.4",
"vue3-json-viewer": "^2.2.2"
},
"devDependencies": {
"@rushstack/eslint-patch": "^1.3.2",
"@types/jsdom": "^21.1.1",
"@types/markdown-it-emoji": "^2.0.2",
"@types/markdown-it-link-attributes": "^3.0.1",
"@types/node": "^18.16.16",
"@unocss/transformer-directives": "^0.53.4",
"@types/node": "^18.16.19",
"@unocss/transformer-directives": "^0.53.5",
"@vitejs/plugin-vue": "^4.2.3",
"@vitest/coverage-v8": "^0.32.4",
"@vitest/coverage-v8": "^0.33.0",
"@vue/eslint-config-typescript": "^11.0.3",
"cypress-vite": "^1.4.0",
"cypress-vite": "^1.4.1",
"eslint": "^8.44.0",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-cypress": "^2.13.3",
Expand All @@ -64,19 +64,19 @@
"npm-run-all": "^4.1.5",
"rimraf": "^5.0.1",
"start-server-and-test": "^2.0.0",
"stylelint": "^15.10.0",
"stylelint": "^15.10.1",
"stylelint-config-html": "^1.1.0",
"stylelint-config-recommended-vue": "^1.4.0",
"stylelint-config-recommended-vue": "^1.5.0",
"stylelint-config-standard": "^34.0.0",
"test-utils": "workspace:^1.0.0",
"unocss": "^0.53.4",
"vite": "^4.3.9",
"unocss": "^0.53.5",
"vite": "^4.4.3",
"vite-plugin-md": "^0.21.5",
"vitest": "^0.32.0",
"vue-tsc": "^1.8.3"
"vitest": "^0.33.0",
"vue-tsc": "^1.8.4"
},
"optionalDependencies": {
"@cypress/vue": "^5.0.5",
"cypress": "^12.16.0"
"cypress": "^12.17.1"
}
}
4 changes: 2 additions & 2 deletions apps/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Base stage
FROM docker.io/node:18.16.0-bullseye-slim AS base
FROM docker.io/node:18.16.1-bullseye-slim AS base

RUN npm install --location=global pnpm
WORKDIR /app
Expand Down Expand Up @@ -30,7 +30,7 @@ RUN pnpm --filter server run build
RUN pnpm --filter server --prod deploy build

# Prod stage
FROM docker.io/node:18.16.0-bullseye-slim AS prod
FROM docker.io/node:18.16.1-bullseye-slim AS prod

ARG APP_VERSION
ENV APP_VERSION=$APP_VERSION
Expand Down
47 changes: 23 additions & 24 deletions apps/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,52 +22,51 @@
},
"dependencies": {
"@fastify/cookie": "^8.3.0",
"@fastify/helmet": "^10.1.1",
"@fastify/session": "^10.3.0",
"@gitbeaker/rest": "^39.5.1",
"@keycloak/keycloak-admin-client": "^21.1.1",
"@fastify/helmet": "^11.0.0",
"@fastify/session": "^10.4.0",
"@gitbeaker/rest": "^39.6.0",
"@keycloak/keycloak-admin-client": "^22.0.0",
"@kubernetes/client-node": "^0.18.1",
"@prisma/client": "^4.15.0",
"@prisma/client": "^5.0.0",
"axios": "^1.4.0",
"date-fns": "^2.30.0",
"dotenv": "^16.1.4",
"fastify": "^4.17.0",
"dotenv": "^16.3.1",
"fastify": "^4.19.2",
"fastify-keycloak-adapter": "^2.0.2",
"mustache": "^4.2.0",
"nanoid": "4.0.2",
"node-vault-client": "^0.6.1",
"prisma": "^4.15.0",
"prisma": "^5.0.0",
"shared": "workspace:^1.0.0",
"vitest-mock-extended": "^1.1.3"
"vitest-mock-extended": "^1.1.4"
},
"devDependencies": {
"@dso-console/tsconfig": "workspace:^",
"@faker-js/faker": "^8.0.2",
"@kubernetes-models/argo-cd": "^2.3.1",
"@rushstack/eslint-patch": "^1.3.1",
"@types/node": "^18.16.16",
"@typescript-eslint/eslint-plugin": "^5.60.1",
"@typescript-eslint/parser": "^5.60.1",
"@vitest/coverage-c8": "^0.30.1",
"@vitest/coverage-v8": "^0.32.0",
"eslint": "^8.42.0",
"@rushstack/eslint-patch": "^1.3.2",
"@types/node": "^18.16.19",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"@vitest/coverage-v8": "^0.33.0",
"eslint": "^8.44.0",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-n": "^16.0.0",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-promise": "^6.1.1",
"fastify-plugin": "^4.5.0",
"nodemon": "^2.0.22",
"nodemon": "^3.0.1",
"npm-run-all": "^4.1.5",
"pino-pretty": "^10.0.0",
"pino-pretty": "^10.0.1",
"rimraf": "^5.0.1",
"shared": "workspace:^",
"test-utils": "workspace:^1.0.0",
"ts-patch": "3.0.0",
"ts-patch": "3.0.1",
"ttypescript": "^1.5.15",
"typescript": "^5.0.4",
"typescript": "^5.1.6",
"typescript-transform-paths": "^3.4.6",
"vite": "^4.3.9",
"vite-node": "^0.32.0",
"vitest": "^0.32.0"
"vite": "^4.4.3",
"vite-node": "^0.33.0",
"vitest": "^0.33.0"
}
}
12 changes: 6 additions & 6 deletions apps/server/src/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,12 @@ model Cluster {
}

model Kubeconfig {
id String @id @unique @default(uuid()) @db.Uuid
user Json
cluster Json
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
parentCluster Cluster? @relation()
id String @id @unique @default(uuid()) @db.Uuid
user Json
cluster Json
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
parentCluster Cluster? @relation()
}

model Role {
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:

postgres:
restart: always
image: docker.io/postgres:14.5
image: docker.io/postgres:15.3
container_name: dso-console_postgres
environment:
CI: "true"
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:

postgres:
restart: always
image: docker.io/postgres:14.5
image: docker.io/postgres:15.3
container_name: dso-console_postgres
environment:
POSTGRES_DB: ${DB_NAME}
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ services:

postgres:
restart: always
image: docker.io/postgres:14.5
image: docker.io/postgres:15.3
container_name: dso-console_postgres
ports:
- 5432:5432
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.int.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3.9'
services:
postgres:
restart: always
image: docker.io/postgres:14.5
image: docker.io/postgres:15.3
container_name: dso-console_postgres
environment:
POSTGRES_DB: ${DB_NAME}
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3.9'
services:
postgres:
restart: always
image: docker.io/postgres:14.5
image: docker.io/postgres:15.3
container_name: dso-console_postgres
environment:
POSTGRES_DB: ${DB_NAME}
Expand Down
2 changes: 1 addition & 1 deletion helm/templates/deployment-postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
containers:
- name: {{ .Release.Name }}-postgres
imagePullPolicy: {{ .Values.imagePullPolicy }}
image: docker.io/postgres:14.5
image: docker.io/postgres:15.3
ports:
- containerPort: {{ .Values.postgres.service.port }}
envFrom:
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
"test:e2e-ci-build": "docker compose --env-file env/.env.ci -f docker/docker-compose.ci.yml build --pull"
},
"devDependencies": {
"@commitlint/cli": "^17.6.5",
"@commitlint/config-conventional": "^17.6.5",
"@commitlint/cli": "^17.6.6",
"@commitlint/config-conventional": "^17.6.6",
"husky": "^8.0.3",
"lint-staged": "^13.2.2",
"turbo": "^1.10.2"
"lint-staged": "^13.2.3",
"turbo": "^1.10.7"
},
"volta": {
"node": "18.16.0"
"node": "18.16.1"
}
}
22 changes: 11 additions & 11 deletions packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@
"@dso-console/tsconfig": "workspace:^",
"@faker-js/faker": "^8.0.2",
"@kubernetes/client-node": "^0.18.1",
"@types/node": "^18.16.16",
"@typescript-eslint/eslint-plugin": "^5.59.11",
"@typescript-eslint/parser": "^5.59.11",
"@vitest/coverage-v8": "^0.32.0",
"eslint": "^8.42.0",
"@types/node": "^18.16.19",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"@vitest/coverage-v8": "^0.33.0",
"eslint": "^8.44.0",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-n": "^16.0.0",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-promise": "^6.1.1",
"nodemon": "^2.0.22",
"nodemon": "^3.0.1",
"npm-run-all": "^4.1.5",
"rimraf": "^5.0.1",
"ts-patch": "3.0.0",
"typescript": "~5.0.0",
"ts-patch": "3.0.1",
"typescript": "~5.1.6",
"typescript-transform-paths": "^3.4.6",
"vite": "^4.3.9",
"vitest": "^0.32.0"
"vite": "^4.4.3",
"vitest": "^0.33.0"
}
}
4 changes: 2 additions & 2 deletions packages/test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
"shared": "workspace:^"
},
"devDependencies": {
"eslint": "^8.42.0",
"eslint": "^8.44.0",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-n": "^16.0.0",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-promise": "^6.1.1"
}
}
Loading

0 comments on commit 6b0da80

Please sign in to comment.