Compare commits
8 Commits
@blitzjs/c
...
@blitzjs/c
| Author | SHA1 | Date | |
|---|---|---|---|
|
0411689b1d | ||
|
|
0d3514cd27 | ||
|
|
a9edde6d83 | ||
|
|
5c5decbce2 | ||
|
|
e476beba39 | ||
|
|
1a1b23a7e8 | ||
|
|
ae0b714f69 | ||
|
|
7817fe3a85 |
6
.changeset/four-brooms-juggle.md
Normal file
6
.changeset/four-brooms-juggle.md
Normal file
@@ -0,0 +1,6 @@
|
||||
---
|
||||
"@blitzjs/auth": patch
|
||||
"@blitzjs/next": patch
|
||||
---
|
||||
|
||||
Add missing RouteUrlObject on Page.authenticate.redirectTo
|
||||
5
.changeset/good-insects-wink.md
Normal file
5
.changeset/good-insects-wink.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
"@blitzjs/next": patch
|
||||
---
|
||||
|
||||
Allow passing optional type argument for ParamsType in GSSP
|
||||
@@ -32,9 +32,11 @@
|
||||
"famous-kings-explain",
|
||||
"fast-trainers-kneel",
|
||||
"flat-bees-approve",
|
||||
"four-brooms-juggle",
|
||||
"four-meals-fry",
|
||||
"fuzzy-jars-admire",
|
||||
"gentle-dogs-reply",
|
||||
"good-insects-wink",
|
||||
"great-months-train",
|
||||
"green-papayas-do",
|
||||
"healthy-rice-shout",
|
||||
@@ -55,6 +57,7 @@
|
||||
"poor-shrimps-think",
|
||||
"purple-singers-greet",
|
||||
"quiet-feet-travel",
|
||||
"quiet-pans-hunt",
|
||||
"rich-chairs-invent",
|
||||
"sharp-falcons-begin",
|
||||
"shy-olives-hang",
|
||||
|
||||
5
.changeset/quiet-pans-hunt.md
Normal file
5
.changeset/quiet-pans-hunt.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
"@blitzjs/next": patch
|
||||
---
|
||||
|
||||
Removes the suspense wrapper from withBlitz since it's not needed
|
||||
@@ -29,7 +29,7 @@
|
||||
"@blitzjs/rpc": "workspace:*",
|
||||
"@hookform/resolvers": "2.8.8",
|
||||
"@prisma/client": "3.9.0",
|
||||
"blitz": "workspace:2.0.0-alpha.43",
|
||||
"blitz": "workspace:2.0.0-alpha.45",
|
||||
"next": "12.1.6-canary.17",
|
||||
"prisma": "3.9.0",
|
||||
"react": "18.0.0",
|
||||
|
||||
@@ -1,5 +1,18 @@
|
||||
# @blitzjs/auth
|
||||
|
||||
## 2.0.0-alpha.45
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- blitz@2.0.0-alpha.45
|
||||
|
||||
## 2.0.0-alpha.44
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 7817fe3a: Add missing RouteUrlObject on Page.authenticate.redirectTo
|
||||
- blitz@2.0.0-alpha.44
|
||||
|
||||
## 2.0.0-alpha.43
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@blitzjs/auth",
|
||||
"version": "2.0.0-alpha.43",
|
||||
"version": "2.0.0-alpha.45",
|
||||
"scripts": {
|
||||
"build": "unbuild",
|
||||
"predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",
|
||||
@@ -26,7 +26,7 @@
|
||||
"@types/secure-password": "3.1.1",
|
||||
"b64-lite": "1.4.0",
|
||||
"bad-behavior": "1.0.1",
|
||||
"blitz": "2.0.0-alpha.43",
|
||||
"blitz": "2.0.0-alpha.45",
|
||||
"cookie": "0.4.1",
|
||||
"cookie-session": "2.0.0",
|
||||
"debug": "4.3.3",
|
||||
@@ -39,7 +39,7 @@
|
||||
"url": "0.11.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@blitzjs/config": "workspace:2.0.0-alpha.43",
|
||||
"@blitzjs/config": "workspace:2.0.0-alpha.45",
|
||||
"@testing-library/react": "13.0.0",
|
||||
"@testing-library/react-hooks": "7.0.2",
|
||||
"@types/cookie": "0.4.1",
|
||||
|
||||
@@ -205,7 +205,7 @@ export type RedirectAuthenticatedToFn = (
|
||||
|
||||
export type BlitzPage<P = {}> = React.ComponentType<P> & {
|
||||
getLayout?: (component: JSX.Element) => JSX.Element
|
||||
authenticate?: boolean | {redirectTo?: string}
|
||||
authenticate?: boolean | {redirectTo?: string | RouteUrlObject}
|
||||
suppressFirstRenderFlicker?: boolean
|
||||
redirectAuthenticatedTo?: RedirectAuthenticatedTo | RedirectAuthenticatedToFn
|
||||
}
|
||||
|
||||
@@ -1,5 +1,20 @@
|
||||
# @blitzjs/next
|
||||
|
||||
## 2.0.0-alpha.45
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 5c5decbc: Removes the suspense wrapper from withBlitz since it's not needed
|
||||
- @blitzjs/rpc@2.0.0-alpha.45
|
||||
|
||||
## 2.0.0-alpha.44
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 7817fe3a: Add missing RouteUrlObject on Page.authenticate.redirectTo
|
||||
- ae0b714f: Allow passing optional type argument for ParamsType in GSSP
|
||||
- @blitzjs/rpc@2.0.0-alpha.44
|
||||
|
||||
## 2.0.0-alpha.43
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@blitzjs/next",
|
||||
"version": "2.0.0-alpha.43",
|
||||
"version": "2.0.0-alpha.45",
|
||||
"scripts": {
|
||||
"build": "unbuild",
|
||||
"dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
|
||||
@@ -23,7 +23,7 @@
|
||||
"eslint.js"
|
||||
],
|
||||
"dependencies": {
|
||||
"@blitzjs/rpc": "2.0.0-alpha.43",
|
||||
"@blitzjs/rpc": "2.0.0-alpha.45",
|
||||
"@types/hoist-non-react-statics": "3.3.1",
|
||||
"debug": "4.3.3",
|
||||
"fs-extra": "10.0.1",
|
||||
@@ -32,7 +32,7 @@
|
||||
"superjson": "1.8.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@blitzjs/config": "workspace:2.0.0-alpha.43",
|
||||
"@blitzjs/config": "workspace:2.0.0-alpha.45",
|
||||
"@testing-library/dom": "8.13.0",
|
||||
"@testing-library/jest-dom": "5.16.3",
|
||||
"@testing-library/react": "13.0.0",
|
||||
@@ -42,7 +42,7 @@
|
||||
"@types/react": "18.0.1",
|
||||
"@types/react-dom": "17.0.14",
|
||||
"@types/testing-library__react-hooks": "4.0.0",
|
||||
"blitz": "2.0.0-alpha.43",
|
||||
"blitz": "2.0.0-alpha.45",
|
||||
"cross-spawn": "7.0.3",
|
||||
"find-up": "4.1.0",
|
||||
"next": "12.1.6-canary.17",
|
||||
|
||||
@@ -51,11 +51,7 @@ const buildWithBlitz = <TPlugins extends readonly ClientPlugin<object>[]>(plugin
|
||||
<>
|
||||
{/* @ts-ignore todo */}
|
||||
{props.Component.suppressFirstRenderFlicker && <NoPageFlicker />}
|
||||
{mounted && (
|
||||
<React.Suspense fallback="Loading...">
|
||||
<UserAppRoot {...props} Component={component} />
|
||||
</React.Suspense>
|
||||
)}
|
||||
{mounted && <UserAppRoot {...props} Component={component} />}
|
||||
</>
|
||||
</BlitzProvider>
|
||||
)
|
||||
@@ -82,7 +78,7 @@ type RedirectAuthenticatedToFnCtx = {
|
||||
type RedirectAuthenticatedToFn = (args: RedirectAuthenticatedToFnCtx) => RedirectAuthenticatedTo
|
||||
export type BlitzPage<P = {}> = React.ComponentType<P> & {
|
||||
getLayout?: (component: JSX.Element) => JSX.Element
|
||||
authenticate?: boolean | {redirectTo?: string}
|
||||
authenticate?: boolean | {redirectTo?: string | RouteUrlObject}
|
||||
suppressFirstRenderFlicker?: boolean
|
||||
redirectAuthenticatedTo?: RedirectAuthenticatedTo | RedirectAuthenticatedToFn
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ import {DefaultOptions, QueryClient} from "react-query"
|
||||
import {IncomingMessage, ServerResponse} from "http"
|
||||
import {withSuperJsonProps} from "./superjson"
|
||||
import {ResolverBasePath} from "@blitzjs/rpc/src/index-server"
|
||||
import {ParsedUrlQuery} from "querystring"
|
||||
|
||||
export * from "./index-browser"
|
||||
|
||||
@@ -41,12 +42,14 @@ type SetupBlitzOptions = {
|
||||
plugins: BlitzServerPlugin<RequestMiddleware, Ctx>[]
|
||||
}
|
||||
|
||||
export type BlitzGSSPHandler<TProps> = ({
|
||||
export type BlitzGSSPHandler<TProps, Query extends ParsedUrlQuery = ParsedUrlQuery> = ({
|
||||
ctx,
|
||||
req,
|
||||
res,
|
||||
...args
|
||||
}: Parameters<GetServerSideProps<TProps>>[0] & {ctx: Ctx}) => ReturnType<GetServerSideProps<TProps>>
|
||||
}: Parameters<GetServerSideProps<TProps>>[0] & {ctx: Ctx}) => ReturnType<
|
||||
GetServerSideProps<TProps, Query>
|
||||
>
|
||||
|
||||
export type BlitzGSPHandler<TProps> = ({
|
||||
ctx,
|
||||
@@ -64,7 +67,9 @@ export const setupBlitzServer = ({plugins}: SetupBlitzOptions) => {
|
||||
const contextMiddleware = plugins.flatMap((p) => p.contextMiddleware).filter(Boolean)
|
||||
|
||||
const gSSP =
|
||||
<TProps>(handler: BlitzGSSPHandler<TProps>): GetServerSideProps<TProps> =>
|
||||
<TProps, Query extends ParsedUrlQuery = ParsedUrlQuery>(
|
||||
handler: BlitzGSSPHandler<TProps, Query>,
|
||||
): GetServerSideProps<TProps> =>
|
||||
async ({req, res, ...rest}) => {
|
||||
await handleRequestWithMiddleware<IncomingMessage, ServerResponse>(req, res, middlewares)
|
||||
const ctx = contextMiddleware.reduceRight(
|
||||
|
||||
@@ -1,5 +1,20 @@
|
||||
# @blitzjs/rpc
|
||||
|
||||
## 2.0.0-alpha.45
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @blitzjs/auth@2.0.0-alpha.45
|
||||
- blitz@2.0.0-alpha.45
|
||||
|
||||
## 2.0.0-alpha.44
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [7817fe3a]
|
||||
- @blitzjs/auth@2.0.0-alpha.44
|
||||
- blitz@2.0.0-alpha.44
|
||||
|
||||
## 2.0.0-alpha.43
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@blitzjs/rpc",
|
||||
"version": "2.0.0-alpha.43",
|
||||
"version": "2.0.0-alpha.45",
|
||||
"scripts": {
|
||||
"build": "unbuild",
|
||||
"predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts && wait-on -d 250 ../blitz-auth/dist/index-browser.d.ts",
|
||||
@@ -20,7 +20,7 @@
|
||||
"dist/**"
|
||||
],
|
||||
"dependencies": {
|
||||
"@blitzjs/auth": "2.0.0-alpha.43",
|
||||
"@blitzjs/auth": "2.0.0-alpha.45",
|
||||
"b64-lite": "1.4.0",
|
||||
"bad-behavior": "1.0.1",
|
||||
"chalk": "^4.1.0",
|
||||
@@ -30,11 +30,11 @@
|
||||
"zod": "3.10.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@blitzjs/config": "workspace:2.0.0-alpha.43",
|
||||
"@blitzjs/config": "workspace:2.0.0-alpha.45",
|
||||
"@types/debug": "4.1.7",
|
||||
"@types/react": "18.0.1",
|
||||
"@types/react-dom": "17.0.14",
|
||||
"blitz": "2.0.0-alpha.43",
|
||||
"blitz": "2.0.0-alpha.45",
|
||||
"next": "12.1.6-canary.17",
|
||||
"react": "18.0.0",
|
||||
"react-dom": "18.0.0",
|
||||
@@ -43,7 +43,7 @@
|
||||
"watch": "1.0.2"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"blitz": "2.0.0-alpha.43",
|
||||
"blitz": "2.0.0-alpha.45",
|
||||
"next": "*"
|
||||
},
|
||||
"publishConfig": {
|
||||
|
||||
@@ -1,5 +1,17 @@
|
||||
# blitz
|
||||
|
||||
## 2.0.0-alpha.45
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @blitzjs/generator@2.0.0-alpha.45
|
||||
|
||||
## 2.0.0-alpha.44
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @blitzjs/generator@2.0.0-alpha.44
|
||||
|
||||
## 2.0.0-alpha.43
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "blitz",
|
||||
"version": "2.0.0-alpha.43",
|
||||
"version": "2.0.0-alpha.45",
|
||||
"scripts": {
|
||||
"build": "unbuild",
|
||||
"dev": "watch unbuild src --wait=0.2",
|
||||
@@ -23,7 +23,7 @@
|
||||
"blitz": "bin/blitz"
|
||||
},
|
||||
"dependencies": {
|
||||
"@blitzjs/generator": "2.0.0-alpha.43",
|
||||
"@blitzjs/generator": "2.0.0-alpha.45",
|
||||
"arg": "5.0.1",
|
||||
"chalk": "^4.1.0",
|
||||
"console-table-printer": "2.10.0",
|
||||
@@ -52,7 +52,7 @@
|
||||
"watchpack": "2.1.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@blitzjs/config": "workspace:2.0.0-alpha.43",
|
||||
"@blitzjs/config": "workspace:2.0.0-alpha.45",
|
||||
"@types/cookie": "0.4.1",
|
||||
"@types/cross-spawn": "6.0.2",
|
||||
"@types/debug": "4.1.7",
|
||||
|
||||
@@ -1,5 +1,19 @@
|
||||
# @blitzjs/codemod
|
||||
|
||||
## 2.0.0-alpha.45
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @blitzjs/generator@2.0.0-alpha.45
|
||||
- blitz@2.0.0-alpha.45
|
||||
|
||||
## 2.0.0-alpha.44
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @blitzjs/generator@2.0.0-alpha.44
|
||||
- blitz@2.0.0-alpha.44
|
||||
|
||||
## 2.0.0-alpha.43
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@blitzjs/codemod",
|
||||
"version": "2.0.0-alpha.43",
|
||||
"version": "2.0.0-alpha.45",
|
||||
"scripts": {
|
||||
"build": "unbuild",
|
||||
"dev": "watch unbuild src --wait=0.2",
|
||||
@@ -25,9 +25,9 @@
|
||||
"@babel/plugin-proposal-class-properties": "7.17.12",
|
||||
"@babel/plugin-syntax-jsx": "7.17.12",
|
||||
"@babel/plugin-syntax-typescript": "7.17.12",
|
||||
"@blitzjs/generator": "2.0.0-alpha.43",
|
||||
"@blitzjs/generator": "2.0.0-alpha.45",
|
||||
"arg": "5.0.1",
|
||||
"blitz": "2.0.0-alpha.43",
|
||||
"blitz": "2.0.0-alpha.45",
|
||||
"chalk": "^4.1.0",
|
||||
"cross-spawn": "7.0.3",
|
||||
"debug": "4.3.3",
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
# @blitzjs/config
|
||||
|
||||
## 2.0.0-alpha.45
|
||||
|
||||
## 2.0.0-alpha.44
|
||||
|
||||
## 2.0.0-alpha.43
|
||||
|
||||
## 2.0.0-alpha.42
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@blitzjs/config",
|
||||
"private": true,
|
||||
"version": "2.0.0-alpha.43",
|
||||
"version": "2.0.0-alpha.45",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@typescript-eslint/eslint-plugin": "5.9.1",
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
# @blitzjs/generator
|
||||
|
||||
## 2.0.0-alpha.45
|
||||
|
||||
## 2.0.0-alpha.44
|
||||
|
||||
## 2.0.0-alpha.43
|
||||
|
||||
## 2.0.0-alpha.42
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@blitzjs/generator",
|
||||
"version": "2.0.0-alpha.43",
|
||||
"version": "2.0.0-alpha.45",
|
||||
"scripts": {
|
||||
"dev": "watch unbuild src --wait=0.2",
|
||||
"build": "unbuild && pnpm build:templates",
|
||||
@@ -45,7 +45,7 @@
|
||||
"vinyl": "2.2.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@blitzjs/config": "2.0.0-alpha.43",
|
||||
"@blitzjs/config": "2.0.0-alpha.45",
|
||||
"@juanm04/cpx": "2.0.1",
|
||||
"@types/babel__core": "7.1.19",
|
||||
"@types/diff": "5.0.2",
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
"@typescript-eslint/parser": "5.9.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@blitzjs/config": "2.0.0-alpha.43",
|
||||
"@blitzjs/config": "2.0.0-alpha.45",
|
||||
"@types/react": "18.0.1",
|
||||
"@types/react-dom": "17.0.14",
|
||||
"react": "18.0.0",
|
||||
|
||||
884
pnpm-lock.yaml
generated
884
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user