Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[legacy-framework] Upgradereact and @types/react in new app templates, update template types #3282

Merged
merged 2 commits into from Apr 12, 2022
Merged

[legacy-framework] Upgradereact and @types/react in new app templates, update template types #3282

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
227575a
Upgrade React in templates, fix types
beerose Apr 11, 2022
573a404
Update minimal app templates
beerose Apr 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions nextjs/packages/next/stdlib/blitz-app-root.tsx
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/generator/templates/app/app/core/layouts/Layout.tsx
View file
Open in desktop
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions packages/generator/templates/app/package.js.json
View file
Open in desktop
Expand Up @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions packages/generator/templates/app/package.ts.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/generator/templates/app/test/utils.tsx
View file
Open in desktop
Expand Up @@ -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}
Expand Down