1
0
mirror of synced 2026-02-04 12:08:33 -05:00

Compare commits

...

7 Commits

Author SHA1 Message Date
github-actions[bot]
81dd346c85 Version Packages (beta) (#3907)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-10-19 14:56:44 +08:00
Aleksandra
6f4349896f Fix 'ambiguous class detected' errors (#3912) 2022-10-19 13:44:33 +08:00
Aleksandra
a6e81f156b Add BlitzLogger plugin and allow customizing logging (#3886) 2022-10-18 15:50:17 +08:00
Aleksandra
4e26ae21bc Upgrade eslint-config-next in new app templates to fix linting issues on blitz build (#3910) 2022-10-18 14:54:47 +08:00
Blitz.js Bot
70ca39e059 (meta) added @janvennemann as contributor 2022-10-17 04:06:03 -04:00
Jan Vennemann
7b63f0f1f2 fix(rpc): allow return undefined in setQueryData updater function (#3898)
Co-authored-by: Dillon Raphael <dillon@creatorsneverdie.com>
Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>
2022-10-17 16:05:57 +08:00
Siddharth Suresh
2e5d7ae40c Upgrade CI Syntax (#3906) 2022-10-17 15:33:36 +08:00
72 changed files with 363 additions and 345 deletions

View File

@@ -3723,6 +3723,16 @@
"contributions": [
"doc"
]
},
{
"login": "janvennemann",
"name": "Jan Vennemann",
"avatar_url": "https://avatars.githubusercontent.com/u/1406024?v=4",
"profile": "https://github.com/janvennemann",
"contributions": [
"doc",
"code"
]
}
],
"contributorsPerLine": 7,

View File

@@ -0,0 +1,6 @@
---
"blitz": patch
"@blitzjs/next": patch
---
Add BlitzLogger plugin and allow customizing logging

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/rpc": patch
---
Allow the updater function in setQueryData to return undefined to match react-query typings

View File

@@ -0,0 +1,5 @@
---
"blitz": patch
---
Fix "Ambiguous class detected" errors reported by SuperJson by removing duplicated export from errors.ts file

View File

@@ -0,0 +1,6 @@
---
"@blitzjs/config": patch
"@blitzjs/generator": patch
---
Upgrade eslint-config-next in new app templates to fix linting issues on blitz build

View File

@@ -98,6 +98,7 @@
"fuzzy-jars-admire",
"gentle-dogs-reply",
"gentle-lions-explode",
"giant-mails-tap",
"gold-horses-punch",
"good-apes-drum",
"good-insects-wink",
@@ -124,12 +125,14 @@
"hungry-pens-collect",
"itchy-houses-marry",
"itchy-spoons-tan",
"khaki-ducks-cheer",
"kind-walls-suffer",
"late-steaks-give",
"lazy-maps-sort",
"lemon-games-press",
"lemon-seas-push",
"light-donkeys-double",
"little-pears-ring",
"long-bees-hope",
"long-dancers-jog",
"long-lobsters-drop",
@@ -137,6 +140,7 @@
"lovely-colts-share",
"lucky-cows-try",
"lucky-months-guess",
"lucky-years-turn",
"mean-gorillas-reply",
"modern-cameras-pull",
"modern-ligers-behave",

View File

@@ -10,7 +10,7 @@ concurrency:
jobs:
changeset:
if: ${{ github.event.label.name != 'no-changeset' }}
if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-changeset') && github.event.pull_request.merged == false }}
runs-on: ubuntu-latest
steps:
- name: Checkout Repo

View File

@@ -129,7 +129,7 @@ jobs:
cd ./integration-tests
tree -J -d -L 1 | jq -c '.[0].contents | map(.name | tostring) | map(select(. != "utils"))'
folders=$(tree -J -d -L 1 | jq -c '.[0].contents | map(.name | tostring) | map(select(. != "utils"))')
echo "::set-output name=folders::$folders"
echo "folders=$folders" >> $GITHUB_OUTPUT
Integration-Tests:
name: "Integration Test: ${{matrix.folder}} @ ${{ matrix.os }} "

View File

@@ -6,7 +6,7 @@
<img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
</a>
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-394-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-395-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
<!-- ALL-CONTRIBUTORS-BADGE:END -->
<a aria-label="License" href="https://github.com/blitz-js/blitz/blob/main/LICENSE">
<img alt="" src="https://img.shields.io/npm/l/blitz.svg?style=for-the-badge&labelColor=000000&color=blue">
@@ -729,6 +729,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
<tr>
<td align="center"><a href="https://github.com/corydeppen"><img src="https://avatars.githubusercontent.com/u/313264?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cory Deppen</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=corydeppen" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/oloost"><img src="https://avatars.githubusercontent.com/u/72395941?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oloost</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=oloost" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/janvennemann"><img src="https://avatars.githubusercontent.com/u/1406024?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jan Vennemann</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=janvennemann" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=janvennemann" title="Code">💻</a></td>
</tr>
</table>

View File

@@ -2,6 +2,7 @@ import { setupBlitzServer } from "@blitzjs/next"
import { AuthServerPlugin, PrismaStorage } from "@blitzjs/auth"
import db from "db"
import { simpleRolesIsAuthorized } from "@blitzjs/auth"
import { BlitzLogger } from "blitz"
const { gSSP, gSP, api } = setupBlitzServer({
plugins: [
@@ -11,6 +12,7 @@ const { gSSP, gSP, api } = setupBlitzServer({
isAuthorized: simpleRolesIsAuthorized,
}),
],
logger: BlitzLogger({}),
})
export { gSSP, gSP, api }

View File

@@ -29,7 +29,7 @@
"@blitzjs/rpc": "workspace:*",
"@hookform/resolvers": "2.8.8",
"@prisma/client": "4.0.0",
"blitz": "workspace:2.0.0-beta.12",
"blitz": "workspace:2.0.0-beta.13",
"next": "12.2.5",
"openid-client": "5.1.8",
"prisma": "4.0.0",
@@ -49,7 +49,7 @@
"@types/react": "18.0.17",
"@typescript-eslint/eslint-plugin": "5.9.1",
"eslint": "7.32.0",
"eslint-config-next": "12.2.0",
"eslint-config-next": "12.3.1",
"eslint-config-prettier": "8.5.0",
"husky": "7.0.4",
"jest": "27.5.1",

View File

@@ -3,6 +3,7 @@ import { setupBlitzServer } from "@blitzjs/next"
import { AuthServerPlugin, PrismaStorage } from "@blitzjs/auth"
import db from "db"
import { simpleRolesIsAuthorized } from "@blitzjs/auth"
import { BlitzLogger } from "blitz"
const { gSSP, gSP, api } = setupBlitzServer({
plugins: [
@@ -12,6 +13,7 @@ const { gSSP, gSP, api } = setupBlitzServer({
isAuthorized: simpleRolesIsAuthorized,
}),
],
logger: BlitzLogger({}),
})
export { gSSP, gSP, api }

View File

@@ -29,7 +29,7 @@
"@blitzjs/rpc": "workspace:*",
"@hookform/resolvers": "2.8.8",
"@prisma/client": "4.0.0",
"blitz": "workspace:2.0.0-beta.12",
"blitz": "workspace:2.0.0-beta.13",
"next": "12.2.5",
"prisma": "4.0.0",
"react": "18.2.0",
@@ -48,7 +48,7 @@
"@types/react": "18.0.17",
"@typescript-eslint/eslint-plugin": "5.9.1",
"eslint": "7.32.0",
"eslint-config-next": "12.2.0",
"eslint-config-next": "12.3.1",
"eslint-config-prettier": "8.5.0",
"husky": "7.0.4",
"jest": "27.5.1",

View File

@@ -7,6 +7,7 @@ import logout from "app/auth/mutations/logout"
import logo from "public/logo.png"
import { useMutation } from "@blitzjs/rpc"
import { Routes, BlitzPage } from "@blitzjs/next"
import { getSession, useSession } from "@blitzjs/auth"
/*
* This file is just for a pleasant getting started page for your new app.
@@ -271,6 +272,4 @@ const Home: BlitzPage = () => {
)
}
Home.authenticate = true
export default Home

View File

@@ -1,7 +1,8 @@
import {setupBlitzServer} from "@blitzjs/next"
import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
import db from "db"
import {simpleRolesIsAuthorized} from "@blitzjs/auth"
import {BlitzLogger} from "blitz"
import db from "db"
const {gSSP, gSP, api} = setupBlitzServer({
plugins: [
@@ -11,6 +12,10 @@ const {gSSP, gSP, api} = setupBlitzServer({
isAuthorized: simpleRolesIsAuthorized,
}),
],
logger: BlitzLogger({
colorizePrettyLogs: true,
prefix: ["[blitz]>>>>>"],
}),
})
export {gSSP, gSP, api}

View File

@@ -2,6 +2,7 @@ import {setupBlitzServer} from "@blitzjs/next"
import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
import {simpleRolesIsAuthorized} from "@blitzjs/auth"
import db from "../db/index"
import {BlitzLogger} from "blitz"
const {gSSP, gSP, api} = setupBlitzServer({
plugins: [
@@ -11,6 +12,7 @@ const {gSSP, gSP, api} = setupBlitzServer({
isAuthorized: simpleRolesIsAuthorized,
}),
],
logger: BlitzLogger({}),
})
export {gSSP, gSP, api}

View File

@@ -21,7 +21,7 @@
"@blitzjs/config": "workspace:*",
"@blitzjs/next": "workspace:*",
"@prisma/client": "4.0.0",
"blitz": "workspace:2.0.0-beta.12",
"blitz": "workspace:2.0.0-beta.13",
"lowdb": "3.0.0",
"next": "12.2.5",
"prisma": "4.0.0",

View File

@@ -2,6 +2,7 @@ import {setupBlitzServer} from "@blitzjs/next"
import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
import {simpleRolesIsAuthorized} from "@blitzjs/auth"
import db from "../db"
import {BlitzLogger} from "blitz"
const {gSSP, gSP, api} = setupBlitzServer({
plugins: [
@@ -11,6 +12,7 @@ const {gSSP, gSP, api} = setupBlitzServer({
isAuthorized: simpleRolesIsAuthorized,
}),
],
logger: BlitzLogger({}),
})
export {gSSP, gSP, api}

View File

@@ -1,7 +1,9 @@
import {setupBlitzServer} from "@blitzjs/next"
import {BlitzLogger} from "blitz"
const {gSSP, gSP, api} = setupBlitzServer({
plugins: [],
logger: BlitzLogger({}),
})
export {gSSP, gSP, api}

View File

@@ -2,6 +2,7 @@ import {setupBlitzServer} from "@blitzjs/next"
import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
import {simpleRolesIsAuthorized} from "@blitzjs/auth"
import db from "../db/index"
import {BlitzLogger} from "blitz"
const {gSSP, gSP, api} = setupBlitzServer({
plugins: [
@@ -11,6 +12,7 @@ const {gSSP, gSP, api} = setupBlitzServer({
isAuthorized: simpleRolesIsAuthorized,
}),
],
logger: BlitzLogger({}),
})
export {gSSP, gSP, api}

View File

@@ -2,6 +2,7 @@ import {setupBlitzServer} from "@blitzjs/next"
import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
import {simpleRolesIsAuthorized} from "@blitzjs/auth"
import db from "../db"
import {BlitzLogger} from "blitz"
const {gSSP, gSP, api} = setupBlitzServer({
plugins: [
@@ -11,6 +12,7 @@ const {gSSP, gSP, api} = setupBlitzServer({
isAuthorized: simpleRolesIsAuthorized,
}),
],
logger: BlitzLogger({}),
})
export {gSSP, gSP, api}

View File

@@ -2,6 +2,7 @@ import {setupBlitzServer} from "@blitzjs/next"
import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
import {simpleRolesIsAuthorized} from "@blitzjs/auth"
import db from "../db"
import {BlitzLogger} from "blitz"
const {gSSP, gSP, api} = setupBlitzServer({
plugins: [
@@ -11,6 +12,7 @@ const {gSSP, gSP, api} = setupBlitzServer({
isAuthorized: simpleRolesIsAuthorized,
}),
],
logger: BlitzLogger({}),
})
export {gSSP, gSP, api}

View File

@@ -1,5 +1,13 @@
# @blitzjs/auth
## 2.0.0-beta.13
### Patch Changes
- Updated dependencies [a6e81f15]
- Updated dependencies [6f434989]
- blitz@2.0.0-beta.13
## 2.0.0-beta.12
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/auth",
"version": "2.0.0-beta.12",
"version": "2.0.0-beta.13",
"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-beta.12",
"blitz": "2.0.0-beta.13",
"cookie": "0.4.1",
"cookie-session": "2.0.0",
"debug": "4.3.3",
@@ -40,7 +40,7 @@
"url": "0.11.0"
},
"devDependencies": {
"@blitzjs/config": "workspace:2.0.0-beta.12",
"@blitzjs/config": "workspace:2.0.0-beta.13",
"@testing-library/react": "13.0.0",
"@testing-library/react-hooks": "7.0.2",
"@types/cookie": "0.4.1",

View File

@@ -1,5 +1,13 @@
# @blitzjs/next
## 2.0.0-beta.13
### Patch Changes
- a6e81f15: Add BlitzLogger plugin and allow customizing logging
- Updated dependencies [7b63f0f1]
- @blitzjs/rpc@2.0.0-beta.13
## 2.0.0-beta.12
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/next",
"version": "2.0.0-beta.12",
"version": "2.0.0-beta.13",
"scripts": {
"build": "unbuild",
"dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -24,7 +24,7 @@
"eslint.js"
],
"dependencies": {
"@blitzjs/rpc": "2.0.0-beta.12",
"@blitzjs/rpc": "2.0.0-beta.13",
"@tanstack/react-query": "4.0.10",
"@types/hoist-non-react-statics": "3.3.1",
"debug": "4.3.3",
@@ -34,7 +34,7 @@
"supports-color": "8.1.1"
},
"devDependencies": {
"@blitzjs/config": "workspace:2.0.0-beta.12",
"@blitzjs/config": "workspace:2.0.0-beta.13",
"@testing-library/dom": "8.13.0",
"@testing-library/jest-dom": "5.16.3",
"@testing-library/react": "13.0.0",
@@ -44,7 +44,7 @@
"@types/react": "18.0.17",
"@types/react-dom": "17.0.14",
"@types/testing-library__react-hooks": "4.0.0",
"blitz": "2.0.0-beta.12",
"blitz": "2.0.0-beta.13",
"cross-spawn": "7.0.3",
"find-up": "4.1.0",
"next": "12.2.5",

View File

@@ -7,7 +7,7 @@ import type {
NextApiRequest,
NextApiResponse,
} from "next"
import type {
import {
AddParameters,
AsyncFunc,
BlitzServerPlugin,
@@ -15,6 +15,8 @@ import type {
FirstParam,
RequestMiddleware,
MiddlewareResponse,
BlitzLogger,
initializeLogger,
} from "blitz"
import {handleRequestWithMiddleware, startWatcher, stopWatcher} from "blitz"
import {
@@ -50,6 +52,7 @@ export type NextApiHandler<TResult> = (
type SetupBlitzOptions = {
plugins: BlitzServerPlugin<RequestMiddleware, Ctx>[]
onError?: (err: Error) => void
logger: ReturnType<typeof BlitzLogger>
}
export type Redirect =
@@ -127,7 +130,9 @@ const prefetchQueryFactory = (
}
}
export const setupBlitzServer = ({plugins, onError}: SetupBlitzOptions) => {
export const setupBlitzServer = ({plugins, onError, logger}: SetupBlitzOptions) => {
initializeLogger(logger)
const middlewares = plugins.flatMap((p) => p.requestMiddlewares)
const contextMiddleware = plugins.flatMap((p) => p.contextMiddleware).filter(Boolean)

View File

@@ -1,5 +1,12 @@
# @blitzjs/rpc
## 2.0.0-beta.13
### Patch Changes
- 7b63f0f1: Allow the updater function in setQueryData to return undefined to match react-query typings
- @blitzjs/auth@2.0.0-beta.13
## 2.0.0-beta.12
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/rpc",
"version": "2.0.0-beta.12",
"version": "2.0.0-beta.13",
"scripts": {
"build": "unbuild",
"predev": "wait-on -d 400 ../blitz/dist/index-server.d.ts && wait-on -d 400 ../blitz-auth/dist/index-browser.d.ts",
@@ -20,7 +20,7 @@
"dist/**"
],
"dependencies": {
"@blitzjs/auth": "2.0.0-beta.12",
"@blitzjs/auth": "2.0.0-beta.13",
"@tanstack/react-query": "4.0.10",
"b64-lite": "1.4.0",
"bad-behavior": "1.0.1",
@@ -30,11 +30,11 @@
"supports-color": "8.1.1"
},
"devDependencies": {
"@blitzjs/config": "workspace:2.0.0-beta.12",
"@blitzjs/config": "workspace:2.0.0-beta.13",
"@types/debug": "4.1.7",
"@types/react": "18.0.17",
"@types/react-dom": "17.0.14",
"blitz": "2.0.0-beta.12",
"blitz": "2.0.0-beta.13",
"next": "12.2.5",
"react": "18.2.0",
"react-dom": "18.2.0",

View File

@@ -186,7 +186,7 @@ export const invalidateQuery: InvalidateQueryType = (resolver, ...params: []) =>
export function setQueryData<TInput, TResult, T extends AsyncFunc>(
resolver: T | Resolver<TInput, TResult> | RpcClient<TInput, TResult>,
params: TInput,
newData: TResult | ((oldData: TResult | undefined) => TResult),
newData: TResult | ((oldData: TResult | undefined) => TResult | undefined),
opts: MutateOptions = {refetch: true},
): Promise<void | ReturnType<ReturnType<typeof getQueryClient>["invalidateQueries"]>> {
if (typeof resolver === "undefined") {

View File

@@ -1,5 +1,14 @@
# blitz
## 2.0.0-beta.13
### Patch Changes
- a6e81f15: Add BlitzLogger plugin and allow customizing logging
- 6f434989: Fix "Ambiguous class detected" errors reported by SuperJson by removing duplicated export from errors.ts file
- Updated dependencies [4e26ae21]
- @blitzjs/generator@2.0.0-beta.13
## 2.0.0-beta.12
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "blitz",
"version": "2.0.0-beta.12",
"version": "2.0.0-beta.13",
"scripts": {
"build": "unbuild",
"dev": "pnpm run predev && watch unbuild src --wait=0.2",
@@ -25,7 +25,7 @@
"blitz": "bin/blitz"
},
"dependencies": {
"@blitzjs/generator": "2.0.0-beta.12",
"@blitzjs/generator": "2.0.0-beta.13",
"@mrleebo/prisma-ast": "0.2.6",
"@types/global-agent": "2.1.1",
"arg": "5.0.1",
@@ -72,7 +72,7 @@
"watchpack": "2.1.1"
},
"devDependencies": {
"@blitzjs/config": "workspace:2.0.0-beta.12",
"@blitzjs/config": "workspace:2.0.0-beta.13",
"@types/cookie": "0.4.1",
"@types/cross-spawn": "6.0.2",
"@types/debug": "4.1.7",

View File

@@ -4,6 +4,7 @@ import os from "os"
import path from "path"
import * as REPL from "repl"
import {REPLCommand, REPLServer} from "repl"
// eslint-disable-next-line @next/next/no-assign-module-variable
const debug = require("debug")("blitz:repl")
import ProgressBar from "progress"
import {log} from "../../logging"
@@ -58,6 +59,7 @@ export const forceRequire = (modulePath: string) => {
})
if (isTypeScript) {
// eslint-disable-next-line @next/next/no-assign-module-variable
const module = require(modulePath)
unregister()
return module
@@ -115,6 +117,7 @@ export const loadBlitz = async (onlyDb: boolean, module = "") => {
try {
debug("Loading", modulePath)
// eslint-disable-next-line @next/next/no-assign-module-variable
const module = forceRequire(modulePath)
const contextObj = module.default || module
// debug("ContextObj", contextObj)
@@ -172,7 +175,7 @@ const setupSelfRolledHistory = (repl: any, path: string) => {
const history = fs.readFileSync(path, {encoding: "utf8"})
const nonEmptyLines = history.split(os.EOL).filter((line) => line.trim())
repl.history.push(...nonEmptyLines.reverse())
} catch (err: any) {
} catch (err) {
if (err.code !== "ENOENT") {
throw err
}

View File

@@ -1,7 +1,22 @@
import "./global"
import {ComponentType} from "react"
import {IncomingMessage, ServerResponse} from "http"
import {AuthenticationError, AuthorizationError, NotFoundError, RedirectError} from "./errors"
import {
AuthenticationError,
AuthorizationError,
CSRFTokenMismatchError,
NotFoundError,
PaginationArgumentError,
RedirectError,
} from "./errors"
export {
AuthenticationError,
AuthorizationError,
CSRFTokenMismatchError,
NotFoundError,
PaginationArgumentError,
RedirectError,
}
export type BlitzProviderComponentType = <TProps = any>(
component: ComponentType<TProps>,
@@ -80,6 +95,5 @@ if (typeof window !== "undefined" && process.env.NODE_ENV === "development") {
export * from "./utils"
export * from "./types"
export * from "./errors"
export * from "./utils/zod"
export * from "./utils/prisma"

View File

@@ -7,7 +7,7 @@ export * from "./types"
export * from "./utils/run-prisma"
export * from "./middleware"
export * from "./paginate"
export {baseLogger, newLine, log} from "./logging"
export * from "./logging"
export {startWatcher, stopWatcher} from "./cli/utils/routes-manifest"
export interface MiddlewareResponse<C extends Ctx = Ctx> extends ServerResponse {

View File

@@ -1,47 +1,29 @@
import {ISettingsParam, Logger} from "tslog"
import {ISettingsParam, Logger, TLogLevelName} from "tslog"
import c from "chalk"
import {Table} from "console-table-printer"
import ora from "ora"
import readline from "readline"
export type LogLevel = "trace" | "debug" | "info" | "warn" | "error" | "fatal"
export type BlitzLoggerSettings = ISettingsParam
export type BlitzLogLevel = TLogLevelName
declare module globalThis {
declare namespace globalThis {
let _blitz_baseLogger: Logger
let _blitz_logLevel: LogLevel
let _blitz_logLevel: BlitzLogLevel
}
export const newLine = () => {
const logLevel: LogLevel = globalThis._blitz_logLevel
switch (logLevel) {
case "trace":
case "debug":
case "info":
console.log(" ")
break
case "warn":
case "error":
case "fatal":
default:
//nothing
break
}
}
export const baseLogger = (options?: ISettingsParam): Logger => {
export const baseLogger = (options: BlitzLoggerSettings = {}): Logger => {
if (globalThis._blitz_baseLogger) return globalThis._blitz_baseLogger
let config
try {
config = {} as any // todo: loadConfigAtRuntime()
} catch {
config = {}
}
globalThis._blitz_baseLogger = BlitzLogger(options)
globalThis._blitz_baseLogger = new Logger({
minLevel: config?.log?.level || "info",
type: config?.log?.type || "pretty",
return globalThis._blitz_baseLogger
}
export const BlitzLogger = (settings: BlitzLoggerSettings = {}) => {
const baseLogger = new Logger({
minLevel: "info",
type: "pretty",
dateTimePattern:
process.env.NODE_ENV === "production"
? "year-month-day hour:minute:second.millisecond"
@@ -61,10 +43,14 @@ export const baseLogger = (options?: ISettingsParam): Logger => {
},
maskValuesOfKeys: ["password", "passwordConfirmation"],
exposeErrorCodeFrame: process.env.NODE_ENV !== "production",
...options,
...settings,
})
return globalThis._blitz_baseLogger
return baseLogger
}
export const initializeLogger = (logger: Logger) => {
globalThis._blitz_baseLogger = logger
}
export const table = Table
@@ -76,6 +62,24 @@ const blitzBrightBrandColor = "8a3df0"
// Using bright brand color so it's better for dark terminals
const brandColor = blitzBrightBrandColor
export const newLine = () => {
const logLevel: BlitzLogLevel = globalThis._blitz_logLevel
switch (logLevel) {
case "trace":
case "debug":
case "info":
console.log(" ")
break
case "warn":
case "error":
case "fatal":
default:
//nothing
break
}
}
const withBrand = (str: string) => {
return c.hex(brandColor).bold(str)
}

View File

@@ -56,61 +56,6 @@ export async function handleRequestWithMiddleware<
}
}
// export type InvokeWithMiddlewareConfig = {
// req: IncomingMessage
// res: ServerResponse
// middleware?: Middleware[]
// [prop: string]: any
// }
// export async function invokeWithMiddleware<
// T extends AsyncFunc,
// TInput = FirstParam<T>,
// TResult = PromiseReturnType<T>
// >(
// resolver: T,
// params: TInput,
// ctx: InvokeWithMiddlewareConfig
// ): Promise<TResult> {
// if (!ctx.req) {
// throw new Error(
// 'You must provide `req` in third argument of invokeWithMiddleware()'
// )
// }
// if (!ctx.res) {
// throw new Error(
// 'You must provide `res` in third argument of invokeWithMiddleware()'
// )
// }
// const rpcResolver = (resolver as unknown) as any // todo: as RpcResolver
// const resolverName =
// rpcResolver._resolverName ?? (rpcResolver as any).default?._resolverName
// try {
// // todo
// // const log = baseLogger().getChildLogger({
// // prefix: [resolverName + '()'],
// // })
// console.log("\n")
// console.info(chalk.dim('Starting with input:'), params)
// const startTime = Date.now()
// const result = await interopDefault(rpcResolver)(params, res.blitzCtx)
// const duration = Date.now() - startTime
// console.info(chalk.dim(`Finished in ${prettyMs(duration)}`))
// console.log("/n")
// res.blitzResult = result // todo: remove?
// } catch (error) {
// throw error
// }
// return (ctx.res as MiddlewareResponse).blitzResult as TResult
// }
/**
* If the middleware function doesn't declare receiving the `next` callback
* assume that it's synchronous and invoke `next` ourselves

View File

@@ -1,5 +1,15 @@
# @blitzjs/codemod
## 2.0.0-beta.13
### Patch Changes
- Updated dependencies [a6e81f15]
- Updated dependencies [6f434989]
- Updated dependencies [4e26ae21]
- blitz@2.0.0-beta.13
- @blitzjs/generator@2.0.0-beta.13
## 2.0.0-beta.12
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/codemod",
"version": "2.0.0-beta.12",
"version": "2.0.0-beta.13",
"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.12",
"@blitzjs/generator": "2.0.0-beta.13",
"arg": "5.0.1",
"blitz": "2.0.0-beta.12",
"blitz": "2.0.0-beta.13",
"chalk": "^4.1.0",
"cross-spawn": "7.0.3",
"debug": "4.3.3",

View File

@@ -1,5 +1,11 @@
# @blitzjs/config
## 2.0.0-beta.13
### Patch Changes
- 4e26ae21: Upgrade eslint-config-next in new app templates to fix linting issues on blitz build
## 2.0.0-beta.12
## 2.0.0-beta.11

View File

@@ -1,12 +1,12 @@
{
"name": "@blitzjs/config",
"private": true,
"version": "2.0.0-beta.12",
"version": "2.0.0-beta.13",
"license": "MIT",
"dependencies": {
"@typescript-eslint/eslint-plugin": "5.9.1",
"@typescript-eslint/parser": "5.9.1",
"eslint-config-next": "12.2.0",
"eslint-config-next": "12.3.1",
"eslint-config-prettier": "8.5.0"
},
"devDependencies": {

View File

@@ -1,5 +1,11 @@
# @blitzjs/generator
## 2.0.0-beta.13
### Patch Changes
- 4e26ae21: Upgrade eslint-config-next in new app templates to fix linting issues on blitz build
## 2.0.0-beta.12
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/generator",
"version": "2.0.0-beta.12",
"version": "2.0.0-beta.13",
"scripts": {
"dev": "watch unbuild src --wait=0.2",
"build": "unbuild && pnpm build:templates",
@@ -46,7 +46,7 @@
"vinyl": "2.2.1"
},
"devDependencies": {
"@blitzjs/config": "2.0.0-beta.12",
"@blitzjs/config": "2.0.0-beta.13",
"@juanm04/cpx": "2.0.1",
"@types/babel__core": "7.1.19",
"@types/diff": "5.0.2",

View File

@@ -1,16 +1,17 @@
import { setupBlitzServer } from "@blitzjs/next"
import { AuthServerPlugin, PrismaStorage } from "@blitzjs/auth"
import { simpleRolesIsAuthorized } from "@blitzjs/auth"
import db from "db"
import { authConfig } from "./blitz-client"
import { setupBlitzServer } from '@blitzjs/next';
import { AuthServerPlugin, PrismaStorage } from '@blitzjs/auth';
import { simpleRolesIsAuthorized } from '@blitzjs/auth';
import { BlitzLogger } from 'blitz';
import db from 'db';
import { authConfig } from './blitz-client';
export const { gSSP, gSP, api } = setupBlitzServer({
plugins: [
AuthServerPlugin({
...authConfig,
storage: PrismaStorage(db),
isAuthorized: simpleRolesIsAuthorized,
}),
],
})
plugins: [
AuthServerPlugin({
...authConfig,
storage: PrismaStorage(db),
isAuthorized: simpleRolesIsAuthorized
})
],
logger: BlitzLogger({})
});

View File

@@ -37,13 +37,13 @@
"@next/bundle-analyzer": "12.0.8",
"@testing-library/jest-dom": "5.16.3",
"@testing-library/react": "13.4.0",
"@testing-library/react-hooks": "8.0.1",
"@testing-library/react-hooks": "8.0.1",
"@types/jest": "27.4.1",
"@types/node": "17.0.16",
"@types/preview-email": "2.0.1",
"@types/react": "18.0.17",
"@types/react": "18.0.17",
"eslint": "7.32.0",
"eslint-config-next": "12.2.0",
"eslint-config-next": "12.3.1",
"eslint-config-prettier": "8.5.0",
"husky": "7.0.4",
"jest": "27.5.1",

View File

@@ -37,14 +37,14 @@
"@next/bundle-analyzer": "12.0.8",
"@testing-library/jest-dom": "5.16.3",
"@testing-library/react": "13.4.0",
"@testing-library/react-hooks": "8.0.1",
"@testing-library/react-hooks": "8.0.1",
"@types/jest": "27.4.1",
"@types/node": "17.0.16",
"@types/preview-email": "2.0.1",
"@types/react": "18.0.17",
"@types/react": "18.0.17",
"@typescript-eslint/eslint-plugin": "5.30.5",
"eslint": "7.32.0",
"eslint-config-next": "12.2.0",
"eslint-config-next": "12.3.1",
"eslint-config-prettier": "8.5.0",
"husky": "7.0.4",
"jest": "27.5.1",

View File

@@ -30,9 +30,9 @@
"@testing-library/jest-dom": "5.16.3",
"@types/jest": "27.4.1",
"@types/node": "17.0.16",
"@types/react": "18.0.17",
"@types/react": "18.0.17",
"eslint": "7.32.0",
"eslint-config-next": "12.2.0",
"eslint-config-next": "12.3.1",
"eslint-config-prettier": "8.5.0",
"husky": "7.0.4",
"jest": "27.5.1",

View File

@@ -15,9 +15,7 @@
"printWidth": 100
},
"lint-staged": {
"*.{js,ts,tsx}": [
"eslint --fix"
]
"*.{js,ts,tsx}": ["eslint --fix"]
},
"dependencies": {
"@blitzjs/next": "latest",
@@ -32,11 +30,11 @@
"@testing-library/jest-dom": "5.16.3",
"@types/jest": "27.4.1",
"@types/node": "17.0.16",
"@types/react": "18.0.17",
"@types/react": "18.0.17",
"@typescript-eslint/eslint-plugin": "5.30.5",
"eslint": "7.32.0",
"eslint-config-prettier": "8.5.0",
"eslint-config-next": "12.2.0",
"eslint-config-next": "12.3.1",
"husky": "7.0.4",
"jest": "27.5.1",
"lint-staged": "12.1.7",

View File

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

271
pnpm-lock.yaml generated
View File

@@ -49,9 +49,9 @@ importers:
"@types/preview-email": 2.0.1
"@types/react": 18.0.17
"@typescript-eslint/eslint-plugin": 5.9.1
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
eslint: 7.32.0
eslint-config-next: 12.2.0
eslint-config-next: 12.3.1
eslint-config-prettier: 8.5.0
husky: 7.0.4
jest: 27.5.1
@@ -93,7 +93,7 @@ importers:
"@types/react": 18.0.17
"@typescript-eslint/eslint-plugin": 5.9.1_hrkuebk64jiu2ut2d2sm4oylnu
eslint: 7.32.0
eslint-config-next: 12.2.0_hrkuebk64jiu2ut2d2sm4oylnu
eslint-config-next: 12.3.1_hrkuebk64jiu2ut2d2sm4oylnu
eslint-config-prettier: 8.5.0_eslint@7.32.0
husky: 7.0.4
jest: 27.5.1_ts-node@10.7.0
@@ -120,9 +120,9 @@ importers:
"@types/preview-email": 2.0.1
"@types/react": 18.0.17
"@typescript-eslint/eslint-plugin": 5.9.1
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
eslint: 7.32.0
eslint-config-next: 12.2.0
eslint-config-next: 12.3.1
eslint-config-prettier: 8.5.0
husky: 7.0.4
jest: 27.5.1
@@ -166,7 +166,7 @@ importers:
"@types/react": 18.0.17
"@typescript-eslint/eslint-plugin": 5.9.1_hxadhbs2xogijvk7vq4t2azzbu
eslint: 7.32.0
eslint-config-next: 12.2.0_hxadhbs2xogijvk7vq4t2azzbu
eslint-config-next: 12.3.1_hxadhbs2xogijvk7vq4t2azzbu
eslint-config-prettier: 8.5.0_eslint@7.32.0
husky: 7.0.4
jest: 27.5.1_ts-node@10.7.0
@@ -235,7 +235,7 @@ importers:
"@types/node-fetch": 2.6.1
"@types/react": 18.0.17
b64-lite: 1.4.0
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
eslint: 7.32.0
fs-extra: 10.0.1
get-port: 6.1.2
@@ -650,8 +650,8 @@ importers:
packages/blitz:
specifiers:
"@blitzjs/config": workspace:2.0.0-beta.11
"@blitzjs/generator": 2.0.0-beta.11
"@blitzjs/config": workspace:2.0.0-beta.12
"@blitzjs/generator": 2.0.0-beta.12
"@mrleebo/prisma-ast": 0.2.6
"@types/cookie": 0.4.1
"@types/cross-spawn": 6.0.2
@@ -795,7 +795,7 @@ importers:
packages/blitz-auth:
specifiers:
"@blitzjs/config": workspace:2.0.0-beta.11
"@blitzjs/config": workspace:2.0.0-beta.12
"@testing-library/react": 13.0.0
"@testing-library/react-hooks": 7.0.2
"@types/b64-lite": 1.3.0
@@ -809,7 +809,7 @@ importers:
"@types/secure-password": 3.1.1
b64-lite: 1.4.0
bad-behavior: 1.0.1
blitz: 2.0.0-beta.11
blitz: 2.0.0-beta.12
cookie: 0.4.1
cookie-session: 2.0.0
debug: 4.3.3
@@ -862,8 +862,8 @@ importers:
packages/blitz-next:
specifiers:
"@blitzjs/config": workspace:2.0.0-beta.11
"@blitzjs/rpc": 2.0.0-beta.11
"@blitzjs/config": workspace:2.0.0-beta.12
"@blitzjs/rpc": 2.0.0-beta.12
"@tanstack/react-query": 4.0.10
"@testing-library/dom": 8.13.0
"@testing-library/jest-dom": 5.16.3
@@ -875,7 +875,7 @@ importers:
"@types/react": 18.0.17
"@types/react-dom": 17.0.14
"@types/testing-library__react-hooks": 4.0.0
blitz: 2.0.0-beta.11
blitz: 2.0.0-beta.12
cross-spawn: 7.0.3
debug: 4.3.3
find-up: 4.1.0
@@ -925,15 +925,15 @@ importers:
packages/blitz-rpc:
specifiers:
"@blitzjs/auth": 2.0.0-beta.11
"@blitzjs/config": workspace:2.0.0-beta.11
"@blitzjs/auth": 2.0.0-beta.12
"@blitzjs/config": workspace:2.0.0-beta.12
"@tanstack/react-query": 4.0.10
"@types/debug": 4.1.7
"@types/react": 18.0.17
"@types/react-dom": 17.0.14
b64-lite: 1.4.0
bad-behavior: 1.0.1
blitz: 2.0.0-beta.11
blitz: 2.0.0-beta.12
chalk: ^4.1.0
debug: 4.3.3
next: 12.2.5
@@ -976,12 +976,12 @@ importers:
"@babel/plugin-syntax-typescript": 7.17.12
"@babel/preset-env": 7.12.10
"@blitzjs/config": workspace:*
"@blitzjs/generator": 2.0.0-beta.11
"@blitzjs/generator": 2.0.0-beta.12
"@types/jscodeshift": 0.11.2
"@types/node": 17.0.16
arg: 5.0.1
ast-types: 0.14.2
blitz: 2.0.0-beta.11
blitz: 2.0.0-beta.12
chalk: ^4.1.0
cross-spawn: 7.0.3
debug: 4.3.3
@@ -1019,13 +1019,13 @@ importers:
specifiers:
"@typescript-eslint/eslint-plugin": 5.9.1
"@typescript-eslint/parser": 5.9.1
eslint-config-next: 12.2.0
eslint-config-next: 12.3.1
eslint-config-prettier: 8.5.0
typescript: ^4.5.3
dependencies:
"@typescript-eslint/eslint-plugin": 5.9.1_z2xqbpkx26iu62rx2zdto5f5qy
"@typescript-eslint/parser": 5.9.1_typescript@4.6.3
eslint-config-next: 12.2.0_typescript@4.6.3
eslint-config-next: 12.3.1_typescript@4.6.3
eslint-config-prettier: 8.5.0
devDependencies:
typescript: 4.6.3
@@ -1036,7 +1036,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-beta.11
"@blitzjs/config": 2.0.0-beta.12
"@juanm04/cpx": 2.0.1
"@mrleebo/prisma-ast": 0.4.1
"@types/babel__core": 7.1.19
@@ -1129,7 +1129,7 @@ importers:
packages/pkg-template:
specifiers:
"@blitzjs/config": 2.0.0-beta.11
"@blitzjs/config": 2.0.0-beta.12
"@types/react": 18.0.17
"@types/react-dom": 17.0.14
"@typescript-eslint/eslint-plugin": 5.9.1
@@ -1153,7 +1153,7 @@ importers:
recipes/base-web:
specifiers:
"@types/jscodeshift": 0.11.2
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
jscodeshift: 0.13.0
dependencies:
blitz: link:../../packages/blitz
@@ -1164,7 +1164,7 @@ importers:
recipes/bulma:
specifiers:
"@types/jscodeshift": 0.11.2
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
jscodeshift: 0.13.0
dependencies:
blitz: link:../../packages/blitz
@@ -1176,7 +1176,7 @@ importers:
specifiers:
"@types/jscodeshift": 0.11.2
ast-types: 0.14.2
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
jscodeshift: 0.13.0
dependencies:
blitz: link:../../packages/blitz
@@ -1189,7 +1189,7 @@ importers:
specifiers:
"@types/jscodeshift": 0.11.2
ast-types: 0.14.2
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
jscodeshift: 0.13.0
dependencies:
blitz: link:../../packages/blitz
@@ -1201,7 +1201,7 @@ importers:
recipes/emotion:
specifiers:
"@types/jscodeshift": 0.11.2
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
jscodeshift: 0.13.0
dependencies:
blitz: link:../../packages/blitz
@@ -1211,20 +1211,20 @@ importers:
recipes/gh-action-yarn-mariadb:
specifiers:
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
dependencies:
blitz: link:../../packages/blitz
recipes/gh-action-yarn-postgres:
specifiers:
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
dependencies:
blitz: link:../../packages/blitz
recipes/ghost:
specifiers:
"@types/jscodeshift": 0.11.2
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
jscodeshift: 0.13.0
dependencies:
blitz: link:../../packages/blitz
@@ -1235,7 +1235,7 @@ importers:
recipes/graphql-apollo-server:
specifiers:
"@types/jscodeshift": 0.11.2
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
jscodeshift: 0.13.0
uuid: ^8.3.1
dependencies:
@@ -1247,14 +1247,14 @@ importers:
recipes/logrocket:
specifiers:
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
dependencies:
blitz: link:../../packages/blitz
recipes/material-ui:
specifiers:
"@types/jscodeshift": 0.11.2
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
jscodeshift: 0.13.0
dependencies:
blitz: link:../../packages/blitz
@@ -1266,7 +1266,7 @@ importers:
specifiers:
"@types/jscodeshift": 0.11.2
ast-types: 0.14.2
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
jscodeshift: 0.13.0
dependencies:
blitz: link:../../packages/blitz
@@ -1277,13 +1277,13 @@ importers:
recipes/passenger:
specifiers:
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
dependencies:
blitz: link:../../packages/blitz
recipes/quirrel:
specifiers:
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
dependencies:
blitz: link:../../packages/blitz
@@ -1291,7 +1291,7 @@ importers:
specifiers:
"@types/jscodeshift": 0.11.2
ast-types: 0.14.2
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
jscodeshift: 0.13.0
dependencies:
blitz: link:../../packages/blitz
@@ -1302,14 +1302,14 @@ importers:
recipes/render:
specifiers:
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
dependencies:
blitz: link:../../packages/blitz
recipes/secureheaders:
specifiers:
"@types/jscodeshift": 0.11.2
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
jscodeshift: 0.13.0
uuid: ^8.3.1
dependencies:
@@ -1322,7 +1322,7 @@ importers:
recipes/stitches:
specifiers:
"@types/jscodeshift": 0.11.2
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
jscodeshift: 0.13.0
dependencies:
blitz: link:../../packages/blitz
@@ -1334,7 +1334,7 @@ importers:
specifiers:
"@types/jscodeshift": 0.11.2
ast-types: 0.14.2
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
jscodeshift: 0.13.0
dependencies:
blitz: link:../../packages/blitz
@@ -1346,7 +1346,7 @@ importers:
recipes/tailwind:
specifiers:
"@types/jscodeshift": 0.11.2
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
jscodeshift: 0.13.0
dependencies:
blitz: link:../../packages/blitz
@@ -1358,7 +1358,7 @@ importers:
specifiers:
"@types/jscodeshift": 0.11.2
ast-types: 0.14.2
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
jscodeshift: 0.13.0
dependencies:
blitz: link:../../packages/blitz
@@ -1370,7 +1370,7 @@ importers:
recipes/vanilla-extract:
specifiers:
"@types/jscodeshift": 0.11.2
blitz: workspace:2.0.0-beta.11
blitz: workspace:2.0.0-beta.12
jscodeshift: 0.13.0
dependencies:
blitz: link:../../packages/blitz
@@ -4492,14 +4492,6 @@ packages:
integrity: sha512-vLPLV3cpPGjUPT3PjgRj7e3nio9t6USkuew3JE/jMeon/9Mvp1WyR18v3iwnCuX7eUAm1HmAbJHHLAbcu/EJcw==,
}
/@next/eslint-plugin-next/12.2.0:
resolution:
{
integrity: sha512-nIj5xV/z3dOfeBnE7qFAjUQZAi4pTlIMuusRM6s/T6lOz8x7mjY5s1ZkTUBmcjPVCb2VIv3CrMH0WZL6xfjZZg==,
}
dependencies:
glob: 7.1.7
/@next/eslint-plugin-next/12.3.1:
resolution:
{
@@ -4507,7 +4499,6 @@ packages:
}
dependencies:
glob: 7.1.7
dev: true
/@next/swc-android-arm-eabi/12.2.5:
resolution:
@@ -9986,89 +9977,6 @@ packages:
optionalDependencies:
source-map: 0.6.1
/eslint-config-next/12.2.0_hrkuebk64jiu2ut2d2sm4oylnu:
resolution:
{
integrity: sha512-QWzNegadFXjQ0h3hixnLacRM9Kot85vQefyNsA8IeOnERZMz0Gvays1W6DMCjSxJbnCwuWaMXj9DCpar5IahRA==,
}
peerDependencies:
eslint: ^7.23.0 || ^8.0.0
typescript: ">=3.3.1"
peerDependenciesMeta:
typescript:
optional: true
dependencies:
"@next/eslint-plugin-next": 12.2.0
"@rushstack/eslint-patch": 1.1.3
"@typescript-eslint/parser": 5.28.0_hrkuebk64jiu2ut2d2sm4oylnu
eslint: 7.32.0
eslint-import-resolver-node: 0.3.6
eslint-import-resolver-typescript: 2.7.1_hpmu7kn6tcn2vnxpfzvv33bxmy
eslint-plugin-import: 2.26.0_zhtk6rij7obli3ams3sxis7j7e
eslint-plugin-jsx-a11y: 6.5.1_eslint@7.32.0
eslint-plugin-react: 7.30.0_eslint@7.32.0
eslint-plugin-react-hooks: 4.5.0_eslint@7.32.0
typescript: 4.6.3
transitivePeerDependencies:
- eslint-import-resolver-webpack
- supports-color
dev: true
/eslint-config-next/12.2.0_hxadhbs2xogijvk7vq4t2azzbu:
resolution:
{
integrity: sha512-QWzNegadFXjQ0h3hixnLacRM9Kot85vQefyNsA8IeOnERZMz0Gvays1W6DMCjSxJbnCwuWaMXj9DCpar5IahRA==,
}
peerDependencies:
eslint: ^7.23.0 || ^8.0.0
typescript: ">=3.3.1"
peerDependenciesMeta:
typescript:
optional: true
dependencies:
"@next/eslint-plugin-next": 12.2.0
"@rushstack/eslint-patch": 1.1.3
"@typescript-eslint/parser": 5.28.0_hxadhbs2xogijvk7vq4t2azzbu
eslint: 7.32.0
eslint-import-resolver-node: 0.3.6
eslint-import-resolver-typescript: 2.7.1_hpmu7kn6tcn2vnxpfzvv33bxmy
eslint-plugin-import: 2.26.0_zhtk6rij7obli3ams3sxis7j7e
eslint-plugin-jsx-a11y: 6.5.1_eslint@7.32.0
eslint-plugin-react: 7.30.0_eslint@7.32.0
eslint-plugin-react-hooks: 4.5.0_eslint@7.32.0
typescript: 4.7.4
transitivePeerDependencies:
- eslint-import-resolver-webpack
- supports-color
dev: true
/eslint-config-next/12.2.0_typescript@4.6.3:
resolution:
{
integrity: sha512-QWzNegadFXjQ0h3hixnLacRM9Kot85vQefyNsA8IeOnERZMz0Gvays1W6DMCjSxJbnCwuWaMXj9DCpar5IahRA==,
}
peerDependencies:
eslint: ^7.23.0 || ^8.0.0
typescript: ">=3.3.1"
peerDependenciesMeta:
typescript:
optional: true
dependencies:
"@next/eslint-plugin-next": 12.2.0
"@rushstack/eslint-patch": 1.1.3
"@typescript-eslint/parser": 5.28.0_typescript@4.6.3
eslint-import-resolver-node: 0.3.6
eslint-import-resolver-typescript: 2.7.1_fkfqfehjtk7sk2efaqbgxsuasa
eslint-plugin-import: 2.26.0_xtdmsd4adcznatktegie3poqce
eslint-plugin-jsx-a11y: 6.5.1
eslint-plugin-react: 7.30.0
eslint-plugin-react-hooks: 4.5.0
typescript: 4.6.3
transitivePeerDependencies:
- eslint-import-resolver-webpack
- supports-color
dev: false
/eslint-config-next/12.3.1_hrkuebk64jiu2ut2d2sm4oylnu:
resolution:
{
@@ -10097,6 +10005,61 @@ packages:
- supports-color
dev: true
/eslint-config-next/12.3.1_hxadhbs2xogijvk7vq4t2azzbu:
resolution:
{
integrity: sha512-EN/xwKPU6jz1G0Qi6Bd/BqMnHLyRAL0VsaQaWA7F3KkjAgZHi4f1uL1JKGWNxdQpHTW/sdGONBd0bzxUka/DJg==,
}
peerDependencies:
eslint: ^7.23.0 || ^8.0.0
typescript: ">=3.3.1"
peerDependenciesMeta:
typescript:
optional: true
dependencies:
"@next/eslint-plugin-next": 12.3.1
"@rushstack/eslint-patch": 1.1.3
"@typescript-eslint/parser": 5.28.0_hxadhbs2xogijvk7vq4t2azzbu
eslint: 7.32.0
eslint-import-resolver-node: 0.3.6
eslint-import-resolver-typescript: 2.7.1_hpmu7kn6tcn2vnxpfzvv33bxmy
eslint-plugin-import: 2.26.0_zhtk6rij7obli3ams3sxis7j7e
eslint-plugin-jsx-a11y: 6.5.1_eslint@7.32.0
eslint-plugin-react: 7.31.8_eslint@7.32.0
eslint-plugin-react-hooks: 4.5.0_eslint@7.32.0
typescript: 4.7.4
transitivePeerDependencies:
- eslint-import-resolver-webpack
- supports-color
dev: true
/eslint-config-next/12.3.1_typescript@4.6.3:
resolution:
{
integrity: sha512-EN/xwKPU6jz1G0Qi6Bd/BqMnHLyRAL0VsaQaWA7F3KkjAgZHi4f1uL1JKGWNxdQpHTW/sdGONBd0bzxUka/DJg==,
}
peerDependencies:
eslint: ^7.23.0 || ^8.0.0
typescript: ">=3.3.1"
peerDependenciesMeta:
typescript:
optional: true
dependencies:
"@next/eslint-plugin-next": 12.3.1
"@rushstack/eslint-patch": 1.1.3
"@typescript-eslint/parser": 5.28.0_typescript@4.6.3
eslint-import-resolver-node: 0.3.6
eslint-import-resolver-typescript: 2.7.1_fkfqfehjtk7sk2efaqbgxsuasa
eslint-plugin-import: 2.26.0_xtdmsd4adcznatktegie3poqce
eslint-plugin-jsx-a11y: 6.5.1
eslint-plugin-react: 7.31.8
eslint-plugin-react-hooks: 4.5.0
typescript: 4.6.3
transitivePeerDependencies:
- eslint-import-resolver-webpack
- supports-color
dev: false
/eslint-config-prettier/8.5.0:
resolution:
{
@@ -10334,10 +10297,10 @@ packages:
eslint: 7.32.0
dev: true
/eslint-plugin-react/7.30.0:
/eslint-plugin-react/7.31.8:
resolution:
{
integrity: sha512-RgwH7hjW48BleKsYyHK5vUAvxtE9SMPDKmcPRQgtRCYaZA0XQPt5FSkrU3nhz5ifzMZcA8opwmRJ2cmOO8tr5A==,
integrity: sha512-5lBTZmgQmARLLSYiwI71tiGVTLUuqXantZM6vlSY39OaDSV0M7+32K5DnLkmFrwTe+Ksz0ffuLUC91RUviVZfw==,
}
engines: {node: ">=4"}
peerDependencies:
@@ -10359,32 +10322,6 @@ packages:
string.prototype.matchall: 4.0.7
dev: false
/eslint-plugin-react/7.30.0_eslint@7.32.0:
resolution:
{
integrity: sha512-RgwH7hjW48BleKsYyHK5vUAvxtE9SMPDKmcPRQgtRCYaZA0XQPt5FSkrU3nhz5ifzMZcA8opwmRJ2cmOO8tr5A==,
}
engines: {node: ">=4"}
peerDependencies:
eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
dependencies:
array-includes: 3.1.5
array.prototype.flatmap: 1.3.0
doctrine: 2.1.0
eslint: 7.32.0
estraverse: 5.3.0
jsx-ast-utils: 3.3.0
minimatch: 3.1.2
object.entries: 1.1.5
object.fromentries: 2.0.5
object.hasown: 1.1.1
object.values: 1.1.5
prop-types: 15.8.1
resolve: 2.0.0-next.3
semver: 6.3.0
string.prototype.matchall: 4.0.7
dev: true
/eslint-plugin-react/7.31.8_eslint@7.32.0:
resolution:
{
@@ -12920,7 +12857,7 @@ packages:
pretty-format: 27.5.1
slash: 3.0.0
strip-json-comments: 3.1.1
ts-node: 10.7.0_typescript@4.6.3
ts-node: 10.7.0_6sxvnwysvlo53egjnie7htsx5a
transitivePeerDependencies:
- bufferutil
- canvas
@@ -18427,7 +18364,6 @@ packages:
typescript: 4.7.4
v8-compile-cache-lib: 3.0.1
yn: 3.1.1
dev: false
/ts-node/10.7.0_fxg3r7oju3tntkxsvleuiot4fa:
resolution:
@@ -18494,6 +18430,7 @@ packages:
typescript: 4.6.3
v8-compile-cache-lib: 3.0.1
yn: 3.1.1
dev: false
/ts-node/10.9.1_kakyiqi62sfonxvjmz3ft5vt7y:
resolution:

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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