diff --git a/.prototools b/.prototools index 26f538aff..3d33d95e4 100644 --- a/.prototools +++ b/.prototools @@ -1 +1 @@ -bun = "1.2.21" +bun = "1.2.23" diff --git a/Dockerfile b/Dockerfile index 8aa90355a..0b0adc494 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # ================= INSTALL BUN =================== -ARG BUN_VERSION=1.2.8 +ARG BUN_VERSION=1.2.23 FROM debian:bullseye-slim AS build-bun ARG BUN_VERSION RUN apt-get update -qq \ @@ -81,7 +81,7 @@ WORKDIR /app FROM base AS pruned ARG SCOPE COPY . . -RUN bunx turbo@2.4.5-canary.7 prune "${SCOPE}" --docker +RUN bunx turbo prune "${SCOPE}" --docker # =============== INSTALL & BUILD ================= @@ -89,6 +89,7 @@ FROM base AS builder ARG BUN_PKG_MANAGER ARG SCOPE COPY --from=pruned /app/out/full/ . +COPY bun.lock . RUN SENTRYCLI_SKIP_DOWNLOAD=1 bun install RUN SKIP_ENV_CHECK=true bunx turbo build --filter="${SCOPE}" diff --git a/bun.lock b/bun.lock index 94c4e0242..cb534356e 100644 --- a/bun.lock +++ b/bun.lock @@ -429,6 +429,7 @@ "openai": "^4.81.0", "qs": "^6.11.2", "stripe": "^17.1.0", + "undici": "^7.16.0", }, "devDependencies": { "@typebot.io/forge": "workspace:*", @@ -5785,7 +5786,7 @@ "unctx": ["unctx@2.4.1", "", { "dependencies": { "acorn": "^8.14.0", "estree-walker": "^3.0.3", "magic-string": "^0.30.17", "unplugin": "^2.1.0" } }, "sha512-AbaYw0Nm4mK4qjhns67C+kgxR2YWiwlDBPzxrN8h8C6VtAdCgditAY5Dezu3IJy4XVqAnbrXt9oQJvsn3fyozg=="], - "undici": ["undici@5.29.0", "", { "dependencies": { "@fastify/busboy": "^2.0.0" } }, "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg=="], + "undici": ["undici@7.16.0", "", {}, "sha512-QEg3HPMll0o3t2ourKwOeUAZ159Kn9mx5pnzHRQO8+Wixmh88YdZRiIwat0iNzNNXn0yoEtXJqFpyW7eM8BV7g=="], "undici-types": ["undici-types@5.26.5", "", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="], @@ -6877,6 +6878,8 @@ "micromatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], + "miniflare/undici": ["undici@5.29.0", "", { "dependencies": { "@fastify/busboy": "^2.0.0" } }, "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg=="], + "minio/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], "minizlib/minipass": ["minipass@3.3.6", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="], diff --git a/docker-compose.build.yml b/docker-compose.build.yml index da1fdff6a..d148119ff 100644 --- a/docker-compose.build.yml +++ b/docker-compose.build.yml @@ -1,6 +1,5 @@ -version: '3.9' services: - typebot-db: + typebot-db-docker: image: postgres:16 restart: always volumes: @@ -19,13 +18,13 @@ services: args: - SCOPE=builder depends_on: - typebot-db: + typebot-db-docker: condition: service_healthy restart: always ports: - - '8080:3000' + - "8080:3000" extra_hosts: - - 'host.docker.internal:host-gateway' + - "host.docker.internal:host-gateway" env_file: .env.docker typebot-viewer: build: @@ -33,9 +32,9 @@ services: args: - SCOPE=viewer depends_on: - typebot-db: + typebot-db-docker: condition: service_healthy restart: always ports: - - '8081:3000' + - "8081:3000" env_file: .env.docker diff --git a/package.json b/package.json index 4f3cc1b67..6e4f060bc 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "typescript": "^5.9.3", "rimraf": "^6.0.1" }, - "packageManager": "bun@1.2.21", + "packageManager": "bun@1.2.23", "engines": { "node": "^22" }, diff --git a/packages/bot-engine/package.json b/packages/bot-engine/package.json index 210f184ae..a54b1b7c3 100644 --- a/packages/bot-engine/package.json +++ b/packages/bot-engine/package.json @@ -50,7 +50,8 @@ "nodemailer": "^7.0.6", "openai": "^4.81.0", "qs": "^6.11.2", - "stripe": "^17.1.0" + "stripe": "^17.1.0", + "undici": "^7.16.0" }, "devDependencies": { "@typebot.io/forge": "workspace:*",