From a1fedfa97525c0fe7d020e7cbfe306140793421e Mon Sep 17 00:00:00 2001 From: Rotimi Best Date: Sat, 28 Sep 2024 21:49:52 +0100 Subject: [PATCH] fix: fly build + adapter-node peer dependency --- .../{Dockerfile.dev => Dockerfile.prod} | 0 apps/backend/fly.toml | 3 + apps/dashboard/package.json | 2 +- pnpm-lock.yaml | 227 +++--------------- 4 files changed, 40 insertions(+), 192 deletions(-) rename apps/backend/{Dockerfile.dev => Dockerfile.prod} (100%) diff --git a/apps/backend/Dockerfile.dev b/apps/backend/Dockerfile.prod similarity index 100% rename from apps/backend/Dockerfile.dev rename to apps/backend/Dockerfile.prod diff --git a/apps/backend/fly.toml b/apps/backend/fly.toml index 7b06770f..1bca8c30 100644 --- a/apps/backend/fly.toml +++ b/apps/backend/fly.toml @@ -6,6 +6,9 @@ app = "classroomio-server" primary_region = "lhr" +[build] + dockerfile = "Dockerfile.prod" + [http_service] internal_port = 3002 force_https = true diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json index 2d909aa8..64a61675 100644 --- a/apps/dashboard/package.json +++ b/apps/dashboard/package.json @@ -27,7 +27,7 @@ "@sentry/vite-plugin": "^2.6.2", "@supabase/supabase-js": "^2.31.0", "@sveltejs/adapter-auto": "^2.1.0", - "@sveltejs/adapter-node": "^5.2.4", + "@sveltejs/adapter-node": "^1.3.1", "@sveltejs/adapter-vercel": "^3.0.3", "@tailwindcss/forms": "^0.5.4", "@types/pluralize": "0.0.30", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fc064676..9ef6906c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -188,8 +188,8 @@ importers: specifier: ^2.1.0 version: 2.1.1(@sveltejs/kit@1.30.4) '@sveltejs/adapter-node': - specifier: ^5.2.4 - version: 5.2.5(@sveltejs/kit@1.30.4) + specifier: ^1.3.1 + version: 1.3.1(@sveltejs/kit@1.30.4) '@sveltejs/adapter-vercel': specifier: ^3.0.3 version: 3.1.0(@sveltejs/kit@1.30.4) @@ -3455,26 +3455,25 @@ packages: resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} dev: false - /@rollup/plugin-commonjs@28.0.0(rollup@4.22.5): - resolution: {integrity: sha512-BJcu+a+Mpq476DMXG+hevgPSl56bkUoi88dKT8t3RyUp8kGuOh+2bU8Gs7zXDlu+fyZggnJ+iOBGrb/O1SorYg==} - engines: {node: '>=16.0.0 || 14 >= 14.17'} + /@rollup/plugin-commonjs@25.0.8(rollup@3.29.5): + resolution: {integrity: sha512-ZEZWTK5n6Qde0to4vS9Mr5x/0UZoqCxPVR9KRUjU4kA2sO7GEUn1fop0DAwpO6z0Nw/kJON9bDmSxdWxO/TT1A==} + engines: {node: '>=14.0.0'} peerDependencies: rollup: ^2.68.0||^3.0.0||^4.0.0 peerDependenciesMeta: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.1.2(rollup@4.22.5) + '@rollup/pluginutils': 5.1.2(rollup@3.29.5) commondir: 1.0.1 estree-walker: 2.0.2 - fdir: 6.3.0(picomatch@2.3.1) + glob: 8.1.0 is-reference: 1.2.1 magic-string: 0.30.11 - picomatch: 2.3.1 - rollup: 4.22.5 + rollup: 3.29.5 dev: false - /@rollup/plugin-json@6.1.0(rollup@4.22.5): + /@rollup/plugin-json@6.1.0(rollup@3.29.5): resolution: {integrity: sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -3483,11 +3482,11 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.1.2(rollup@4.22.5) - rollup: 4.22.5 + '@rollup/pluginutils': 5.1.2(rollup@3.29.5) + rollup: 3.29.5 dev: false - /@rollup/plugin-node-resolve@15.3.0(rollup@4.22.5): + /@rollup/plugin-node-resolve@15.3.0(rollup@3.29.5): resolution: {integrity: sha512-9eO5McEICxMzJpDW9OnMYSv4Sta3hmt7VtBFz5zR9273suNOydOyq/FrGeGy+KsTRFm8w0SLVhzig2ILFT63Ag==} engines: {node: '>=14.0.0'} peerDependencies: @@ -3496,12 +3495,12 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.1.2(rollup@4.22.5) + '@rollup/pluginutils': 5.1.2(rollup@3.29.5) '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-module: 1.0.0 resolve: 1.22.8 - rollup: 4.22.5 + rollup: 3.29.5 dev: false /@rollup/pluginutils@4.2.1: @@ -3512,7 +3511,7 @@ packages: picomatch: 2.3.1 dev: false - /@rollup/pluginutils@5.1.2(rollup@4.22.5): + /@rollup/pluginutils@5.1.2(rollup@3.29.5): resolution: {integrity: sha512-/FIdS3PyZ39bjZlwqFnWqCOVnW7o963LtKMwQOD0NhQqw22gSr2YY1afu3FxRip4ZCZNsD5jq6Aaz6QV3D/Njw==} engines: {node: '>=14.0.0'} peerDependencies: @@ -3524,137 +3523,9 @@ packages: '@types/estree': 1.0.6 estree-walker: 2.0.2 picomatch: 2.3.1 - rollup: 4.22.5 + rollup: 3.29.5 dev: false - /@rollup/rollup-android-arm-eabi@4.22.5: - resolution: {integrity: sha512-SU5cvamg0Eyu/F+kLeMXS7GoahL+OoizlclVFX3l5Ql6yNlywJJ0OuqTzUx0v+aHhPHEB/56CT06GQrRrGNYww==} - cpu: [arm] - os: [android] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-android-arm64@4.22.5: - resolution: {integrity: sha512-S4pit5BP6E5R5C8S6tgU/drvgjtYW76FBuG6+ibG3tMvlD1h9LHVF9KmlmaUBQ8Obou7hEyS+0w+IR/VtxwNMQ==} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-darwin-arm64@4.22.5: - resolution: {integrity: sha512-250ZGg4ipTL0TGvLlfACkIxS9+KLtIbn7BCZjsZj88zSg2Lvu3Xdw6dhAhfe/FjjXPVNCtcSp+WZjVsD3a/Zlw==} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-darwin-x64@4.22.5: - resolution: {integrity: sha512-D8brJEFg5D+QxFcW6jYANu+Rr9SlKtTenmsX5hOSzNYVrK5oLAEMTUgKWYJP+wdKyCdeSwnapLsn+OVRFycuQg==} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-linux-arm-gnueabihf@4.22.5: - resolution: {integrity: sha512-PNqXYmdNFyWNg0ma5LdY8wP+eQfdvyaBAojAXgO7/gs0Q/6TQJVXAXe8gwW9URjbS0YAammur0fynYGiWsKlXw==} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-linux-arm-musleabihf@4.22.5: - resolution: {integrity: sha512-kSSCZOKz3HqlrEuwKd9TYv7vxPYD77vHSUvM2y0YaTGnFc8AdI5TTQRrM1yIp3tXCKrSL9A7JLoILjtad5t8pQ==} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-linux-arm64-gnu@4.22.5: - resolution: {integrity: sha512-oTXQeJHRbOnwRnRffb6bmqmUugz0glXaPyspp4gbQOPVApdpRrY/j7KP3lr7M8kTfQTyrBUzFjj5EuHAhqH4/w==} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-linux-arm64-musl@4.22.5: - resolution: {integrity: sha512-qnOTIIs6tIGFKCHdhYitgC2XQ2X25InIbZFor5wh+mALH84qnFHvc+vmWUpyX97B0hNvwNUL4B+MB8vJvH65Fw==} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-linux-powerpc64le-gnu@4.22.5: - resolution: {integrity: sha512-TMYu+DUdNlgBXING13rHSfUc3Ky5nLPbWs4bFnT+R6Vu3OvXkTkixvvBKk8uO4MT5Ab6lC3U7x8S8El2q5o56w==} - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-linux-riscv64-gnu@4.22.5: - resolution: {integrity: sha512-PTQq1Kz22ZRvuhr3uURH+U/Q/a0pbxJoICGSprNLAoBEkyD3Sh9qP5I0Asn0y0wejXQBbsVMRZRxlbGFD9OK4A==} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-linux-s390x-gnu@4.22.5: - resolution: {integrity: sha512-bR5nCojtpuMss6TDEmf/jnBnzlo+6n1UhgwqUvRoe4VIotC7FG1IKkyJbwsT7JDsF2jxR+NTnuOwiGv0hLyDoQ==} - cpu: [s390x] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-linux-x64-gnu@4.22.5: - resolution: {integrity: sha512-N0jPPhHjGShcB9/XXZQWuWBKZQnC1F36Ce3sDqWpujsGjDz/CQtOL9LgTrJ+rJC8MJeesMWrMWVLKKNR/tMOCA==} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-linux-x64-musl@4.22.5: - resolution: {integrity: sha512-uBa2e28ohzNNwjr6Uxm4XyaA1M/8aTgfF2T7UIlElLaeXkgpmIJ2EitVNQxjO9xLLLy60YqAgKn/AqSpCUkE9g==} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-win32-arm64-msvc@4.22.5: - resolution: {integrity: sha512-RXT8S1HP8AFN/Kr3tg4fuYrNxZ/pZf1HemC5Tsddc6HzgGnJm0+Lh5rAHJkDuW3StI0ynNXukidROMXYl6ew8w==} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-win32-ia32-msvc@4.22.5: - resolution: {integrity: sha512-ElTYOh50InL8kzyUD6XsnPit7jYCKrphmddKAe1/Ytt74apOxDq5YEcbsiKs0fR3vff3jEneMM+3I7jbqaMyBg==} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: false - optional: true - - /@rollup/rollup-win32-x64-msvc@4.22.5: - resolution: {integrity: sha512-+lvL/4mQxSV8MukpkKyyvfwhH266COcWlXE/1qxwN08ajovta3459zrjLghYMgDerlzNwLAcFpvU+WWE5y6nAQ==} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: false - optional: true - /@rtsao/scc@1.1.0: resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==} dev: true @@ -4477,16 +4348,16 @@ packages: '@sveltejs/kit': 1.30.4(svelte@4.2.19)(vite@4.5.5) import-meta-resolve: 4.1.0 - /@sveltejs/adapter-node@5.2.5(@sveltejs/kit@1.30.4): - resolution: {integrity: sha512-FVeysFqeIlKFpDF1Oj38gby34f6uA9FuXnV330Z0RHmSyOR9JzJs70/nFKy1Ue3fWtf7S0RemOrP66Vr9Jcmew==} + /@sveltejs/adapter-node@1.3.1(@sveltejs/kit@1.30.4): + resolution: {integrity: sha512-A0VgRQDCDPzdLNoiAbcOxGw4zT1Mc+n1LwT1OmO350R7WxrEqdMUChPPOd1iMfIDWlP4ie6E2d/WQf5es2d4Zw==} peerDependencies: - '@sveltejs/kit': ^2.4.0 + '@sveltejs/kit': ^1.0.0 dependencies: - '@rollup/plugin-commonjs': 28.0.0(rollup@4.22.5) - '@rollup/plugin-json': 6.1.0(rollup@4.22.5) - '@rollup/plugin-node-resolve': 15.3.0(rollup@4.22.5) + '@rollup/plugin-commonjs': 25.0.8(rollup@3.29.5) + '@rollup/plugin-json': 6.1.0(rollup@3.29.5) + '@rollup/plugin-node-resolve': 15.3.0(rollup@3.29.5) '@sveltejs/kit': 1.30.4(svelte@4.2.19)(vite@4.5.5) - rollup: 4.22.5 + rollup: 3.29.5 dev: false /@sveltejs/adapter-vercel@3.1.0(@sveltejs/kit@1.30.4): @@ -8405,17 +8276,6 @@ packages: bser: 2.1.1 dev: true - /fdir@6.3.0(picomatch@2.3.1): - resolution: {integrity: sha512-QOnuT+BOtivR77wYvCWHfGt9s4Pz1VIMbD463vegT5MLqNXy8rYFT/lPVEqf/bhYeT6qmqrNHhsX+rWwe3rOCQ==} - peerDependencies: - picomatch: ^3 || ^4 - peerDependenciesMeta: - picomatch: - optional: true - dependencies: - picomatch: 2.3.1 - dev: false - /fetch-blob@3.2.0: resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==} engines: {node: ^12.20 || >= 14.13} @@ -8802,6 +8662,18 @@ packages: once: 1.4.0 path-is-absolute: 1.0.1 + /glob@8.1.0: + resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} + engines: {node: '>=12'} + deprecated: Glob versions prior to v9 are no longer supported + dependencies: + fs.realpath: 1.0.0 + inflight: 1.0.6 + inherits: 2.0.4 + minimatch: 5.1.6 + once: 1.4.0 + dev: false + /glob@9.3.5: resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==} engines: {node: '>=16 || 14 >=14.17'} @@ -11281,7 +11153,7 @@ packages: dependencies: '@babel/core': 7.25.2 '@babel/types': 7.25.6 - '@rollup/pluginutils': 5.1.2(rollup@4.22.5) + '@rollup/pluginutils': 5.1.2(rollup@3.29.5) kleur: 4.1.5 undici: 6.19.8 unplugin: 1.14.1 @@ -11334,7 +11206,6 @@ packages: engines: {node: '>=10'} dependencies: brace-expansion: 2.0.1 - dev: true /minimatch@8.0.4: resolution: {integrity: sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==} @@ -12998,32 +12869,6 @@ packages: optionalDependencies: fsevents: 2.3.3 - /rollup@4.22.5: - resolution: {integrity: sha512-WoinX7GeQOFMGznEcWA1WrTQCd/tpEbMkc3nuMs9BT0CPjMdSjPMTVClwWd4pgSQwJdP65SK9mTCNvItlr5o7w==} - engines: {node: '>=18.0.0', npm: '>=8.0.0'} - hasBin: true - dependencies: - '@types/estree': 1.0.6 - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.22.5 - '@rollup/rollup-android-arm64': 4.22.5 - '@rollup/rollup-darwin-arm64': 4.22.5 - '@rollup/rollup-darwin-x64': 4.22.5 - '@rollup/rollup-linux-arm-gnueabihf': 4.22.5 - '@rollup/rollup-linux-arm-musleabihf': 4.22.5 - '@rollup/rollup-linux-arm64-gnu': 4.22.5 - '@rollup/rollup-linux-arm64-musl': 4.22.5 - '@rollup/rollup-linux-powerpc64le-gnu': 4.22.5 - '@rollup/rollup-linux-riscv64-gnu': 4.22.5 - '@rollup/rollup-linux-s390x-gnu': 4.22.5 - '@rollup/rollup-linux-x64-gnu': 4.22.5 - '@rollup/rollup-linux-x64-musl': 4.22.5 - '@rollup/rollup-win32-arm64-msvc': 4.22.5 - '@rollup/rollup-win32-ia32-msvc': 4.22.5 - '@rollup/rollup-win32-x64-msvc': 4.22.5 - fsevents: 2.3.3 - dev: false - /run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} dependencies: