Merge branch 'main' into feat/395-add-cjs-support

apps/login/package.json

@@ -48,26 +48,26 @@
     "jose": "^5.3.0",
     "lucide-react": "0.469.0",
     "moment": "^2.29.4",
-    "next": "15.3.1-canary.9",
+    "next": "15.4.0-canary.3",
     "next-intl": "^3.25.1",
     "next-themes": "^0.2.1",
     "nice-grpc": "2.0.1",
     "qrcode.react": "^3.1.0",
-    "react": "19.0.0",
+    "react": "19.1.0",
-    "react-dom": "19.0.0",
+    "react-dom": "19.1.0",
     "react-hook-form": "7.39.5",
     "swr": "^2.2.0",
     "tinycolor2": "1.4.2",
     "uuid": "^11.1.0"
   },
   "devDependencies": {
-    "@bufbuild/buf": "^1.46.0",
+    "@bufbuild/buf": "^1.53.0",
     "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^16.0.1",
+    "@testing-library/react": "^16.3.0",
-    "@types/ms": "0.7.34",
+    "@types/ms": "2.1.0",
-    "@types/node": "^20.17.17",
+    "@types/node": "^22.14.1",
-    "@types/react": "19.0.2",
+    "@types/react": "19.1.2",
-    "@types/react-dom": "19.0.2",
+    "@types/react-dom": "19.1.2",
     "@types/tinycolor2": "1.4.3",
     "@types/uuid": "^10.0.0",
     "@vercel/git-hooks": "1.0.0",
@@ -75,22 +75,22 @@
     "@zitadel/prettier-config": "workspace:*",
     "@zitadel/tailwind-config": "workspace:*",
     "@zitadel/tsconfig": "workspace:*",
-    "autoprefixer": "10.4.20",
+    "autoprefixer": "10.4.21",
-    "concurrently": "^9.1.0",
+    "concurrently": "^9.1.2",
-    "cypress": "^13.15.2",
+    "cypress": "^14.3.2",
     "del-cli": "6.0.0",
     "env-cmd": "^10.0.0",
-    "grpc-tools": "1.12.4",
+    "grpc-tools": "1.13.0",
-    "jsdom": "^25.0.1",
+    "jsdom": "^26.1.0",
-    "lint-staged": "15.2.10",
+    "lint-staged": "15.5.1",
     "make-dir-cli": "4.0.0",
-    "nodemon": "^3.1.7",
+    "nodemon": "^3.1.9",
-    "postcss": "8.4.49",
+    "postcss": "8.5.3",
-    "prettier-plugin-tailwindcss": "0.6.8",
+    "prettier-plugin-tailwindcss": "0.6.11",
-    "sass": "^1.80.7",
+    "sass": "^1.87.0",
-    "start-server-and-test": "^2.0.8",
+    "start-server-and-test": "^2.0.11",
     "tailwindcss": "3.4.14",
-    "ts-proto": "^2.2.7",
+    "ts-proto": "^2.7.0",
-    "typescript": "^5.6.3"
+    "typescript": "^5.8.3"
   }
 }

apps/login/src/app/(login)/mfa/set/page.tsx

@@ -68,6 +68,7 @@ export default async function Page(props: {
           user.user?.type.case === "human" ? user.user?.type.value : undefined;
 
         return {
+          id: session.id,
           factors: session?.factors,
           authMethods: methods.authMethodTypes ?? [],
           phoneVerified: humanUser?.phone?.isVerified ?? false,
@@ -142,7 +143,7 @@ export default async function Page(props: {
             <ChooseSecondFactorToSetup
               userId={sessionWithData.factors?.user?.id}
               loginName={loginName}
-              sessionId={sessionId}
+              sessionId={sessionWithData.id}
               requestId={requestId}
               organization={organization}
               loginSettings={loginSettings}

package.json

@@ -41,22 +41,22 @@
     "@otplib/core": "^12.0.0",
     "@otplib/plugin-thirty-two": "^12.0.0",
     "@otplib/plugin-crypto": "^12.0.0",
-    "@faker-js/faker": "^9.2.0",
+    "@faker-js/faker": "^9.7.0",
-    "@changesets/cli": "^2.27.9",
+    "@changesets/cli": "^2.29.2",
-    "@playwright/test": "^1.48.2",
+    "@playwright/test": "^1.52.0",
-    "@types/node": "^20.17.17",
+    "@types/node": "^22.14.1",
-    "@vitejs/plugin-react": "^4.3.3",
+    "@vitejs/plugin-react": "^4.4.1",
     "@zitadel/prettier-config": "workspace:*",
-    "axios": "^1.8.2",
+    "axios": "^1.8.4",
-    "dotenv": "^16.4.5",
+    "dotenv": "^16.5.0",
     "eslint": "8.57.1",
     "@zitadel/eslint-config": "workspace:*",
-    "prettier": "^3.2.5",
+    "prettier": "^3.5.3",
     "prettier-plugin-organize-imports": "^4.1.0",
-    "tsup": "^8.3.5",
+    "tsup": "^8.4.0",
-    "turbo": "2.2.3",
+    "turbo": "2.5.0",
-    "typescript": "^5.6.3",
+    "typescript": "^5.8.3",
-    "vite-tsconfig-paths": "^5.1.2",
+    "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^2.1.4"
+    "vitest": "^3.1.2"
   }
 }

packages/zitadel-proto/package.json

@@ -61,7 +61,7 @@
     "@bufbuild/protobuf": "^2.2.2"
   },
   "devDependencies": {
-    "@bufbuild/buf": "^1.47.2",
+    "@bufbuild/buf": "^1.53.0",
     "tsup": "^8.0.0",
     "ts-node": "^10.9.2",
     "@zitadel/tsconfig": "workspace:*"

packages/zitadel-tailwind-config/package.json

@@ -6,7 +6,7 @@
   },
   "main": "index.js",
   "devDependencies": {
-    "tailwindcss": "^3.4.14",
+    "tailwindcss": "^4.1.4",
     "@tailwindcss/forms": "0.5.3"
   }
 }