Upgradereact and @types/react in new app templates, update types (#…

…3282) (newapp)
blitz-js · Apr 12, 2022 · 881d686 · 881d686
1 parent a7deaaf
commit 881d686
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/nextjs/packages/next/stdlib/blitz-app-root.tsx b/nextjs/packages/next/stdlib/blitz-app-root.tsx
@@ -14,6 +14,7 @@ import { queryClient } from '../data-client/react-query-utils'
 const debug = require('debug')('blitz:approot')
 
 export type BlitzProviderProps = {
+  children?: React.ReactNode
   client?: QueryClient
   contextSharing?: boolean
   dehydratedState?: unknown

diff --git a/packages/generator/templates/app/app/core/layouts/Layout.tsx b/packages/generator/templates/app/app/core/layouts/Layout.tsx
@@ -1,6 +1,6 @@
 import { Head, BlitzLayout } from "blitz"
 
-const Layout: BlitzLayout<{title?: string}> = ({ title, children }) => {
+const Layout: BlitzLayout<{title?: string, children?: React.ReactNode}> = ({ title, children }) => {
   return (
     <>
       <Head>

diff --git a/packages/generator/templates/app/package.js.json b/packages/generator/templates/app/package.js.json
@@ -24,8 +24,8 @@
   "dependencies": {
     "@prisma/client": "3.x",
     "blitz": "latest",
-    "react-dom": "18.0.0-alpha-5ca4b0433-20211020",
-    "react": "18.0.0-beta-149b420f6-20211119",
+    "react-dom": "18.0.0",
+    "react": "18.0.0",
     "zod": "3.x"
   },
   "devDependencies": {

diff --git a/packages/generator/templates/app/package.ts.json b/packages/generator/templates/app/package.ts.json
@@ -26,13 +26,13 @@
   "dependencies": {
     "@prisma/client": "3.x",
     "blitz": "latest",
-    "react-dom": "18.0.0-alpha-5ca4b0433-20211020",
-    "react": "18.0.0-beta-149b420f6-20211119",
+    "react-dom": "18.0.0",
+    "react": "18.0.0",
     "zod": "3.x"
   },
   "devDependencies": {
     "@types/preview-email": "2.x",
-    "@types/react": "17.x",
+    "@types/react": "18.0.1",
     "eslint": "7.x",
     "husky": "7.x",
     "lint-staged": "11.x",

diff --git a/packages/generator/templates/app/test/utils.tsx b/packages/generator/templates/app/test/utils.tsx
@@ -30,7 +30,7 @@ export function render(
 ) {
   if (!wrapper) {
     // Add a default context wrapper if one isn't supplied from the test
-    wrapper = ({ children }) => (
+    wrapper = ({ children }: { children: React.ReactNode }) => (
       <BlitzProvider dehydratedState={dehydratedState}>
         <RouterContext.Provider value={{ ...mockRouter, ...router }}>
           {children}

diff --git a/packages/generator/templates/minimalapp/package.js.json b/packages/generator/templates/minimalapp/package.js.json
@@ -19,8 +19,8 @@
   },
   "dependencies": {
     "blitz": "latest",
-    "react-dom": "18.0.0-alpha-5ca4b0433-20211020",
-    "react": "18.0.0-beta-149b420f6-20211119"
+    "react-dom": "18.0.0",
+    "react": "18.0.0"
   },
   "devDependencies": {
     "eslint": "7.x",

diff --git a/packages/generator/templates/minimalapp/package.ts.json b/packages/generator/templates/minimalapp/package.ts.json
@@ -21,11 +21,11 @@
   },
   "dependencies": {
     "blitz": "latest",
-    "react-dom": "18.0.0-alpha-5ca4b0433-20211020",
-    "react": "18.0.0-beta-149b420f6-20211119"
+    "react-dom": "18.0.0",
+    "react": "18.0.0"
   },
   "devDependencies": {
-    "@types/react": "17.x",
+    "@types/react": "18.0.1",
     "eslint": "7.x",
     "husky": "7.x",
     "lint-staged": "11.x",