1
0
mirror of synced 2026-02-06 18:00:14 -05:00

Compare commits

...

24 Commits

Author SHA1 Message Date
Siddharth Suresh
721461a7b9 chore: update pnpm lock to latest 2024-06-04 22:55:41 +05:30
github-actions[bot]
3193bdea48 Version Packages (#4346)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-06-04 22:48:44 +05:30
Siddharth Suresh
318e9740d6 feat: upgrade to latest next-auth v4 version (#4345)
* upgrade to latest v4

* Create warm-scissors-juggle.md

* Update .changeset/warm-scissors-juggle.md

* also check for flightcontrol platform
2024-06-03 15:37:12 +00:00
Tobias
0df368308b Delete .node-version (#4340) 2024-05-27 04:56:35 +00:00
github-actions[bot]
ad94bee56a Version Packages (#4333)
* Version Packages

* pnpm lock fix

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Siddharth Suresh <siddh.suresh@gmail.com>
2024-05-09 15:37:39 +00:00
Siddharth Suresh
5a14306f7b regression: export enhancePrisma from the brower (#4326)
* move it back to index-server

* fix turbopack

* Create big-cars-raise.md

* cleanup

* fix

* fix lint
2024-05-09 14:05:23 +00:00
github-actions[bot]
6e8eeb1514 Version Packages (#4327)
* Version Packages

* update pnpm lock

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Siddharth Suresh <siddh.suresh@gmail.com>
2024-04-17 14:14:39 +00:00
Siddharth Suresh
5e61a16815 bug: merge existing and blitz turbo config (#4323)
* do not oveeride existing config

* Create calm-deers-sin.md

* Update packages/blitz-next/src/index-server.ts
2024-04-17 19:34:19 +05:30
Siddharth Suresh
77555468f3 fix: add missing host in next-auth adapter (#4325)
* fix: add missing host in next-auth adapter

* Create red-masks-drop.md

* Update .changeset/red-masks-drop.md
2024-04-17 19:26:15 +05:30
github-actions[bot]
22e402af01 Version Packages (#4320)
* Version Packages

* pnpm lock fix

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Siddharth Suresh <siddh.suresh@gmail.com>
2024-04-05 21:03:50 +05:30
Siddharth Suresh
19afc57530 internal: unblock the changeset release 2024-04-05 20:50:21 +05:30
Blitz.js Bot
b7dab1d800 (meta) added @timneutkens as contributor 2024-04-05 10:28:56 -04:00
Tim Neutkens
ee7bf87ec0 Turbopack support for Blitz (#4314)
* Use this.rootContext instead of webpack internals

Ensures the root context is read from the public API that webpack exposes. This is the first step for Turbopack support as Turbopack includes `this.rootContext` as well

* Turbopack support for Blitz

* Update packages/blitz-rpc/src/server/loader/server/loader-server.ts

Co-authored-by: Tobias Koppers <tobias.koppers@googlemail.com>

* fix: CI and update next.js version in test app

* feat: add tests for turbo and expose new `turbo` boolean

* upgrade to latest next version

* use latest canary in internal packages and tests

* chore: add changeset

* chore: minor fix on how the test is run

* fix stray DYNAMIC_SERVER_USAGE thrown

* cleanup

* chore: changeset

* pnpm lock fix

* fix turbo tests

* fixes

* oops

* add turbo config only when needed

* remove need for any change to `next.config.js`

---------

Co-authored-by: Tobias Koppers <tobias.koppers@googlemail.com>
Co-authored-by: Siddharth Suresh <siddh.suresh@gmail.com>
2024-04-05 10:28:50 -04:00
Siddharth Suresh
451ead089c chore: try fixing the pr release for usage with forks 2024-04-03 14:04:18 +05:30
Siddharth Suresh
5d9570f7f4 chore: update dependencies of CI workflows 2024-04-03 13:56:36 +05:30
Siddharth Suresh
178c152b2c fix: pages and app directory - Uncaught Error: DYNAMIC_SERVER_USAGE (#4318)
* fix stray DYNAMIC_SERVER_USAGE thrown

* cleanup

* chore: changeset
2024-04-02 14:34:27 +00:00
github-actions[bot]
bbe1a54d7a Version Packages (#4316)
* Version Packages

* chore: update pnpm lock

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Siddharth Suresh <siddh.suresh@gmail.com>
2024-04-02 06:39:08 +00:00
Siddharth Suresh
9b075dbb47 chore: upgrade release CI to latest versions 2024-04-02 12:00:21 +05:30
Siddharth Suresh
60a4d90c86 chore: override version of mime blocking release CI 2024-04-02 11:53:32 +05:30
Blitz.js Bot
a674897601 (meta) added @gengjiawen as contributor 2024-04-01 08:56:45 -04:00
Jiawen Geng
5a587a6c31 fix: production issue (#4311)
* fix: production issue

* Update .changeset/soft-tables-ring.md

---------

Co-authored-by: Siddharth Suresh <siddh.suresh@gmail.com>
2024-04-01 12:56:40 +00:00
Siddharth Suresh
744242f25b chore: remove --no-frozen-lockfile install step for release workflow 2024-03-08 00:47:36 +05:30
Blitz.js Bot
0f5297f1aa (meta) added @lmisea as contributor 2024-03-07 13:26:25 -05:00
Luis Isea
76a2544f9d fix: process.kill("SIGABRT") not supported on windows (#4308)
* fix: process.kill("SIGABRT") not supported on windows

* fix: use process.kill("SIGINT") across all operative systems

* Update .changeset/clever-insects-shave.md

---------

Co-authored-by: Siddharth Suresh <siddh.suresh@gmail.com>
2024-03-07 18:26:20 +00:00
86 changed files with 1878 additions and 718 deletions

View File

@@ -4034,6 +4034,37 @@
"doc", "doc",
"code" "code"
] ]
},
{
"login": "lmisea",
"name": "Luis Isea",
"avatar_url": "https://avatars.githubusercontent.com/u/106825636?v=4",
"profile": "https://github.com/lmisea",
"contributions": [
"doc",
"code"
]
},
{
"login": "gengjiawen",
"name": "Jiawen Geng",
"avatar_url": "https://avatars.githubusercontent.com/u/3759816?v=4",
"profile": "https://www.gengjiawen.com",
"contributions": [
"doc",
"code"
]
},
{
"login": "timneutkens",
"name": "Tim Neutkens",
"avatar_url": "https://avatars.githubusercontent.com/u/6324199?v=4",
"profile": "https://timn.tech",
"contributions": [
"doc",
"code",
"test"
]
} }
], ],
"contributorsPerLine": 7, "contributorsPerLine": 7,

View File

@@ -28,17 +28,20 @@ jobs:
with: with:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
ref: ${{ steps.refs.outputs.head_ref }} ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
- name: Setup PNPM - name: Setup PNPM
uses: pnpm/action-setup@v2.2.1 uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
with:
version: 8.9.0
- name: Setup Node - name: Setup Node
uses: actions/setup-node@v3 uses: actions/setup-node@v4
with: with:
node-version: 16 node-version: 20
registry-url: "https://registry.npmjs.org" registry-url: "https://registry.npmjs.org"
cache: "pnpm" cache: "pnpm"

View File

@@ -19,12 +19,12 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout Repo - name: Checkout Repo
uses: actions/checkout@v2 uses: actions/checkout@v4
- name: Setup Node.js 16.x - name: Setup Node.js 20.x
uses: actions/setup-node@v2 uses: actions/setup-node@v4
with: with:
node-version: 16.x node-version: 20.x
- name: Creating .npmrc - name: Creating .npmrc
run: | run: |
@@ -37,8 +37,10 @@ jobs:
- name: Pre-publish - name: Pre-publish
uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2 uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
with: with:
version: 6.32.6 version: 8.9.0
- run: pnpm install --no-frozen-lockfile - run: pnpm install
env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
- run: pnpm build - run: pnpm build
- name: Create Release Pull Request - name: Create Release Pull Request
@@ -49,10 +51,3 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
# - name: Github Release
# uses: release-drafter/release-drafter@v5.19.0
# with:
# config-name: release-drafter.yml
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -1 +0,0 @@
16.13.2

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=="> <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> </a>
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section --> <!-- 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-425-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-428-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
<!-- ALL-CONTRIBUTORS-BADGE:END --> <!-- ALL-CONTRIBUTORS-BADGE:END -->
<a aria-label="License" href="https://github.com/blitz-js/blitz/blob/main/LICENSE"> <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"> <img alt="" src="https://img.shields.io/npm/l/blitz.svg?style=for-the-badge&labelColor=000000&color=blue">
@@ -749,6 +749,11 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
<td align="center"><a href="https://github.com/papsavas"><img src="https://avatars.githubusercontent.com/u/50584606?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Savvas Papageorgiadis</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=papsavas" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=papsavas" title="Code">💻</a></td> <td align="center"><a href="https://github.com/papsavas"><img src="https://avatars.githubusercontent.com/u/50584606?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Savvas Papageorgiadis</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=papsavas" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=papsavas" title="Code">💻</a></td>
<td align="center"><a href="https://flow-office.eu/"><img src="https://avatars.githubusercontent.com/u/77194479?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Leonidas</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=LeonMueller-OneAndOnly" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=LeonMueller-OneAndOnly" title="Code">💻</a></td> <td align="center"><a href="https://flow-office.eu/"><img src="https://avatars.githubusercontent.com/u/77194479?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Leonidas</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=LeonMueller-OneAndOnly" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=LeonMueller-OneAndOnly" title="Code">💻</a></td>
<td align="center"><a href="https://hacknex.us"><img src="https://avatars.githubusercontent.com/u/19937034?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Doc0x1</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Doc0x1" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=Doc0x1" title="Code">💻</a></td> <td align="center"><a href="https://hacknex.us"><img src="https://avatars.githubusercontent.com/u/19937034?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Doc0x1</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Doc0x1" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=Doc0x1" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/lmisea"><img src="https://avatars.githubusercontent.com/u/106825636?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Luis Isea</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=lmisea" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=lmisea" title="Code">💻</a></td>
<td align="center"><a href="https://www.gengjiawen.com"><img src="https://avatars.githubusercontent.com/u/3759816?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jiawen Geng</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=gengjiawen" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=gengjiawen" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://timn.tech"><img src="https://avatars.githubusercontent.com/u/6324199?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tim Neutkens</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=timneutkens" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=timneutkens" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=timneutkens" title="Tests">⚠️</a></td>
</tr> </tr>
</table> </table>

View File

@@ -1,5 +1,63 @@
# next-blitz-auth # next-blitz-auth
## 0.1.11
### Patch Changes
- Updated dependencies [318e9740d]
- @blitzjs/auth@2.0.10
- blitz@2.0.10
- @blitzjs/rpc@2.0.10
- @blitzjs/next@2.0.10
- @blitzjs/config@2.0.10
## 0.1.10
### Patch Changes
- Updated dependencies [5a14306f7]
- @blitzjs/next@2.0.9
- @blitzjs/rpc@2.0.9
- blitz@2.0.9
- @blitzjs/auth@2.0.9
- @blitzjs/config@2.0.9
## 0.1.9
### Patch Changes
- Updated dependencies [5e61a1681]
- Updated dependencies [77555468f]
- @blitzjs/next@2.0.8
- blitz@2.0.8
- @blitzjs/auth@2.0.8
- @blitzjs/rpc@2.0.8
- @blitzjs/config@2.0.8
## 0.1.8
### Patch Changes
- Updated dependencies [ee7bf87ec]
- Updated dependencies [178c152b2]
- blitz@2.0.7
- @blitzjs/next@2.0.7
- @blitzjs/rpc@2.0.7
- @blitzjs/auth@2.0.7
- @blitzjs/config@2.0.7
## 0.1.7
### Patch Changes
- Updated dependencies [76a2544f9]
- Updated dependencies [5a587a6c3]
- blitz@2.0.6
- @blitzjs/auth@2.0.6
- @blitzjs/next@2.0.6
- @blitzjs/rpc@2.0.6
- @blitzjs/config@2.0.6
## 0.1.6 ## 0.1.6
### Patch Changes ### Patch Changes

View File

@@ -1,5 +1,13 @@
const {withBlitz} = require("@blitzjs/next") const {withBlitz} = require("@blitzjs/next")
const loaderClient = require.resolve("@blitzjs/rpc/dist/loader-client.cjs")
const loaderServer = require.resolve("@blitzjs/rpc/dist/loader-server.cjs")
const loaderServerResolvers = require.resolve("@blitzjs/rpc/dist/loader-server-resolvers.cjs")
console.log("loaderClient", loaderClient)
console.log("loaderServer", loaderServer)
console.log("loaderServerResolvers", loaderServerResolvers)
/** @type {import('next').NextConfig} */ /** @type {import('next').NextConfig} */
const nextConfig = {} const nextConfig = {}

View File

@@ -1,6 +1,6 @@
{ {
"name": "next-blitz-auth", "name": "next-blitz-auth",
"version": "0.1.6", "version": "0.1.11",
"private": true, "private": true,
"scripts": { "scripts": {
"blitz:dev": "next dev", "blitz:dev": "next dev",
@@ -12,17 +12,17 @@
"schema": "prisma/schema.prisma" "schema": "prisma/schema.prisma"
}, },
"dependencies": { "dependencies": {
"@blitzjs/auth": "2.0.5", "@blitzjs/auth": "2.0.10",
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@blitzjs/next": "2.0.5", "@blitzjs/next": "2.0.10",
"@blitzjs/rpc": "2.0.5", "@blitzjs/rpc": "2.0.10",
"@hookform/error-message": "2.0.0", "@hookform/error-message": "2.0.0",
"@hookform/resolvers": "2.9.10", "@hookform/resolvers": "2.9.10",
"@prisma/client": "^4.5.0", "@prisma/client": "^4.5.0",
"@tanstack/react-query": "4.0.10", "@tanstack/react-query": "4.0.10",
"blitz": "2.0.5", "blitz": "2.0.10",
"flatted": "3.2.7", "flatted": "3.2.7",
"next": "14.0.4", "next": "canary",
"prisma": "^4.5.0", "prisma": "^4.5.0",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",

View File

@@ -23,15 +23,15 @@
] ]
}, },
"dependencies": { "dependencies": {
"@blitzjs/auth": "2.0.5", "@blitzjs/auth": "2.0.10",
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@blitzjs/next": "2.0.5", "@blitzjs/next": "2.0.10",
"@blitzjs/rpc": "2.0.5", "@blitzjs/rpc": "2.0.10",
"@hookform/error-message": "2.0.0", "@hookform/error-message": "2.0.0",
"@hookform/resolvers": "2.9.10", "@hookform/resolvers": "2.9.10",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "2.0.5", "blitz": "2.0.10",
"next": "14.0.4", "next": "canary",
"openid-client": "5.2.1", "openid-client": "5.2.1",
"prisma": "4.6.1", "prisma": "4.6.1",
"react": "18.2.0", "react": "18.2.0",

View File

@@ -24,16 +24,16 @@
] ]
}, },
"dependencies": { "dependencies": {
"@blitzjs/auth": "2.0.5", "@blitzjs/auth": "2.0.10",
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@blitzjs/next": "2.0.5", "@blitzjs/next": "2.0.10",
"@blitzjs/rpc": "2.0.5", "@blitzjs/rpc": "2.0.10",
"@hookform/error-message": "2.0.0", "@hookform/error-message": "2.0.0",
"@hookform/resolvers": "2.9.10", "@hookform/resolvers": "2.9.10",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "2.0.5", "blitz": "2.0.10",
"next": "14.0.4", "next": "canary",
"next-auth": "4.18.7", "next-auth": "4.24.7",
"prisma": "4.6.1", "prisma": "4.6.1",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",

View File

@@ -16,17 +16,17 @@
"schema": "./db/schema.prisma" "schema": "./db/schema.prisma"
}, },
"dependencies": { "dependencies": {
"@blitzjs/auth": "2.0.5", "@blitzjs/auth": "2.0.10",
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@blitzjs/next": "2.0.5", "@blitzjs/next": "2.0.10",
"@blitzjs/rpc": "2.0.5", "@blitzjs/rpc": "2.0.10",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"@types/jest": "29.2.2", "@types/jest": "29.2.2",
"@types/passport-twitter": "1.0.37", "@types/passport-twitter": "1.0.37",
"blitz": "2.0.5", "blitz": "2.0.10",
"jest": "29.3.0", "jest": "29.3.0",
"jest-environment-jsdom": "29.3.0", "jest-environment-jsdom": "29.3.0",
"next": "14.0.4", "next": "canary",
"passport-mock-strategy": "2.0.0", "passport-mock-strategy": "2.0.0",
"passport-twitter": "1.0.4", "passport-twitter": "1.0.4",
"prisma": "4.6.1", "prisma": "4.6.1",

View File

@@ -17,16 +17,16 @@
"prisma:studio": "prisma studio" "prisma:studio": "prisma studio"
}, },
"dependencies": { "dependencies": {
"@blitzjs/auth": "2.0.5", "@blitzjs/auth": "2.0.10",
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@blitzjs/next": "2.0.5", "@blitzjs/next": "2.0.10",
"@blitzjs/rpc": "2.0.5", "@blitzjs/rpc": "2.0.10",
"@hookform/error-message": "2.0.0", "@hookform/error-message": "2.0.0",
"@hookform/resolvers": "2.9.10", "@hookform/resolvers": "2.9.10",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "2.0.5", "blitz": "2.0.10",
"delay": "5.0.0", "delay": "5.0.0",
"next": "14.0.4", "next": "canary",
"prisma": "4.6.1", "prisma": "4.6.1",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",

View File

@@ -79,11 +79,13 @@ const runTests = () => {
let text = await browser.elementByCss("#content").text() let text = await browser.elementByCss("#content").text()
expect(text).toMatch(/logged-out/) expect(text).toMatch(/logged-out/)
await browser.elementByCss("#login").click() await browser.elementByCss("#login").click()
await waitFor(200) await waitFor(7500)
text = await browser.elementByCss("#content").text() text = await browser.elementByCss("#content").text()
expect(text).toMatch(/logged-in/) expect(text).toMatch(/logged-in/)
await browser.elementByCss("#logout").click() await browser.elementByCss("#logout").click()
await waitFor(250) await waitFor(5000)
text = await browser.elementByCss("#content").text() text = await browser.elementByCss("#content").text()
expect(text).toMatch(/logged-out/) expect(text).toMatch(/logged-out/)
@@ -93,16 +95,16 @@ const runTests = () => {
it("should logout without infinite loop #2233", async () => { it("should logout without infinite loop #2233", async () => {
// Login // Login
let browser = await webdriver(appPort, "/login") let browser = await webdriver(appPort, "/login")
await waitFor(200) await waitFor(5000)
await browser.elementByCss("#login").click() await browser.elementByCss("#login").click()
await waitFor(200) await waitFor(5000)
await browser.eval(`window.location = "/authenticated-query"`) await browser.eval(`window.location = "/authenticated-query"`)
await browser.waitForElementByCss("#content") await browser.waitForElementByCss("#content")
let text = await browser.elementByCss("#content").text() let text = await browser.elementByCss("#content").text()
expect(text).toMatch(/authenticated-basic-result/) expect(text).toMatch(/authenticated-basic-result/)
await browser.elementByCss("#logout").click() await browser.elementByCss("#logout").click()
await waitFor(200) await waitFor(5000)
await browser.waitForElementByCss("#error") await browser.waitForElementByCss("#error")
text = await browser.elementByCss("#error").text() text = await browser.elementByCss("#error").text()
if (mode === "server") { if (mode === "server") {
@@ -115,9 +117,9 @@ const runTests = () => {
it("Page.authenticate = {role} should throw authentication error ", async () => { it("Page.authenticate = {role} should throw authentication error ", async () => {
let browser = await webdriver(appPort, "/login") let browser = await webdriver(appPort, "/login")
await waitFor(200) await waitFor(5000)
await browser.elementByCss("#login").click() await browser.elementByCss("#login").click()
await waitFor(200) await waitFor(5000)
await browser.eval(`window.location = "/page-dot-authenticate-role"`) await browser.eval(`window.location = "/page-dot-authenticate-role"`)
await browser.waitForElementByCss("#error") await browser.waitForElementByCss("#error")
let text = await browser.elementByCss("#error").text() let text = await browser.elementByCss("#error").text()
@@ -169,7 +171,7 @@ const runTests = () => {
let text = await browser.elementByCss("#content").text() let text = await browser.elementByCss("#content").text()
expect(text).toMatch(/authenticated-basic-result/) expect(text).toMatch(/authenticated-basic-result/)
await browser.elementByCss("#logout").click() await browser.elementByCss("#logout").click()
await waitFor(500) await waitFor(5000)
expect(await browser.url()).toMatch(/\/login/) expect(await browser.url()).toMatch(/\/login/)
if (browser) await browser.close() if (browser) await browser.close()
@@ -275,7 +277,7 @@ const runTests = () => {
} }
describe("Auth Tests", () => { describe("Auth Tests", () => {
describe("dev mode", () => { describe("dev mode - webpack", () => {
beforeAll(async () => { beforeAll(async () => {
mode = "dev" mode = "dev"
try { try {
@@ -290,6 +292,21 @@ describe("Auth Tests", () => {
runTests() runTests()
}) })
describe("dev mode - turbo", () => {
beforeAll(async () => {
mode = "dev"
try {
await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
appPort = await findPort()
app = await blitzLaunchApp(appPort, {cwd: process.cwd()}, true)
} catch (error) {
console.log(error)
}
}, 5000 * 60 * 2)
afterAll(async () => await killApp(app))
runTests()
})
describe("server mode", () => { describe("server mode", () => {
beforeAll(async () => { beforeAll(async () => {
mode = "server" mode = "server"

View File

@@ -17,13 +17,13 @@
"prisma:studio": "prisma studio" "prisma:studio": "prisma studio"
}, },
"dependencies": { "dependencies": {
"@blitzjs/auth": "2.0.5", "@blitzjs/auth": "2.0.10",
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@blitzjs/next": "2.0.5", "@blitzjs/next": "2.0.10",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "2.0.5", "blitz": "2.0.10",
"lowdb": "3.0.0", "lowdb": "3.0.0",
"next": "14.0.4", "next": "canary",
"prisma": "4.6.1", "prisma": "4.6.1",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",

View File

@@ -16,19 +16,19 @@
"schema": "db/schema.prisma" "schema": "db/schema.prisma"
}, },
"dependencies": { "dependencies": {
"@blitzjs/auth": "2.0.5", "@blitzjs/auth": "2.0.10",
"@blitzjs/next": "2.0.5", "@blitzjs/next": "2.0.10",
"@blitzjs/rpc": "2.0.5", "@blitzjs/rpc": "2.0.10",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "2.0.5", "blitz": "2.0.10",
"lowdb": "3.0.0", "lowdb": "3.0.0",
"next": "14.0.4", "next": "canary",
"prisma": "4.6.1", "prisma": "4.6.1",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0" "react-dom": "18.2.0"
}, },
"devDependencies": { "devDependencies": {
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@next/bundle-analyzer": "12.0.8", "@next/bundle-analyzer": "12.0.8",
"@types/express": "4.17.13", "@types/express": "4.17.13",
"@types/fs-extra": "9.0.13", "@types/fs-extra": "9.0.13",

View File

@@ -11,11 +11,11 @@
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next" "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
}, },
"dependencies": { "dependencies": {
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@blitzjs/next": "2.0.5", "@blitzjs/next": "2.0.10",
"@blitzjs/rpc": "2.0.5", "@blitzjs/rpc": "2.0.10",
"blitz": "2.0.5", "blitz": "2.0.10",
"next": "14.0.4", "next": "canary",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0" "react-dom": "18.2.0"
}, },

View File

@@ -1,34 +0,0 @@
"use client"
import {useQuery, useMutation} from "@blitzjs/rpc"
import logout from "../src/auth/mutations/logout"
import getCurrentUser from "../src/users/queries/getCurrentUser"
import {useTransition} from "react"
import {useRouter} from "next/navigation"
export default function Test() {
const router = useRouter()
const [user] = useQuery(getCurrentUser, null)
const [isPending, startTransition] = useTransition()
const [logoutMutation] = useMutation(logout)
console.log(user)
return (
<div>
<h1>Test</h1>
<p>{user?.email}</p>
<button
className="button small"
onClick={async () => {
await logoutMutation()
startTransition(() => {
// Refresh the current route and fetch new data from the server without
// losing client-side browser or React state.
router.refresh()
})
}}
>
Logout
</button>
</div>
)
}

View File

@@ -17,14 +17,14 @@
"prisma:studio": "prisma studio" "prisma:studio": "prisma studio"
}, },
"dependencies": { "dependencies": {
"@blitzjs/auth": "2.0.5", "@blitzjs/auth": "2.0.10",
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@blitzjs/next": "2.0.5", "@blitzjs/next": "2.0.10",
"@blitzjs/rpc": "2.0.5", "@blitzjs/rpc": "2.0.10",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "2.0.5", "blitz": "2.0.10",
"lowdb": "3.0.0", "lowdb": "3.0.0",
"next": "14.0.4", "next": "canary",
"prisma": "4.6.1", "prisma": "4.6.1",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",

View File

@@ -153,7 +153,7 @@ const runTests = (mode?: string) => {
} }
describe("Auth Tests", () => { describe("Auth Tests", () => {
describe("dev mode", async () => { describe("dev mode - webpack", async () => {
beforeAll(async () => { beforeAll(async () => {
try { try {
await runBlitzCommand(["prisma", "migrate", "reset", "--force"]) await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
@@ -169,19 +169,19 @@ describe("Auth Tests", () => {
runTests() runTests()
}) })
// describe("server mode", () => { describe("dev mode - turbo", async () => {
// beforeAll(async () => { beforeAll(async () => {
// try { try {
// await runBlitzCommand(["prisma", "generate"]) await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
// await runBlitzCommand(["prisma", "migrate", "deploy"]) appPort = await findPort()
// await blitzBuild() app = await blitzLaunchApp(appPort, {cwd: process.cwd()}, true)
// // appPort = await findPort() } catch (error) {
// app = await blitzStart(appPort, {cwd: process.cwd()}) console.log(error)
// } catch (err) { }
// console.log(err) }, 5000 * 60 * 2)
// } afterAll(async () => {
// }, 5000 * 60 * 2) await killApp(app)
// afterAll(async () => await killApp(app)) })
// runTests() runTests()
// }) })
}) })

View File

@@ -16,19 +16,19 @@
"prisma:studio": "prisma studio" "prisma:studio": "prisma studio"
}, },
"dependencies": { "dependencies": {
"@blitzjs/auth": "2.0.5", "@blitzjs/auth": "2.0.10",
"@blitzjs/next": "2.0.5", "@blitzjs/next": "2.0.10",
"@blitzjs/rpc": "2.0.5", "@blitzjs/rpc": "2.0.10",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "2.0.5", "blitz": "2.0.10",
"lowdb": "3.0.0", "lowdb": "3.0.0",
"next": "14.0.4", "next": "canary",
"prisma": "4.6.1", "prisma": "4.6.1",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0" "react-dom": "18.2.0"
}, },
"devDependencies": { "devDependencies": {
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@next/bundle-analyzer": "12.0.8", "@next/bundle-analyzer": "12.0.8",
"@types/express": "4.17.13", "@types/express": "4.17.13",
"@types/fs-extra": "9.0.13", "@types/fs-extra": "9.0.13",

View File

@@ -8,14 +8,14 @@
"clean": "rm -rf .turbo && rm -rf node_modules" "clean": "rm -rf .turbo && rm -rf node_modules"
}, },
"dependencies": { "dependencies": {
"@blitzjs/auth": "2.0.5", "@blitzjs/auth": "2.0.10",
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@blitzjs/next": "2.0.5", "@blitzjs/next": "2.0.10",
"@blitzjs/rpc": "2.0.5", "@blitzjs/rpc": "2.0.10",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"@tanstack/react-query": "4.0.10", "@tanstack/react-query": "4.0.10",
"blitz": "2.0.5", "blitz": "2.0.10",
"next": "14.0.4", "next": "canary",
"prisma": "4.6.1", "prisma": "4.6.1",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0" "react-dom": "18.2.0"

View File

@@ -16,18 +16,18 @@
"schema": "db/schema.prisma" "schema": "db/schema.prisma"
}, },
"dependencies": { "dependencies": {
"@blitzjs/next": "2.0.5", "@blitzjs/next": "2.0.10",
"@blitzjs/rpc": "2.0.5", "@blitzjs/rpc": "2.0.10",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "2.0.5", "blitz": "2.0.10",
"lowdb": "3.0.0", "lowdb": "3.0.0",
"next": "14.0.4", "next": "canary",
"prisma": "4.6.1", "prisma": "4.6.1",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0" "react-dom": "18.2.0"
}, },
"devDependencies": { "devDependencies": {
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@next/bundle-analyzer": "12.0.8", "@next/bundle-analyzer": "12.0.8",
"@types/express": "4.17.13", "@types/express": "4.17.13",
"@types/fs-extra": "9.0.13", "@types/fs-extra": "9.0.13",

View File

@@ -7,11 +7,11 @@
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next" "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
}, },
"dependencies": { "dependencies": {
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@blitzjs/next": "2.0.5", "@blitzjs/next": "2.0.10",
"@blitzjs/rpc": "2.0.5", "@blitzjs/rpc": "2.0.10",
"blitz": "2.0.5", "blitz": "2.0.10",
"next": "14.0.4", "next": "canary",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0" "react-dom": "18.2.0"
}, },

View File

@@ -7,11 +7,11 @@
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next" "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
}, },
"dependencies": { "dependencies": {
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@blitzjs/next": "2.0.5", "@blitzjs/next": "2.0.10",
"@blitzjs/rpc": "2.0.5", "@blitzjs/rpc": "2.0.10",
"blitz": "2.0.5", "blitz": "2.0.10",
"next": "14.0.4", "next": "canary",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0" "react-dom": "18.2.0"
}, },

View File

@@ -16,19 +16,19 @@
"schema": "db/schema.prisma" "schema": "db/schema.prisma"
}, },
"dependencies": { "dependencies": {
"@blitzjs/auth": "2.0.5", "@blitzjs/auth": "2.0.10",
"@blitzjs/next": "2.0.5", "@blitzjs/next": "2.0.10",
"@blitzjs/rpc": "2.0.5", "@blitzjs/rpc": "2.0.10",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "2.0.5", "blitz": "2.0.10",
"lowdb": "3.0.0", "lowdb": "3.0.0",
"next": "14.0.4", "next": "canary",
"prisma": "4.6.1", "prisma": "4.6.1",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0" "react-dom": "18.2.0"
}, },
"devDependencies": { "devDependencies": {
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@next/bundle-analyzer": "12.0.8", "@next/bundle-analyzer": "12.0.8",
"@types/express": "4.17.13", "@types/express": "4.17.13",
"@types/fs-extra": "9.0.13", "@types/fs-extra": "9.0.13",

View File

@@ -233,6 +233,7 @@ export function runBlitzCommandDev(argv, stdOut, opts: RunNextCommandDevOptions
} }
return new Promise<void>((resolve, reject) => { return new Promise<void>((resolve, reject) => {
console.log(`Running command "blitz ${argv.join(" ")}"`)
const instance = spawn("node", [blitzBin, ...argv], { const instance = spawn("node", [blitzBin, ...argv], {
cwd, cwd,
env, env,
@@ -294,8 +295,8 @@ export function runBlitzCommandDev(argv, stdOut, opts: RunNextCommandDevOptions
} }
// Blitz Utils // Blitz Utils
export function blitzLaunchApp(port, opts: RunNextCommandDevOptions) { export function blitzLaunchApp(port, opts: RunNextCommandDevOptions, turbo = false) {
return runBlitzCommandDev(["dev", "-p", port], undefined, opts) return runBlitzCommandDev(["dev", "-p", port, turbo ? "--turbo" : ""], undefined, opts)
} }
export function blitzBuild(args = [], opts = {}): any { export function blitzBuild(args = [], opts = {}): any {
@@ -437,7 +438,7 @@ export function runNextCommandDev(argv, stdOut, opts: RunNextCommandDevOptions =
} }
if (opts.stdout !== false) { if (opts.stdout !== false) {
process.stdout.write(message) process.stdout.write(message)
} }
} }
@@ -923,4 +924,5 @@ interface RunNextCommandDevOptions {
nodeArgs?: [] nodeArgs?: []
bootupMarker?: any bootupMarker?: any
nextStart?: boolean nextStart?: boolean
turbo?: boolean
} }

View File

@@ -3,9 +3,9 @@
"version": "0.0.0", "version": "0.0.0",
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"@blitzjs/config": "workspace:2.0.5", "@blitzjs/config": "workspace:2.0.10",
"@blitzjs/next": "workspace:2.0.5", "@blitzjs/next": "workspace:2.0.10",
"@blitzjs/rpc": "workspace:2.0.5", "@blitzjs/rpc": "workspace:2.0.10",
"@tanstack/react-query": "4.13.0", "@tanstack/react-query": "4.13.0",
"@testing-library/react": "13.4.0", "@testing-library/react": "13.4.0",
"@types/express": "4.17.13", "@types/express": "4.17.13",

View File

@@ -29,7 +29,7 @@
"husky": "8.0.2", "husky": "8.0.2",
"jsdom": "^19.0.0", "jsdom": "^19.0.0",
"lint-staged": "13.0.3", "lint-staged": "13.0.3",
"next": "14.0.4", "next": "canary",
"only-allow": "1.1.0", "only-allow": "1.1.0",
"prettier": "^2.7.1", "prettier": "^2.7.1",
"prettier-plugin-prisma": "4.4.0", "prettier-plugin-prisma": "4.4.0",
@@ -47,7 +47,10 @@
}, },
"pnpm": { "pnpm": {
"patchedDependencies": { "patchedDependencies": {
"next-auth@4.18.7": "patches/next-auth@4.18.7.patch" "next-auth@4.24.7": "patches/next-auth@4.24.7.patch"
},
"overrides": {
"@types/mime": "3.0.4"
} }
} }
} }

View File

@@ -1,5 +1,45 @@
# @blitzjs/auth # @blitzjs/auth
## 2.0.10
### Patch Changes
- 318e9740d: feat: support next-auth version 4.24.7
- Updated dependencies [318e9740d]
- blitz@2.0.10
## 2.0.9
### Patch Changes
- Updated dependencies [5a14306f7]
- blitz@2.0.9
## 2.0.8
### Patch Changes
- 77555468f: fix: add missing host while initialising the next-auth adapter
- Updated dependencies [5e61a1681]
- Updated dependencies [77555468f]
- blitz@2.0.8
## 2.0.7
### Patch Changes
- Updated dependencies [ee7bf87ec]
- Updated dependencies [178c152b2]
- blitz@2.0.7
## 2.0.6
### Patch Changes
- 5a587a6c3: Fix bundling issue that occurs in vercel due to the way imports were handled internally
- Updated dependencies [76a2544f9]
- blitz@2.0.6
## 2.0.5 ## 2.0.5
### Patch Changes ### Patch Changes

View File

@@ -1,6 +1,6 @@
{ {
"name": "@blitzjs/auth", "name": "@blitzjs/auth",
"version": "2.0.5", "version": "2.0.10",
"homepage": "https://blitzjs.com/", "homepage": "https://blitzjs.com/",
"repository": { "repository": {
"type": "git", "type": "git",
@@ -50,7 +50,7 @@
"url": "0.11.0" "url": "0.11.0"
}, },
"peerDependencies": { "peerDependencies": {
"blitz": "2.0.5", "blitz": "2.0.10",
"next": "*", "next": "*",
"next-auth": "*", "next-auth": "*",
"secure-password": "4.0.0" "secure-password": "4.0.0"
@@ -67,7 +67,7 @@
} }
}, },
"devDependencies": { "devDependencies": {
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@testing-library/react": "13.4.0", "@testing-library/react": "13.4.0",
"@testing-library/react-hooks": "8.0.1", "@testing-library/react-hooks": "8.0.1",
"@types/cookie": "0.4.1", "@types/cookie": "0.4.1",
@@ -75,9 +75,9 @@
"@types/jsonwebtoken": "8.5.8", "@types/jsonwebtoken": "8.5.8",
"@types/react": "18.0.25", "@types/react": "18.0.25",
"@types/react-dom": "17.0.14", "@types/react-dom": "17.0.14",
"blitz": "2.0.5", "blitz": "2.0.10",
"next": "14.0.4", "next": "canary",
"next-auth": "4.18.7", "next-auth": "4.24.7",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"secure-password": "4.0.0", "secure-password": "4.0.0",

View File

@@ -161,6 +161,8 @@ export const useSession = (options: UseSessionOptions = {}): ClientSession => {
if (isServer) { if (isServer) {
const e = new Error() const e = new Error()
e.name = "Rendering Suspense fallback..." e.name = "Rendering Suspense fallback..."
;(e as any).digest = "DYNAMIC_SERVER_USAGE"
e.message = "DYNAMIC_SERVER_USAGE"
delete e.stack delete e.stack
throw e throw e
} else { } else {

View File

@@ -107,13 +107,8 @@ export function NextAuthAdapter<P extends Provider[]>(
providerId = providerId.split("?")[0] providerId = providerId.split("?")[0]
} }
const {options, cookies} = await init({ const {options, cookies} = await init({
// @ts-ignore
url: new URL(
// @ts-ignore
internalRequest.url!,
process.env.APP_ORIGIN || process.env.BLITZ_DEV_SERVER_ORIGIN,
),
authOptions: config as unknown as AuthOptions, authOptions: config as unknown as AuthOptions,
origin: internalRequest.origin,
action, action,
providerId, providerId,
callbackUrl: req.body?.callbackUrl ?? (req.query?.callbackUrl as string), callbackUrl: req.body?.callbackUrl ?? (req.query?.callbackUrl as string),

View File

@@ -47,7 +47,12 @@ async function readJSONBody(
// prettier-ignore // prettier-ignore
const actions = [ "providers", "session", "csrf", "login", "signout", "callback", "verify-request", "error", "_log"] const actions = [ "providers", "session", "csrf", "login", "signout", "callback", "verify-request", "error", "_log"]
export async function toInternalRequest(req: Request): Promise<RequestInternal | Error> { export async function toInternalRequest(req: Request): Promise<
| (RequestInternal & {
url: URL
})
| Error
> {
try { try {
// TODO: url.toString() should not include action and providerId // TODO: url.toString() should not include action and providerId
// see init.ts // see init.ts
@@ -69,17 +74,28 @@ export async function toInternalRequest(req: Request): Promise<RequestInternal |
providerId = providerIdOrAction providerId = providerIdOrAction
} }
const headers = Object.fromEntries(req.headers)
const detectOrigin = (host?: string, proto?: string) => {
if (process.env.VERCEL ?? process.env.FLIGHTCONTROL ?? process.env.AUTH_TRUST_HOST)
return `${proto === "http" ? "http" : "https"}://${host}`
return process.env.NEXTAUTH_URL
}
return { return {
//@ts-ignore
url, url,
action, action,
providerId, providerId,
method: req.method ?? "GET", method: req.method ?? "GET",
headers: Object.fromEntries(req.headers), headers,
body: req.body ? await readJSONBody(req.body) : undefined, body: req.body ? await readJSONBody(req.body) : undefined,
cookies: parseCookie(req.headers.get("cookie") ?? "") ?? {}, cookies: parseCookie(req.headers.get("cookie") ?? "") ?? {},
error: url.searchParams.get("error") ?? undefined, error: url.searchParams.get("error") ?? undefined,
query: Object.fromEntries(url.searchParams), query: Object.fromEntries(url.searchParams),
origin: detectOrigin(
headers["x-forwarded-host"] ?? headers.host,
headers["x-forwarded-proto"],
),
} }
} catch (error) { } catch (error) {
return error as Error return error as Error

View File

@@ -183,8 +183,7 @@ export async function getSession(
export async function getBlitzContext(): Promise<Ctx> { export async function getBlitzContext(): Promise<Ctx> {
try { try {
//using eval to avoid bundling next/headers const {headers, cookies} = require("next/headers")
const {headers, cookies} = eval("require('next/headers')")
const req = new IncomingMessage(new Socket()) as IncomingMessage & { const req = new IncomingMessage(new Socket()) as IncomingMessage & {
cookies: {[key: string]: string} cookies: {[key: string]: string}
} }
@@ -234,8 +233,7 @@ export async function useAuthenticatedBlitzContext({
const ctx: Ctx = await getBlitzContext() const ctx: Ctx = await getBlitzContext()
const userId = ctx.session.userId const userId = ctx.session.userId
try { try {
//using eval to avoid bundling next/navigation const {redirect} = require("next/navigation")
const {redirect} = eval("require('next/navigation')")
if (userId) { if (userId) {
debug("[useAuthenticatedBlitzContext] User is authenticated") debug("[useAuthenticatedBlitzContext] User is authenticated")
if (redirectAuthenticatedTo) { if (redirectAuthenticatedTo) {

View File

@@ -1,5 +1,59 @@
# @blitzjs/next # @blitzjs/next
## 2.0.10
### Patch Changes
- Updated dependencies [318e9740d]
- blitz@2.0.10
- @blitzjs/rpc@2.0.10
## 2.0.9
### Patch Changes
- 5a14306f7: fix export `enhancePrisma` in client
- Updated dependencies [5a14306f7]
- @blitzjs/rpc@2.0.9
- blitz@2.0.9
## 2.0.8
### Patch Changes
- 5e61a1681: bug: merge existing and custom blitz turbo configs
- Updated dependencies [5e61a1681]
- Updated dependencies [77555468f]
- blitz@2.0.8
- @blitzjs/rpc@2.0.8
## 2.0.7
### Patch Changes
- ee7bf87ec: Turbopack support for Blitz
This PR includes the changes required to make the Blitz loaders work with Turbopack.
Usage:
```bash
pnpm blitz dev --turbo
```
- Updated dependencies [ee7bf87ec]
- Updated dependencies [178c152b2]
- blitz@2.0.7
- @blitzjs/rpc@2.0.7
## 2.0.6
### Patch Changes
- Updated dependencies [76a2544f9]
- blitz@2.0.6
- @blitzjs/rpc@2.0.6
## 2.0.5 ## 2.0.5
### Patch Changes ### Patch Changes

View File

@@ -1,6 +1,6 @@
{ {
"name": "@blitzjs/next", "name": "@blitzjs/next",
"version": "2.0.5", "version": "2.0.10",
"homepage": "https://blitzjs.com/", "homepage": "https://blitzjs.com/",
"repository": { "repository": {
"type": "git", "type": "git",
@@ -29,7 +29,7 @@
"eslint.js" "eslint.js"
], ],
"dependencies": { "dependencies": {
"@blitzjs/rpc": "2.0.5", "@blitzjs/rpc": "2.0.10",
"@types/hoist-non-react-statics": "3.3.1", "@types/hoist-non-react-statics": "3.3.1",
"copy-webpack-plugin": "11.0.0", "copy-webpack-plugin": "11.0.0",
"debug": "4.3.3", "debug": "4.3.3",
@@ -39,13 +39,13 @@
"supports-color": "8.1.1" "supports-color": "8.1.1"
}, },
"peerDependencies": { "peerDependencies": {
"blitz": "2.0.5", "blitz": "2.0.10",
"next": "*", "next": "*",
"react": "*", "react": "*",
"tslog": "4.9.0" "tslog": "4.9.0"
}, },
"devDependencies": { "devDependencies": {
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@testing-library/dom": "8.13.0", "@testing-library/dom": "8.13.0",
"@testing-library/jest-dom": "5.16.3", "@testing-library/jest-dom": "5.16.3",
"@testing-library/react": "13.4.0", "@testing-library/react": "13.4.0",
@@ -56,10 +56,10 @@
"@types/react": "18.0.25", "@types/react": "18.0.25",
"@types/react-dom": "17.0.14", "@types/react-dom": "17.0.14",
"@types/testing-library__react-hooks": "4.0.0", "@types/testing-library__react-hooks": "4.0.0",
"blitz": "2.0.5", "blitz": "2.0.10",
"cross-spawn": "7.0.3", "cross-spawn": "7.0.3",
"find-up": "4.1.0", "find-up": "4.1.0",
"next": "14.0.4", "next": "canary",
"next-router-mock": "0.9.1", "next-router-mock": "0.9.1",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",

View File

@@ -170,6 +170,7 @@ function codegen() {
const defaultIndexJsPath = path.join(dotBlitzDir, "index.js") const defaultIndexJsPath = path.join(dotBlitzDir, "index.js")
const defaultIndexBrowserJSPath = path.join(dotBlitzDir, "index-browser.js") const defaultIndexBrowserJSPath = path.join(dotBlitzDir, "index-browser.js")
const defaultIndexDTSPath = path.join(dotBlitzDir, "index.d.ts") const defaultIndexDTSPath = path.join(dotBlitzDir, "index.d.ts")
const emptyJSPath = path.join(dotBlitzDir, "turbopack-empty.js")
if (!fs.existsSync(defaultIndexJsPath)) { if (!fs.existsSync(defaultIndexJsPath)) {
await copyFile(path.join(__dirname, "default-index.js"), defaultIndexJsPath) await copyFile(path.join(__dirname, "default-index.js"), defaultIndexJsPath)
@@ -181,6 +182,10 @@ function codegen() {
if (!fs.existsSync(defaultIndexDTSPath)) { if (!fs.existsSync(defaultIndexDTSPath)) {
await copyFile(path.join(__dirname, "default-index.d.ts"), defaultIndexDTSPath) await copyFile(path.join(__dirname, "default-index.d.ts"), defaultIndexDTSPath)
} }
if (!fs.existsSync(emptyJSPath)) {
await copyFile(path.join(__dirname, "turbopack-empty.js"), emptyJSPath)
}
} catch (e) { } catch (e) {
console.error(e) console.error(e)
} }

View File

@@ -0,0 +1 @@
export {}

View File

@@ -28,6 +28,7 @@ import {
getInfiniteQueryKey, getInfiniteQueryKey,
getQueryKey, getQueryKey,
installWebpackConfig, installWebpackConfig,
installTurboConfig,
InstallWebpackConfigOptions, InstallWebpackConfigOptions,
ResolverPathOptions, ResolverPathOptions,
DefaultOptions, DefaultOptions,
@@ -272,26 +273,30 @@ export function withBlitz(nextConfig: BlitzConfig = {}): NextConfig {
}, },
}) })
try { if (!process.env.TURBOPACK) {
const sodiumNativePath = fs.realpathSync(path.join(require.resolve("sodium-native"), "..")) try {
const dotNextDirectory = `${process.cwd()}/.next` const sodiumNativePath = fs.realpathSync(
config.plugins.push( path.join(require.resolve("sodium-native"), ".."),
new CopyPlugin({ )
patterns: [ const dotNextDirectory = `${process.cwd()}/.next`
{ config.plugins.push(
//dev new CopyPlugin({
from: `${sodiumNativePath}/prebuilds/`, patterns: [
to: `${dotNextDirectory}/server/vendor-chunks/prebuilds/`, {
}, //dev
{ from: `${sodiumNativePath}/prebuilds/`,
//prod to: `${dotNextDirectory}/server/vendor-chunks/prebuilds/`,
from: `${sodiumNativePath}/prebuilds/`, },
to: `${dotNextDirectory}/server/chunks/prebuilds/`, {
}, //prod
], from: `${sodiumNativePath}/prebuilds/`,
}), to: `${dotNextDirectory}/server/chunks/prebuilds/`,
) },
} catch {} ],
}),
)
} catch {}
}
if (typeof nextConfig.webpack === "function") { if (typeof nextConfig.webpack === "function") {
return nextConfig.webpack(config, options) return nextConfig.webpack(config, options)
@@ -300,6 +305,26 @@ export function withBlitz(nextConfig: BlitzConfig = {}): NextConfig {
}, },
}) })
if (process.env.TURBOPACK) {
const blitzTurboConfig = installTurboConfig()
config.experimental = {
...config.experimental,
turbo: {
loaders: {
...config.experimental?.turbo?.loaders,
},
resolveAlias: {
...config.experimental?.turbo?.resolveAlias,
...blitzTurboConfig.resolveAlias,
},
rules: {
...config.experimental?.turbo?.rules,
...blitzTurboConfig.rules,
},
},
}
}
const {blitz, ...rest} = config const {blitz, ...rest} = config
return rest return rest
} }

View File

@@ -1,5 +1,53 @@
# @blitzjs/rpc # @blitzjs/rpc
## 2.0.10
### Patch Changes
- Updated dependencies [318e9740d]
- blitz@2.0.10
## 2.0.9
### Patch Changes
- 5a14306f7: fix export `enhancePrisma` in client
- Updated dependencies [5a14306f7]
- blitz@2.0.9
## 2.0.8
### Patch Changes
- Updated dependencies [5e61a1681]
- Updated dependencies [77555468f]
- blitz@2.0.8
## 2.0.7
### Patch Changes
- ee7bf87ec: Turbopack support for Blitz
This PR includes the changes required to make the Blitz loaders work with Turbopack.
Usage:
```bash
pnpm blitz dev --turbo
```
- Updated dependencies [ee7bf87ec]
- Updated dependencies [178c152b2]
- blitz@2.0.7
## 2.0.6
### Patch Changes
- Updated dependencies [76a2544f9]
- blitz@2.0.6
## 2.0.5 ## 2.0.5
### Patch Changes ### Patch Changes

View File

@@ -1,6 +1,6 @@
{ {
"name": "@blitzjs/rpc", "name": "@blitzjs/rpc",
"version": "2.0.5", "version": "2.0.10",
"homepage": "https://blitzjs.com/", "homepage": "https://blitzjs.com/",
"repository": { "repository": {
"type": "git", "type": "git",
@@ -37,19 +37,19 @@
}, },
"peerDependencies": { "peerDependencies": {
"@tanstack/query-core": "4.24.4", "@tanstack/query-core": "4.24.4",
"blitz": "2.0.5", "blitz": "2.0.10",
"next": "*", "next": "*",
"react": "*" "react": "*"
}, },
"devDependencies": { "devDependencies": {
"@blitzjs/auth": "2.0.5", "@blitzjs/auth": "2.0.10",
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@tanstack/query-core": "4.24.4", "@tanstack/query-core": "4.24.4",
"@types/debug": "4.1.7", "@types/debug": "4.1.7",
"@types/react": "18.0.25", "@types/react": "18.0.25",
"@types/react-dom": "17.0.14", "@types/react-dom": "17.0.14",
"blitz": "2.0.5", "blitz": "2.0.10",
"next": "14.0.4", "next": "canary",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"typescript": "^4.8.4", "typescript": "^4.8.4",

View File

@@ -157,6 +157,45 @@ export function installWebpackConfig({
}) })
} }
export function installTurboConfig() {
return {
resolveAlias: {
"cross-spawn": {browser: ".blitz/turbopack-empty.js"},
"npm-which": {browser: ".blitz/turbopack-empty.js"},
fs: {browser: ".blitz/turbopack-empty.js"},
child_process: {browser: ".blitz/turbopack-empty.js"},
},
rules: {
"**/*...blitz*.{jsx,tsx,js,ts}": {
default: {
loaders: [{loader: loaderServer, options: {}}],
as: "*.ts",
},
},
"**/{queries,mutations}/**": {
browser: {
loaders: [
{
loader: loaderClient,
options: {},
},
],
as: "*.ts",
},
default: {
loaders: [
{
loader: loaderServerResolvers,
options: {},
},
],
as: "*.ts",
},
},
},
}
}
// ---------- // ----------
// END LOADER // END LOADER
// ---------- // ----------

View File

@@ -14,12 +14,24 @@ import {getResolverConfig} from "../../parsers/parse-rpc-config"
// Subset of `import type { LoaderDefinitionFunction } from 'webpack'` // Subset of `import type { LoaderDefinitionFunction } from 'webpack'`
export async function loader(this: Loader, input: string): Promise<string> { export async function loader(this: Loader, input: string): Promise<string> {
const compiler = this._compiler!
const id = this.resource const id = this.resource
const root = this._compiler!.context const root = this.rootContext
const isSSR = compiler.name === "server" // Webpack has `_compiler` property. Turbopack does not.
if (!isSSR) { const webpackCompilerName = this._compiler?.name
if (webpackCompilerName) {
const isSSR = webpackCompilerName === "server"
if (!isSSR) {
return await transformBlitzRpcResolverClient(
input,
toPosixPath(id),
toPosixPath(root),
this.query,
)
}
// Handle Turbopack / other bundlers case.
// The decision of which environment to run the loader in is decided by the loader configuration instead.
} else {
return await transformBlitzRpcResolverClient( return await transformBlitzRpcResolverClient(
input, input,
toPosixPath(id), toPosixPath(id),

View File

@@ -13,12 +13,24 @@ import {posix} from "path"
// Subset of `import type { LoaderDefinitionFunction } from 'webpack'` // Subset of `import type { LoaderDefinitionFunction } from 'webpack'`
export async function loader(this: Loader, input: string): Promise<string> { export async function loader(this: Loader, input: string): Promise<string> {
const compiler = this._compiler!
const id = this.resource const id = this.resource
const root = this._compiler!.context const root = this.rootContext
const isSSR = compiler.name === "server" // Webpack has `_compiler` property. Turbopack does not.
if (isSSR) { const webpackCompilerName = this._compiler?.name
if (webpackCompilerName) {
const isSSR = webpackCompilerName === "server"
if (isSSR) {
return await transformBlitzRpcResolverServer(
input,
toPosixPath(id),
toPosixPath(root),
this.query,
)
}
// Handle Turbopack / other bundlers case.
// The decision of which environment to run the loader in is decided by the loader configuration instead.
} else {
return await transformBlitzRpcResolverServer( return await transformBlitzRpcResolverServer(
input, input,
toPosixPath(id), toPosixPath(id),

View File

@@ -1,4 +1,4 @@
import {join} from "path" import {join, relative} from "path"
import {promises} from "fs" import {promises} from "fs"
import { import {
assertPosixPath, assertPosixPath,
@@ -14,17 +14,37 @@ import {
// Subset of `import type { LoaderDefinitionFunction } from 'webpack'` // Subset of `import type { LoaderDefinitionFunction } from 'webpack'`
export async function loader(this: Loader, input: string): Promise<string> { export async function loader(this: Loader, input: string): Promise<string> {
const compiler = this._compiler!
const id = this.resource const id = this.resource
const root = this._compiler!.context const root = this.rootContext
const rpcFolders = this.query.includeRPCFolders ? this.query.includeRPCFolders : [] const rpcFolders = this.query.includeRPCFolders ? this.query.includeRPCFolders : []
const isSSR = compiler.name === "server" // Webpack has `_compiler` property. Turbopack does not.
if (isSSR) { const webpackCompilerName = this._compiler?.name
if (webpackCompilerName) {
const isSSR = webpackCompilerName === "server"
if (isSSR) {
this.cacheable(false)
const resolvers = await collectResolvers(root, rpcFolders, ["ts", "js", "tsx", "jsx"])
return await transformBlitzRpcServer(
this.context,
input,
toPosixPath(id),
toPosixPath(root),
resolvers,
this.query,
)
}
// Handle Turbopack / other bundlers case.
// The decision of which environment to run the loader in is decided by the loader configuration instead.
} else {
this.cacheable(false) this.cacheable(false)
const resolvers = await collectResolvers(root, rpcFolders, ["ts", "js", "tsx", "jsx"]) const resolvers = await collectResolvers(root, rpcFolders, ["ts", "js", "tsx", "jsx"])
return await transformBlitzRpcServer( return await transformBlitzRpcServer(
this.context,
input, input,
toPosixPath(id), toPosixPath(id),
toPosixPath(root), toPosixPath(root),
@@ -43,6 +63,7 @@ function slash(str: string) {
} }
export async function transformBlitzRpcServer( export async function transformBlitzRpcServer(
context: string,
src: string, src: string,
id: string, id: string,
root: string, root: string,
@@ -68,7 +89,9 @@ export async function transformBlitzRpcServer(
code += `__internal_addBlitzRpcResolver('${routePath}','${slash( code += `__internal_addBlitzRpcResolver('${routePath}','${slash(
resolverFilePath, resolverFilePath,
)}',() => ${importStrategy}('${slash(resolverFilePath)}'));` )}',() => ${importStrategy}('${slash(
relative(context, resolverFilePath).replace(/\\/g, "/"),
)}'))`
code += "\n" code += "\n"
} }

View File

@@ -9,10 +9,11 @@ export interface LoaderOptions {
} }
export interface Loader { export interface Loader {
_compiler?: { _compiler: {
name: string name: string
context: string
} }
rootContext: string
context: string
resource: string resource: string
cacheable: (enabled: boolean) => void cacheable: (enabled: boolean) => void
query: LoaderOptions query: LoaderOptions

View File

@@ -1,5 +1,51 @@
# blitz # blitz
## 2.0.10
### Patch Changes
- 318e9740d: feat: support next-auth version 4.24.7
- @blitzjs/generator@2.0.10
## 2.0.9
### Patch Changes
- 5a14306f7: fix export `enhancePrisma` in client
- @blitzjs/generator@2.0.9
## 2.0.8
### Patch Changes
- 5e61a1681: bug: merge existing and custom blitz turbo configs
- 77555468f: fix: add missing host while initialising the next-auth adapter
- @blitzjs/generator@2.0.8
## 2.0.7
### Patch Changes
- ee7bf87ec: Turbopack support for Blitz
This PR includes the changes required to make the Blitz loaders work with Turbopack.
Usage:
```bash
pnpm blitz dev --turbo
```
- 178c152b2: fix: patch next.js to hide intentional throws of `DYNAMIC_SERVER_USAGE`
- @blitzjs/generator@2.0.7
## 2.0.6
### Patch Changes
- 76a2544f9: Use `SIGINT` signal instead of `SIGABRT` to stop the process, when using custom server for better compatibility with operative systems
- @blitzjs/generator@2.0.6
## 2.0.5 ## 2.0.5
### Patch Changes ### Patch Changes

View File

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

View File

@@ -16,7 +16,14 @@ export const codegenTasks = async () => {
*/ */
const nextDir = await resolveCwd("next") const nextDir = await resolveCwd("next")
const nextClientIndex = join(nextDir, "../..", "client", "index.js") const nextClientIndex = join(nextDir, "../..", "client", "index.js")
const nextClientOnRecoverableErrorIndex = join(
nextDir,
"../..",
"client",
"on-recoverable-error.js",
)
const readFile = await fs.readFile(nextClientIndex) const readFile = await fs.readFile(nextClientIndex)
const readOnRecoverableErrorFile = await fs.readFile(nextClientOnRecoverableErrorIndex)
const packageJson = await getPackageJson() const packageJson = await getPackageJson()
const version = packageJson.dependencies.next const version = packageJson.dependencies.next
const nextVersion = semver.clean(version, {loose: true}) || semver.valid(semver.coerce(version)) const nextVersion = semver.clean(version, {loose: true}) || semver.valid(semver.coerce(version))
@@ -48,14 +55,16 @@ export const codegenTasks = async () => {
) )
await fs.writeFile(nextClientIndex, updatedFile) await fs.writeFile(nextClientIndex, updatedFile)
log.success("Next.js was successfully patched with a React Suspense fix") log.success("Next.js was successfully patched with a React Suspense fix")
} else if (nextVersion && semver.satisfies(nextVersion, ">=13.3.1")) { } else {
const updatedFile = readFile const updatedFile = readOnRecoverableErrorFile.toString().replace(
.toString() /defaultOnRecoverableError\(err\);/gm,
.replace( ` if (err.toString().includes("DYNAMIC_SERVER_USAGE") || err.toString().includes("could not finish this Suspense boundary") || err.toString().includes("Minified React error #419")) {
/_onrecoverableerror\.default$/gm, return;
`(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)`, } else {
) defaultOnRecoverableError(err)
await fs.writeFile(nextClientIndex, updatedFile) }`,
)
await fs.writeFile(nextClientOnRecoverableErrorIndex, updatedFile)
log.success("Next.js was successfully patched with a React Suspense fix") log.success("Next.js was successfully patched with a React Suspense fix")
} }
} catch (err) { } catch (err) {

View File

@@ -2,7 +2,7 @@ import {ChildProcess} from "child_process"
import {spawn} from "cross-spawn" import {spawn} from "cross-spawn"
import detect from "detect-port" import detect from "detect-port"
import path from "path" import path from "path"
import {existsSync, readJSONSync} from "fs-extra" import {copySync, existsSync, readJSONSync} from "fs-extra"
import * as esbuild from "esbuild" import * as esbuild from "esbuild"
import pkgDir from "pkg-dir" import pkgDir from "pkg-dir"
import type {ServerConfig} from "./config" import type {ServerConfig} from "./config"
@@ -127,7 +127,7 @@ export function startCustomServer(
console.log("\n") console.log("\n")
//@ts-ignore -- incorrect TS type from node //@ts-ignore -- incorrect TS type from node
process.exitCode = RESTART_CODE process.exitCode = RESTART_CODE
process.kill("SIGABRT") process.kill("SIGINT")
} }
}, },
} }
@@ -151,22 +151,12 @@ function getSpawnEnv(config: ServerConfig) {
return spawnEnv return spawnEnv
} }
async function createCommandAndPort(config: ServerConfig, command: string) { async function detectAvailablePort(config: ServerConfig) {
let spawnCommand: string[] = [command] return await detect({port: config.port ? config.port : 3000})
let availablePort: number
availablePort = await detect({port: config.port ? config.port : 3000})
spawnCommand = spawnCommand.concat(["-p", `${availablePort}`])
if (config.hostname) {
spawnCommand = spawnCommand.concat(["-H", `${config.hostname}`])
}
const spawnEnv = getSpawnEnv(config)
return {spawnCommand, spawnEnv, availablePort}
} }
const frameworkCommands = ["blitz", "next"]
export async function nextStartDev( export async function nextStartDev(
nextBin: string, nextBin: string,
cwd: string, cwd: string,
@@ -174,12 +164,11 @@ export async function nextStartDev(
_buildFolder: string, _buildFolder: string,
config: ServerConfig, config: ServerConfig,
) { ) {
const {spawnCommand, spawnEnv, availablePort} = await createCommandAndPort(config, "dev") const spawnEnv = getSpawnEnv(config)
const availablePort = await detectAvailablePort(config)
process.env.BLITZ_DEV_SERVER_ORIGIN = `http://localhost:${availablePort}` process.env.BLITZ_DEV_SERVER_ORIGIN = `http://localhost:${availablePort}`
debug("cwd ", cwd) const spawnCommand = process.argv.slice(2).filter((arg) => !frameworkCommands.includes(arg))
debug("spawn ", nextBin, spawnCommand)
return new Promise<void>((res, rej) => { return new Promise<void>((res, rej) => {
spawn(nextBin, spawnCommand, { spawn(nextBin, spawnCommand, {
@@ -248,7 +237,8 @@ export function nextExport(nextBin: string, config: ServerConfig) {
} }
export async function nextStart(nextBin: string, _buildFolder: string, config: ServerConfig) { export async function nextStart(nextBin: string, _buildFolder: string, config: ServerConfig) {
const {spawnCommand, spawnEnv} = await createCommandAndPort(config, "start") const spawnEnv = getSpawnEnv(config)
const spawnCommand = process.argv.slice(2).filter((arg) => !frameworkCommands.includes(arg))
return new Promise<void>((res, rej) => { return new Promise<void>((res, rej) => {
spawn(nextBin, spawnCommand, { spawn(nextBin, spawnCommand, {

View File

@@ -19,6 +19,7 @@ export {
RedirectError, RedirectError,
OAuthError, OAuthError,
} }
export * from "./utils/enhance-prisma"
export type BlitzProviderComponentType = <TProps = any>( export type BlitzProviderComponentType = <TProps = any>(
component: ComponentType<TProps>, component: ComponentType<TProps>,
@@ -84,6 +85,5 @@ if (typeof window !== "undefined" && process.env.NODE_ENV === "development") {
export * from "./utils" export * from "./utils"
export * from "./types" export * from "./types"
export * from "./utils/enhance-prisma"
export * from "./utils/zod" export * from "./utils/zod"
export {reduceBlitzClientPlugins} from "./plugin" export {reduceBlitzClientPlugins} from "./plugin"

View File

@@ -1,5 +1,47 @@
# @blitzjs/codemod # @blitzjs/codemod
## 2.0.10
### Patch Changes
- Updated dependencies [318e9740d]
- blitz@2.0.10
- @blitzjs/generator@2.0.10
## 2.0.9
### Patch Changes
- Updated dependencies [5a14306f7]
- blitz@2.0.9
- @blitzjs/generator@2.0.9
## 2.0.8
### Patch Changes
- Updated dependencies [5e61a1681]
- Updated dependencies [77555468f]
- blitz@2.0.8
- @blitzjs/generator@2.0.8
## 2.0.7
### Patch Changes
- Updated dependencies [ee7bf87ec]
- Updated dependencies [178c152b2]
- blitz@2.0.7
- @blitzjs/generator@2.0.7
## 2.0.6
### Patch Changes
- Updated dependencies [76a2544f9]
- blitz@2.0.6
- @blitzjs/generator@2.0.6
## 2.0.5 ## 2.0.5
### Patch Changes ### Patch Changes

View File

@@ -1,6 +1,6 @@
{ {
"name": "@blitzjs/codemod", "name": "@blitzjs/codemod",
"version": "2.0.5", "version": "2.0.10",
"scripts": { "scripts": {
"build": "unbuild", "build": "unbuild",
"dev": "watch unbuild src --wait=0.2", "dev": "watch unbuild src --wait=0.2",
@@ -25,9 +25,9 @@
"@babel/plugin-proposal-class-properties": "7.17.12", "@babel/plugin-proposal-class-properties": "7.17.12",
"@babel/plugin-syntax-jsx": "7.17.12", "@babel/plugin-syntax-jsx": "7.17.12",
"@babel/plugin-syntax-typescript": "7.17.12", "@babel/plugin-syntax-typescript": "7.17.12",
"@blitzjs/generator": "2.0.5", "@blitzjs/generator": "2.0.10",
"arg": "5.0.1", "arg": "5.0.1",
"blitz": "2.0.5", "blitz": "2.0.10",
"chalk": "^4.1.0", "chalk": "^4.1.0",
"cross-spawn": "7.0.3", "cross-spawn": "7.0.3",
"debug": "4.3.3", "debug": "4.3.3",
@@ -38,7 +38,7 @@
}, },
"devDependencies": { "devDependencies": {
"@babel/preset-env": "7.12.10", "@babel/preset-env": "7.12.10",
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@types/jscodeshift": "0.11.2", "@types/jscodeshift": "0.11.2",
"@types/node": "18.11.9", "@types/node": "18.11.9",
"ast-types": "0.14.2", "ast-types": "0.14.2",

View File

@@ -1,5 +1,15 @@
# @blitzjs/config # @blitzjs/config
## 2.0.10
## 2.0.9
## 2.0.8
## 2.0.7
## 2.0.6
## 2.0.5 ## 2.0.5
## 2.0.4 ## 2.0.4

View File

@@ -1,7 +1,7 @@
{ {
"name": "@blitzjs/config", "name": "@blitzjs/config",
"private": true, "private": true,
"version": "2.0.5", "version": "2.0.10",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@typescript-eslint/eslint-plugin": "5.42.1", "@typescript-eslint/eslint-plugin": "5.42.1",

View File

@@ -1,5 +1,15 @@
# @blitzjs/generator # @blitzjs/generator
## 2.0.10
## 2.0.9
## 2.0.8
## 2.0.7
## 2.0.6
## 2.0.5 ## 2.0.5
## 2.0.4 ## 2.0.4

View File

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

View File

@@ -31,7 +31,7 @@
"@prisma/client": "5.4.2", "@prisma/client": "5.4.2",
"blitz": "latest", "blitz": "latest",
"formik": "2.4.5", "formik": "2.4.5",
"next": "13.5.4", "next": "14.1.4",
"prisma": "5.4.2", "prisma": "5.4.2",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",

View File

@@ -27,7 +27,7 @@
"@blitzjs/rpc": "latest", "@blitzjs/rpc": "latest",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "latest", "blitz": "latest",
"next": "13.4.5", "next": "14.1.4",
"prisma": "4.6.1", "prisma": "4.6.1",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",

View File

@@ -27,7 +27,7 @@
"@blitzjs/rpc": "latest", "@blitzjs/rpc": "latest",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "latest", "blitz": "latest",
"next": "13.4.5", "next": "14.1.4",
"prisma": "4.6.1", "prisma": "4.6.1",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",

View File

@@ -25,7 +25,7 @@
"@typescript-eslint/parser": "5.9.1" "@typescript-eslint/parser": "5.9.1"
}, },
"devDependencies": { "devDependencies": {
"@blitzjs/config": "2.0.5", "@blitzjs/config": "2.0.10",
"@types/react": "18.0.25", "@types/react": "18.0.25",
"@types/react-dom": "17.0.14", "@types/react-dom": "17.0.14",
"react": "18.2.0", "react": "18.2.0",

View File

@@ -1,16 +0,0 @@
diff --git a/package.json b/package.json
index 42c10484d14e2b029157acf9a08087e8133b20d2..c5a6acce9dd9c8f24271be0b8ae19df680ea0f7b 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,10 @@
"./next": "./next/index.js",
"./middleware": "./middleware.js",
"./client/_utils": "./client/_utils.js",
- "./providers/*": "./providers/*.js"
+ "./providers/*": "./providers/*.js",
+ "./core/init": "./core/init.js",
+ "./core/lib/oauth/authorization-url": "./core/lib/oauth/authorization-url.js",
+ "./core/lib/oauth/callback": "./core/lib/oauth/callback.js"
},
"scripts": {
"build": "pnpm clean && pnpm build:js && pnpm build:css",

View File

@@ -0,0 +1,23 @@
diff --git a/package.json b/package.json
index c89e03c41a03de738cfb0ad090a63c2e99dadc7b..a5f38083c24732651c427c2b2d17cbcb23495473 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,18 @@
"./providers/*": {
"types": "./providers/*.d.ts",
"default": "./providers/*.js"
+ },
+ "./core/init": {
+ "types": "./core/init.d.ts",
+ "default": "./core/init.js"
+ },
+ "./core/lib/oauth/authorization-url": {
+ "types": "./core/lib/oauth/authorization-url.d.ts",
+ "default": "./core/lib/oauth/authorization-url.js"
+ },
+ "./core/lib/oauth/callback": {
+ "types": "./core/lib/oauth/callback.d.ts",
+ "default": "./core/lib/oauth/callback.js"
}
},
"files": [

1478
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -24,6 +24,6 @@
}, },
"homepage": "https://github.com/blitz-js/blitz#readme", "homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": { "dependencies": {
"blitz": "2.0.5" "blitz": "2.0.10"
} }
} }

View File

@@ -24,6 +24,6 @@
}, },
"homepage": "https://github.com/blitz-js/blitz#readme", "homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": { "dependencies": {
"blitz": "2.0.5" "blitz": "2.0.10"
} }
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -23,6 +23,6 @@
}, },
"homepage": "https://github.com/blitz-js/blitz#readme", "homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": { "dependencies": {
"blitz": "2.0.5" "blitz": "2.0.10"
} }
} }

View File

@@ -22,6 +22,6 @@
}, },
"homepage": "https://github.com/blitz-js/blitz#readme", "homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": { "dependencies": {
"blitz": "2.0.5" "blitz": "2.0.10"
} }
} }

View File

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

View File

@@ -22,6 +22,6 @@
}, },
"homepage": "https://github.com/blitz-js/blitz#readme", "homepage": "https://github.com/blitz-js/blitz#readme",
"dependencies": { "dependencies": {
"blitz": "2.0.5" "blitz": "2.0.10"
} }
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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