From 99cb249ee31b13cfea48797f61803d11f312f22b Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 10:38:10 +0530 Subject: [PATCH 01/22] chore: upgrade to next.js 15 --- apps/next13/package.json | 2 +- apps/toolkit-app-passportjs/package.json | 2 +- apps/toolkit-app/package.json | 2 +- apps/web/package.json | 2 +- integration-tests/auth-with-rpc/package.json | 2 +- integration-tests/auth/package.json | 2 +- .../get-initial-props/package.json | 2 +- integration-tests/middleware/package.json | 2 +- .../next-13-app-dir/package.json | 2 +- integration-tests/no-suspense/package.json | 2 +- integration-tests/qm/package.json | 2 +- .../react-query-utils/package.json | 2 +- integration-tests/rpc-path-root/package.json | 2 +- integration-tests/rpc/package.json | 2 +- integration-tests/trailing-slash/package.json | 2 +- package.json | 4 +- packages/blitz-auth/package.json | 2 +- packages/blitz-next/package.json | 2 +- packages/blitz-rpc/package.json | 2 +- pnpm-lock.yaml | 869 ++++++++++-------- 20 files changed, 515 insertions(+), 394 deletions(-) diff --git a/apps/next13/package.json b/apps/next13/package.json index a482a0c759..0b890ce8fe 100644 --- a/apps/next13/package.json +++ b/apps/next13/package.json @@ -22,7 +22,7 @@ "@tanstack/react-query": "4.0.10", "blitz": "2.1.3", "flatted": "3.2.7", - "next": "14.2.15", + "next": "15.0.1", "prisma": "^4.5.0", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/apps/toolkit-app-passportjs/package.json b/apps/toolkit-app-passportjs/package.json index 1533bcdc23..99102ba1ab 100644 --- a/apps/toolkit-app-passportjs/package.json +++ b/apps/toolkit-app-passportjs/package.json @@ -31,7 +31,7 @@ "@hookform/resolvers": "2.9.10", "@prisma/client": "4.6.1", "blitz": "2.1.3", - "next": "14.2.15", + "next": "15.0.1", "openid-client": "5.2.1", "prisma": "4.6.1", "react": "18.2.0", diff --git a/apps/toolkit-app/package.json b/apps/toolkit-app/package.json index bba578d622..8bd7befacd 100644 --- a/apps/toolkit-app/package.json +++ b/apps/toolkit-app/package.json @@ -32,7 +32,7 @@ "@hookform/resolvers": "2.9.10", "@prisma/client": "4.6.1", "blitz": "2.1.3", - "next": "14.2.15", + "next": "15.0.1", "next-auth": "4.24.7", "prisma": "4.6.1", "react": "18.2.0", diff --git a/apps/web/package.json b/apps/web/package.json index 1166b8ecf1..82de464d18 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -26,7 +26,7 @@ "blitz": "2.1.3", "jest": "29.3.0", "jest-environment-jsdom": "29.3.0", - "next": "14.2.15", + "next": "15.0.1", "passport-mock-strategy": "2.0.0", "passport-twitter": "1.0.4", "prisma": "4.6.1", diff --git a/integration-tests/auth-with-rpc/package.json b/integration-tests/auth-with-rpc/package.json index 1735667e21..3b71063c3e 100644 --- a/integration-tests/auth-with-rpc/package.json +++ b/integration-tests/auth-with-rpc/package.json @@ -26,7 +26,7 @@ "@prisma/client": "4.6.1", "blitz": "2.1.3", "delay": "5.0.0", - "next": "14.2.15", + "next": "15.0.1", "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/integration-tests/auth/package.json b/integration-tests/auth/package.json index f4e51e8260..97e7281ca7 100644 --- a/integration-tests/auth/package.json +++ b/integration-tests/auth/package.json @@ -23,7 +23,7 @@ "@prisma/client": "4.6.1", "blitz": "2.1.3", "lowdb": "3.0.0", - "next": "14.2.15", + "next": "15.0.1", "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/integration-tests/get-initial-props/package.json b/integration-tests/get-initial-props/package.json index 070fd5b116..ff836375b4 100644 --- a/integration-tests/get-initial-props/package.json +++ b/integration-tests/get-initial-props/package.json @@ -22,7 +22,7 @@ "@prisma/client": "4.6.1", "blitz": "2.1.3", "lowdb": "2.1.0", - "next": "14.2.15", + "next": "15.0.1", "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0" diff --git a/integration-tests/middleware/package.json b/integration-tests/middleware/package.json index 874a0a50fc..49865a5536 100644 --- a/integration-tests/middleware/package.json +++ b/integration-tests/middleware/package.json @@ -15,7 +15,7 @@ "@blitzjs/next": "2.1.3", "@blitzjs/rpc": "2.1.3", "blitz": "2.1.3", - "next": "14.2.15", + "next": "15.0.1", "react": "18.2.0", "react-dom": "18.2.0" }, diff --git a/integration-tests/next-13-app-dir/package.json b/integration-tests/next-13-app-dir/package.json index a5a22a4358..791dd96a4e 100644 --- a/integration-tests/next-13-app-dir/package.json +++ b/integration-tests/next-13-app-dir/package.json @@ -24,7 +24,7 @@ "@prisma/client": "4.6.1", "blitz": "2.1.3", "lowdb": "2.1.0", - "next": "14.2.15", + "next": "15.0.1", "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/integration-tests/no-suspense/package.json b/integration-tests/no-suspense/package.json index e8c3f8e040..91bba45e5a 100644 --- a/integration-tests/no-suspense/package.json +++ b/integration-tests/no-suspense/package.json @@ -22,7 +22,7 @@ "@prisma/client": "4.6.1", "blitz": "2.1.3", "lowdb": "3.0.0", - "next": "14.2.15", + "next": "15.0.1", "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0" diff --git a/integration-tests/qm/package.json b/integration-tests/qm/package.json index 4cf3b3f17d..f4414578e8 100644 --- a/integration-tests/qm/package.json +++ b/integration-tests/qm/package.json @@ -15,7 +15,7 @@ "@prisma/client": "4.6.1", "@tanstack/react-query": "4.0.10", "blitz": "2.1.3", - "next": "14.2.15", + "next": "15.0.1", "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0" diff --git a/integration-tests/react-query-utils/package.json b/integration-tests/react-query-utils/package.json index 3cade96607..4be6d1f42f 100644 --- a/integration-tests/react-query-utils/package.json +++ b/integration-tests/react-query-utils/package.json @@ -21,7 +21,7 @@ "@prisma/client": "4.6.1", "blitz": "2.1.3", "lowdb": "3.0.0", - "next": "14.2.15", + "next": "15.0.1", "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0" diff --git a/integration-tests/rpc-path-root/package.json b/integration-tests/rpc-path-root/package.json index 43bd0be38f..7b33eaed67 100644 --- a/integration-tests/rpc-path-root/package.json +++ b/integration-tests/rpc-path-root/package.json @@ -11,7 +11,7 @@ "@blitzjs/next": "2.1.3", "@blitzjs/rpc": "2.1.3", "blitz": "2.1.3", - "next": "14.2.15", + "next": "15.0.1", "react": "18.2.0", "react-dom": "18.2.0" }, diff --git a/integration-tests/rpc/package.json b/integration-tests/rpc/package.json index f443eec0e7..48c9a93b7f 100644 --- a/integration-tests/rpc/package.json +++ b/integration-tests/rpc/package.json @@ -11,7 +11,7 @@ "@blitzjs/next": "2.1.3", "@blitzjs/rpc": "2.1.3", "blitz": "2.1.3", - "next": "14.2.15", + "next": "15.0.1", "react": "18.2.0", "react-dom": "18.2.0" }, diff --git a/integration-tests/trailing-slash/package.json b/integration-tests/trailing-slash/package.json index 2f3b090907..d5ddde93de 100644 --- a/integration-tests/trailing-slash/package.json +++ b/integration-tests/trailing-slash/package.json @@ -22,7 +22,7 @@ "@prisma/client": "4.6.1", "blitz": "2.1.3", "lowdb": "3.0.0", - "next": "14.2.15", + "next": "15.0.1", "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0" diff --git a/package.json b/package.json index 4cd886c130..eb96e7cc64 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "husky": "8.0.2", "jsdom": "^19.0.0", "lint-staged": "13.0.3", - "next": "14.2.15", + "next": "15.0.1", "only-allow": "1.1.0", "prettier": "^2.8.8", "prettier-plugin-prisma": "4.4.0", @@ -51,7 +51,7 @@ }, "overrides": { "@types/mime": "3.0.4", - "next": "14.2.15" + "next": "15.0.1" } } } diff --git a/packages/blitz-auth/package.json b/packages/blitz-auth/package.json index 12b2788231..da07873a46 100644 --- a/packages/blitz-auth/package.json +++ b/packages/blitz-auth/package.json @@ -76,7 +76,7 @@ "@types/react": "18.0.25", "@types/react-dom": "17.0.14", "blitz": "2.1.3", - "next": "14.2.15", + "next": "15.0.1", "next-auth": "4.24.7", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/packages/blitz-next/package.json b/packages/blitz-next/package.json index 5521ebd776..f8fb6caf32 100644 --- a/packages/blitz-next/package.json +++ b/packages/blitz-next/package.json @@ -59,7 +59,7 @@ "blitz": "2.1.3", "cross-spawn": "7.0.3", "find-up": "4.1.0", - "next": "14.2.15", + "next": "15.0.1", "next-router-mock": "0.9.1", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/packages/blitz-rpc/package.json b/packages/blitz-rpc/package.json index da25ac8265..22192d70e0 100644 --- a/packages/blitz-rpc/package.json +++ b/packages/blitz-rpc/package.json @@ -49,7 +49,7 @@ "@types/react": "18.0.25", "@types/react-dom": "17.0.14", "blitz": "2.1.3", - "next": "14.2.15", + "next": "15.0.1", "react": "18.2.0", "react-dom": "18.2.0", "typescript": "^4.8.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4e03d25276..7f6a68a868 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,7 @@ settings: overrides: "@types/mime": 3.0.4 - next: 14.2.15 + next: 15.0.1 patchedDependencies: next-auth@4.24.7: @@ -35,8 +35,8 @@ importers: specifier: 13.0.3 version: 13.0.3 next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) only-allow: specifier: 1.1.0 version: 1.1.0 @@ -92,8 +92,8 @@ importers: specifier: 3.2.7 version: 3.2.7 next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) prisma: specifier: ^4.5.0 version: 4.6.1 @@ -159,11 +159,11 @@ importers: specifier: 2.1.3 version: link:../../packages/blitz next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) next-auth: specifier: 4.24.7 - version: 4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@14.2.15)(react-dom@18.2.0)(react@18.2.0) + version: 4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@18.2.0)(react@18.2.0) prisma: specifier: 4.6.1 version: 4.6.1 @@ -277,8 +277,8 @@ importers: specifier: 2.1.3 version: link:../../packages/blitz next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) openid-client: specifier: 5.2.1 version: 5.2.1 @@ -395,8 +395,8 @@ importers: specifier: 29.3.0 version: 29.3.0 next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) passport-mock-strategy: specifier: 2.0.0 version: 2.0.0 @@ -450,8 +450,8 @@ importers: specifier: 3.0.0 version: 3.0.0 next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) prisma: specifier: 4.6.1 version: 4.6.1 @@ -541,8 +541,8 @@ importers: specifier: 5.0.0 version: 5.0.0 next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) prisma: specifier: 4.6.1 version: 4.6.1 @@ -653,8 +653,8 @@ importers: specifier: 2.1.0 version: 2.1.0 next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) prisma: specifier: 4.6.1 version: 4.6.1 @@ -717,8 +717,8 @@ importers: specifier: 2.1.3 version: link:../../packages/blitz next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) react: specifier: 18.2.0 version: 18.2.0 @@ -781,8 +781,8 @@ importers: specifier: 2.1.0 version: 2.1.0 next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) prisma: specifier: 4.6.1 version: 4.6.1 @@ -863,8 +863,8 @@ importers: specifier: 3.0.0 version: 3.0.0 next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) prisma: specifier: 4.6.1 version: 4.6.1 @@ -936,8 +936,8 @@ importers: specifier: 2.1.3 version: link:../../packages/blitz next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.18.2)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.18.2)(react-dom@18.2.0)(react@18.2.0) prisma: specifier: 4.6.1 version: 4.6.1 @@ -994,8 +994,8 @@ importers: specifier: 3.0.0 version: 3.0.0 next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) prisma: specifier: 4.6.1 version: 4.6.1 @@ -1058,8 +1058,8 @@ importers: specifier: 2.1.3 version: link:../../packages/blitz next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) react: specifier: 18.2.0 version: 18.2.0 @@ -1107,8 +1107,8 @@ importers: specifier: 2.1.3 version: link:../../packages/blitz next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) react: specifier: 18.2.0 version: 18.2.0 @@ -1162,8 +1162,8 @@ importers: specifier: 3.0.0 version: 3.0.0 next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) prisma: specifier: 4.6.1 version: 4.6.1 @@ -1618,11 +1618,11 @@ importers: specifier: 2.1.3 version: link:../blitz next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) next-auth: specifier: 4.24.7 - version: 4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@14.2.15)(react-dom@18.2.0)(react@18.2.0) + version: 4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@18.2.0)(react@18.2.0) react: specifier: 18.2.0 version: 18.2.0 @@ -1712,11 +1712,11 @@ importers: specifier: 4.1.0 version: 4.1.0 next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) next-router-mock: specifier: 0.9.1 - version: 0.9.1(next@14.2.15)(react@18.2.0) + version: 0.9.1(next@15.0.1)(react@18.2.0) react: specifier: 18.2.0 version: 18.2.0 @@ -1728,7 +1728,7 @@ importers: version: 5.0.0 ts-jest: specifier: 27.1.4 - version: 27.1.4(@babel/core@7.12.10)(esbuild@0.14.51)(jest@27.5.1)(typescript@4.8.4) + version: 27.1.4(@babel/core@7.20.2)(esbuild@0.14.51)(jest@27.5.1)(typescript@4.8.4) tslog: specifier: 4.9.0 version: 4.9.0 @@ -1791,8 +1791,8 @@ importers: specifier: 2.1.3 version: link:../blitz next: - specifier: 14.2.15 - version: 14.2.15(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) + specifier: 15.0.1 + version: 15.0.1(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) react: specifier: 18.2.0 version: 18.2.0 @@ -1852,7 +1852,7 @@ importers: version: 10.0.1 jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) prompts: specifier: 2.4.2 version: 2.4.2 @@ -1874,7 +1874,7 @@ importers: version: 0.14.2 unbuild: specifier: 0.7.6 - version: 0.7.6 + version: 0.7.6(supports-color@8.1.1) watch: specifier: 1.0.2 version: 1.0.2 @@ -2075,7 +2075,7 @@ importers: version: 4.8.4 unbuild: specifier: 0.7.6 - version: 0.7.6 + version: 0.7.6(supports-color@8.1.1) watch: specifier: 1.0.2 version: 1.0.2 @@ -2087,7 +2087,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) devDependencies: "@types/jscodeshift": specifier: 0.11.2 @@ -2100,7 +2100,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) devDependencies: "@types/jscodeshift": specifier: 0.11.2 @@ -2113,7 +2113,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) devDependencies: "@types/jscodeshift": specifier: 0.11.2 @@ -2129,7 +2129,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) devDependencies: "@types/jscodeshift": specifier: 0.11.2 @@ -2145,7 +2145,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) devDependencies: "@types/jscodeshift": specifier: 0.11.2 @@ -2170,7 +2170,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) devDependencies: "@types/jscodeshift": specifier: 0.11.2 @@ -2183,7 +2183,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) uuid: specifier: ^8.3.1 version: 8.3.2 @@ -2199,7 +2199,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) devDependencies: "@types/jscodeshift": specifier: 0.11.2 @@ -2212,7 +2212,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) devDependencies: "@types/jscodeshift": specifier: 0.11.2 @@ -2225,7 +2225,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) devDependencies: "@types/jscodeshift": specifier: 0.11.2 @@ -2253,7 +2253,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) devDependencies: "@types/jscodeshift": specifier: 0.11.2 @@ -2275,7 +2275,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) uuid: specifier: ^8.3.1 version: 8.3.2 @@ -2291,7 +2291,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) devDependencies: "@types/jscodeshift": specifier: 0.11.2 @@ -2304,7 +2304,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) devDependencies: "@types/jscodeshift": specifier: 0.11.2 @@ -2320,7 +2320,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) devDependencies: "@types/jscodeshift": specifier: 0.11.2 @@ -2333,7 +2333,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) devDependencies: "@types/jscodeshift": specifier: 0.11.2 @@ -2349,7 +2349,7 @@ importers: version: link:../../packages/blitz jscodeshift: specifier: 0.13.0 - version: 0.13.0(@babel/preset-env@7.12.10) + version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) devDependencies: "@types/jscodeshift": specifier: 0.11.2 @@ -2457,31 +2457,6 @@ packages: transitivePeerDependencies: - supports-color - /@babel/core@7.20.2: - resolution: - { - integrity: sha512-w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g==, - } - engines: {node: ">=6.9.0"} - dependencies: - "@ampproject/remapping": 2.2.0 - "@babel/code-frame": 7.18.6 - "@babel/generator": 7.20.4 - "@babel/helper-compilation-targets": 7.20.0(@babel/core@7.20.2) - "@babel/helper-module-transforms": 7.20.2(supports-color@8.1.1) - "@babel/helpers": 7.20.1(supports-color@8.1.1) - "@babel/parser": 7.20.3 - "@babel/template": 7.18.10 - "@babel/traverse": 7.20.1(supports-color@8.1.1) - "@babel/types": 7.20.2 - convert-source-map: 1.8.0 - debug: 4.3.3(supports-color@8.1.1) - gensync: 1.0.0-beta.2 - json5: 2.2.1 - semver: 6.3.0 - transitivePeerDependencies: - - supports-color - /@babel/core@7.20.2(supports-color@8.1.1): resolution: { @@ -2503,7 +2478,7 @@ packages: debug: 4.3.3(supports-color@8.1.1) gensync: 1.0.0-beta.2 json5: 2.2.1 - semver: 6.3.1 + semver: 6.3.0 transitivePeerDependencies: - supports-color @@ -2597,7 +2572,7 @@ packages: "@babel/core": ^7.0.0 dependencies: "@babel/compat-data": 7.20.1 - "@babel/core": 7.20.2 + "@babel/core": 7.20.2(supports-color@8.1.1) "@babel/helper-validator-option": 7.18.6 browserslist: 4.21.4 semver: 6.3.1 @@ -2642,27 +2617,6 @@ packages: transitivePeerDependencies: - supports-color - /@babel/helper-create-class-features-plugin@7.18.0(@babel/core@7.20.2): - resolution: - { - integrity: sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==, - } - engines: {node: ">=6.9.0"} - peerDependencies: - "@babel/core": ^7.0.0 - dependencies: - "@babel/core": 7.20.2 - "@babel/helper-annotate-as-pure": 7.18.6 - "@babel/helper-environment-visitor": 7.18.9 - "@babel/helper-function-name": 7.19.0 - "@babel/helper-member-expression-to-functions": 7.17.7 - "@babel/helper-optimise-call-expression": 7.16.7 - "@babel/helper-replace-supers": 7.18.2(supports-color@8.1.1) - "@babel/helper-split-export-declaration": 7.18.6 - transitivePeerDependencies: - - supports-color - dev: false - /@babel/helper-create-class-features-plugin@7.18.0(@babel/core@7.20.2)(supports-color@8.1.1): resolution: { @@ -3067,22 +3021,6 @@ packages: transitivePeerDependencies: - supports-color - /@babel/plugin-proposal-class-properties@7.17.12(@babel/core@7.20.2): - resolution: - { - integrity: sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==, - } - engines: {node: ">=6.9.0"} - peerDependencies: - "@babel/core": ^7.0.0-0 - dependencies: - "@babel/core": 7.20.2 - "@babel/helper-create-class-features-plugin": 7.18.0(@babel/core@7.20.2) - "@babel/helper-plugin-utils": 7.17.12 - transitivePeerDependencies: - - supports-color - dev: false - /@babel/plugin-proposal-class-properties@7.17.12(@babel/core@7.20.2)(supports-color@8.1.1): resolution: { @@ -3401,7 +3339,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.20.2 + "@babel/core": 7.20.2(supports-color@8.1.1) "@babel/helper-plugin-utils": 7.20.2 dev: true @@ -3764,24 +3702,6 @@ packages: transitivePeerDependencies: - supports-color - /@babel/plugin-transform-modules-commonjs@7.18.2(@babel/core@7.20.2): - resolution: - { - integrity: sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==, - } - engines: {node: ">=6.9.0"} - peerDependencies: - "@babel/core": ^7.0.0-0 - dependencies: - "@babel/core": 7.20.2 - "@babel/helper-module-transforms": 7.18.0(supports-color@8.1.1) - "@babel/helper-plugin-utils": 7.17.12 - "@babel/helper-simple-access": 7.18.2 - babel-plugin-dynamic-import-node: 2.3.3 - transitivePeerDependencies: - - supports-color - dev: false - /@babel/plugin-transform-modules-commonjs@7.18.2(@babel/core@7.20.2)(supports-color@8.1.1): resolution: { @@ -3919,7 +3839,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.20.2 + "@babel/core": 7.20.2(supports-color@8.1.1) "@babel/plugin-transform-react-jsx": 7.19.0(@babel/core@7.20.2) dev: true @@ -3945,7 +3865,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.20.2 + "@babel/core": 7.20.2(supports-color@8.1.1) "@babel/helper-plugin-utils": 7.20.2 dev: true @@ -3971,7 +3891,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.20.2 + "@babel/core": 7.20.2(supports-color@8.1.1) "@babel/helper-plugin-utils": 7.20.2 dev: true @@ -4001,7 +3921,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.20.2 + "@babel/core": 7.20.2(supports-color@8.1.1) "@babel/helper-annotate-as-pure": 7.18.6 "@babel/helper-module-imports": 7.18.6 "@babel/helper-plugin-utils": 7.20.2 @@ -4111,23 +4031,6 @@ packages: - supports-color dev: false - /@babel/plugin-transform-typescript@7.18.4(@babel/core@7.20.2): - resolution: - { - integrity: sha512-l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw==, - } - engines: {node: ">=6.9.0"} - peerDependencies: - "@babel/core": ^7.0.0-0 - dependencies: - "@babel/core": 7.20.2 - "@babel/helper-create-class-features-plugin": 7.18.0(@babel/core@7.20.2) - "@babel/helper-plugin-utils": 7.17.12 - "@babel/plugin-syntax-typescript": 7.17.12(@babel/core@7.20.2) - transitivePeerDependencies: - - supports-color - dev: false - /@babel/plugin-transform-typescript@7.18.4(@babel/core@7.20.2)(supports-color@8.1.1): resolution: { @@ -4278,23 +4181,6 @@ packages: "@babel/types": 7.18.4 esutils: 2.0.3 - /@babel/preset-typescript@7.17.12(@babel/core@7.20.2): - resolution: - { - integrity: sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg==, - } - engines: {node: ">=6.9.0"} - peerDependencies: - "@babel/core": ^7.0.0-0 - dependencies: - "@babel/core": 7.20.2 - "@babel/helper-plugin-utils": 7.17.12 - "@babel/helper-validator-option": 7.16.7 - "@babel/plugin-transform-typescript": 7.18.4(@babel/core@7.20.2) - transitivePeerDependencies: - - supports-color - dev: false - /@babel/preset-typescript@7.17.12(@babel/core@7.20.2)(supports-color@8.1.1): resolution: { @@ -4770,6 +4656,16 @@ packages: } dev: true + /@emnapi/runtime@1.3.1: + resolution: + { + integrity: sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==, + } + requiresBuild: true + dependencies: + tslib: 2.4.0 + optional: true + /@esbuild/android-arm@0.15.15: resolution: { @@ -4879,6 +4775,224 @@ packages: integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==, } + /@img/sharp-darwin-arm64@0.33.5: + resolution: + { + integrity: sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==, + } + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm64] + os: [darwin] + requiresBuild: true + optionalDependencies: + "@img/sharp-libvips-darwin-arm64": 1.0.4 + optional: true + + /@img/sharp-darwin-x64@0.33.5: + resolution: + { + integrity: sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==, + } + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [x64] + os: [darwin] + requiresBuild: true + optionalDependencies: + "@img/sharp-libvips-darwin-x64": 1.0.4 + optional: true + + /@img/sharp-libvips-darwin-arm64@1.0.4: + resolution: + { + integrity: sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==, + } + cpu: [arm64] + os: [darwin] + requiresBuild: true + optional: true + + /@img/sharp-libvips-darwin-x64@1.0.4: + resolution: + { + integrity: sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==, + } + cpu: [x64] + os: [darwin] + requiresBuild: true + optional: true + + /@img/sharp-libvips-linux-arm64@1.0.4: + resolution: + { + integrity: sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==, + } + cpu: [arm64] + os: [linux] + requiresBuild: true + optional: true + + /@img/sharp-libvips-linux-arm@1.0.5: + resolution: + { + integrity: sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==, + } + cpu: [arm] + os: [linux] + requiresBuild: true + optional: true + + /@img/sharp-libvips-linux-s390x@1.0.4: + resolution: + { + integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==, + } + cpu: [s390x] + os: [linux] + requiresBuild: true + optional: true + + /@img/sharp-libvips-linux-x64@1.0.4: + resolution: + { + integrity: sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==, + } + cpu: [x64] + os: [linux] + requiresBuild: true + optional: true + + /@img/sharp-libvips-linuxmusl-arm64@1.0.4: + resolution: + { + integrity: sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==, + } + cpu: [arm64] + os: [linux] + requiresBuild: true + optional: true + + /@img/sharp-libvips-linuxmusl-x64@1.0.4: + resolution: + { + integrity: sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==, + } + cpu: [x64] + os: [linux] + requiresBuild: true + optional: true + + /@img/sharp-linux-arm64@0.33.5: + resolution: + { + integrity: sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==, + } + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm64] + os: [linux] + requiresBuild: true + optionalDependencies: + "@img/sharp-libvips-linux-arm64": 1.0.4 + optional: true + + /@img/sharp-linux-arm@0.33.5: + resolution: + { + integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==, + } + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm] + os: [linux] + requiresBuild: true + optionalDependencies: + "@img/sharp-libvips-linux-arm": 1.0.5 + optional: true + + /@img/sharp-linux-s390x@0.33.5: + resolution: + { + integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==, + } + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [s390x] + os: [linux] + requiresBuild: true + optionalDependencies: + "@img/sharp-libvips-linux-s390x": 1.0.4 + optional: true + + /@img/sharp-linux-x64@0.33.5: + resolution: + { + integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==, + } + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [x64] + os: [linux] + requiresBuild: true + optionalDependencies: + "@img/sharp-libvips-linux-x64": 1.0.4 + optional: true + + /@img/sharp-linuxmusl-arm64@0.33.5: + resolution: + { + integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==, + } + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm64] + os: [linux] + requiresBuild: true + optionalDependencies: + "@img/sharp-libvips-linuxmusl-arm64": 1.0.4 + optional: true + + /@img/sharp-linuxmusl-x64@0.33.5: + resolution: + { + integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==, + } + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [x64] + os: [linux] + requiresBuild: true + optionalDependencies: + "@img/sharp-libvips-linuxmusl-x64": 1.0.4 + optional: true + + /@img/sharp-wasm32@0.33.5: + resolution: + { + integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==, + } + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [wasm32] + requiresBuild: true + dependencies: + "@emnapi/runtime": 1.3.1 + optional: true + + /@img/sharp-win32-ia32@0.33.5: + resolution: + { + integrity: sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==, + } + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [ia32] + os: [win32] + requiresBuild: true + optional: true + + /@img/sharp-win32-x64@0.33.5: + resolution: + { + integrity: sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==, + } + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [x64] + os: [win32] + requiresBuild: true + optional: true + /@isaacs/cliui@8.0.2: resolution: { @@ -5552,10 +5666,10 @@ packages: - utf-8-validate dev: true - /@next/env@14.2.15: + /@next/env@15.0.1: resolution: { - integrity: sha512-S1qaj25Wru2dUpcIZMjxeMVSwkt8BK4dmWHHiBuRstcIyOsMapqT4A4jSB6onvqeygkSSmOkyny9VVx8JIGamQ==, + integrity: sha512-lc4HeDUKO9gxxlM5G2knTRifqhsY6yYpwuHspBZdboZe0Gp+rZHBNNSIjmQKDJIdRXiXGyVnSD6gafrbQPvILQ==, } /@next/eslint-plugin-next@12.3.1: @@ -5584,10 +5698,10 @@ packages: glob: 10.3.10 dev: true - /@next/swc-darwin-arm64@14.2.15: + /@next/swc-darwin-arm64@15.0.1: resolution: { - integrity: sha512-Rvh7KU9hOUBnZ9TJ28n2Oa7dD9cvDBKua9IKx7cfQQ0GoYUwg9ig31O2oMwH3wm+pE3IkAQ67ZobPfEgurPZIA==, + integrity: sha512-C9k/Xv4sxkQRTA37Z6MzNq3Yb1BJMmSqjmwowoWEpbXTkAdfOwnoKOpAb71ItSzoA26yUTIo6ZhN8rKGu4ExQw==, } engines: {node: ">= 10"} cpu: [arm64] @@ -5595,10 +5709,10 @@ packages: requiresBuild: true optional: true - /@next/swc-darwin-x64@14.2.15: + /@next/swc-darwin-x64@15.0.1: resolution: { - integrity: sha512-5TGyjFcf8ampZP3e+FyCax5zFVHi+Oe7sZyaKOngsqyaNEpOgkKB3sqmymkZfowy3ufGA/tUgDPPxpQx931lHg==, + integrity: sha512-uHl13HXOuq1G7ovWFxCACDJHTSDVbn/sbLv8V1p+7KIvTrYQ5HNoSmKBdYeEKRRCbEmd+OohOgg9YOp8Ux3MBg==, } engines: {node: ">= 10"} cpu: [x64] @@ -5606,10 +5720,10 @@ packages: requiresBuild: true optional: true - /@next/swc-linux-arm64-gnu@14.2.15: + /@next/swc-linux-arm64-gnu@15.0.1: resolution: { - integrity: sha512-3Bwv4oc08ONiQ3FiOLKT72Q+ndEMyLNsc/D3qnLMbtUYTQAmkx9E/JRu0DBpHxNddBmNT5hxz1mYBphJ3mfrrw==, + integrity: sha512-LvyhvxHOihFTEIbb35KxOc3q8w8G4xAAAH/AQnsYDEnOvwawjL2eawsB59AX02ki6LJdgDaHoTEnC54Gw+82xw==, } engines: {node: ">= 10"} cpu: [arm64] @@ -5617,10 +5731,10 @@ packages: requiresBuild: true optional: true - /@next/swc-linux-arm64-musl@14.2.15: + /@next/swc-linux-arm64-musl@15.0.1: resolution: { - integrity: sha512-k5xf/tg1FBv/M4CMd8S+JL3uV9BnnRmoe7F+GWC3DxkTCD9aewFRH1s5rJ1zkzDa+Do4zyN8qD0N8c84Hu96FQ==, + integrity: sha512-vFmCGUFNyk/A5/BYcQNhAQqPIw01RJaK6dRO+ZEhz0DncoW+hJW1kZ8aH2UvTX27zPq3m85zN5waMSbZEmANcQ==, } engines: {node: ">= 10"} cpu: [arm64] @@ -5628,10 +5742,10 @@ packages: requiresBuild: true optional: true - /@next/swc-linux-x64-gnu@14.2.15: + /@next/swc-linux-x64-gnu@15.0.1: resolution: { - integrity: sha512-kE6q38hbrRbKEkkVn62reLXhThLRh6/TvgSP56GkFNhU22TbIrQDEMrO7j0IcQHcew2wfykq8lZyHFabz0oBrA==, + integrity: sha512-5by7IYq0NCF8rouz6Qg9T97jYU68kaClHPfGpQG2lCZpSYHtSPQF1kjnqBTd34RIqPKMbCa4DqCufirgr8HM5w==, } engines: {node: ">= 10"} cpu: [x64] @@ -5639,10 +5753,10 @@ packages: requiresBuild: true optional: true - /@next/swc-linux-x64-musl@14.2.15: + /@next/swc-linux-x64-musl@15.0.1: resolution: { - integrity: sha512-PZ5YE9ouy/IdO7QVJeIcyLn/Rc4ml9M2G4y3kCM9MNf1YKvFY4heg3pVa/jQbMro+tP6yc4G2o9LjAz1zxD7tQ==, + integrity: sha512-lmYr6H3JyDNBJLzklGXLfbehU3ay78a+b6UmBGlHls4xhDXBNZfgb0aI67sflrX+cGBnv1LgmWzFlYrAYxS1Qw==, } engines: {node: ">= 10"} cpu: [x64] @@ -5650,10 +5764,10 @@ packages: requiresBuild: true optional: true - /@next/swc-win32-arm64-msvc@14.2.15: + /@next/swc-win32-arm64-msvc@15.0.1: resolution: { - integrity: sha512-2raR16703kBvYEQD9HNLyb0/394yfqzmIeyp2nDzcPV4yPjqNUG3ohX6jX00WryXz6s1FXpVhsCo3i+g4RUX+g==, + integrity: sha512-DS8wQtl6diAj0eZTdH0sefykm4iXMbHT4MOvLwqZiIkeezKpkgPFcEdFlz3vKvXa2R/2UEgMh48z1nEpNhjeOQ==, } engines: {node: ">= 10"} cpu: [arm64] @@ -5661,21 +5775,10 @@ packages: requiresBuild: true optional: true - /@next/swc-win32-ia32-msvc@14.2.15: - resolution: - { - integrity: sha512-fyTE8cklgkyR1p03kJa5zXEaZ9El+kDNM5A+66+8evQS5e/6v0Gk28LqA0Jet8gKSOyP+OTm/tJHzMlGdQerdQ==, - } - engines: {node: ">= 10"} - cpu: [ia32] - os: [win32] - requiresBuild: true - optional: true - - /@next/swc-win32-x64-msvc@14.2.15: + /@next/swc-win32-x64-msvc@15.0.1: resolution: { - integrity: sha512-SzqGbsLsP9OwKNUG9nekShTwhj6JSB9ZLMWQ8g1gG6hdE5gQLncbnbymrwy2yVmH9nikSLYRYxYMFu78Ggp7/g==, + integrity: sha512-4Ho2ggvDdMKlZ/0e9HNdZ9ngeaBwtc+2VS5oCeqrbXqOgutX6I4U2X/42VBw0o+M5evn4/7v3zKgGHo+9v/VjA==, } engines: {node: ">= 10"} cpu: [x64] @@ -6217,13 +6320,12 @@ packages: integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==, } - /@swc/helpers@0.5.5: + /@swc/helpers@0.5.13: resolution: { - integrity: sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==, + integrity: sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==, } dependencies: - "@swc/counter": 0.1.3 tslib: 2.4.0 /@swc/wasm@1.2.122: @@ -7766,7 +7868,7 @@ packages: peerDependencies: vite: ^3.0.0 dependencies: - "@babel/core": 7.20.2 + "@babel/core": 7.20.2(supports-color@8.1.1) "@babel/plugin-transform-react-jsx": 7.19.0(@babel/core@7.20.2) "@babel/plugin-transform-react-jsx-development": 7.18.6(@babel/core@7.20.2) "@babel/plugin-transform-react-jsx-self": 7.18.6(@babel/core@7.20.2) @@ -9611,6 +9713,29 @@ packages: integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==, } + /color-string@1.9.1: + resolution: + { + integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==, + } + requiresBuild: true + dependencies: + color-name: 1.1.4 + simple-swizzle: 0.2.2 + optional: true + + /color@4.2.3: + resolution: + { + integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==, + } + engines: {node: ">=12.5.0"} + requiresBuild: true + dependencies: + color-convert: 2.0.1 + color-string: 1.9.1 + optional: true + /colorette@2.0.17: resolution: { @@ -10394,6 +10519,15 @@ packages: engines: {node: ">=8"} dev: false + /detect-libc@2.0.3: + resolution: + { + integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==, + } + engines: {node: ">=8"} + requiresBuild: true + optional: true + /detect-newline@3.1.0: resolution: { @@ -14251,6 +14385,14 @@ packages: integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==, } + /is-arrayish@0.3.2: + resolution: + { + integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==, + } + requiresBuild: true + optional: true + /is-async-function@2.0.0: resolution: { @@ -16037,39 +16179,6 @@ packages: dependencies: argparse: 2.0.1 - /jscodeshift@0.13.0(@babel/preset-env@7.12.10): - resolution: - { - integrity: sha512-FNHLuwh7TeI0F4EzNVIRwUSxSqsGWM5nTv596FK4NfBnEEKFpIcyFeG559DMFGHSTIYA5AY4Fqh2cBrJx0EAwg==, - } - hasBin: true - peerDependencies: - "@babel/preset-env": ^7.1.6 - dependencies: - "@babel/core": 7.20.2 - "@babel/parser": 7.20.3 - "@babel/plugin-proposal-class-properties": 7.17.12(@babel/core@7.20.2) - "@babel/plugin-proposal-nullish-coalescing-operator": 7.17.12(@babel/core@7.20.2) - "@babel/plugin-proposal-optional-chaining": 7.17.12(@babel/core@7.20.2) - "@babel/plugin-transform-modules-commonjs": 7.18.2(@babel/core@7.20.2) - "@babel/preset-env": 7.12.10(@babel/core@7.12.10)(supports-color@8.1.1) - "@babel/preset-flow": 7.17.12(@babel/core@7.20.2) - "@babel/preset-typescript": 7.17.12(@babel/core@7.20.2) - "@babel/register": 7.17.7(@babel/core@7.20.2) - babel-core: 7.0.0-bridge.0(@babel/core@7.20.2) - colors: 1.4.0 - flow-parser: 0.179.0 - graceful-fs: 4.2.11 - micromatch: 3.1.10(supports-color@8.1.1) - neo-async: 2.6.2 - node-dir: 0.1.17 - recast: 0.20.5 - temp: 0.8.4 - write-file-atomic: 2.4.3 - transitivePeerDependencies: - - supports-color - dev: false - /jscodeshift@0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1): resolution: { @@ -17469,13 +17578,13 @@ packages: } dev: false - /next-auth@4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@14.2.15)(react-dom@18.2.0)(react@18.2.0): + /next-auth@4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@18.2.0)(react@18.2.0): resolution: { integrity: sha512-iChjE8ov/1K/z98gdKbn2Jw+2vLgJtVV39X+rCP5SGnVQuco7QOr19FRNGMIrD8d3LYhHWV9j9sKLzq1aDWWQQ==, } peerDependencies: - next: ^12.2.5 || ^13 || ^14 + next: 15.0.1 nodemailer: ^6.6.5 react: ^17.0.2 || ^18 react-dom: ^17.0.2 || ^18 @@ -17487,7 +17596,7 @@ packages: "@panva/hkdf": 1.0.2 cookie: 0.5.0 jose: 4.15.5 - next: 14.2.15(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) + next: 15.0.1(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) oauth: 0.9.15 openid-client: 5.6.5 preact: 10.11.3 @@ -17497,148 +17606,158 @@ packages: uuid: 8.3.2 patched: true - /next-router-mock@0.9.1(next@14.2.15)(react@18.2.0): + /next-router-mock@0.9.1(next@15.0.1)(react@18.2.0): resolution: { integrity: sha512-GTrns944dnFNgycpinyRszOiwwk99LUJsvvX0FWRgUFHv6hOuzCns1rmTlzO+DRimYB9/XMA+87X2/dQLzjiUQ==, } peerDependencies: - next: ">=10.0.0" + next: 15.0.1 react: ">=17.0.0" dependencies: - next: 14.2.15(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + next: 15.0.1(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 dev: true - /next@14.2.15(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0): + /next@15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0): resolution: { - integrity: sha512-h9ctmOokpoDphRvMGnwOJAedT6zKhwqyZML9mDtspgf4Rh3Pn7UTYKqePNoDvhsWBAO5GoPNYshnAUGIazVGmw==, + integrity: sha512-PSkFkr/w7UnFWm+EP8y/QpHrJXMqpZzAXpergB/EqLPOh4SGPJXv1wj4mslr2hUZBAS9pX7/9YLIdxTv6fwytw==, } - engines: {node: ">=18.17.0"} + engines: {node: ">=18.18.0"} hasBin: true peerDependencies: "@opentelemetry/api": ^1.1.0 "@playwright/test": ^1.41.2 - react: ^18.2.0 - react-dom: ^18.2.0 + babel-plugin-react-compiler: "*" + react: ^18.2.0 || 19.0.0-rc-69d4b800-20241021 + react-dom: ^18.2.0 || 19.0.0-rc-69d4b800-20241021 sass: ^1.3.0 peerDependenciesMeta: "@opentelemetry/api": optional: true "@playwright/test": optional: true + babel-plugin-react-compiler: + optional: true sass: optional: true dependencies: - "@next/env": 14.2.15 - "@swc/helpers": 0.5.5 + "@next/env": 15.0.1 + "@swc/counter": 0.1.3 + "@swc/helpers": 0.5.13 busboy: 1.6.0 caniuse-lite: 1.0.30001599 - graceful-fs: 4.2.11 postcss: 8.4.31 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - styled-jsx: 5.1.1(@babel/core@7.12.10)(react@18.2.0) + styled-jsx: 5.1.6(@babel/core@7.12.10)(react@18.2.0) optionalDependencies: - "@next/swc-darwin-arm64": 14.2.15 - "@next/swc-darwin-x64": 14.2.15 - "@next/swc-linux-arm64-gnu": 14.2.15 - "@next/swc-linux-arm64-musl": 14.2.15 - "@next/swc-linux-x64-gnu": 14.2.15 - "@next/swc-linux-x64-musl": 14.2.15 - "@next/swc-win32-arm64-msvc": 14.2.15 - "@next/swc-win32-ia32-msvc": 14.2.15 - "@next/swc-win32-x64-msvc": 14.2.15 + "@next/swc-darwin-arm64": 15.0.1 + "@next/swc-darwin-x64": 15.0.1 + "@next/swc-linux-arm64-gnu": 15.0.1 + "@next/swc-linux-arm64-musl": 15.0.1 + "@next/swc-linux-x64-gnu": 15.0.1 + "@next/swc-linux-x64-musl": 15.0.1 + "@next/swc-win32-arm64-msvc": 15.0.1 + "@next/swc-win32-x64-msvc": 15.0.1 + sharp: 0.33.5 transitivePeerDependencies: - "@babel/core" - babel-plugin-macros + dev: false - /next@14.2.15(@babel/core@7.18.2)(react-dom@18.2.0)(react@18.2.0): + /next@15.0.1(@babel/core@7.18.2)(react-dom@18.2.0)(react@18.2.0): resolution: { - integrity: sha512-h9ctmOokpoDphRvMGnwOJAedT6zKhwqyZML9mDtspgf4Rh3Pn7UTYKqePNoDvhsWBAO5GoPNYshnAUGIazVGmw==, + integrity: sha512-PSkFkr/w7UnFWm+EP8y/QpHrJXMqpZzAXpergB/EqLPOh4SGPJXv1wj4mslr2hUZBAS9pX7/9YLIdxTv6fwytw==, } - engines: {node: ">=18.17.0"} + engines: {node: ">=18.18.0"} hasBin: true peerDependencies: "@opentelemetry/api": ^1.1.0 "@playwright/test": ^1.41.2 - react: ^18.2.0 - react-dom: ^18.2.0 + babel-plugin-react-compiler: "*" + react: ^18.2.0 || 19.0.0-rc-69d4b800-20241021 + react-dom: ^18.2.0 || 19.0.0-rc-69d4b800-20241021 sass: ^1.3.0 peerDependenciesMeta: "@opentelemetry/api": optional: true "@playwright/test": optional: true + babel-plugin-react-compiler: + optional: true sass: optional: true dependencies: - "@next/env": 14.2.15 - "@swc/helpers": 0.5.5 + "@next/env": 15.0.1 + "@swc/counter": 0.1.3 + "@swc/helpers": 0.5.13 busboy: 1.6.0 caniuse-lite: 1.0.30001599 - graceful-fs: 4.2.11 postcss: 8.4.31 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - styled-jsx: 5.1.1(@babel/core@7.18.2)(react@18.2.0) + styled-jsx: 5.1.6(@babel/core@7.18.2)(react@18.2.0) optionalDependencies: - "@next/swc-darwin-arm64": 14.2.15 - "@next/swc-darwin-x64": 14.2.15 - "@next/swc-linux-arm64-gnu": 14.2.15 - "@next/swc-linux-arm64-musl": 14.2.15 - "@next/swc-linux-x64-gnu": 14.2.15 - "@next/swc-linux-x64-musl": 14.2.15 - "@next/swc-win32-arm64-msvc": 14.2.15 - "@next/swc-win32-ia32-msvc": 14.2.15 - "@next/swc-win32-x64-msvc": 14.2.15 + "@next/swc-darwin-arm64": 15.0.1 + "@next/swc-darwin-x64": 15.0.1 + "@next/swc-linux-arm64-gnu": 15.0.1 + "@next/swc-linux-arm64-musl": 15.0.1 + "@next/swc-linux-x64-gnu": 15.0.1 + "@next/swc-linux-x64-musl": 15.0.1 + "@next/swc-win32-arm64-msvc": 15.0.1 + "@next/swc-win32-x64-msvc": 15.0.1 + sharp: 0.33.5 transitivePeerDependencies: - "@babel/core" - babel-plugin-macros dev: false - /next@14.2.15(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0): + /next@15.0.1(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0): resolution: { - integrity: sha512-h9ctmOokpoDphRvMGnwOJAedT6zKhwqyZML9mDtspgf4Rh3Pn7UTYKqePNoDvhsWBAO5GoPNYshnAUGIazVGmw==, + integrity: sha512-PSkFkr/w7UnFWm+EP8y/QpHrJXMqpZzAXpergB/EqLPOh4SGPJXv1wj4mslr2hUZBAS9pX7/9YLIdxTv6fwytw==, } - engines: {node: ">=18.17.0"} + engines: {node: ">=18.18.0"} hasBin: true peerDependencies: "@opentelemetry/api": ^1.1.0 "@playwright/test": ^1.41.2 - react: ^18.2.0 - react-dom: ^18.2.0 + babel-plugin-react-compiler: "*" + react: ^18.2.0 || 19.0.0-rc-69d4b800-20241021 + react-dom: ^18.2.0 || 19.0.0-rc-69d4b800-20241021 sass: ^1.3.0 peerDependenciesMeta: "@opentelemetry/api": optional: true "@playwright/test": optional: true + babel-plugin-react-compiler: + optional: true sass: optional: true dependencies: - "@next/env": 14.2.15 - "@swc/helpers": 0.5.5 + "@next/env": 15.0.1 + "@swc/counter": 0.1.3 + "@swc/helpers": 0.5.13 busboy: 1.6.0 caniuse-lite: 1.0.30001599 - graceful-fs: 4.2.11 postcss: 8.4.31 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - styled-jsx: 5.1.1(@babel/core@7.20.2)(react@18.2.0) + styled-jsx: 5.1.6(@babel/core@7.20.2)(react@18.2.0) optionalDependencies: - "@next/swc-darwin-arm64": 14.2.15 - "@next/swc-darwin-x64": 14.2.15 - "@next/swc-linux-arm64-gnu": 14.2.15 - "@next/swc-linux-arm64-musl": 14.2.15 - "@next/swc-linux-x64-gnu": 14.2.15 - "@next/swc-linux-x64-musl": 14.2.15 - "@next/swc-win32-arm64-msvc": 14.2.15 - "@next/swc-win32-ia32-msvc": 14.2.15 - "@next/swc-win32-x64-msvc": 14.2.15 + "@next/swc-darwin-arm64": 15.0.1 + "@next/swc-darwin-x64": 15.0.1 + "@next/swc-linux-arm64-gnu": 15.0.1 + "@next/swc-linux-arm64-musl": 15.0.1 + "@next/swc-linux-x64-gnu": 15.0.1 + "@next/swc-linux-x64-musl": 15.0.1 + "@next/swc-win32-arm64-msvc": 15.0.1 + "@next/swc-win32-x64-msvc": 15.0.1 + sharp: 0.33.5 transitivePeerDependencies: - "@babel/core" - babel-plugin-macros @@ -20201,6 +20320,16 @@ packages: dependencies: lru-cache: 6.0.0 + /semver@7.6.3: + resolution: + { + integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==, + } + engines: {node: ">=10"} + hasBin: true + requiresBuild: true + optional: true + /send@0.17.2(supports-color@8.1.1): resolution: { @@ -20326,6 +20455,39 @@ packages: kind-of: 6.0.3 dev: false + /sharp@0.33.5: + resolution: + { + integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==, + } + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + requiresBuild: true + dependencies: + color: 4.2.3 + detect-libc: 2.0.3 + semver: 7.6.3 + optionalDependencies: + "@img/sharp-darwin-arm64": 0.33.5 + "@img/sharp-darwin-x64": 0.33.5 + "@img/sharp-libvips-darwin-arm64": 1.0.4 + "@img/sharp-libvips-darwin-x64": 1.0.4 + "@img/sharp-libvips-linux-arm": 1.0.5 + "@img/sharp-libvips-linux-arm64": 1.0.4 + "@img/sharp-libvips-linux-s390x": 1.0.4 + "@img/sharp-libvips-linux-x64": 1.0.4 + "@img/sharp-libvips-linuxmusl-arm64": 1.0.4 + "@img/sharp-libvips-linuxmusl-x64": 1.0.4 + "@img/sharp-linux-arm": 0.33.5 + "@img/sharp-linux-arm64": 0.33.5 + "@img/sharp-linux-s390x": 0.33.5 + "@img/sharp-linux-x64": 0.33.5 + "@img/sharp-linuxmusl-arm64": 0.33.5 + "@img/sharp-linuxmusl-x64": 0.33.5 + "@img/sharp-wasm32": 0.33.5 + "@img/sharp-win32-ia32": 0.33.5 + "@img/sharp-win32-x64": 0.33.5 + optional: true + /shebang-command@1.2.0: resolution: { @@ -20388,6 +20550,16 @@ packages: engines: {node: ">=14"} dev: true + /simple-swizzle@0.2.2: + resolution: + { + integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==, + } + requiresBuild: true + dependencies: + is-arrayish: 0.3.2 + optional: true + /simple-wcswidth@1.0.1: resolution: { @@ -20965,16 +21137,16 @@ packages: dependencies: acorn: 8.8.1 - /styled-jsx@5.1.1(@babel/core@7.12.10)(react@18.2.0): + /styled-jsx@5.1.6(@babel/core@7.12.10)(react@18.2.0): resolution: { - integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==, + integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==, } engines: {node: ">= 12.0.0"} peerDependencies: "@babel/core": "*" babel-plugin-macros: "*" - react: ">= 16.8.0 || 17.x.x || ^18.0.0-0" + react: ">= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0" peerDependenciesMeta: "@babel/core": optional: true @@ -20984,17 +21156,18 @@ packages: "@babel/core": 7.12.10(supports-color@8.1.1) client-only: 0.0.1 react: 18.2.0 + dev: false - /styled-jsx@5.1.1(@babel/core@7.18.2)(react@18.2.0): + /styled-jsx@5.1.6(@babel/core@7.18.2)(react@18.2.0): resolution: { - integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==, + integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==, } engines: {node: ">= 12.0.0"} peerDependencies: "@babel/core": "*" babel-plugin-macros: "*" - react: ">= 16.8.0 || 17.x.x || ^18.0.0-0" + react: ">= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0" peerDependenciesMeta: "@babel/core": optional: true @@ -21006,23 +21179,23 @@ packages: react: 18.2.0 dev: false - /styled-jsx@5.1.1(@babel/core@7.20.2)(react@18.2.0): + /styled-jsx@5.1.6(@babel/core@7.20.2)(react@18.2.0): resolution: { - integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==, + integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==, } engines: {node: ">= 12.0.0"} peerDependencies: "@babel/core": "*" babel-plugin-macros: "*" - react: ">= 16.8.0 || 17.x.x || ^18.0.0-0" + react: ">= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0" peerDependenciesMeta: "@babel/core": optional: true babel-plugin-macros: optional: true dependencies: - "@babel/core": 7.20.2 + "@babel/core": 7.20.2(supports-color@8.1.1) client-only: 0.0.1 react: 18.2.0 @@ -21508,7 +21681,7 @@ packages: } dev: true - /ts-jest@27.1.4(@babel/core@7.12.10)(esbuild@0.14.51)(jest@27.5.1)(typescript@4.8.4): + /ts-jest@27.1.4(@babel/core@7.20.2)(esbuild@0.14.51)(jest@27.5.1)(typescript@4.8.4): resolution: { integrity: sha512-qjkZlVPWVctAezwsOD1OPzbZ+k7zA5z3oxII4dGdZo5ggX/PL7kvwTM0pXTr10fAtbiVpJaL3bWd502zAhpgSQ==, @@ -21532,7 +21705,7 @@ packages: esbuild: optional: true dependencies: - "@babel/core": 7.12.10(supports-color@8.1.1) + "@babel/core": 7.20.2(supports-color@8.1.1) bs-logger: 0.2.6 esbuild: 0.14.51 fast-json-stable-stringify: 2.1.0 @@ -22022,44 +22195,6 @@ packages: - supports-color dev: true - /unbuild@0.7.6: - resolution: - { - integrity: sha512-W6pFPS6/ewlEV5uWbNgfo0i2LbVBsue5GKlOkCo6ozIrInOBEgq4s3HCUB5eZSw6Ty2iwF8dKM65pZX7QGZJ0g==, - } - hasBin: true - dependencies: - "@rollup/plugin-alias": 3.1.9(rollup@2.77.2) - "@rollup/plugin-commonjs": 22.0.1(rollup@2.77.2) - "@rollup/plugin-json": 4.1.0(rollup@2.77.2) - "@rollup/plugin-node-resolve": 13.3.0(rollup@2.77.2) - "@rollup/plugin-replace": 4.0.0(rollup@2.77.2) - "@rollup/pluginutils": 4.2.1 - chalk: 5.0.1 - consola: 2.15.3 - defu: 6.0.0 - esbuild: 0.14.51 - hookable: 5.1.1 - jiti: 1.14.0 - magic-string: 0.26.2 - mkdirp: 1.0.4 - mkdist: 0.3.13(typescript@4.9.5) - mlly: 0.5.5 - mri: 1.2.0 - pathe: 0.3.2 - pkg-types: 0.3.3 - pretty-bytes: 6.0.0 - rimraf: 3.0.2 - rollup: 2.77.2 - rollup-plugin-dts: 4.2.2(rollup@2.77.2)(typescript@4.9.5) - rollup-plugin-esbuild: 4.9.1(esbuild@0.14.51)(rollup@2.77.2)(supports-color@8.1.1) - scule: 0.2.1 - typescript: 4.9.5 - untyped: 0.4.4 - transitivePeerDependencies: - - supports-color - dev: true - /unbuild@0.7.6(supports-color@8.1.1): resolution: { @@ -22189,20 +22324,6 @@ packages: } dev: true - /untyped@0.4.4: - resolution: - { - integrity: sha512-sY6u8RedwfLfBis0copfU/fzROieyAndqPs8Kn2PfyzTjtA88vCk81J1b5z+8/VJc+cwfGy23/AqOCpvAbkNVw==, - } - dependencies: - "@babel/core": 7.20.2 - "@babel/standalone": 7.18.9 - "@babel/types": 7.18.4 - scule: 0.2.1 - transitivePeerDependencies: - - supports-color - dev: true - /untyped@0.4.4(supports-color@8.1.1): resolution: { From a362d8ac68bd3d39ed514a7b2852053490a6c3ce Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 10:38:36 +0530 Subject: [PATCH 02/22] fix: await cookies and headers in blitz auth --- packages/blitz-auth/src/server/auth-sessions.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/blitz-auth/src/server/auth-sessions.ts b/packages/blitz-auth/src/server/auth-sessions.ts index 31494911dc..6fd512bd00 100644 --- a/packages/blitz-auth/src/server/auth-sessions.ts +++ b/packages/blitz-auth/src/server/auth-sessions.ts @@ -289,8 +289,10 @@ const makeProxyToPublicData = (ctxClass: T): T => export async function getBlitzContext(): Promise { try { const {headers, cookies} = require("next/headers") - const reqHeader = Object.fromEntries(headers()) - const csrfToken = cookies().get(COOKIE_CSRF_TOKEN()) + const cookieStore = await cookies() + const headersStore = await headers() + const reqHeader = Object.fromEntries(headersStore) + const csrfToken = cookieStore.get(COOKIE_CSRF_TOKEN()) if (csrfToken) { reqHeader[HEADER_CSRF] = csrfToken.value } From fe8ed06a6e3ea937fc331a8273cd1ff87d24a633 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 10:41:21 +0530 Subject: [PATCH 03/22] chore: run codemod --- .../templates/route/__modelIdParam__/edit/page.tsx | 8 +++++--- .../generator/templates/route/__modelIdParam__/page.tsx | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/generator/templates/route/__modelIdParam__/edit/page.tsx b/packages/generator/templates/route/__modelIdParam__/edit/page.tsx index 764d279139..a6ec7ccb71 100644 --- a/packages/generator/templates/route/__modelIdParam__/edit/page.tsx +++ b/packages/generator/templates/route/__modelIdParam__/edit/page.tsx @@ -5,17 +5,19 @@ import get__ModelName__ from "../../queries/get__ModelName__" import { Edit__ModelName__ } from "../../components/Edit__ModelName__" type Edit__ModelName__PageProps = { - params: { __modelId__: string } + params: Promise<{ __modelId__: string }> } -export async function generateMetadata({ params }: Edit__ModelName__PageProps): Promise { +export async function generateMetadata(props: Edit__ModelName__PageProps): Promise { + const params = await props.params; const __ModelName__ = await invoke(get__ModelName__, { id: Number(params.__modelId__) }) return { title: `Edit __ModelName__ ${__ModelName__.id} - ${__ModelName__.name}`, } } -export default async function Page({ params }: Edit__ModelName__PageProps) { +export default async function Page(props: Edit__ModelName__PageProps) { + const params = await props.params; return (
Loading...
}> diff --git a/packages/generator/templates/route/__modelIdParam__/page.tsx b/packages/generator/templates/route/__modelIdParam__/page.tsx index 560a34ee06..93d041050a 100644 --- a/packages/generator/templates/route/__modelIdParam__/page.tsx +++ b/packages/generator/templates/route/__modelIdParam__/page.tsx @@ -5,7 +5,8 @@ import { invoke } from "src/app/blitz-server" import get__ModelName__ from "../queries/get__ModelName__" import { __ModelName__ } from "../components/__ModelName__" -export async function generateMetadata({ params }: __ModelName__PageProps): Promise { +export async function generateMetadata(props: __ModelName__PageProps): Promise { + const params = await props.params; const __ModelName__ = await invoke(get__ModelName__, { id: Number(params.__modelId__) }) return { title: `__ModelName__ ${__ModelName__.id} - ${__ModelName__.name}`, @@ -13,10 +14,11 @@ export async function generateMetadata({ params }: __ModelName__PageProps): Prom } type __ModelName__PageProps = { - params: { __modelId__: string } + params: Promise<{ __modelId__: string }> } -export default async function Page({ params }: __ModelName__PageProps) { +export default async function Page(props: __ModelName__PageProps) { + const params = await props.params; return (

From 19884bff01a78e550e4653b599888761f1e0e198 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 10:50:00 +0530 Subject: [PATCH 04/22] upgrade to latest react --- apps/next13/package.json | 8 +- apps/toolkit-app-passportjs/package.json | 6 +- apps/toolkit-app/package.json | 6 +- apps/web/package.json | 6 +- integration-tests/auth-with-rpc/package.json | 6 +- integration-tests/auth/package.json | 6 +- .../get-initial-props/package.json | 6 +- integration-tests/middleware/package.json | 6 +- .../next-13-app-dir/package.json | 6 +- integration-tests/no-suspense/package.json | 6 +- integration-tests/qm/package.json | 6 +- .../react-query-utils/package.json | 6 +- integration-tests/rpc-path-root/package.json | 6 +- integration-tests/rpc/package.json | 6 +- integration-tests/trailing-slash/package.json | 6 +- integration-tests/utils/package.json | 6 +- package.json | 4 +- packages/blitz-auth/package.json | 8 +- packages/blitz-next/package.json | 8 +- packages/blitz-rpc/package.json | 8 +- packages/blitz/package.json | 6 +- packages/generator/package.json | 6 +- packages/pkg-template/package.json | 6 +- pnpm-lock.yaml | 679 ++++++++++-------- 24 files changed, 444 insertions(+), 379 deletions(-) diff --git a/apps/next13/package.json b/apps/next13/package.json index 0b890ce8fe..2ad7698aec 100644 --- a/apps/next13/package.json +++ b/apps/next13/package.json @@ -24,16 +24,16 @@ "flatted": "3.2.7", "next": "15.0.1", "prisma": "^4.5.0", - "react": "18.2.0", - "react-dom": "18.2.0", + "react": "rc", + "react-dom": "rc", "react-hook-form": "7.39.1", "superjson": "1.11.0", "zod": "3.23.8" }, "devDependencies": { "@types/node": "18.11.7", - "@types/react": "18.0.23", - "@types/react-dom": "18.0.7", + "@types/react": "npm:types-react@rc", + "@types/react-dom": "npm:types-react-dom@rc", "eslint": "8.26.0", "eslint-config-next": "13.0.0", "typescript": "4.8.4" diff --git a/apps/toolkit-app-passportjs/package.json b/apps/toolkit-app-passportjs/package.json index 99102ba1ab..c721343f12 100644 --- a/apps/toolkit-app-passportjs/package.json +++ b/apps/toolkit-app-passportjs/package.json @@ -34,8 +34,8 @@ "next": "15.0.1", "openid-client": "5.2.1", "prisma": "4.6.1", - "react": "18.2.0", - "react-dom": "18.2.0", + "react": "rc", + "react-dom": "rc", "react-hook-form": "7.39.1", "ts-node": "10.9.1", "zod": "3.23.8" @@ -47,7 +47,7 @@ "@types/jest": "29.2.2", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", - "@types/react": "18.0.25", + "@types/react": "npm:types-react@rc", "@typescript-eslint/eslint-plugin": "5.42.1", "eslint": "8.27.0", "eslint-config-next": "12.3.1", diff --git a/apps/toolkit-app/package.json b/apps/toolkit-app/package.json index 8bd7befacd..3adc6d2263 100644 --- a/apps/toolkit-app/package.json +++ b/apps/toolkit-app/package.json @@ -35,8 +35,8 @@ "next": "15.0.1", "next-auth": "4.24.7", "prisma": "4.6.1", - "react": "18.2.0", - "react-dom": "18.2.0", + "react": "rc", + "react-dom": "rc", "react-hook-form": "7.39.1", "ts-node": "10.9.1", "zod": "3.23.8" @@ -48,7 +48,7 @@ "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", - "@types/react": "18.0.25", + "@types/react": "npm:types-react@rc", "@typescript-eslint/eslint-plugin": "5.42.1", "@vitejs/plugin-react": "2.2.0", "eslint": "8.27.0", diff --git a/apps/web/package.json b/apps/web/package.json index 82de464d18..5cafc4210f 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -30,13 +30,13 @@ "passport-mock-strategy": "2.0.0", "passport-twitter": "1.0.4", "prisma": "4.6.1", - "react": "18.2.0", - "react-dom": "18.2.0", + "react": "rc", + "react-dom": "rc", "ts-node": "10.9.1" }, "devDependencies": { "@next/bundle-analyzer": "12.0.8", - "@types/react": "18.0.25", + "@types/react": "npm:types-react@rc", "eslint": "8.27.0", "typescript": "^4.8.4" } diff --git a/integration-tests/auth-with-rpc/package.json b/integration-tests/auth-with-rpc/package.json index 3b71063c3e..ffd97b88e0 100644 --- a/integration-tests/auth-with-rpc/package.json +++ b/integration-tests/auth-with-rpc/package.json @@ -28,8 +28,8 @@ "delay": "5.0.0", "next": "15.0.1", "prisma": "4.6.1", - "react": "18.2.0", - "react-dom": "18.2.0", + "react": "rc", + "react-dom": "rc", "react-hook-form": "7.39.1", "ts-node": "10.9.1", "zod": "3.23.8" @@ -41,7 +41,7 @@ "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", - "@types/react": "18.0.25", + "@types/react": "npm:types-react@rc", "@typescript-eslint/eslint-plugin": "5.42.1", "@vitejs/plugin-react": "2.2.0", "eslint": "8.27.0", diff --git a/integration-tests/auth/package.json b/integration-tests/auth/package.json index 97e7281ca7..790ab0d110 100644 --- a/integration-tests/auth/package.json +++ b/integration-tests/auth/package.json @@ -25,8 +25,8 @@ "lowdb": "3.0.0", "next": "15.0.1", "prisma": "4.6.1", - "react": "18.2.0", - "react-dom": "18.2.0", + "react": "rc", + "react-dom": "rc", "secure-password": "4.0.0", "wait-port": "1.0.4" }, @@ -36,7 +36,7 @@ "@types/fs-extra": "9.0.13", "@types/node": "18.7.13", "@types/node-fetch": "2.6.1", - "@types/react": "18.0.25", + "@types/react": "npm:types-react@rc", "b64-lite": "1.4.0", "eslint": "8.27.0", "fs-extra": "10.0.1", diff --git a/integration-tests/get-initial-props/package.json b/integration-tests/get-initial-props/package.json index ff836375b4..367532208e 100644 --- a/integration-tests/get-initial-props/package.json +++ b/integration-tests/get-initial-props/package.json @@ -24,8 +24,8 @@ "lowdb": "2.1.0", "next": "15.0.1", "prisma": "4.6.1", - "react": "18.2.0", - "react-dom": "18.2.0" + "react": "rc", + "react-dom": "rc" }, "devDependencies": { "@blitzjs/config": "2.1.3", @@ -33,7 +33,7 @@ "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", - "@types/react": "18.0.25", + "@types/react": "npm:types-react@rc", "b64-lite": "1.4.0", "eslint": "8.27.0", "fs-extra": "10.0.1", diff --git a/integration-tests/middleware/package.json b/integration-tests/middleware/package.json index 49865a5536..f7931643e3 100644 --- a/integration-tests/middleware/package.json +++ b/integration-tests/middleware/package.json @@ -16,15 +16,15 @@ "@blitzjs/rpc": "2.1.3", "blitz": "2.1.3", "next": "15.0.1", - "react": "18.2.0", - "react-dom": "18.2.0" + "react": "rc", + "react-dom": "rc" }, "devDependencies": { "@next/bundle-analyzer": "12.0.8", "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", - "@types/react": "18.0.25", + "@types/react": "npm:types-react@rc", "eslint": "8.27.0", "fs-extra": "10.0.1", "get-port": "6.1.2", diff --git a/integration-tests/next-13-app-dir/package.json b/integration-tests/next-13-app-dir/package.json index 791dd96a4e..e0d4bf3408 100644 --- a/integration-tests/next-13-app-dir/package.json +++ b/integration-tests/next-13-app-dir/package.json @@ -26,8 +26,8 @@ "lowdb": "2.1.0", "next": "15.0.1", "prisma": "4.6.1", - "react": "18.2.0", - "react-dom": "18.2.0", + "react": "rc", + "react-dom": "rc", "secure-password": "4.0.0", "wait-port": "1.0.4" }, @@ -37,7 +37,7 @@ "@types/fs-extra": "9.0.13", "@types/node": "18.7.13", "@types/node-fetch": "2.6.1", - "@types/react": "18.0.25", + "@types/react": "npm:types-react@rc", "b64-lite": "1.4.0", "eslint": "8.27.0", "fs-extra": "10.0.1", diff --git a/integration-tests/no-suspense/package.json b/integration-tests/no-suspense/package.json index 91bba45e5a..033acc6cc0 100644 --- a/integration-tests/no-suspense/package.json +++ b/integration-tests/no-suspense/package.json @@ -24,8 +24,8 @@ "lowdb": "3.0.0", "next": "15.0.1", "prisma": "4.6.1", - "react": "18.2.0", - "react-dom": "18.2.0" + "react": "rc", + "react-dom": "rc" }, "devDependencies": { "@blitzjs/config": "2.1.3", @@ -33,7 +33,7 @@ "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", - "@types/react": "18.0.25", + "@types/react": "npm:types-react@rc", "b64-lite": "1.4.0", "eslint": "8.27.0", "fs-extra": "10.0.1", diff --git a/integration-tests/qm/package.json b/integration-tests/qm/package.json index f4414578e8..e487baa852 100644 --- a/integration-tests/qm/package.json +++ b/integration-tests/qm/package.json @@ -17,12 +17,12 @@ "blitz": "2.1.3", "next": "15.0.1", "prisma": "4.6.1", - "react": "18.2.0", - "react-dom": "18.2.0" + "react": "rc", + "react-dom": "rc" }, "devDependencies": { "@testing-library/react": "13.4.0", - "@types/react": "18.0.25", + "@types/react": "npm:types-react@rc", "@vitejs/plugin-react": "1.3.0", "delay": "5.0.0", "eslint": "8.27.0", diff --git a/integration-tests/react-query-utils/package.json b/integration-tests/react-query-utils/package.json index 4be6d1f42f..4899ea685e 100644 --- a/integration-tests/react-query-utils/package.json +++ b/integration-tests/react-query-utils/package.json @@ -23,8 +23,8 @@ "lowdb": "3.0.0", "next": "15.0.1", "prisma": "4.6.1", - "react": "18.2.0", - "react-dom": "18.2.0" + "react": "rc", + "react-dom": "rc" }, "devDependencies": { "@blitzjs/config": "2.1.3", @@ -32,7 +32,7 @@ "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", - "@types/react": "18.0.25", + "@types/react": "npm:types-react@rc", "b64-lite": "1.4.0", "eslint": "8.27.0", "fs-extra": "10.0.1", diff --git a/integration-tests/rpc-path-root/package.json b/integration-tests/rpc-path-root/package.json index 7b33eaed67..5c84191a8d 100644 --- a/integration-tests/rpc-path-root/package.json +++ b/integration-tests/rpc-path-root/package.json @@ -12,14 +12,14 @@ "@blitzjs/rpc": "2.1.3", "blitz": "2.1.3", "next": "15.0.1", - "react": "18.2.0", - "react-dom": "18.2.0" + "react": "rc", + "react-dom": "rc" }, "devDependencies": { "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", - "@types/react": "18.0.25", + "@types/react": "npm:types-react@rc", "b64-lite": "1.4.0", "eslint": "8.27.0", "fs-extra": "10.0.1", diff --git a/integration-tests/rpc/package.json b/integration-tests/rpc/package.json index 48c9a93b7f..a5f4196e86 100644 --- a/integration-tests/rpc/package.json +++ b/integration-tests/rpc/package.json @@ -12,14 +12,14 @@ "@blitzjs/rpc": "2.1.3", "blitz": "2.1.3", "next": "15.0.1", - "react": "18.2.0", - "react-dom": "18.2.0" + "react": "rc", + "react-dom": "rc" }, "devDependencies": { "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", - "@types/react": "18.0.25", + "@types/react": "npm:types-react@rc", "b64-lite": "1.4.0", "eslint": "8.27.0", "fs-extra": "10.0.1", diff --git a/integration-tests/trailing-slash/package.json b/integration-tests/trailing-slash/package.json index d5ddde93de..c2c5f933e6 100644 --- a/integration-tests/trailing-slash/package.json +++ b/integration-tests/trailing-slash/package.json @@ -24,8 +24,8 @@ "lowdb": "3.0.0", "next": "15.0.1", "prisma": "4.6.1", - "react": "18.2.0", - "react-dom": "18.2.0" + "react": "rc", + "react-dom": "rc" }, "devDependencies": { "@blitzjs/config": "2.1.3", @@ -33,7 +33,7 @@ "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", - "@types/react": "18.0.25", + "@types/react": "npm:types-react@rc", "b64-lite": "1.4.0", "eslint": "8.27.0", "fs-extra": "10.0.1", diff --git a/integration-tests/utils/package.json b/integration-tests/utils/package.json index b71223a978..f9cd071c85 100644 --- a/integration-tests/utils/package.json +++ b/integration-tests/utils/package.json @@ -11,7 +11,7 @@ "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", - "@types/react": "18.0.25", + "@types/react": "npm:types-react@rc", "@types/rimraf": "3.0.2", "@types/selenium-webdriver": "4.0.18", "chromedriver": "100.0.0", @@ -23,8 +23,8 @@ "node-fetch": "3.2.3", "pkg-dir": "5.0.0", "playwright-chromium": "1.28.0", - "react": "18.2.0", - "react-dom": "18.2.0", + "react": "rc", + "react-dom": "rc", "resolve-cwd": "3.0.0", "resolve-from": "5.0.0", "rimraf": "3.0.2", diff --git a/package.json b/package.json index eb96e7cc64..bfd68be590 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,9 @@ }, "overrides": { "@types/mime": "3.0.4", - "next": "15.0.1" + "next": "15.0.1", + "@types/react": "npm:types-react@rc", + "@types/react-dom": "npm:types-react-dom@rc" } } } diff --git a/packages/blitz-auth/package.json b/packages/blitz-auth/package.json index da07873a46..29516ebf17 100644 --- a/packages/blitz-auth/package.json +++ b/packages/blitz-auth/package.json @@ -73,13 +73,13 @@ "@types/cookie": "0.4.1", "@types/debug": "4.1.7", "@types/jsonwebtoken": "8.5.8", - "@types/react": "18.0.25", - "@types/react-dom": "17.0.14", + "@types/react": "npm:types-react@rc", + "@types/react-dom": "npm:types-react-dom@rc", "blitz": "2.1.3", "next": "15.0.1", "next-auth": "4.24.7", - "react": "18.2.0", - "react-dom": "18.2.0", + "react": "rc", + "react-dom": "rc", "secure-password": "4.0.0", "typescript": "^4.8.4", "unbuild": "0.7.6", diff --git a/packages/blitz-next/package.json b/packages/blitz-next/package.json index f8fb6caf32..7b77a581ec 100644 --- a/packages/blitz-next/package.json +++ b/packages/blitz-next/package.json @@ -53,16 +53,16 @@ "@testing-library/user-event": "13.5.0", "@types/debug": "4.1.7", "@types/node": "18.11.9", - "@types/react": "18.0.25", - "@types/react-dom": "17.0.14", + "@types/react": "npm:types-react@rc", + "@types/react-dom": "npm:types-react-dom@rc", "@types/testing-library__react-hooks": "4.0.0", "blitz": "2.1.3", "cross-spawn": "7.0.3", "find-up": "4.1.0", "next": "15.0.1", "next-router-mock": "0.9.1", - "react": "18.2.0", - "react-dom": "18.2.0", + "react": "rc", + "react-dom": "rc", "resolve-from": "5.0.0", "ts-jest": "27.1.4", "tslog": "4.9.0", diff --git a/packages/blitz-rpc/package.json b/packages/blitz-rpc/package.json index 22192d70e0..5f21050ca2 100644 --- a/packages/blitz-rpc/package.json +++ b/packages/blitz-rpc/package.json @@ -46,12 +46,12 @@ "@blitzjs/config": "2.1.3", "@tanstack/query-core": "4.24.4", "@types/debug": "4.1.7", - "@types/react": "18.0.25", - "@types/react-dom": "17.0.14", + "@types/react": "npm:types-react@rc", + "@types/react-dom": "npm:types-react-dom@rc", "blitz": "2.1.3", "next": "15.0.1", - "react": "18.2.0", - "react-dom": "18.2.0", + "react": "rc", + "react-dom": "rc", "typescript": "^4.8.4", "unbuild": "0.7.6", "watch": "1.0.2", diff --git a/packages/blitz/package.json b/packages/blitz/package.json index 5c01749591..73d5a4278a 100644 --- a/packages/blitz/package.json +++ b/packages/blitz/package.json @@ -95,12 +95,12 @@ "@types/npm-which": "3.0.1", "@types/progress": "2.0.5", "@types/prompts": "2.0.14", - "@types/react": "18.0.25", - "@types/react-dom": "17.0.14", + "@types/react": "npm:types-react@rc", + "@types/react-dom": "npm:types-react-dom@rc", "@types/test-listen": "1.1.0", "@types/watchpack": "1.1.1", "express": "4.17.3", - "react": "18.2.0", + "react": "rc", "test-listen": "1.1.0", "typescript": "^4.8.4", "unbuild": "0.7.6", diff --git a/packages/generator/package.json b/packages/generator/package.json index b0fc9c4e44..b2f9f28f3c 100644 --- a/packages/generator/package.json +++ b/packages/generator/package.json @@ -64,15 +64,15 @@ "@types/mem-fs-editor": "7.0.1", "@types/pluralize": "0.0.29", "@types/prettier": "2.4.4", - "@types/react": "18.0.25", - "@types/react-dom": "17.0.14", + "@types/react": "npm:types-react@rc", + "@types/react-dom": "npm:types-react-dom@rc", "@types/vinyl": "2.0.6", "@typescript-eslint/eslint-plugin": "5.42.1", "@typescript-eslint/parser": "5.9.1", "babylon": "6.18.0", "debug": "4.3.3", "eslint": "8.27.0", - "react": "18.2.0", + "react": "rc", "typescript": "^4.8.4", "unbuild": "0.6.9", "watch": "1.0.2" diff --git a/packages/pkg-template/package.json b/packages/pkg-template/package.json index f344698b2c..785dd982bf 100644 --- a/packages/pkg-template/package.json +++ b/packages/pkg-template/package.json @@ -26,9 +26,9 @@ }, "devDependencies": { "@blitzjs/config": "2.1.3", - "@types/react": "18.0.25", - "@types/react-dom": "17.0.14", - "react": "18.2.0", + "@types/react": "npm:types-react@rc", + "@types/react-dom": "npm:types-react-dom@rc", + "react": "rc", "typescript": "^4.8.4", "unbuild": "0.7.6", "watch": "1.0.2" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7f6a68a868..d89a8186ca 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,6 +7,8 @@ settings: overrides: "@types/mime": 3.0.4 next: 15.0.1 + "@types/react": npm:types-react@rc + "@types/react-dom": npm:types-react-dom@rc patchedDependencies: next-auth@4.24.7: @@ -36,7 +38,7 @@ importers: version: 13.0.3 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(react-dom@18.2.0)(react@18.2.0) only-allow: specifier: 1.1.0 version: 1.1.0 @@ -75,7 +77,7 @@ importers: version: link:../../packages/blitz-rpc "@hookform/error-message": specifier: 2.0.0 - version: 2.0.0(react-dom@18.2.0)(react-hook-form@7.39.1)(react@18.2.0) + version: 2.0.0(react-dom@19.0.0-rc-cae764ce-20241025)(react-hook-form@7.39.1)(react@19.0.0-rc-cae764ce-20241025) "@hookform/resolvers": specifier: 2.9.10 version: 2.9.10(react-hook-form@7.39.1) @@ -84,7 +86,7 @@ importers: version: 4.6.1(prisma@4.6.1) "@tanstack/react-query": specifier: 4.0.10 - version: 4.0.10(react-dom@18.2.0)(react@18.2.0) + version: 4.0.10(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) blitz: specifier: 2.1.3 version: link:../../packages/blitz @@ -93,19 +95,19 @@ importers: version: 3.2.7 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) prisma: specifier: ^4.5.0 version: 4.6.1 react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) react-hook-form: specifier: 7.39.1 - version: 7.39.1(react@18.2.0) + version: 7.39.1(react@19.0.0-rc-cae764ce-20241025) superjson: specifier: 1.11.0 version: 1.11.0 @@ -117,11 +119,11 @@ importers: specifier: 18.11.7 version: 18.11.7 "@types/react": - specifier: 18.0.23 - version: 18.0.23 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 "@types/react-dom": - specifier: 18.0.7 - version: 18.0.7 + specifier: npm:types-react-dom@rc + version: /types-react-dom@19.0.0-rc.1 eslint: specifier: 8.26.0 version: 8.26.0 @@ -148,7 +150,7 @@ importers: version: link:../../packages/blitz-rpc "@hookform/error-message": specifier: 2.0.0 - version: 2.0.0(react-dom@18.2.0)(react-hook-form@7.39.1)(react@18.2.0) + version: 2.0.0(react-dom@19.0.0-rc-cae764ce-20241025)(react-hook-form@7.39.1)(react@19.0.0-rc-cae764ce-20241025) "@hookform/resolvers": specifier: 2.9.10 version: 2.9.10(react-hook-form@7.39.1) @@ -160,22 +162,22 @@ importers: version: link:../../packages/blitz next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) next-auth: specifier: 4.24.7 - version: 4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@18.2.0)(react@18.2.0) + version: 4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) react-hook-form: specifier: 7.39.1 - version: 7.39.1(react@18.2.0) + version: 7.39.1(react@19.0.0-rc-cae764ce-20241025) ts-node: specifier: 10.9.1 version: 10.9.1(@types/node@18.11.9)(typescript@4.8.4) @@ -191,10 +193,10 @@ importers: version: 5.16.5 "@testing-library/react": specifier: 13.4.0 - version: 13.4.0(react-dom@18.2.0)(react@18.2.0) + version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) "@testing-library/react-hooks": specifier: 8.0.1 - version: 8.0.1(@types/react@18.0.25)(react-dom@18.2.0)(react@18.2.0) + version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) "@types/node": specifier: 18.11.9 version: 18.11.9 @@ -202,8 +204,8 @@ importers: specifier: 2.0.1 version: 2.0.1 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 "@typescript-eslint/eslint-plugin": specifier: 5.42.1 version: 5.42.1(@typescript-eslint/parser@5.9.1)(eslint@8.27.0)(supports-color@8.1.1)(typescript@4.8.4) @@ -266,7 +268,7 @@ importers: version: link:../../packages/blitz-rpc "@hookform/error-message": specifier: 2.0.0 - version: 2.0.0(react-dom@18.2.0)(react-hook-form@7.39.1)(react@18.2.0) + version: 2.0.0(react-dom@19.0.0-rc-cae764ce-20241025)(react-hook-form@7.39.1)(react@19.0.0-rc-cae764ce-20241025) "@hookform/resolvers": specifier: 2.9.10 version: 2.9.10(react-hook-form@7.39.1) @@ -278,7 +280,7 @@ importers: version: link:../../packages/blitz next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) openid-client: specifier: 5.2.1 version: 5.2.1 @@ -286,14 +288,14 @@ importers: specifier: 4.6.1 version: 4.6.1 react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) react-hook-form: specifier: 7.39.1 - version: 7.39.1(react@18.2.0) + version: 7.39.1(react@19.0.0-rc-cae764ce-20241025) ts-node: specifier: 10.9.1 version: 10.9.1(@types/node@18.11.9)(typescript@4.8.4) @@ -306,10 +308,10 @@ importers: version: 12.0.8 "@testing-library/react": specifier: 13.4.0 - version: 13.4.0(react-dom@18.2.0)(react@18.2.0) + version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) "@testing-library/react-hooks": specifier: 8.0.1 - version: 8.0.1(@types/react@18.0.25)(react-dom@18.2.0)(react@18.2.0) + version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) "@types/jest": specifier: 29.2.2 version: 29.2.2 @@ -320,8 +322,8 @@ importers: specifier: 2.0.1 version: 2.0.1 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 "@typescript-eslint/eslint-plugin": specifier: 5.42.1 version: 5.42.1(@typescript-eslint/parser@5.9.1)(eslint@8.27.0)(supports-color@8.1.1)(typescript@4.8.4) @@ -396,7 +398,7 @@ importers: version: 29.3.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) passport-mock-strategy: specifier: 2.0.0 version: 2.0.0 @@ -407,11 +409,11 @@ importers: specifier: 4.6.1 version: 4.6.1 react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) ts-node: specifier: 10.9.1 version: 10.9.1(@types/node@18.11.9)(typescript@4.8.4) @@ -420,8 +422,8 @@ importers: specifier: 12.0.8 version: 12.0.8 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 eslint: specifier: 8.27.0 version: 8.27.0(supports-color@8.1.1) @@ -451,16 +453,16 @@ importers: version: 3.0.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) secure-password: specifier: 4.0.0 version: 4.0.0 @@ -484,8 +486,8 @@ importers: specifier: 2.6.1 version: 2.6.1 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 b64-lite: specifier: 1.4.0 version: 1.4.0 @@ -527,7 +529,7 @@ importers: version: link:../../packages/blitz-rpc "@hookform/error-message": specifier: 2.0.0 - version: 2.0.0(react-dom@18.2.0)(react-hook-form@7.39.1)(react@18.2.0) + version: 2.0.0(react-dom@19.0.0-rc-cae764ce-20241025)(react-hook-form@7.39.1)(react@19.0.0-rc-cae764ce-20241025) "@hookform/resolvers": specifier: 2.9.10 version: 2.9.10(react-hook-form@7.39.1) @@ -542,19 +544,19 @@ importers: version: 5.0.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) react-hook-form: specifier: 7.39.1 - version: 7.39.1(react@18.2.0) + version: 7.39.1(react@19.0.0-rc-cae764ce-20241025) ts-node: specifier: 10.9.1 version: 10.9.1(@types/node@18.11.9)(typescript@4.8.4) @@ -570,10 +572,10 @@ importers: version: 5.16.5 "@testing-library/react": specifier: 13.4.0 - version: 13.4.0(react-dom@18.2.0)(react@18.2.0) + version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) "@testing-library/react-hooks": specifier: 8.0.1 - version: 8.0.1(@types/react@18.0.25)(react-dom@18.2.0)(react@18.2.0) + version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) "@types/node": specifier: 18.11.9 version: 18.11.9 @@ -581,8 +583,8 @@ importers: specifier: 2.0.1 version: 2.0.1 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 "@typescript-eslint/eslint-plugin": specifier: 5.42.1 version: 5.42.1(@typescript-eslint/parser@5.9.1)(eslint@8.27.0)(supports-color@8.1.1)(typescript@4.8.4) @@ -654,16 +656,16 @@ importers: version: 2.1.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) devDependencies: "@blitzjs/config": specifier: 2.1.3 @@ -681,8 +683,8 @@ importers: specifier: 2.6.1 version: 2.6.1 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 b64-lite: specifier: 1.4.0 version: 1.4.0 @@ -718,13 +720,13 @@ importers: version: link:../../packages/blitz next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) devDependencies: "@next/bundle-analyzer": specifier: 12.0.8 @@ -739,8 +741,8 @@ importers: specifier: 2.6.1 version: 2.6.1 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 eslint: specifier: 8.27.0 version: 8.27.0(supports-color@8.1.1) @@ -782,16 +784,16 @@ importers: version: 2.1.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) secure-password: specifier: 4.0.0 version: 4.0.0 @@ -815,8 +817,8 @@ importers: specifier: 2.6.1 version: 2.6.1 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 b64-lite: specifier: 1.4.0 version: 1.4.0 @@ -864,16 +866,16 @@ importers: version: 3.0.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) devDependencies: "@blitzjs/config": specifier: 2.1.3 @@ -891,8 +893,8 @@ importers: specifier: 2.6.1 version: 2.6.1 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 b64-lite: specifier: 1.4.0 version: 1.4.0 @@ -931,29 +933,29 @@ importers: version: 4.6.1(prisma@4.6.1) "@tanstack/react-query": specifier: 4.0.10 - version: 4.0.10(react-dom@18.2.0)(react@18.2.0) + version: 4.0.10(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) blitz: specifier: 2.1.3 version: link:../../packages/blitz next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.18.2)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.18.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) devDependencies: "@testing-library/react": specifier: 13.4.0 - version: 13.4.0(react-dom@18.2.0)(react@18.2.0) + version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 "@vitejs/plugin-react": specifier: 1.3.0 version: 1.3.0 @@ -995,16 +997,16 @@ importers: version: 3.0.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) devDependencies: "@blitzjs/config": specifier: 2.1.3 @@ -1022,8 +1024,8 @@ importers: specifier: 2.6.1 version: 2.6.1 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 b64-lite: specifier: 1.4.0 version: 1.4.0 @@ -1059,13 +1061,13 @@ importers: version: link:../../packages/blitz next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) devDependencies: "@types/express": specifier: 4.17.13 @@ -1077,8 +1079,8 @@ importers: specifier: 2.6.1 version: 2.6.1 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 b64-lite: specifier: 1.4.0 version: 1.4.0 @@ -1108,13 +1110,13 @@ importers: version: link:../../packages/blitz next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) devDependencies: "@types/express": specifier: 4.17.13 @@ -1126,8 +1128,8 @@ importers: specifier: 2.6.1 version: 2.6.1 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 b64-lite: specifier: 1.4.0 version: 1.4.0 @@ -1163,16 +1165,16 @@ importers: version: 3.0.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) devDependencies: "@blitzjs/config": specifier: 2.1.3 @@ -1190,8 +1192,8 @@ importers: specifier: 2.6.1 version: 2.6.1 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 b64-lite: specifier: 1.4.0 version: 1.4.0 @@ -1224,10 +1226,10 @@ importers: version: link:../../packages/blitz-rpc "@tanstack/react-query": specifier: 4.13.0 - version: 4.13.0(react-dom@18.2.0)(react@18.2.0) + version: 4.13.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) "@testing-library/react": specifier: 13.4.0 - version: 13.4.0(react-dom@18.2.0)(react@18.2.0) + version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) "@types/express": specifier: 4.17.13 version: 4.17.13 @@ -1238,8 +1240,8 @@ importers: specifier: 2.6.1 version: 2.6.1 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 "@types/rimraf": specifier: 3.0.2 version: 3.0.2 @@ -1274,11 +1276,11 @@ importers: specifier: 1.28.0 version: 1.28.0 react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) resolve-cwd: specifier: 3.0.0 version: 3.0.0 @@ -1377,10 +1379,10 @@ importers: version: 1.2.3 ink: specifier: 3.2.0 - version: 3.2.0(@types/react@18.0.25)(react@18.2.0) + version: 3.2.0(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) ink-spinner: specifier: 4.0.3 - version: 4.0.3(ink@3.2.0)(react@18.2.0) + version: 4.0.3(ink@3.2.0)(react@19.0.0-rc-cae764ce-20241025) jscodeshift: specifier: 0.13.0 version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) @@ -1491,11 +1493,11 @@ importers: specifier: 2.0.14 version: 2.0.14 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 "@types/react-dom": - specifier: 17.0.14 - version: 17.0.14 + specifier: npm:types-react-dom@rc + version: /types-react-dom@19.0.0-rc.1 "@types/test-listen": specifier: 1.1.0 version: 1.1.0 @@ -1506,8 +1508,8 @@ importers: specifier: 4.17.3 version: 4.17.3(supports-color@8.1.1) react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 test-listen: specifier: 1.1.0 version: 1.1.0 @@ -1595,10 +1597,10 @@ importers: version: link:../config "@testing-library/react": specifier: 13.4.0 - version: 13.4.0(react-dom@18.2.0)(react@18.2.0) + version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) "@testing-library/react-hooks": specifier: 8.0.1 - version: 8.0.1(@types/react@18.0.25)(react-dom@18.2.0)(react@18.2.0) + version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) "@types/cookie": specifier: 0.4.1 version: 0.4.1 @@ -1609,26 +1611,26 @@ importers: specifier: 8.5.8 version: 8.5.8 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 "@types/react-dom": - specifier: 17.0.14 - version: 17.0.14 + specifier: npm:types-react-dom@rc + version: /types-react-dom@19.0.0-rc.1 blitz: specifier: 2.1.3 version: link:../blitz next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) next-auth: specifier: 4.24.7 - version: 4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@18.2.0)(react@18.2.0) + version: 4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) secure-password: specifier: 4.0.0 version: 4.0.0 @@ -1680,10 +1682,10 @@ importers: version: 5.16.3 "@testing-library/react": specifier: 13.4.0 - version: 13.4.0(react-dom@18.2.0)(react@18.2.0) + version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) "@testing-library/react-hooks": specifier: 8.0.1 - version: 8.0.1(@types/react@18.0.25)(react-dom@18.2.0)(react@18.2.0) + version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) "@testing-library/user-event": specifier: 13.5.0 version: 13.5.0(@testing-library/dom@8.13.0) @@ -1694,14 +1696,14 @@ importers: specifier: 18.11.9 version: 18.11.9 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 "@types/react-dom": - specifier: 17.0.14 - version: 17.0.14 + specifier: npm:types-react-dom@rc + version: /types-react-dom@19.0.0-rc.1 "@types/testing-library__react-hooks": specifier: 4.0.0 - version: 4.0.0(@types/react@18.0.25)(react-dom@18.2.0)(react@18.2.0) + version: 4.0.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) blitz: specifier: 2.1.3 version: link:../blitz @@ -1713,16 +1715,16 @@ importers: version: 4.1.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) next-router-mock: specifier: 0.9.1 - version: 0.9.1(next@15.0.1)(react@18.2.0) + version: 0.9.1(next@15.0.1)(react@19.0.0-rc-cae764ce-20241025) react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) resolve-from: specifier: 5.0.0 version: 5.0.0 @@ -1749,7 +1751,7 @@ importers: version: 1.3.7 "@tanstack/react-query": specifier: 4.24.4 - version: 4.24.4(react-dom@18.2.0)(react@18.2.0) + version: 4.24.4(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) b64-lite: specifier: 1.4.0 version: 1.4.0 @@ -1782,23 +1784,23 @@ importers: specifier: 4.1.7 version: 4.1.7 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 "@types/react-dom": - specifier: 17.0.14 - version: 17.0.14 + specifier: npm:types-react-dom@rc + version: /types-react-dom@19.0.0-rc.1 blitz: specifier: 2.1.3 version: link:../blitz next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) + version: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 react-dom: - specifier: 18.2.0 - version: 18.2.0(react@18.2.0) + specifier: rc + version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) typescript: specifier: ^4.8.4 version: 4.8.4 @@ -2013,11 +2015,11 @@ importers: specifier: 2.4.4 version: 2.4.4 "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 "@types/react-dom": - specifier: 17.0.14 - version: 17.0.14 + specifier: npm:types-react-dom@rc + version: /types-react-dom@19.0.0-rc.1 "@types/vinyl": specifier: 2.0.6 version: 2.0.6 @@ -2037,8 +2039,8 @@ importers: specifier: 8.27.0 version: 8.27.0(supports-color@8.1.1) react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 typescript: specifier: ^4.8.4 version: 4.8.4 @@ -2062,14 +2064,14 @@ importers: specifier: 2.1.3 version: link:../config "@types/react": - specifier: 18.0.25 - version: 18.0.25 + specifier: npm:types-react@rc + version: /types-react@19.0.0-rc.1 "@types/react-dom": - specifier: 17.0.14 - version: 17.0.14 + specifier: npm:types-react-dom@rc + version: /types-react-dom@19.0.0-rc.1 react: - specifier: 18.2.0 - version: 18.2.0 + specifier: rc + version: 19.0.0-rc-cae764ce-20241025 typescript: specifier: ^4.8.4 version: 4.8.4 @@ -4723,7 +4725,7 @@ packages: "@hapi/hoek": 9.3.0 dev: false - /@hookform/error-message@2.0.0(react-dom@18.2.0)(react-hook-form@7.39.1)(react@18.2.0): + /@hookform/error-message@2.0.0(react-dom@19.0.0-rc-cae764ce-20241025)(react-hook-form@7.39.1)(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-Y90nHzjgL2MP7GFy75kscdvxrCTjtyxGmOLLxX14nd08OXRIh9lMH/y9Kpdo0p1IPowJBiZMHyueg7p+yrqynQ==, @@ -4733,9 +4735,9 @@ packages: react-dom: ">=16.8.0" react-hook-form: ^7.0.0 dependencies: - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - react-hook-form: 7.39.1(react@18.2.0) + react: 19.0.0-rc-cae764ce-20241025 + react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + react-hook-form: 7.39.1(react@19.0.0-rc-cae764ce-20241025) dev: false /@hookform/resolvers@2.9.10(react-hook-form@7.39.1): @@ -4746,7 +4748,7 @@ packages: peerDependencies: react-hook-form: ^7.0.0 dependencies: - react-hook-form: 7.39.1(react@18.2.0) + react-hook-form: 7.39.1(react@19.0.0-rc-cae764ce-20241025) dev: false /@humanwhocodes/config-array@0.11.7(supports-color@8.1.1): @@ -6379,7 +6381,7 @@ packages: integrity: sha512-9dqjv9eeB6VHN7lD3cLo16ZAjfjCsdXetSAD5+VyKqLUvcKTL0CklGQRJu+bWzdrS69R6Ea4UZo8obHYZnG6aA==, } - /@tanstack/react-query@4.0.10(react-dom@18.2.0)(react@18.2.0): + /@tanstack/react-query@4.0.10(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-Wn5QhZUE5wvr6rGClV7KeQIUsdTmYR9mgmMZen7DSRWauHW2UTynFg3Kkf6pw+XlxxOLsyLWwz/Q6q1lSpM3TQ==, @@ -6396,12 +6398,12 @@ packages: dependencies: "@tanstack/query-core": 4.24.4 "@types/use-sync-external-store": 0.0.3 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - use-sync-external-store: 1.2.0(react@18.2.0) + react: 19.0.0-rc-cae764ce-20241025 + react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + use-sync-external-store: 1.2.0(react@19.0.0-rc-cae764ce-20241025) dev: false - /@tanstack/react-query@4.13.0(react-dom@18.2.0)(react@18.2.0): + /@tanstack/react-query@4.13.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-dI/5hJ/pGQ74P5hxBLC9h6K0/Cap2T3k0ZjjjFLBCNnohDYgl7LNmMopzrRzBHk2mMjf2hgXHIzcKNG8GOZ5hg==, @@ -6417,12 +6419,12 @@ packages: optional: true dependencies: "@tanstack/query-core": 4.13.0 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - use-sync-external-store: 1.2.0(react@18.2.0) + react: 19.0.0-rc-cae764ce-20241025 + react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + use-sync-external-store: 1.2.0(react@19.0.0-rc-cae764ce-20241025) dev: true - /@tanstack/react-query@4.24.4(react-dom@18.2.0)(react@18.2.0): + /@tanstack/react-query@4.24.4(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-RpaS/3T/a3pHuZJbIAzAYRu+1nkp+/enr9hfRXDS/mojwx567UiMksoqW4wUFWlwIvWTXyhot2nbIipTKEg55Q==, @@ -6438,9 +6440,9 @@ packages: optional: true dependencies: "@tanstack/query-core": 4.24.4 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - use-sync-external-store: 1.2.0(react@18.2.0) + react: 19.0.0-rc-cae764ce-20241025 + react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + use-sync-external-store: 1.2.0(react@19.0.0-rc-cae764ce-20241025) dev: false /@testim/chrome-version@1.1.2: @@ -6503,14 +6505,14 @@ packages: redent: 3.0.0 dev: true - /@testing-library/react-hooks@8.0.1(@types/react@18.0.25)(react-dom@18.2.0)(react@18.2.0): + /@testing-library/react-hooks@8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1): resolution: { integrity: sha512-Aqhl2IVmLt8IovEVarNDFuJDVWVvhnr9/GCU6UUnrYXwgDFF9h2L2o2P9KBni1AST5sT6riAyoukFLyjQUgD/g==, } engines: {node: ">=12"} peerDependencies: - "@types/react": ^16.9.0 || ^17.0.0 + "@types/react": npm:types-react@rc react: ^16.9.0 || ^17.0.0 react-dom: ^16.9.0 || ^17.0.0 react-test-renderer: ^16.9.0 || ^17.0.0 @@ -6523,13 +6525,13 @@ packages: optional: true dependencies: "@babel/runtime": 7.18.3 - "@types/react": 18.0.25 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - react-error-boundary: 3.1.4(react@18.2.0) + "@types/react": /types-react@19.0.0-rc.1 + react: 19.0.0-rc-cae764ce-20241025 + react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + react-error-boundary: 3.1.4(react@19.0.0-rc-cae764ce-20241025) dev: true - /@testing-library/react@13.4.0(react-dom@18.2.0)(react@18.2.0): + /@testing-library/react@13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw==, @@ -6541,9 +6543,9 @@ packages: dependencies: "@babel/runtime": 7.18.3 "@testing-library/dom": 8.13.0 - "@types/react-dom": 18.0.7 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + "@types/react-dom": /types-react-dom@19.0.0-rc.1 + react: 19.0.0-rc-cae764ce-20241025 + react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) dev: true /@testing-library/user-event@13.5.0(@testing-library/dom@8.13.0): @@ -6896,7 +6898,7 @@ packages: integrity: sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==, } dependencies: - "@types/react": 18.0.25 + "@types/react": /types-react@19.0.0-rc.1 hoist-non-react-statics: 3.3.2 dev: false @@ -7216,12 +7218,6 @@ packages: "@types/node": 18.11.9 dev: true - /@types/prop-types@15.7.5: - resolution: - { - integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==, - } - /@types/qs@6.9.7: resolution: { @@ -7234,45 +7230,6 @@ packages: integrity: sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==, } - /@types/react-dom@17.0.14: - resolution: - { - integrity: sha512-H03xwEP1oXmSfl3iobtmQ/2dHF5aBHr8aUMwyGZya6OW45G+xtdzmq6HkncefiBt5JU8DVyaWl/nWZbjZCnzAQ==, - } - dependencies: - "@types/react": 18.0.25 - dev: true - - /@types/react-dom@18.0.7: - resolution: - { - integrity: sha512-HaXc+BbqAZE1RdsK3tC8SbkFy6UL2xF76lT9rQs5JkPrJg3rWA3Ou/Lhw3YJQzEDkBpmJ79nBsfnd05WrBd2QQ==, - } - dependencies: - "@types/react": 18.0.25 - dev: true - - /@types/react@18.0.23: - resolution: - { - integrity: sha512-R1wTULtCiJkudAN2DJGoYYySbGtOdzZyUWAACYinKdiQC8auxso4kLDUhQ7AJ2kh3F6A6z4v69U6tNY39hihVQ==, - } - dependencies: - "@types/prop-types": 15.7.5 - "@types/scheduler": 0.16.2 - csstype: 3.1.0 - dev: true - - /@types/react@18.0.25: - resolution: - { - integrity: sha512-xD6c0KDT4m7n9uD4ZHi02lzskaiqcBxf4zi+tXZY98a04wvc0hi/TcCPC2FOESZi51Nd7tlUeOJY8RofL799/g==, - } - dependencies: - "@types/prop-types": 15.7.5 - "@types/scheduler": 0.16.2 - csstype: 3.1.0 - /@types/resolve@1.17.1: resolution: { @@ -7301,12 +7258,6 @@ packages: "@types/node": 18.11.9 dev: true - /@types/scheduler@0.16.2: - resolution: - { - integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==, - } - /@types/secure-password@3.1.1: resolution: { @@ -7369,14 +7320,14 @@ packages: "@types/jest": 29.2.2 dev: true - /@types/testing-library__react-hooks@4.0.0(@types/react@18.0.25)(react-dom@18.2.0)(react@18.2.0): + /@types/testing-library__react-hooks@4.0.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1): resolution: { integrity: sha512-UzZUXthQtVjDruR2YA+hqg9ux5AfmZ8Kaw+QDungax+T7wb/5NC4x7YOpIqRx7oY3KksGQ69bzNE/xwzb5NslQ==, } deprecated: This is a stub types definition. @testing-library/react-hooks provides its own type definitions, so you do not need this installed. dependencies: - "@testing-library/react-hooks": 8.0.1(@types/react@18.0.25)(react-dom@18.2.0)(react@18.2.0) + "@testing-library/react-hooks": 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) transitivePeerDependencies: - "@types/react" - react @@ -14264,7 +14215,7 @@ packages: } dev: false - /ink-spinner@4.0.3(ink@3.2.0)(react@18.2.0): + /ink-spinner@4.0.3(ink@3.2.0)(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-uJ4nbH00MM9fjTJ5xdw0zzvtXMkeGb0WV6dzSWvFv2/+ks6FIhpkt+Ge/eLdh0Ah6Vjw5pLMyNfoHQpRDRVFbQ==, @@ -14275,24 +14226,24 @@ packages: react: ">=16.8.2" dependencies: cli-spinners: 2.6.1 - ink: 3.2.0(@types/react@18.0.25)(react@18.2.0) - react: 18.2.0 + ink: 3.2.0(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) + react: 19.0.0-rc-cae764ce-20241025 dev: false - /ink@3.2.0(@types/react@18.0.25)(react@18.2.0): + /ink@3.2.0(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1): resolution: { integrity: sha512-firNp1q3xxTzoItj/eOOSZQnYSlyrWks5llCTVX37nJ59K3eXbQ8PtzCguqo8YI19EELo5QxaKnJd4VxzhU8tg==, } engines: {node: ">=10"} peerDependencies: - "@types/react": ">=16.8.0" + "@types/react": npm:types-react@rc react: ">=16.8.0" peerDependenciesMeta: "@types/react": optional: true dependencies: - "@types/react": 18.0.25 + "@types/react": /types-react@19.0.0-rc.1 ansi-escapes: 4.3.2 auto-bind: 4.0.0 chalk: 4.1.2 @@ -14304,9 +14255,9 @@ packages: is-ci: 2.0.0 lodash: 4.17.21 patch-console: 1.0.0 - react: 18.2.0 + react: 19.0.0-rc-cae764ce-20241025 react-devtools-core: 4.25.0 - react-reconciler: 0.26.2(react@18.2.0) + react-reconciler: 0.26.2(react@19.0.0-rc-cae764ce-20241025) scheduler: 0.20.2 signal-exit: 3.0.7 slice-ansi: 3.0.0 @@ -17578,7 +17529,7 @@ packages: } dev: false - /next-auth@4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@18.2.0)(react@18.2.0): + /next-auth@4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-iChjE8ov/1K/z98gdKbn2Jw+2vLgJtVV39X+rCP5SGnVQuco7QOr19FRNGMIrD8d3LYhHWV9j9sKLzq1aDWWQQ==, @@ -17596,17 +17547,17 @@ packages: "@panva/hkdf": 1.0.2 cookie: 0.5.0 jose: 4.15.5 - next: 15.0.1(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) + next: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) oauth: 0.9.15 openid-client: 5.6.5 preact: 10.11.3 preact-render-to-string: 5.2.6(preact@10.11.3) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + react: 19.0.0-rc-cae764ce-20241025 + react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) uuid: 8.3.2 patched: true - /next-router-mock@0.9.1(next@15.0.1)(react@18.2.0): + /next-router-mock@0.9.1(next@15.0.1)(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-GTrns944dnFNgycpinyRszOiwwk99LUJsvvX0FWRgUFHv6hOuzCns1rmTlzO+DRimYB9/XMA+87X2/dQLzjiUQ==, @@ -17615,11 +17566,11 @@ packages: next: 15.0.1 react: ">=17.0.0" dependencies: - next: 15.0.1(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 + next: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + react: 19.0.0-rc-cae764ce-20241025 dev: true - /next@15.0.1(@babel/core@7.12.10)(react-dom@18.2.0)(react@18.2.0): + /next@15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-PSkFkr/w7UnFWm+EP8y/QpHrJXMqpZzAXpergB/EqLPOh4SGPJXv1wj4mslr2hUZBAS9pX7/9YLIdxTv6fwytw==, @@ -17649,9 +17600,9 @@ packages: busboy: 1.6.0 caniuse-lite: 1.0.30001599 postcss: 8.4.31 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - styled-jsx: 5.1.6(@babel/core@7.12.10)(react@18.2.0) + react: 19.0.0-rc-cae764ce-20241025 + react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + styled-jsx: 5.1.6(@babel/core@7.12.10)(react@19.0.0-rc-cae764ce-20241025) optionalDependencies: "@next/swc-darwin-arm64": 15.0.1 "@next/swc-darwin-x64": 15.0.1 @@ -17667,7 +17618,7 @@ packages: - babel-plugin-macros dev: false - /next@15.0.1(@babel/core@7.18.2)(react-dom@18.2.0)(react@18.2.0): + /next@15.0.1(@babel/core@7.18.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-PSkFkr/w7UnFWm+EP8y/QpHrJXMqpZzAXpergB/EqLPOh4SGPJXv1wj4mslr2hUZBAS9pX7/9YLIdxTv6fwytw==, @@ -17697,9 +17648,9 @@ packages: busboy: 1.6.0 caniuse-lite: 1.0.30001599 postcss: 8.4.31 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - styled-jsx: 5.1.6(@babel/core@7.18.2)(react@18.2.0) + react: 19.0.0-rc-cae764ce-20241025 + react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + styled-jsx: 5.1.6(@babel/core@7.18.2)(react@19.0.0-rc-cae764ce-20241025) optionalDependencies: "@next/swc-darwin-arm64": 15.0.1 "@next/swc-darwin-x64": 15.0.1 @@ -17715,7 +17666,54 @@ packages: - babel-plugin-macros dev: false - /next@15.0.1(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0): + /next@15.0.1(@babel/core@7.20.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): + resolution: + { + integrity: sha512-PSkFkr/w7UnFWm+EP8y/QpHrJXMqpZzAXpergB/EqLPOh4SGPJXv1wj4mslr2hUZBAS9pX7/9YLIdxTv6fwytw==, + } + engines: {node: ">=18.18.0"} + hasBin: true + peerDependencies: + "@opentelemetry/api": ^1.1.0 + "@playwright/test": ^1.41.2 + babel-plugin-react-compiler: "*" + react: ^18.2.0 || 19.0.0-rc-69d4b800-20241021 + react-dom: ^18.2.0 || 19.0.0-rc-69d4b800-20241021 + sass: ^1.3.0 + peerDependenciesMeta: + "@opentelemetry/api": + optional: true + "@playwright/test": + optional: true + babel-plugin-react-compiler: + optional: true + sass: + optional: true + dependencies: + "@next/env": 15.0.1 + "@swc/counter": 0.1.3 + "@swc/helpers": 0.5.13 + busboy: 1.6.0 + caniuse-lite: 1.0.30001599 + postcss: 8.4.31 + react: 19.0.0-rc-cae764ce-20241025 + react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + styled-jsx: 5.1.6(@babel/core@7.20.2)(react@19.0.0-rc-cae764ce-20241025) + optionalDependencies: + "@next/swc-darwin-arm64": 15.0.1 + "@next/swc-darwin-x64": 15.0.1 + "@next/swc-linux-arm64-gnu": 15.0.1 + "@next/swc-linux-arm64-musl": 15.0.1 + "@next/swc-linux-x64-gnu": 15.0.1 + "@next/swc-linux-x64-musl": 15.0.1 + "@next/swc-win32-arm64-msvc": 15.0.1 + "@next/swc-win32-x64-msvc": 15.0.1 + sharp: 0.33.5 + transitivePeerDependencies: + - "@babel/core" + - babel-plugin-macros + + /next@15.0.1(react-dom@18.2.0)(react@18.2.0): resolution: { integrity: sha512-PSkFkr/w7UnFWm+EP8y/QpHrJXMqpZzAXpergB/EqLPOh4SGPJXv1wj4mslr2hUZBAS9pX7/9YLIdxTv6fwytw==, @@ -17747,7 +17745,7 @@ packages: postcss: 8.4.31 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - styled-jsx: 5.1.6(@babel/core@7.20.2)(react@18.2.0) + styled-jsx: 5.1.6(react@18.2.0) optionalDependencies: "@next/swc-darwin-arm64": 15.0.1 "@next/swc-darwin-x64": 15.0.1 @@ -17761,6 +17759,7 @@ packages: transitivePeerDependencies: - "@babel/core" - babel-plugin-macros + dev: false /nice-try@1.0.5: resolution: @@ -19461,8 +19460,20 @@ packages: loose-envify: 1.4.0 react: 18.2.0 scheduler: 0.23.0 + dev: false + + /react-dom@19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025): + resolution: + { + integrity: sha512-e3CVe2+ojMe4dz8E/WsV9bkRj+lZt5ms+rhTFHEqIAHv4/PDdXa7P4uJXNhfik+ZYF4Wg5wCDVP4l7cgaudCpg==, + } + peerDependencies: + react: 19.0.0-rc-cae764ce-20241025 + dependencies: + react: 19.0.0-rc-cae764ce-20241025 + scheduler: 0.25.0-rc-cae764ce-20241025 - /react-error-boundary@3.1.4(react@18.2.0): + /react-error-boundary@3.1.4(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-uM9uPzZJTF6wRQORmSrvOIgt4lJ9MC1sNgEOj2XGsDTRE4kmpWxg7ENK9EWNKJRMAOY9z0MuF4yIfl6gp4sotA==, @@ -19472,10 +19483,10 @@ packages: react: ">=16.13.1" dependencies: "@babel/runtime": 7.18.3 - react: 18.2.0 + react: 19.0.0-rc-cae764ce-20241025 dev: true - /react-hook-form@7.39.1(react@18.2.0): + /react-hook-form@7.39.1(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-MiF9PCILN5KulhSGbnjohMiTOrB47GerDTichMNP0y2cPUu1GTRFqbunOxCE9N1499YTLMV/ne4gFzqCp1rxrQ==, @@ -19484,7 +19495,7 @@ packages: peerDependencies: react: ^16.8.0 || ^17 || ^18 dependencies: - react: 18.2.0 + react: 19.0.0-rc-cae764ce-20241025 dev: false /react-is@16.13.1: @@ -19506,7 +19517,7 @@ packages: integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==, } - /react-reconciler@0.26.2(react@18.2.0): + /react-reconciler@0.26.2(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-nK6kgY28HwrMNwDnMui3dvm3rCFjZrcGiuwLc5COUipBK5hWHLOxMJhSnSomirqWwjPBJKV1QcbkI0VJr7Gl1Q==, @@ -19517,7 +19528,7 @@ packages: dependencies: loose-envify: 1.4.0 object-assign: 4.1.1 - react: 18.2.0 + react: 19.0.0-rc-cae764ce-20241025 scheduler: 0.20.2 dev: false @@ -19545,6 +19556,14 @@ packages: engines: {node: ">=0.10.0"} dependencies: loose-envify: 1.4.0 + dev: false + + /react@19.0.0-rc-cae764ce-20241025: + resolution: + { + integrity: sha512-5wV/3MJc6Ws4l4ZF95yaQKaMV8aWVlIBKOdPA4Kere7CfdJ0NMIuKt9j9v0U4ZTmCi4ubAdN+KL4gGdfTEIpuw==, + } + engines: {node: ">=0.10.0"} /read-pkg-up@7.0.1: resolution: @@ -20189,6 +20208,13 @@ packages: } dependencies: loose-envify: 1.4.0 + dev: false + + /scheduler@0.25.0-rc-cae764ce-20241025: + resolution: + { + integrity: sha512-kiDqIcp0nrZ8RW65wMujBEs7eDNfd49hcfjDmscxWIsnDTz9NRQrTAChv/tYRYCUNk7qPM36SQOja2HcRuee0A==, + } /schema-utils@3.3.0: resolution: @@ -21137,7 +21163,7 @@ packages: dependencies: acorn: 8.8.1 - /styled-jsx@5.1.6(@babel/core@7.12.10)(react@18.2.0): + /styled-jsx@5.1.6(@babel/core@7.12.10)(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==, @@ -21155,10 +21181,10 @@ packages: dependencies: "@babel/core": 7.12.10(supports-color@8.1.1) client-only: 0.0.1 - react: 18.2.0 + react: 19.0.0-rc-cae764ce-20241025 dev: false - /styled-jsx@5.1.6(@babel/core@7.18.2)(react@18.2.0): + /styled-jsx@5.1.6(@babel/core@7.18.2)(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==, @@ -21176,10 +21202,10 @@ packages: dependencies: "@babel/core": 7.18.2 client-only: 0.0.1 - react: 18.2.0 + react: 19.0.0-rc-cae764ce-20241025 dev: false - /styled-jsx@5.1.6(@babel/core@7.20.2)(react@18.2.0): + /styled-jsx@5.1.6(@babel/core@7.20.2)(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==, @@ -21196,8 +21222,28 @@ packages: optional: true dependencies: "@babel/core": 7.20.2(supports-color@8.1.1) + client-only: 0.0.1 + react: 19.0.0-rc-cae764ce-20241025 + + /styled-jsx@5.1.6(react@18.2.0): + resolution: + { + integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==, + } + engines: {node: ">= 12.0.0"} + peerDependencies: + "@babel/core": "*" + babel-plugin-macros: "*" + react: ">= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0" + peerDependenciesMeta: + "@babel/core": + optional: true + babel-plugin-macros: + optional: true + dependencies: client-only: 0.0.1 react: 18.2.0 + dev: false /subarg@1.0.0: resolution: @@ -22122,6 +22168,23 @@ packages: is-typedarray: 1.0.0 dev: true + /types-react-dom@19.0.0-rc.1: + resolution: + { + integrity: sha512-VSLZJl8VXCD0fAWp7DUTFUDCcZ8DVXOQmjhJMD03odgeFmu14ZQJHCXeETm3BEAhJqfgJaFkLnGkQv88sRx0fQ==, + } + dependencies: + "@types/react": /types-react@19.0.0-rc.1 + dev: true + + /types-react@19.0.0-rc.1: + resolution: + { + integrity: sha512-RshndUfqTW6K3STLPis8BtAYCGOkMbtvYsi90gmVNDZBXUyUc5juf2PE9LfS/JmOlUIRO8cWTS/1MTnmhjDqyQ==, + } + dependencies: + csstype: 3.1.0 + /typescript@4.8.4: resolution: { @@ -22393,7 +22456,7 @@ packages: querystring: 0.2.0 dev: false - /use-sync-external-store@1.2.0(react@18.2.0): + /use-sync-external-store@1.2.0(react@19.0.0-rc-cae764ce-20241025): resolution: { integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==, @@ -22401,7 +22464,7 @@ packages: peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 dependencies: - react: 18.2.0 + react: 19.0.0-rc-cae764ce-20241025 /use@3.1.1: resolution: From 668ed499644bc7aae7b39bdba8f88e19653a7e70 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 10:54:12 +0530 Subject: [PATCH 05/22] fix: add await to blitz rpc handler --- packages/blitz-rpc/src/index-server.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/blitz-rpc/src/index-server.ts b/packages/blitz-rpc/src/index-server.ts index ea818a5e4d..54dbff39ef 100644 --- a/packages/blitz-rpc/src/index-server.ts +++ b/packages/blitz-rpc/src/index-server.ts @@ -221,7 +221,7 @@ async function getResolverMap(): Promise { // Handles: // - Vite // { - // const {resolverFilesLoaded, viteProvider} = await loadTelefuncFilesWithVite(runContext) + // const {resolverFilesLoaded, viteProvider} = await loadTelefuncFilesWithVite(run // if (resolverFilesLoaded) { // assertUsage( // Object.keys(resolverFilesLoaded).length > 0, @@ -364,17 +364,18 @@ type Params = Record export function rpcAppHandler(config?: RpcConfig) { registerBlitzErrorClasses() - async function handleRpcRequest(req: Request, context: {params: Params}, ctx?: Ctx) { + async function handleRpcRequest(req: Request, segmentData: {params: Promise}, ctx?: Ctx) { + const params = await segmentData.params const session = ctx?.session const resolverMap = await getResolverMap() assert(resolverMap, "No query or mutation resolvers found") assert( - Array.isArray(context.params.blitz), + Array.isArray(params.blitz), "It seems your Blitz RPC endpoint file is not named [[...blitz]].(jt)s. Please ensure it is", ) - const relativeRoutePath = (context.params.blitz as string[])?.join("/") + const relativeRoutePath = (params.blitz as string[])?.join("/") const routePath = "/" + relativeRoutePath const resolverName = routePath.replace(/(\/api\/rpc)?\//, "") const rpcLogger = new RpcLogger(resolverName, config?.logging) @@ -413,14 +414,14 @@ export function rpcAppHandler(config?: RpcConfig) { json: req.method === "POST" ? body.params - : context.params.params - ? parse(`${context.params.params}`) + : params.params + ? parse(`${params.params}`) : undefined, meta: req.method === "POST" ? body.meta?.params - : context.params.meta - ? parse(`${context.params.meta}`) + : params.meta + ? parse(`${params.meta}`) : undefined, }) rpcLogger.timer.initResolver() From 5d4d4daa2db7bbcf5eb2b2dbfc28cdbbe11008f4 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 10:58:42 +0530 Subject: [PATCH 06/22] chore: upgrade to latest dynamic import --- packages/blitz-next/src/error-component.tsx | 14 ++++++++++---- packages/blitz-next/src/index-browser.tsx | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/packages/blitz-next/src/error-component.tsx b/packages/blitz-next/src/error-component.tsx index 1b7b10a387..aa29ea4485 100644 --- a/packages/blitz-next/src/error-component.tsx +++ b/packages/blitz-next/src/error-component.tsx @@ -1,10 +1,16 @@ import React from "react" import {NextPageContext} from "next" import dynamic from "next/dynamic" -const Head = dynamic(() => import("next/head").then((mod) => mod.default), { - ssr: false, - loading: () => null, -}) +const Head = dynamic( + () => + import("next/head").then((mod) => ({ + default: mod.default, + })), + { + ssr: false, + loading: () => null, + }, +) const statusCodes: {[code: number]: string} = { 400: "Bad Request", diff --git a/packages/blitz-next/src/index-browser.tsx b/packages/blitz-next/src/index-browser.tsx index e02a6391a0..c8cb5cd012 100644 --- a/packages/blitz-next/src/index-browser.tsx +++ b/packages/blitz-next/src/index-browser.tsx @@ -9,10 +9,16 @@ import type {Router} from "next/router" import {BlitzProvider} from "./provider" import dynamic from "next/dynamic" export {Routes} from ".blitz" -const Head = dynamic(() => import("next/head").then((mod) => mod.default), { - ssr: false, - loading: () => null, -}) +const Head = dynamic( + () => + import("next/head").then((mod) => ({ + default: mod.default, + })), + { + ssr: false, + loading: () => null, + }, +) export {BlitzProvider} from "./provider" From 714f293d69745c5ef5e930d936391f03d9f541a4 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 11:13:32 +0530 Subject: [PATCH 07/22] fix: remaining type fixes --- packages/blitz-auth/src/client/index.tsx | 2 +- packages/blitz-next/src/error-boundary.tsx | 14 ++++++++++---- packages/blitz-next/src/index-browser.tsx | 2 +- packages/blitz-next/src/provider.tsx | 2 +- .../blitz-rpc/src/query/react-query/provider.tsx | 2 +- packages/blitz/src/index-browser.tsx | 3 ++- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/packages/blitz-auth/src/client/index.tsx b/packages/blitz-auth/src/client/index.tsx index b96b00fc57..246d1aff43 100644 --- a/packages/blitz-auth/src/client/index.tsx +++ b/packages/blitz-auth/src/client/index.tsx @@ -260,7 +260,7 @@ export type RedirectAuthenticatedToFn = ( ) => RedirectAuthenticatedTo export type BlitzPage

= React.ComponentType

& { - getLayout?: (component: JSX.Element) => JSX.Element + getLayout?: (component: React.JSX.Element) => React.JSX.Element authenticate?: boolean | {redirectTo?: string | RouteUrlObject; role?: string | Array} suppressFirstRenderFlicker?: boolean redirectAuthenticatedTo?: RedirectAuthenticatedTo | RedirectAuthenticatedToFn diff --git a/packages/blitz-next/src/error-boundary.tsx b/packages/blitz-next/src/error-boundary.tsx index b0ed9636b4..e56dfd41b9 100644 --- a/packages/blitz-next/src/error-boundary.tsx +++ b/packages/blitz-next/src/error-boundary.tsx @@ -1,7 +1,7 @@ import {RedirectError} from "blitz" import {useRouter} from "next/compat/router" import type {NextRouter} from "next/router" -import * as React from "react" +import React from "react" import {RouterContext} from "./router-context" import _debug from "debug" import type {ExcludeRouterProps, WithRouterProps} from "next/dist/client/with-router" @@ -77,7 +77,7 @@ const initialState: ErrorBoundaryState = {error: null} function withRouter

( ComposedComponent: React.ComponentType

, ): React.ComponentType> { - function WithRouterWrapper(props: any): JSX.Element { + function WithRouterWrapper(props: any): React.JSX.Element { return } @@ -114,7 +114,13 @@ export const ErrorBoundary = withRouter( await this.props.router.push(error.url) return } - this.props.onError?.(error, info) + if (this.props.onError) { + let componentStack = info.componentStack + if (!componentStack) { + componentStack = new Error("Stack trace").stack || "" + } + this.props.onError(error, {componentStack}) + } } componentDidMount() { @@ -190,7 +196,7 @@ export const ErrorBoundary = withRouter( }, ) -function withErrorBoundary

( +function withErrorBoundary

( Component: React.ComponentType

, errorBoundaryProps: ErrorBoundaryProps, ): React.ComponentType

{ diff --git a/packages/blitz-next/src/index-browser.tsx b/packages/blitz-next/src/index-browser.tsx index c8cb5cd012..38ea4c3cf7 100644 --- a/packages/blitz-next/src/index-browser.tsx +++ b/packages/blitz-next/src/index-browser.tsx @@ -61,7 +61,7 @@ type RedirectAuthenticatedToFnCtx = { } type RedirectAuthenticatedToFn = (args: RedirectAuthenticatedToFnCtx) => RedirectAuthenticatedTo export type BlitzPage

= React.ComponentType

& { - getLayout?: (component: JSX.Element) => JSX.Element + getLayout?: (component: React.JSX.Element) => React.JSX.Element authenticate?: boolean | {redirectTo?: string | RouteUrlObject; role?: string | Array} suppressFirstRenderFlicker?: boolean redirectAuthenticatedTo?: RedirectAuthenticatedTo | RedirectAuthenticatedToFn diff --git a/packages/blitz-next/src/provider.tsx b/packages/blitz-next/src/provider.tsx index 02031c3695..ba414b3162 100644 --- a/packages/blitz-next/src/provider.tsx +++ b/packages/blitz-next/src/provider.tsx @@ -3,7 +3,7 @@ import type {QueryClient, HydrateOptions} from "@blitzjs/rpc" import React from "react" export type BlitzProviderProps = { - children: JSX.Element + children: React.JSX.Element client?: QueryClient contextSharing?: boolean dehydratedState?: unknown diff --git a/packages/blitz-rpc/src/query/react-query/provider.tsx b/packages/blitz-rpc/src/query/react-query/provider.tsx index 2d49b127d3..df0abc39e0 100644 --- a/packages/blitz-rpc/src/query/react-query/provider.tsx +++ b/packages/blitz-rpc/src/query/react-query/provider.tsx @@ -1,7 +1,7 @@ import {QueryClientProvider} from "@tanstack/react-query" import React from "react" -export type BlitzProviderType = ({children}: {children: React.ReactNode}) => JSX.Element +export type BlitzProviderType = ({children}: {children: React.ReactNode}) => React.JSX.Element const BlitzProvider: BlitzProviderType = ({children}) => { const [queryClient] = React.useState(globalThis.queryClient) diff --git a/packages/blitz/src/index-browser.tsx b/packages/blitz/src/index-browser.tsx index 776ac988b8..48d49db556 100644 --- a/packages/blitz/src/index-browser.tsx +++ b/packages/blitz/src/index-browser.tsx @@ -11,6 +11,7 @@ import { registerBlitzErrorClasses, } from "./errors" import type {EventHooks, MiddlewareHooks} from "./types" +import React from "react" export { AuthenticationError, AuthorizationError, @@ -26,7 +27,7 @@ export * from "./utils/enhance-prisma" export type BlitzProviderComponentType = ( component: ComponentType, ) => { - (props: TProps): JSX.Element + (props: TProps): React.JSX.Element displayName: string } From 1802227f700579385d55b22224109a7e10aef8a8 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 11:15:10 +0530 Subject: [PATCH 08/22] Create wild-news-shop.md --- .changeset/wild-news-shop.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .changeset/wild-news-shop.md diff --git a/.changeset/wild-news-shop.md b/.changeset/wild-news-shop.md new file mode 100644 index 0000000000..a25ca8d9f4 --- /dev/null +++ b/.changeset/wild-news-shop.md @@ -0,0 +1,8 @@ +--- +"@blitzjs/auth": minor +"@blitzjs/next": minor +"@blitzjs/rpc": minor +"blitz": minor +--- + +chore: support next.js 15 From b25ec48a6fbdc508b424d353bb025597fa73019b Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 11:24:30 +0530 Subject: [PATCH 09/22] fix: react types --- apps/next13/src/core/components/Form.tsx | 2 +- apps/next13/src/core/components/LabeledTextField.tsx | 5 +++-- apps/toolkit-app-passportjs/src/core/components/Form.tsx | 2 +- .../src/core/components/LabeledTextField.tsx | 5 +++-- apps/toolkit-app/next-env.d.ts | 2 +- apps/toolkit-app/src/core/components/Form.tsx | 2 +- apps/toolkit-app/src/core/components/LabelSelectField.tsx | 5 +++-- apps/toolkit-app/src/core/components/LabeledTextField.tsx | 5 +++-- packages/generator/templates/app/_forms/finalform/Form.tsx | 2 +- .../templates/app/_forms/finalform/LabelSelectField.tsx | 4 ++-- .../templates/app/_forms/finalform/LabeledTextField.tsx | 4 ++-- packages/generator/templates/app/_forms/formik/Form.tsx | 2 +- .../templates/app/_forms/formik/LabelSelectField.tsx | 4 ++-- .../templates/app/_forms/formik/LabeledTextField.tsx | 4 ++-- packages/generator/templates/app/_forms/hookform/Form.tsx | 2 +- .../templates/app/_forms/hookform/LabelSelectField.tsx | 4 ++-- .../templates/app/_forms/hookform/LabeledTextField.tsx | 4 ++-- packages/generator/templates/pages/_forms/finalform/Form.tsx | 2 +- .../templates/pages/_forms/finalform/LabelSelectField.tsx | 4 ++-- .../templates/pages/_forms/finalform/LabeledTextField.tsx | 4 ++-- packages/generator/templates/pages/_forms/formik/Form.tsx | 2 +- .../templates/pages/_forms/formik/LabelSelectField.tsx | 4 ++-- .../templates/pages/_forms/formik/LabeledTextField.tsx | 4 ++-- packages/generator/templates/pages/_forms/hookform/Form.tsx | 2 +- .../templates/pages/_forms/hookform/LabelSelectField.tsx | 4 ++-- .../templates/pages/_forms/hookform/LabeledTextField.tsx | 4 ++-- 26 files changed, 46 insertions(+), 42 deletions(-) diff --git a/apps/next13/src/core/components/Form.tsx b/apps/next13/src/core/components/Form.tsx index 049a6536cb..6be9309531 100644 --- a/apps/next13/src/core/components/Form.tsx +++ b/apps/next13/src/core/components/Form.tsx @@ -4,7 +4,7 @@ import {zodResolver} from "@hookform/resolvers/zod" import {z} from "zod" export interface FormProps> - extends Omit, "onSubmit"> { + extends Omit, "onSubmit"> { /** All your form fields */ children?: ReactNode /** Text to display in the submit button */ diff --git a/apps/next13/src/core/components/LabeledTextField.tsx b/apps/next13/src/core/components/LabeledTextField.tsx index 69b6697205..4943696bbc 100644 --- a/apps/next13/src/core/components/LabeledTextField.tsx +++ b/apps/next13/src/core/components/LabeledTextField.tsx @@ -2,14 +2,15 @@ import {forwardRef, PropsWithoutRef, ComponentPropsWithoutRef} from "react" import {useFormContext} from "react-hook-form" import {ErrorMessage} from "@hookform/error-message" -export interface LabeledTextFieldProps extends PropsWithoutRef { +export interface LabeledTextFieldProps + extends PropsWithoutRef { /** Field name. */ name: string /** Field label. */ label: string /** Field type. Doesn't include radio buttons and checkboxes */ type?: "text" | "password" | "email" | "number" - outerProps?: PropsWithoutRef + outerProps?: PropsWithoutRef labelProps?: ComponentPropsWithoutRef<"label"> } diff --git a/apps/toolkit-app-passportjs/src/core/components/Form.tsx b/apps/toolkit-app-passportjs/src/core/components/Form.tsx index 773c27072e..b3756a6a11 100644 --- a/apps/toolkit-app-passportjs/src/core/components/Form.tsx +++ b/apps/toolkit-app-passportjs/src/core/components/Form.tsx @@ -4,7 +4,7 @@ import { zodResolver } from "@hookform/resolvers/zod" import { z } from "zod" export interface FormProps> - extends Omit, "onSubmit"> { + extends Omit, "onSubmit"> { /** All your form fields */ children?: ReactNode /** Text to display in the submit button */ diff --git a/apps/toolkit-app-passportjs/src/core/components/LabeledTextField.tsx b/apps/toolkit-app-passportjs/src/core/components/LabeledTextField.tsx index 999c9aaf36..4f086fba58 100644 --- a/apps/toolkit-app-passportjs/src/core/components/LabeledTextField.tsx +++ b/apps/toolkit-app-passportjs/src/core/components/LabeledTextField.tsx @@ -2,14 +2,15 @@ import { forwardRef, PropsWithoutRef, ComponentPropsWithoutRef } from "react" import { useFormContext } from "react-hook-form" import { ErrorMessage } from "@hookform/error-message" -export interface LabeledTextFieldProps extends PropsWithoutRef { +export interface LabeledTextFieldProps + extends PropsWithoutRef { /** Field name. */ name: string /** Field label. */ label: string /** Field type. Doesn't include radio buttons and checkboxes */ type?: "text" | "password" | "email" | "number" - outerProps?: PropsWithoutRef + outerProps?: PropsWithoutRef labelProps?: ComponentPropsWithoutRef<"label"> } diff --git a/apps/toolkit-app/next-env.d.ts b/apps/toolkit-app/next-env.d.ts index 4f11a03dc6..a4a7b3f5cf 100644 --- a/apps/toolkit-app/next-env.d.ts +++ b/apps/toolkit-app/next-env.d.ts @@ -2,4 +2,4 @@ /// // NOTE: This file should not be edited -// see https://nextjs.org/docs/basic-features/typescript for more information. +// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information. diff --git a/apps/toolkit-app/src/core/components/Form.tsx b/apps/toolkit-app/src/core/components/Form.tsx index 773c27072e..b3756a6a11 100644 --- a/apps/toolkit-app/src/core/components/Form.tsx +++ b/apps/toolkit-app/src/core/components/Form.tsx @@ -4,7 +4,7 @@ import { zodResolver } from "@hookform/resolvers/zod" import { z } from "zod" export interface FormProps> - extends Omit, "onSubmit"> { + extends Omit, "onSubmit"> { /** All your form fields */ children?: ReactNode /** Text to display in the submit button */ diff --git a/apps/toolkit-app/src/core/components/LabelSelectField.tsx b/apps/toolkit-app/src/core/components/LabelSelectField.tsx index 8b38a02ab2..32d5258271 100644 --- a/apps/toolkit-app/src/core/components/LabelSelectField.tsx +++ b/apps/toolkit-app/src/core/components/LabelSelectField.tsx @@ -2,14 +2,15 @@ import { ComponentPropsWithoutRef, forwardRef, PropsWithoutRef } from "react" import { useFormContext } from "react-hook-form" import { ErrorMessage } from "@hookform/error-message" -export interface LabeledSelectFieldProps extends PropsWithoutRef { +export interface LabeledSelectFieldProps + extends PropsWithoutRef { /** Field name. */ name: string /** Field label. */ label: string /** Field type. Doesn't include radio buttons and checkboxes */ options: any[] - outerProps?: PropsWithoutRef + outerProps?: PropsWithoutRef labelProps?: ComponentPropsWithoutRef<"label"> } diff --git a/apps/toolkit-app/src/core/components/LabeledTextField.tsx b/apps/toolkit-app/src/core/components/LabeledTextField.tsx index 999c9aaf36..4f086fba58 100644 --- a/apps/toolkit-app/src/core/components/LabeledTextField.tsx +++ b/apps/toolkit-app/src/core/components/LabeledTextField.tsx @@ -2,14 +2,15 @@ import { forwardRef, PropsWithoutRef, ComponentPropsWithoutRef } from "react" import { useFormContext } from "react-hook-form" import { ErrorMessage } from "@hookform/error-message" -export interface LabeledTextFieldProps extends PropsWithoutRef { +export interface LabeledTextFieldProps + extends PropsWithoutRef { /** Field name. */ name: string /** Field label. */ label: string /** Field type. Doesn't include radio buttons and checkboxes */ type?: "text" | "password" | "email" | "number" - outerProps?: PropsWithoutRef + outerProps?: PropsWithoutRef labelProps?: ComponentPropsWithoutRef<"label"> } diff --git a/packages/generator/templates/app/_forms/finalform/Form.tsx b/packages/generator/templates/app/_forms/finalform/Form.tsx index eb45dc3b9f..c431da9ad4 100644 --- a/packages/generator/templates/app/_forms/finalform/Form.tsx +++ b/packages/generator/templates/app/_forms/finalform/Form.tsx @@ -5,7 +5,7 @@ import { validateZodSchema } from "blitz" export { FORM_ERROR } from "final-form" export interface FormProps> - extends Omit, "onSubmit"> { + extends Omit, "onSubmit"> { /** All your form fields */ children?: ReactNode /** Text to display in the submit button */ diff --git a/packages/generator/templates/app/_forms/finalform/LabelSelectField.tsx b/packages/generator/templates/app/_forms/finalform/LabelSelectField.tsx index a37899e6f1..3aadf7a0a5 100644 --- a/packages/generator/templates/app/_forms/finalform/LabelSelectField.tsx +++ b/packages/generator/templates/app/_forms/finalform/LabelSelectField.tsx @@ -1,14 +1,14 @@ import { forwardRef, PropsWithoutRef } from "react" import { useField } from "react-final-form" -export interface LabeledSelectFieldProps extends PropsWithoutRef { +export interface LabeledSelectFieldProps extends PropsWithoutRef { /** Field name. */ name: string /** Field label. */ label: string type?: "number" | "string" options: any - outerProps?: PropsWithoutRef + outerProps?: PropsWithoutRef } export const LabeledSelectField = forwardRef( diff --git a/packages/generator/templates/app/_forms/finalform/LabeledTextField.tsx b/packages/generator/templates/app/_forms/finalform/LabeledTextField.tsx index cc515f2f5a..c5b9683ef2 100644 --- a/packages/generator/templates/app/_forms/finalform/LabeledTextField.tsx +++ b/packages/generator/templates/app/_forms/finalform/LabeledTextField.tsx @@ -1,14 +1,14 @@ import { forwardRef, ComponentPropsWithoutRef, PropsWithoutRef } from "react" import { useField, UseFieldConfig } from "react-final-form" -export interface LabeledTextFieldProps extends PropsWithoutRef { +export interface LabeledTextFieldProps extends PropsWithoutRef { /** Field name. */ name: string /** Field label. */ label: string /** Field type. Doesn't include radio buttons and checkboxes */ type?: "text" | "password" | "email" | "number" - outerProps?: PropsWithoutRef + outerProps?: PropsWithoutRef labelProps?: ComponentPropsWithoutRef<"label"> fieldProps?: UseFieldConfig } diff --git a/packages/generator/templates/app/_forms/formik/Form.tsx b/packages/generator/templates/app/_forms/formik/Form.tsx index cc69db1c3b..af92ae14a7 100644 --- a/packages/generator/templates/app/_forms/formik/Form.tsx +++ b/packages/generator/templates/app/_forms/formik/Form.tsx @@ -4,7 +4,7 @@ import { validateZodSchema } from "blitz" import { z } from "zod" export interface FormProps> - extends Omit, "onSubmit"> { + extends Omit, "onSubmit"> { /** All your form fields */ children?: ReactNode /** Text to display in the submit button */ diff --git a/packages/generator/templates/app/_forms/formik/LabelSelectField.tsx b/packages/generator/templates/app/_forms/formik/LabelSelectField.tsx index 3f98240401..575f260e97 100644 --- a/packages/generator/templates/app/_forms/formik/LabelSelectField.tsx +++ b/packages/generator/templates/app/_forms/formik/LabelSelectField.tsx @@ -2,14 +2,14 @@ import { forwardRef, PropsWithoutRef } from "react"; import { useFormikContext, ErrorMessage, Field } from "formik"; export interface LabeledSelectFieldProps - extends PropsWithoutRef { + extends PropsWithoutRef { /** Field name. */ name: string; /** Field label. */ label: string; /** Field options. */ options: any; - outerProps?: PropsWithoutRef; + outerProps?: PropsWithoutRef; } export const LabeledSelectField = forwardRef< diff --git a/packages/generator/templates/app/_forms/formik/LabeledTextField.tsx b/packages/generator/templates/app/_forms/formik/LabeledTextField.tsx index dcee271ec5..6ba995f491 100644 --- a/packages/generator/templates/app/_forms/formik/LabeledTextField.tsx +++ b/packages/generator/templates/app/_forms/formik/LabeledTextField.tsx @@ -1,14 +1,14 @@ import { forwardRef, PropsWithoutRef } from "react" import { useField, useFormikContext, ErrorMessage } from "formik" -export interface LabeledTextFieldProps extends PropsWithoutRef { +export interface LabeledTextFieldProps extends PropsWithoutRef { /** Field name. */ name: string /** Field label. */ label: string /** Field type. Doesn't include radio buttons and checkboxes */ type?: "text" | "password" | "email" | "number" - outerProps?: PropsWithoutRef + outerProps?: PropsWithoutRef } export const LabeledTextField = forwardRef( diff --git a/packages/generator/templates/app/_forms/hookform/Form.tsx b/packages/generator/templates/app/_forms/hookform/Form.tsx index 773c27072e..b3756a6a11 100644 --- a/packages/generator/templates/app/_forms/hookform/Form.tsx +++ b/packages/generator/templates/app/_forms/hookform/Form.tsx @@ -4,7 +4,7 @@ import { zodResolver } from "@hookform/resolvers/zod" import { z } from "zod" export interface FormProps> - extends Omit, "onSubmit"> { + extends Omit, "onSubmit"> { /** All your form fields */ children?: ReactNode /** Text to display in the submit button */ diff --git a/packages/generator/templates/app/_forms/hookform/LabelSelectField.tsx b/packages/generator/templates/app/_forms/hookform/LabelSelectField.tsx index 5e8f860d8d..4f3f16573a 100644 --- a/packages/generator/templates/app/_forms/hookform/LabelSelectField.tsx +++ b/packages/generator/templates/app/_forms/hookform/LabelSelectField.tsx @@ -2,14 +2,14 @@ import { ComponentPropsWithoutRef, forwardRef, PropsWithoutRef } from "react" import { useFormContext } from "react-hook-form" import { ErrorMessage } from "@hookform/error-message" -export interface LabeledSelectFieldProps extends PropsWithoutRef { +export interface LabeledSelectFieldProps extends PropsWithoutRef { /** Field name. */ name: string /** Field label. */ label: string /** Field type. Doesn't include radio buttons and checkboxes */ options: any[] - outerProps?: PropsWithoutRef + outerProps?: PropsWithoutRef labelProps?: ComponentPropsWithoutRef<"label"> } diff --git a/packages/generator/templates/app/_forms/hookform/LabeledTextField.tsx b/packages/generator/templates/app/_forms/hookform/LabeledTextField.tsx index 219e5f89c2..e228285d75 100644 --- a/packages/generator/templates/app/_forms/hookform/LabeledTextField.tsx +++ b/packages/generator/templates/app/_forms/hookform/LabeledTextField.tsx @@ -2,14 +2,14 @@ import { forwardRef, PropsWithoutRef, ComponentPropsWithoutRef } from "react" import { useFormContext } from "react-hook-form" import { ErrorMessage } from "@hookform/error-message" -export interface LabeledTextFieldProps extends PropsWithoutRef { +export interface LabeledTextFieldProps extends PropsWithoutRef { /** Field name. */ name: string /** Field label. */ label: string /** Field type. Doesn't include radio buttons and checkboxes */ type?: "text" | "password" | "email" | "number" - outerProps?: PropsWithoutRef + outerProps?: PropsWithoutRef labelProps?: ComponentPropsWithoutRef<"label"> } diff --git a/packages/generator/templates/pages/_forms/finalform/Form.tsx b/packages/generator/templates/pages/_forms/finalform/Form.tsx index eb45dc3b9f..c431da9ad4 100644 --- a/packages/generator/templates/pages/_forms/finalform/Form.tsx +++ b/packages/generator/templates/pages/_forms/finalform/Form.tsx @@ -5,7 +5,7 @@ import { validateZodSchema } from "blitz" export { FORM_ERROR } from "final-form" export interface FormProps> - extends Omit, "onSubmit"> { + extends Omit, "onSubmit"> { /** All your form fields */ children?: ReactNode /** Text to display in the submit button */ diff --git a/packages/generator/templates/pages/_forms/finalform/LabelSelectField.tsx b/packages/generator/templates/pages/_forms/finalform/LabelSelectField.tsx index 3bf2ceea42..415ffc5a0d 100644 --- a/packages/generator/templates/pages/_forms/finalform/LabelSelectField.tsx +++ b/packages/generator/templates/pages/_forms/finalform/LabelSelectField.tsx @@ -1,14 +1,14 @@ import { forwardRef, PropsWithoutRef } from "react" import { useField } from "react-final-form" -export interface LabeledSelectFieldProps extends PropsWithoutRef { +export interface LabeledSelectFieldProps extends PropsWithoutRef { /** Field name. */ name: string /** Field label. */ label: string type?: "number" | "string" options: any - outerProps?: PropsWithoutRef + outerProps?: PropsWithoutRef } export const LabeledSelectField = forwardRef( diff --git a/packages/generator/templates/pages/_forms/finalform/LabeledTextField.tsx b/packages/generator/templates/pages/_forms/finalform/LabeledTextField.tsx index 7dc98b89c9..b5e918369c 100644 --- a/packages/generator/templates/pages/_forms/finalform/LabeledTextField.tsx +++ b/packages/generator/templates/pages/_forms/finalform/LabeledTextField.tsx @@ -1,14 +1,14 @@ import { forwardRef, ComponentPropsWithoutRef, PropsWithoutRef } from "react" import { useField, UseFieldConfig } from "react-final-form" -export interface LabeledTextFieldProps extends PropsWithoutRef { +export interface LabeledTextFieldProps extends PropsWithoutRef { /** Field name. */ name: string /** Field label. */ label: string /** Field type. Doesn't include radio buttons and checkboxes */ type?: "text" | "password" | "email" | "number" - outerProps?: PropsWithoutRef + outerProps?: PropsWithoutRef labelProps?: ComponentPropsWithoutRef<"label"> fieldProps?: UseFieldConfig } diff --git a/packages/generator/templates/pages/_forms/formik/Form.tsx b/packages/generator/templates/pages/_forms/formik/Form.tsx index cc69db1c3b..af92ae14a7 100644 --- a/packages/generator/templates/pages/_forms/formik/Form.tsx +++ b/packages/generator/templates/pages/_forms/formik/Form.tsx @@ -4,7 +4,7 @@ import { validateZodSchema } from "blitz" import { z } from "zod" export interface FormProps> - extends Omit, "onSubmit"> { + extends Omit, "onSubmit"> { /** All your form fields */ children?: ReactNode /** Text to display in the submit button */ diff --git a/packages/generator/templates/pages/_forms/formik/LabelSelectField.tsx b/packages/generator/templates/pages/_forms/formik/LabelSelectField.tsx index dc670de76f..76ce25d035 100644 --- a/packages/generator/templates/pages/_forms/formik/LabelSelectField.tsx +++ b/packages/generator/templates/pages/_forms/formik/LabelSelectField.tsx @@ -2,14 +2,14 @@ import { forwardRef, PropsWithoutRef } from "react"; import { useFormikContext, ErrorMessage, Field } from "formik"; export interface LabeledSelectFieldProps - extends PropsWithoutRef { + extends PropsWithoutRef { /** Field name. */ name: string; /** Field label. */ label: string; /** Field options. */ options: any; - outerProps?: PropsWithoutRef; + outerProps?: PropsWithoutRef; } export const LabeledSelectField = forwardRef< diff --git a/packages/generator/templates/pages/_forms/formik/LabeledTextField.tsx b/packages/generator/templates/pages/_forms/formik/LabeledTextField.tsx index b43dce98b9..d6816e5056 100644 --- a/packages/generator/templates/pages/_forms/formik/LabeledTextField.tsx +++ b/packages/generator/templates/pages/_forms/formik/LabeledTextField.tsx @@ -1,14 +1,14 @@ import { forwardRef, PropsWithoutRef } from "react" import { useField, useFormikContext, ErrorMessage } from "formik" -export interface LabeledTextFieldProps extends PropsWithoutRef { +export interface LabeledTextFieldProps extends PropsWithoutRef { /** Field name. */ name: string /** Field label. */ label: string /** Field type. Doesn't include radio buttons and checkboxes */ type?: "text" | "password" | "email" | "number" - outerProps?: PropsWithoutRef + outerProps?: PropsWithoutRef } export const LabeledTextField = forwardRef( diff --git a/packages/generator/templates/pages/_forms/hookform/Form.tsx b/packages/generator/templates/pages/_forms/hookform/Form.tsx index 773c27072e..b3756a6a11 100644 --- a/packages/generator/templates/pages/_forms/hookform/Form.tsx +++ b/packages/generator/templates/pages/_forms/hookform/Form.tsx @@ -4,7 +4,7 @@ import { zodResolver } from "@hookform/resolvers/zod" import { z } from "zod" export interface FormProps> - extends Omit, "onSubmit"> { + extends Omit, "onSubmit"> { /** All your form fields */ children?: ReactNode /** Text to display in the submit button */ diff --git a/packages/generator/templates/pages/_forms/hookform/LabelSelectField.tsx b/packages/generator/templates/pages/_forms/hookform/LabelSelectField.tsx index a78d8c2927..8915a2bd1c 100644 --- a/packages/generator/templates/pages/_forms/hookform/LabelSelectField.tsx +++ b/packages/generator/templates/pages/_forms/hookform/LabelSelectField.tsx @@ -2,14 +2,14 @@ import { ComponentPropsWithoutRef, forwardRef, PropsWithoutRef } from "react" import { useFormContext } from "react-hook-form" import { ErrorMessage } from "@hookform/error-message" -export interface LabeledSelectFieldProps extends PropsWithoutRef { +export interface LabeledSelectFieldProps extends PropsWithoutRef { /** Field name. */ name: string /** Field label. */ label: string /** Field type. Doesn't include radio buttons and checkboxes */ options: any[] - outerProps?: PropsWithoutRef + outerProps?: PropsWithoutRef labelProps?: ComponentPropsWithoutRef<"label"> } diff --git a/packages/generator/templates/pages/_forms/hookform/LabeledTextField.tsx b/packages/generator/templates/pages/_forms/hookform/LabeledTextField.tsx index 999c9aaf36..04160c25e1 100644 --- a/packages/generator/templates/pages/_forms/hookform/LabeledTextField.tsx +++ b/packages/generator/templates/pages/_forms/hookform/LabeledTextField.tsx @@ -2,14 +2,14 @@ import { forwardRef, PropsWithoutRef, ComponentPropsWithoutRef } from "react" import { useFormContext } from "react-hook-form" import { ErrorMessage } from "@hookform/error-message" -export interface LabeledTextFieldProps extends PropsWithoutRef { +export interface LabeledTextFieldProps extends PropsWithoutRef { /** Field name. */ name: string /** Field label. */ label: string /** Field type. Doesn't include radio buttons and checkboxes */ type?: "text" | "password" | "email" | "number" - outerProps?: PropsWithoutRef + outerProps?: PropsWithoutRef labelProps?: ComponentPropsWithoutRef<"label"> } From 362893835f2fa1e18b49f7bf49acca721207b790 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 11:31:52 +0530 Subject: [PATCH 10/22] upgrade testing library --- apps/toolkit-app-passportjs/package.json | 2 +- apps/toolkit-app/package.json | 2 +- integration-tests/auth-with-rpc/package.json | 2 +- integration-tests/qm/package.json | 2 +- integration-tests/utils/package.json | 2 +- packages/blitz-auth/package.json | 2 +- packages/blitz-next/package.json | 2 +- packages/generator/templates/app/package.ts.json | 2 +- packages/generator/templates/pages/package.js.json | 2 +- packages/generator/templates/pages/package.ts.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/toolkit-app-passportjs/package.json b/apps/toolkit-app-passportjs/package.json index c721343f12..97ef01b250 100644 --- a/apps/toolkit-app-passportjs/package.json +++ b/apps/toolkit-app-passportjs/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@next/bundle-analyzer": "12.0.8", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@testing-library/react-hooks": "8.0.1", "@types/jest": "29.2.2", "@types/node": "18.11.9", diff --git a/apps/toolkit-app/package.json b/apps/toolkit-app/package.json index 3adc6d2263..e1d133075c 100644 --- a/apps/toolkit-app/package.json +++ b/apps/toolkit-app/package.json @@ -44,7 +44,7 @@ "devDependencies": { "@next/bundle-analyzer": "12.0.8", "@testing-library/jest-dom": "5.16.5", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", diff --git a/integration-tests/auth-with-rpc/package.json b/integration-tests/auth-with-rpc/package.json index ffd97b88e0..04c0c7825e 100644 --- a/integration-tests/auth-with-rpc/package.json +++ b/integration-tests/auth-with-rpc/package.json @@ -37,7 +37,7 @@ "devDependencies": { "@next/bundle-analyzer": "12.0.8", "@testing-library/jest-dom": "5.16.5", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", diff --git a/integration-tests/qm/package.json b/integration-tests/qm/package.json index e487baa852..f3a0c74b20 100644 --- a/integration-tests/qm/package.json +++ b/integration-tests/qm/package.json @@ -21,7 +21,7 @@ "react-dom": "rc" }, "devDependencies": { - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@types/react": "npm:types-react@rc", "@vitejs/plugin-react": "1.3.0", "delay": "5.0.0", diff --git a/integration-tests/utils/package.json b/integration-tests/utils/package.json index f9cd071c85..9c6ff32fd1 100644 --- a/integration-tests/utils/package.json +++ b/integration-tests/utils/package.json @@ -7,7 +7,7 @@ "@blitzjs/next": "workspace:2.1.3", "@blitzjs/rpc": "workspace:2.1.3", "@tanstack/react-query": "4.13.0", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", diff --git a/packages/blitz-auth/package.json b/packages/blitz-auth/package.json index 29516ebf17..8a5635d8d8 100644 --- a/packages/blitz-auth/package.json +++ b/packages/blitz-auth/package.json @@ -68,7 +68,7 @@ }, "devDependencies": { "@blitzjs/config": "2.1.3", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@testing-library/react-hooks": "8.0.1", "@types/cookie": "0.4.1", "@types/debug": "4.1.7", diff --git a/packages/blitz-next/package.json b/packages/blitz-next/package.json index 7b77a581ec..92bfba24cb 100644 --- a/packages/blitz-next/package.json +++ b/packages/blitz-next/package.json @@ -48,7 +48,7 @@ "@blitzjs/config": "2.1.3", "@testing-library/dom": "8.13.0", "@testing-library/jest-dom": "5.16.3", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@testing-library/react-hooks": "8.0.1", "@testing-library/user-event": "13.5.0", "@types/debug": "4.1.7", diff --git a/packages/generator/templates/app/package.ts.json b/packages/generator/templates/app/package.ts.json index 2c087f5a08..968fe92d4b 100644 --- a/packages/generator/templates/app/package.ts.json +++ b/packages/generator/templates/app/package.ts.json @@ -41,7 +41,7 @@ "devDependencies": { "@next/env": "13.4.19", "@testing-library/jest-dom": "5.16.5", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", diff --git a/packages/generator/templates/pages/package.js.json b/packages/generator/templates/pages/package.js.json index 36f51effdc..99eefd3dce 100644 --- a/packages/generator/templates/pages/package.js.json +++ b/packages/generator/templates/pages/package.js.json @@ -37,7 +37,7 @@ "devDependencies": { "@next/bundle-analyzer": "12.0.8", "@testing-library/jest-dom": "5.16.5", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", diff --git a/packages/generator/templates/pages/package.ts.json b/packages/generator/templates/pages/package.ts.json index 7b50171e0b..c8c22b2bbe 100644 --- a/packages/generator/templates/pages/package.ts.json +++ b/packages/generator/templates/pages/package.ts.json @@ -38,7 +38,7 @@ "@next/bundle-analyzer": "12.0.8", "@next/env": "13.4.19", "@testing-library/jest-dom": "5.16.5", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", From 170af30c93946d9a73436461339ce68beff1a059 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 13:00:20 +0530 Subject: [PATCH 11/22] fix turbopack exports --- .../next-13-app-dir/next-env.d.ts | 2 +- .../blitz-next/scripts/turbopack-empty.js | 7 +- pnpm-lock.yaml | 103 +++++++++++++++--- 3 files changed, 92 insertions(+), 20 deletions(-) diff --git a/integration-tests/next-13-app-dir/next-env.d.ts b/integration-tests/next-13-app-dir/next-env.d.ts index 4f11a03dc6..40c3d68096 100644 --- a/integration-tests/next-13-app-dir/next-env.d.ts +++ b/integration-tests/next-13-app-dir/next-env.d.ts @@ -2,4 +2,4 @@ /// // NOTE: This file should not be edited -// see https://nextjs.org/docs/basic-features/typescript for more information. +// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information. diff --git a/packages/blitz-next/scripts/turbopack-empty.js b/packages/blitz-next/scripts/turbopack-empty.js index 336ce12bb9..64aa464c9f 100644 --- a/packages/blitz-next/scripts/turbopack-empty.js +++ b/packages/blitz-next/scripts/turbopack-empty.js @@ -1 +1,6 @@ -export {} +const exports = { + "npm-which": {}, + "cross-spawn": {}, +} + +module.exports = exports diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d89a8186ca..9baca5845f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -192,8 +192,8 @@ importers: specifier: 5.16.5 version: 5.16.5 "@testing-library/react": - specifier: 13.4.0 - version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + specifier: 16.0.1 + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@testing-library/react-hooks": specifier: 8.0.1 version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) @@ -307,8 +307,8 @@ importers: specifier: 12.0.8 version: 12.0.8 "@testing-library/react": - specifier: 13.4.0 - version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + specifier: 16.0.1 + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@testing-library/react-hooks": specifier: 8.0.1 version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) @@ -571,8 +571,8 @@ importers: specifier: 5.16.5 version: 5.16.5 "@testing-library/react": - specifier: 13.4.0 - version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + specifier: 16.0.1 + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@testing-library/react-hooks": specifier: 8.0.1 version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) @@ -951,8 +951,8 @@ importers: version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) devDependencies: "@testing-library/react": - specifier: 13.4.0 - version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + specifier: 16.0.1 + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@types/react": specifier: npm:types-react@rc version: /types-react@19.0.0-rc.1 @@ -1228,8 +1228,8 @@ importers: specifier: 4.13.0 version: 4.13.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) "@testing-library/react": - specifier: 13.4.0 - version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + specifier: 16.0.1 + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@types/express": specifier: 4.17.13 version: 4.17.13 @@ -1596,8 +1596,8 @@ importers: specifier: 2.1.3 version: link:../config "@testing-library/react": - specifier: 13.4.0 - version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + specifier: 16.0.1 + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@testing-library/react-hooks": specifier: 8.0.1 version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) @@ -1681,8 +1681,8 @@ importers: specifier: 5.16.3 version: 5.16.3 "@testing-library/react": - specifier: 13.4.0 - version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + specifier: 16.0.1 + version: 16.0.1(@testing-library/dom@8.13.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@testing-library/react-hooks": specifier: 8.0.1 version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) @@ -6452,6 +6452,23 @@ packages: } dev: true + /@testing-library/dom@10.4.0: + resolution: + { + integrity: sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==, + } + engines: {node: ">=18"} + dependencies: + "@babel/code-frame": 7.18.6 + "@babel/runtime": 7.23.2 + "@types/aria-query": 5.0.4 + aria-query: 5.3.0 + chalk: 4.1.2 + dom-accessibility-api: 0.5.14 + lz-string: 1.5.0 + pretty-format: 27.5.1 + dev: true + /@testing-library/dom@8.13.0: resolution: { @@ -6531,18 +6548,53 @@ packages: react-error-boundary: 3.1.4(react@19.0.0-rc-cae764ce-20241025) dev: true - /@testing-library/react@13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): + /@testing-library/react@16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1): resolution: { - integrity: sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw==, + integrity: sha512-dSmwJVtJXmku+iocRhWOUFbrERC76TX2Mnf0ATODz8brzAZrMBbzLwQixlBSanZxR6LddK3eiwpSFZgDET1URg==, } - engines: {node: ">=12"} + engines: {node: ">=18"} peerDependencies: + "@testing-library/dom": ^10.0.0 + "@types/react": npm:types-react@rc + "@types/react-dom": npm:types-react-dom@rc react: ^18.0.0 react-dom: ^18.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + "@types/react-dom": + optional: true dependencies: - "@babel/runtime": 7.18.3 + "@babel/runtime": 7.23.2 + "@testing-library/dom": 10.4.0 + "@types/react": /types-react@19.0.0-rc.1 + "@types/react-dom": /types-react-dom@19.0.0-rc.1 + react: 19.0.0-rc-cae764ce-20241025 + react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + dev: true + + /@testing-library/react@16.0.1(@testing-library/dom@8.13.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1): + resolution: + { + integrity: sha512-dSmwJVtJXmku+iocRhWOUFbrERC76TX2Mnf0ATODz8brzAZrMBbzLwQixlBSanZxR6LddK3eiwpSFZgDET1URg==, + } + engines: {node: ">=18"} + peerDependencies: + "@testing-library/dom": ^10.0.0 + "@types/react": npm:types-react@rc + "@types/react-dom": npm:types-react-dom@rc + react: ^18.0.0 + react-dom: ^18.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + "@types/react-dom": + optional: true + dependencies: + "@babel/runtime": 7.23.2 "@testing-library/dom": 8.13.0 + "@types/react": /types-react@19.0.0-rc.1 "@types/react-dom": /types-react-dom@19.0.0-rc.1 react: 19.0.0-rc-cae764ce-20241025 react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) @@ -6607,6 +6659,13 @@ packages: } dev: true + /@types/aria-query@5.0.4: + resolution: + { + integrity: sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==, + } + dev: true + /@types/b64-lite@1.3.0: resolution: { @@ -16870,6 +16929,14 @@ packages: hasBin: true dev: true + /lz-string@1.5.0: + resolution: + { + integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==, + } + hasBin: true + dev: true + /macos-release@3.1.0: resolution: { From dfb5d6b3607f5fbf6dd73d0c864f45c7a78a5733 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 13:02:18 +0530 Subject: [PATCH 12/22] fix --- packages/blitz-next/scripts/turbopack-empty.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/blitz-next/scripts/turbopack-empty.js b/packages/blitz-next/scripts/turbopack-empty.js index 64aa464c9f..19140d433e 100644 --- a/packages/blitz-next/scripts/turbopack-empty.js +++ b/packages/blitz-next/scripts/turbopack-empty.js @@ -1,6 +1,8 @@ const exports = { "npm-which": {}, "cross-spawn": {}, + fs: {}, + child_process: {}, } module.exports = exports From 9219ec7ccc28514bb44a11e3ce8e10e836966ad2 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 13:05:41 +0530 Subject: [PATCH 13/22] chore: remove outdated `@testing-library/react-hooks` --- apps/toolkit-app-passportjs/package.json | 1 - apps/toolkit-app/package.json | 1 - integration-tests/auth-with-rpc/package.json | 1 - packages/blitz-auth/package.json | 1 - .../blitz-auth/src/client/auth-client.test.ts | 2 +- packages/blitz-next/package.json | 1 - packages/blitz-next/src/use-params.test.tsx | 2 +- packages/generator/templates/app/package.ts.json | 1 - .../generator/templates/pages/package.js.json | 1 - .../generator/templates/pages/package.ts.json | 1 - packages/generator/templates/pages/test/utils.tsx | 2 +- pnpm-lock.yaml | 15 --------------- 12 files changed, 3 insertions(+), 26 deletions(-) diff --git a/apps/toolkit-app-passportjs/package.json b/apps/toolkit-app-passportjs/package.json index 97ef01b250..f02f7c8d39 100644 --- a/apps/toolkit-app-passportjs/package.json +++ b/apps/toolkit-app-passportjs/package.json @@ -43,7 +43,6 @@ "devDependencies": { "@next/bundle-analyzer": "12.0.8", "@testing-library/react": "16.0.1", - "@testing-library/react-hooks": "8.0.1", "@types/jest": "29.2.2", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", diff --git a/apps/toolkit-app/package.json b/apps/toolkit-app/package.json index e1d133075c..80e298945b 100644 --- a/apps/toolkit-app/package.json +++ b/apps/toolkit-app/package.json @@ -45,7 +45,6 @@ "@next/bundle-analyzer": "12.0.8", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "16.0.1", - "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", "@types/react": "npm:types-react@rc", diff --git a/integration-tests/auth-with-rpc/package.json b/integration-tests/auth-with-rpc/package.json index 04c0c7825e..09a76e60fa 100644 --- a/integration-tests/auth-with-rpc/package.json +++ b/integration-tests/auth-with-rpc/package.json @@ -38,7 +38,6 @@ "@next/bundle-analyzer": "12.0.8", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "16.0.1", - "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", "@types/react": "npm:types-react@rc", diff --git a/packages/blitz-auth/package.json b/packages/blitz-auth/package.json index 8a5635d8d8..b6e8d98cac 100644 --- a/packages/blitz-auth/package.json +++ b/packages/blitz-auth/package.json @@ -69,7 +69,6 @@ "devDependencies": { "@blitzjs/config": "2.1.3", "@testing-library/react": "16.0.1", - "@testing-library/react-hooks": "8.0.1", "@types/cookie": "0.4.1", "@types/debug": "4.1.7", "@types/jsonwebtoken": "8.5.8", diff --git a/packages/blitz-auth/src/client/auth-client.test.ts b/packages/blitz-auth/src/client/auth-client.test.ts index 35c5264155..eab2adac22 100644 --- a/packages/blitz-auth/src/client/auth-client.test.ts +++ b/packages/blitz-auth/src/client/auth-client.test.ts @@ -7,7 +7,7 @@ import {parsePublicDataToken, getPublicDataStore, useSession} from "./index" import {COOKIE_PUBLIC_DATA_TOKEN} from "../shared" import {toBase64} from "b64-lite" import {act} from "@testing-library/react" -import {renderHook} from "@testing-library/react-hooks" +import {renderHook} from "@testing-library/react" vi.mock("blitz", async () => { const blitz = await vi.importActual("blitz") diff --git a/packages/blitz-next/package.json b/packages/blitz-next/package.json index 92bfba24cb..571eacbea6 100644 --- a/packages/blitz-next/package.json +++ b/packages/blitz-next/package.json @@ -49,7 +49,6 @@ "@testing-library/dom": "8.13.0", "@testing-library/jest-dom": "5.16.3", "@testing-library/react": "16.0.1", - "@testing-library/react-hooks": "8.0.1", "@testing-library/user-event": "13.5.0", "@types/debug": "4.1.7", "@types/node": "18.11.9", diff --git a/packages/blitz-next/src/use-params.test.tsx b/packages/blitz-next/src/use-params.test.tsx index 4adbf3a1b1..42d56d2a6a 100644 --- a/packages/blitz-next/src/use-params.test.tsx +++ b/packages/blitz-next/src/use-params.test.tsx @@ -4,7 +4,7 @@ import React from "react" import {describe, it, expect, vi, afterEach} from "vitest" import {extractRouterParams, useParam, useParams} from "./use-params" -import {renderHook as defaultRenderHook} from "@testing-library/react-hooks" +import {renderHook as defaultRenderHook} from "@testing-library/react" import {NextRouter} from "next/router" import {RouterContext} from "./router-context" diff --git a/packages/generator/templates/app/package.ts.json b/packages/generator/templates/app/package.ts.json index 968fe92d4b..25ff42e1ce 100644 --- a/packages/generator/templates/app/package.ts.json +++ b/packages/generator/templates/app/package.ts.json @@ -42,7 +42,6 @@ "@next/env": "13.4.19", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "16.0.1", - "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", "@types/react": "18.0.25", diff --git a/packages/generator/templates/pages/package.js.json b/packages/generator/templates/pages/package.js.json index 99eefd3dce..f75693b261 100644 --- a/packages/generator/templates/pages/package.js.json +++ b/packages/generator/templates/pages/package.js.json @@ -38,7 +38,6 @@ "@next/bundle-analyzer": "12.0.8", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "16.0.1", - "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", "@types/react": "18.0.25", diff --git a/packages/generator/templates/pages/package.ts.json b/packages/generator/templates/pages/package.ts.json index c8c22b2bbe..77867b0103 100644 --- a/packages/generator/templates/pages/package.ts.json +++ b/packages/generator/templates/pages/package.ts.json @@ -39,7 +39,6 @@ "@next/env": "13.4.19", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "16.0.1", - "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", "@types/react": "18.0.25", diff --git a/packages/generator/templates/pages/test/utils.tsx b/packages/generator/templates/pages/test/utils.tsx index 350e7b86de..0c9c13ed90 100644 --- a/packages/generator/templates/pages/test/utils.tsx +++ b/packages/generator/templates/pages/test/utils.tsx @@ -1,7 +1,7 @@ import {vi} from "vitest" import { render as defaultRender } from "@testing-library/react" -import { renderHook as defaultRenderHook } from "@testing-library/react-hooks" +import { renderHook as defaultRenderHook } from "@testing-library/react" import { NextRouter } from "next/router" import {BlitzProvider, RouterContext} from "@blitzjs/next" import { QueryClient } from "@blitzjs/rpc" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9baca5845f..8e8a891ffd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -194,9 +194,6 @@ importers: "@testing-library/react": specifier: 16.0.1 version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) - "@testing-library/react-hooks": - specifier: 8.0.1 - version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) "@types/node": specifier: 18.11.9 version: 18.11.9 @@ -309,9 +306,6 @@ importers: "@testing-library/react": specifier: 16.0.1 version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) - "@testing-library/react-hooks": - specifier: 8.0.1 - version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) "@types/jest": specifier: 29.2.2 version: 29.2.2 @@ -573,9 +567,6 @@ importers: "@testing-library/react": specifier: 16.0.1 version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) - "@testing-library/react-hooks": - specifier: 8.0.1 - version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) "@types/node": specifier: 18.11.9 version: 18.11.9 @@ -1598,9 +1589,6 @@ importers: "@testing-library/react": specifier: 16.0.1 version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) - "@testing-library/react-hooks": - specifier: 8.0.1 - version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) "@types/cookie": specifier: 0.4.1 version: 0.4.1 @@ -1683,9 +1671,6 @@ importers: "@testing-library/react": specifier: 16.0.1 version: 16.0.1(@testing-library/dom@8.13.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) - "@testing-library/react-hooks": - specifier: 8.0.1 - version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) "@testing-library/user-event": specifier: 13.5.0 version: 13.5.0(@testing-library/dom@8.13.0) From 12faac9f69390d5741f382874ed2dcf979ef117b Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 11:24:34 +0530 Subject: [PATCH 14/22] Merge branch 'siddharth/upgrade-to-next-15' of https://github.com/blitz-js/blitz into siddharth/upgrade-to-next-15 --- .changeset/wild-news-shop.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .changeset/wild-news-shop.md diff --git a/.changeset/wild-news-shop.md b/.changeset/wild-news-shop.md new file mode 100644 index 0000000000..a25ca8d9f4 --- /dev/null +++ b/.changeset/wild-news-shop.md @@ -0,0 +1,8 @@ +--- +"@blitzjs/auth": minor +"@blitzjs/next": minor +"@blitzjs/rpc": minor +"blitz": minor +--- + +chore: support next.js 15 From a4f4e7e098b72535891df93f5f6d0deb004a5307 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 11:31:52 +0530 Subject: [PATCH 15/22] upgrade testing library --- apps/toolkit-app-passportjs/package.json | 2 +- apps/toolkit-app/package.json | 2 +- integration-tests/auth-with-rpc/package.json | 2 +- integration-tests/qm/package.json | 2 +- integration-tests/utils/package.json | 2 +- packages/blitz-auth/package.json | 2 +- packages/blitz-next/package.json | 2 +- packages/generator/templates/app/package.ts.json | 2 +- packages/generator/templates/pages/package.js.json | 2 +- packages/generator/templates/pages/package.ts.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/toolkit-app-passportjs/package.json b/apps/toolkit-app-passportjs/package.json index c721343f12..97ef01b250 100644 --- a/apps/toolkit-app-passportjs/package.json +++ b/apps/toolkit-app-passportjs/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@next/bundle-analyzer": "12.0.8", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@testing-library/react-hooks": "8.0.1", "@types/jest": "29.2.2", "@types/node": "18.11.9", diff --git a/apps/toolkit-app/package.json b/apps/toolkit-app/package.json index 3adc6d2263..e1d133075c 100644 --- a/apps/toolkit-app/package.json +++ b/apps/toolkit-app/package.json @@ -44,7 +44,7 @@ "devDependencies": { "@next/bundle-analyzer": "12.0.8", "@testing-library/jest-dom": "5.16.5", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", diff --git a/integration-tests/auth-with-rpc/package.json b/integration-tests/auth-with-rpc/package.json index ffd97b88e0..04c0c7825e 100644 --- a/integration-tests/auth-with-rpc/package.json +++ b/integration-tests/auth-with-rpc/package.json @@ -37,7 +37,7 @@ "devDependencies": { "@next/bundle-analyzer": "12.0.8", "@testing-library/jest-dom": "5.16.5", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", diff --git a/integration-tests/qm/package.json b/integration-tests/qm/package.json index e487baa852..f3a0c74b20 100644 --- a/integration-tests/qm/package.json +++ b/integration-tests/qm/package.json @@ -21,7 +21,7 @@ "react-dom": "rc" }, "devDependencies": { - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@types/react": "npm:types-react@rc", "@vitejs/plugin-react": "1.3.0", "delay": "5.0.0", diff --git a/integration-tests/utils/package.json b/integration-tests/utils/package.json index f9cd071c85..9c6ff32fd1 100644 --- a/integration-tests/utils/package.json +++ b/integration-tests/utils/package.json @@ -7,7 +7,7 @@ "@blitzjs/next": "workspace:2.1.3", "@blitzjs/rpc": "workspace:2.1.3", "@tanstack/react-query": "4.13.0", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", diff --git a/packages/blitz-auth/package.json b/packages/blitz-auth/package.json index 29516ebf17..8a5635d8d8 100644 --- a/packages/blitz-auth/package.json +++ b/packages/blitz-auth/package.json @@ -68,7 +68,7 @@ }, "devDependencies": { "@blitzjs/config": "2.1.3", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@testing-library/react-hooks": "8.0.1", "@types/cookie": "0.4.1", "@types/debug": "4.1.7", diff --git a/packages/blitz-next/package.json b/packages/blitz-next/package.json index 7b77a581ec..92bfba24cb 100644 --- a/packages/blitz-next/package.json +++ b/packages/blitz-next/package.json @@ -48,7 +48,7 @@ "@blitzjs/config": "2.1.3", "@testing-library/dom": "8.13.0", "@testing-library/jest-dom": "5.16.3", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@testing-library/react-hooks": "8.0.1", "@testing-library/user-event": "13.5.0", "@types/debug": "4.1.7", diff --git a/packages/generator/templates/app/package.ts.json b/packages/generator/templates/app/package.ts.json index 2c087f5a08..968fe92d4b 100644 --- a/packages/generator/templates/app/package.ts.json +++ b/packages/generator/templates/app/package.ts.json @@ -41,7 +41,7 @@ "devDependencies": { "@next/env": "13.4.19", "@testing-library/jest-dom": "5.16.5", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", diff --git a/packages/generator/templates/pages/package.js.json b/packages/generator/templates/pages/package.js.json index 36f51effdc..99eefd3dce 100644 --- a/packages/generator/templates/pages/package.js.json +++ b/packages/generator/templates/pages/package.js.json @@ -37,7 +37,7 @@ "devDependencies": { "@next/bundle-analyzer": "12.0.8", "@testing-library/jest-dom": "5.16.5", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", diff --git a/packages/generator/templates/pages/package.ts.json b/packages/generator/templates/pages/package.ts.json index 7b50171e0b..c8c22b2bbe 100644 --- a/packages/generator/templates/pages/package.ts.json +++ b/packages/generator/templates/pages/package.ts.json @@ -38,7 +38,7 @@ "@next/bundle-analyzer": "12.0.8", "@next/env": "13.4.19", "@testing-library/jest-dom": "5.16.5", - "@testing-library/react": "13.4.0", + "@testing-library/react": "16.0.1", "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", From f303bc6ab1dcddcfc2b3ce7c19ae3d789c469624 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 13:00:20 +0530 Subject: [PATCH 16/22] fix turbopack exports --- .../next-13-app-dir/next-env.d.ts | 2 +- .../blitz-next/scripts/turbopack-empty.js | 7 +- pnpm-lock.yaml | 103 +++++++++++++++--- 3 files changed, 92 insertions(+), 20 deletions(-) diff --git a/integration-tests/next-13-app-dir/next-env.d.ts b/integration-tests/next-13-app-dir/next-env.d.ts index 4f11a03dc6..40c3d68096 100644 --- a/integration-tests/next-13-app-dir/next-env.d.ts +++ b/integration-tests/next-13-app-dir/next-env.d.ts @@ -2,4 +2,4 @@ /// // NOTE: This file should not be edited -// see https://nextjs.org/docs/basic-features/typescript for more information. +// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information. diff --git a/packages/blitz-next/scripts/turbopack-empty.js b/packages/blitz-next/scripts/turbopack-empty.js index 336ce12bb9..64aa464c9f 100644 --- a/packages/blitz-next/scripts/turbopack-empty.js +++ b/packages/blitz-next/scripts/turbopack-empty.js @@ -1 +1,6 @@ -export {} +const exports = { + "npm-which": {}, + "cross-spawn": {}, +} + +module.exports = exports diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d89a8186ca..9baca5845f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -192,8 +192,8 @@ importers: specifier: 5.16.5 version: 5.16.5 "@testing-library/react": - specifier: 13.4.0 - version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + specifier: 16.0.1 + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@testing-library/react-hooks": specifier: 8.0.1 version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) @@ -307,8 +307,8 @@ importers: specifier: 12.0.8 version: 12.0.8 "@testing-library/react": - specifier: 13.4.0 - version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + specifier: 16.0.1 + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@testing-library/react-hooks": specifier: 8.0.1 version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) @@ -571,8 +571,8 @@ importers: specifier: 5.16.5 version: 5.16.5 "@testing-library/react": - specifier: 13.4.0 - version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + specifier: 16.0.1 + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@testing-library/react-hooks": specifier: 8.0.1 version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) @@ -951,8 +951,8 @@ importers: version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) devDependencies: "@testing-library/react": - specifier: 13.4.0 - version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + specifier: 16.0.1 + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@types/react": specifier: npm:types-react@rc version: /types-react@19.0.0-rc.1 @@ -1228,8 +1228,8 @@ importers: specifier: 4.13.0 version: 4.13.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) "@testing-library/react": - specifier: 13.4.0 - version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + specifier: 16.0.1 + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@types/express": specifier: 4.17.13 version: 4.17.13 @@ -1596,8 +1596,8 @@ importers: specifier: 2.1.3 version: link:../config "@testing-library/react": - specifier: 13.4.0 - version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + specifier: 16.0.1 + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@testing-library/react-hooks": specifier: 8.0.1 version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) @@ -1681,8 +1681,8 @@ importers: specifier: 5.16.3 version: 5.16.3 "@testing-library/react": - specifier: 13.4.0 - version: 13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + specifier: 16.0.1 + version: 16.0.1(@testing-library/dom@8.13.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@testing-library/react-hooks": specifier: 8.0.1 version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) @@ -6452,6 +6452,23 @@ packages: } dev: true + /@testing-library/dom@10.4.0: + resolution: + { + integrity: sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==, + } + engines: {node: ">=18"} + dependencies: + "@babel/code-frame": 7.18.6 + "@babel/runtime": 7.23.2 + "@types/aria-query": 5.0.4 + aria-query: 5.3.0 + chalk: 4.1.2 + dom-accessibility-api: 0.5.14 + lz-string: 1.5.0 + pretty-format: 27.5.1 + dev: true + /@testing-library/dom@8.13.0: resolution: { @@ -6531,18 +6548,53 @@ packages: react-error-boundary: 3.1.4(react@19.0.0-rc-cae764ce-20241025) dev: true - /@testing-library/react@13.4.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): + /@testing-library/react@16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1): resolution: { - integrity: sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw==, + integrity: sha512-dSmwJVtJXmku+iocRhWOUFbrERC76TX2Mnf0ATODz8brzAZrMBbzLwQixlBSanZxR6LddK3eiwpSFZgDET1URg==, } - engines: {node: ">=12"} + engines: {node: ">=18"} peerDependencies: + "@testing-library/dom": ^10.0.0 + "@types/react": npm:types-react@rc + "@types/react-dom": npm:types-react-dom@rc react: ^18.0.0 react-dom: ^18.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + "@types/react-dom": + optional: true dependencies: - "@babel/runtime": 7.18.3 + "@babel/runtime": 7.23.2 + "@testing-library/dom": 10.4.0 + "@types/react": /types-react@19.0.0-rc.1 + "@types/react-dom": /types-react-dom@19.0.0-rc.1 + react: 19.0.0-rc-cae764ce-20241025 + react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + dev: true + + /@testing-library/react@16.0.1(@testing-library/dom@8.13.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1): + resolution: + { + integrity: sha512-dSmwJVtJXmku+iocRhWOUFbrERC76TX2Mnf0ATODz8brzAZrMBbzLwQixlBSanZxR6LddK3eiwpSFZgDET1URg==, + } + engines: {node: ">=18"} + peerDependencies: + "@testing-library/dom": ^10.0.0 + "@types/react": npm:types-react@rc + "@types/react-dom": npm:types-react-dom@rc + react: ^18.0.0 + react-dom: ^18.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + "@types/react-dom": + optional: true + dependencies: + "@babel/runtime": 7.23.2 "@testing-library/dom": 8.13.0 + "@types/react": /types-react@19.0.0-rc.1 "@types/react-dom": /types-react-dom@19.0.0-rc.1 react: 19.0.0-rc-cae764ce-20241025 react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) @@ -6607,6 +6659,13 @@ packages: } dev: true + /@types/aria-query@5.0.4: + resolution: + { + integrity: sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==, + } + dev: true + /@types/b64-lite@1.3.0: resolution: { @@ -16870,6 +16929,14 @@ packages: hasBin: true dev: true + /lz-string@1.5.0: + resolution: + { + integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==, + } + hasBin: true + dev: true + /macos-release@3.1.0: resolution: { From ad493c489df1674d42d9c8d38fa4204920d335c4 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Sat, 26 Oct 2024 13:05:41 +0530 Subject: [PATCH 17/22] fix chore: remove outdated `@testing-library/react-hooks` --- apps/toolkit-app-passportjs/package.json | 1 - apps/toolkit-app/package.json | 1 - integration-tests/auth-with-rpc/package.json | 1 - packages/blitz-auth/package.json | 1 - .../blitz-auth/src/client/auth-client.test.ts | 2 +- packages/blitz-next/package.json | 1 - packages/blitz-next/scripts/turbopack-empty.js | 2 ++ packages/blitz-next/src/use-params.test.tsx | 2 +- packages/generator/templates/app/package.ts.json | 1 - .../generator/templates/pages/package.js.json | 1 - .../generator/templates/pages/package.ts.json | 1 - packages/generator/templates/pages/test/utils.tsx | 2 +- pnpm-lock.yaml | 15 --------------- 13 files changed, 5 insertions(+), 26 deletions(-) diff --git a/apps/toolkit-app-passportjs/package.json b/apps/toolkit-app-passportjs/package.json index 97ef01b250..f02f7c8d39 100644 --- a/apps/toolkit-app-passportjs/package.json +++ b/apps/toolkit-app-passportjs/package.json @@ -43,7 +43,6 @@ "devDependencies": { "@next/bundle-analyzer": "12.0.8", "@testing-library/react": "16.0.1", - "@testing-library/react-hooks": "8.0.1", "@types/jest": "29.2.2", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", diff --git a/apps/toolkit-app/package.json b/apps/toolkit-app/package.json index e1d133075c..80e298945b 100644 --- a/apps/toolkit-app/package.json +++ b/apps/toolkit-app/package.json @@ -45,7 +45,6 @@ "@next/bundle-analyzer": "12.0.8", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "16.0.1", - "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", "@types/react": "npm:types-react@rc", diff --git a/integration-tests/auth-with-rpc/package.json b/integration-tests/auth-with-rpc/package.json index 04c0c7825e..09a76e60fa 100644 --- a/integration-tests/auth-with-rpc/package.json +++ b/integration-tests/auth-with-rpc/package.json @@ -38,7 +38,6 @@ "@next/bundle-analyzer": "12.0.8", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "16.0.1", - "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", "@types/react": "npm:types-react@rc", diff --git a/packages/blitz-auth/package.json b/packages/blitz-auth/package.json index 8a5635d8d8..b6e8d98cac 100644 --- a/packages/blitz-auth/package.json +++ b/packages/blitz-auth/package.json @@ -69,7 +69,6 @@ "devDependencies": { "@blitzjs/config": "2.1.3", "@testing-library/react": "16.0.1", - "@testing-library/react-hooks": "8.0.1", "@types/cookie": "0.4.1", "@types/debug": "4.1.7", "@types/jsonwebtoken": "8.5.8", diff --git a/packages/blitz-auth/src/client/auth-client.test.ts b/packages/blitz-auth/src/client/auth-client.test.ts index 35c5264155..eab2adac22 100644 --- a/packages/blitz-auth/src/client/auth-client.test.ts +++ b/packages/blitz-auth/src/client/auth-client.test.ts @@ -7,7 +7,7 @@ import {parsePublicDataToken, getPublicDataStore, useSession} from "./index" import {COOKIE_PUBLIC_DATA_TOKEN} from "../shared" import {toBase64} from "b64-lite" import {act} from "@testing-library/react" -import {renderHook} from "@testing-library/react-hooks" +import {renderHook} from "@testing-library/react" vi.mock("blitz", async () => { const blitz = await vi.importActual("blitz") diff --git a/packages/blitz-next/package.json b/packages/blitz-next/package.json index 92bfba24cb..571eacbea6 100644 --- a/packages/blitz-next/package.json +++ b/packages/blitz-next/package.json @@ -49,7 +49,6 @@ "@testing-library/dom": "8.13.0", "@testing-library/jest-dom": "5.16.3", "@testing-library/react": "16.0.1", - "@testing-library/react-hooks": "8.0.1", "@testing-library/user-event": "13.5.0", "@types/debug": "4.1.7", "@types/node": "18.11.9", diff --git a/packages/blitz-next/scripts/turbopack-empty.js b/packages/blitz-next/scripts/turbopack-empty.js index 64aa464c9f..19140d433e 100644 --- a/packages/blitz-next/scripts/turbopack-empty.js +++ b/packages/blitz-next/scripts/turbopack-empty.js @@ -1,6 +1,8 @@ const exports = { "npm-which": {}, "cross-spawn": {}, + fs: {}, + child_process: {}, } module.exports = exports diff --git a/packages/blitz-next/src/use-params.test.tsx b/packages/blitz-next/src/use-params.test.tsx index 4adbf3a1b1..42d56d2a6a 100644 --- a/packages/blitz-next/src/use-params.test.tsx +++ b/packages/blitz-next/src/use-params.test.tsx @@ -4,7 +4,7 @@ import React from "react" import {describe, it, expect, vi, afterEach} from "vitest" import {extractRouterParams, useParam, useParams} from "./use-params" -import {renderHook as defaultRenderHook} from "@testing-library/react-hooks" +import {renderHook as defaultRenderHook} from "@testing-library/react" import {NextRouter} from "next/router" import {RouterContext} from "./router-context" diff --git a/packages/generator/templates/app/package.ts.json b/packages/generator/templates/app/package.ts.json index 968fe92d4b..25ff42e1ce 100644 --- a/packages/generator/templates/app/package.ts.json +++ b/packages/generator/templates/app/package.ts.json @@ -42,7 +42,6 @@ "@next/env": "13.4.19", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "16.0.1", - "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", "@types/react": "18.0.25", diff --git a/packages/generator/templates/pages/package.js.json b/packages/generator/templates/pages/package.js.json index 99eefd3dce..f75693b261 100644 --- a/packages/generator/templates/pages/package.js.json +++ b/packages/generator/templates/pages/package.js.json @@ -38,7 +38,6 @@ "@next/bundle-analyzer": "12.0.8", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "16.0.1", - "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", "@types/react": "18.0.25", diff --git a/packages/generator/templates/pages/package.ts.json b/packages/generator/templates/pages/package.ts.json index c8c22b2bbe..77867b0103 100644 --- a/packages/generator/templates/pages/package.ts.json +++ b/packages/generator/templates/pages/package.ts.json @@ -39,7 +39,6 @@ "@next/env": "13.4.19", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "16.0.1", - "@testing-library/react-hooks": "8.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", "@types/react": "18.0.25", diff --git a/packages/generator/templates/pages/test/utils.tsx b/packages/generator/templates/pages/test/utils.tsx index 350e7b86de..0c9c13ed90 100644 --- a/packages/generator/templates/pages/test/utils.tsx +++ b/packages/generator/templates/pages/test/utils.tsx @@ -1,7 +1,7 @@ import {vi} from "vitest" import { render as defaultRender } from "@testing-library/react" -import { renderHook as defaultRenderHook } from "@testing-library/react-hooks" +import { renderHook as defaultRenderHook } from "@testing-library/react" import { NextRouter } from "next/router" import {BlitzProvider, RouterContext} from "@blitzjs/next" import { QueryClient } from "@blitzjs/rpc" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9baca5845f..8e8a891ffd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -194,9 +194,6 @@ importers: "@testing-library/react": specifier: 16.0.1 version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) - "@testing-library/react-hooks": - specifier: 8.0.1 - version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) "@types/node": specifier: 18.11.9 version: 18.11.9 @@ -309,9 +306,6 @@ importers: "@testing-library/react": specifier: 16.0.1 version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) - "@testing-library/react-hooks": - specifier: 8.0.1 - version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) "@types/jest": specifier: 29.2.2 version: 29.2.2 @@ -573,9 +567,6 @@ importers: "@testing-library/react": specifier: 16.0.1 version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) - "@testing-library/react-hooks": - specifier: 8.0.1 - version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) "@types/node": specifier: 18.11.9 version: 18.11.9 @@ -1598,9 +1589,6 @@ importers: "@testing-library/react": specifier: 16.0.1 version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) - "@testing-library/react-hooks": - specifier: 8.0.1 - version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) "@types/cookie": specifier: 0.4.1 version: 0.4.1 @@ -1683,9 +1671,6 @@ importers: "@testing-library/react": specifier: 16.0.1 version: 16.0.1(@testing-library/dom@8.13.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) - "@testing-library/react-hooks": - specifier: 8.0.1 - version: 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) "@testing-library/user-event": specifier: 13.5.0 version: 13.5.0(@testing-library/dom@8.13.0) From a0448fff17a2e538efbaef8e42bb44d85db462d5 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Fri, 20 Dec 2024 17:24:12 +0530 Subject: [PATCH 18/22] upgrade to react 19 --- apps/next13/package.json | 8 +- apps/toolkit-app-passportjs/package.json | 6 +- apps/toolkit-app/package.json | 6 +- apps/web/package.json | 6 +- integration-tests/auth-with-rpc/package.json | 6 +- integration-tests/auth/package.json | 6 +- .../get-initial-props/package.json | 6 +- integration-tests/middleware/package.json | 6 +- .../next-13-app-dir/package.json | 6 +- integration-tests/no-suspense/package.json | 6 +- integration-tests/qm/package.json | 6 +- .../react-query-utils/package.json | 6 +- integration-tests/rpc-path-root/package.json | 6 +- integration-tests/rpc/package.json | 6 +- integration-tests/trailing-slash/package.json | 6 +- integration-tests/utils/package.json | 6 +- packages/blitz-auth/package.json | 8 +- packages/blitz-next/package.json | 8 +- packages/blitz-rpc/package.json | 8 +- packages/blitz/package.json | 6 +- packages/generator/package.json | 6 +- packages/pkg-template/package.json | 6 +- pnpm-lock.yaml | 430 +++++++++--------- 23 files changed, 285 insertions(+), 285 deletions(-) diff --git a/apps/next13/package.json b/apps/next13/package.json index 2ad7698aec..2034b8d09c 100644 --- a/apps/next13/package.json +++ b/apps/next13/package.json @@ -24,16 +24,16 @@ "flatted": "3.2.7", "next": "15.0.1", "prisma": "^4.5.0", - "react": "rc", - "react-dom": "rc", + "react": "19.0.0", + "react-dom": "19.0.0", "react-hook-form": "7.39.1", "superjson": "1.11.0", "zod": "3.23.8" }, "devDependencies": { "@types/node": "18.11.7", - "@types/react": "npm:types-react@rc", - "@types/react-dom": "npm:types-react-dom@rc", + "@types/react": "npm:types-react@19.0.0", + "@types/react-dom": "npm:types-react-dom@19.0.0", "eslint": "8.26.0", "eslint-config-next": "13.0.0", "typescript": "4.8.4" diff --git a/apps/toolkit-app-passportjs/package.json b/apps/toolkit-app-passportjs/package.json index f02f7c8d39..7bb7bba3e5 100644 --- a/apps/toolkit-app-passportjs/package.json +++ b/apps/toolkit-app-passportjs/package.json @@ -34,8 +34,8 @@ "next": "15.0.1", "openid-client": "5.2.1", "prisma": "4.6.1", - "react": "rc", - "react-dom": "rc", + "react": "19.0.0", + "react-dom": "19.0.0", "react-hook-form": "7.39.1", "ts-node": "10.9.1", "zod": "3.23.8" @@ -46,7 +46,7 @@ "@types/jest": "29.2.2", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", - "@types/react": "npm:types-react@rc", + "@types/react": "npm:types-react@19.0.0", "@typescript-eslint/eslint-plugin": "5.42.1", "eslint": "8.27.0", "eslint-config-next": "12.3.1", diff --git a/apps/toolkit-app/package.json b/apps/toolkit-app/package.json index 80e298945b..4d87b79a51 100644 --- a/apps/toolkit-app/package.json +++ b/apps/toolkit-app/package.json @@ -35,8 +35,8 @@ "next": "15.0.1", "next-auth": "4.24.7", "prisma": "4.6.1", - "react": "rc", - "react-dom": "rc", + "react": "19.0.0", + "react-dom": "19.0.0", "react-hook-form": "7.39.1", "ts-node": "10.9.1", "zod": "3.23.8" @@ -47,7 +47,7 @@ "@testing-library/react": "16.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", - "@types/react": "npm:types-react@rc", + "@types/react": "npm:types-react@19.0.0", "@typescript-eslint/eslint-plugin": "5.42.1", "@vitejs/plugin-react": "2.2.0", "eslint": "8.27.0", diff --git a/apps/web/package.json b/apps/web/package.json index 5cafc4210f..a9901b4298 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -30,13 +30,13 @@ "passport-mock-strategy": "2.0.0", "passport-twitter": "1.0.4", "prisma": "4.6.1", - "react": "rc", - "react-dom": "rc", + "react": "19.0.0", + "react-dom": "19.0.0", "ts-node": "10.9.1" }, "devDependencies": { "@next/bundle-analyzer": "12.0.8", - "@types/react": "npm:types-react@rc", + "@types/react": "npm:types-react@19.0.0", "eslint": "8.27.0", "typescript": "^4.8.4" } diff --git a/integration-tests/auth-with-rpc/package.json b/integration-tests/auth-with-rpc/package.json index 09a76e60fa..4b663b4c41 100644 --- a/integration-tests/auth-with-rpc/package.json +++ b/integration-tests/auth-with-rpc/package.json @@ -28,8 +28,8 @@ "delay": "5.0.0", "next": "15.0.1", "prisma": "4.6.1", - "react": "rc", - "react-dom": "rc", + "react": "19.0.0", + "react-dom": "19.0.0", "react-hook-form": "7.39.1", "ts-node": "10.9.1", "zod": "3.23.8" @@ -40,7 +40,7 @@ "@testing-library/react": "16.0.1", "@types/node": "18.11.9", "@types/preview-email": "2.0.1", - "@types/react": "npm:types-react@rc", + "@types/react": "npm:types-react@19.0.0", "@typescript-eslint/eslint-plugin": "5.42.1", "@vitejs/plugin-react": "2.2.0", "eslint": "8.27.0", diff --git a/integration-tests/auth/package.json b/integration-tests/auth/package.json index 790ab0d110..8ea4a7793c 100644 --- a/integration-tests/auth/package.json +++ b/integration-tests/auth/package.json @@ -25,8 +25,8 @@ "lowdb": "3.0.0", "next": "15.0.1", "prisma": "4.6.1", - "react": "rc", - "react-dom": "rc", + "react": "19.0.0", + "react-dom": "19.0.0", "secure-password": "4.0.0", "wait-port": "1.0.4" }, @@ -36,7 +36,7 @@ "@types/fs-extra": "9.0.13", "@types/node": "18.7.13", "@types/node-fetch": "2.6.1", - "@types/react": "npm:types-react@rc", + "@types/react": "npm:types-react@19.0.0", "b64-lite": "1.4.0", "eslint": "8.27.0", "fs-extra": "10.0.1", diff --git a/integration-tests/get-initial-props/package.json b/integration-tests/get-initial-props/package.json index 367532208e..8c42876d66 100644 --- a/integration-tests/get-initial-props/package.json +++ b/integration-tests/get-initial-props/package.json @@ -24,8 +24,8 @@ "lowdb": "2.1.0", "next": "15.0.1", "prisma": "4.6.1", - "react": "rc", - "react-dom": "rc" + "react": "19.0.0", + "react-dom": "19.0.0" }, "devDependencies": { "@blitzjs/config": "2.1.3", @@ -33,7 +33,7 @@ "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", - "@types/react": "npm:types-react@rc", + "@types/react": "npm:types-react@19.0.0", "b64-lite": "1.4.0", "eslint": "8.27.0", "fs-extra": "10.0.1", diff --git a/integration-tests/middleware/package.json b/integration-tests/middleware/package.json index f7931643e3..eefe3255c8 100644 --- a/integration-tests/middleware/package.json +++ b/integration-tests/middleware/package.json @@ -16,15 +16,15 @@ "@blitzjs/rpc": "2.1.3", "blitz": "2.1.3", "next": "15.0.1", - "react": "rc", - "react-dom": "rc" + "react": "19.0.0", + "react-dom": "19.0.0" }, "devDependencies": { "@next/bundle-analyzer": "12.0.8", "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", - "@types/react": "npm:types-react@rc", + "@types/react": "npm:types-react@19.0.0", "eslint": "8.27.0", "fs-extra": "10.0.1", "get-port": "6.1.2", diff --git a/integration-tests/next-13-app-dir/package.json b/integration-tests/next-13-app-dir/package.json index e0d4bf3408..aec5ab7d0d 100644 --- a/integration-tests/next-13-app-dir/package.json +++ b/integration-tests/next-13-app-dir/package.json @@ -26,8 +26,8 @@ "lowdb": "2.1.0", "next": "15.0.1", "prisma": "4.6.1", - "react": "rc", - "react-dom": "rc", + "react": "19.0.0", + "react-dom": "19.0.0", "secure-password": "4.0.0", "wait-port": "1.0.4" }, @@ -37,7 +37,7 @@ "@types/fs-extra": "9.0.13", "@types/node": "18.7.13", "@types/node-fetch": "2.6.1", - "@types/react": "npm:types-react@rc", + "@types/react": "npm:types-react@19.0.0", "b64-lite": "1.4.0", "eslint": "8.27.0", "fs-extra": "10.0.1", diff --git a/integration-tests/no-suspense/package.json b/integration-tests/no-suspense/package.json index 033acc6cc0..b14bb95b37 100644 --- a/integration-tests/no-suspense/package.json +++ b/integration-tests/no-suspense/package.json @@ -24,8 +24,8 @@ "lowdb": "3.0.0", "next": "15.0.1", "prisma": "4.6.1", - "react": "rc", - "react-dom": "rc" + "react": "19.0.0", + "react-dom": "19.0.0" }, "devDependencies": { "@blitzjs/config": "2.1.3", @@ -33,7 +33,7 @@ "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", - "@types/react": "npm:types-react@rc", + "@types/react": "npm:types-react@19.0.0", "b64-lite": "1.4.0", "eslint": "8.27.0", "fs-extra": "10.0.1", diff --git a/integration-tests/qm/package.json b/integration-tests/qm/package.json index f3a0c74b20..47478f785e 100644 --- a/integration-tests/qm/package.json +++ b/integration-tests/qm/package.json @@ -17,12 +17,12 @@ "blitz": "2.1.3", "next": "15.0.1", "prisma": "4.6.1", - "react": "rc", - "react-dom": "rc" + "react": "19.0.0", + "react-dom": "19.0.0" }, "devDependencies": { "@testing-library/react": "16.0.1", - "@types/react": "npm:types-react@rc", + "@types/react": "npm:types-react@19.0.0", "@vitejs/plugin-react": "1.3.0", "delay": "5.0.0", "eslint": "8.27.0", diff --git a/integration-tests/react-query-utils/package.json b/integration-tests/react-query-utils/package.json index 4899ea685e..81933df652 100644 --- a/integration-tests/react-query-utils/package.json +++ b/integration-tests/react-query-utils/package.json @@ -23,8 +23,8 @@ "lowdb": "3.0.0", "next": "15.0.1", "prisma": "4.6.1", - "react": "rc", - "react-dom": "rc" + "react": "19.0.0", + "react-dom": "19.0.0" }, "devDependencies": { "@blitzjs/config": "2.1.3", @@ -32,7 +32,7 @@ "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", - "@types/react": "npm:types-react@rc", + "@types/react": "npm:types-react@19.0.0", "b64-lite": "1.4.0", "eslint": "8.27.0", "fs-extra": "10.0.1", diff --git a/integration-tests/rpc-path-root/package.json b/integration-tests/rpc-path-root/package.json index 5c84191a8d..89c495e808 100644 --- a/integration-tests/rpc-path-root/package.json +++ b/integration-tests/rpc-path-root/package.json @@ -12,14 +12,14 @@ "@blitzjs/rpc": "2.1.3", "blitz": "2.1.3", "next": "15.0.1", - "react": "rc", - "react-dom": "rc" + "react": "19.0.0", + "react-dom": "19.0.0" }, "devDependencies": { "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", - "@types/react": "npm:types-react@rc", + "@types/react": "npm:types-react@19.0.0", "b64-lite": "1.4.0", "eslint": "8.27.0", "fs-extra": "10.0.1", diff --git a/integration-tests/rpc/package.json b/integration-tests/rpc/package.json index a5f4196e86..766dcd58f9 100644 --- a/integration-tests/rpc/package.json +++ b/integration-tests/rpc/package.json @@ -12,14 +12,14 @@ "@blitzjs/rpc": "2.1.3", "blitz": "2.1.3", "next": "15.0.1", - "react": "rc", - "react-dom": "rc" + "react": "19.0.0", + "react-dom": "19.0.0" }, "devDependencies": { "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", - "@types/react": "npm:types-react@rc", + "@types/react": "npm:types-react@19.0.0", "b64-lite": "1.4.0", "eslint": "8.27.0", "fs-extra": "10.0.1", diff --git a/integration-tests/trailing-slash/package.json b/integration-tests/trailing-slash/package.json index c2c5f933e6..b9615a13e9 100644 --- a/integration-tests/trailing-slash/package.json +++ b/integration-tests/trailing-slash/package.json @@ -24,8 +24,8 @@ "lowdb": "3.0.0", "next": "15.0.1", "prisma": "4.6.1", - "react": "rc", - "react-dom": "rc" + "react": "19.0.0", + "react-dom": "19.0.0" }, "devDependencies": { "@blitzjs/config": "2.1.3", @@ -33,7 +33,7 @@ "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", - "@types/react": "npm:types-react@rc", + "@types/react": "npm:types-react@19.0.0", "b64-lite": "1.4.0", "eslint": "8.27.0", "fs-extra": "10.0.1", diff --git a/integration-tests/utils/package.json b/integration-tests/utils/package.json index 9c6ff32fd1..3a111a03b9 100644 --- a/integration-tests/utils/package.json +++ b/integration-tests/utils/package.json @@ -11,7 +11,7 @@ "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", "@types/node-fetch": "2.6.1", - "@types/react": "npm:types-react@rc", + "@types/react": "npm:types-react@19.0.0", "@types/rimraf": "3.0.2", "@types/selenium-webdriver": "4.0.18", "chromedriver": "100.0.0", @@ -23,8 +23,8 @@ "node-fetch": "3.2.3", "pkg-dir": "5.0.0", "playwright-chromium": "1.28.0", - "react": "rc", - "react-dom": "rc", + "react": "19.0.0", + "react-dom": "19.0.0", "resolve-cwd": "3.0.0", "resolve-from": "5.0.0", "rimraf": "3.0.2", diff --git a/packages/blitz-auth/package.json b/packages/blitz-auth/package.json index b6e8d98cac..65d37c1873 100644 --- a/packages/blitz-auth/package.json +++ b/packages/blitz-auth/package.json @@ -72,13 +72,13 @@ "@types/cookie": "0.4.1", "@types/debug": "4.1.7", "@types/jsonwebtoken": "8.5.8", - "@types/react": "npm:types-react@rc", - "@types/react-dom": "npm:types-react-dom@rc", + "@types/react": "npm:types-react@19.0.0", + "@types/react-dom": "npm:types-react-dom@19.0.0", "blitz": "2.1.3", "next": "15.0.1", "next-auth": "4.24.7", - "react": "rc", - "react-dom": "rc", + "react": "19.0.0", + "react-dom": "19.0.0", "secure-password": "4.0.0", "typescript": "^4.8.4", "unbuild": "0.7.6", diff --git a/packages/blitz-next/package.json b/packages/blitz-next/package.json index 571eacbea6..2556f11153 100644 --- a/packages/blitz-next/package.json +++ b/packages/blitz-next/package.json @@ -52,16 +52,16 @@ "@testing-library/user-event": "13.5.0", "@types/debug": "4.1.7", "@types/node": "18.11.9", - "@types/react": "npm:types-react@rc", - "@types/react-dom": "npm:types-react-dom@rc", + "@types/react": "npm:types-react@19.0.0", + "@types/react-dom": "npm:types-react-dom@19.0.0", "@types/testing-library__react-hooks": "4.0.0", "blitz": "2.1.3", "cross-spawn": "7.0.3", "find-up": "4.1.0", "next": "15.0.1", "next-router-mock": "0.9.1", - "react": "rc", - "react-dom": "rc", + "react": "19.0.0", + "react-dom": "19.0.0", "resolve-from": "5.0.0", "ts-jest": "27.1.4", "tslog": "4.9.0", diff --git a/packages/blitz-rpc/package.json b/packages/blitz-rpc/package.json index 5f21050ca2..0857a957ec 100644 --- a/packages/blitz-rpc/package.json +++ b/packages/blitz-rpc/package.json @@ -46,12 +46,12 @@ "@blitzjs/config": "2.1.3", "@tanstack/query-core": "4.24.4", "@types/debug": "4.1.7", - "@types/react": "npm:types-react@rc", - "@types/react-dom": "npm:types-react-dom@rc", + "@types/react": "npm:types-react@19.0.0", + "@types/react-dom": "npm:types-react-dom@19.0.0", "blitz": "2.1.3", "next": "15.0.1", - "react": "rc", - "react-dom": "rc", + "react": "19.0.0", + "react-dom": "19.0.0", "typescript": "^4.8.4", "unbuild": "0.7.6", "watch": "1.0.2", diff --git a/packages/blitz/package.json b/packages/blitz/package.json index 73d5a4278a..1d2fad3d72 100644 --- a/packages/blitz/package.json +++ b/packages/blitz/package.json @@ -95,12 +95,12 @@ "@types/npm-which": "3.0.1", "@types/progress": "2.0.5", "@types/prompts": "2.0.14", - "@types/react": "npm:types-react@rc", - "@types/react-dom": "npm:types-react-dom@rc", + "@types/react": "npm:types-react@19.0.0", + "@types/react-dom": "npm:types-react-dom@19.0.0", "@types/test-listen": "1.1.0", "@types/watchpack": "1.1.1", "express": "4.17.3", - "react": "rc", + "react": "19.0.0", "test-listen": "1.1.0", "typescript": "^4.8.4", "unbuild": "0.7.6", diff --git a/packages/generator/package.json b/packages/generator/package.json index b2f9f28f3c..52724aadda 100644 --- a/packages/generator/package.json +++ b/packages/generator/package.json @@ -64,15 +64,15 @@ "@types/mem-fs-editor": "7.0.1", "@types/pluralize": "0.0.29", "@types/prettier": "2.4.4", - "@types/react": "npm:types-react@rc", - "@types/react-dom": "npm:types-react-dom@rc", + "@types/react": "npm:types-react@19.0.0", + "@types/react-dom": "npm:types-react-dom@19.0.0", "@types/vinyl": "2.0.6", "@typescript-eslint/eslint-plugin": "5.42.1", "@typescript-eslint/parser": "5.9.1", "babylon": "6.18.0", "debug": "4.3.3", "eslint": "8.27.0", - "react": "rc", + "react": "19.0.0", "typescript": "^4.8.4", "unbuild": "0.6.9", "watch": "1.0.2" diff --git a/packages/pkg-template/package.json b/packages/pkg-template/package.json index 785dd982bf..9527c1d765 100644 --- a/packages/pkg-template/package.json +++ b/packages/pkg-template/package.json @@ -26,9 +26,9 @@ }, "devDependencies": { "@blitzjs/config": "2.1.3", - "@types/react": "npm:types-react@rc", - "@types/react-dom": "npm:types-react-dom@rc", - "react": "rc", + "@types/react": "npm:types-react@19.0.0", + "@types/react-dom": "npm:types-react-dom@19.0.0", + "react": "19.0.0", "typescript": "^4.8.4", "unbuild": "0.7.6", "watch": "1.0.2" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8e8a891ffd..1de0c7be9e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -77,7 +77,7 @@ importers: version: link:../../packages/blitz-rpc "@hookform/error-message": specifier: 2.0.0 - version: 2.0.0(react-dom@19.0.0-rc-cae764ce-20241025)(react-hook-form@7.39.1)(react@19.0.0-rc-cae764ce-20241025) + version: 2.0.0(react-dom@19.0.0)(react-hook-form@7.39.1)(react@19.0.0) "@hookform/resolvers": specifier: 2.9.10 version: 2.9.10(react-hook-form@7.39.1) @@ -86,7 +86,7 @@ importers: version: 4.6.1(prisma@4.6.1) "@tanstack/react-query": specifier: 4.0.10 - version: 4.0.10(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 4.0.10(react-dom@19.0.0)(react@19.0.0) blitz: specifier: 2.1.3 version: link:../../packages/blitz @@ -95,19 +95,19 @@ importers: version: 3.2.7 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0)(react@19.0.0) prisma: specifier: ^4.5.0 version: 4.6.1 react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) react-hook-form: specifier: 7.39.1 - version: 7.39.1(react@19.0.0-rc-cae764ce-20241025) + version: 7.39.1(react@19.0.0) superjson: specifier: 1.11.0 version: 1.11.0 @@ -150,7 +150,7 @@ importers: version: link:../../packages/blitz-rpc "@hookform/error-message": specifier: 2.0.0 - version: 2.0.0(react-dom@19.0.0-rc-cae764ce-20241025)(react-hook-form@7.39.1)(react@19.0.0-rc-cae764ce-20241025) + version: 2.0.0(react-dom@19.0.0)(react-hook-form@7.39.1)(react@19.0.0) "@hookform/resolvers": specifier: 2.9.10 version: 2.9.10(react-hook-form@7.39.1) @@ -162,22 +162,22 @@ importers: version: link:../../packages/blitz next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0)(react@19.0.0) next-auth: specifier: 4.24.7 - version: 4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@19.0.0)(react@19.0.0) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) react-hook-form: specifier: 7.39.1 - version: 7.39.1(react@19.0.0-rc-cae764ce-20241025) + version: 7.39.1(react@19.0.0) ts-node: specifier: 10.9.1 version: 10.9.1(@types/node@18.11.9)(typescript@4.8.4) @@ -193,7 +193,7 @@ importers: version: 5.16.5 "@testing-library/react": specifier: 16.0.1 - version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0)(react@19.0.0)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@types/node": specifier: 18.11.9 version: 18.11.9 @@ -265,7 +265,7 @@ importers: version: link:../../packages/blitz-rpc "@hookform/error-message": specifier: 2.0.0 - version: 2.0.0(react-dom@19.0.0-rc-cae764ce-20241025)(react-hook-form@7.39.1)(react@19.0.0-rc-cae764ce-20241025) + version: 2.0.0(react-dom@19.0.0)(react-hook-form@7.39.1)(react@19.0.0) "@hookform/resolvers": specifier: 2.9.10 version: 2.9.10(react-hook-form@7.39.1) @@ -277,7 +277,7 @@ importers: version: link:../../packages/blitz next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0)(react@19.0.0) openid-client: specifier: 5.2.1 version: 5.2.1 @@ -285,14 +285,14 @@ importers: specifier: 4.6.1 version: 4.6.1 react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) react-hook-form: specifier: 7.39.1 - version: 7.39.1(react@19.0.0-rc-cae764ce-20241025) + version: 7.39.1(react@19.0.0) ts-node: specifier: 10.9.1 version: 10.9.1(@types/node@18.11.9)(typescript@4.8.4) @@ -305,7 +305,7 @@ importers: version: 12.0.8 "@testing-library/react": specifier: 16.0.1 - version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0)(react@19.0.0)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@types/jest": specifier: 29.2.2 version: 29.2.2 @@ -392,7 +392,7 @@ importers: version: 29.3.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0)(react@19.0.0) passport-mock-strategy: specifier: 2.0.0 version: 2.0.0 @@ -403,11 +403,11 @@ importers: specifier: 4.6.1 version: 4.6.1 react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) ts-node: specifier: 10.9.1 version: 10.9.1(@types/node@18.11.9)(typescript@4.8.4) @@ -447,16 +447,16 @@ importers: version: 3.0.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0)(react@19.0.0) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) secure-password: specifier: 4.0.0 version: 4.0.0 @@ -523,7 +523,7 @@ importers: version: link:../../packages/blitz-rpc "@hookform/error-message": specifier: 2.0.0 - version: 2.0.0(react-dom@19.0.0-rc-cae764ce-20241025)(react-hook-form@7.39.1)(react@19.0.0-rc-cae764ce-20241025) + version: 2.0.0(react-dom@19.0.0)(react-hook-form@7.39.1)(react@19.0.0) "@hookform/resolvers": specifier: 2.9.10 version: 2.9.10(react-hook-form@7.39.1) @@ -538,19 +538,19 @@ importers: version: 5.0.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0)(react@19.0.0) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) react-hook-form: specifier: 7.39.1 - version: 7.39.1(react@19.0.0-rc-cae764ce-20241025) + version: 7.39.1(react@19.0.0) ts-node: specifier: 10.9.1 version: 10.9.1(@types/node@18.11.9)(typescript@4.8.4) @@ -566,7 +566,7 @@ importers: version: 5.16.5 "@testing-library/react": specifier: 16.0.1 - version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0)(react@19.0.0)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@types/node": specifier: 18.11.9 version: 18.11.9 @@ -647,16 +647,16 @@ importers: version: 2.1.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0)(react@19.0.0) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) devDependencies: "@blitzjs/config": specifier: 2.1.3 @@ -711,13 +711,13 @@ importers: version: link:../../packages/blitz next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0)(react@19.0.0) react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) devDependencies: "@next/bundle-analyzer": specifier: 12.0.8 @@ -775,16 +775,16 @@ importers: version: 2.1.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0)(react@19.0.0) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) secure-password: specifier: 4.0.0 version: 4.0.0 @@ -857,16 +857,16 @@ importers: version: 3.0.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0)(react@19.0.0) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) devDependencies: "@blitzjs/config": specifier: 2.1.3 @@ -924,26 +924,26 @@ importers: version: 4.6.1(prisma@4.6.1) "@tanstack/react-query": specifier: 4.0.10 - version: 4.0.10(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 4.0.10(react-dom@19.0.0)(react@19.0.0) blitz: specifier: 2.1.3 version: link:../../packages/blitz next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.18.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.18.2)(react-dom@19.0.0)(react@19.0.0) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) devDependencies: "@testing-library/react": specifier: 16.0.1 - version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0)(react@19.0.0)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@types/react": specifier: npm:types-react@rc version: /types-react@19.0.0-rc.1 @@ -988,16 +988,16 @@ importers: version: 3.0.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0)(react@19.0.0) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) devDependencies: "@blitzjs/config": specifier: 2.1.3 @@ -1052,13 +1052,13 @@ importers: version: link:../../packages/blitz next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0)(react@19.0.0) react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) devDependencies: "@types/express": specifier: 4.17.13 @@ -1101,13 +1101,13 @@ importers: version: link:../../packages/blitz next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0)(react@19.0.0) react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) devDependencies: "@types/express": specifier: 4.17.13 @@ -1156,16 +1156,16 @@ importers: version: 3.0.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0)(react@19.0.0) prisma: specifier: 4.6.1 version: 4.6.1 react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) devDependencies: "@blitzjs/config": specifier: 2.1.3 @@ -1217,10 +1217,10 @@ importers: version: link:../../packages/blitz-rpc "@tanstack/react-query": specifier: 4.13.0 - version: 4.13.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 4.13.0(react-dom@19.0.0)(react@19.0.0) "@testing-library/react": specifier: 16.0.1 - version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0)(react@19.0.0)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@types/express": specifier: 4.17.13 version: 4.17.13 @@ -1267,11 +1267,11 @@ importers: specifier: 1.28.0 version: 1.28.0 react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) resolve-cwd: specifier: 3.0.0 version: 3.0.0 @@ -1370,10 +1370,10 @@ importers: version: 1.2.3 ink: specifier: 3.2.0 - version: 3.2.0(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) + version: 3.2.0(react@19.0.0)(types-react@19.0.0-rc.1) ink-spinner: specifier: 4.0.3 - version: 4.0.3(ink@3.2.0)(react@19.0.0-rc-cae764ce-20241025) + version: 4.0.3(ink@3.2.0)(react@19.0.0) jscodeshift: specifier: 0.13.0 version: 0.13.0(@babel/preset-env@7.12.10)(supports-color@8.1.1) @@ -1499,8 +1499,8 @@ importers: specifier: 4.17.3 version: 4.17.3(supports-color@8.1.1) react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 test-listen: specifier: 1.1.0 version: 1.1.0 @@ -1588,7 +1588,7 @@ importers: version: link:../config "@testing-library/react": specifier: 16.0.1 - version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) + version: 16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0)(react@19.0.0)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@types/cookie": specifier: 0.4.1 version: 0.4.1 @@ -1609,16 +1609,16 @@ importers: version: link:../blitz next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0)(react@19.0.0) next-auth: specifier: 4.24.7 - version: 4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@19.0.0)(react@19.0.0) react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) secure-password: specifier: 4.0.0 version: 4.0.0 @@ -1670,7 +1670,7 @@ importers: version: 5.16.3 "@testing-library/react": specifier: 16.0.1 - version: 16.0.1(@testing-library/dom@8.13.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) + version: 16.0.1(@testing-library/dom@8.13.0)(react-dom@19.0.0)(react@19.0.0)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1) "@testing-library/user-event": specifier: 13.5.0 version: 13.5.0(@testing-library/dom@8.13.0) @@ -1688,7 +1688,7 @@ importers: version: /types-react-dom@19.0.0-rc.1 "@types/testing-library__react-hooks": specifier: 4.0.0 - version: 4.0.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) + version: 4.0.0(react-dom@19.0.0)(react@19.0.0)(types-react@19.0.0-rc.1) blitz: specifier: 2.1.3 version: link:../blitz @@ -1700,22 +1700,22 @@ importers: version: 4.1.0 next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0)(react@19.0.0) next-router-mock: specifier: 0.9.1 - version: 0.9.1(next@15.0.1)(react@19.0.0-rc-cae764ce-20241025) + version: 0.9.1(next@15.0.1)(react@19.0.0) react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) resolve-from: specifier: 5.0.0 version: 5.0.0 ts-jest: specifier: 27.1.4 - version: 27.1.4(@babel/core@7.20.2)(esbuild@0.14.51)(jest@27.5.1)(typescript@4.8.4) + version: 27.1.4(@babel/core@7.12.10)(esbuild@0.14.51)(jest@27.5.1)(typescript@4.8.4) tslog: specifier: 4.9.0 version: 4.9.0 @@ -1736,7 +1736,7 @@ importers: version: 1.3.7 "@tanstack/react-query": specifier: 4.24.4 - version: 4.24.4(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 4.24.4(react-dom@19.0.0)(react@19.0.0) b64-lite: specifier: 1.4.0 version: 1.4.0 @@ -1779,13 +1779,13 @@ importers: version: link:../blitz next: specifier: 15.0.1 - version: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + version: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0)(react@19.0.0) react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 react-dom: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) typescript: specifier: ^4.8.4 version: 4.8.4 @@ -2024,8 +2024,8 @@ importers: specifier: 8.27.0 version: 8.27.0(supports-color@8.1.1) react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 typescript: specifier: ^4.8.4 version: 4.8.4 @@ -2055,8 +2055,8 @@ importers: specifier: npm:types-react-dom@rc version: /types-react-dom@19.0.0-rc.1 react: - specifier: rc - version: 19.0.0-rc-cae764ce-20241025 + specifier: 19.0.0 + version: 19.0.0 typescript: specifier: ^4.8.4 version: 4.8.4 @@ -4710,7 +4710,7 @@ packages: "@hapi/hoek": 9.3.0 dev: false - /@hookform/error-message@2.0.0(react-dom@19.0.0-rc-cae764ce-20241025)(react-hook-form@7.39.1)(react@19.0.0-rc-cae764ce-20241025): + /@hookform/error-message@2.0.0(react-dom@19.0.0)(react-hook-form@7.39.1)(react@19.0.0): resolution: { integrity: sha512-Y90nHzjgL2MP7GFy75kscdvxrCTjtyxGmOLLxX14nd08OXRIh9lMH/y9Kpdo0p1IPowJBiZMHyueg7p+yrqynQ==, @@ -4720,9 +4720,9 @@ packages: react-dom: ">=16.8.0" react-hook-form: ^7.0.0 dependencies: - react: 19.0.0-rc-cae764ce-20241025 - react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) - react-hook-form: 7.39.1(react@19.0.0-rc-cae764ce-20241025) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + react-hook-form: 7.39.1(react@19.0.0) dev: false /@hookform/resolvers@2.9.10(react-hook-form@7.39.1): @@ -4733,7 +4733,7 @@ packages: peerDependencies: react-hook-form: ^7.0.0 dependencies: - react-hook-form: 7.39.1(react@19.0.0-rc-cae764ce-20241025) + react-hook-form: 7.39.1(react@19.0.0) dev: false /@humanwhocodes/config-array@0.11.7(supports-color@8.1.1): @@ -6366,7 +6366,7 @@ packages: integrity: sha512-9dqjv9eeB6VHN7lD3cLo16ZAjfjCsdXetSAD5+VyKqLUvcKTL0CklGQRJu+bWzdrS69R6Ea4UZo8obHYZnG6aA==, } - /@tanstack/react-query@4.0.10(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): + /@tanstack/react-query@4.0.10(react-dom@19.0.0)(react@19.0.0): resolution: { integrity: sha512-Wn5QhZUE5wvr6rGClV7KeQIUsdTmYR9mgmMZen7DSRWauHW2UTynFg3Kkf6pw+XlxxOLsyLWwz/Q6q1lSpM3TQ==, @@ -6383,12 +6383,12 @@ packages: dependencies: "@tanstack/query-core": 4.24.4 "@types/use-sync-external-store": 0.0.3 - react: 19.0.0-rc-cae764ce-20241025 - react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) - use-sync-external-store: 1.2.0(react@19.0.0-rc-cae764ce-20241025) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + use-sync-external-store: 1.2.0(react@19.0.0) dev: false - /@tanstack/react-query@4.13.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): + /@tanstack/react-query@4.13.0(react-dom@19.0.0)(react@19.0.0): resolution: { integrity: sha512-dI/5hJ/pGQ74P5hxBLC9h6K0/Cap2T3k0ZjjjFLBCNnohDYgl7LNmMopzrRzBHk2mMjf2hgXHIzcKNG8GOZ5hg==, @@ -6404,12 +6404,12 @@ packages: optional: true dependencies: "@tanstack/query-core": 4.13.0 - react: 19.0.0-rc-cae764ce-20241025 - react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) - use-sync-external-store: 1.2.0(react@19.0.0-rc-cae764ce-20241025) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + use-sync-external-store: 1.2.0(react@19.0.0) dev: true - /@tanstack/react-query@4.24.4(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): + /@tanstack/react-query@4.24.4(react-dom@19.0.0)(react@19.0.0): resolution: { integrity: sha512-RpaS/3T/a3pHuZJbIAzAYRu+1nkp+/enr9hfRXDS/mojwx567UiMksoqW4wUFWlwIvWTXyhot2nbIipTKEg55Q==, @@ -6425,9 +6425,9 @@ packages: optional: true dependencies: "@tanstack/query-core": 4.24.4 - react: 19.0.0-rc-cae764ce-20241025 - react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) - use-sync-external-store: 1.2.0(react@19.0.0-rc-cae764ce-20241025) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + use-sync-external-store: 1.2.0(react@19.0.0) dev: false /@testim/chrome-version@1.1.2: @@ -6507,14 +6507,14 @@ packages: redent: 3.0.0 dev: true - /@testing-library/react-hooks@8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1): + /@testing-library/react-hooks@8.0.1(react-dom@19.0.0)(react@19.0.0)(types-react@19.0.0-rc.1): resolution: { integrity: sha512-Aqhl2IVmLt8IovEVarNDFuJDVWVvhnr9/GCU6UUnrYXwgDFF9h2L2o2P9KBni1AST5sT6riAyoukFLyjQUgD/g==, } engines: {node: ">=12"} peerDependencies: - "@types/react": npm:types-react@rc + "@types/react": ^16.9.0 || ^17.0.0 react: ^16.9.0 || ^17.0.0 react-dom: ^16.9.0 || ^17.0.0 react-test-renderer: ^16.9.0 || ^17.0.0 @@ -6528,12 +6528,12 @@ packages: dependencies: "@babel/runtime": 7.18.3 "@types/react": /types-react@19.0.0-rc.1 - react: 19.0.0-rc-cae764ce-20241025 - react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) - react-error-boundary: 3.1.4(react@19.0.0-rc-cae764ce-20241025) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + react-error-boundary: 3.1.4(react@19.0.0) dev: true - /@testing-library/react@16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1): + /@testing-library/react@16.0.1(@testing-library/dom@10.4.0)(react-dom@19.0.0)(react@19.0.0)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1): resolution: { integrity: sha512-dSmwJVtJXmku+iocRhWOUFbrERC76TX2Mnf0ATODz8brzAZrMBbzLwQixlBSanZxR6LddK3eiwpSFZgDET1URg==, @@ -6541,8 +6541,8 @@ packages: engines: {node: ">=18"} peerDependencies: "@testing-library/dom": ^10.0.0 - "@types/react": npm:types-react@rc - "@types/react-dom": npm:types-react-dom@rc + "@types/react": ^18.0.0 + "@types/react-dom": ^18.0.0 react: ^18.0.0 react-dom: ^18.0.0 peerDependenciesMeta: @@ -6555,11 +6555,11 @@ packages: "@testing-library/dom": 10.4.0 "@types/react": /types-react@19.0.0-rc.1 "@types/react-dom": /types-react-dom@19.0.0-rc.1 - react: 19.0.0-rc-cae764ce-20241025 - react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) dev: true - /@testing-library/react@16.0.1(@testing-library/dom@8.13.0)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1): + /@testing-library/react@16.0.1(@testing-library/dom@8.13.0)(react-dom@19.0.0)(react@19.0.0)(types-react-dom@19.0.0-rc.1)(types-react@19.0.0-rc.1): resolution: { integrity: sha512-dSmwJVtJXmku+iocRhWOUFbrERC76TX2Mnf0ATODz8brzAZrMBbzLwQixlBSanZxR6LddK3eiwpSFZgDET1URg==, @@ -6567,8 +6567,8 @@ packages: engines: {node: ">=18"} peerDependencies: "@testing-library/dom": ^10.0.0 - "@types/react": npm:types-react@rc - "@types/react-dom": npm:types-react-dom@rc + "@types/react": ^18.0.0 + "@types/react-dom": ^18.0.0 react: ^18.0.0 react-dom: ^18.0.0 peerDependenciesMeta: @@ -6581,8 +6581,8 @@ packages: "@testing-library/dom": 8.13.0 "@types/react": /types-react@19.0.0-rc.1 "@types/react-dom": /types-react-dom@19.0.0-rc.1 - react: 19.0.0-rc-cae764ce-20241025 - react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) dev: true /@testing-library/user-event@13.5.0(@testing-library/dom@8.13.0): @@ -7364,14 +7364,14 @@ packages: "@types/jest": 29.2.2 dev: true - /@types/testing-library__react-hooks@4.0.0(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1): + /@types/testing-library__react-hooks@4.0.0(react-dom@19.0.0)(react@19.0.0)(types-react@19.0.0-rc.1): resolution: { integrity: sha512-UzZUXthQtVjDruR2YA+hqg9ux5AfmZ8Kaw+QDungax+T7wb/5NC4x7YOpIqRx7oY3KksGQ69bzNE/xwzb5NslQ==, } deprecated: This is a stub types definition. @testing-library/react-hooks provides its own type definitions, so you do not need this installed. dependencies: - "@testing-library/react-hooks": 8.0.1(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) + "@testing-library/react-hooks": 8.0.1(react-dom@19.0.0)(react@19.0.0)(types-react@19.0.0-rc.1) transitivePeerDependencies: - "@types/react" - react @@ -8080,6 +8080,7 @@ packages: { integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==, } + deprecated: package has been renamed to acorn-import-attributes peerDependencies: acorn: ^8 dependencies: @@ -13575,6 +13576,7 @@ packages: { integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==, } + deprecated: Glob versions prior to v9 are no longer supported dependencies: fs.realpath: 1.0.0 inflight: 1.0.6 @@ -14259,7 +14261,7 @@ packages: } dev: false - /ink-spinner@4.0.3(ink@3.2.0)(react@19.0.0-rc-cae764ce-20241025): + /ink-spinner@4.0.3(ink@3.2.0)(react@19.0.0): resolution: { integrity: sha512-uJ4nbH00MM9fjTJ5xdw0zzvtXMkeGb0WV6dzSWvFv2/+ks6FIhpkt+Ge/eLdh0Ah6Vjw5pLMyNfoHQpRDRVFbQ==, @@ -14270,18 +14272,18 @@ packages: react: ">=16.8.2" dependencies: cli-spinners: 2.6.1 - ink: 3.2.0(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1) - react: 19.0.0-rc-cae764ce-20241025 + ink: 3.2.0(react@19.0.0)(types-react@19.0.0-rc.1) + react: 19.0.0 dev: false - /ink@3.2.0(react@19.0.0-rc-cae764ce-20241025)(types-react@19.0.0-rc.1): + /ink@3.2.0(react@19.0.0)(types-react@19.0.0-rc.1): resolution: { integrity: sha512-firNp1q3xxTzoItj/eOOSZQnYSlyrWks5llCTVX37nJ59K3eXbQ8PtzCguqo8YI19EELo5QxaKnJd4VxzhU8tg==, } engines: {node: ">=10"} peerDependencies: - "@types/react": npm:types-react@rc + "@types/react": ">=16.8.0" react: ">=16.8.0" peerDependenciesMeta: "@types/react": @@ -14299,9 +14301,9 @@ packages: is-ci: 2.0.0 lodash: 4.17.21 patch-console: 1.0.0 - react: 19.0.0-rc-cae764ce-20241025 + react: 19.0.0 react-devtools-core: 4.25.0 - react-reconciler: 0.26.2(react@19.0.0-rc-cae764ce-20241025) + react-reconciler: 0.26.2(react@19.0.0) scheduler: 0.20.2 signal-exit: 3.0.7 slice-ansi: 3.0.0 @@ -17581,13 +17583,13 @@ packages: } dev: false - /next-auth@4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): + /next-auth@4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@19.0.0)(react@19.0.0): resolution: { integrity: sha512-iChjE8ov/1K/z98gdKbn2Jw+2vLgJtVV39X+rCP5SGnVQuco7QOr19FRNGMIrD8d3LYhHWV9j9sKLzq1aDWWQQ==, } peerDependencies: - next: 15.0.1 + next: ^12.2.5 || ^13 || ^14 nodemailer: ^6.6.5 react: ^17.0.2 || ^18 react-dom: ^17.0.2 || ^18 @@ -17599,30 +17601,30 @@ packages: "@panva/hkdf": 1.0.2 cookie: 0.5.0 jose: 4.15.5 - next: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) + next: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0)(react@19.0.0) oauth: 0.9.15 openid-client: 5.6.5 preact: 10.11.3 preact-render-to-string: 5.2.6(preact@10.11.3) - react: 19.0.0-rc-cae764ce-20241025 - react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) uuid: 8.3.2 patched: true - /next-router-mock@0.9.1(next@15.0.1)(react@19.0.0-rc-cae764ce-20241025): + /next-router-mock@0.9.1(next@15.0.1)(react@19.0.0): resolution: { integrity: sha512-GTrns944dnFNgycpinyRszOiwwk99LUJsvvX0FWRgUFHv6hOuzCns1rmTlzO+DRimYB9/XMA+87X2/dQLzjiUQ==, } peerDependencies: - next: 15.0.1 + next: ">=10.0.0" react: ">=17.0.0" dependencies: - next: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025) - react: 19.0.0-rc-cae764ce-20241025 + next: 15.0.1(@babel/core@7.12.10)(react-dom@19.0.0)(react@19.0.0) + react: 19.0.0 dev: true - /next@15.0.1(@babel/core@7.12.10)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): + /next@15.0.1(@babel/core@7.12.10)(react-dom@19.0.0)(react@19.0.0): resolution: { integrity: sha512-PSkFkr/w7UnFWm+EP8y/QpHrJXMqpZzAXpergB/EqLPOh4SGPJXv1wj4mslr2hUZBAS9pX7/9YLIdxTv6fwytw==, @@ -17652,9 +17654,9 @@ packages: busboy: 1.6.0 caniuse-lite: 1.0.30001599 postcss: 8.4.31 - react: 19.0.0-rc-cae764ce-20241025 - react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) - styled-jsx: 5.1.6(@babel/core@7.12.10)(react@19.0.0-rc-cae764ce-20241025) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + styled-jsx: 5.1.6(@babel/core@7.12.10)(react@19.0.0) optionalDependencies: "@next/swc-darwin-arm64": 15.0.1 "@next/swc-darwin-x64": 15.0.1 @@ -17668,9 +17670,8 @@ packages: transitivePeerDependencies: - "@babel/core" - babel-plugin-macros - dev: false - /next@15.0.1(@babel/core@7.18.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): + /next@15.0.1(@babel/core@7.18.2)(react-dom@19.0.0)(react@19.0.0): resolution: { integrity: sha512-PSkFkr/w7UnFWm+EP8y/QpHrJXMqpZzAXpergB/EqLPOh4SGPJXv1wj4mslr2hUZBAS9pX7/9YLIdxTv6fwytw==, @@ -17700,9 +17701,9 @@ packages: busboy: 1.6.0 caniuse-lite: 1.0.30001599 postcss: 8.4.31 - react: 19.0.0-rc-cae764ce-20241025 - react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) - styled-jsx: 5.1.6(@babel/core@7.18.2)(react@19.0.0-rc-cae764ce-20241025) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + styled-jsx: 5.1.6(@babel/core@7.18.2)(react@19.0.0) optionalDependencies: "@next/swc-darwin-arm64": 15.0.1 "@next/swc-darwin-x64": 15.0.1 @@ -17718,7 +17719,7 @@ packages: - babel-plugin-macros dev: false - /next@15.0.1(@babel/core@7.20.2)(react-dom@19.0.0-rc-cae764ce-20241025)(react@19.0.0-rc-cae764ce-20241025): + /next@15.0.1(@babel/core@7.20.2)(react-dom@19.0.0)(react@19.0.0): resolution: { integrity: sha512-PSkFkr/w7UnFWm+EP8y/QpHrJXMqpZzAXpergB/EqLPOh4SGPJXv1wj4mslr2hUZBAS9pX7/9YLIdxTv6fwytw==, @@ -17748,9 +17749,9 @@ packages: busboy: 1.6.0 caniuse-lite: 1.0.30001599 postcss: 8.4.31 - react: 19.0.0-rc-cae764ce-20241025 - react-dom: 19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025) - styled-jsx: 5.1.6(@babel/core@7.20.2)(react@19.0.0-rc-cae764ce-20241025) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + styled-jsx: 5.1.6(@babel/core@7.20.2)(react@19.0.0) optionalDependencies: "@next/swc-darwin-arm64": 15.0.1 "@next/swc-darwin-x64": 15.0.1 @@ -19514,18 +19515,18 @@ packages: scheduler: 0.23.0 dev: false - /react-dom@19.0.0-rc-cae764ce-20241025(react@19.0.0-rc-cae764ce-20241025): + /react-dom@19.0.0(react@19.0.0): resolution: { - integrity: sha512-e3CVe2+ojMe4dz8E/WsV9bkRj+lZt5ms+rhTFHEqIAHv4/PDdXa7P4uJXNhfik+ZYF4Wg5wCDVP4l7cgaudCpg==, + integrity: sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==, } peerDependencies: - react: 19.0.0-rc-cae764ce-20241025 + react: ^19.0.0 dependencies: - react: 19.0.0-rc-cae764ce-20241025 - scheduler: 0.25.0-rc-cae764ce-20241025 + react: 19.0.0 + scheduler: 0.25.0 - /react-error-boundary@3.1.4(react@19.0.0-rc-cae764ce-20241025): + /react-error-boundary@3.1.4(react@19.0.0): resolution: { integrity: sha512-uM9uPzZJTF6wRQORmSrvOIgt4lJ9MC1sNgEOj2XGsDTRE4kmpWxg7ENK9EWNKJRMAOY9z0MuF4yIfl6gp4sotA==, @@ -19535,10 +19536,10 @@ packages: react: ">=16.13.1" dependencies: "@babel/runtime": 7.18.3 - react: 19.0.0-rc-cae764ce-20241025 + react: 19.0.0 dev: true - /react-hook-form@7.39.1(react@19.0.0-rc-cae764ce-20241025): + /react-hook-form@7.39.1(react@19.0.0): resolution: { integrity: sha512-MiF9PCILN5KulhSGbnjohMiTOrB47GerDTichMNP0y2cPUu1GTRFqbunOxCE9N1499YTLMV/ne4gFzqCp1rxrQ==, @@ -19547,7 +19548,7 @@ packages: peerDependencies: react: ^16.8.0 || ^17 || ^18 dependencies: - react: 19.0.0-rc-cae764ce-20241025 + react: 19.0.0 dev: false /react-is@16.13.1: @@ -19569,7 +19570,7 @@ packages: integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==, } - /react-reconciler@0.26.2(react@19.0.0-rc-cae764ce-20241025): + /react-reconciler@0.26.2(react@19.0.0): resolution: { integrity: sha512-nK6kgY28HwrMNwDnMui3dvm3rCFjZrcGiuwLc5COUipBK5hWHLOxMJhSnSomirqWwjPBJKV1QcbkI0VJr7Gl1Q==, @@ -19580,7 +19581,7 @@ packages: dependencies: loose-envify: 1.4.0 object-assign: 4.1.1 - react: 19.0.0-rc-cae764ce-20241025 + react: 19.0.0 scheduler: 0.20.2 dev: false @@ -19610,10 +19611,10 @@ packages: loose-envify: 1.4.0 dev: false - /react@19.0.0-rc-cae764ce-20241025: + /react@19.0.0: resolution: { - integrity: sha512-5wV/3MJc6Ws4l4ZF95yaQKaMV8aWVlIBKOdPA4Kere7CfdJ0NMIuKt9j9v0U4ZTmCi4ubAdN+KL4gGdfTEIpuw==, + integrity: sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==, } engines: {node: ">=0.10.0"} @@ -20262,10 +20263,10 @@ packages: loose-envify: 1.4.0 dev: false - /scheduler@0.25.0-rc-cae764ce-20241025: + /scheduler@0.25.0: resolution: { - integrity: sha512-kiDqIcp0nrZ8RW65wMujBEs7eDNfd49hcfjDmscxWIsnDTz9NRQrTAChv/tYRYCUNk7qPM36SQOja2HcRuee0A==, + integrity: sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==, } /schema-utils@3.3.0: @@ -21215,7 +21216,7 @@ packages: dependencies: acorn: 8.8.1 - /styled-jsx@5.1.6(@babel/core@7.12.10)(react@19.0.0-rc-cae764ce-20241025): + /styled-jsx@5.1.6(@babel/core@7.12.10)(react@19.0.0): resolution: { integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==, @@ -21233,10 +21234,9 @@ packages: dependencies: "@babel/core": 7.12.10(supports-color@8.1.1) client-only: 0.0.1 - react: 19.0.0-rc-cae764ce-20241025 - dev: false + react: 19.0.0 - /styled-jsx@5.1.6(@babel/core@7.18.2)(react@19.0.0-rc-cae764ce-20241025): + /styled-jsx@5.1.6(@babel/core@7.18.2)(react@19.0.0): resolution: { integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==, @@ -21254,10 +21254,10 @@ packages: dependencies: "@babel/core": 7.18.2 client-only: 0.0.1 - react: 19.0.0-rc-cae764ce-20241025 + react: 19.0.0 dev: false - /styled-jsx@5.1.6(@babel/core@7.20.2)(react@19.0.0-rc-cae764ce-20241025): + /styled-jsx@5.1.6(@babel/core@7.20.2)(react@19.0.0): resolution: { integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==, @@ -21275,7 +21275,7 @@ packages: dependencies: "@babel/core": 7.20.2(supports-color@8.1.1) client-only: 0.0.1 - react: 19.0.0-rc-cae764ce-20241025 + react: 19.0.0 /styled-jsx@5.1.6(react@18.2.0): resolution: @@ -21779,7 +21779,7 @@ packages: } dev: true - /ts-jest@27.1.4(@babel/core@7.20.2)(esbuild@0.14.51)(jest@27.5.1)(typescript@4.8.4): + /ts-jest@27.1.4(@babel/core@7.12.10)(esbuild@0.14.51)(jest@27.5.1)(typescript@4.8.4): resolution: { integrity: sha512-qjkZlVPWVctAezwsOD1OPzbZ+k7zA5z3oxII4dGdZo5ggX/PL7kvwTM0pXTr10fAtbiVpJaL3bWd502zAhpgSQ==, @@ -21803,7 +21803,7 @@ packages: esbuild: optional: true dependencies: - "@babel/core": 7.20.2(supports-color@8.1.1) + "@babel/core": 7.12.10(supports-color@8.1.1) bs-logger: 0.2.6 esbuild: 0.14.51 fast-json-stable-stringify: 2.1.0 @@ -22508,7 +22508,7 @@ packages: querystring: 0.2.0 dev: false - /use-sync-external-store@1.2.0(react@19.0.0-rc-cae764ce-20241025): + /use-sync-external-store@1.2.0(react@19.0.0): resolution: { integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==, @@ -22516,7 +22516,7 @@ packages: peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 dependencies: - react: 19.0.0-rc-cae764ce-20241025 + react: 19.0.0 /use@3.1.1: resolution: From f8ab8fce25425b67fe61ef5939253e339af6d623 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Fri, 20 Dec 2024 17:38:51 +0530 Subject: [PATCH 19/22] fix unit tests --- .../src/error-boundary-hook.test.tsx | 4 +- .../blitz-next/src/error-boundary.test.tsx | 54 +++++++------------ 2 files changed, 22 insertions(+), 36 deletions(-) diff --git a/packages/blitz-next/src/error-boundary-hook.test.tsx b/packages/blitz-next/src/error-boundary-hook.test.tsx index f92bc38989..9fa8f153bb 100644 --- a/packages/blitz-next/src/error-boundary-hook.test.tsx +++ b/packages/blitz-next/src/error-boundary-hook.test.tsx @@ -70,7 +70,7 @@ test("handleError forwards along async errors", async () => { // // React will try to recreate this component tree from scratch using the error boundary you provided, ErrorBoundary." // `) - expect(consoleError).toHaveBeenCalledTimes(3) + expect(consoleError).toHaveBeenCalledTimes(1) consoleError.mockClear() // can recover @@ -116,7 +116,7 @@ test("can pass an error to useErrorHandler", async () => { // // React will try to recreate this component tree from scratch using the error boundary you provided, ErrorBoundary." // `) - expect(consoleError).toHaveBeenCalledTimes(3) + expect(consoleError).toHaveBeenCalledTimes(1) consoleError.mockClear() // can recover diff --git a/packages/blitz-next/src/error-boundary.test.tsx b/packages/blitz-next/src/error-boundary.test.tsx index ced4f1211b..debe3fa2c0 100644 --- a/packages/blitz-next/src/error-boundary.test.tsx +++ b/packages/blitz-next/src/error-boundary.test.tsx @@ -77,11 +77,9 @@ test("standard use-case", () => { const {unmount} = render() userEvent.type(screen.getByRole("textbox", {name: /username/i}), "fail") - - const [[actualError], [componentStack]] = consoleError.mock.calls - expect(firstLine(actualError as string)).toMatchInlineSnapshot( - `"Error: Uncaught [Error: 💥 CABOOM 💥]"`, - ) + const calls = consoleError.mock.calls[0] + //@ts-expect-error - it's a mock + expect(calls[1]).toMatchInlineSnapshot("[Error: 💥 CABOOM 💥]") expect(cleanStack(componentStack)).toMatchInlineSnapshot(` "Error: Uncaught [Error: 💥 CABOOM 💥] at reportException @@ -149,7 +147,7 @@ test("fallbackRender prop", () => { } const {unmount} = render() - expect(consoleError).toHaveBeenCalledTimes(3) + expect(consoleError).toHaveBeenCalledTimes(1) consoleError.mockClear() // the render prop API allows a single action to reset the app state @@ -168,14 +166,14 @@ test("simple fallback is supported", () => { child , ) - expect(consoleError).toHaveBeenCalledTimes(3) + expect(consoleError).toHaveBeenCalledTimes(1) consoleError.mockClear() expect(screen.getByText(/oh no/i)).to.exist expect(screen.queryByText(/child/i)).to.not.exist unmount() }) -test("withErrorBoundary HOC", () => { +test.only("withErrorBoundary HOC", () => { const consoleError = console.error as MockedFunction<(args: unknown[]) => void> const onErrorHandler = vi.fn() @@ -183,27 +181,16 @@ test("withErrorBoundary HOC", () => { () => { throw new Error("💥 CABOOM 💥") }, - {FallbackComponent: ErrorFallback, onError: onErrorHandler}, + { + FallbackComponent: ErrorFallback, + onError: onErrorHandler, + }, ) const {unmount} = render() - - const [[actualError], [componentStack]] = consoleError.mock.calls - const firstLineOfError = firstLine(actualError as string) - expect(firstLineOfError).toMatchInlineSnapshot(`"Error: Uncaught [Error: 💥 CABOOM 💥]"`) - expect(cleanStack(componentStack)).toMatchInlineSnapshot(` - "Error: Uncaught [Error: 💥 CABOOM 💥] - at reportException - at innerInvokeEventListeners - at invokeEventListeners - at HTMLUnknownElementImpl._dispatch - at HTMLUnknownElementImpl.dispatchEvent - at HTMLUnknownElement.dispatchEvent - at Object.invokeGuardedCallbackDev - at invokeGuardedCallback - at beginWork\$1 - at performUnitOfWork " - `) - expect(consoleError).toHaveBeenCalledTimes(3) + const calls = consoleError.mock.calls[0] + //@ts-expect-error - it's a mock + expect(calls[1]).toMatchInlineSnapshot("[Error: 💥 CABOOM 💥]") + expect(consoleError).toHaveBeenCalledTimes(1) consoleError.mockClear() const [error, onErrorComponentStack] = (onErrorHandler.mock.calls as [[Error, string]])[0] @@ -265,7 +252,6 @@ test("requires either a fallback, fallbackRender, or FallbackComponent", () => { let unmount: undefined | (() => void) expect(() => { const result = render( - // @ts-expect-error we're testing the runtime check of missing props here , @@ -318,7 +304,7 @@ test("supports automatic reset of error boundary when resetKeys change", () => { // blow it up userEvent.click(screen.getByText("toggle explode")) expect(screen.getByRole("alert")).to.exist - expect(consoleError).toHaveBeenCalledTimes(3) + expect(consoleError).toHaveBeenCalledTimes(1) consoleError.mockClear() // recover via try again button @@ -333,7 +319,7 @@ test("supports automatic reset of error boundary when resetKeys change", () => { // blow it up again userEvent.click(screen.getByText("toggle explode")) expect(screen.getByRole("alert")).to.exist - expect(consoleError).toHaveBeenCalledTimes(3) + expect(consoleError).toHaveBeenCalledTimes(1) consoleError.mockClear() // recover via resetKeys change @@ -348,7 +334,7 @@ test("supports automatic reset of error boundary when resetKeys change", () => { // blow it up again userEvent.click(screen.getByText("toggle explode")) expect(screen.getByRole("alert")).to.exist - expect(consoleError).toHaveBeenCalledTimes(3) + expect(consoleError).toHaveBeenCalledTimes(1) consoleError.mockClear() // toggles adding an extra resetKey to the array @@ -358,7 +344,7 @@ test("supports automatic reset of error boundary when resetKeys change", () => { expect(handleResetKeysChange).toHaveBeenCalledWith([true], [true, true]) handleResetKeysChange.mockClear() expect(screen.getByRole("alert")).to.exist - expect(consoleError).toHaveBeenCalledTimes(3) + expect(consoleError).toHaveBeenCalledTimes(1) consoleError.mockClear() // toggle explode back to false @@ -369,7 +355,7 @@ test("supports automatic reset of error boundary when resetKeys change", () => { expect(handleResetKeysChange).toHaveBeenCalledWith([true, true], [false, true]) expect(screen.getByRole("alert")).to.exist handleResetKeysChange.mockClear() - expect(consoleError).toHaveBeenCalledTimes(3) + expect(consoleError).toHaveBeenCalledTimes(1) consoleError.mockClear() // toggle extra resetKey @@ -411,7 +397,7 @@ test("supports reset via resetKeys right after error is triggered on component m // it blows up on render expect(screen.queryByRole("alert", {})).to.exist - expect(consoleError).toHaveBeenCalledTimes(3) + expect(consoleError).toHaveBeenCalledTimes(1) consoleError.mockClear() // recover via "toggle explode" button From fbd64739cb159cba61e43adb317639ea98019463 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Fri, 20 Dec 2024 17:41:34 +0530 Subject: [PATCH 20/22] fix --- packages/blitz-next/src/error-boundary.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/blitz-next/src/error-boundary.test.tsx b/packages/blitz-next/src/error-boundary.test.tsx index debe3fa2c0..2ae827b18d 100644 --- a/packages/blitz-next/src/error-boundary.test.tsx +++ b/packages/blitz-next/src/error-boundary.test.tsx @@ -173,7 +173,7 @@ test("simple fallback is supported", () => { unmount() }) -test.only("withErrorBoundary HOC", () => { +test("withErrorBoundary HOC", () => { const consoleError = console.error as MockedFunction<(args: unknown[]) => void> const onErrorHandler = vi.fn() From a38caabd109155f922b3add86af3e04498b99825 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Fri, 20 Dec 2024 18:38:27 +0530 Subject: [PATCH 21/22] fix --- packages/blitz-next/src/error-boundary.test.tsx | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/packages/blitz-next/src/error-boundary.test.tsx b/packages/blitz-next/src/error-boundary.test.tsx index 2ae827b18d..0d2c8f759d 100644 --- a/packages/blitz-next/src/error-boundary.test.tsx +++ b/packages/blitz-next/src/error-boundary.test.tsx @@ -80,19 +80,6 @@ test("standard use-case", () => { const calls = consoleError.mock.calls[0] //@ts-expect-error - it's a mock expect(calls[1]).toMatchInlineSnapshot("[Error: 💥 CABOOM 💥]") - expect(cleanStack(componentStack)).toMatchInlineSnapshot(` - "Error: Uncaught [Error: 💥 CABOOM 💥] - at reportException - at innerInvokeEventListeners - at invokeEventListeners - at HTMLUnknownElementImpl._dispatch - at HTMLUnknownElementImpl.dispatchEvent - at HTMLUnknownElement.dispatchEvent - at Object.invokeGuardedCallbackDev - at invokeGuardedCallback - at beginWork\$1 - at performUnitOfWork " - `) expect(consoleError).toHaveBeenCalledTimes(3) consoleError.mockClear() From 2bb10b86cf51d7f490dec0fa4b5d89678c738b90 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Fri, 20 Dec 2024 20:18:01 +0530 Subject: [PATCH 22/22] fix again --- packages/blitz-next/src/error-boundary.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/blitz-next/src/error-boundary.test.tsx b/packages/blitz-next/src/error-boundary.test.tsx index 0d2c8f759d..fbe9b0e890 100644 --- a/packages/blitz-next/src/error-boundary.test.tsx +++ b/packages/blitz-next/src/error-boundary.test.tsx @@ -80,7 +80,7 @@ test("standard use-case", () => { const calls = consoleError.mock.calls[0] //@ts-expect-error - it's a mock expect(calls[1]).toMatchInlineSnapshot("[Error: 💥 CABOOM 💥]") - expect(consoleError).toHaveBeenCalledTimes(3) + expect(consoleError).toHaveBeenCalledTimes(1) consoleError.mockClear() expect(screen.getByRole("alert")).toMatchInlineSnapshot(`