Compare commits
21 Commits
fix-javasc
...
@blitzjs/r
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
831a493ab6 | ||
|
|
b6b9a1c5a4 | ||
|
|
61888d1a30 | ||
|
|
7aef610d85 | ||
|
|
b266254247 | ||
|
|
67e00d9108 | ||
|
|
d25c965bc8 | ||
|
|
1bb3a65566 | ||
|
|
28b0ffeb5f | ||
|
|
c7ac86b857 | ||
|
|
5166e5e037 | ||
|
|
2533caf484 | ||
|
|
85a71ffef9 | ||
|
|
803f533a3d | ||
|
|
63ee9423a9 | ||
|
|
89446b3656 | ||
|
|
5a64f1c39c | ||
|
|
fa30de4599 | ||
|
|
3d004dc415 | ||
|
|
08fbede75e | ||
|
|
eda14fa8aa |
@@ -3896,6 +3896,65 @@
|
||||
"doc",
|
||||
"code"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "dbrxnds",
|
||||
"name": "David",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/32268383?v=4",
|
||||
"profile": "https://github.com/dbrxnds",
|
||||
"contributions": [
|
||||
"doc",
|
||||
"code",
|
||||
"test"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "gjmoed",
|
||||
"name": "G.J. Moed",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/4458993?v=4",
|
||||
"profile": "https://github.com/gjmoed",
|
||||
"contributions": [
|
||||
"doc",
|
||||
"code"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "GHKEN",
|
||||
"name": "Tetsuya Fukuda",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/5304351?v=4",
|
||||
"profile": "https://ghken.com",
|
||||
"contributions": [
|
||||
"doc",
|
||||
"code"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "nerixim",
|
||||
"name": "Nikita Kamaev",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/26106502?v=4",
|
||||
"profile": "https://github.com/nerixim",
|
||||
"contributions": [
|
||||
"doc"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "nikola-wd",
|
||||
"name": "Nikola Ivanov",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/11588823?v=4",
|
||||
"profile": "https://webredone.com/",
|
||||
"contributions": [
|
||||
"doc"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "jayu",
|
||||
"name": "Jakub Mazurek",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/11561585?v=4",
|
||||
"profile": "jayu.dev",
|
||||
"contributions": [
|
||||
"doc",
|
||||
"code"
|
||||
]
|
||||
}
|
||||
],
|
||||
"contributorsPerLine": 7,
|
||||
|
||||
9
.changeset/big-turtles-tease.md
Normal file
9
.changeset/big-turtles-tease.md
Normal file
@@ -0,0 +1,9 @@
|
||||
---
|
||||
"@blitzjs/auth": patch
|
||||
"@blitzjs/next": patch
|
||||
"@blitzjs/rpc": patch
|
||||
"blitz": patch
|
||||
"@blitzjs/generator": patch
|
||||
---
|
||||
|
||||
(feat) upgrade tslog to v4.8.2
|
||||
6
.changeset/chatty-gifts-whisper.md
Normal file
6
.changeset/chatty-gifts-whisper.md
Normal file
@@ -0,0 +1,6 @@
|
||||
---
|
||||
"@blitzjs/next": minor
|
||||
"@blitzjs/rpc": minor
|
||||
---
|
||||
|
||||
Add ability to format the error on the server before returning it to the client.
|
||||
5
.changeset/few-elephants-approve.md
Normal file
5
.changeset/few-elephants-approve.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
"@blitzjs/rpc": patch
|
||||
---
|
||||
|
||||
Fix return type of `requestMiddlewares` in `RpcServerPlugin`
|
||||
5
.changeset/fresh-crews-chew.md
Normal file
5
.changeset/fresh-crews-chew.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
"@blitzjs/next": minor
|
||||
---
|
||||
|
||||
Fix the DYNAMIC_SERVER_USAGE error for Next.js 13.3.1+
|
||||
26
.changeset/good-oranges-pretend.md
Normal file
26
.changeset/good-oranges-pretend.md
Normal file
@@ -0,0 +1,26 @@
|
||||
---
|
||||
"@blitzjs/rpc": patch
|
||||
---
|
||||
|
||||
Fixes enormous memory consumption of the dev server by changing the default import strategy to "require" instead of "import" which in webpack causes multiple chunks to be created for each import.
|
||||
|
||||
## Blitz Configuration
|
||||
|
||||
To configure this behaviour, you can add the following to your next.config.js:
|
||||
|
||||
```js
|
||||
/**
|
||||
* @type {import('@blitzjs/next').BlitzConfig}
|
||||
**/
|
||||
const config = {
|
||||
blitz: {
|
||||
resolversDynamicImport: true,
|
||||
},
|
||||
}
|
||||
```
|
||||
|
||||
When `resolversDynamicImport` is set to `true`, the import strategy will be "import" instead of "require".
|
||||
|
||||
### On Vercel
|
||||
|
||||
If you are using Vercel, `resolversDynamicImport` will be set to `true` by default, since it is better for the separate chunks to be create for serverless lambdas.
|
||||
5
.changeset/large-hairs-battle.md
Normal file
5
.changeset/large-hairs-battle.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
"@blitzjs/generator": patch
|
||||
---
|
||||
|
||||
Make Next.js version stick to 13.4.5 when generating a new app
|
||||
5
.changeset/moody-crews-travel.md
Normal file
5
.changeset/moody-crews-travel.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
"@blitzjs/auth": minor
|
||||
---
|
||||
|
||||
Stop exporting `useAuthenticatedBlitzContext` from `@blitzjs/auth` this must be imported from `app/blitz-server.ts` file in order to work correctly
|
||||
@@ -55,6 +55,7 @@
|
||||
"afraid-ears-repair",
|
||||
"big-boats-lay",
|
||||
"big-phones-bow",
|
||||
"big-turtles-tease",
|
||||
"blue-flowers-peel",
|
||||
"blue-pigs-tan",
|
||||
"brave-zebras-deny",
|
||||
@@ -70,6 +71,7 @@
|
||||
"calm-papayas-protect",
|
||||
"calm-tomatoes-drive",
|
||||
"chatty-fireants-leave",
|
||||
"chatty-gifts-whisper",
|
||||
"chilled-carrots-own",
|
||||
"chilly-candles-care",
|
||||
"chilly-nails-nail",
|
||||
@@ -108,6 +110,7 @@
|
||||
"fast-toys-wash",
|
||||
"fast-trainers-kneel",
|
||||
"few-dogs-fetch",
|
||||
"few-elephants-approve",
|
||||
"few-hounds-worry",
|
||||
"few-shrimps-leave",
|
||||
"flat-bees-approve",
|
||||
@@ -119,6 +122,7 @@
|
||||
"four-meals-fry",
|
||||
"four-radios-tickle",
|
||||
"four-sheep-judge",
|
||||
"fresh-crews-chew",
|
||||
"funny-cups-pay",
|
||||
"fuzzy-bees-warn",
|
||||
"fuzzy-dots-cross",
|
||||
@@ -131,6 +135,7 @@
|
||||
"gold-horses-punch",
|
||||
"good-apes-drum",
|
||||
"good-insects-wink",
|
||||
"good-oranges-pretend",
|
||||
"gorgeous-birds-warn",
|
||||
"gorgeous-buses-scream",
|
||||
"gorgeous-games-obey",
|
||||
@@ -160,6 +165,7 @@
|
||||
"khaki-ducks-cheer",
|
||||
"khaki-pens-rest",
|
||||
"kind-walls-suffer",
|
||||
"large-hairs-battle",
|
||||
"late-steaks-give",
|
||||
"lazy-maps-sort",
|
||||
"lemon-games-press",
|
||||
@@ -185,6 +191,7 @@
|
||||
"modern-games-dream",
|
||||
"modern-ligers-behave",
|
||||
"moody-bags-walk",
|
||||
"moody-crews-travel",
|
||||
"moody-spoons-rhyme",
|
||||
"moody-squids-cheer",
|
||||
"nasty-suns-wash",
|
||||
@@ -195,6 +202,7 @@
|
||||
"nice-boxes-travel",
|
||||
"nice-deers-dream",
|
||||
"nice-starfishes-live",
|
||||
"nine-bags-rhyme",
|
||||
"nine-birds-confess",
|
||||
"nine-onions-admire",
|
||||
"ninety-lies-press",
|
||||
@@ -256,6 +264,7 @@
|
||||
"slow-impalas-tap",
|
||||
"slow-walls-camp",
|
||||
"slow-walls-poke",
|
||||
"small-monkeys-battle",
|
||||
"small-socks-confess",
|
||||
"smooth-planets-admire",
|
||||
"smooth-rice-clap",
|
||||
@@ -285,6 +294,7 @@
|
||||
"tall-radios-clean",
|
||||
"tame-keys-reply",
|
||||
"tame-pumpkins-nail",
|
||||
"tame-rocks-unite",
|
||||
"tasty-maps-fetch",
|
||||
"tasty-news-collect",
|
||||
"tasty-squids-sin",
|
||||
@@ -322,7 +332,9 @@
|
||||
"wicked-rings-walk",
|
||||
"wise-eels-visit",
|
||||
"wise-frogs-give",
|
||||
"wise-lies-relate",
|
||||
"wise-rabbits-complain",
|
||||
"yellow-numbers-serve",
|
||||
"young-birds-talk"
|
||||
]
|
||||
}
|
||||
|
||||
6
.changeset/small-monkeys-battle.md
Normal file
6
.changeset/small-monkeys-battle.md
Normal file
@@ -0,0 +1,6 @@
|
||||
---
|
||||
"@blitzjs/auth": patch
|
||||
"blitz": patch
|
||||
---
|
||||
|
||||
Fix Next-Auth integration: `Unable to use next-auth with provider: Error [ERR_PACKAGE_PATH_NOT_EXPORTED]`
|
||||
5
.changeset/tame-rocks-unite.md
Normal file
5
.changeset/tame-rocks-unite.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
"blitz": patch
|
||||
---
|
||||
|
||||
Fix log formatting to not show the path of blitz rpc
|
||||
5
.changeset/yellow-numbers-serve.md
Normal file
5
.changeset/yellow-numbers-serve.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
"@blitzjs/recipe-tailwind": minor
|
||||
---
|
||||
|
||||
support both directory style in tailwind recipe
|
||||
62
.github/workflows/main.yml
vendored
62
.github/workflows/main.yml
vendored
@@ -7,8 +7,8 @@ on:
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
env:
|
||||
|
||||
env:
|
||||
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
|
||||
|
||||
jobs:
|
||||
@@ -17,9 +17,9 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
|
||||
- uses: pnpm/action-setup@v2.2.4
|
||||
with:
|
||||
version: 7.11.0
|
||||
version: 7.33.0
|
||||
- name: Setup node
|
||||
uses: actions/setup-node@v2
|
||||
with:
|
||||
@@ -38,9 +38,9 @@ jobs:
|
||||
name: Build
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
|
||||
- uses: pnpm/action-setup@v2.2.4
|
||||
with:
|
||||
version: 7.11.0
|
||||
version: 7.33.0
|
||||
- name: Setup node
|
||||
uses: actions/setup-node@v2
|
||||
with:
|
||||
@@ -68,9 +68,9 @@ jobs:
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup PNPM
|
||||
uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
|
||||
uses: pnpm/action-setup@v2.2.4
|
||||
with:
|
||||
version: 7.11.0
|
||||
version: 7.33.0
|
||||
|
||||
- name: Setup node@16
|
||||
uses: actions/setup-node@v2
|
||||
@@ -109,44 +109,9 @@ jobs:
|
||||
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 "folders=$folders" >> $GITHUB_OUTPUT
|
||||
|
||||
Generator:
|
||||
name: :"Generator Test ${{matrix.language}}"
|
||||
strategy:
|
||||
matrix:
|
||||
language:
|
||||
- javascript
|
||||
- typescript
|
||||
os:
|
||||
- ubuntu-latest
|
||||
fail-fast: false
|
||||
runs-on: "ubuntu-latest"
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Setup PNPM
|
||||
uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
|
||||
with:
|
||||
version: 7.11.0
|
||||
- name: Setup node@${{ matrix.NODE_VERSION }}
|
||||
uses: actions/setup-node@v2
|
||||
with:
|
||||
node-version: ${{ matrix.NODE_VERSION }}
|
||||
cache: "pnpm"
|
||||
- name: Install dependencies
|
||||
run: pnpm install --frozen-lockfile
|
||||
shell: bash
|
||||
- name: Build
|
||||
run: pnpm build
|
||||
shell: bash
|
||||
- name: Generate
|
||||
run: |
|
||||
mkdir test
|
||||
cd test
|
||||
pnpm blitz new . --language=${{matrix.language}}
|
||||
|
||||
|
||||
Integration-Tests:
|
||||
name: "Integration Test: ${{matrix.folder}} @ ${{matrix.os}} "
|
||||
name: "Integration Test: ${{matrix.folder}} @ ${{ matrix.os }} "
|
||||
needs: [find-integration-tests]
|
||||
strategy:
|
||||
matrix:
|
||||
@@ -154,6 +119,7 @@ jobs:
|
||||
os:
|
||||
- ubuntu-latest
|
||||
- windows-latest
|
||||
fail-fast: false
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- run: echo ${{matrix.folder}}
|
||||
@@ -161,9 +127,9 @@ jobs:
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup PNPM
|
||||
uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
|
||||
uses: pnpm/action-setup@v2.2.4
|
||||
with:
|
||||
version: 7.11.0
|
||||
version: 7.33.0
|
||||
|
||||
- name: Setup node@${{ matrix.NODE_VERSION }}
|
||||
uses: actions/setup-node@v2
|
||||
@@ -177,7 +143,7 @@ jobs:
|
||||
|
||||
- name: Install playwright
|
||||
run: |
|
||||
pnpx playwright@1.28.0 install --with-deps
|
||||
pnpx playwright@1.28.0 install --with-deps
|
||||
shell: bash
|
||||
|
||||
- name: Build
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
. "$(dirname "$0")/_/husky.sh"
|
||||
|
||||
pnpm manypkg check
|
||||
pnpm lint
|
||||
# pnpm lint
|
||||
pnpm pretty-quick --staged
|
||||
|
||||
10
README.md
10
README.md
@@ -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-411-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-417-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">
|
||||
@@ -724,6 +724,14 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
|
||||
<td align="center"><a href="https://maotoramm.com"><img src="https://avatars.githubusercontent.com/u/5174884?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maotora ᕙ(⇀‸↼‶)ᕗ</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=maotora" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=maotora" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://github.com/vitaliemiron"><img src="https://avatars.githubusercontent.com/u/45145592?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitalie</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=vitaliemiron" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=vitaliemiron" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://estevao.org"><img src="https://avatars.githubusercontent.com/u/19409687?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nelson Estevão</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nelsonmestevao" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=nelsonmestevao" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://github.com/dbrxnds"><img src="https://avatars.githubusercontent.com/u/32268383?v=4?s=100" width="100px;" alt=""/><br /><sub><b>David</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dbrxnds" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=dbrxnds" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=dbrxnds" title="Tests">⚠️</a></td>
|
||||
<td align="center"><a href="https://github.com/gjmoed"><img src="https://avatars.githubusercontent.com/u/4458993?v=4?s=100" width="100px;" alt=""/><br /><sub><b>G.J. Moed</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=gjmoed" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=gjmoed" title="Code">💻</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center"><a href="https://ghken.com"><img src="https://avatars.githubusercontent.com/u/5304351?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tetsuya Fukuda</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=GHKEN" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=GHKEN" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://github.com/nerixim"><img src="https://avatars.githubusercontent.com/u/26106502?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikita Kamaev</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nerixim" title="Documentation">📖</a></td>
|
||||
<td align="center"><a href="https://webredone.com/"><img src="https://avatars.githubusercontent.com/u/11588823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikola Ivanov</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nikola-wd" title="Documentation">📖</a></td>
|
||||
<td align="center"><a href="jayu.dev"><img src="https://avatars.githubusercontent.com/u/11561585?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jakub Mazurek</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jayu" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=jayu" title="Code">💻</a></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
||||
@@ -1,5 +1,44 @@
|
||||
# next-blitz-auth
|
||||
|
||||
## 0.1.1-beta.5
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [b6b9a1c5a]
|
||||
- Updated dependencies [61888d1a3]
|
||||
- @blitzjs/auth@2.0.0-beta.29
|
||||
- blitz@2.0.0-beta.29
|
||||
- @blitzjs/rpc@2.0.0-beta.29
|
||||
- @blitzjs/next@2.0.0-beta.29
|
||||
- @blitzjs/config@2.0.0-beta.29
|
||||
|
||||
## 0.1.1-beta.4
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [5166e5e03]
|
||||
- Updated dependencies [2533caf48]
|
||||
- Updated dependencies [c7ac86b85]
|
||||
- Updated dependencies [1bb3a6556]
|
||||
- @blitzjs/auth@2.0.0-beta.28
|
||||
- @blitzjs/next@2.0.0-beta.28
|
||||
- @blitzjs/rpc@2.0.0-beta.28
|
||||
- blitz@2.0.0-beta.28
|
||||
- @blitzjs/config@2.0.0-beta.28
|
||||
|
||||
## 0.1.1-beta.3
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [eda14fa8a]
|
||||
- Updated dependencies [3d004dc41]
|
||||
- Updated dependencies [29c2b029a]
|
||||
- @blitzjs/next@2.0.0-beta.27
|
||||
- @blitzjs/rpc@2.0.0-beta.27
|
||||
- @blitzjs/auth@2.0.0-beta.27
|
||||
- blitz@2.0.0-beta.27
|
||||
- @blitzjs/config@2.0.0-beta.27
|
||||
|
||||
## 0.1.1-beta.2
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "next-blitz-auth",
|
||||
"version": "0.1.1-beta.2",
|
||||
"version": "0.1.1-beta.5",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"blitz:dev": "next dev",
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
"@hookform/error-message": "2.0.0",
|
||||
"@hookform/resolvers": "2.9.10",
|
||||
"@prisma/client": "4.6.1",
|
||||
"blitz": "workspace:2.0.0-beta.26",
|
||||
"blitz": "workspace:2.0.0-beta.29",
|
||||
"next": "13.3.0",
|
||||
"openid-client": "5.2.1",
|
||||
"prisma": "4.6.1",
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
const { withNextAuthAdapter } = require("@blitzjs/auth/next-auth")
|
||||
const { withNextAuthAdapter } = require("@blitzjs/auth")
|
||||
const { withBlitz } = require("@blitzjs/next")
|
||||
|
||||
/**
|
||||
* @type {import('@blitzjs/next').BlitzConfig}
|
||||
* @type {import('next').NextConfig}
|
||||
**/
|
||||
const config = {
|
||||
reactStrictMode: true,
|
||||
blitz: {
|
||||
resolversDynamicImport: true,
|
||||
},
|
||||
}
|
||||
|
||||
module.exports = withBlitz(withNextAuthAdapter(config))
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
"@hookform/error-message": "2.0.0",
|
||||
"@hookform/resolvers": "2.9.10",
|
||||
"@prisma/client": "4.6.1",
|
||||
"blitz": "workspace:2.0.0-beta.26",
|
||||
"blitz": "workspace:2.0.0-beta.29",
|
||||
"next": "13.3.0",
|
||||
"next-auth": "4.18.7",
|
||||
"prisma": "4.6.1",
|
||||
|
||||
@@ -10,6 +10,7 @@ type SignupFormProps = {
|
||||
|
||||
export const SignupForm = (props: SignupFormProps) => {
|
||||
const [signupMutation] = useMutation(signup)
|
||||
|
||||
return (
|
||||
<div>
|
||||
<h1>Create an Account</h1>
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import db from "db"
|
||||
import { SecurePassword } from "@blitzjs/auth/secure-password"
|
||||
import { Role } from "types"
|
||||
|
||||
export default async function signup(input, ctx) {
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
import type { BlitzCliConfig } from "blitz"
|
||||
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 { setupBlitzServer } from "@blitzjs/next"
|
||||
import { AuthServerPlugin, PrismaStorage, simpleRolesIsAuthorized } from "@blitzjs/auth"
|
||||
import db from "db"
|
||||
|
||||
export const cliConfig: BlitzCliConfig = {
|
||||
customTemplates: "src/templates",
|
||||
@@ -27,6 +26,9 @@ const { gSSP, gSP, api } = setupBlitzServer({
|
||||
isAuthorized: simpleRolesIsAuthorized,
|
||||
}),
|
||||
],
|
||||
formatError: (error) => {
|
||||
return new Error("Formatted error" + error.message)
|
||||
},
|
||||
logger: BlitzLogger({}),
|
||||
})
|
||||
|
||||
|
||||
@@ -1,4 +1,12 @@
|
||||
import { rpcHandler } from "@blitzjs/rpc"
|
||||
import { api } from "src/blitz-server"
|
||||
|
||||
export default api(rpcHandler({ onError: console.log }))
|
||||
export default api(
|
||||
rpcHandler({
|
||||
onError: console.log,
|
||||
formatError: (error) => {
|
||||
error.message = `FormatError handler: ${error.message}`
|
||||
return error
|
||||
},
|
||||
})
|
||||
)
|
||||
|
||||
@@ -38,13 +38,13 @@ const UserInfo = () => {
|
||||
} else {
|
||||
return (
|
||||
<>
|
||||
<Link href={Routes.SignupPage()} className={styles.button}>
|
||||
<Link href={"/signup"} className={styles.button}>
|
||||
<strong>Sign Up</strong>
|
||||
</Link>
|
||||
<Link href={Routes.LoginPage()} className={styles.loginButton}>
|
||||
<Link href={"/login"} className={styles.loginButton}>
|
||||
<strong>Login</strong>
|
||||
</Link>
|
||||
<Link href="/api/auth/github/login" passHref>
|
||||
<Link href="/api/auth/github/login" passHref legacyBehavior>
|
||||
<a className="button small">
|
||||
<strong>Sign in with GitHub</strong>
|
||||
</a>
|
||||
|
||||
@@ -13,7 +13,6 @@ const {gSSP, gSP, api} = setupBlitzServer({
|
||||
}),
|
||||
],
|
||||
logger: BlitzLogger({
|
||||
colorizePrettyLogs: true,
|
||||
prefix: ["[blitz]>>>>>"],
|
||||
}),
|
||||
})
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
"prisma:studio": "prisma studio"
|
||||
},
|
||||
"dependencies": {
|
||||
"@blitzjs/auth": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/auth": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.29",
|
||||
"@hookform/error-message": "2.0.0",
|
||||
"@hookform/resolvers": "2.9.10",
|
||||
"@prisma/client": "4.6.1",
|
||||
"blitz": "workspace:2.0.0-beta.26",
|
||||
"blitz": "workspace:2.0.0-beta.29",
|
||||
"delay": "5.0.0",
|
||||
"next": "13.3.0",
|
||||
"prisma": "4.6.1",
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import {describe, it, expect, beforeAll, afterAll} from "vitest"
|
||||
import {afterAll, beforeAll, describe, expect, it} from "vitest"
|
||||
import {
|
||||
killApp,
|
||||
findPort,
|
||||
runBlitzCommand,
|
||||
blitzLaunchApp,
|
||||
blitzBuild,
|
||||
blitzLaunchApp,
|
||||
blitzStart,
|
||||
findPort,
|
||||
killApp,
|
||||
runBlitzCommand,
|
||||
waitFor,
|
||||
} from "../../utils/next-test-utils"
|
||||
import webdriver from "../../utils/next-webdriver"
|
||||
@@ -15,7 +15,7 @@ let appPort: number
|
||||
|
||||
const runTests = () => {
|
||||
describe("Auth", () => {
|
||||
/* TODO - Add a non flaky Integration Test for custom plugin
|
||||
/* TODO - Add a non flaky Integration Test for custom plugin
|
||||
describe("custom plugin", () => {
|
||||
it("custom plugin - events", async () => {
|
||||
const browser = await webdriver(appPort, "/custom-plugin")
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
"prisma:studio": "prisma studio"
|
||||
},
|
||||
"dependencies": {
|
||||
"@blitzjs/auth": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/auth": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.29",
|
||||
"@prisma/client": "4.6.1",
|
||||
"blitz": "workspace:2.0.0-beta.26",
|
||||
"blitz": "workspace:2.0.0-beta.29",
|
||||
"lowdb": "3.0.0",
|
||||
"next": "13.3.0",
|
||||
"prisma": "4.6.1",
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
"schema": "db/schema.prisma"
|
||||
},
|
||||
"dependencies": {
|
||||
"@blitzjs/auth": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/auth": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.29",
|
||||
"@prisma/client": "4.6.1",
|
||||
"blitz": "workspace:2.0.0-beta.26",
|
||||
"blitz": "workspace:2.0.0-beta.29",
|
||||
"lowdb": "3.0.0",
|
||||
"next": "13.3.0",
|
||||
"prisma": "4.6.1",
|
||||
@@ -28,7 +28,7 @@
|
||||
"react-dom": "18.2.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.29",
|
||||
"@next/bundle-analyzer": "12.0.8",
|
||||
"@types/express": "4.17.13",
|
||||
"@types/fs-extra": "9.0.13",
|
||||
|
||||
@@ -11,10 +11,10 @@
|
||||
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
|
||||
},
|
||||
"dependencies": {
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.26",
|
||||
"blitz": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.29",
|
||||
"blitz": "workspace:2.0.0-beta.29",
|
||||
"next": "13.3.0",
|
||||
"react": "18.2.0",
|
||||
"react-dom": "18.2.0"
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/// <reference types="next" />
|
||||
/// <reference types="next/image-types/global" />
|
||||
/// <reference types="next/navigation-types/compat/navigation" />
|
||||
|
||||
// NOTE: This file should not be edited
|
||||
// see https://nextjs.org/docs/basic-features/typescript for more information.
|
||||
|
||||
@@ -17,12 +17,12 @@
|
||||
"prisma:studio": "prisma studio"
|
||||
},
|
||||
"dependencies": {
|
||||
"@blitzjs/auth": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/auth": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.29",
|
||||
"@prisma/client": "4.6.1",
|
||||
"blitz": "workspace:2.0.0-beta.26",
|
||||
"blitz": "workspace:2.0.0-beta.29",
|
||||
"lowdb": "3.0.0",
|
||||
"next": "13.3.0",
|
||||
"prisma": "4.6.1",
|
||||
|
||||
@@ -1,13 +1,6 @@
|
||||
import {describe, it, expect, beforeAll, afterAll} from "vitest"
|
||||
import {afterAll, beforeAll, describe, expect, it} from "vitest"
|
||||
import waitPort from "wait-port"
|
||||
import {
|
||||
killApp,
|
||||
findPort,
|
||||
runBlitzCommand,
|
||||
blitzLaunchApp,
|
||||
blitzBuild,
|
||||
blitzStart,
|
||||
} from "../../utils/next-test-utils"
|
||||
import {blitzLaunchApp, findPort, killApp, runBlitzCommand} from "../../utils/next-test-utils"
|
||||
import webdriver from "../../utils/next-webdriver"
|
||||
|
||||
import fetch from "node-fetch"
|
||||
@@ -43,7 +36,7 @@ const runTests = (mode?: string) => {
|
||||
const browser = await webdriver(appPort, "/authenticated-client")
|
||||
let errorMsg = await browser.elementById(`error`).text()
|
||||
expect(errorMsg).toMatch(/Error: You are not authenticated/)
|
||||
if (browser) browser.close()
|
||||
if (browser) await browser.close()
|
||||
},
|
||||
5000 * 60 * 2,
|
||||
)
|
||||
@@ -55,7 +48,7 @@ const runTests = (mode?: string) => {
|
||||
const browser = await webdriver(appPort, "/authenticated-server")
|
||||
let errorMsg = await browser.elementById(`error`).text()
|
||||
expect(errorMsg).toMatch(/Error: You are not authenticated/)
|
||||
if (browser) browser.close()
|
||||
if (browser) await browser.close()
|
||||
},
|
||||
5000 * 60 * 2,
|
||||
)
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
{
|
||||
"name": "next"
|
||||
}
|
||||
]
|
||||
],
|
||||
"strictNullChecks": true
|
||||
},
|
||||
"exclude": ["node_modules"],
|
||||
"baseUrl": "."
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
"prisma:studio": "prisma studio"
|
||||
},
|
||||
"dependencies": {
|
||||
"@blitzjs/auth": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/auth": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.29",
|
||||
"@prisma/client": "4.6.1",
|
||||
"blitz": "workspace:2.0.0-beta.26",
|
||||
"blitz": "workspace:2.0.0-beta.29",
|
||||
"lowdb": "3.0.0",
|
||||
"next": "13.3.0",
|
||||
"prisma": "4.6.1",
|
||||
@@ -28,7 +28,7 @@
|
||||
"react-dom": "18.2.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.29",
|
||||
"@next/bundle-analyzer": "12.0.8",
|
||||
"@types/express": "4.17.13",
|
||||
"@types/fs-extra": "9.0.13",
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
"clean": "rm -rf .turbo && rm -rf node_modules"
|
||||
},
|
||||
"dependencies": {
|
||||
"@blitzjs/auth": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/auth": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.29",
|
||||
"@prisma/client": "4.6.1",
|
||||
"@tanstack/react-query": "4.0.10",
|
||||
"blitz": "workspace:2.0.0-beta.26",
|
||||
"blitz": "workspace:2.0.0-beta.29",
|
||||
"next": "13.3.0",
|
||||
"prisma": "4.6.1",
|
||||
"react": "18.2.0",
|
||||
|
||||
@@ -16,10 +16,10 @@
|
||||
"schema": "db/schema.prisma"
|
||||
},
|
||||
"dependencies": {
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.29",
|
||||
"@prisma/client": "4.6.1",
|
||||
"blitz": "workspace:2.0.0-beta.26",
|
||||
"blitz": "workspace:2.0.0-beta.29",
|
||||
"lowdb": "3.0.0",
|
||||
"next": "13.3.0",
|
||||
"prisma": "4.6.1",
|
||||
@@ -27,7 +27,7 @@
|
||||
"react-dom": "18.2.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.29",
|
||||
"@next/bundle-analyzer": "12.0.8",
|
||||
"@types/express": "4.17.13",
|
||||
"@types/fs-extra": "9.0.13",
|
||||
|
||||
@@ -7,10 +7,10 @@
|
||||
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
|
||||
},
|
||||
"dependencies": {
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.26",
|
||||
"blitz": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.29",
|
||||
"blitz": "workspace:2.0.0-beta.29",
|
||||
"next": "13.3.0",
|
||||
"react": "18.2.0",
|
||||
"react-dom": "18.2.0"
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
class ErrorWithStatusCode extends Error {
|
||||
statusCode
|
||||
|
||||
constructor(message, statusCode) {
|
||||
super(message)
|
||||
this.statusCode = statusCode
|
||||
}
|
||||
}
|
||||
|
||||
export default async function getCustomStatusCodeFailure() {
|
||||
throw new ErrorWithStatusCode("Error with custom status code for test", 418)
|
||||
}
|
||||
@@ -7,10 +7,10 @@
|
||||
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
|
||||
},
|
||||
"dependencies": {
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.26",
|
||||
"blitz": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.29",
|
||||
"blitz": "workspace:2.0.0-beta.29",
|
||||
"next": "13.3.0",
|
||||
"react": "18.2.0",
|
||||
"react-dom": "18.2.0"
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
import {describe, it, expect, beforeAll, afterAll} from "vitest"
|
||||
import fs from "fs-extra"
|
||||
import {afterAll, beforeAll, describe, expect, it} from "vitest"
|
||||
import {join} from "path"
|
||||
import {
|
||||
killApp,
|
||||
findPort,
|
||||
launchApp,
|
||||
fetchViaHTTP,
|
||||
findPort,
|
||||
killApp,
|
||||
launchApp,
|
||||
nextBuild,
|
||||
nextStart,
|
||||
nextExport,
|
||||
nextStart,
|
||||
} from "../../utils/next-test-utils"
|
||||
|
||||
// jest.setTimeout(1000 * 60 * 2)
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
"schema": "db/schema.prisma"
|
||||
},
|
||||
"dependencies": {
|
||||
"@blitzjs/auth": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/auth": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/next": "workspace:2.0.0-beta.29",
|
||||
"@blitzjs/rpc": "workspace:2.0.0-beta.29",
|
||||
"@prisma/client": "4.6.1",
|
||||
"blitz": "workspace:2.0.0-beta.26",
|
||||
"blitz": "workspace:2.0.0-beta.29",
|
||||
"lowdb": "3.0.0",
|
||||
"next": "13.3.0",
|
||||
"prisma": "4.6.1",
|
||||
@@ -28,7 +28,7 @@
|
||||
"react-dom": "18.2.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.29",
|
||||
"@next/bundle-analyzer": "12.0.8",
|
||||
"@types/express": "4.17.13",
|
||||
"@types/fs-extra": "9.0.13",
|
||||
|
||||
@@ -1,5 +1,33 @@
|
||||
# @blitzjs/auth
|
||||
|
||||
## 2.0.0-beta.29
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- b6b9a1c5a: Fix Next-Auth integration: `Unable to use next-auth with provider: Error [ERR_PACKAGE_PATH_NOT_EXPORTED]`
|
||||
- Updated dependencies [b6b9a1c5a]
|
||||
- Updated dependencies [61888d1a3]
|
||||
- blitz@2.0.0-beta.29
|
||||
|
||||
## 2.0.0-beta.28
|
||||
|
||||
### Minor Changes
|
||||
|
||||
- 1bb3a6556: Stop exporting `useAuthenticatedBlitzContext` from `@blitzjs/auth` this must be imported from `app/blitz-server.ts` file in order to work correctly
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 5166e5e03: (feat) upgrade tslog to v4.8.2
|
||||
- Updated dependencies [5166e5e03]
|
||||
- blitz@2.0.0-beta.28
|
||||
|
||||
## 2.0.0-beta.27
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 29c2b029a: Fix: Add missing entry to expose next-auth adapter in Blitz Auth
|
||||
- blitz@2.0.0-beta.27
|
||||
|
||||
## 2.0.0-beta.26
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@blitzjs/auth",
|
||||
"version": "2.0.0-beta.26",
|
||||
"version": "2.0.0-beta.29",
|
||||
"homepage": "https://blitzjs.com/",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@@ -37,6 +37,7 @@
|
||||
"cookie": "0.4.1",
|
||||
"cookie-session": "2.0.0",
|
||||
"debug": "4.3.3",
|
||||
"find-up": "4.1.0",
|
||||
"http": "0.0.1-security",
|
||||
"jsonwebtoken": "9.0.0",
|
||||
"nanoid": "3.2.0",
|
||||
@@ -44,11 +45,12 @@
|
||||
"openid-client": "5.2.1",
|
||||
"passport": "0.6.0",
|
||||
"path": "0.12.7",
|
||||
"resolve-from": "5.0.0",
|
||||
"supports-color": "8.1.1",
|
||||
"url": "0.11.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"next": "*",
|
||||
"next-auth": "*",
|
||||
"secure-password": "4.0.0"
|
||||
@@ -65,7 +67,7 @@
|
||||
}
|
||||
},
|
||||
"devDependencies": {
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.29",
|
||||
"@testing-library/react": "13.4.0",
|
||||
"@testing-library/react-hooks": "8.0.1",
|
||||
"@types/cookie": "0.4.1",
|
||||
@@ -73,7 +75,7 @@
|
||||
"@types/jsonwebtoken": "8.5.8",
|
||||
"@types/react": "18.0.25",
|
||||
"@types/react-dom": "17.0.14",
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"next": "13.3.0",
|
||||
"next-auth": "4.18.7",
|
||||
"react": "18.2.0",
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
export * from "./passport/adapter"
|
||||
export * from "./next-auth/webpack"
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
export * from "./next-auth/adapter"
|
||||
export * from "./next-auth/types"
|
||||
export * from "./next-auth/webpack"
|
||||
|
||||
@@ -27,7 +27,9 @@ import type {
|
||||
} from "./types"
|
||||
import {Provider} from "next-auth/providers"
|
||||
|
||||
export {withNextAuthAdapter} from "./webpack"
|
||||
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"
|
||||
|
||||
@@ -102,7 +104,6 @@ export function NextAuthAdapter<P extends Provider[]>(
|
||||
if (providerId?.includes("?")) {
|
||||
providerId = providerId.split("?")[0]
|
||||
}
|
||||
const {init} = await import("next-auth/core/init").then((m) => m)
|
||||
const {options, cookies} = await init({
|
||||
// @ts-ignore
|
||||
url: new URL(
|
||||
@@ -158,9 +159,6 @@ async function AuthHandler<P extends Provider[]>(
|
||||
if (action === "login") {
|
||||
middleware.push(async (req, res, next) => {
|
||||
try {
|
||||
const getAuthorizationUrl = await import("next-auth/core/lib/oauth/authorization-url").then(
|
||||
(m) => m.default,
|
||||
)
|
||||
const _signin = await getAuthorizationUrl({options: options, query: req.query})
|
||||
if (_signin.cookies) cookies.push(..._signin.cookies)
|
||||
const session = res.blitzCtx.session as SessionContext
|
||||
@@ -191,9 +189,6 @@ async function AuthHandler<P extends Provider[]>(
|
||||
middleware.push(
|
||||
// eslint-disable-next-line no-shadow
|
||||
connectMiddleware(async (req, res, next) => {
|
||||
const oAuthCallback = await import("next-auth/core/lib/oauth/callback").then(
|
||||
(m) => m.default,
|
||||
)
|
||||
try {
|
||||
const {profile, account, OAuthProfile} = await oAuthCallback({
|
||||
query: internalRequest.query,
|
||||
|
||||
@@ -1,15 +1,27 @@
|
||||
//@ts-nocheck
|
||||
import fs from "fs-extra"
|
||||
import path from "path"
|
||||
|
||||
export function withNextAuthAdapter(nextConfig) {
|
||||
const config = Object.assign({}, nextConfig)
|
||||
config.webpack = (config) => {
|
||||
//add a required resolve alias
|
||||
config.resolve.alias["next-auth/core/lib/oauth/callback"] =
|
||||
process.cwd() + "/node_modules/next-auth/core/lib/oauth/callback.js"
|
||||
config.resolve.alias["next-auth/core/lib/oauth/authorization-url"] =
|
||||
process.cwd() + "/node_modules/next-auth/core/lib/oauth/authorization-url.js"
|
||||
config.resolve.alias["next-auth/core/init"] =
|
||||
process.cwd() + "/node_modules/next-auth/core/init.js"
|
||||
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
|
||||
}
|
||||
|
||||
@@ -220,7 +220,7 @@ export async function useAuthenticatedBlitzContext({
|
||||
redirectAuthenticatedTo?: string | RouteUrlObject | ((ctx: Ctx) => string | RouteUrlObject)
|
||||
role?: string | string[]
|
||||
}): Promise<void> {
|
||||
const log = baseLogger().getChildLogger()
|
||||
const log = baseLogger().getSubLogger({name: "useAuthenticatedBlitzContext"})
|
||||
const customChalk = new chalk.Instance({
|
||||
level: log.settings.type === "json" ? 0 : chalk.level,
|
||||
})
|
||||
|
||||
@@ -1,4 +1,16 @@
|
||||
export * from "./auth-sessions"
|
||||
export * from "./auth-utils"
|
||||
export * from "./auth-plugin"
|
||||
export * from "./adapters"
|
||||
|
||||
export {
|
||||
SessionContextClass,
|
||||
getAllSessionHandlesForUser,
|
||||
getCookieParser,
|
||||
getSession,
|
||||
isLocalhost,
|
||||
setPublicDataForUser,
|
||||
setCookie,
|
||||
simpleRolesIsAuthorized,
|
||||
getBlitzContext,
|
||||
} from "./auth-sessions"
|
||||
export type {AnonymousSessionPayload, SimpleRolesIsAuthorized} from "./auth-sessions"
|
||||
|
||||
@@ -1,5 +1,38 @@
|
||||
# @blitzjs/next
|
||||
|
||||
## 2.0.0-beta.29
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [b6b9a1c5a]
|
||||
- Updated dependencies [61888d1a3]
|
||||
- blitz@2.0.0-beta.29
|
||||
- @blitzjs/rpc@2.0.0-beta.29
|
||||
|
||||
## 2.0.0-beta.28
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 5166e5e03: (feat) upgrade tslog to v4.8.2
|
||||
- Updated dependencies [5166e5e03]
|
||||
- Updated dependencies [2533caf48]
|
||||
- Updated dependencies [c7ac86b85]
|
||||
- @blitzjs/rpc@2.0.0-beta.28
|
||||
- blitz@2.0.0-beta.28
|
||||
|
||||
## 2.0.0-beta.27
|
||||
|
||||
### Minor Changes
|
||||
|
||||
- eda14fa8a: Add ability to format the error on the server before returning it to the client.
|
||||
- 3d004dc41: Fix the DYNAMIC_SERVER_USAGE error for Next.js 13.3.1+
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [eda14fa8a]
|
||||
- @blitzjs/rpc@2.0.0-beta.27
|
||||
- blitz@2.0.0-beta.27
|
||||
|
||||
## 2.0.0-beta.26
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@blitzjs/next",
|
||||
"version": "2.0.0-beta.26",
|
||||
"version": "2.0.0-beta.29",
|
||||
"homepage": "https://blitzjs.com/",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@@ -29,7 +29,7 @@
|
||||
"eslint.js"
|
||||
],
|
||||
"dependencies": {
|
||||
"@blitzjs/rpc": "2.0.0-beta.26",
|
||||
"@blitzjs/rpc": "2.0.0-beta.29",
|
||||
"@types/hoist-non-react-statics": "3.3.1",
|
||||
"debug": "4.3.3",
|
||||
"fs-extra": "10.0.1",
|
||||
@@ -38,22 +38,24 @@
|
||||
"supports-color": "8.1.1"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"next": "*",
|
||||
"react": "*"
|
||||
"react": "*",
|
||||
"tslog": "*"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.29",
|
||||
"@testing-library/dom": "8.13.0",
|
||||
"@testing-library/jest-dom": "5.16.3",
|
||||
"@testing-library/react": "13.4.0",
|
||||
"@testing-library/react-hooks": "8.0.1",
|
||||
"@testing-library/user-event": "13.5.0",
|
||||
"@types/debug": "4.1.7",
|
||||
"@types/node": "18.11.9",
|
||||
"@types/react": "18.0.25",
|
||||
"@types/react-dom": "17.0.14",
|
||||
"@types/testing-library__react-hooks": "4.0.0",
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"cross-spawn": "7.0.3",
|
||||
"find-up": "4.1.0",
|
||||
"next": "13.3.0",
|
||||
@@ -62,6 +64,7 @@
|
||||
"react-dom": "18.2.0",
|
||||
"resolve-from": "5.0.0",
|
||||
"ts-jest": "27.1.4",
|
||||
"tslog": "4.8.2",
|
||||
"typescript": "^4.8.4",
|
||||
"unbuild": "0.7.6",
|
||||
"watch": "1.0.2"
|
||||
|
||||
@@ -211,8 +211,9 @@ test("withErrorBoundary HOC", () => {
|
||||
expect(cleanStack(onErrorComponentStack)).toMatchInlineSnapshot(`
|
||||
{
|
||||
"componentStack": "
|
||||
at ErrorBoundaryRoot
|
||||
at withRouter
|
||||
at __vite_ssr_import_4__.withErrorBoundary.FallbackComponent
|
||||
at ErrorBoundaryRoot
|
||||
at WithRouterWrapper
|
||||
at withErrorBoundary",
|
||||
}
|
||||
`)
|
||||
|
||||
@@ -3,6 +3,7 @@ import {NextRouter, withRouter} from "next/router"
|
||||
import * as React from "react"
|
||||
import {RouterContext} from "./router-context"
|
||||
import _debug from "debug"
|
||||
import {ExcludeRouterProps} from "next/dist/client/with-router"
|
||||
|
||||
const debug = _debug("blitz:errorboundary")
|
||||
|
||||
@@ -72,7 +73,9 @@ type ErrorBoundaryState = {error: Error | null}
|
||||
|
||||
const initialState: ErrorBoundaryState = {error: null}
|
||||
|
||||
const ErrorBoundary = withRouter(
|
||||
const ErrorBoundary: React.ComponentType<
|
||||
ExcludeRouterProps<React.PropsWithChildren<ErrorBoundaryProps>>
|
||||
> = withRouter(
|
||||
class ErrorBoundaryRoot extends React.Component<
|
||||
React.PropsWithRef<React.PropsWithChildren<ErrorBoundaryProps>>,
|
||||
ErrorBoundaryState
|
||||
|
||||
@@ -1,41 +1,43 @@
|
||||
import type {
|
||||
NextConfig,
|
||||
GetServerSideProps,
|
||||
GetServerSidePropsResult,
|
||||
GetStaticProps,
|
||||
GetStaticPropsResult,
|
||||
NextApiRequest,
|
||||
NextApiResponse,
|
||||
NextConfig,
|
||||
} from "next"
|
||||
import {
|
||||
AddParameters,
|
||||
AsyncFunc,
|
||||
BlitzLogger,
|
||||
BlitzServerPlugin,
|
||||
Ctx as BlitzCtx,
|
||||
FirstParam,
|
||||
RequestMiddleware,
|
||||
MiddlewareResponse,
|
||||
BlitzLogger,
|
||||
handleRequestWithMiddleware,
|
||||
initializeLogger,
|
||||
Simplify,
|
||||
UnionToIntersection,
|
||||
isRouteUrlObject,
|
||||
MiddlewareResponse,
|
||||
reduceBlitzServerPlugins,
|
||||
RouteUrlObject,
|
||||
startWatcher,
|
||||
stopWatcher,
|
||||
} from "blitz"
|
||||
import {handleRequestWithMiddleware, startWatcher, stopWatcher} from "blitz"
|
||||
import {installWebpackConfig, InstallWebpackConfigOptions, ResolverPathOptions} from "@blitzjs/rpc"
|
||||
import {
|
||||
DefaultOptions,
|
||||
QueryClient,
|
||||
getQueryKey,
|
||||
getInfiniteQueryKey,
|
||||
dehydrate,
|
||||
getInfiniteQueryKey,
|
||||
getQueryKey,
|
||||
installWebpackConfig,
|
||||
InstallWebpackConfigOptions,
|
||||
QueryClient,
|
||||
ResolverPathOptions,
|
||||
} from "@blitzjs/rpc"
|
||||
import {IncomingMessage, ServerResponse} from "http"
|
||||
import {withSuperJsonProps} from "./superjson"
|
||||
import {ParsedUrlQuery} from "querystring"
|
||||
import {PreviewData} from "next/types"
|
||||
import {resolveHref} from "next/dist/shared/lib/router/utils/resolve-href"
|
||||
import {RouteUrlObject, isRouteUrlObject} from "blitz"
|
||||
|
||||
export * from "./index-browser"
|
||||
|
||||
@@ -130,10 +132,12 @@ export const setupBlitzServer = <TPlugins extends readonly BlitzServerPlugin<obj
|
||||
plugins,
|
||||
onError,
|
||||
logger,
|
||||
formatError,
|
||||
}: {
|
||||
plugins: TPlugins
|
||||
onError?: (err: Error) => void
|
||||
logger?: ReturnType<typeof BlitzLogger>
|
||||
formatError?: (err: Error) => Error
|
||||
}) => {
|
||||
initializeLogger(logger ?? BlitzLogger())
|
||||
|
||||
@@ -168,9 +172,9 @@ export const setupBlitzServer = <TPlugins extends readonly BlitzServerPlugin<obj
|
||||
getClient(),
|
||||
),
|
||||
)
|
||||
} catch (err: any) {
|
||||
onError?.(err)
|
||||
throw err
|
||||
} catch (error: any) {
|
||||
onError?.(error)
|
||||
throw formatError?.(error) ?? error
|
||||
}
|
||||
}
|
||||
|
||||
@@ -197,9 +201,9 @@ export const setupBlitzServer = <TPlugins extends readonly BlitzServerPlugin<obj
|
||||
getClient(),
|
||||
),
|
||||
)
|
||||
} catch (err: any) {
|
||||
onError?.(err)
|
||||
throw err
|
||||
} catch (error: any) {
|
||||
onError?.(error)
|
||||
throw formatError?.(error) ?? error
|
||||
}
|
||||
}
|
||||
|
||||
@@ -215,7 +219,8 @@ export const setupBlitzServer = <TPlugins extends readonly BlitzServerPlugin<obj
|
||||
])
|
||||
} catch (error: any) {
|
||||
onError?.(error)
|
||||
return res.status(400).send(error)
|
||||
const formattedError = formatError?.(error) ?? error
|
||||
return res.status(400).send(formattedError)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -225,6 +230,7 @@ export const setupBlitzServer = <TPlugins extends readonly BlitzServerPlugin<obj
|
||||
export interface BlitzConfig extends NextConfig {
|
||||
blitz?: {
|
||||
resolverPath?: ResolverPathOptions
|
||||
resolversDynamicImport?: boolean
|
||||
includeRPCFolders?: string[]
|
||||
customServer?: {
|
||||
hotReload?: boolean
|
||||
@@ -256,6 +262,8 @@ export function withBlitz(nextConfig: BlitzConfig = {}): NextConfig {
|
||||
webpackConfig: config,
|
||||
webpackRuleOptions: {
|
||||
resolverPath: nextConfig.blitz?.resolverPath,
|
||||
resolversDynamicImport:
|
||||
nextConfig.blitz?.resolversDynamicImport ?? Boolean(process.env.VERCEL),
|
||||
includeRPCFolders: nextConfig.blitz?.includeRPCFolders,
|
||||
},
|
||||
})
|
||||
|
||||
@@ -1,5 +1,55 @@
|
||||
# @blitzjs/rpc
|
||||
|
||||
## 2.0.0-beta.29
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [b6b9a1c5a]
|
||||
- Updated dependencies [61888d1a3]
|
||||
- blitz@2.0.0-beta.29
|
||||
|
||||
## 2.0.0-beta.28
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 5166e5e03: (feat) upgrade tslog to v4.8.2
|
||||
- 2533caf48: Fix return type of `requestMiddlewares` in `RpcServerPlugin`
|
||||
- c7ac86b85: Fixes enormous memory consumption of the dev server by changing the default import strategy to "require" instead of "import" which in webpack causes multiple chunks to be created for each import.
|
||||
|
||||
## Blitz Configuration
|
||||
|
||||
To configure this behaviour, you can add the following to your next.config.js:
|
||||
|
||||
```js
|
||||
/**
|
||||
* @type {import('@blitzjs/next').BlitzConfig}
|
||||
**/
|
||||
const config = {
|
||||
blitz: {
|
||||
resolversDynamicImport: true,
|
||||
},
|
||||
}
|
||||
```
|
||||
|
||||
When `resolversDynamicImport` is set to `true`, the import strategy will be "import" instead of "require".
|
||||
|
||||
### On Vercel
|
||||
|
||||
If you are using Vercel, `resolversDynamicImport` will be set to `true` by default, since it is better for the separate chunks to be create for serverless lambdas.
|
||||
|
||||
- Updated dependencies [5166e5e03]
|
||||
- blitz@2.0.0-beta.28
|
||||
|
||||
## 2.0.0-beta.27
|
||||
|
||||
### Minor Changes
|
||||
|
||||
- eda14fa8a: Add ability to format the error on the server before returning it to the client.
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- blitz@2.0.0-beta.27
|
||||
|
||||
## 2.0.0-beta.26
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@blitzjs/rpc",
|
||||
"version": "2.0.0-beta.26",
|
||||
"version": "2.0.0-beta.29",
|
||||
"homepage": "https://blitzjs.com/",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@@ -37,18 +37,18 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@tanstack/query-core": "4.24.4",
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"next": "*",
|
||||
"react": "*"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@blitzjs/auth": "2.0.0-beta.26",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/auth": "2.0.0-beta.29",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.29",
|
||||
"@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.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"next": "13.3.0",
|
||||
"react": "18.2.0",
|
||||
"react-dom": "18.2.0",
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import {assert, baseLogger, Ctx, newLine, prettyMs, ResolverConfig} from "blitz"
|
||||
import {NextApiRequest, NextApiResponse} from "next"
|
||||
import {deserialize, serialize as superjsonSerialize, parse} from "superjson"
|
||||
import {deserialize, parse, serialize as superjsonSerialize} from "superjson"
|
||||
import {resolve} from "path"
|
||||
import chalk from "chalk"
|
||||
import {LoaderOptions} from "./server/loader/utils/loader-utils"
|
||||
|
||||
// TODO - optimize end user server bundles by not exporting all client stuff here
|
||||
export * from "./index-browser"
|
||||
@@ -60,16 +61,11 @@ const loaderClient = resolve(dir, "./loader-client.cjs")
|
||||
const loaderServer = resolve(dir, "./loader-server.cjs")
|
||||
const loaderServerResolvers = resolve(dir, "./loader-server-resolvers.cjs")
|
||||
|
||||
interface WebpackRuleOptions {
|
||||
resolverPath: ResolverPathOptions | undefined
|
||||
includeRPCFolders: string[] | undefined
|
||||
}
|
||||
|
||||
interface WebpackRule {
|
||||
test: RegExp
|
||||
use: Array<{
|
||||
loader: string
|
||||
options: WebpackRuleOptions
|
||||
options: LoaderOptions
|
||||
}>
|
||||
}
|
||||
|
||||
@@ -84,7 +80,7 @@ export interface InstallWebpackConfigOptions {
|
||||
rules: WebpackRule[]
|
||||
}
|
||||
}
|
||||
webpackRuleOptions: WebpackRuleOptions
|
||||
webpackRuleOptions: LoaderOptions
|
||||
}
|
||||
|
||||
export function installWebpackConfig({
|
||||
@@ -149,6 +145,7 @@ async function getResolverMap(): Promise<ResolverFiles | null | undefined> {
|
||||
|
||||
interface RpcConfig {
|
||||
onError?: (error: Error) => void
|
||||
formatError?: (error: Error) => Error
|
||||
}
|
||||
|
||||
export function rpcHandler(config: RpcConfig) {
|
||||
@@ -163,7 +160,8 @@ export function rpcHandler(config: RpcConfig) {
|
||||
const relativeRoutePath = (req.query.blitz as string[])?.join("/")
|
||||
const routePath = "/" + relativeRoutePath
|
||||
|
||||
const log = baseLogger().getChildLogger({
|
||||
const log = baseLogger().getSubLogger({
|
||||
name: "blitz-rpc",
|
||||
prefix: [routePath.replace(/(\/api\/rpc)?\//, "") + "()"],
|
||||
})
|
||||
const customChalk = new chalk.Instance({
|
||||
@@ -219,7 +217,7 @@ export function rpcHandler(config: RpcConfig) {
|
||||
const startTime = Date.now()
|
||||
const result = await resolver(data, (res as any).blitzCtx)
|
||||
const resolverDuration = Date.now() - startTime
|
||||
log.debug(customChalk.dim("Result:"), result ? result : JSON.stringify(result))
|
||||
log.info(customChalk.dim("Result:"), result ? result : JSON.stringify(result))
|
||||
|
||||
const serializerStartTime = Date.now()
|
||||
const serializedResult = superjsonSerialize(result)
|
||||
@@ -241,7 +239,7 @@ export function rpcHandler(config: RpcConfig) {
|
||||
const serializerDuration = Date.now() - serializerStartTime
|
||||
const duration = Date.now() - startTime
|
||||
|
||||
log.info(
|
||||
log.debug(
|
||||
customChalk.dim(
|
||||
`Finished: resolver:${prettyMs(resolverDuration)} serializer:${prettyMs(
|
||||
serializerDuration,
|
||||
@@ -265,7 +263,8 @@ export function rpcHandler(config: RpcConfig) {
|
||||
error.statusCode = 500
|
||||
}
|
||||
|
||||
const serializedError = superjsonSerialize(error)
|
||||
const formattedError = config.formatError?.(error) ?? error
|
||||
const serializedError = superjsonSerialize(formattedError)
|
||||
|
||||
res.json({
|
||||
result: null,
|
||||
|
||||
@@ -64,12 +64,14 @@ export async function transformBlitzRpcServer(
|
||||
extraRpcBasePaths: options?.includeRPCFolders,
|
||||
})
|
||||
|
||||
code += `__internal_addBlitzRpcResolver('${routePath}',() => import('${slash(
|
||||
const importStrategy = options?.resolversDynamicImport ? "import" : "require"
|
||||
|
||||
code += `__internal_addBlitzRpcResolver('${routePath}',() => ${importStrategy}('${slash(
|
||||
resolverFilePath,
|
||||
)}'));`
|
||||
code += "\n"
|
||||
}
|
||||
// console.log("NEW CODE", code)
|
||||
|
||||
return code
|
||||
}
|
||||
|
||||
|
||||
@@ -3,8 +3,9 @@ import {posix, sep, win32, join, normalize} from "path"
|
||||
import {ResolverPathOptions} from "../../../index-server"
|
||||
|
||||
export interface LoaderOptions {
|
||||
resolverPath: ResolverPathOptions
|
||||
resolverPath?: ResolverPathOptions
|
||||
includeRPCFolders?: string[]
|
||||
resolversDynamicImport?: boolean
|
||||
}
|
||||
|
||||
export interface Loader {
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import {createServerPlugin} from "blitz"
|
||||
import {RequestMiddleware, createServerPlugin} from "blitz"
|
||||
import {invoke} from "../client/invoke"
|
||||
|
||||
export const RpcServerPlugin = createServerPlugin(() => {
|
||||
return {
|
||||
requestMiddlewares: [],
|
||||
requestMiddlewares: [] as RequestMiddleware<any, any, void | Promise<void>>[],
|
||||
exports: () => ({
|
||||
invoke,
|
||||
}),
|
||||
|
||||
@@ -1,5 +1,29 @@
|
||||
# blitz
|
||||
|
||||
## 2.0.0-beta.29
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- b6b9a1c5a: Fix Next-Auth integration: `Unable to use next-auth with provider: Error [ERR_PACKAGE_PATH_NOT_EXPORTED]`
|
||||
- 61888d1a3: Fix log formatting to not show the path of blitz rpc
|
||||
- Updated dependencies [7aef610d8]
|
||||
- @blitzjs/generator@2.0.0-beta.29
|
||||
|
||||
## 2.0.0-beta.28
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 5166e5e03: (feat) upgrade tslog to v4.8.2
|
||||
- Updated dependencies [5166e5e03]
|
||||
- @blitzjs/generator@2.0.0-beta.28
|
||||
|
||||
## 2.0.0-beta.27
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [d814c2d2d]
|
||||
- @blitzjs/generator@2.0.0-beta.27
|
||||
|
||||
## 2.0.0-beta.26
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "blitz",
|
||||
"version": "2.0.0-beta.26",
|
||||
"version": "2.0.0-beta.29",
|
||||
"homepage": "https://blitzjs.com/",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@@ -30,7 +30,7 @@
|
||||
"blitz": "bin/blitz"
|
||||
},
|
||||
"dependencies": {
|
||||
"@blitzjs/generator": "2.0.0-beta.26",
|
||||
"@blitzjs/generator": "2.0.0-beta.29",
|
||||
"@mrleebo/prisma-ast": "0.2.6",
|
||||
"@types/global-agent": "2.1.1",
|
||||
"arg": "5.0.1",
|
||||
@@ -76,11 +76,11 @@
|
||||
"tar": "6.1.11",
|
||||
"ts-node": "10.9.1",
|
||||
"tsconfig-paths": "4.0.0",
|
||||
"tslog": "3.3.4",
|
||||
"tslog": "4.8.2",
|
||||
"watchpack": "2.1.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.26",
|
||||
"@blitzjs/config": "workspace:2.0.0-beta.29",
|
||||
"@types/cookie": "0.4.1",
|
||||
"@types/cross-spawn": "6.0.2",
|
||||
"@types/debug": "4.1.7",
|
||||
|
||||
@@ -45,7 +45,7 @@ const pipeline = promisify(Stream.pipeline)
|
||||
const got = async (url: string) => {
|
||||
return require("got")(url).catch((e: any) => {
|
||||
if (e.response.statusCode === 403) {
|
||||
baseLogger({displayDateTime: false}).error(e.response.body)
|
||||
baseLogger().error(e.response.body)
|
||||
} else {
|
||||
return e
|
||||
}
|
||||
@@ -264,7 +264,7 @@ const install: CliCommand = async () => {
|
||||
|
||||
if (!(await isUrlValid(packageJsonPath))) {
|
||||
debug("Url is invalid for ", packageJsonPath)
|
||||
baseLogger({displayDateTime: false}).error(`Could not find recipe "${args._[1]}"\n`)
|
||||
baseLogger().error(`Could not find recipe "${args._[1]}"\n`)
|
||||
console.log(`${chalk.bold("Please provide one of the following:")}
|
||||
|
||||
1. The name of a recipe to install (e.g. "tailwind")
|
||||
|
||||
@@ -16,6 +16,7 @@ export const codegenTasks = async () => {
|
||||
*/
|
||||
const nextDir = await resolveCwd("next")
|
||||
const nextClientIndex = join(nextDir, "../..", "client", "index.js")
|
||||
console.log(nextClientIndex)
|
||||
const readFile = await fs.readFile(nextClientIndex)
|
||||
const packageJson = await getPackageJson()
|
||||
const version = packageJson.dependencies.next
|
||||
@@ -39,15 +40,24 @@ export const codegenTasks = async () => {
|
||||
)
|
||||
await fs.writeFile(nextClientIndex, updatedFile)
|
||||
log.success("Next.js was successfully patched with a React Suspense fix")
|
||||
} else if (nextVersion && semver.satisfies(nextVersion, ">=13.2")) {
|
||||
} else if (nextVersion && semver.satisfies(nextVersion, "13.1 - 13.3.0")) {
|
||||
const updatedFile = readFile
|
||||
.toString()
|
||||
.replace(
|
||||
/_onRecoverableError\.default/,
|
||||
/_onRecoverableError\.default$/gm,
|
||||
`(err) => (err.toString().includes("DYNAMIC_SERVER_USAGE") || err.toString().includes("could not finish this Suspense boundary") || err.toString().includes("Minified React error #419")) ? null : _onRecoverableError.default(err)`,
|
||||
)
|
||||
await fs.writeFile(nextClientIndex, updatedFile)
|
||||
log.success("Next.js was successfully patched with a React Suspense fix")
|
||||
} else if (nextVersion && semver.satisfies(nextVersion, ">=13.3.1")) {
|
||||
const updatedFile = readFile
|
||||
.toString()
|
||||
.replace(
|
||||
/_onrecoverableerror\.default$/gm,
|
||||
`(err) => (err.toString().includes("DYNAMIC_SERVER_USAGE") || err.toString().includes("could not finish this Suspense boundary") || err.toString().includes("Minified React error #419")) ? null : _onrecoverableerror.default(err)`,
|
||||
)
|
||||
await fs.writeFile(nextClientIndex, updatedFile)
|
||||
log.success("Next.js was successfully patched with a React Suspense fix")
|
||||
}
|
||||
} catch (err) {
|
||||
log.error(JSON.stringify(err, null, 2))
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
import {join, dirname} from "path"
|
||||
import {join} from "path"
|
||||
import os from "os"
|
||||
import {promises} from "fs"
|
||||
const readFile = promises.readFile
|
||||
import {outputFile, readdir} from "fs-extra"
|
||||
import findUp from "find-up"
|
||||
import resolveFrom from "resolve-from"
|
||||
import {outputFile, readdir, readFile} from "fs-extra"
|
||||
import Watchpack from "watchpack"
|
||||
import {isInternalBlitzMonorepoDevelopment} from "./helpers"
|
||||
import {findNodeModulesRoot} from "./find-node-modules"
|
||||
|
||||
const debug = require("debug")("blitz")
|
||||
export const CONFIG_FILE = ".blitz.config.compiled.js"
|
||||
export const NEXT_CONFIG_FILE = "next.config.js"
|
||||
|
||||
@@ -41,11 +41,9 @@ export class RecipeExecutor<Options extends RecipeMeta> {
|
||||
{exitOnCtrlC: false},
|
||||
)
|
||||
await waitUntilExit()
|
||||
baseLogger({displayDateTime: false, displayLogLevel: false}).info(
|
||||
`\n🎉 The ${this.options.name} recipe has been installed!\n`,
|
||||
)
|
||||
baseLogger().info(`\n🎉 The ${this.options.name} recipe has been installed!\n`)
|
||||
} catch (e) {
|
||||
baseLogger({displayDateTime: false}).error(e as any)
|
||||
baseLogger().error(e as any)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
import {ISettingsParam, Logger, TLogLevelName} from "tslog"
|
||||
import {ILogObj, ISettingsParam, Logger, IMeta} from "tslog"
|
||||
import c from "chalk"
|
||||
import {Table} from "console-table-printer"
|
||||
import ora from "ora"
|
||||
import readline from "readline"
|
||||
|
||||
export type BlitzLoggerSettings = ISettingsParam
|
||||
export type BlitzLogLevel = TLogLevelName
|
||||
export type BlitzLoggerSettings = ISettingsParam<ILogObj>
|
||||
export type BlitzLogLevel = "trace" | "debug" | "info" | "warn" | "error" | "fatal"
|
||||
|
||||
declare namespace globalThis {
|
||||
let _blitz_baseLogger: Logger
|
||||
let _blitz_baseLogger: Logger<ILogObj>
|
||||
let _blitz_logLevel: BlitzLogLevel
|
||||
}
|
||||
|
||||
export const baseLogger = (options: BlitzLoggerSettings = {}): Logger => {
|
||||
export const baseLogger = (options: BlitzLoggerSettings = {}): Logger<ILogObj> => {
|
||||
if (globalThis._blitz_baseLogger) return globalThis._blitz_baseLogger
|
||||
|
||||
globalThis._blitz_baseLogger = BlitzLogger(options)
|
||||
@@ -22,34 +22,18 @@ export const baseLogger = (options: BlitzLoggerSettings = {}): Logger => {
|
||||
|
||||
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"
|
||||
: "hour:minute:second.millisecond",
|
||||
displayFunctionName: false,
|
||||
displayFilePath: "hidden",
|
||||
displayRequestId: false,
|
||||
dateTimeTimezone:
|
||||
process.env.NODE_ENV === "production"
|
||||
? "utc"
|
||||
: Intl.DateTimeFormat().resolvedOptions().timeZone,
|
||||
prettyInspectHighlightStyles: {
|
||||
name: "yellow",
|
||||
number: "blue",
|
||||
bigint: "blue",
|
||||
boolean: "blue",
|
||||
},
|
||||
prettyLogTimeZone: process.env.NODE_ENV === "production" ? "UTC" : "local",
|
||||
maskValuesOfKeys: ["password", "passwordConfirmation", "currentPassword"],
|
||||
exposeErrorCodeFrame: process.env.NODE_ENV !== "production",
|
||||
type: process.env.NODE_ENV === "production" ? "json" : "pretty",
|
||||
prettyLogTemplate:
|
||||
"{{yyyy}}.{{mm}}.{{dd}} {{hh}}:{{MM}}:{{ss}}:{{ms}}\t{{logLevelName}}\t[{{name}}]\t",
|
||||
...settings,
|
||||
})
|
||||
|
||||
return baseLogger
|
||||
}
|
||||
|
||||
export const initializeLogger = (logger: Logger) => {
|
||||
export const initializeLogger = (logger: Logger<ILogObj>) => {
|
||||
globalThis._blitz_baseLogger = logger
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import {IncomingMessage, ServerResponse} from "http"
|
||||
import {compose, Ctx, RequestMiddleware, MiddlewareNext, MiddlewareResponse} from "./index-server"
|
||||
import {compose, Ctx, MiddlewareNext, MiddlewareResponse, RequestMiddleware} from "./index-server"
|
||||
|
||||
export async function handleRequestWithMiddleware<
|
||||
Req extends IncomingMessage = IncomingMessage,
|
||||
|
||||
@@ -1,5 +1,31 @@
|
||||
# @blitzjs/codemod
|
||||
|
||||
## 2.0.0-beta.29
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [7aef610d8]
|
||||
- Updated dependencies [b6b9a1c5a]
|
||||
- Updated dependencies [61888d1a3]
|
||||
- @blitzjs/generator@2.0.0-beta.29
|
||||
- blitz@2.0.0-beta.29
|
||||
|
||||
## 2.0.0-beta.28
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [5166e5e03]
|
||||
- blitz@2.0.0-beta.28
|
||||
- @blitzjs/generator@2.0.0-beta.28
|
||||
|
||||
## 2.0.0-beta.27
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [d814c2d2d]
|
||||
- @blitzjs/generator@2.0.0-beta.27
|
||||
- blitz@2.0.0-beta.27
|
||||
|
||||
## 2.0.0-beta.26
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@blitzjs/codemod",
|
||||
"version": "2.0.0-beta.26",
|
||||
"version": "2.0.0-beta.29",
|
||||
"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.26",
|
||||
"@blitzjs/generator": "2.0.0-beta.29",
|
||||
"arg": "5.0.1",
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"chalk": "^4.1.0",
|
||||
"cross-spawn": "7.0.3",
|
||||
"debug": "4.3.3",
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
# @blitzjs/config
|
||||
|
||||
## 2.0.0-beta.29
|
||||
|
||||
## 2.0.0-beta.28
|
||||
|
||||
## 2.0.0-beta.27
|
||||
|
||||
## 2.0.0-beta.26
|
||||
|
||||
## 2.0.0-beta.25
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@blitzjs/config",
|
||||
"private": true,
|
||||
"version": "2.0.0-beta.26",
|
||||
"version": "2.0.0-beta.29",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@typescript-eslint/eslint-plugin": "5.42.1",
|
||||
|
||||
@@ -1,5 +1,23 @@
|
||||
# @blitzjs/generator
|
||||
|
||||
## 2.0.0-beta.29
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 7aef610d8: Make Next.js version stick to 13.4.5 when generating a new app
|
||||
|
||||
## 2.0.0-beta.28
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 5166e5e03: (feat) upgrade tslog to v4.8.2
|
||||
|
||||
## 2.0.0-beta.27
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- d814c2d2d: fix: add missing key prop to LabelSelectField
|
||||
|
||||
## 2.0.0-beta.26
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@blitzjs/generator",
|
||||
"version": "2.0.0-beta.26",
|
||||
"version": "2.0.0-beta.29",
|
||||
"homepage": "https://blitzjs.com/",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@@ -48,13 +48,13 @@
|
||||
"prettier": "^2.7.1",
|
||||
"recast": "0.20.5",
|
||||
"supports-color": "8.1.1",
|
||||
"tslog": "3.3.4",
|
||||
"tslog": "4.8.2",
|
||||
"username": "5.1.0",
|
||||
"vinyl": "2.2.1",
|
||||
"zod": "3.20.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@blitzjs/config": "2.0.0-beta.26",
|
||||
"@blitzjs/config": "2.0.0-beta.29",
|
||||
"@juanm04/cpx": "2.0.1",
|
||||
"@types/babel__core": "7.1.19",
|
||||
"@types/diff": "5.0.2",
|
||||
|
||||
@@ -90,8 +90,8 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
|
||||
|
||||
gitInitSuccessful = initResult.status === 0
|
||||
if (!gitInitSuccessful) {
|
||||
baseLogger({displayDateTime: false}).warn("Failed to run git init.")
|
||||
baseLogger({displayDateTime: false}).warn(
|
||||
baseLogger().warn("Failed to run git init.")
|
||||
baseLogger().warn(
|
||||
"Find out more about how to install git here: https://git-scm.com/downloads.",
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import {ISettingsParam, Logger} from "tslog"
|
||||
import {ILogObj, ISettingsParam, Logger} from "tslog"
|
||||
import c from "chalk"
|
||||
import {Table} from "console-table-printer"
|
||||
import ora from "ora"
|
||||
@@ -8,7 +8,7 @@ import {defaultConfig} from "./default-config"
|
||||
|
||||
// eslint-disable-next-line
|
||||
declare module globalThis {
|
||||
let _blitz_baseLogger: Logger
|
||||
let _blitz_baseLogger: Logger<ILogObj>
|
||||
let _blitz_logLevel: LogLevel
|
||||
}
|
||||
|
||||
@@ -103,7 +103,7 @@ export const newline = () => {
|
||||
}
|
||||
}
|
||||
|
||||
export const baseLogger = (options?: ISettingsParam): Logger => {
|
||||
export const baseLogger = (options?: ISettingsParam<ILogObj>): Logger<ILogObj> => {
|
||||
if (globalThis._blitz_baseLogger) return globalThis._blitz_baseLogger
|
||||
|
||||
let config
|
||||
@@ -114,28 +114,14 @@ export const baseLogger = (options?: ISettingsParam): Logger => {
|
||||
}
|
||||
|
||||
globalThis._blitz_baseLogger = new Logger({
|
||||
minLevel: config.log?.level || "info",
|
||||
minLevel: config.log?.level || 3,
|
||||
type: config.log?.type || "pretty",
|
||||
dateTimePattern:
|
||||
prettyLogTemplate:
|
||||
process.env.NODE_ENV === "production"
|
||||
? "year-month-day hour:minute:second.millisecond"
|
||||
: "hour:minute:second.millisecond",
|
||||
displayFunctionName: false,
|
||||
displayFilePath: "hidden",
|
||||
displayRequestId: false,
|
||||
dateTimeTimezone:
|
||||
process.env.NODE_ENV === "production"
|
||||
? "utc"
|
||||
: Intl.DateTimeFormat().resolvedOptions().timeZone,
|
||||
prettyInspectHighlightStyles: {
|
||||
name: "yellow",
|
||||
number: "blue",
|
||||
bigint: "blue",
|
||||
boolean: "blue",
|
||||
},
|
||||
colorizePrettyLogs: process.env.FORCE_COLOR === "0" ? false : true,
|
||||
maskValuesOfKeys: ["password", "passwordConfirmation"],
|
||||
exposeErrorCodeFrame: process.env.NODE_ENV !== "production",
|
||||
? "{{yyyy}}-{{mm}}-{{dd}} {{hh}}:{{MM}}:{{ss}}:{{ms}}"
|
||||
: "{{hh}}:{{MM}}:{{ss}}:{{ms}}",
|
||||
prettyLogTimeZone: process.env.NODE_ENV === "production" ? "UTC" : "local",
|
||||
maskValuesOfKeys: ["password", "passwordConfirmation", "currentPassword"],
|
||||
...options,
|
||||
})
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
"@blitzjs/rpc": "latest",
|
||||
"@prisma/client": "4.6.1",
|
||||
"blitz": "latest",
|
||||
"next": "^13.3.0",
|
||||
"next": "13.4.5",
|
||||
"prisma": "4.6.1",
|
||||
"react": "18.2.0",
|
||||
"react-dom": "18.2.0",
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
"@blitzjs/rpc": "latest",
|
||||
"@prisma/client": "4.6.1",
|
||||
"blitz": "latest",
|
||||
"next": "^13.3.0",
|
||||
"next": "13.4.5",
|
||||
"prisma": "4.6.1",
|
||||
"react": "18.2.0",
|
||||
"react-dom": "18.2.0",
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
"dependencies": {
|
||||
"@blitzjs/next": "latest",
|
||||
"blitz": "latest",
|
||||
"next": "^13.3.0",
|
||||
"next": "13.4.5",
|
||||
"react": "18.2.0",
|
||||
"react-dom": "18.2.0",
|
||||
"ts-node": "10.9.1"
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
"dependencies": {
|
||||
"@blitzjs/next": "latest",
|
||||
"blitz": "latest",
|
||||
"next": "^13.3.0",
|
||||
"next": "13.4.5",
|
||||
"react": "18.2.0",
|
||||
"react-dom": "18.2.0",
|
||||
"ts-node": "10.9.1"
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
"@typescript-eslint/parser": "5.9.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@blitzjs/config": "2.0.0-beta.26",
|
||||
"@blitzjs/config": "2.0.0-beta.29",
|
||||
"@types/react": "18.0.25",
|
||||
"@types/react-dom": "17.0.14",
|
||||
"react": "18.2.0",
|
||||
|
||||
8800
pnpm-lock.yaml
generated
8800
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -23,7 +23,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/blitz-js/blitz#readme",
|
||||
"dependencies": {
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"jscodeshift": "0.13.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/blitz-js/blitz#readme",
|
||||
"dependencies": {
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"jscodeshift": "0.13.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/blitz-js/blitz#readme",
|
||||
"dependencies": {
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"jscodeshift": "0.13.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/blitz-js/blitz#readme",
|
||||
"dependencies": {
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"jscodeshift": "0.13.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/blitz-js/blitz#readme",
|
||||
"dependencies": {
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"jscodeshift": "0.13.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -24,6 +24,6 @@
|
||||
},
|
||||
"homepage": "https://github.com/blitz-js/blitz#readme",
|
||||
"dependencies": {
|
||||
"blitz": "2.0.0-beta.26"
|
||||
"blitz": "2.0.0-beta.29"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,6 +24,6 @@
|
||||
},
|
||||
"homepage": "https://github.com/blitz-js/blitz#readme",
|
||||
"dependencies": {
|
||||
"blitz": "2.0.0-beta.26"
|
||||
"blitz": "2.0.0-beta.29"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/blitz-js/blitz#readme",
|
||||
"dependencies": {
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"jscodeshift": "0.13.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/blitz-js/blitz#readme",
|
||||
"dependencies": {
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"jscodeshift": "0.13.0",
|
||||
"uuid": "^8.3.1"
|
||||
},
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/blitz-js/blitz#readme",
|
||||
"dependencies": {
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"jscodeshift": "0.13.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/blitz-js/blitz#readme",
|
||||
"dependencies": {
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"jscodeshift": "0.13.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/blitz-js/blitz#readme",
|
||||
"dependencies": {
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"jscodeshift": "0.13.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -23,6 +23,6 @@
|
||||
},
|
||||
"homepage": "https://github.com/blitz-js/blitz#readme",
|
||||
"dependencies": {
|
||||
"blitz": "2.0.0-beta.26"
|
||||
"blitz": "2.0.0-beta.29"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,6 +22,6 @@
|
||||
},
|
||||
"homepage": "https://github.com/blitz-js/blitz#readme",
|
||||
"dependencies": {
|
||||
"blitz": "2.0.0-beta.26"
|
||||
"blitz": "2.0.0-beta.29"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/blitz-js/blitz#readme",
|
||||
"dependencies": {
|
||||
"blitz": "2.0.0-beta.26",
|
||||
"blitz": "2.0.0-beta.29",
|
||||
"jscodeshift": "0.13.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -22,6 +22,6 @@
|
||||
},
|
||||
"homepage": "https://github.com/blitz-js/blitz#readme",
|
||||
"dependencies": {
|
||||
"blitz": "2.0.0-beta.26"
|
||||
"blitz": "2.0.0-beta.29"
|
||||
}
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user