Merge branch 'main' into issue-4136

blitz-js · May 1, 2023 · 14bd73d · 14bd73d
2 parents 959b4fe + 5a64f1c
commit 14bd73d
Show file tree

Hide file tree

Showing 54 changed files with 318 additions and 245 deletions.
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -70,6 +70,7 @@
     "calm-papayas-protect",
     "calm-tomatoes-drive",
     "chatty-fireants-leave",
+    "chatty-gifts-whisper",
     "chilled-carrots-own",
     "chilly-candles-care",
     "chilly-nails-nail",
@@ -119,6 +120,7 @@
     "four-meals-fry",
     "four-radios-tickle",
     "four-sheep-judge",
+    "fresh-crews-chew",
     "funny-cups-pay",
     "fuzzy-bees-warn",
     "fuzzy-dots-cross",
@@ -195,6 +197,7 @@
     "nice-boxes-travel",
     "nice-deers-dream",
     "nice-starfishes-live",
+    "nine-bags-rhyme",
     "nine-birds-confess",
     "nine-onions-admire",
     "ninety-lies-press",
@@ -322,6 +325,7 @@
     "wicked-rings-walk",
     "wise-eels-visit",
     "wise-frogs-give",
+    "wise-lies-relate",
     "wise-rabbits-complain",
     "young-birds-talk"
   ]

diff --git a/apps/next13/CHANGELOG.md b/apps/next13/CHANGELOG.md
@@ -1,5 +1,18 @@
 # next-blitz-auth
 
+## 0.1.1-beta.3
+
+### Patch Changes
+
+- Updated dependencies [eda14fa8a]
+- Updated dependencies [3d004dc41]
+- Updated dependencies [29c2b029a]
+  - @blitzjs/next@2.0.0-beta.27
+  - @blitzjs/rpc@2.0.0-beta.27
+  - @blitzjs/auth@2.0.0-beta.27
+  - blitz@2.0.0-beta.27
+  - @blitzjs/config@2.0.0-beta.27
+
 ## 0.1.1-beta.2
 
 ### Patch Changes

diff --git a/apps/next13/package.json b/apps/next13/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next-blitz-auth",
-  "version": "0.1.1-beta.2",
+  "version": "0.1.1-beta.3",
   "private": true,
   "scripts": {
     "blitz:dev": "next dev",

diff --git a/apps/toolkit-app-passportjs/package.json b/apps/toolkit-app-passportjs/package.json
@@ -30,7 +30,7 @@
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.26",
+    "blitz": "workspace:2.0.0-beta.27",
     "next": "13.3.0",
     "openid-client": "5.2.1",
     "prisma": "4.6.1",

diff --git a/apps/toolkit-app/package.json b/apps/toolkit-app/package.json
@@ -31,7 +31,7 @@
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.26",
+    "blitz": "workspace:2.0.0-beta.27",
     "next": "13.3.0",
     "next-auth": "4.18.7",
     "prisma": "4.6.1",

diff --git a/integration-tests/auth-with-rpc/package.json b/integration-tests/auth-with-rpc/package.json
@@ -17,14 +17,14 @@
     "prisma:studio": "prisma studio"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.26",
-    "@blitzjs/config": "workspace:2.0.0-beta.26",
-    "@blitzjs/next": "workspace:2.0.0-beta.26",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.26",
+    "@blitzjs/auth": "workspace:2.0.0-beta.27",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.26",
+    "blitz": "workspace:2.0.0-beta.27",
     "delay": "5.0.0",
     "next": "13.3.0",
     "prisma": "4.6.1",

diff --git a/integration-tests/auth/package.json b/integration-tests/auth/package.json
@@ -17,11 +17,11 @@
     "prisma:studio": "prisma studio"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.26",
-    "@blitzjs/config": "workspace:2.0.0-beta.26",
-    "@blitzjs/next": "workspace:2.0.0-beta.26",
+    "@blitzjs/auth": "workspace:2.0.0-beta.27",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.26",
+    "blitz": "workspace:2.0.0-beta.27",
     "lowdb": "3.0.0",
     "next": "13.3.0",
     "prisma": "4.6.1",

diff --git a/integration-tests/get-initial-props/package.json b/integration-tests/get-initial-props/package.json
@@ -16,19 +16,19 @@
     "schema": "db/schema.prisma"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.26",
-    "@blitzjs/next": "workspace:2.0.0-beta.26",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.26",
+    "@blitzjs/auth": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.26",
+    "blitz": "workspace:2.0.0-beta.27",
     "lowdb": "3.0.0",
     "next": "13.3.0",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.26",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

diff --git a/integration-tests/middleware/package.json b/integration-tests/middleware/package.json
@@ -11,10 +11,10 @@
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
   },
   "dependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.26",
-    "@blitzjs/next": "workspace:2.0.0-beta.26",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.26",
-    "blitz": "workspace:2.0.0-beta.26",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
+    "blitz": "workspace:2.0.0-beta.27",
     "next": "13.3.0",
     "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
@@ -17,12 +17,12 @@
     "prisma:studio": "prisma studio"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.26",
-    "@blitzjs/config": "workspace:2.0.0-beta.26",
-    "@blitzjs/next": "workspace:2.0.0-beta.26",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.26",
+    "@blitzjs/auth": "workspace:2.0.0-beta.27",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.26",
+    "blitz": "workspace:2.0.0-beta.27",
     "lowdb": "3.0.0",
     "next": "13.3.0",
     "prisma": "4.6.1",

diff --git a/integration-tests/no-suspense/package.json b/integration-tests/no-suspense/package.json
@@ -16,19 +16,19 @@
     "prisma:studio": "prisma studio"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.26",
-    "@blitzjs/next": "workspace:2.0.0-beta.26",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.26",
+    "@blitzjs/auth": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.26",
+    "blitz": "workspace:2.0.0-beta.27",
     "lowdb": "3.0.0",
     "next": "13.3.0",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.26",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

diff --git a/integration-tests/qm/package.json b/integration-tests/qm/package.json
@@ -8,13 +8,13 @@
     "clean": "rm -rf .turbo && rm -rf node_modules"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.26",
-    "@blitzjs/config": "workspace:2.0.0-beta.26",
-    "@blitzjs/next": "workspace:2.0.0-beta.26",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.26",
+    "@blitzjs/auth": "workspace:2.0.0-beta.27",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
     "@prisma/client": "4.6.1",
     "@tanstack/react-query": "4.0.10",
-    "blitz": "workspace:2.0.0-beta.26",
+    "blitz": "workspace:2.0.0-beta.27",
     "next": "13.3.0",
     "prisma": "4.6.1",
     "react": "18.2.0",

diff --git a/integration-tests/react-query-utils/package.json b/integration-tests/react-query-utils/package.json
@@ -16,18 +16,18 @@
     "schema": "db/schema.prisma"
   },
   "dependencies": {
-    "@blitzjs/next": "workspace:2.0.0-beta.26",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.26",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.26",
+    "blitz": "workspace:2.0.0-beta.27",
     "lowdb": "3.0.0",
     "next": "13.3.0",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.26",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

diff --git a/integration-tests/rpc-path-root/package.json b/integration-tests/rpc-path-root/package.json
@@ -7,10 +7,10 @@
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
   },
   "dependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.26",
-    "@blitzjs/next": "workspace:2.0.0-beta.26",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.26",
-    "blitz": "workspace:2.0.0-beta.26",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
+    "blitz": "workspace:2.0.0-beta.27",
     "next": "13.3.0",
     "react": "18.2.0",
     "react-dom": "18.2.0"

diff --git a/integration-tests/rpc/package.json b/integration-tests/rpc/package.json
@@ -7,10 +7,10 @@
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
   },
   "dependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.26",
-    "@blitzjs/next": "workspace:2.0.0-beta.26",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.26",
-    "blitz": "workspace:2.0.0-beta.26",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
+    "blitz": "workspace:2.0.0-beta.27",
     "next": "13.3.0",
     "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
@@ -16,19 +16,19 @@
     "schema": "db/schema.prisma"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.26",
-    "@blitzjs/next": "workspace:2.0.0-beta.26",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.26",
+    "@blitzjs/auth": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.26",
+    "blitz": "workspace:2.0.0-beta.27",
     "lowdb": "3.0.0",
     "next": "13.3.0",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.26",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

diff --git a/packages/blitz-auth/CHANGELOG.md b/packages/blitz-auth/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @blitzjs/auth
 
+## 2.0.0-beta.27
+
+### Patch Changes
+
+- 29c2b029a: Fix: Add missing entry to expose next-auth adapter in Blitz Auth
+  - blitz@2.0.0-beta.27
+
 ## 2.0.0-beta.26
 
 ### Patch Changes

diff --git a/packages/blitz-auth/package.json b/packages/blitz-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-beta.26",
+  "version": "2.0.0-beta.27",
   "homepage": "https://blitzjs.com/",
   "repository": {
     "type": "git",
@@ -48,7 +48,7 @@
     "url": "0.11.0"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-beta.26",
+    "blitz": "2.0.0-beta.27",
     "next": "*",
     "next-auth": "*",
     "secure-password": "4.0.0"
@@ -65,15 +65,15 @@
     }
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.26",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
     "@testing-library/react": "13.4.0",
     "@testing-library/react-hooks": "8.0.1",
     "@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",
-    "blitz": "2.0.0-beta.26",
+    "blitz": "2.0.0-beta.27",
     "next": "13.3.0",
     "next-auth": "4.18.7",
     "react": "18.2.0",

diff --git a/packages/blitz-next/CHANGELOG.md b/packages/blitz-next/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @blitzjs/next
 
+## 2.0.0-beta.27
+
+### Minor Changes
+
+- eda14fa8a: Add ability to format the error on the server before returning it to the client.
+- 3d004dc41: Fix the DYNAMIC_SERVER_USAGE error for Next.js 13.3.1+
+
+### Patch Changes
+
+- Updated dependencies [eda14fa8a]
+  - @blitzjs/rpc@2.0.0-beta.27
+  - blitz@2.0.0-beta.27
+
 ## 2.0.0-beta.26
 
 ### Patch Changes