pnpmlock

Version Packages (alpha) (#3378 )
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2026-02-03 18:01:02 -05:00 · 2022-05-24 15:11:18 -04:00 · 2022-05-24 15:09:03 -04:00 · 2022-05-24 21:02:17 +02:00
23 changed files with 101 additions and 46 deletions
--- a/.changeset/four-meals-fry.md
+++ b/.changeset/four-meals-fry.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+export BlitzPage & BlitzLayout types from @blitzjs/next
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -24,6 +24,7 @@
    "fair-wombats-sneeze",
    "fast-trainers-kneel",
    "flat-bees-approve",
+    "four-meals-fry",
    "great-months-train",
    "hot-drinks-approve",
    "lovely-colts-share",
--- a/apps/toolkit-app/package.json
+++ b/apps/toolkit-app/package.json
@@ -29,7 +29,7 @@
    "@blitzjs/rpc": "workspace:*",
    "@hookform/resolvers": "2.8.8",
    "@prisma/client": "3.9.0",
-    "blitz": "workspace:2.0.0-alpha.25",
+    "blitz": "workspace:2.0.0-alpha.26",
    "next": "12.1.6-canary.17",
    "prisma": "3.9.0",
    "react": "18.0.0",
--- a/apps/toolkit-app/pages/_app.tsx
+++ b/apps/toolkit-app/pages/_app.tsx
@@ -1,6 +1,5 @@
-import { ErrorFallbackProps, ErrorComponent, ErrorBoundary } from "@blitzjs/next"
+import { ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps } from "@blitzjs/next"
 import { AuthenticationError, AuthorizationError } from "blitz"
-import type { AppProps } from "next/app"
 import React from "react"
 import { withBlitz } from "app/blitz-client"

--- a/apps/web/pages/_app.tsx
+++ b/apps/web/pages/_app.tsx
@@ -1,6 +1,5 @@
-import {ErrorFallbackProps, ErrorComponent, ErrorBoundary} from "@blitzjs/next"
+import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
 import {AuthenticationError, AuthorizationError} from "blitz"
-import type {AppProps} from "next/app"
 import React from "react"
 import {withBlitz} from "app/blitz-client"

--- a/integration-tests/auth/pages/_app.tsx
+++ b/integration-tests/auth/pages/_app.tsx
@@ -1,6 +1,5 @@
-import {ErrorFallbackProps, ErrorComponent, ErrorBoundary} from "@blitzjs/next"
+import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
 import {AuthenticationError, AuthorizationError} from "blitz"
-import type {AppProps} from "next/app"
 import React from "react"
 import {withBlitz} from "../app/blitz-client"

--- a/packages/blitz-auth/CHANGELOG.md
+++ b/packages/blitz-auth/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @blitzjs/auth

+## 2.0.0-alpha.26
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.26
+
 ## 2.0.0-alpha.25

 ### Patch Changes
--- a/packages/blitz-auth/package.json
+++ b/packages/blitz-auth/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.25",
+  "version": "2.0.0-alpha.26",
  "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.25",
+    "blitz": "2.0.0-alpha.26",
    "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.25",
+    "@blitzjs/config": "workspace:2.0.0-alpha.26",
    "@testing-library/react": "13.0.0",
    "@testing-library/react-hooks": "7.0.2",
    "@types/cookie": "0.4.1",
--- a/packages/blitz-next/CHANGELOG.md
+++ b/packages/blitz-next/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @blitzjs/next

+## 2.0.0-alpha.26
+
+### Patch Changes
+
+- 0e762fb5: export BlitzPage & BlitzLayout types from @blitzjs/next
+  - @blitzjs/rpc@2.0.0-alpha.26
+
 ## 2.0.0-alpha.25

 ### Patch Changes
--- a/packages/blitz-next/package.json
+++ b/packages/blitz-next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.25",
+  "version": "2.0.0-alpha.26",
  "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.25",
+    "@blitzjs/rpc": "2.0.0-alpha.26",
    "@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.25",
+    "@blitzjs/config": "workspace:2.0.0-alpha.26",
    "@testing-library/dom": "8.13.0",
    "@testing-library/jest-dom": "5.16.3",
    "@testing-library/react": "13.0.0",
@@ -43,7 +43,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.25",
+    "blitz": "2.0.0-alpha.26",
    "cross-spawn": "7.0.3",
    "find-up": "4.1.0",
    "lodash.frompairs": "4.0.1",
--- a/packages/blitz-next/src/index-browser.tsx
+++ b/packages/blitz-next/src/index-browser.tsx
@@ -5,12 +5,15 @@ import type {
  UnionToIntersection,
  Simplify,
 } from "blitz"
-import {AppProps} from "next/app"
 import Head from "next/head"
 import React from "react"
 import {QueryClient, QueryClientProvider} from "react-query"
 import {Hydrate, HydrateOptions} from "react-query/hydration"
 import {withSuperJSONPage} from "./superjson"
+import {Ctx} from "blitz"
+import {UrlObject} from "url"
+import {AppPropsType} from "next/dist/shared/lib/utils"
+import {Router} from "next/router"

 export * from "./error-boundary"
 export * from "./error-component"
@@ -68,6 +71,27 @@ export type BlitzProviderProps = {
  hydrateOptions?: HydrateOptions
 }

+interface RouteUrlObject extends Pick<UrlObject, "pathname" | "query"> {
+  pathname: string
+}
+type RedirectAuthenticatedTo = string | RouteUrlObject | false
+type RedirectAuthenticatedToFnCtx = {
+  session: Ctx["session"]["$publicData"]
+}
+type RedirectAuthenticatedToFn = (args: RedirectAuthenticatedToFnCtx) => RedirectAuthenticatedTo
+export type BlitzPage<P = {}> = React.ComponentType<P> & {
+  getLayout?: (component: JSX.Element) => JSX.Element
+  authenticate?: boolean | {redirectTo?: string}
+  suppressFirstRenderFlicker?: boolean
+  redirectAuthenticatedTo?: RedirectAuthenticatedTo | RedirectAuthenticatedToFn
+}
+export type BlitzLayout<P = {}> = React.ComponentType<P> & {
+  authenticate?: boolean | {redirectTo?: string | RouteUrlObject}
+  redirectAuthenticatedTo?: RedirectAuthenticatedTo | RedirectAuthenticatedToFn
+}
+export type AppProps<P = {}> = AppPropsType<Router, P> & {
+  Component: BlitzPage
+}
 const BlitzProvider = ({
  client,
  contextSharing = false,
--- a/packages/blitz-rpc/CHANGELOG.md
+++ b/packages/blitz-rpc/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @blitzjs/rpc

+## 2.0.0-alpha.26
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.26
+- blitz@2.0.0-alpha.26
+
 ## 2.0.0-alpha.25

 ### Patch Changes
--- a/packages/blitz-rpc/package.json
+++ b/packages/blitz-rpc/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.25",
+  "version": "2.0.0-alpha.26",
  "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.25",
+    "@blitzjs/auth": "2.0.0-alpha.26",
    "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.25",
+    "@blitzjs/config": "workspace:2.0.0-alpha.26",
    "@types/debug": "4.1.7",
    "@types/react": "18.0.1",
    "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.25",
+    "blitz": "2.0.0-alpha.26",
    "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.25",
+    "blitz": "2.0.0-alpha.26",
    "next": "*"
  },
  "publishConfig": {
--- a/packages/blitz/CHANGELOG.md
+++ b/packages/blitz/CHANGELOG.md
@@ -1,5 +1,11 @@
 # blitz

+## 2.0.0-alpha.26
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.26
+
 ## 2.0.0-alpha.25

 ### Patch Changes
--- a/packages/blitz/package.json
+++ b/packages/blitz/package.json
@@ -1,6 +1,6 @@
 {
  "name": "blitz",
-  "version": "2.0.0-alpha.25",
+  "version": "2.0.0-alpha.26",
  "scripts": {
    "build": "unbuild",
    "dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
    "blitz": "bin/blitz"
  },
  "dependencies": {
-    "@blitzjs/generator": "2.0.0-alpha.25",
+    "@blitzjs/generator": "2.0.0-alpha.26",
    "arg": "5.0.1",
    "chalk": "^4.1.0",
    "console-table-printer": "2.10.0",
@@ -49,7 +49,7 @@
    "tslog": "3.3.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.25",
+    "@blitzjs/config": "workspace:2.0.0-alpha.26",
    "@types/cookie": "0.4.1",
    "@types/cross-spawn": "6.0.2",
    "@types/debug": "4.1.7",
--- a/packages/config/CHANGELOG.md
+++ b/packages/config/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @blitzjs/config

+## 2.0.0-alpha.26
+
 ## 2.0.0-alpha.25

 ## 2.0.0-alpha.24
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@blitzjs/config",
  "private": true,
-  "version": "2.0.0-alpha.25",
+  "version": "2.0.0-alpha.26",
  "license": "MIT",
  "dependencies": {
    "@typescript-eslint/eslint-plugin": "5.9.1",
--- a/packages/generator/CHANGELOG.md
+++ b/packages/generator/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @blitzjs/generator

+## 2.0.0-alpha.26
+
 ## 2.0.0-alpha.25

 ## 2.0.0-alpha.24
--- a/packages/generator/package.json
+++ b/packages/generator/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/generator",
-  "version": "2.0.0-alpha.25",
+  "version": "2.0.0-alpha.26",
  "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.25",
+    "@blitzjs/config": "2.0.0-alpha.26",
    "@juanm04/cpx": "2.0.1",
    "@types/babel__core": "7.1.19",
    "@types/diff": "5.0.2",
--- a/packages/generator/templates/app/pages/_app.tsx
+++ b/packages/generator/templates/app/pages/_app.tsx
@@ -1,6 +1,5 @@
-import {ErrorFallbackProps, ErrorComponent, ErrorBoundary} from "@blitzjs/next"
+import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
 import {AuthenticationError, AuthorizationError} from "blitz"
-import type {AppProps} from "next/app"
 import React from "react"
 import {withBlitz} from "app/blitz-client"

--- a/packages/generator/templates/minimalapp/pages/_app.tsx
+++ b/packages/generator/templates/minimalapp/pages/_app.tsx
@@ -1,5 +1,4 @@
-import { ErrorFallbackProps, ErrorComponent, ErrorBoundary } from "@blitzjs/next"
-import type { AppProps } from "next/app"
+import { ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps } from "@blitzjs/next"
 import React from "react"
 import { withBlitz } from "app/blitz-client"

--- a/packages/pkg-template/package.json
+++ b/packages/pkg-template/package.json
@@ -25,7 +25,7 @@
    "@typescript-eslint/parser": "5.9.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.25",
+    "@blitzjs/config": "2.0.0-alpha.26",
    "@types/react": "18.0.1",
    "@types/react-dom": "17.0.14",
    "react": "18.0.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,7 +50,7 @@ importers:
      "@types/node": 17.0.16
      "@types/preview-email": 2.0.1
      "@types/react": 18.0.1
-      blitz: workspace:2.0.0-alpha.25
+      blitz: workspace:2.0.0-alpha.26
      eslint: 7.32.0
      husky: 7.0.4
      jest: 27.5.1
@@ -326,8 +326,8 @@ importers:

  packages/blitz:
    specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.25
-      "@blitzjs/generator": 2.0.0-alpha.25
+      "@blitzjs/config": workspace:2.0.0-alpha.26
+      "@blitzjs/generator": 2.0.0-alpha.26
      "@types/cookie": 0.4.1
      "@types/cross-spawn": 6.0.2
      "@types/debug": 4.1.7
@@ -423,7 +423,7 @@ importers:

  packages/blitz-auth:
    specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.25
+      "@blitzjs/config": workspace:2.0.0-alpha.26
      "@testing-library/react": 13.0.0
      "@testing-library/react-hooks": 7.0.2
      "@types/b64-lite": 1.3.0
@@ -437,7 +437,7 @@ importers:
      "@types/secure-password": 3.1.1
      b64-lite: 1.4.0
      bad-behavior: 1.0.1
-      blitz: 2.0.0-alpha.25
+      blitz: 2.0.0-alpha.26
      cookie: 0.4.1
      cookie-session: 2.0.0
      debug: 4.3.3
@@ -488,8 +488,8 @@ importers:

  packages/blitz-next:
    specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.25
-      "@blitzjs/rpc": 2.0.0-alpha.25
+      "@blitzjs/config": workspace:2.0.0-alpha.26
+      "@blitzjs/rpc": 2.0.0-alpha.26
      "@testing-library/dom": 8.13.0
      "@testing-library/jest-dom": 5.16.3
      "@testing-library/react": 13.0.0
@@ -501,7 +501,7 @@ importers:
      "@types/react": 18.0.1
      "@types/react-dom": 17.0.14
      "@types/testing-library__react-hooks": 4.0.0
-      blitz: 2.0.0-alpha.25
+      blitz: 2.0.0-alpha.26
      cross-spawn: 7.0.3
      debug: 4.3.3
      find-up: 4.1.0
@@ -553,14 +553,14 @@ importers:

  packages/blitz-rpc:
    specifiers:
-      "@blitzjs/auth": 2.0.0-alpha.25
-      "@blitzjs/config": workspace:2.0.0-alpha.25
+      "@blitzjs/auth": 2.0.0-alpha.26
+      "@blitzjs/config": workspace:2.0.0-alpha.26
      "@types/debug": 4.1.7
      "@types/react": 18.0.1
      "@types/react-dom": 17.0.14
      b64-lite: 1.4.0
      bad-behavior: 1.0.1
-      blitz: 2.0.0-alpha.25
+      blitz: 2.0.0-alpha.26
      chalk: ^4.1.0
      debug: 4.3.3
      next: 12.1.6-canary.17
@@ -615,7 +615,7 @@ importers:
      "@babel/plugin-transform-typescript": 7.12.1
      "@babel/preset-env": 7.12.10
      "@babel/types": 7.12.10
-      "@blitzjs/config": 2.0.0-alpha.25
+      "@blitzjs/config": 2.0.0-alpha.26
      "@juanm04/cpx": 2.0.1
      "@mrleebo/prisma-ast": 0.2.6
      "@types/babel__core": 7.1.19
@@ -706,7 +706,7 @@ importers:

  packages/pkg-template:
    specifiers:
-      "@blitzjs/config": 2.0.0-alpha.25
+      "@blitzjs/config": 2.0.0-alpha.26
      "@types/react": 18.0.1
      "@types/react-dom": 17.0.14
      "@typescript-eslint/eslint-plugin": 5.9.1
@@ -10359,7 +10359,7 @@ packages:
      pretty-format: 27.5.1
      slash: 3.0.0
      strip-json-comments: 3.1.1
-      ts-node: 10.7.0_fxg3r7oju3tntkxsvleuiot4fa
+      ts-node: 10.7.0_typescript@4.6.3
    transitivePeerDependencies:
      - bufferutil
      - canvas
@@ -15204,6 +15204,7 @@ packages:
      typescript: 4.6.3
      v8-compile-cache-lib: 3.0.1
      yn: 3.1.1
+    dev: false

  /ts-node/10.7.0_typescript@4.6.3:
    resolution:
@@ -15236,7 +15237,6 @@ packages:
      typescript: 4.6.3
      v8-compile-cache-lib: 3.0.1
      yn: 3.1.1
-    dev: false

  /tsconfig-paths/3.14.1:
    resolution:
Author	SHA1	Message	Date
Dillon Raphael	b545a38b87	pnpmlock	2022-05-24 15:11:18 -04:00
github-actions[bot]	1463a20471	Version Packages (alpha) (#3378 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-05-24 15:09:03 -04:00
Dillon Raphael	0e762fb557	export `BlitzPage` & `BlitzLayout` types from `@blitzjs/next` (#3376 ) * Export types * Add changeset * export AppProps Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>	2022-05-24 21:02:17 +02:00