fix docker build

Author: Brendonovich

apps/web/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker.io/docker/dockerfile:1
 
-FROM node:20-alpine AS base
+FROM node:22-alpine AS base
 RUN corepack enable
 
 FROM base AS builder

apps/web/app/layout.tsx

@@ -8,7 +8,7 @@ import { getCurrentUser } from "@cap/database/auth/session";
 import { buildEnv, serverEnv } from "@cap/env";
 import { S3_BUCKET_URL } from "@cap/utils";
 import * as TooltipPrimitive from "@radix-ui/react-tooltip";
-import crypto from "crypto";
+import crypto from "node:crypto";
 import type { Metadata } from "next";
 import { PropsWithChildren } from "react";
 import { AuthProvider } from "./AuthProvider";

apps/web/instrumentation.ts

@@ -2,11 +2,11 @@
 // It is not suitable (a.k.a DEADLY) for serverless environments where the server will be restarted on each request.
 
 import { serverEnv } from "@cap/env";
-import { createS3Client } from "./utils/s3";
 import {
   BucketAlreadyOwnedByYou,
   CreateBucketCommand,
   PutBucketPolicyCommand,
+  S3Client,
 } from "@aws-sdk/client-s3";
 
 export async function register() {
@@ -61,7 +61,15 @@ export async function register() {
 }
 
 async function createS3Bucket() {
-  const [s3Client] = await createS3Client();
+  const s3Client = new S3Client({
+    endpoint: serverEnv().CAP_AWS_ENDPOINT,
+    region: serverEnv().CAP_AWS_REGION,
+    credentials: {
+      accessKeyId: serverEnv().CAP_AWS_ACCESS_KEY ?? "",
+      secretAccessKey: serverEnv().CAP_AWS_SECRET_KEY ?? "",
+    },
+    forcePathStyle: serverEnv().S3_PATH_STYLE,
+  });
 
   await s3Client
     .send(new CreateBucketCommand({ Bucket: serverEnv().CAP_AWS_BUCKET }))

apps/web/package.json

@@ -110,7 +110,10 @@
     "tailwindcss": "^3",
     "typescript": "^5.8.3"
   },
+  "browser": {
+    "crypto": false
+  },
   "engines": {
     "node": "20"
   }
-}
+}

apps/web/utils/s3.ts

@@ -9,7 +9,7 @@ import {
 import type { s3Buckets } from "@cap/database/schema";
 import type { InferSelectModel } from "drizzle-orm";
 import { decrypt } from "@cap/database/crypto";
-import { buildEnv, serverEnv } from "@cap/env";
+import { serverEnv } from "@cap/env";
 import * as S3Presigner from "@aws-sdk/s3-request-presigner";
 import * as CloudFrontPresigner from "@aws-sdk/cloudfront-signer";
 import { S3_BUCKET_URL } from "@cap/utils";

packages/database/crypto.ts

@@ -1,5 +1,5 @@
 import { serverEnv } from "@cap/env";
-import { timingSafeEqual } from "crypto";
+import { timingSafeEqual } from "node:crypto";
 
 const ALGORITHM = { name: "AES-GCM", length: 256 };
 const IV_LENGTH = 12;
@@ -162,7 +162,10 @@ export async function hashPassword(password: string): Promise<string> {
   return result.toString("base64");
 }
 
-export async function verifyPassword(stored: string, password: string): Promise<boolean> {
+export async function verifyPassword(
+  stored: string,
+  password: string
+): Promise<boolean> {
   if (!stored || !password) return false;
 
   const data = Buffer.from(stored, "base64");