1
0
mirror of synced 2026-02-07 12:00:13 -05:00

Compare commits

..

1 Commits

Author SHA1 Message Date
github-actions[bot]
e1bffdf3d6 Version Packages (beta) (#4197)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Siddharth Suresh <siddh.suresh@gmail.com>
2023-08-17 23:41:49 +05:30
99 changed files with 660 additions and 520 deletions

View File

@@ -1,6 +0,0 @@
---
"@blitzjs/auth": major
"blitz": patch
---
Migrate `next-auth` adapter to use `@auth/core`

View File

@@ -74,10 +74,12 @@
"chatty-gifts-whisper",
"chilled-carrots-own",
"chilly-candles-care",
"chilly-jeans-fix",
"chilly-nails-nail",
"clean-hats-pump",
"clean-hounds-laugh",
"clean-walls-wink",
"clever-hornets-talk",
"clever-radios-lie",
"cool-doors-invent",
"cool-horses-check",
@@ -124,6 +126,7 @@
"four-meals-fry",
"four-radios-tickle",
"four-sheep-judge",
"fresh-camels-return",
"fresh-crews-chew",
"funny-cups-pay",
"fuzzy-bees-warn",

View File

@@ -1,5 +1,17 @@
# next-blitz-auth
## 0.1.1-beta.8
### Patch Changes
- Updated dependencies [82649f341]
- Updated dependencies [8b01175b4]
- blitz@2.0.0-beta.32
- @blitzjs/next@2.0.0-beta.32
- @blitzjs/auth@2.0.0-beta.32
- @blitzjs/rpc@2.0.0-beta.32
- @blitzjs/config@2.0.0-beta.32
## 0.1.1-beta.7
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "next-blitz-auth",
"version": "0.1.1-beta.7",
"version": "0.1.1-beta.8",
"private": true,
"scripts": {
"blitz:dev": "next dev",
@@ -9,15 +9,15 @@
"lint": "next lint"
},
"dependencies": {
"@blitzjs/auth": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/next": "2.0.0-beta.31",
"@blitzjs/rpc": "2.0.0-beta.31",
"@blitzjs/auth": "2.0.0-beta.32",
"@blitzjs/config": "2.0.0-beta.32",
"@blitzjs/next": "2.0.0-beta.32",
"@blitzjs/rpc": "2.0.0-beta.32",
"@hookform/error-message": "2.0.0",
"@hookform/resolvers": "2.9.10",
"@prisma/client": "^4.5.0",
"@tanstack/react-query": "4.0.10",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"flatted": "3.2.7",
"next": "13.3.0",
"prisma": "^4.5.0",

View File

@@ -23,14 +23,14 @@
]
},
"dependencies": {
"@blitzjs/auth": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/next": "2.0.0-beta.31",
"@blitzjs/rpc": "2.0.0-beta.31",
"@blitzjs/auth": "2.0.0-beta.32",
"@blitzjs/config": "2.0.0-beta.32",
"@blitzjs/next": "2.0.0-beta.32",
"@blitzjs/rpc": "2.0.0-beta.32",
"@hookform/error-message": "2.0.0",
"@hookform/resolvers": "2.9.10",
"@prisma/client": "4.6.1",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"next": "13.3.0",
"openid-client": "5.2.1",
"prisma": "4.6.1",

View File

@@ -1,3 +1,4 @@
const { withNextAuthAdapter } = require("@blitzjs/auth")
const { withBlitz } = require("@blitzjs/next")
/**
@@ -10,4 +11,4 @@ const config = {
},
}
module.exports = withBlitz(config)
module.exports = withBlitz(withNextAuthAdapter(config))

View File

@@ -24,16 +24,16 @@
]
},
"dependencies": {
"@auth/core": "0.10.0",
"@blitzjs/auth": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/next": "2.0.0-beta.31",
"@blitzjs/rpc": "2.0.0-beta.31",
"@blitzjs/auth": "2.0.0-beta.32",
"@blitzjs/config": "2.0.0-beta.32",
"@blitzjs/next": "2.0.0-beta.32",
"@blitzjs/rpc": "2.0.0-beta.32",
"@hookform/error-message": "2.0.0",
"@hookform/resolvers": "2.9.10",
"@prisma/client": "4.6.1",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"next": "13.3.0",
"next-auth": "4.18.7",
"prisma": "4.6.1",
"react": "18.2.0",
"react-dom": "18.2.0",

View File

@@ -1,6 +1,6 @@
import { api } from "src/blitz-server"
import GithubProvider from "@auth/core/providers/github"
import { AuthAdapter } from "@blitzjs/auth/adapters/authjs"
import GithubProvider from "next-auth/providers/github"
import { NextAuthAdapter, BlitzNextAuthOptions } from "@blitzjs/auth/next-auth"
import db, { User } from "db"
import { Role } from "types"
@@ -13,23 +13,20 @@ const providers = [
]
export default api(
AuthAdapter({
NextAuthAdapter({
successRedirectUrl: "/",
errorRedirectUrl: "/error",
providers,
trustHost: true,
secret: process.env.AUTH_SECRET,
callback: async (user, account, profile, session) => {
console.log("USER SIDE PROFILE_DATA", { user, account, profile })
let newUser: User
if (!user) throw new Error("No user found")
try {
newUser = await db.user.findFirstOrThrow({ where: { name: { equals: user.name } } })
} catch (e) {
newUser = await db.user.create({
data: {
email: user.email ?? "",
name: user.name ?? "",
email: user.email as string,
name: user.name as string,
role: "USER",
},
})

View File

@@ -5,6 +5,7 @@ import { useCurrentUser } from "src/users/hooks/useCurrentUser"
import logout from "src/auth/mutations/logout"
import { useMutation } from "@blitzjs/rpc"
import { BlitzPage } from "@blitzjs/next"
import { Routes } from ".blitz"
import styles from "src/styles/Home.module.css"
/*
@@ -31,8 +32,6 @@ const UserInfo = () => {
User id: <code>{currentUser.id}</code>
<br />
User role: <code>{currentUser.role}</code>
<br />
User email: <code>{currentUser.email}</code>
</div>
</>
)
@@ -45,11 +44,11 @@ const UserInfo = () => {
<Link href={"/login"} className={styles.loginButton}>
<strong>Login</strong>
</Link>
<a href="/api/auth/github/signin">
<p className="button small">
<Link href="/api/auth/github/login" passHref legacyBehavior>
<a className="button small">
<strong>Sign in with GitHub</strong>
</p>
</a>
</a>
</Link>
</>
)
}
@@ -80,6 +79,8 @@ const Home: BlitzPage = () => {
<h1>Your database & authentication is ready. Try it by signing up.</h1>
{/* Auth */}
<div className={styles.buttonContainer}>
<Suspense fallback="Loading...">
<UserInfo />

View File

@@ -2,7 +2,6 @@ import { useQuery } from "@blitzjs/rpc"
import getCurrentUser from "src/users/queries/getCurrentUser"
export const useCurrentUser = () => {
console.log("useCurrentUser")
const [user] = useQuery(getCurrentUser, null)
return user
}

View File

@@ -16,14 +16,14 @@
"schema": "./db/schema.prisma"
},
"dependencies": {
"@blitzjs/auth": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/next": "2.0.0-beta.31",
"@blitzjs/rpc": "2.0.0-beta.31",
"@blitzjs/auth": "2.0.0-beta.32",
"@blitzjs/config": "2.0.0-beta.32",
"@blitzjs/next": "2.0.0-beta.32",
"@blitzjs/rpc": "2.0.0-beta.32",
"@prisma/client": "4.6.1",
"@types/jest": "29.2.2",
"@types/passport-twitter": "1.0.37",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jest": "29.3.0",
"jest-environment-jsdom": "29.3.0",
"next": "13.3.0",

View File

@@ -17,14 +17,14 @@
"prisma:studio": "prisma studio"
},
"dependencies": {
"@blitzjs/auth": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/next": "2.0.0-beta.31",
"@blitzjs/rpc": "2.0.0-beta.31",
"@blitzjs/auth": "2.0.0-beta.32",
"@blitzjs/config": "2.0.0-beta.32",
"@blitzjs/next": "2.0.0-beta.32",
"@blitzjs/rpc": "2.0.0-beta.32",
"@hookform/error-message": "2.0.0",
"@hookform/resolvers": "2.9.10",
"@prisma/client": "4.6.1",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"delay": "5.0.0",
"next": "13.3.0",
"prisma": "4.6.1",

View File

@@ -11,7 +11,7 @@ import {
import webdriver from "../../utils/next-webdriver"
let app: any
let appPort: number = 3000
let appPort: number
const runTests = () => {
describe("Auth", () => {
@@ -263,7 +263,7 @@ describe("Auth Tests", () => {
describe("dev mode", () => {
beforeAll(async () => {
try {
await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
appPort = await findPort()
app = await blitzLaunchApp(appPort, {cwd: process.cwd()})
} catch (error) {

View File

@@ -17,11 +17,11 @@
"prisma:studio": "prisma studio"
},
"dependencies": {
"@blitzjs/auth": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/next": "2.0.0-beta.31",
"@blitzjs/auth": "2.0.0-beta.32",
"@blitzjs/config": "2.0.0-beta.32",
"@blitzjs/next": "2.0.0-beta.32",
"@prisma/client": "4.6.1",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"lowdb": "3.0.0",
"next": "13.3.0",
"prisma": "4.6.1",

View File

@@ -14,7 +14,7 @@ import fetch from "node-fetch"
import {fromBase64} from "b64-lite"
let app: any
let appPort: number = 3000
let appPort: number
const HEADER_CSRF = "anti-csrf"
const COOKIE_PUBLIC_DATA_TOKEN = "auth-tests-cookie-prefix_sPublicDataToken"
const COOKIE_SESSION_TOKEN = "auth-tests-cookie-prefix_sSessionToken"
@@ -132,7 +132,7 @@ describe("Auth Tests", () => {
describe("dev mode", async () => {
beforeAll(async () => {
try {
await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
appPort = await findPort()
app = await blitzLaunchApp(appPort, {cwd: process.cwd()})
} catch (error) {

View File

@@ -16,11 +16,11 @@
"schema": "db/schema.prisma"
},
"dependencies": {
"@blitzjs/auth": "2.0.0-beta.31",
"@blitzjs/next": "2.0.0-beta.31",
"@blitzjs/rpc": "2.0.0-beta.31",
"@blitzjs/auth": "2.0.0-beta.32",
"@blitzjs/next": "2.0.0-beta.32",
"@blitzjs/rpc": "2.0.0-beta.32",
"@prisma/client": "4.6.1",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"lowdb": "3.0.0",
"next": "13.3.0",
"prisma": "4.6.1",
@@ -28,7 +28,7 @@
"react-dom": "18.2.0"
},
"devDependencies": {
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.32",
"@next/bundle-analyzer": "12.0.8",
"@types/express": "4.17.13",
"@types/fs-extra": "9.0.13",

View File

@@ -15,7 +15,7 @@ import webdriver from "../../utils/next-webdriver"
import {join} from "path"
let app: any
let appPort: number = 3000
let appPort: number
const appDir = join(__dirname, "../")
const runTests = (mode?: string) => {
@@ -50,7 +50,7 @@ describe("getInitialProps Tests", () => {
describe("dev mode", () => {
beforeAll(async () => {
try {
await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
appPort = await findPort()
app = await blitzLaunchApp(appPort, {cwd: process.cwd()})
} catch (error) {

View File

@@ -11,10 +11,10 @@
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
},
"dependencies": {
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/next": "2.0.0-beta.31",
"@blitzjs/rpc": "2.0.0-beta.31",
"blitz": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.32",
"@blitzjs/next": "2.0.0-beta.32",
"@blitzjs/rpc": "2.0.0-beta.32",
"blitz": "2.0.0-beta.32",
"next": "13.3.0",
"react": "18.2.0",
"react-dom": "18.2.0"

View File

@@ -13,7 +13,7 @@ import {
import {join} from "path"
let app: any
let appPort: number = 3000
let appPort: number
const appDir = join(__dirname, "../")
const runTests = () => {

View File

@@ -17,12 +17,12 @@
"prisma:studio": "prisma studio"
},
"dependencies": {
"@blitzjs/auth": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/next": "2.0.0-beta.31",
"@blitzjs/rpc": "2.0.0-beta.31",
"@blitzjs/auth": "2.0.0-beta.32",
"@blitzjs/config": "2.0.0-beta.32",
"@blitzjs/next": "2.0.0-beta.32",
"@blitzjs/rpc": "2.0.0-beta.32",
"@prisma/client": "4.6.1",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"lowdb": "3.0.0",
"next": "13.3.0",
"prisma": "4.6.1",

View File

@@ -7,7 +7,7 @@ import fetch from "node-fetch"
import {fromBase64} from "b64-lite"
let app: any
let appPort: number = 3000
let appPort: number
const HEADER_CSRF = "anti-csrf"
const COOKIE_PUBLIC_DATA_TOKEN = "auth-tests-cookie-prefix_sPublicDataToken"
const COOKIE_SESSION_TOKEN = "auth-tests-cookie-prefix_sSessionToken"
@@ -156,7 +156,7 @@ describe("Auth Tests", () => {
describe("dev mode", async () => {
beforeAll(async () => {
try {
await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
appPort = await findPort()
app = await blitzLaunchApp(appPort, {cwd: process.cwd()})
} catch (error) {

View File

@@ -16,11 +16,11 @@
"prisma:studio": "prisma studio"
},
"dependencies": {
"@blitzjs/auth": "2.0.0-beta.31",
"@blitzjs/next": "2.0.0-beta.31",
"@blitzjs/rpc": "2.0.0-beta.31",
"@blitzjs/auth": "2.0.0-beta.32",
"@blitzjs/next": "2.0.0-beta.32",
"@blitzjs/rpc": "2.0.0-beta.32",
"@prisma/client": "4.6.1",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"lowdb": "3.0.0",
"next": "13.3.0",
"prisma": "4.6.1",
@@ -28,7 +28,7 @@
"react-dom": "18.2.0"
},
"devDependencies": {
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.32",
"@next/bundle-analyzer": "12.0.8",
"@types/express": "4.17.13",
"@types/fs-extra": "9.0.13",

View File

@@ -15,7 +15,7 @@ import webdriver from "../../utils/next-webdriver"
import {join} from "path"
let app: any
let appPort: number = 3000
let appPort: number
const appDir = join(__dirname, "../")
const runTests = (mode?: string) => {
@@ -40,7 +40,7 @@ describe("No Suspense Tests", () => {
describe("dev mode", () => {
beforeAll(async () => {
try {
await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
appPort = await findPort()
app = await blitzLaunchApp(appPort, {cwd: process.cwd()})
} catch (error) {

View File

@@ -8,13 +8,13 @@
"clean": "rm -rf .turbo && rm -rf node_modules"
},
"dependencies": {
"@blitzjs/auth": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/next": "2.0.0-beta.31",
"@blitzjs/rpc": "2.0.0-beta.31",
"@blitzjs/auth": "2.0.0-beta.32",
"@blitzjs/config": "2.0.0-beta.32",
"@blitzjs/next": "2.0.0-beta.32",
"@blitzjs/rpc": "2.0.0-beta.32",
"@prisma/client": "4.6.1",
"@tanstack/react-query": "4.0.10",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"next": "13.3.0",
"prisma": "4.6.1",
"react": "18.2.0",

View File

@@ -16,10 +16,10 @@
"schema": "db/schema.prisma"
},
"dependencies": {
"@blitzjs/next": "2.0.0-beta.31",
"@blitzjs/rpc": "2.0.0-beta.31",
"@blitzjs/next": "2.0.0-beta.32",
"@blitzjs/rpc": "2.0.0-beta.32",
"@prisma/client": "4.6.1",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"lowdb": "3.0.0",
"next": "13.3.0",
"prisma": "4.6.1",
@@ -27,7 +27,7 @@
"react-dom": "18.2.0"
},
"devDependencies": {
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.32",
"@next/bundle-analyzer": "12.0.8",
"@types/express": "4.17.13",
"@types/fs-extra": "9.0.13",

View File

@@ -10,7 +10,7 @@ import {
import webdriver from "../../utils/next-webdriver"
let app: any
let appPort: number = 3000
let appPort: number
const runTests = () => {
describe("get query data", () => {
@@ -114,7 +114,7 @@ describe("React Query Utils Tests", () => {
describe("dev mode", () => {
beforeAll(async () => {
try {
await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
appPort = await findPort()
app = await blitzLaunchApp(appPort, {cwd: process.cwd()})
} catch (error) {

View File

@@ -7,10 +7,10 @@
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
},
"dependencies": {
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/next": "2.0.0-beta.31",
"@blitzjs/rpc": "2.0.0-beta.31",
"blitz": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.32",
"@blitzjs/next": "2.0.0-beta.32",
"@blitzjs/rpc": "2.0.0-beta.32",
"blitz": "2.0.0-beta.32",
"next": "13.3.0",
"react": "18.2.0",
"react-dom": "18.2.0"

View File

@@ -7,10 +7,10 @@
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
},
"dependencies": {
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/next": "2.0.0-beta.31",
"@blitzjs/rpc": "2.0.0-beta.31",
"blitz": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.32",
"@blitzjs/next": "2.0.0-beta.32",
"@blitzjs/rpc": "2.0.0-beta.32",
"blitz": "2.0.0-beta.32",
"next": "13.3.0",
"react": "18.2.0",
"react-dom": "18.2.0"

View File

@@ -16,11 +16,11 @@
"schema": "db/schema.prisma"
},
"dependencies": {
"@blitzjs/auth": "2.0.0-beta.31",
"@blitzjs/next": "2.0.0-beta.31",
"@blitzjs/rpc": "2.0.0-beta.31",
"@blitzjs/auth": "2.0.0-beta.32",
"@blitzjs/next": "2.0.0-beta.32",
"@blitzjs/rpc": "2.0.0-beta.32",
"@prisma/client": "4.6.1",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"lowdb": "3.0.0",
"next": "13.3.0",
"prisma": "4.6.1",
@@ -28,7 +28,7 @@
"react-dom": "18.2.0"
},
"devDependencies": {
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.32",
"@next/bundle-analyzer": "12.0.8",
"@types/express": "4.17.13",
"@types/fs-extra": "9.0.13",

View File

@@ -15,7 +15,7 @@ import webdriver from "../../utils/next-webdriver"
import {join} from "path"
let app: any
let appPort: number = 3000
let appPort: number
const appDir = join(__dirname, "../")
const runTests = (mode?: string) => {
@@ -39,7 +39,7 @@ describe("Trailing Slash Tests", () => {
describe("dev mode", () => {
beforeAll(async () => {
try {
await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
appPort = await findPort()
app = await blitzLaunchApp(appPort, {cwd: process.cwd()})
} catch (error) {

View File

@@ -44,10 +44,5 @@
"ignoredRules": [
"EXTERNAL_MISMATCH"
]
},
"pnpm": {
"patchedDependencies": {
"@auth/core@0.10.0": "patches/@auth__core@0.10.0.patch"
}
}
}

View File

@@ -1 +0,0 @@
adapters

View File

@@ -1,5 +1,13 @@
# @blitzjs/auth
## 2.0.0-beta.32
### Patch Changes
- 8b01175b4: Updated `useAuthenticatedBlitzContext` to now return `AuthenticatedCtx`
- Updated dependencies [82649f341]
- blitz@2.0.0-beta.32
## 2.0.0-beta.31
### Patch Changes

View File

@@ -5,11 +5,7 @@ const config: BuildConfig = {
"./src/index-browser",
"./src/index-server",
"./src/server/secure-password",
{
builder: "mkdist",
input: "./src/adapters/",
outDir: "./adapters",
},
"./src/server/adapters/next-auth",
],
externals: ["index-browser.cjs", "index-browser.mjs", "react"],
declaration: true,

1
packages/blitz-auth/next-auth.d.ts vendored Normal file
View File

@@ -0,0 +1 @@
export * from "./dist/next-auth"

View File

@@ -0,0 +1 @@
module.exports = require("./dist/next-auth.cjs")

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/auth",
"version": "2.0.0-beta.31",
"version": "2.0.0-beta.32",
"homepage": "https://blitzjs.com/",
"repository": {
"type": "git",
@@ -24,7 +24,7 @@
"files": [
"dist/**",
"secure-password.*",
"adapters/**"
"next-auth.*"
],
"dependencies": {
"@types/b64-lite": "1.3.0",
@@ -50,9 +50,9 @@
"url": "0.11.0"
},
"peerDependencies": {
"@auth/core": "*",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"next": "*",
"next-auth": "*",
"secure-password": "4.0.0"
},
"peerDependenciesMeta": {
@@ -62,13 +62,12 @@
"secure-password": {
"optional": true
},
"@auth/core": {
"next-auth": {
"optional": true
}
},
"devDependencies": {
"@auth/core": "0.10.0",
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.32",
"@testing-library/react": "13.4.0",
"@testing-library/react-hooks": "8.0.1",
"@types/cookie": "0.4.1",
@@ -76,8 +75,9 @@
"@types/jsonwebtoken": "8.5.8",
"@types/react": "18.0.25",
"@types/react-dom": "17.0.14",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"next": "13.3.0",
"next-auth": "4.18.7",
"react": "18.2.0",
"react-dom": "18.2.0",
"secure-password": "4.0.0",

View File

@@ -1 +0,0 @@
!adapters

View File

@@ -1,2 +0,0 @@
export * from "./authjs/adapter"
export * from "./authjs/types"

View File

@@ -1,3 +0,0 @@
# Auth Core Internals for Blitz
This directory contains the internals of the Auth Core being used by the blitz adapter.

View File

@@ -1 +0,0 @@
export * from "./passport/adapter"

View File

@@ -1,9 +0,0 @@
export function isLocalhost(req: any): boolean {
let {host} = req.headers
let localhost = false
if (host) {
host = host.split(":")[0]
localhost = host === "localhost"
}
return localhost
}

View File

@@ -1,4 +1,4 @@
import "./global"
export * from "./adapters"
export * from "./index-browser"
export * from "./server"

View File

@@ -0,0 +1,2 @@
export * from "./passport/adapter"
export * from "./next-auth/webpack"

View File

@@ -0,0 +1,2 @@
export * from "./next-auth/adapter"
export * from "./next-auth/types"

View File

@@ -11,26 +11,25 @@ import {
secureProxyMiddleware,
truncateString,
} from "blitz"
import {isLocalhost, SessionContext} from "../../../index-server"
// next-auth internals
import {toInternalRequest, toResponse} from "./internals/utils/web"
import {getBody, getURL, setHeaders} from "./internals/utils/node"
import type {RequestInternal, AuthOptions, User} from "next-auth"
import type {Cookie} from "next-auth/core/lib/cookie"
import type {AuthAction, InternalOptions} from "./internals/core/types"
import type {
ApiHandlerIncomingMessage,
BlitzNextAuthApiHandler,
BlitzNextAuthOptions,
} from "./types"
import {isLocalhost} from "../utils"
import {Provider} from "next-auth/providers"
// next-auth internals
import {getBody, getURL, setHeaders} from "./internals/core/node"
import type {AuthAction, InternalOptions, RequestInternal} from "./internals/core/types"
import type {OAuthConfig} from "@auth/core/providers"
import type {Cookie} from "@auth/core/lib/cookie"
import {init} from "@auth/core/lib/init"
import emailSignIn from "@auth/core/lib/email/signin"
import {getAuthorizationUrl} from "@auth/core/lib/oauth/authorization-url"
import {handleOAuth} from "@auth/core/lib/oauth/callback"
import {handleState} from "@auth/core/lib/oauth/handle-state"
import {toInternalRequest, toResponse} from "@auth/core/lib/web"
import {assertConfig} from "@auth/core/lib/assert"
import {init} from "next-auth/core/init"
import getAuthorizationUrl from "next-auth/core/lib/oauth/authorization-url"
import oAuthCallback from "next-auth/core/lib/oauth/callback"
const INTERNAL_REDIRECT_URL_KEY = "_redirectUrl"
@@ -43,38 +42,41 @@ function switchURL(callbackUrl: string) {
return `${url.protocol}//${url.host}${switchPathNameString}${url.search}${url.hash}`
}
export function AuthAdapter<P extends OAuthConfig<any>[]>(
export function NextAuthAdapter<P extends Provider[]>(
config: BlitzNextAuthOptions<P>,
): BlitzNextAuthApiHandler {
return async function authHandler(req, res) {
assert(
req.query.nextauth,
"req.query.nextauth is not defined. Page must be named [...nextauth].ts/js.",
"req.query.nextauth is not defined. Page must be named [...auth].ts/js.",
)
assert(
Array.isArray(req.query.nextauth),
"req.query.nextauth must be an array. Page must be named [...nextauth].ts/js.",
"req.query.nextauth must be an array. Page must be named [...auth].ts/js.",
)
if (!req.query.nextauth?.length) {
return res.status(404).end()
}
const action = req.query.nextauth[1] as AuthAction
if (!action || !["signin", "callback"].includes(action)) {
if (!action || !["login", "callback"].includes(action)) {
return res.status(404).end()
}
const cookieSessionMiddleware = cookieSession({
secret: process.env.SESSION_SECRET_KEY || "default-dev-secret",
secure: process.env.NODE_ENV === "production" && !isLocalhost(req),
})
const middleware: RequestMiddleware<ApiHandlerIncomingMessage, MiddlewareResponse<Ctx>>[] = [
connectMiddleware(cookieSessionMiddleware as RequestMiddleware),
]
if (config.secureProxy) {
middleware.push(secureProxyMiddleware)
}
const headers = new Headers(req.headers as any)
const url = getURL(req.url, headers)
log.debug("NEXT_AUTH_URL", url)
if (url instanceof Error) {
if (process.env.NODE_ENV !== "production") throw url
const errorLogger = config.logger?.error ?? console.error
@@ -90,46 +92,37 @@ export function AuthAdapter<P extends OAuthConfig<any>[]>(
method: req.method,
...getBody(req),
})
log.debug("NEXT_AUTH_REQUEST")
const internalRequest = await toInternalRequest(request)
log.debug("NEXT_AUTH_INTERNAL_REQUEST", internalRequest)
if (internalRequest instanceof Error) {
console.error((request as any).code, request)
return res.status(500).json({
message:
"There was a problem with the server configuration. Check the server logs for more information.",
return new Response(`Error: This action with HTTP ${request.method} is not supported.`, {
status: 400,
})
}
const assertionResult = assertConfig(internalRequest, config)
if (Array.isArray(assertionResult)) {
assertionResult.forEach(log.error)
} else if (assertionResult instanceof Error) {
// Bail out early if there's an error in the user config
log.error(assertionResult.message)
return res.status(500).json({
message:
"There was a problem with the server configuration. Check the server logs for more information.",
code: assertionResult.name,
})
let {providerId} = internalRequest
if (providerId?.includes("?")) {
providerId = providerId.split("?")[0]
}
const callbackUrl = req.body?.callbackUrl ?? req.query?.callbackUrl?.toString()
const {options, cookies} = await init({
// @ts-ignore
url: new URL(
internalRequest.url,
// @ts-ignore
internalRequest.url!,
process.env.APP_ORIGIN || process.env.BLITZ_DEV_SERVER_ORIGIN,
),
authOptions: config,
authOptions: config as unknown as AuthOptions,
action,
providerId: internalRequest.providerId.includes("?")
? internalRequest.providerId.split("?")[0]
: internalRequest.providerId,
callbackUrl,
providerId,
callbackUrl: req.body?.callbackUrl ?? (req.query?.callbackUrl as string),
cookies: internalRequest.cookies,
isPost: req.method === "POST",
csrfDisabled: config.csrf?.enabled ?? false,
})
options.provider.callbackUrl = switchURL(options.provider.callbackUrl)
log.debug("NEXT_AUTH_INTERNAL_OPTIONS", options)
await AuthHandler(middleware, config, internalRequest, action, options, cookies)
.then(async ({middleware}) => {
await handleRequestWithMiddleware<ApiHandlerIncomingMessage, MiddlewareResponse<Ctx>>(
@@ -152,14 +145,7 @@ export function AuthAdapter<P extends OAuthConfig<any>[]>(
}
}
function defaultNormalizer(email?: string) {
if (!email) throw new Error("Missing email from request body.")
let [local, domain] = email.toLowerCase().trim().split("@")
domain = domain?.split(",")[0]
return `${local}@${domain}`
}
export async function AuthHandler<P extends OAuthConfig<any>[]>(
async function AuthHandler<P extends Provider[]>(
middleware: RequestMiddleware<ApiHandlerIncomingMessage, MiddlewareResponse<Ctx>>[],
config: BlitzNextAuthOptions<P>,
internalRequest: RequestInternal,
@@ -170,34 +156,23 @@ export async function AuthHandler<P extends OAuthConfig<any>[]>(
if (!options.provider) {
throw new OAuthError("MISSING_PROVIDER_ERROR")
}
if (action === "signin") {
middleware.push(async (req, res, _next) => {
if (action === "login") {
middleware.push(async (req, res, next) => {
try {
if (options.provider.type === "oauth" || options.provider.type === "oidc") {
const _signin = await getAuthorizationUrl(req.query, options)
log.debug("NEXT_AUTH_SIGNIN", _signin)
if (_signin.cookies) cookies.push(..._signin.cookies)
await res.blitzCtx.session.$setPublicData({
[INTERNAL_REDIRECT_URL_KEY]: _signin.redirect,
} as any)
const response = toResponse(_signin)
setHeaders(response.headers, res)
log.debug("NEXT_AUTH_SIGNIN_REDIRECT", _signin.redirect)
res.setHeader("Location", _signin.redirect)
res.statusCode = 302
res.end()
} else if (options.provider.type === "email") {
const normalizer = options.provider.normalizeIdentifier ?? defaultNormalizer
const email = normalizer(internalRequest.body?.email)
const redirect = await emailSignIn(email, options, internalRequest)
res.setHeader("Location", redirect)
res.statusCode = 302
res.end()
} else {
throw new OAuthError("UNSUPPORTED_PROVIDER_ERROR")
}
const _signin = await getAuthorizationUrl({options: options, query: req.query})
if (_signin.cookies) cookies.push(..._signin.cookies)
const session = res.blitzCtx.session as SessionContext
assert(session, "Missing Blitz sessionMiddleware!")
await session.$setPublicData({
[INTERNAL_REDIRECT_URL_KEY]: _signin.redirect,
} as any)
const response = toResponse(_signin)
setHeaders(response.headers, res)
res.setHeader("Location", _signin.redirect)
res.statusCode = 302
res.end()
} catch (e) {
log.error("OAUTH_SIGNIN_Error in AuthAdapter " + (e as Error).toString())
log.error("OAUTH_SIGNIN_Error in NextAuthAdapter " + (e as Error).toString())
console.log(e)
const authErrorQueryStringKey = config.errorRedirectUrl.includes("?")
? "&authError="
@@ -212,27 +187,19 @@ export async function AuthHandler<P extends OAuthConfig<any>[]>(
return {middleware}
} else if (action === "callback") {
middleware.push(
connectMiddleware(async (req, res, _next) => {
// eslint-disable-next-line no-shadow
connectMiddleware(async (req, res, next) => {
try {
const {proxyRedirect, randomState} = handleState(
req.query,
options.provider,
options.isOnRedirectProxy,
)
if (proxyRedirect) {
log.debug("proxy redirect", {proxyRedirect, randomState})
res.setHeader("Location", proxyRedirect)
res.statusCode = 302
res.end()
}
const {cookies, profile, account, user} = await handleOAuth(
req.query,
internalRequest.cookies,
options,
)
log.debug("NEXT_AUTH_CALLBACK", {cookies, profile, account, user})
const session = res.blitzCtx.session
const callback = await config.callback(user, account, profile as any, session)
const {profile, account, OAuthProfile} = await oAuthCallback({
query: internalRequest.query,
body: internalRequest.body || {code: req.query.code, state: req.query.state},
method: "POST",
options: options as any,
cookies: internalRequest.cookies,
})
const session = res.blitzCtx.session as SessionContext
assert(session, "Missing Blitz sessionMiddleware!")
const callback = await config.callback(profile as User, account, OAuthProfile!, session)
let _redirect = config.successRedirectUrl
if (callback instanceof Object) {
_redirect = callback.redirectUrl
@@ -241,12 +208,13 @@ export async function AuthHandler<P extends OAuthConfig<any>[]>(
redirect: _redirect,
cookies: cookies,
})
setHeaders(response.headers, res)
res.setHeader("Location", _redirect)
res.statusCode = 302
res.end()
} catch (e) {
log.error("OAUTH_CALLBACK_Error in AuthAdapter " + (e as Error).toString())
log.error("OAUTH_CALLBACK_Error in NextAuthAdapter " + (e as Error).toString())
console.log(e)
const authErrorQueryStringKey = config.errorRedirectUrl.includes("?")
? "&authError="

View File

@@ -0,0 +1,3 @@
# Next-auth Internals
This directory contains the internals of the Next-auth being used by the blitz adapter.

View File

@@ -1,7 +1,6 @@
import type {AuthConfig} from "@auth/core"
import {EventCallbacks, PagesOptions, CookiesOptions, CallbacksOptions} from "@auth/core/types"
import type {Adapter} from "@auth/core/adapters"
import type {JWTOptions} from "@auth/core/jwt"
import type {CallbacksOptions, CookiesOptions, EventCallbacks} from "next-auth"
import type {Adapter} from "next-auth/adapters"
import type {JWTOptions} from "next-auth/jwt"
import type {
OAuthConfig,
ProviderType,
@@ -10,7 +9,7 @@ import type {
AuthorizationEndpointHandler,
EmailConfig,
CredentialsConfig,
} from "@auth/core/providers"
} from "next-auth/providers"
export interface OAuthConfigInternal<P>
extends Omit<OAuthConfig<P>, "authorization" | "token" | "userinfo"> {
@@ -34,7 +33,7 @@ export type AuthAction =
| "providers"
| "session"
| "csrf"
| "signin"
| "login"
| "signout"
| "callback"
| "verify-request"
@@ -62,40 +61,26 @@ export interface LoggerInstance extends Record<string, Function> {
debug: (code: string, metadata: unknown) => void
}
export interface RequestInternal {
url: URL
method: "GET" | "POST"
cookies?: Partial<Record<string, string>>
headers?: Record<string, any>
query?: Record<string, any>
body?: Record<string, any>
action: AuthAction
providerId?: string
error?: string
}
export interface InternalOptions<TProviderType = ProviderType> {
export interface InternalOptions<
TProviderType = ProviderType,
WithVerificationToken = TProviderType extends "email" ? true : false,
> {
providers: InternalProvider[]
url: URL
action: AuthAction
provider: InternalProvider<TProviderType>
csrfToken?: string
csrfTokenVerified?: boolean
secret: string
theme: Theme
debug: boolean
logger: LoggerInstance
session: NonNullable<Required<AuthConfig["session"]>>
pages: Partial<PagesOptions>
session: Required<LoggerInstance>
pages: any
jwt: JWTOptions
events: Partial<EventCallbacks>
adapter: Required<Adapter> | undefined
adapter: WithVerificationToken extends true
? Adapter<WithVerificationToken>
: Adapter<WithVerificationToken> | undefined
callbacks: CallbacksOptions
cookies: CookiesOptions
callbackUrl: string
/**
* If true, the OAuth callback is being proxied by the server to the original URL.
* See also {@link OAuthConfigInternal.redirectProxyUrl}.
*/
isOnRedirectProxy: boolean
}

View File

@@ -0,0 +1,39 @@
export interface InternalUrl {
/** @default "http://localhost:3000" */
origin: string
/** @default "localhost:3000" */
host: string
/** @default "/api/auth" */
path: string
/** @default "http://localhost:3000/api/auth" */
base: string
/** @default "http://localhost:3000/api/auth" */
toString: () => string
}
/**
* TODO: Can we remove this?
* Returns an `URL` like object to make requests/redirects from server-side
*/
export default function parseUrl(url?: string | URL): InternalUrl {
const defaultUrl = new URL("http://localhost:3000/api/auth")
if (url && !url.toString().startsWith("http")) {
url = `https://${url}`
}
const _url = new URL(url ?? defaultUrl)
const path = (_url.pathname === "/" ? defaultUrl.pathname : _url.pathname)
// Remove trailing slash
.replace(/\/$/, "")
const base = `${_url.origin}${path}`
return {
origin: _url.origin,
host: _url.host,
path,
base,
toString: () => base,
}
}

View File

@@ -0,0 +1,115 @@
import {OAuthError} from "blitz"
import {serialize, parse as parseCookie} from "cookie"
import type {ResponseInternal, RequestInternal} from "next-auth/core"
import type {AuthAction} from "next-auth/core/types"
const decoder = new TextDecoder()
async function streamToString(stream: any): Promise<string> {
const chunks: Uint8Array[] = []
return await new Promise((resolve, reject) => {
stream.on("data", (chunk: WithImplicitCoercion<ArrayBuffer | SharedArrayBuffer>) =>
chunks.push(Buffer.from(chunk)),
)
stream.on("error", (err: any) => reject(err))
stream.on("end", () => resolve(Buffer.concat(chunks).toString("utf8")))
})
}
async function readJSONBody(
body: ReadableStream | Buffer,
): Promise<Record<string, any> | undefined> {
try {
if ("getReader" in body) {
const reader = body.getReader()
const bytes: number[] = []
while (true) {
const {value, done} = await reader.read()
if (done) break
bytes.push(...value)
}
const b = new Uint8Array(bytes)
return JSON.parse(decoder.decode(b))
}
// node-fetch
if (typeof Buffer !== "undefined" && Buffer.isBuffer(body)) {
return JSON.parse(body.toString("utf8"))
}
return JSON.parse(await streamToString(body))
} catch (e) {
console.error(e)
}
}
// prettier-ignore
const actions = [ "providers", "session", "csrf", "login", "signout", "callback", "verify-request", "error", "_log"]
export async function toInternalRequest(req: Request): Promise<RequestInternal | Error> {
try {
// TODO: url.toString() should not include action and providerId
// see init.ts
const url = new URL(req.url.replace(/\/$/, ""))
const {pathname} = url
const action = actions.find((a) => pathname.includes(a)) as AuthAction | undefined
if (!action) {
throw new OAuthError("Cannot detect action.")
}
const providerIdOrAction = pathname.split("/").pop()
let providerId
if (
providerIdOrAction &&
!action.includes(providerIdOrAction) &&
["login", "callback"].includes(action)
) {
providerId = providerIdOrAction
}
return {
//@ts-ignore
url,
action,
providerId,
method: req.method ?? "GET",
headers: Object.fromEntries(req.headers),
body: req.body ? await readJSONBody(req.body) : undefined,
cookies: parseCookie(req.headers.get("cookie") ?? "") ?? {},
error: url.searchParams.get("error") ?? undefined,
query: Object.fromEntries(url.searchParams),
}
} catch (error) {
return error as Error
}
}
export function toResponse(res: ResponseInternal): Response {
const headers = new Headers(res.headers as unknown as HeadersInit)
res.cookies?.forEach((cookie) => {
const {name, value, options} = cookie
const cookieHeader = serialize(name, value, options)
if (headers.has("Set-Cookie")) {
headers.append("Set-Cookie", cookieHeader)
} else {
headers.set("Set-Cookie", cookieHeader)
}
})
const body =
headers.get("content-type") === "application/json" ? JSON.stringify(res.body) : res.body
const response = new Response(body, {
headers,
status: res.redirect ? 302 : res.status ?? 200,
})
if (res.redirect) {
response.headers.set("Location", res.redirect)
}
return response
}

View File

@@ -1,22 +1,19 @@
import type {Ctx, MiddlewareResponse} from "blitz"
import type {IncomingMessage} from "http"
import type {Account, Profile, User} from "@auth/core/types"
import type {AuthConfig} from "@auth/core"
import type {SessionContext} from "../../index-server"
import type {OAuthConfig} from "@auth/core/providers"
import type {AuthOptions, Profile, User} from "next-auth"
import {SessionContext} from "../../../index-server"
import oAuthCallback from "next-auth/core/lib/oauth/callback"
import {OAuthConfig, Provider} from "next-auth/providers"
export type BlitzNextAuthOptions<P extends OAuthConfig<any>[]> = Omit<AuthConfig, "providers"> & {
export type BlitzNextAuthOptions<P extends Provider[]> = Omit<AuthOptions, "providers"> & {
providers: P
successRedirectUrl: string
errorRedirectUrl: string
secureProxy?: boolean
csrf?: {
enabled: boolean
}
callback: (
user: User | undefined,
account: Account | undefined,
profile: P[number] extends OAuthConfig<infer T> ? T : Profile,
user: User,
account: Awaited<ReturnType<typeof oAuthCallback>>["account"],
profile: P[0] extends OAuthConfig<any> ? Parameters<P[0]["profile"]>[0] : Profile,
session: SessionContext,
) => Promise<void | {redirectUrl: string}>
}

View File

@@ -0,0 +1,30 @@
//@ts-nocheck
import path from "path"
export function withNextAuthAdapter(nextConfig) {
const config = Object.assign({}, nextConfig)
try {
const nextAuthPath = path.dirname(require.resolve("next-auth"))
const webpack = (config) => {
config.resolve.alias = {
...config.resolve.alias,
"next-auth/core/lib/oauth/callback": path.join(nextAuthPath, "core/lib/oauth/callback.js"),
"next-auth/core/lib/oauth/authorization-url": path.join(
nextAuthPath,
"core/lib/oauth/authorization-url.js",
),
"next-auth/core/init": path.join(nextAuthPath, "core/init.js"),
}
return config
}
if (typeof nextConfig.webpack === "function") {
config.webpack = (config, options) => {
return nextConfig.webpack(webpack(config), options)
}
}
config.webpack = webpack
return config
} catch (e) {
return config
}
}

View File

@@ -1,7 +1,7 @@
/* @eslint-disable no-redeclare */
import cookieSession from "cookie-session"
import passport from "passport"
import {isLocalhost} from "../utils"
import {isLocalhost} from "../../index"
import {
assert,
connectMiddleware,
@@ -12,7 +12,7 @@ import {
secureProxyMiddleware,
truncateString,
} from "blitz"
import type {SessionContext} from "../../shared"
import {SessionContext} from "../../../shared"
import {
BlitzPassportConfig,
ApiHandler,

View File

@@ -1,6 +1,6 @@
import type {AuthenticateOptions, Strategy} from "passport"
import type {IncomingMessage, ServerResponse} from "http"
import type {PublicData} from "../../shared"
import type {PublicData} from "../../../shared"
import type {Ctx, MiddlewareResponse} from "blitz"
export interface BlitzPassportConfigCallbackParams {

View File

@@ -190,7 +190,7 @@ export async function getBlitzContext(): Promise<Ctx> {
const req = new IncomingMessage(new Socket()) as IncomingMessage & {
cookies: {[key: string]: string}
}
req.headers = Object.fromEntries(headers() as any)
req.headers = Object.fromEntries(headers())
const csrfToken = cookies().get(COOKIE_CSRF_TOKEN())
if (csrfToken) {
req.headers[HEADER_CSRF] = csrfToken.value

View File

@@ -1,5 +1,7 @@
export * from "./auth-utils"
export * from "./auth-plugin"
export * from "./adapters"
export {
SessionContextClass,
getAllSessionHandlesForUser,

View File

@@ -1,5 +1,17 @@
# @blitzjs/next
## 2.0.0-beta.32
### Patch Changes
- 82649f341: Upgrade tslog to `4.9.0`.
This due a [tslog issue](https://github.com/fullstack-build/tslog/issues/227) that causes tslog to crash when attempting to log an error whose constructor expects more than one argument.
- Updated dependencies [82649f341]
- blitz@2.0.0-beta.32
- @blitzjs/rpc@2.0.0-beta.32
## 2.0.0-beta.31
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/next",
"version": "2.0.0-beta.31",
"version": "2.0.0-beta.32",
"homepage": "https://blitzjs.com/",
"repository": {
"type": "git",
@@ -29,7 +29,7 @@
"eslint.js"
],
"dependencies": {
"@blitzjs/rpc": "2.0.0-beta.31",
"@blitzjs/rpc": "2.0.0-beta.32",
"@types/hoist-non-react-statics": "3.3.1",
"debug": "4.3.3",
"fs-extra": "10.0.1",
@@ -38,13 +38,13 @@
"supports-color": "8.1.1"
},
"peerDependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"next": "*",
"react": "*",
"tslog": "*"
},
"devDependencies": {
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.32",
"@testing-library/dom": "8.13.0",
"@testing-library/jest-dom": "5.16.3",
"@testing-library/react": "13.4.0",
@@ -55,7 +55,7 @@
"@types/react": "18.0.25",
"@types/react-dom": "17.0.14",
"@types/testing-library__react-hooks": "4.0.0",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"cross-spawn": "7.0.3",
"find-up": "4.1.0",
"next": "13.3.0",

View File

@@ -1,5 +1,12 @@
# @blitzjs/rpc
## 2.0.0-beta.32
### Patch Changes
- Updated dependencies [82649f341]
- blitz@2.0.0-beta.32
## 2.0.0-beta.31
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/rpc",
"version": "2.0.0-beta.31",
"version": "2.0.0-beta.32",
"homepage": "https://blitzjs.com/",
"repository": {
"type": "git",
@@ -37,18 +37,18 @@
},
"peerDependencies": {
"@tanstack/query-core": "4.24.4",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"next": "*",
"react": "*"
},
"devDependencies": {
"@blitzjs/auth": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/auth": "2.0.0-beta.32",
"@blitzjs/config": "2.0.0-beta.32",
"@tanstack/query-core": "4.24.4",
"@types/debug": "4.1.7",
"@types/react": "18.0.25",
"@types/react-dom": "17.0.14",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"next": "13.3.0",
"react": "18.2.0",
"react-dom": "18.2.0",

View File

@@ -1,5 +1,17 @@
# blitz
## 2.0.0-beta.32
### Patch Changes
- 82649f341: Upgrade tslog to `4.9.0`.
This due a [tslog issue](https://github.com/fullstack-build/tslog/issues/227) that causes tslog to crash when attempting to log an error whose constructor expects more than one argument.
- Updated dependencies [47c6b62dc]
- Updated dependencies [82649f341]
- @blitzjs/generator@2.0.0-beta.32
## 2.0.0-beta.31
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "blitz",
"version": "2.0.0-beta.31",
"version": "2.0.0-beta.32",
"homepage": "https://blitzjs.com/",
"repository": {
"type": "git",
@@ -30,7 +30,7 @@
"blitz": "bin/blitz"
},
"dependencies": {
"@blitzjs/generator": "2.0.0-beta.31",
"@blitzjs/generator": "2.0.0-beta.32",
"@mrleebo/prisma-ast": "0.2.6",
"@types/global-agent": "2.1.1",
"arg": "5.0.1",
@@ -80,7 +80,7 @@
"watchpack": "2.1.1"
},
"devDependencies": {
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.32",
"@types/cookie": "0.4.1",
"@types/cross-spawn": "6.0.2",
"@types/debug": "4.1.7",

View File

@@ -1,5 +1,14 @@
# @blitzjs/codemod
## 2.0.0-beta.32
### Patch Changes
- Updated dependencies [47c6b62dc]
- Updated dependencies [82649f341]
- @blitzjs/generator@2.0.0-beta.32
- blitz@2.0.0-beta.32
## 2.0.0-beta.31
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/codemod",
"version": "2.0.0-beta.31",
"version": "2.0.0-beta.32",
"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-beta.31",
"@blitzjs/generator": "2.0.0-beta.32",
"arg": "5.0.1",
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"chalk": "^4.1.0",
"cross-spawn": "7.0.3",
"debug": "4.3.3",
@@ -38,7 +38,7 @@
},
"devDependencies": {
"@babel/preset-env": "7.12.10",
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.32",
"@types/jscodeshift": "0.11.2",
"@types/node": "18.11.9",
"ast-types": "0.14.2",

View File

@@ -1,5 +1,7 @@
# @blitzjs/config
## 2.0.0-beta.32
## 2.0.0-beta.31
## 2.0.0-beta.30

View File

@@ -1,7 +1,7 @@
{
"name": "@blitzjs/config",
"private": true,
"version": "2.0.0-beta.31",
"version": "2.0.0-beta.32",
"license": "MIT",
"dependencies": {
"@typescript-eslint/eslint-plugin": "5.42.1",

View File

@@ -1,5 +1,14 @@
# @blitzjs/generator
## 2.0.0-beta.32
### Patch Changes
- 47c6b62dc: Update examples of generate all in docs to include one column in model.
- 82649f341: Upgrade tslog to `4.9.0`.
This due a [tslog issue](https://github.com/fullstack-build/tslog/issues/227) that causes tslog to crash when attempting to log an error whose constructor expects more than one argument.
## 2.0.0-beta.31
## 2.0.0-beta.30

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/generator",
"version": "2.0.0-beta.31",
"version": "2.0.0-beta.32",
"homepage": "https://blitzjs.com/",
"repository": {
"type": "git",
@@ -54,7 +54,7 @@
"zod": "3.20.2"
},
"devDependencies": {
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.32",
"@juanm04/cpx": "2.0.1",
"@types/babel__core": "7.1.19",
"@types/diff": "5.0.2",

View File

@@ -25,7 +25,7 @@
"@typescript-eslint/parser": "5.9.1"
},
"devDependencies": {
"@blitzjs/config": "2.0.0-beta.31",
"@blitzjs/config": "2.0.0-beta.32",
"@types/react": "18.0.25",
"@types/react-dom": "17.0.14",
"react": "18.2.0",

View File

@@ -1,39 +0,0 @@
diff --git a/package.json b/package.json
index dbd1f7f8e24dd70d74bb1bd5ad7bb1a244919ead..72b04f35527ec98dba059ba9e03eb35c08a27c1c 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,34 @@
},
"./types": {
"types": "./types.d.ts"
+ },
+ "./lib/init": {
+ "types": "./lib/init.d.ts",
+ "import": "./lib/init.js"
+ },
+ "./lib/email/signin":{
+ "types": "./lib/email/signin.d.ts",
+ "import": "./lib/email/signin.js"
+ },
+ "./lib/oauth/authorization-url": {
+ "types": "./lib/oauth/authorization-url.d.ts",
+ "import": "./lib/oauth/authorization-url.js"
+ },
+ "./lib/oauth/callback": {
+ "types": "./lib/oauth/callback.d.ts",
+ "import": "./lib/oauth/callback.js"
+ },
+ "./lib/oauth/handle-state": {
+ "types": "./lib/oauth/handle-state.d.ts",
+ "import": "./lib/oauth/handle-state.js"
+ },
+ "./lib/assert": {
+ "types": "./lib/assert.d.ts",
+ "import": "./lib/assert.js"
+ },
+ "./lib/web": {
+ "types": "./lib/web.d.ts",
+ "import": "./lib/web.js"
}
},
"license": "ISC",

296
pnpm-lock.yaml generated
View File

@@ -4,11 +4,6 @@ settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
patchedDependencies:
"@auth/core@0.10.0":
hash: jkkk4das3mr53z5xj5wygbcfda
path: patches/@auth__core@0.10.0.patch
importers:
.:
dependencies:
@@ -58,16 +53,16 @@ importers:
apps/next13:
dependencies:
"@blitzjs/auth":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-auth
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/config
"@blitzjs/next":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-next
"@blitzjs/rpc":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-rpc
"@hookform/error-message":
specifier: 2.0.0
@@ -82,7 +77,7 @@ importers:
specifier: 4.0.10
version: 4.0.10(react-dom@18.2.0)(react@18.2.0)
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
flatted:
specifier: 3.2.7
@@ -130,20 +125,17 @@ importers:
apps/toolkit-app:
dependencies:
"@auth/core":
specifier: 0.10.0
version: 0.10.0(patch_hash=jkkk4das3mr53z5xj5wygbcfda)
"@blitzjs/auth":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-auth
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/config
"@blitzjs/next":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-next
"@blitzjs/rpc":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-rpc
"@hookform/error-message":
specifier: 2.0.0
@@ -155,11 +147,14 @@ importers:
specifier: 4.6.1
version: 4.6.1(prisma@4.6.1)
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
next:
specifier: 13.3.0
version: 13.3.0(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0)
next-auth:
specifier: 4.18.7
version: 4.18.7(next@13.3.0)(react-dom@18.2.0)(react@18.2.0)
prisma:
specifier: 4.6.1
version: 4.6.1
@@ -249,16 +244,16 @@ importers:
apps/toolkit-app-passportjs:
dependencies:
"@blitzjs/auth":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-auth
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/config
"@blitzjs/next":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-next
"@blitzjs/rpc":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-rpc
"@hookform/error-message":
specifier: 2.0.0
@@ -270,7 +265,7 @@ importers:
specifier: 4.6.1
version: 4.6.1(prisma@4.6.1)
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
next:
specifier: 13.3.0
@@ -361,16 +356,16 @@ importers:
apps/web:
dependencies:
"@blitzjs/auth":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-auth
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/config
"@blitzjs/next":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-next
"@blitzjs/rpc":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-rpc
"@prisma/client":
specifier: 4.6.1
@@ -382,7 +377,7 @@ importers:
specifier: 1.0.37
version: 1.0.37
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jest:
specifier: 29.3.0
@@ -428,19 +423,19 @@ importers:
integration-tests/auth:
dependencies:
"@blitzjs/auth":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-auth
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/config
"@blitzjs/next":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-next
"@prisma/client":
specifier: 4.6.1
version: 4.6.1(prisma@4.6.1)
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
lowdb:
specifier: 3.0.0
@@ -510,16 +505,16 @@ importers:
integration-tests/auth-with-rpc:
dependencies:
"@blitzjs/auth":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-auth
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/config
"@blitzjs/next":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-next
"@blitzjs/rpc":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-rpc
"@hookform/error-message":
specifier: 2.0.0
@@ -531,7 +526,7 @@ importers:
specifier: 4.6.1
version: 4.6.1(prisma@4.6.1)
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
delay:
specifier: 5.0.0
@@ -631,19 +626,19 @@ importers:
integration-tests/get-initial-props:
dependencies:
"@blitzjs/auth":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-auth
"@blitzjs/next":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-next
"@blitzjs/rpc":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-rpc
"@prisma/client":
specifier: 4.6.1
version: 4.6.1(prisma@4.6.1)
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
lowdb:
specifier: 3.0.0
@@ -662,7 +657,7 @@ importers:
version: 18.2.0(react@18.2.0)
devDependencies:
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/config
"@next/bundle-analyzer":
specifier: 12.0.8
@@ -701,16 +696,16 @@ importers:
integration-tests/middleware:
dependencies:
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/config
"@blitzjs/next":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-next
"@blitzjs/rpc":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-rpc
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
next:
specifier: 13.3.0
@@ -756,22 +751,22 @@ importers:
integration-tests/next-13-app-dir:
dependencies:
"@blitzjs/auth":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-auth
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/config
"@blitzjs/next":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-next
"@blitzjs/rpc":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-rpc
"@prisma/client":
specifier: 4.6.1
version: 4.6.1(prisma@4.6.1)
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
lowdb:
specifier: 3.0.0
@@ -841,19 +836,19 @@ importers:
integration-tests/no-suspense:
dependencies:
"@blitzjs/auth":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-auth
"@blitzjs/next":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-next
"@blitzjs/rpc":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-rpc
"@prisma/client":
specifier: 4.6.1
version: 4.6.1(prisma@4.6.1)
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
lowdb:
specifier: 3.0.0
@@ -872,7 +867,7 @@ importers:
version: 18.2.0(react@18.2.0)
devDependencies:
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/config
"@next/bundle-analyzer":
specifier: 12.0.8
@@ -911,16 +906,16 @@ importers:
integration-tests/qm:
dependencies:
"@blitzjs/auth":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-auth
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/config
"@blitzjs/next":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-next
"@blitzjs/rpc":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-rpc
"@prisma/client":
specifier: 4.6.1
@@ -929,7 +924,7 @@ importers:
specifier: 4.0.10
version: 4.0.10(react-dom@18.2.0)(react@18.2.0)
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
next:
specifier: 13.3.0
@@ -975,16 +970,16 @@ importers:
integration-tests/react-query-utils:
dependencies:
"@blitzjs/next":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-next
"@blitzjs/rpc":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-rpc
"@prisma/client":
specifier: 4.6.1
version: 4.6.1(prisma@4.6.1)
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
lowdb:
specifier: 3.0.0
@@ -1003,7 +998,7 @@ importers:
version: 18.2.0(react@18.2.0)
devDependencies:
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/config
"@next/bundle-analyzer":
specifier: 12.0.8
@@ -1042,16 +1037,16 @@ importers:
integration-tests/rpc:
dependencies:
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/config
"@blitzjs/next":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-next
"@blitzjs/rpc":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-rpc
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
next:
specifier: 13.3.0
@@ -1091,16 +1086,16 @@ importers:
integration-tests/rpc-path-root:
dependencies:
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/config
"@blitzjs/next":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-next
"@blitzjs/rpc":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-rpc
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
next:
specifier: 13.3.0
@@ -1140,19 +1135,19 @@ importers:
integration-tests/trailing-slash:
dependencies:
"@blitzjs/auth":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-auth
"@blitzjs/next":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-next
"@blitzjs/rpc":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz-rpc
"@prisma/client":
specifier: 4.6.1
version: 4.6.1(prisma@4.6.1)
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
lowdb:
specifier: 3.0.0
@@ -1171,7 +1166,7 @@ importers:
version: 18.2.0(react@18.2.0)
devDependencies:
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/config
"@next/bundle-analyzer":
specifier: 12.0.8
@@ -1294,7 +1289,7 @@ importers:
packages/blitz:
dependencies:
"@blitzjs/generator":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../generator
"@mrleebo/prisma-ast":
specifier: 0.2.6
@@ -1439,7 +1434,7 @@ importers:
version: 2.1.1
devDependencies:
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../config
"@types/cookie":
specifier: 0.4.1
@@ -1583,11 +1578,8 @@ importers:
specifier: 0.11.0
version: 0.11.0
devDependencies:
"@auth/core":
specifier: 0.10.0
version: 0.10.0(patch_hash=jkkk4das3mr53z5xj5wygbcfda)
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../config
"@testing-library/react":
specifier: 13.4.0
@@ -1611,11 +1603,14 @@ importers:
specifier: 17.0.14
version: 17.0.14
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../blitz
next:
specifier: 13.3.0
version: 13.3.0(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0)
next-auth:
specifier: 4.18.7
version: 4.18.7(next@13.3.0)(react-dom@18.2.0)(react@18.2.0)
react:
specifier: 18.2.0
version: 18.2.0
@@ -1638,7 +1633,7 @@ importers:
packages/blitz-next:
dependencies:
"@blitzjs/rpc":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../blitz-rpc
"@types/hoist-non-react-statics":
specifier: 3.3.1
@@ -1660,7 +1655,7 @@ importers:
version: 8.1.1
devDependencies:
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../config
"@testing-library/dom":
specifier: 8.13.0
@@ -1693,7 +1688,7 @@ importers:
specifier: 4.0.0
version: 4.0.0(@types/react@18.0.25)(react-dom@18.2.0)(react@18.2.0)
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../blitz
cross-spawn:
specifier: 7.0.3
@@ -1760,10 +1755,10 @@ importers:
version: 8.1.1
devDependencies:
"@blitzjs/auth":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../blitz-auth
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../config
"@tanstack/query-core":
specifier: 4.24.4
@@ -1778,7 +1773,7 @@ importers:
specifier: 17.0.14
version: 17.0.14
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../blitz
next:
specifier: 13.3.0
@@ -1817,13 +1812,13 @@ importers:
specifier: 7.17.12
version: 7.17.12(@babel/core@7.12.10)
"@blitzjs/generator":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../generator
arg:
specifier: 5.0.1
version: 5.0.1
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../blitz
chalk:
specifier: ^4.1.0
@@ -1851,7 +1846,7 @@ importers:
specifier: 7.12.10
version: 7.12.10(@babel/core@7.12.10)(supports-color@8.1.1)
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../config
"@types/jscodeshift":
specifier: 0.11.2
@@ -1973,7 +1968,7 @@ importers:
version: 3.20.2
devDependencies:
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../config
"@juanm04/cpx":
specifier: 2.0.1
@@ -2049,7 +2044,7 @@ importers:
version: 5.9.1(eslint@8.27.0)(supports-color@8.1.1)(typescript@4.8.4)
devDependencies:
"@blitzjs/config":
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../config
"@types/react":
specifier: 18.0.25
@@ -2073,7 +2068,7 @@ importers:
recipes/base-web:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2086,7 +2081,7 @@ importers:
recipes/bulma:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2099,7 +2094,7 @@ importers:
recipes/bumbag-ui:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2115,7 +2110,7 @@ importers:
recipes/chakra-ui:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2131,7 +2126,7 @@ importers:
recipes/emotion:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2144,19 +2139,19 @@ importers:
recipes/gh-action-yarn-mariadb:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
recipes/gh-action-yarn-postgres:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
recipes/ghost:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2169,7 +2164,7 @@ importers:
recipes/graphql-apollo-server:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2185,7 +2180,7 @@ importers:
recipes/logrocket:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2198,7 +2193,7 @@ importers:
recipes/material-ui:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2211,7 +2206,7 @@ importers:
recipes/next-ui:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2227,19 +2222,19 @@ importers:
recipes/passenger:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
recipes/quirrel:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
recipes/reflexjs:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2255,13 +2250,13 @@ importers:
recipes/render:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
recipes/secureheaders:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2277,7 +2272,7 @@ importers:
recipes/stitches:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2290,7 +2285,7 @@ importers:
recipes/styled-components:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2306,7 +2301,7 @@ importers:
recipes/tailwind:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2319,7 +2314,7 @@ importers:
recipes/theme-ui:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2335,7 +2330,7 @@ importers:
recipes/vanilla-extract:
dependencies:
blitz:
specifier: 2.0.0-beta.31
specifier: 2.0.0-beta.32
version: link:../../packages/blitz
jscodeshift:
specifier: 0.13.0
@@ -2363,25 +2358,6 @@ packages:
"@jridgewell/gen-mapping": 0.1.1
"@jridgewell/trace-mapping": 0.3.17
/@auth/core@0.10.0(patch_hash=jkkk4das3mr53z5xj5wygbcfda):
resolution:
{
integrity: sha512-mmvAzFUcDHG0m6avQ6/sYI3wtQtt3Tjbk4wCr27OlCeNnlzqK8lDQJIDFbJOTXEu/dNUx8sUQ0xMp7A6GAaHQw==,
}
peerDependencies:
nodemailer: ^6.8.0
peerDependenciesMeta:
nodemailer:
optional: true
dependencies:
"@panva/hkdf": 1.1.1
cookie: 0.5.0
jose: 4.11.2
oauth4webapi: 2.3.0
preact: 10.11.3
preact-render-to-string: 5.2.3(preact@10.11.3)
patched: true
/@babel/code-frame@7.16.7:
resolution:
{
@@ -5741,10 +5717,10 @@ packages:
"@nodelib/fs.scandir": 2.1.5
fastq: 1.13.0
/@panva/hkdf@1.1.1:
/@panva/hkdf@1.0.2:
resolution:
{
integrity: sha512-dhPeilub1NuIG0X5Kvhh9lH4iW3ZsHlnzwgwbOlgwQ2wG1IqFzsgHqmKPk3WzsdWAeaxKJxgM0+W433RmN45GA==,
integrity: sha512-MSAs9t3Go7GUkMhpKC44T58DJ5KGk2vBo+h1cqQeqlMfdGkxaVB78ZWpv9gYi/g2fa4sopag9gJsNvS8XGgWJA==,
}
/@pkgr/utils@2.3.1:
@@ -16739,6 +16715,34 @@ packages:
}
dev: false
/next-auth@4.18.7(next@13.3.0)(react-dom@18.2.0)(react@18.2.0):
resolution:
{
integrity: sha512-kR3s1JVPMaDuSAlFxcGyv7Ec3fdE6za71r1F77IOII5zJmW2wfkIA2xj223fM0D20ip2pzFpHfk/qN4L6l5XMA==,
}
engines: {node: ^12.19.0 || ^14.15.0 || ^16.13.0 || ^18.12.0}
peerDependencies:
next: ^12.2.5 || ^13
nodemailer: ^6.6.5
react: ^17.0.2 || ^18
react-dom: ^17.0.2 || ^18
peerDependenciesMeta:
nodemailer:
optional: true
dependencies:
"@babel/runtime": 7.18.3
"@panva/hkdf": 1.0.2
cookie: 0.5.0
jose: 4.11.2
next: 13.3.0(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0)
oauth: 0.9.15
openid-client: 5.2.1
preact: 10.11.3
preact-render-to-string: 5.2.6(preact@10.11.3)
react: 18.2.0
react-dom: 18.2.0(react@18.2.0)
uuid: 8.3.2
/next-router-mock@0.9.1(next@13.3.0)(react@18.2.0):
resolution:
{
@@ -17064,12 +17068,6 @@ packages:
integrity: sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==,
}
/oauth4webapi@2.3.0:
resolution:
{
integrity: sha512-JGkb5doGrwzVDuHwgrR4nHJayzN4h59VCed6EW8Tql6iHDfZIabCJvg6wtbn5q6pyB2hZruI3b77Nudvq7NmvA==,
}
/oauth@0.10.0:
resolution:
{
@@ -17082,7 +17080,6 @@ packages:
{
integrity: sha512-a5ERWK1kh38ExDEfoO6qUHJb32rd7aYmPHuyCu3Fta/cnICvYmgd2uhuKXvPD+PXB+gCEYYEaQdIRAjCOwAKNA==,
}
dev: false
/object-assign@4.1.1:
resolution:
@@ -17109,7 +17106,6 @@ packages:
integrity: sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==,
}
engines: {node: ">= 6"}
dev: false
/object-inspect@1.12.2:
resolution:
@@ -17204,7 +17200,6 @@ packages:
integrity: sha512-EvoOtz6FIEBzE+9q253HsLCVRiK/0doEJ2HCvvqMQb3dHZrP3WlJKYtJ55CRTw4jmYomzH4wkPuCj/I3ZvpKxQ==,
}
engines: {node: ^10.13.0 || >=12.0.0}
dev: false
/on-finished@2.3.0:
resolution:
@@ -17302,7 +17297,6 @@ packages:
lru-cache: 6.0.0
object-hash: 2.2.0
oidc-token-hash: 5.0.1
dev: false
/optionator@0.8.3:
resolution:
@@ -17996,10 +17990,10 @@ packages:
picocolors: 1.0.0
source-map-js: 1.0.2
/preact-render-to-string@5.2.3(preact@10.11.3):
/preact-render-to-string@5.2.6(preact@10.11.3):
resolution:
{
integrity: sha512-aPDxUn5o3GhWdtJtW0svRC2SS/l8D9MAgo2+AWml+BhDImb27ALf04Q2d+AHqUUOc6RdSXFIBVa2gxzgMKgtZA==,
integrity: sha512-JyhErpYOvBV1hEPwIxc/fHWXPfnEGdRKxc8gFdAZ7XV4tlzyzG847XAyEZqoDnynP88akM4eaHcSOzNcLWFguw==,
}
peerDependencies:
preact: ">=10"

View File

@@ -23,7 +23,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0"
},
"devDependencies": {

View File

@@ -22,7 +22,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0"
},
"devDependencies": {

View File

@@ -24,7 +24,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0"
},
"devDependencies": {

View File

@@ -24,7 +24,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0"
},
"devDependencies": {

View File

@@ -22,7 +22,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0"
},
"devDependencies": {

View File

@@ -24,6 +24,6 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31"
"blitz": "2.0.0-beta.32"
}
}

View File

@@ -24,6 +24,6 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31"
"blitz": "2.0.0-beta.32"
}
}

View File

@@ -23,7 +23,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0"
},
"devDependencies": {

View File

@@ -22,7 +22,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0",
"uuid": "^8.3.1"
},

View File

@@ -23,7 +23,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0"
},
"devDependencies": {

View File

@@ -23,7 +23,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0"
},
"devDependencies": {

View File

@@ -23,7 +23,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0"
},
"devDependencies": {

View File

@@ -23,6 +23,6 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31"
"blitz": "2.0.0-beta.32"
}
}

View File

@@ -22,6 +22,6 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31"
"blitz": "2.0.0-beta.32"
}
}

View File

@@ -23,7 +23,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0"
},
"devDependencies": {

View File

@@ -22,6 +22,6 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31"
"blitz": "2.0.0-beta.32"
}
}

View File

@@ -22,7 +22,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0",
"uuid": "^8.3.1"
},

View File

@@ -24,7 +24,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0"
},
"devDependencies": {

View File

@@ -24,7 +24,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0"
},
"devDependencies": {

View File

@@ -22,7 +22,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0"
},
"devDependencies": {

View File

@@ -23,7 +23,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0"
},
"devDependencies": {

View File

@@ -25,7 +25,7 @@
},
"homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": {
"blitz": "2.0.0-beta.31",
"blitz": "2.0.0-beta.32",
"jscodeshift": "0.13.0"
},
"devDependencies": {