Update Next.js version and addBasePath location (#3506)

blitz-js · Jul 6, 2022 · c11f040 · c11f040
1 parent 830b51d
commit c11f040
Show file tree

Hide file tree

Showing 23 changed files with 177 additions and 129 deletions.
diff --git a/.changeset/lemon-games-press.md b/.changeset/lemon-games-press.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/rpc": patch
+"@blitzjs/generator": patch
+---
+
+Update Next.js version and addBasePath location
diff --git a/apps/toolkit-app/package.json b/apps/toolkit-app/package.json
@@ -30,13 +30,13 @@
     "@hookform/resolvers": "2.8.8",
     "@prisma/client": "3.9.0",
     "blitz": "workspace:2.0.0-alpha.49",
-    "next": "12.1.6-canary.17",
+    "next": "12.2.0",
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "react-hook-form": "7.29.0",
     "ts-node": "10.7.0",
-    "zod": "3.10.1"
+    "zod": "3.17.3"
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -25,7 +25,7 @@
     "@types/passport-twitter": "1.0.37",
     "blitz": "workspace:*",
     "jest": "27.5.1",
-    "next": "12.1.6-canary.17",
+    "next": "12.2.0",
     "passport-mock-strategy": "2.0.0",
     "passport-twitter": "1.0.4",
     "prisma": "3.9.0",

diff --git a/integration-tests/auth/package.json b/integration-tests/auth/package.json
@@ -19,7 +19,7 @@
     "@prisma/client": "3.9.0",
     "blitz": "workspace:*",
     "lowdb": "3.0.0",
-    "next": "12.1.6-canary.17",
+    "next": "12.2.0",
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0"

diff --git a/...ion-tests/middleware/pages/_middleware.ts → integration-tests/middleware/middleware.ts b/...ion-tests/middleware/pages/_middleware.ts → integration-tests/middleware/middleware.ts
diff --git a/integration-tests/middleware/next.config.js b/integration-tests/middleware/next.config.js
@@ -1,4 +1,2 @@
 const {withBlitz} = require("@blitzjs/next")
-module.exports = withBlitz({
-  // update me
-})
+module.exports = withBlitz({})
diff --git a/integration-tests/middleware/package.json b/integration-tests/middleware/package.json
@@ -15,7 +15,7 @@
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
     "blitz": "workspace:*",
-    "next": "12.1.6-canary.17",
+    "next": "12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0"
   },

diff --git a/integration-tests/no-suspense/package.json b/integration-tests/no-suspense/package.json
@@ -19,7 +19,7 @@
     "@prisma/client": "3.9.0",
     "blitz": "workspace:*",
     "lowdb": "3.0.0",
-    "next": "12.1.6-canary.17",
+    "next": "12.2.0",
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0"

diff --git a/integration-tests/qm/package.json b/integration-tests/qm/package.json
@@ -14,7 +14,7 @@
     "@blitzjs/rpc": "workspace:*",
     "@prisma/client": "3.9.0",
     "blitz": "workspace:*",
-    "next": "12.1.6-canary.17",
+    "next": "12.2.0",
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",

diff --git a/integration-tests/rpc/package.json b/integration-tests/rpc/package.json
@@ -12,7 +12,7 @@
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
     "blitz": "workspace:*",
-    "next": "12.1.6-canary.17",
+    "next": "12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0"
   },

diff --git a/integration-tests/trailing-slash/package.json b/integration-tests/trailing-slash/package.json
@@ -22,7 +22,7 @@
     "@prisma/client": "3.9.0",
     "blitz": "workspace:*",
     "lowdb": "3.0.0",
-    "next": "12.1.6-canary.17",
+    "next": "12.2.0",
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0"

diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "husky": "7.0.4",
     "jsdom": "^19.0.0",
     "lint-staged": "12.1.7",
-    "next": "12.1.6-canary.17",
+    "next": "12.2.0",
     "only-allow": "1.1.0",
     "patch-package": "6.4.7",
     "prettier": "^2.5.1",

diff --git a/packages/blitz-auth/src/server/passport-adapter.ts b/packages/blitz-auth/src/server/passport-adapter.ts
@@ -57,7 +57,7 @@ export type VerifyCallbackResult = {
 
 export type ApiHandlerIncomingMessage = IncomingMessage & {
   query: {
-    [key: string]: string | string[]
+    [key: string]: string | string[] | undefined
   }
 }
 

diff --git a/packages/blitz-next/package.json b/packages/blitz-next/package.json
@@ -45,7 +45,7 @@
     "blitz": "2.0.0-alpha.49",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
-    "next": "12.1.6-canary.17",
+    "next": "12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "resolve-from": "5.0.0",
@@ -58,7 +58,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "next": "*",
+    "next": ">=12.2.0",
     "react": "*"
   }
 }
diff --git a/packages/blitz-rpc/package.json b/packages/blitz-rpc/package.json
@@ -27,15 +27,15 @@
     "debug": "4.3.3",
     "react-query": "3.39.0",
     "superjson": "1.8.0",
-    "zod": "3.10.1"
+    "zod": "3.17.3"
   },
   "devDependencies": {
     "@blitzjs/config": "workspace:2.0.0-alpha.49",
     "@types/debug": "4.1.7",
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
     "blitz": "2.0.0-alpha.49",
-    "next": "12.1.6-canary.17",
+    "next": "12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "typescript": "^4.5.3",
@@ -44,7 +44,7 @@
   },
   "peerDependencies": {
     "blitz": "2.0.0-alpha.49",
-    "next": "*"
+    "next": ">=12.2.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/blitz-rpc/src/data-client/rpc.ts b/packages/blitz-rpc/src/data-client/rpc.ts
@@ -1,5 +1,5 @@
 import {normalizePathTrailingSlash} from "next/dist/client/normalize-trailing-slash"
-import {addBasePath} from "next/dist/shared/lib/router/router"
+import {addBasePath} from "next/dist/client/add-base-path"
 import {deserialize, serialize} from "superjson"
 import {SuperJSONResult} from "superjson/dist/types"
 import {CSRFTokenMismatchError, isServer} from "blitz"

diff --git a/packages/blitz/package.json b/packages/blitz/package.json
@@ -75,7 +75,7 @@
     "typescript": "^4.5.3",
     "unbuild": "0.6.9",
     "watch": "1.0.2",
-    "zod": "3.10.1"
+    "zod": "3.17.3"
   },
   "peerDependencies": {
     "react": "*"

diff --git a/packages/blitz/src/zod-utils.test.ts b/packages/blitz/src/zod-utils.test.ts
@@ -78,7 +78,7 @@ describe("formatZodError", () => {
     })
     expect(formatZodError(result.error)).toEqual({
       students: [undefined, {name: "Required"}, {name: "Expected string, received boolean"}],
-      data: [undefined, "Expected true, received undefined"],
+      data: [undefined, "Invalid literal value, expected true"],
     })
   })
 })

diff --git a/packages/generator/templates/app/package.js.json b/packages/generator/templates/app/package.js.json
@@ -27,11 +27,11 @@
     "@blitzjs/rpc": "latest",
     "@prisma/client": "3.9.0",
     "blitz": "alpha",
-    "next": "12.1.6",
+    "next": "12.2.0",
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
-    "zod": "3.10.1"
+    "zod": "3.17.3"
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",

diff --git a/packages/generator/templates/app/package.ts.json b/packages/generator/templates/app/package.ts.json
@@ -27,11 +27,11 @@
     "@blitzjs/rpc": "latest",
     "@prisma/client": "3.9.0",
     "blitz": "alpha",
-    "next": "12.1.6",
+    "next": "12.2.0",
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
-    "zod": "3.10.1"
+    "zod": "3.17.3"
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",

diff --git a/packages/generator/templates/minimalapp/package.js.json b/packages/generator/templates/minimalapp/package.js.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@blitzjs/next": "alpha",
     "blitz": "alpha",
-    "next": "12.1.6",
+    "next": "12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "ts-node": "10.7.0"

diff --git a/packages/generator/templates/minimalapp/package.ts.json b/packages/generator/templates/minimalapp/package.ts.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "@blitzjs/next": "alpha",
     "blitz": "alpha",
-    "next": "12.1.6",
+    "next": "12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "ts-node": "10.7.0"