From 6ec6082ab6a88ab44f4e1e2a0303ac581da5c6ba Mon Sep 17 00:00:00 2001 From: schneefux Date: Tue, 5 Dec 2023 11:34:55 +0100 Subject: [PATCH] cube, render, media: Update --- cube/Dockerfile | 2 +- cube/package.json | 4 +- cube/yarn.lock | 170 ++++++++++++++++++++++---------------------- media/Dockerfile | 4 +- render/Dockerfile | 4 +- render/package.json | 12 ++-- render/yarn.lock | 75 +++++++++---------- web/Dockerfile | 9 ++- 8 files changed, 139 insertions(+), 141 deletions(-) diff --git a/cube/Dockerfile b/cube/Dockerfile index b62efda9..35acdc38 100644 --- a/cube/Dockerfile +++ b/cube/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20 AS builder +FROM node:21 AS builder WORKDIR /app COPY ./package.json ./yarn.lock . RUN yarn install --frozen-lockfile diff --git a/cube/package.json b/cube/package.json index 00347892..9922ff24 100644 --- a/cube/package.json +++ b/cube/package.json @@ -7,8 +7,8 @@ "dev": "cross-env CUBEJS_DEV_MODE=true ./node_modules/.bin/cubejs-server server" }, "devDependencies": { - "@cubejs-backend/clickhouse-driver": "^0.34.20", - "@cubejs-backend/server": "^0.34.23", + "@cubejs-backend/clickhouse-driver": "^0.34.26", + "@cubejs-backend/server": "^0.34.30", "cross-env": "^7.0.3" } } diff --git a/cube/yarn.lock b/cube/yarn.lock index 0de9a93a..66a015c1 100644 --- a/cube/yarn.lock +++ b/cube/yarn.lock @@ -905,13 +905,13 @@ "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" -"@cubejs-backend/api-gateway@^0.34.23": - version "0.34.23" - resolved "https://registry.yarnpkg.com/@cubejs-backend/api-gateway/-/api-gateway-0.34.23.tgz#d4aea729a53b8ad93453e50ada90f0a83493aa4a" - integrity sha512-AHSIPFjfpoF3ssq2wKUDwsu5/M0b85gsqeHRZwPHxq2y2Kmi235c2pVpmaoFbNeN6Hop5bMbGTWITXymkfUYug== +"@cubejs-backend/api-gateway@^0.34.27": + version "0.34.27" + resolved "https://registry.yarnpkg.com/@cubejs-backend/api-gateway/-/api-gateway-0.34.27.tgz#13b0d0ba976cb1f34d78b25709d61b6417d7aa12" + integrity sha512-SyzWldbcOoW6xZn9jnKthHA41JqhVHekYN5wK9rxVU0MQy35hB4Q+fldLNuSFgfrFbAbagSh7K16FjGz0LPOJw== dependencies: - "@cubejs-backend/native" "^0.34.23" - "@cubejs-backend/shared" "^0.34.20" + "@cubejs-backend/native" "^0.34.27" + "@cubejs-backend/shared" "^0.34.25" "@ungap/structured-clone" "^0.3.4" body-parser "^1.19.0" chrono-node "^2.6.2" @@ -930,33 +930,33 @@ ramda "^0.27.0" uuid "^8.3.2" -"@cubejs-backend/base-driver@^0.34.20": - version "0.34.20" - resolved "https://registry.yarnpkg.com/@cubejs-backend/base-driver/-/base-driver-0.34.20.tgz#35b0b37cb7f15c517df93d2dd2775b4c6efb94c5" - integrity sha512-3Gzy9/mrZrtEb85R6HmlgeKbdlrvnILDUXNAFNCUqL477oJvttvB3xSxk4JpjVxc3cgUcMlmKkAJ4Oq4iZTxvA== +"@cubejs-backend/base-driver@^0.34.26": + version "0.34.26" + resolved "https://registry.yarnpkg.com/@cubejs-backend/base-driver/-/base-driver-0.34.26.tgz#8dd608e092f27789288b5f0c94dd1d7d2130cafe" + integrity sha512-3R4WdqoTuDfXPvh+7dXoFeglmAYJID7FYjdCzgB6I4nho2U+Dk3RMzGCtMDhzj3rj50laCCZ46CGbaEagm8/PQ== dependencies: - "@cubejs-backend/shared" "^0.34.20" + "@cubejs-backend/shared" "^0.34.25" ramda "^0.27.0" -"@cubejs-backend/clickhouse-driver@^0.34.20": - version "0.34.20" - resolved "https://registry.yarnpkg.com/@cubejs-backend/clickhouse-driver/-/clickhouse-driver-0.34.20.tgz#29611d11c028e36db1c79298506e99e1a3ef8a8c" - integrity sha512-+envHHEMyUiupl/DX5ZQ4KBERVevd9FAzwGaIzpNH3BjKt7QEddLydBvbB/fLrsdZRNYAGwIVBrigVAOB89hyA== +"@cubejs-backend/clickhouse-driver@^0.34.26": + version "0.34.26" + resolved "https://registry.yarnpkg.com/@cubejs-backend/clickhouse-driver/-/clickhouse-driver-0.34.26.tgz#4b9ea0fa782dc73b00cc0a5ebfb232dbcbd1238e" + integrity sha512-LEr6o8d2Fo84siPD3u0zIXXtR14C9egDZVd8DIO3qou6RCzffiFtgRqGwv283XOZpfdckVrJ2tExdcf+0oNJgA== dependencies: "@apla/clickhouse" "^1.5.5" - "@cubejs-backend/base-driver" "^0.34.20" - "@cubejs-backend/shared" "^0.34.20" + "@cubejs-backend/base-driver" "^0.34.26" + "@cubejs-backend/shared" "^0.34.25" generic-pool "^3.6.0" sqlstring "^2.3.1" uuid "^8.3.2" -"@cubejs-backend/cloud@^0.34.20": - version "0.34.20" - resolved "https://registry.yarnpkg.com/@cubejs-backend/cloud/-/cloud-0.34.20.tgz#0b692dfd4d6266a52f30282392cd576ff3706935" - integrity sha512-yYSovGFDRXS63NGoHOoZLy5oKuErYgHlYRiJti727DnvKRLPgiGEqAVacw/JDUW2Iy9Go+Be28zy1nVnh3dLlg== +"@cubejs-backend/cloud@^0.34.25": + version "0.34.25" + resolved "https://registry.yarnpkg.com/@cubejs-backend/cloud/-/cloud-0.34.25.tgz#0d3fe62352a7bf24bcdc541d670d13aca7102962" + integrity sha512-JEzrG6hjpEhUfKBKWUf4dgv0YseMX58iuuAktEVLns1s7Byxeea8gaQi2E7tXURkhzKTuJfI+3uNqBugjKfrNw== dependencies: "@cubejs-backend/dotenv" "^9.0.2" - "@cubejs-backend/shared" "^0.34.20" + "@cubejs-backend/shared" "^0.34.25" chokidar "^3.5.1" env-var "^6.3.0" fs-extra "^9.1.0" @@ -964,19 +964,19 @@ request "^2.88.2" request-promise "^4.2.5" -"@cubejs-backend/cubesql@^0.34.23": - version "0.34.23" - resolved "https://registry.yarnpkg.com/@cubejs-backend/cubesql/-/cubesql-0.34.23.tgz#5ddc05377f0280dae95f904adda4b0f79136261b" - integrity sha512-7gz+mdFQunYYnHHEy5jL2RTxDwJezv8r1qwaz32gRXk9rzylZGHqvfFsl+w09xjbOAMky9hLJeFGZi7+hh/Stw== +"@cubejs-backend/cubesql@^0.34.27": + version "0.34.27" + resolved "https://registry.yarnpkg.com/@cubejs-backend/cubesql/-/cubesql-0.34.27.tgz#7bb8218830dc9207643718b5544aba6323d74d25" + integrity sha512-TUA4sMxFEXc0aLAd+cvB0IG+jQJ95J5oC47p9ylWRicizR1OJf3iuV4wSTrkn309l43RjluDYT9bCdxGXuf1nA== -"@cubejs-backend/cubestore-driver@^0.34.21": - version "0.34.21" - resolved "https://registry.yarnpkg.com/@cubejs-backend/cubestore-driver/-/cubestore-driver-0.34.21.tgz#88e03615c06f59498fe0c2c98a3935806b8c4eba" - integrity sha512-PuqI2SCyVC9vbaRtKaQ64v9NqbhYDG3DHXIUSEtEmiGXZmYeHsmA5K2IJKDJ931BqAVnGEoEXy0sFr4iRJHdyQ== +"@cubejs-backend/cubestore-driver@^0.34.30": + version "0.34.30" + resolved "https://registry.yarnpkg.com/@cubejs-backend/cubestore-driver/-/cubestore-driver-0.34.30.tgz#6a1d3b0642eb4ca44f67cdc414f256d2d16c5c5c" + integrity sha512-x9+xIRp3IhZ9SE082MCDQj2hlLwtZsDS/Ye2LDCPBpr4/cbFHufLDhRs0iD2RLE26s0SRwzqZ0TnINQKKQ3xsw== dependencies: - "@cubejs-backend/base-driver" "^0.34.20" - "@cubejs-backend/cubestore" "^0.34.21" - "@cubejs-backend/shared" "^0.34.20" + "@cubejs-backend/base-driver" "^0.34.26" + "@cubejs-backend/cubestore" "^0.34.30" + "@cubejs-backend/shared" "^0.34.25" csv-write-stream "^2.0.0" flatbuffers "23.3.3" fs-extra "^9.1.0" @@ -988,12 +988,12 @@ uuid "^8.3.2" ws "^7.4.3" -"@cubejs-backend/cubestore@^0.34.21": - version "0.34.21" - resolved "https://registry.yarnpkg.com/@cubejs-backend/cubestore/-/cubestore-0.34.21.tgz#d29db0c83d7982beeb19cb1bcfe79bf8f49ecadb" - integrity sha512-PrGM7ehugwdxQnP8Lkz8ZKj+HSjOsDx2n4BWm1aVjC/cP14WuAvDxm3yKF8kslAIkYJEmiszzSrFRbOe0TeNiA== +"@cubejs-backend/cubestore@^0.34.30": + version "0.34.30" + resolved "https://registry.yarnpkg.com/@cubejs-backend/cubestore/-/cubestore-0.34.30.tgz#209afc946a887df07023dc32d378463fb1c68dfd" + integrity sha512-HEFiECY+o+/MwSrE291EJekryx84PlwkB+GvhsAXn/A53SgAu6+l76wkGC3e9bEkGNPaOp3o0VVXlNyPJNs4ow== dependencies: - "@cubejs-backend/shared" "^0.34.20" + "@cubejs-backend/shared" "^0.34.25" "@octokit/core" "^3.2.5" source-map-support "^0.5.19" @@ -1002,23 +1002,23 @@ resolved "https://registry.yarnpkg.com/@cubejs-backend/dotenv/-/dotenv-9.0.2.tgz#c3679091b702f0fd38de120c5a63943fcdc0dcbf" integrity sha512-yC1juhXEjM7K97KfXubDm7WGipd4Lpxe+AT8XeTRE9meRULrKlw0wtE2E8AQkGOfTBn+P1SCkePQ/BzIbOh1VA== -"@cubejs-backend/native@^0.34.23": - version "0.34.23" - resolved "https://registry.yarnpkg.com/@cubejs-backend/native/-/native-0.34.23.tgz#b407e20cee1e8f63ee29c1d3b53804089f374777" - integrity sha512-0oYxxgUq5uCqQr77KiluMrul2YZukrN41ZSvowiAR1krBX0u42IGHDXu3o1S7/T4mZ8+h8AimRjJVetKPF3kTA== +"@cubejs-backend/native@^0.34.27": + version "0.34.27" + resolved "https://registry.yarnpkg.com/@cubejs-backend/native/-/native-0.34.27.tgz#c46f5b4feb2da0197beae96db0f5ddef95f0a7c1" + integrity sha512-YnbB/S0EDmBOxYUNPLbDAbkj1vKOMCDX6/AHDyVQJgaermH34U8PKdwrVmnzpaPdQgIo5tfysls6VYuCCYZI1g== dependencies: - "@cubejs-backend/cubesql" "^0.34.23" - "@cubejs-backend/shared" "^0.34.20" + "@cubejs-backend/cubesql" "^0.34.27" + "@cubejs-backend/shared" "^0.34.25" "@cubejs-infra/post-installer" "^0.0.7" -"@cubejs-backend/query-orchestrator@^0.34.23": - version "0.34.23" - resolved "https://registry.yarnpkg.com/@cubejs-backend/query-orchestrator/-/query-orchestrator-0.34.23.tgz#9bb0c03707d7940ce23de178bdad866e54f9a122" - integrity sha512-60OY84MfbPmb2oMQyCby8h/otfyYHEkzh+MVGtVaJvE2oxiGzxoHG7249g1lhU+UkUvUM0YGpRnX2n23zw53xg== +"@cubejs-backend/query-orchestrator@^0.34.30": + version "0.34.30" + resolved "https://registry.yarnpkg.com/@cubejs-backend/query-orchestrator/-/query-orchestrator-0.34.30.tgz#1c481de6273f744615ade4a7bfd2bafa5e626e5c" + integrity sha512-vuicEXc2ZxF4WKyFIBuKm5dO9zA3WD1skuBockYBiOMfOmmS1QWSMLhzVeVcF12Lvqg/xS9pDQmi+Xuzqyjc9Q== dependencies: - "@cubejs-backend/base-driver" "^0.34.20" - "@cubejs-backend/cubestore-driver" "^0.34.21" - "@cubejs-backend/shared" "^0.34.20" + "@cubejs-backend/base-driver" "^0.34.26" + "@cubejs-backend/cubestore-driver" "^0.34.30" + "@cubejs-backend/shared" "^0.34.25" csv-write-stream "^2.0.0" es5-ext "0.10.53" generic-pool "^3.7.1" @@ -1029,10 +1029,10 @@ ramda "^0.27.2" redis "^3.0.2" -"@cubejs-backend/schema-compiler@^0.34.23": - version "0.34.23" - resolved "https://registry.yarnpkg.com/@cubejs-backend/schema-compiler/-/schema-compiler-0.34.23.tgz#ddb682d58b87e4fc7aee3389ab1936bd22d7568b" - integrity sha512-SXBSCvEwGiMs29u57E2ycx55UyWQBdiVwRZ3ei0UIHoQekyhVvUtHUu80fvrHOA8sllxLgXtYREQ+hx6+Px3sw== +"@cubejs-backend/schema-compiler@^0.34.30": + version "0.34.30" + resolved "https://registry.yarnpkg.com/@cubejs-backend/schema-compiler/-/schema-compiler-0.34.30.tgz#bc1a421e2ee032a5beba8b9de4a665dafec43dc2" + integrity sha512-GfGiBBm7ebXonmNBynMFB2J5gtISfqSZ4VXEsr2SSAa2rWsmzwRYn8ZC70lQe/GZyjKK1vdTgzNeRTnPtbKWgA== dependencies: "@babel/code-frame" "^7.12.11" "@babel/core" "^7.12.10" @@ -1042,8 +1042,8 @@ "@babel/standalone" "^7.12.10" "@babel/traverse" "^7.12.10" "@babel/types" "^7.12.12" - "@cubejs-backend/native" "^0.34.23" - "@cubejs-backend/shared" "^0.34.20" + "@cubejs-backend/native" "^0.34.27" + "@cubejs-backend/shared" "^0.34.25" antlr4ts "0.5.0-alpha.4" camelcase "^6.2.0" cron-parser "^3.5.0" @@ -1058,19 +1058,19 @@ ramda "^0.27.2" syntax-error "^1.3.0" -"@cubejs-backend/server-core@^0.34.23": - version "0.34.23" - resolved "https://registry.yarnpkg.com/@cubejs-backend/server-core/-/server-core-0.34.23.tgz#9424cc2bf56765658446778d596adcaf79c2e8e0" - integrity sha512-IjOP8TtWJWVpLPTfOCPupIY9XWcVvWVedLR4yMKADmwEkgZnd2ad2gDoN7EOMAz9gthrtWphEU8DPd38WeUWJw== +"@cubejs-backend/server-core@^0.34.30": + version "0.34.30" + resolved "https://registry.yarnpkg.com/@cubejs-backend/server-core/-/server-core-0.34.30.tgz#ac7c515fdf10bc14ff493306694b8fd05c19d313" + integrity sha512-VJH0Fq2RVkWWYDhicZF9FLiAaztrFBQXB6YARt2amwUpRyNb1m9VOj9g4inGeHrZHE9ipVlJCEF3uIjlMcfCpA== dependencies: - "@cubejs-backend/api-gateway" "^0.34.23" - "@cubejs-backend/cloud" "^0.34.20" + "@cubejs-backend/api-gateway" "^0.34.27" + "@cubejs-backend/cloud" "^0.34.25" "@cubejs-backend/dotenv" "^9.0.2" - "@cubejs-backend/native" "^0.34.23" - "@cubejs-backend/query-orchestrator" "^0.34.23" - "@cubejs-backend/schema-compiler" "^0.34.23" - "@cubejs-backend/shared" "^0.34.20" - "@cubejs-backend/templates" "^0.34.20" + "@cubejs-backend/native" "^0.34.27" + "@cubejs-backend/query-orchestrator" "^0.34.30" + "@cubejs-backend/schema-compiler" "^0.34.30" + "@cubejs-backend/shared" "^0.34.25" + "@cubejs-backend/templates" "^0.34.25" codesandbox-import-utils "^2.1.12" cross-spawn "^7.0.1" fs-extra "^8.1.0" @@ -1090,16 +1090,16 @@ uuid "^8.3.2" ws "^7.5.3" -"@cubejs-backend/server@^0.34.23": - version "0.34.23" - resolved "https://registry.yarnpkg.com/@cubejs-backend/server/-/server-0.34.23.tgz#9a919f2ddaa7d3f007f5a2397c2de08a8652947e" - integrity sha512-gn7wAPhVm5IHHX+gHj+8/jkOkXvnGUxmIivQITbv5X07LrObEppLCeWNSGLbQNPH9hduU6ZcKpeP9qNqWcPpzQ== +"@cubejs-backend/server@^0.34.30": + version "0.34.30" + resolved "https://registry.yarnpkg.com/@cubejs-backend/server/-/server-0.34.30.tgz#d5b3297a07a57a2adc4b427335d6cb432aaf7fad" + integrity sha512-MDkXn/iggO1ZjYUbt4JKMa/rIyDsfx07t94qsycbHUcrR3vUw7IBu+x/fzJUDg2FoKPGeB9Sxb2BJKHWKvXZHA== dependencies: - "@cubejs-backend/cubestore-driver" "^0.34.21" + "@cubejs-backend/cubestore-driver" "^0.34.30" "@cubejs-backend/dotenv" "^9.0.2" - "@cubejs-backend/native" "^0.34.23" - "@cubejs-backend/server-core" "^0.34.23" - "@cubejs-backend/shared" "^0.34.20" + "@cubejs-backend/native" "^0.34.27" + "@cubejs-backend/server-core" "^0.34.30" + "@cubejs-backend/shared" "^0.34.25" "@oclif/color" "^1.0.0" "@oclif/command" "^1.8.13" "@oclif/config" "^1.18.2" @@ -1135,10 +1135,10 @@ throttle-debounce "^3.0.1" uuid "^8.3.2" -"@cubejs-backend/shared@^0.34.20": - version "0.34.20" - resolved "https://registry.yarnpkg.com/@cubejs-backend/shared/-/shared-0.34.20.tgz#3fce091184b9bb641a80c69edce01dde5dce9d03" - integrity sha512-Q+jbDF5i3yv4wRThJXfLQqtWfB7OKRNsyNwtRx1ND+gPRI2gXS6HKPk4ZByt7k/4icMJA7PzULDLBVM4IYOD4w== +"@cubejs-backend/shared@^0.34.25": + version "0.34.25" + resolved "https://registry.yarnpkg.com/@cubejs-backend/shared/-/shared-0.34.25.tgz#c59f6487fa5519b0fa41fff636a50143d9f841ca" + integrity sha512-q8/1qkwIMrAz5MGiosaPsCvCEPSBeWNUriZ67SSdcsIRENaaMSXX/R/BIqzBXC2uv88LjWOlKUtFmM6GOyUlbw== dependencies: "@oclif/color" "^0.1.2" bytes "^3.1.0" @@ -1155,12 +1155,12 @@ throttle-debounce "^3.0.1" uuid "^8.3.2" -"@cubejs-backend/templates@^0.34.20": - version "0.34.20" - resolved "https://registry.yarnpkg.com/@cubejs-backend/templates/-/templates-0.34.20.tgz#a509ca117af7a4a0a90f7da5c72a9d36d9348a1c" - integrity sha512-pW5oCk11zQsNDa74exl3r3+lTnsADI3CWGKw8KmHZU6e0uo2o0OjCIDdmJjZinW+UvYzZ4FMXPzj0z+u4Q7UKg== +"@cubejs-backend/templates@^0.34.25": + version "0.34.25" + resolved "https://registry.yarnpkg.com/@cubejs-backend/templates/-/templates-0.34.25.tgz#37d31f3dd3f2121dac09252be905e9793f36b655" + integrity sha512-4KPni5/Hx25+Zp0430/vNr8u/hjIqF8RYDM9lt5QppPBofp1h3/ALecdmZSpGjJt/+x0ESwRpSwHJs5rj5QJVg== dependencies: - "@cubejs-backend/shared" "^0.34.20" + "@cubejs-backend/shared" "^0.34.25" cross-spawn "^7.0.3" decompress "^4.2.1" decompress-targz "^4.1.1" diff --git a/media/Dockerfile b/media/Dockerfile index 2f20daa4..a9cde953 100644 --- a/media/Dockerfile +++ b/media/Dockerfile @@ -1,11 +1,11 @@ -FROM node:20 AS builder +FROM node:21 AS builder WORKDIR /app COPY package.json yarn.lock . RUN yarn install --frozen-lockfile COPY . . RUN yarn run build -FROM node:20 +FROM node:21 # use jemalloc to reduce memory consumption, # see https://sharp.pixelplumbing.com/install#linux-memory-allocator RUN apt-get update && apt-get install -y libjemalloc-dev && apt-get clean && rm -rf /var/lib/apt/lists/* diff --git a/render/Dockerfile b/render/Dockerfile index e928ca52..ec7a7422 100644 --- a/render/Dockerfile +++ b/render/Dockerfile @@ -1,11 +1,11 @@ -FROM node:20 AS builder +FROM node:21 AS builder WORKDIR /app COPY package.json yarn.lock . RUN yarn install --frozen-lockfile COPY . . RUN yarn run build -FROM mcr.microsoft.com/playwright:v1.39.0-jammy +FROM mcr.microsoft.com/playwright:v1.40.1-jammy RUN apt-get -y update && apt-get install -y fonts-freefont-ttf fonts-noto-color-emoji ENV NODE_ENV=production WORKDIR /app diff --git a/render/package.json b/render/package.json index 79b871a1..2e1489e8 100644 --- a/render/package.json +++ b/render/package.json @@ -13,14 +13,14 @@ "@koa/cors": "^4.0.0", "hot-shots": "^10.0.0", "koa": "^2.14.2", - "playwright": "^1.39.0" + "playwright": "^1.40.1" }, "devDependencies": { - "@types/koa": "^2.13.10", - "@types/koa__cors": "^4.0.2", - "@types/node": "^20.8.9", - "nodemon": "^3.0.1", + "@types/koa": "^2.13.12", + "@types/koa__cors": "^4.0.3", + "@types/node": "^20.10.3", + "nodemon": "^3.0.2", "ts-node": "^10.9.1", - "typescript": "^5.2.2" + "typescript": "^5.3.2" } } diff --git a/render/yarn.lock b/render/yarn.lock index 92aef8e6..e989029c 100644 --- a/render/yarn.lock +++ b/render/yarn.lock @@ -146,10 +146,10 @@ "@types/koa-compose" "*" "@types/node" "*" -"@types/koa@^2.13.10": - version "2.13.10" - resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.10.tgz#2c2a1cdf1252d654b05f444194328a3d23a880c4" - integrity sha512-weKc5IBeORLDGwD1FMgPjaZIg0/mtP7KxXAXEzPRCN78k274D9U2acmccDNPL1MwyV40Jj+hQQ5N2eaV6O0z8g== +"@types/koa@^2.13.12": + version "2.13.12" + resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.12.tgz#70d87a9061a81909e0ee11ca50168416e8d3e795" + integrity sha512-vAo1KuDSYWFDB4Cs80CHvfmzSQWeUb909aQib0C0aFx4sw0K9UZFz2m5jaEP+b3X1+yr904iQiruS0hXi31jbw== dependencies: "@types/accepts" "*" "@types/content-disposition" "*" @@ -160,10 +160,10 @@ "@types/koa-compose" "*" "@types/node" "*" -"@types/koa__cors@^4.0.2": - version "4.0.2" - resolved "https://registry.yarnpkg.com/@types/koa__cors/-/koa__cors-4.0.2.tgz#9a866628aa57653e130e731d6c19c6372779ca1c" - integrity sha512-EV1S9t1PbauzUlKyI4KKrw1E/JWHI15OtdVXkaBm6sI+vXvvSW6JoKcsmAiIqY0PYvt94fycvdrWMTtM15uZmw== +"@types/koa__cors@^4.0.3": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@types/koa__cors/-/koa__cors-4.0.3.tgz#048fa1d523a27ff448c071416e774fac1bf43aab" + integrity sha512-zj+1sQO/6GGRGINRXlMmoiFwHibKVcjNGdh+p2SpqHDMLyvC+ce0LMHX6UBi1rdpnPZ/+osUwWdGKF945ffrzA== dependencies: "@types/koa" "*" @@ -177,10 +177,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a" integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA== -"@types/node@^20.8.9": - version "20.8.9" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.9.tgz#646390b4fab269abce59c308fc286dcd818a2b08" - integrity sha512-UzykFsT3FhHb1h7yD4CA4YhBHq545JC0YnEz41xkipN88eKQtL6rSgocL5tbAP6Ola9Izm/Aw4Ora8He4x0BHg== +"@types/node@^20.10.3": + version "20.10.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.3.tgz#4900adcc7fc189d5af5bb41da8f543cea6962030" + integrity sha512-XJavIpZqiXID5Yxnxv3RUDKTN5b81ddNC3ecsA0SoFXz/QU8OGBwZGMomiq0zw+uuqbL/krztv/DINAQ/EV4gg== dependencies: undici-types "~5.26.4" @@ -328,12 +328,12 @@ create-require@^1.1.0: resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== -debug@^3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== +debug@^4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: - ms "^2.1.1" + ms "2.1.2" debug@^4.3.2: version "4.3.2" @@ -587,11 +587,6 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - nan@^2.16.0: version "2.18.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554" @@ -602,13 +597,13 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -nodemon@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-3.0.1.tgz#affe822a2c5f21354466b2fc8ae83277d27dadc7" - integrity sha512-g9AZ7HmkhQkqXkRc20w+ZfQ73cHLbE8hnPbtaFbFtCumZsjyMhKk9LajQ07U5Ux28lvFjZ5X7HvWR1xzU8jHVw== +nodemon@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-3.0.2.tgz#222dd0de79fc7b7b3eedba422d2b9e5fc678621e" + integrity sha512-9qIN2LNTrEzpOPBaWHTm4Asy1LxXLSickZStAQ4IZe7zsoIpD/A7LWxhZV3t4Zu352uBcqVnRsDXSMR2Sc3lTA== dependencies: chokidar "^3.5.2" - debug "^3.2.7" + debug "^4" ignore-by-default "^1.0.1" minimatch "^3.1.2" pstree.remy "^1.1.8" @@ -652,17 +647,17 @@ picomatch@^2.0.4, picomatch@^2.2.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== -playwright-core@1.39.0: - version "1.39.0" - resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.39.0.tgz#efeaea754af4fb170d11845b8da30b2323287c63" - integrity sha512-+k4pdZgs1qiM+OUkSjx96YiKsXsmb59evFoqv8SKO067qBA+Z2s/dCzJij/ZhdQcs2zlTAgRKfeiiLm8PQ2qvw== +playwright-core@1.40.1: + version "1.40.1" + resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.40.1.tgz#442d15e86866a87d90d07af528e0afabe4c75c05" + integrity sha512-+hkOycxPiV534c4HhpfX6yrlawqVUzITRKwHAmYfmsVreltEl6fAZJ3DPfLMOODw0H3s1Itd6MDCWmP1fl/QvQ== -playwright@^1.39.0: - version "1.39.0" - resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.39.0.tgz#184c81cd6478f8da28bcd9e60e94fcebf566e077" - integrity sha512-naE5QT11uC/Oiq0BwZ50gDmy8c8WLPRTEWuSSFVG2egBka/1qMoSqYQcROMT9zLwJ86oPofcTH2jBY/5wWOgIw== +playwright@^1.40.1: + version "1.40.1" + resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.40.1.tgz#a11bf8dca15be5a194851dbbf3df235b9f53d7ae" + integrity sha512-2eHI7IioIpQ0bS1Ovg/HszsN/XKNwEG1kbzSDDmADpclKc7CyqkHw7Mg2JCz/bbCxg25QUPcjksoMW7JcIFQmw== dependencies: - playwright-core "1.39.0" + playwright-core "1.40.1" optionalDependencies: fsevents "2.3.2" @@ -770,10 +765,10 @@ type-is@^1.6.16: media-typer "0.3.0" mime-types "~2.1.24" -typescript@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" - integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== +typescript@^5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.2.tgz#00d1c7c1c46928c5845c1ee8d0cc2791031d4c43" + integrity sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ== undefsafe@^2.0.5: version "2.0.5" diff --git a/web/Dockerfile b/web/Dockerfile index 808385b7..a8882969 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20 AS builder +FROM node:21 AS builder ARG SENTRY_DSN='' ENV SENTRY_DSN=$SENTRY_DSN ARG SENTRY_ORG='' @@ -15,12 +15,15 @@ WORKDIR /app COPY ./.npmrc ./package.json ./yarn.lock . RUN sed -i '/@schneefux\/klicker/d' package.json RUN yarn install --frozen-lockfile -RUN npm install --save @schneefux/klicker +RUN npm install --force --save @schneefux/klicker RUN cat package.json COPY . . RUN yarn run build -FROM node:20 +FROM node:21 +# use jemalloc to reduce memory consumption +RUN apt-get update && apt-get install -y libjemalloc-dev && apt-get clean && rm -rf /var/lib/apt/lists/* +ENV LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libjemalloc.so" ENV NODE_ENV=production ARG SENTRY_DSN='' ENV SENTRY_DSN=$SENTRY_DSN