From da33d3b4efe5a36fbd578041ddfd27dc2a12888a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=20Gramn=C3=A6s=20Tjernshaugen?= Date: Wed, 9 Oct 2024 17:29:15 +0200 Subject: [PATCH] Switch web and dashboard to turbopack (#1047) --- apps/dashboard/package.json | 5 +- apps/web/package.json | 4 +- pnpm-lock.yaml | 124 +++++++++++++----------------------- 3 files changed, 52 insertions(+), 81 deletions(-) diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json index 627aef9dd..53147f32f 100644 --- a/apps/dashboard/package.json +++ b/apps/dashboard/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "scripts": { - "dev": "next dev -p 3002", + "dev": "next dev -p 3002 --turbo", "build": "next build", "start": "next start", "lint": "biome check . --write", @@ -18,6 +18,8 @@ "@dotkomonline/types": "workspace:*", "@dotkomonline/ui": "workspace:*", "@dotkomonline/utils": "workspace:*", + "@aws-sdk/client-s3": "^3.665.0", + "@aws-sdk/s3-presigned-post": "^3.665.0", "@hookform/error-message": "^2.0.1", "@hookform/resolvers": "^3.3.4", "@iconify/react": "^4.1.1", @@ -43,6 +45,7 @@ "react-hook-form": "^7.48.2", "react-zxing": "^2.0.0", "superjson": "^2.0.0", + "pg": "^8.11.3", "zod": "^3.22.4" }, "devDependencies": { diff --git a/apps/web/package.json b/apps/web/package.json index c2363db7c..edf70beec 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -4,7 +4,7 @@ "type": "module", "private": true, "scripts": { - "dev": "next dev", + "dev": "next dev --turbo", "build:prod": "next build", "start": "next start", "storybook": "start-storybook -p 6007", @@ -23,6 +23,8 @@ "@dotkomonline/types": "workspace:*", "@dotkomonline/ui": "workspace:*", "@dotkomonline/utils": "workspace:*", + "@aws-sdk/client-s3": "^3.665.0", + "@aws-sdk/s3-presigned-post": "^3.665.0", "@fadi-ui/react-country-flag": "^1.0.7", "@next/env": "^14.2.14", "@portabletext/react": "^3.0.11", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 10d032c18..c6e495fa1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -47,13 +47,19 @@ importers: version: 20.16.10 tsup: specifier: ^7.2.0 - version: 7.3.0(@swc/core@1.7.28)(postcss@8.4.47)(typescript@5.6.2) + version: 7.3.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(postcss@8.4.47)(typescript@5.6.2) typescript: specifier: ^5.4.5 version: 5.6.2 apps/dashboard: dependencies: + '@aws-sdk/client-s3': + specifier: ^3.665.0 + version: 3.665.0 + '@aws-sdk/s3-presigned-post': + specifier: ^3.665.0 + version: 3.665.0 '@dotkomonline/auth': specifier: workspace:* version: link:../../packages/auth @@ -132,6 +138,9 @@ importers: next-auth: specifier: ^4.24.8 version: 4.24.8(next@14.2.14(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + pg: + specifier: ^8.11.3 + version: 8.13.0(pg-native@file:apps/dashboard/stubs/pg-native) pg-native: specifier: file:./stubs/pg-native version: file:apps/dashboard/stubs/pg-native @@ -403,6 +412,12 @@ importers: apps/web: dependencies: + '@aws-sdk/client-s3': + specifier: ^3.665.0 + version: 3.665.0 + '@aws-sdk/s3-presigned-post': + specifier: ^3.665.0 + version: 3.665.0 '@dotkomonline/auth': specifier: workspace:* version: link:../../packages/auth @@ -711,10 +726,10 @@ importers: version: 5.6.2 vitest: specifier: ^1.3.1 - version: 1.6.0(@types/node@20.16.10)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1) + version: 1.6.0(@types/node@20.16.10)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1(postcss@8.4.47)) vitest-mock-extended: specifier: ^1.3.1 - version: 1.3.2(typescript@5.6.2)(vitest@1.6.0(@types/node@20.16.10)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1)) + version: 1.3.2(typescript@5.6.2)(vitest@1.6.0(@types/node@20.16.10)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1(postcss@8.4.47))) packages/db: dependencies: @@ -847,7 +862,7 @@ importers: version: 5.6.2 vitest: specifier: ^1.3.1 - version: 1.6.0(@types/node@22.7.4)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1) + version: 1.6.0(@types/node@22.7.4)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1(postcss@8.4.47)) packages/gateway-trpc: dependencies: @@ -896,7 +911,7 @@ importers: version: 5.6.2 vitest: specifier: ^1.3.1 - version: 1.6.0(@types/node@22.7.4)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1) + version: 1.6.0(@types/node@22.7.4)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1(postcss@8.4.47)) packages/logger: dependencies: @@ -10452,7 +10467,7 @@ snapshots: pathe: 1.1.2 picocolors: 1.1.0 sirv: 2.0.4 - vitest: 1.6.0(@types/node@20.16.10)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1) + vitest: 1.6.0(@types/node@20.16.10)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1(postcss@8.4.47)) '@vitest/utils@1.6.0': dependencies: @@ -13136,6 +13151,10 @@ snapshots: pg-numeric@1.0.2: {} + pg-pool@3.7.0(pg@8.13.0(pg-native@file:apps/dashboard/stubs/pg-native)): + dependencies: + pg: 8.13.0(pg-native@file:apps/dashboard/stubs/pg-native) + pg-pool@3.7.0(pg@8.13.0): dependencies: pg: 8.13.0 @@ -13170,6 +13189,17 @@ snapshots: optionalDependencies: pg-cloudflare: 1.1.1 + pg@8.13.0(pg-native@file:apps/dashboard/stubs/pg-native): + dependencies: + pg-connection-string: 2.7.0 + pg-pool: 3.7.0(pg@8.13.0(pg-native@file:apps/dashboard/stubs/pg-native)) + pg-protocol: 1.7.0 + pg-types: 2.2.0 + pgpass: 1.0.5 + optionalDependencies: + pg-cloudflare: 1.1.1 + pg-native: file:apps/dashboard/stubs/pg-native + pgpass@1.0.5: dependencies: split2: 4.2.0 @@ -14150,7 +14180,7 @@ snapshots: tsscmp@1.0.6: {} - tsup@7.3.0(@swc/core@1.7.28)(postcss@8.4.47)(typescript@5.6.2): + tsup@7.3.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(postcss@8.4.47)(typescript@5.6.2): dependencies: bundle-require: 4.2.1(esbuild@0.19.12) cac: 6.7.14 @@ -14383,13 +14413,13 @@ snapshots: '@types/unist': 3.0.3 vfile-message: 4.0.2 - vite-node@1.6.0(@types/node@20.16.10)(sugarss@4.0.1): + vite-node@1.6.0(@types/node@20.16.10)(sugarss@4.0.1(postcss@8.4.47)): dependencies: cac: 6.7.14 debug: 4.3.7 pathe: 1.1.2 picocolors: 1.1.0 - vite: 5.4.8(@types/node@20.16.10)(sugarss@4.0.1) + vite: 5.4.8(@types/node@20.16.10)(sugarss@4.0.1(postcss@8.4.47)) transitivePeerDependencies: - '@types/node' - less @@ -14419,24 +14449,6 @@ snapshots: - supports-color - terser - vite-node@1.6.0(@types/node@22.7.4)(sugarss@4.0.1): - dependencies: - cac: 6.7.14 - debug: 4.3.7 - pathe: 1.1.2 - picocolors: 1.1.0 - vite: 5.4.8(@types/node@22.7.4)(sugarss@4.0.1) - transitivePeerDependencies: - - '@types/node' - - less - - lightningcss - - sass - - sass-embedded - - stylus - - sugarss - - supports-color - - terser - vite-tsconfig-paths@4.3.2(typescript@5.6.2)(vite@5.4.8(@types/node@22.7.4)(sugarss@4.0.1(postcss@8.4.47))): dependencies: debug: 4.3.7 @@ -14448,7 +14460,7 @@ snapshots: - supports-color - typescript - vite@5.4.8(@types/node@20.16.10)(sugarss@4.0.1): + vite@5.4.8(@types/node@20.16.10)(sugarss@4.0.1(postcss@8.4.47)): dependencies: esbuild: 0.21.5 postcss: 8.4.47 @@ -14468,23 +14480,13 @@ snapshots: fsevents: 2.3.3 sugarss: 4.0.1(postcss@8.4.47) - vite@5.4.8(@types/node@22.7.4)(sugarss@4.0.1): - dependencies: - esbuild: 0.21.5 - postcss: 8.4.47 - rollup: 4.22.4 - optionalDependencies: - '@types/node': 22.7.4 - fsevents: 2.3.3 - sugarss: 4.0.1(postcss@8.4.47) - - vitest-mock-extended@1.3.2(typescript@5.6.2)(vitest@1.6.0(@types/node@20.16.10)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1)): + vitest-mock-extended@1.3.2(typescript@5.6.2)(vitest@1.6.0(@types/node@20.16.10)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1(postcss@8.4.47))): dependencies: ts-essentials: 10.0.2(typescript@5.6.2) typescript: 5.6.2 - vitest: 1.6.0(@types/node@20.16.10)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1) + vitest: 1.6.0(@types/node@20.16.10)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1(postcss@8.4.47)) - vitest@1.6.0(@types/node@20.16.10)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1): + vitest@1.6.0(@types/node@20.16.10)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1(postcss@8.4.47)): dependencies: '@vitest/expect': 1.6.0 '@vitest/runner': 1.6.0 @@ -14503,8 +14505,8 @@ snapshots: strip-literal: 2.1.0 tinybench: 2.9.0 tinypool: 0.8.4 - vite: 5.4.8(@types/node@20.16.10)(sugarss@4.0.1) - vite-node: 1.6.0(@types/node@20.16.10)(sugarss@4.0.1) + vite: 5.4.8(@types/node@20.16.10)(sugarss@4.0.1(postcss@8.4.47)) + vite-node: 1.6.0(@types/node@20.16.10)(sugarss@4.0.1(postcss@8.4.47)) why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 20.16.10 @@ -14556,42 +14558,6 @@ snapshots: - supports-color - terser - vitest@1.6.0(@types/node@22.7.4)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sugarss@4.0.1): - dependencies: - '@vitest/expect': 1.6.0 - '@vitest/runner': 1.6.0 - '@vitest/snapshot': 1.6.0 - '@vitest/spy': 1.6.0 - '@vitest/utils': 1.6.0 - acorn-walk: 8.3.4 - chai: 4.5.0 - debug: 4.3.7 - execa: 8.0.1 - local-pkg: 0.5.0 - magic-string: 0.30.11 - pathe: 1.1.2 - picocolors: 1.1.0 - std-env: 3.7.0 - strip-literal: 2.1.0 - tinybench: 2.9.0 - tinypool: 0.8.4 - vite: 5.4.8(@types/node@22.7.4)(sugarss@4.0.1) - vite-node: 1.6.0(@types/node@22.7.4)(sugarss@4.0.1) - why-is-node-running: 2.3.0 - optionalDependencies: - '@types/node': 22.7.4 - '@vitest/ui': 1.6.0(vitest@1.6.0) - jsdom: 22.1.0 - transitivePeerDependencies: - - less - - lightningcss - - sass - - sass-embedded - - stylus - - sugarss - - supports-color - - terser - w3c-xmlserializer@4.0.0: dependencies: xml-name-validator: 4.0.0