1
0
mirror of synced 2026-02-09 09:00:09 -05:00

Compare commits

...

14 Commits

Author SHA1 Message Date
Siddharth Suresh
33f649f64c Update main.yml 2023-04-30 16:50:28 +05:30
Siddharth Suresh
8542c14952 Update main.yml 2023-04-30 16:43:49 +05:30
Blitz.js Bot
7e0e0f984c (meta) added @nelsonmestevao as contributor 2023-04-19 14:27:42 -04:00
Nelson Estevão
d814c2d2d8 fix: add missing key prop to LabelSelectField (#4122)
Co-authored-by: Siddharth Suresh <siddh.suresh@gmail.com>
2023-04-19 23:57:37 +05:30
Siddharth Suresh
29c2b029ac Fix: Add missing entry to expose next-auth adapter (#4133) 2023-04-19 23:45:39 +05:30
Siddharth Suresh
ed22706e5f fix (minor): Replace console.log with debug (#4132) 2023-04-19 23:44:46 +05:30
github-actions[bot]
3e8f04ed03 Version Packages (beta) (#4121)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Siddharth Suresh <siddh.suresh@gmail.com>
2023-04-10 19:24:42 +05:30
Siddharth Suresh
e82a79be50 Update the version of next in the new template from 13.2 to 13.3.0 (#4120)
Co-authored-by: Brandon Bayer <b@bayer.ws>
2023-04-10 18:45:54 +05:30
Blitz.js Bot
b1fdb63470 (meta) added @vitaliemiron as contributor 2023-04-07 12:46:27 -04:00
Vitalie
38d945a3fb fix: new app generated by blitz new causes Error: DYNAMIC_SERVER_USAGE (#4113)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2023-04-07 16:46:22 +00:00
Blitz.js Bot
ac587b6ac3 (meta) added @maotora as contributor 2023-04-07 12:38:51 -04:00
Maotora ᕙ(⇀‸↼‶)ᕗ
c07a13eefb Fix blitz recipe paths (#3997)
Co-authored-by: Tobias <t@tobiasjordans.de>
Co-authored-by: Siddharth Suresh <siddh.suresh@gmail.com>
2023-04-07 12:38:46 -04:00
github-actions[bot]
9f316d73f5 Version Packages (beta) (#4111)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Siddharth Suresh <siddh.suresh@gmail.com>
2023-04-03 19:26:36 +05:30
Siddharth Suresh
f84d77a425 Fix invoke type regression (#4110) 2023-04-03 08:49:55 +05:30
79 changed files with 742 additions and 466 deletions

View File

@@ -3866,6 +3866,36 @@
"doc", "doc",
"code" "code"
] ]
},
{
"login": "maotora",
"name": "Maotora ᕙ(⇀‸↼‶)ᕗ",
"avatar_url": "https://avatars.githubusercontent.com/u/5174884?v=4",
"profile": "https://maotoramm.com",
"contributions": [
"doc",
"code"
]
},
{
"login": "vitaliemiron",
"name": "Vitalie",
"avatar_url": "https://avatars.githubusercontent.com/u/45145592?v=4",
"profile": "https://github.com/vitaliemiron",
"contributions": [
"doc",
"code"
]
},
{
"login": "nelsonmestevao",
"name": "Nelson Estevão",
"avatar_url": "https://avatars.githubusercontent.com/u/19409687?v=4",
"profile": "https://estevao.org",
"contributions": [
"doc",
"code"
]
} }
], ],
"contributorsPerLine": 7, "contributorsPerLine": 7,

View File

@@ -0,0 +1,7 @@
---
"@blitzjs/recipe-chakra-ui": patch
"@blitzjs/recipe-next-ui": patch
"@blitzjs/recipe-tailwind": patch
---
This change reflects the directory change from app/pages to src/pages for the receipts chakra-ui, next-ui, tailwind. It checks for which directories exists and is compatible with either versions.

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/rpc": patch
---
Fix return type of the `invoke` method from returning type function to return the type of resolved data

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/generator": patch
---
fix: add missing key prop to LabelSelectField

View File

@@ -0,0 +1,9 @@
---
"@blitzjs/auth": patch
"@blitzjs/next": patch
"@blitzjs/rpc": patch
"blitz": patch
"@blitzjs/generator": patch
---
Update the version of next in the new template from 13.2 to 13.3.0

View File

@@ -0,0 +1,5 @@
---
"blitz": patch
---
The issue is that the version provided, "13.2", is not a valid SemVer version. A valid SemVer version must have three components: major, minor, and patch (e.g., "13.2.0").

View File

@@ -178,6 +178,7 @@
"lucky-cows-try", "lucky-cows-try",
"lucky-months-guess", "lucky-months-guess",
"lucky-years-turn", "lucky-years-turn",
"many-fans-fetch",
"mean-ears-speak", "mean-ears-speak",
"mean-gorillas-reply", "mean-gorillas-reply",
"modern-cameras-pull", "modern-cameras-pull",
@@ -191,12 +192,14 @@
"nervous-dolls-rule", "nervous-dolls-rule",
"new-coats-turn", "new-coats-turn",
"new-olives-protect", "new-olives-protect",
"nice-boxes-travel",
"nice-deers-dream", "nice-deers-dream",
"nice-starfishes-live", "nice-starfishes-live",
"nine-birds-confess", "nine-birds-confess",
"nine-onions-admire", "nine-onions-admire",
"ninety-lies-press", "ninety-lies-press",
"ninety-pets-heal", "ninety-pets-heal",
"ninety-pots-learn",
"ninety-rice-tickle", "ninety-rice-tickle",
"odd-bears-run", "odd-bears-run",
"olive-bees-buy", "olive-bees-buy",
@@ -210,6 +213,7 @@
"perfect-eyes-repeat", "perfect-eyes-repeat",
"perfect-trains-double", "perfect-trains-double",
"plenty-bottles-swim", "plenty-bottles-swim",
"plenty-gifts-provide",
"plenty-kiwis-greet", "plenty-kiwis-greet",
"polite-lizards-love", "polite-lizards-love",
"poor-peas-lick", "poor-peas-lick",

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/auth": patch
---
Fix: Add missing entry to expose next-auth adapter in Blitz Auth

View File

@@ -109,9 +109,44 @@ jobs:
tree -J -d -L 1 | jq -c '.[0].contents | map(.name | tostring) | map(select(. != "utils"))' 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"))') folders=$(tree -J -d -L 1 | jq -c '.[0].contents | map(.name | tostring) | map(select(. != "utils"))')
echo "folders=$folders" >> $GITHUB_OUTPUT 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: Integration-Tests:
name: "Integration Test: ${{matrix.folder}} @ ${{ matrix.os }} " name: "Integration Test: ${{matrix.folder}} @ ${{matrix.os}} "
needs: [find-integration-tests] needs: [find-integration-tests]
strategy: strategy:
matrix: matrix:
@@ -119,7 +154,6 @@ jobs:
os: os:
- ubuntu-latest - ubuntu-latest
- windows-latest - windows-latest
fail-fast: false
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- run: echo ${{matrix.folder}} - run: echo ${{matrix.folder}}

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-408-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-411-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">
@@ -721,6 +721,9 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
<tr> <tr>
<td align="center"><a href="https://github.com/jeliasson"><img src="https://avatars.githubusercontent.com/u/865493?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Johan Eliasson</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jeliasson" title="Documentation">📖</a></td> <td align="center"><a href="https://github.com/jeliasson"><img src="https://avatars.githubusercontent.com/u/865493?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Johan Eliasson</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jeliasson" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/jafarlihi"><img src="https://avatars.githubusercontent.com/u/43515211?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hikmat Jafarli</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jafarlihi" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=jafarlihi" title="Code">💻</a></td> <td align="center"><a href="https://github.com/jafarlihi"><img src="https://avatars.githubusercontent.com/u/43515211?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hikmat Jafarli</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jafarlihi" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=jafarlihi" title="Code">💻</a></td>
<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>
</tr> </tr>
</table> </table>

View File

@@ -1,5 +1,28 @@
# next-blitz-auth # next-blitz-auth
## 0.1.1-beta.2
### Patch Changes
- Updated dependencies [e82a79be5]
- Updated dependencies [38d945a3f]
- @blitzjs/auth@2.0.0-beta.26
- @blitzjs/next@2.0.0-beta.26
- @blitzjs/rpc@2.0.0-beta.26
- blitz@2.0.0-beta.26
- @blitzjs/config@2.0.0-beta.26
## 0.1.1-beta.1
### Patch Changes
- Updated dependencies [f84d77a42]
- @blitzjs/rpc@2.0.0-beta.25
- @blitzjs/next@2.0.0-beta.25
- @blitzjs/auth@2.0.0-beta.25
- @blitzjs/config@2.0.0-beta.25
- blitz@2.0.0-beta.25
## 0.1.1-beta.0 ## 0.1.1-beta.0
### Patch Changes ### Patch Changes

View File

@@ -1,6 +1,6 @@
{ {
"name": "next-blitz-auth", "name": "next-blitz-auth",
"version": "0.1.1-beta.0", "version": "0.1.1-beta.2",
"private": true, "private": true,
"scripts": { "scripts": {
"blitz:dev": "next dev", "blitz:dev": "next dev",
@@ -19,7 +19,7 @@
"@tanstack/react-query": "4.0.10", "@tanstack/react-query": "4.0.10",
"blitz": "workspace:*", "blitz": "workspace:*",
"flatted": "3.2.7", "flatted": "3.2.7",
"next": "13.2.4", "next": "13.3.0",
"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

@@ -30,8 +30,8 @@
"@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": "workspace:2.0.0-beta.24", "blitz": "workspace:2.0.0-beta.26",
"next": "13.2.4", "next": "13.3.0",
"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

@@ -31,8 +31,8 @@
"@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": "workspace:2.0.0-beta.24", "blitz": "workspace:2.0.0-beta.26",
"next": "13.2.4", "next": "13.3.0",
"next-auth": "4.18.7", "next-auth": "4.18.7",
"prisma": "4.6.1", "prisma": "4.6.1",
"react": "18.2.0", "react": "18.2.0",

View File

@@ -26,7 +26,7 @@
"blitz": "workspace:*", "blitz": "workspace:*",
"jest": "29.3.0", "jest": "29.3.0",
"jest-environment-jsdom": "29.3.0", "jest-environment-jsdom": "29.3.0",
"next": "13.2.4", "next": "13.3.0",
"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": "workspace:2.0.0-beta.24", "@blitzjs/auth": "workspace:2.0.0-beta.26",
"@blitzjs/config": "workspace:2.0.0-beta.24", "@blitzjs/config": "workspace:2.0.0-beta.26",
"@blitzjs/next": "workspace:2.0.0-beta.24", "@blitzjs/next": "workspace:2.0.0-beta.26",
"@blitzjs/rpc": "workspace:2.0.0-beta.24", "@blitzjs/rpc": "workspace:2.0.0-beta.26",
"@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": "workspace:2.0.0-beta.24", "blitz": "workspace:2.0.0-beta.26",
"delay": "5.0.0", "delay": "5.0.0",
"next": "13.2.4", "next": "13.3.0",
"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

@@ -15,7 +15,8 @@ let appPort: number
const runTests = () => { const runTests = () => {
describe("Auth", () => { describe("Auth", () => {
describe("custom plugin", () => { /* TODO - Add a non flaky Integration Test for custom plugin
describe("custom plugin", () => {
it("custom plugin - events", async () => { it("custom plugin - events", async () => {
const browser = await webdriver(appPort, "/custom-plugin") const browser = await webdriver(appPort, "/custom-plugin")
let text = await browser.elementByCss("#page").text() let text = await browser.elementByCss("#page").text()
@@ -34,7 +35,7 @@ const runTests = () => {
await waitFor(100) await waitFor(100)
let text = await browser.elementByCss("#before-req").text() let text = await browser.elementByCss("#before-req").text()
expect(text).toBe("customHeaderValue") expect(text).toBe("customHeaderValue")
await waitFor(1000) await waitFor(2000)
text = await browser.elementByCss("#before-res").text() text = await browser.elementByCss("#before-res").text()
expect(text).toBe("55") expect(text).toBe("55")
if (browser) { if (browser) {
@@ -42,6 +43,7 @@ const runTests = () => {
} }
}) })
}) })
*/
describe("unauthenticated", () => { describe("unauthenticated", () => {
it("should render result for open query", async () => { it("should render result for open query", async () => {
const browser = await webdriver(appPort, "/noauth-query") const browser = await webdriver(appPort, "/noauth-query")

View File

@@ -17,13 +17,13 @@
"prisma:studio": "prisma studio" "prisma:studio": "prisma studio"
}, },
"dependencies": { "dependencies": {
"@blitzjs/auth": "workspace:2.0.0-beta.24", "@blitzjs/auth": "workspace:2.0.0-beta.26",
"@blitzjs/config": "workspace:2.0.0-beta.24", "@blitzjs/config": "workspace:2.0.0-beta.26",
"@blitzjs/next": "workspace:2.0.0-beta.24", "@blitzjs/next": "workspace:2.0.0-beta.26",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "workspace:2.0.0-beta.24", "blitz": "workspace:2.0.0-beta.26",
"lowdb": "3.0.0", "lowdb": "3.0.0",
"next": "13.2.4", "next": "13.3.0",
"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": "workspace:2.0.0-beta.24", "@blitzjs/auth": "workspace:2.0.0-beta.26",
"@blitzjs/next": "workspace:2.0.0-beta.24", "@blitzjs/next": "workspace:2.0.0-beta.26",
"@blitzjs/rpc": "workspace:2.0.0-beta.24", "@blitzjs/rpc": "workspace:2.0.0-beta.26",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "workspace:2.0.0-beta.24", "blitz": "workspace:2.0.0-beta.26",
"lowdb": "3.0.0", "lowdb": "3.0.0",
"next": "13.2.4", "next": "13.3.0",
"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": "workspace:2.0.0-beta.24", "@blitzjs/config": "workspace:2.0.0-beta.26",
"@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": "workspace:2.0.0-beta.24", "@blitzjs/config": "workspace:2.0.0-beta.26",
"@blitzjs/next": "workspace:2.0.0-beta.24", "@blitzjs/next": "workspace:2.0.0-beta.26",
"@blitzjs/rpc": "workspace:2.0.0-beta.24", "@blitzjs/rpc": "workspace:2.0.0-beta.26",
"blitz": "workspace:2.0.0-beta.24", "blitz": "workspace:2.0.0-beta.26",
"next": "13.2.4", "next": "13.3.0",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0" "react-dom": "18.2.0"
}, },

View File

@@ -17,14 +17,14 @@
"prisma:studio": "prisma studio" "prisma:studio": "prisma studio"
}, },
"dependencies": { "dependencies": {
"@blitzjs/auth": "workspace:2.0.0-beta.24", "@blitzjs/auth": "workspace:2.0.0-beta.26",
"@blitzjs/config": "workspace:2.0.0-beta.24", "@blitzjs/config": "workspace:2.0.0-beta.26",
"@blitzjs/next": "workspace:2.0.0-beta.24", "@blitzjs/next": "workspace:2.0.0-beta.26",
"@blitzjs/rpc": "workspace:2.0.0-beta.24", "@blitzjs/rpc": "workspace:2.0.0-beta.26",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "workspace:2.0.0-beta.24", "blitz": "workspace:2.0.0-beta.26",
"lowdb": "3.0.0", "lowdb": "3.0.0",
"next": "13.2.4", "next": "13.3.0",
"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 @@
"prisma:studio": "prisma studio" "prisma:studio": "prisma studio"
}, },
"dependencies": { "dependencies": {
"@blitzjs/auth": "workspace:2.0.0-beta.24", "@blitzjs/auth": "workspace:2.0.0-beta.26",
"@blitzjs/next": "workspace:2.0.0-beta.24", "@blitzjs/next": "workspace:2.0.0-beta.26",
"@blitzjs/rpc": "workspace:2.0.0-beta.24", "@blitzjs/rpc": "workspace:2.0.0-beta.26",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "workspace:2.0.0-beta.24", "blitz": "workspace:2.0.0-beta.26",
"lowdb": "3.0.0", "lowdb": "3.0.0",
"next": "13.2.4", "next": "13.3.0",
"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": "workspace:2.0.0-beta.24", "@blitzjs/config": "workspace:2.0.0-beta.26",
"@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": "workspace:2.0.0-beta.24", "@blitzjs/auth": "workspace:2.0.0-beta.26",
"@blitzjs/config": "workspace:2.0.0-beta.24", "@blitzjs/config": "workspace:2.0.0-beta.26",
"@blitzjs/next": "workspace:2.0.0-beta.24", "@blitzjs/next": "workspace:2.0.0-beta.26",
"@blitzjs/rpc": "workspace:2.0.0-beta.24", "@blitzjs/rpc": "workspace:2.0.0-beta.26",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"@tanstack/react-query": "4.0.10", "@tanstack/react-query": "4.0.10",
"blitz": "workspace:2.0.0-beta.24", "blitz": "workspace:2.0.0-beta.26",
"next": "13.2.4", "next": "13.3.0",
"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": "workspace:2.0.0-beta.24", "@blitzjs/next": "workspace:2.0.0-beta.26",
"@blitzjs/rpc": "workspace:2.0.0-beta.24", "@blitzjs/rpc": "workspace:2.0.0-beta.26",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "workspace:2.0.0-beta.24", "blitz": "workspace:2.0.0-beta.26",
"lowdb": "3.0.0", "lowdb": "3.0.0",
"next": "13.2.4", "next": "13.3.0",
"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": "workspace:2.0.0-beta.24", "@blitzjs/config": "workspace:2.0.0-beta.26",
"@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": "workspace:2.0.0-beta.24", "@blitzjs/config": "workspace:2.0.0-beta.26",
"@blitzjs/next": "workspace:2.0.0-beta.24", "@blitzjs/next": "workspace:2.0.0-beta.26",
"@blitzjs/rpc": "workspace:2.0.0-beta.24", "@blitzjs/rpc": "workspace:2.0.0-beta.26",
"blitz": "workspace:2.0.0-beta.24", "blitz": "workspace:2.0.0-beta.26",
"next": "13.2.4", "next": "13.3.0",
"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": "workspace:2.0.0-beta.24", "@blitzjs/config": "workspace:2.0.0-beta.26",
"@blitzjs/next": "workspace:2.0.0-beta.24", "@blitzjs/next": "workspace:2.0.0-beta.26",
"@blitzjs/rpc": "workspace:2.0.0-beta.24", "@blitzjs/rpc": "workspace:2.0.0-beta.26",
"blitz": "workspace:2.0.0-beta.24", "blitz": "workspace:2.0.0-beta.26",
"next": "13.2.4", "next": "13.3.0",
"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": "workspace:2.0.0-beta.24", "@blitzjs/auth": "workspace:2.0.0-beta.26",
"@blitzjs/next": "workspace:2.0.0-beta.24", "@blitzjs/next": "workspace:2.0.0-beta.26",
"@blitzjs/rpc": "workspace:2.0.0-beta.24", "@blitzjs/rpc": "workspace:2.0.0-beta.26",
"@prisma/client": "4.6.1", "@prisma/client": "4.6.1",
"blitz": "workspace:2.0.0-beta.24", "blitz": "workspace:2.0.0-beta.26",
"lowdb": "3.0.0", "lowdb": "3.0.0",
"next": "13.2.4", "next": "13.3.0",
"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": "workspace:2.0.0-beta.24", "@blitzjs/config": "workspace:2.0.0-beta.26",
"@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

@@ -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": "13.2.4", "next": "13.3.0",
"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",

View File

@@ -1,5 +1,20 @@
# @blitzjs/auth # @blitzjs/auth
## 2.0.0-beta.26
### Patch Changes
- e82a79be5: Update the version of next in the new template from 13.2 to 13.3.0
- Updated dependencies [e82a79be5]
- Updated dependencies [38d945a3f]
- blitz@2.0.0-beta.26
## 2.0.0-beta.25
### Patch Changes
- blitz@2.0.0-beta.25
## 2.0.0-beta.24 ## 2.0.0-beta.24
### Major Changes ### Major Changes

View File

@@ -1,6 +1,6 @@
{ {
"name": "@blitzjs/auth", "name": "@blitzjs/auth",
"version": "2.0.0-beta.24", "version": "2.0.0-beta.26",
"homepage": "https://blitzjs.com/", "homepage": "https://blitzjs.com/",
"repository": { "repository": {
"type": "git", "type": "git",
@@ -23,7 +23,8 @@
"license": "MIT", "license": "MIT",
"files": [ "files": [
"dist/**", "dist/**",
"secure-password.*" "secure-password.*",
"next-auth.*"
], ],
"dependencies": { "dependencies": {
"@types/b64-lite": "1.3.0", "@types/b64-lite": "1.3.0",
@@ -47,7 +48,7 @@
"url": "0.11.0" "url": "0.11.0"
}, },
"peerDependencies": { "peerDependencies": {
"blitz": "2.0.0-beta.24", "blitz": "2.0.0-beta.26",
"next": "*", "next": "*",
"next-auth": "*", "next-auth": "*",
"secure-password": "4.0.0" "secure-password": "4.0.0"
@@ -64,7 +65,7 @@
} }
}, },
"devDependencies": { "devDependencies": {
"@blitzjs/config": "workspace:2.0.0-beta.24", "@blitzjs/config": "workspace:2.0.0-beta.26",
"@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",
@@ -72,8 +73,8 @@
"@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.0-beta.24", "blitz": "2.0.0-beta.26",
"next": "13.2.4", "next": "13.3.0",
"next-auth": "4.18.7", "next-auth": "4.18.7",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",

View File

@@ -1,5 +1,23 @@
# @blitzjs/next # @blitzjs/next
## 2.0.0-beta.26
### Patch Changes
- e82a79be5: Update the version of next in the new template from 13.2 to 13.3.0
- Updated dependencies [e82a79be5]
- Updated dependencies [38d945a3f]
- @blitzjs/rpc@2.0.0-beta.26
- blitz@2.0.0-beta.26
## 2.0.0-beta.25
### Patch Changes
- Updated dependencies [f84d77a42]
- @blitzjs/rpc@2.0.0-beta.25
- blitz@2.0.0-beta.25
## 2.0.0-beta.24 ## 2.0.0-beta.24
### Minor Changes ### Minor Changes

View File

@@ -1,6 +1,6 @@
{ {
"name": "@blitzjs/next", "name": "@blitzjs/next",
"version": "2.0.0-beta.24", "version": "2.0.0-beta.26",
"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.0-beta.24", "@blitzjs/rpc": "2.0.0-beta.26",
"@types/hoist-non-react-statics": "3.3.1", "@types/hoist-non-react-statics": "3.3.1",
"debug": "4.3.3", "debug": "4.3.3",
"fs-extra": "10.0.1", "fs-extra": "10.0.1",
@@ -38,12 +38,12 @@
"supports-color": "8.1.1" "supports-color": "8.1.1"
}, },
"peerDependencies": { "peerDependencies": {
"blitz": "2.0.0-beta.24", "blitz": "2.0.0-beta.26",
"next": "*", "next": "*",
"react": "*" "react": "*"
}, },
"devDependencies": { "devDependencies": {
"@blitzjs/config": "workspace:2.0.0-beta.24", "@blitzjs/config": "workspace:2.0.0-beta.26",
"@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",
@@ -53,10 +53,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.0-beta.24", "blitz": "2.0.0-beta.26",
"cross-spawn": "7.0.3", "cross-spawn": "7.0.3",
"find-up": "4.1.0", "find-up": "4.1.0",
"next": "13.2.4", "next": "13.3.0",
"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

@@ -1,5 +1,21 @@
# @blitzjs/rpc # @blitzjs/rpc
## 2.0.0-beta.26
### Patch Changes
- e82a79be5: Update the version of next in the new template from 13.2 to 13.3.0
- Updated dependencies [e82a79be5]
- Updated dependencies [38d945a3f]
- blitz@2.0.0-beta.26
## 2.0.0-beta.25
### Patch Changes
- f84d77a42: Fix return type of the `invoke` method from returning type function to return the type of resolved data
- blitz@2.0.0-beta.25
## 2.0.0-beta.24 ## 2.0.0-beta.24
### Minor Changes ### Minor Changes

View File

@@ -1,6 +1,6 @@
{ {
"name": "@blitzjs/rpc", "name": "@blitzjs/rpc",
"version": "2.0.0-beta.24", "version": "2.0.0-beta.26",
"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.0-beta.24", "blitz": "2.0.0-beta.26",
"next": "*", "next": "*",
"react": "*" "react": "*"
}, },
"devDependencies": { "devDependencies": {
"@blitzjs/auth": "2.0.0-beta.24", "@blitzjs/auth": "2.0.0-beta.26",
"@blitzjs/config": "workspace:2.0.0-beta.24", "@blitzjs/config": "workspace:2.0.0-beta.26",
"@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.0-beta.24", "blitz": "2.0.0-beta.26",
"next": "13.2.4", "next": "13.3.0",
"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

@@ -4,17 +4,17 @@ import {RpcClient} from "./rpc"
export async function invoke<T extends (...args: any) => any, TInput = FirstParam<T>>( export async function invoke<T extends (...args: any) => any, TInput = FirstParam<T>>(
queryFn: T, queryFn: T,
params: TInput, params: TInput,
): Promise<T> ): Promise<PromiseReturnType<T>>
export async function invoke<T extends (...args: any) => any, TInput = FirstParam<T>>( export async function invoke<T extends (...args: any) => any, TInput = FirstParam<T>>(
queryFn: T, queryFn: T,
params: TInput, params: TInput,
isServer: boolean, isServer: boolean,
): Promise<T> ): Promise<PromiseReturnType<T>>
export async function invoke<T extends (...args: any) => any, TInput = FirstParam<T>>( export async function invoke<T extends (...args: any) => any, TInput = FirstParam<T>>(
queryFn: T, queryFn: T,
params: TInput, params: TInput,
isServer = typeof window === "undefined" ? true : false, isServer = typeof window === "undefined" ? true : false,
): Promise<T> { ): Promise<PromiseReturnType<T>> {
if (typeof queryFn === "undefined") { if (typeof queryFn === "undefined") {
throw new Error( throw new Error(
"invoke is missing the first argument - it must be a query or mutation function", "invoke is missing the first argument - it must be a query or mutation function",
@@ -28,15 +28,15 @@ export async function invoke<T extends (...args: any) => any, TInput = FirstPara
) )
}) })
const ctx = await getBlitzContext() const ctx = await getBlitzContext()
return queryFn(params, ctx) return queryFn(params, ctx) as PromiseReturnType<T>
} }
if (isClient) { if (isClient) {
const fn = queryFn as unknown as RpcClient const fn = queryFn as unknown as RpcClient
return fn(params, {fromInvoke: true}) as ReturnType<T> return fn(params, {fromInvoke: true}) as PromiseReturnType<T>
} else { } else {
const fn = queryFn as unknown as RpcClient const fn = queryFn as unknown as RpcClient
return fn(params) as ReturnType<T> return fn(params) as PromiseReturnType<T>
} }
} }

View File

@@ -1,5 +1,20 @@
# blitz # blitz
## 2.0.0-beta.26
### Patch Changes
- e82a79be5: Update the version of next in the new template from 13.2 to 13.3.0
- 38d945a3f: The issue is that the version provided, "13.2", is not a valid SemVer version. A valid SemVer version must have three components: major, minor, and patch (e.g., "13.2.0").
- Updated dependencies [e82a79be5]
- @blitzjs/generator@2.0.0-beta.26
## 2.0.0-beta.25
### Patch Changes
- @blitzjs/generator@2.0.0-beta.25
## 2.0.0-beta.24 ## 2.0.0-beta.24
### Minor Changes ### Minor Changes

View File

@@ -1,6 +1,6 @@
{ {
"name": "blitz", "name": "blitz",
"version": "2.0.0-beta.24", "version": "2.0.0-beta.26",
"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.0-beta.24", "@blitzjs/generator": "2.0.0-beta.26",
"@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": "workspace:2.0.0-beta.24", "@blitzjs/config": "workspace:2.0.0-beta.26",
"@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

@@ -18,7 +18,8 @@ export const codegenTasks = async () => {
const nextClientIndex = join(nextDir, "../..", "client", "index.js") const nextClientIndex = join(nextDir, "../..", "client", "index.js")
const readFile = await fs.readFile(nextClientIndex) const readFile = await fs.readFile(nextClientIndex)
const packageJson = await getPackageJson() const packageJson = await getPackageJson()
const nextVersion = packageJson.dependencies.next const version = packageJson.dependencies.next
const nextVersion = semver.clean(version, {loose: true}) || semver.valid(semver.coerce(version))
if (nextVersion && /^([~^])?12/.test(nextVersion)) { if (nextVersion && /^([~^])?12/.test(nextVersion)) {
const updatedFile = readFile const updatedFile = readFile

View File

@@ -8,6 +8,7 @@ import resolveFrom from "resolve-from"
import Watchpack from "watchpack" import Watchpack from "watchpack"
import {isInternalBlitzMonorepoDevelopment} from "./helpers" import {isInternalBlitzMonorepoDevelopment} from "./helpers"
import {findNodeModulesRoot} from "./find-node-modules" import {findNodeModulesRoot} from "./find-node-modules"
const debug = require("debug")("blitz")
export const CONFIG_FILE = ".blitz.config.compiled.js" export const CONFIG_FILE = ".blitz.config.compiled.js"
export const NEXT_CONFIG_FILE = "next.config.js" export const NEXT_CONFIG_FILE = "next.config.js"
export const PHASE_PRODUCTION_SERVER = "phase-production-server" export const PHASE_PRODUCTION_SERVER = "phase-production-server"
@@ -160,7 +161,7 @@ export const loadConfig = (pagesDir: string) => {
// eslint-disable-next-line no-eval -- block webpack from following this module path // eslint-disable-next-line no-eval -- block webpack from following this module path
userConfigModule = eval("require")(path) userConfigModule = eval("require")(path)
} catch { } catch {
console.log("Did not find custom config file") debug("Did not find custom config file")
// In case user does not have custom config // In case user does not have custom config
userConfigModule = {} userConfigModule = {}
} }

View File

@@ -18,14 +18,28 @@ function getBlitzPath(type: string) {
} }
} }
function getAppSourceDir() {
const srcPath = "src/pages"
const srcDir = fs.existsSync(path.resolve(srcPath))
if (srcDir) {
return "src"
} else {
return "app"
}
}
function findPageDir() { function findPageDir() {
const srcPagePath = `src/pages` const srcPagePath = `src/pages`
const srcPage = fs.existsSync(path.resolve(srcPagePath)) const srcPage = getAppSourceDir()
if (srcPage) { switch (srcPage) {
return srcPagePath case "src": {
} else { return srcPagePath
return `pages` }
default: {
return `pages`
}
} }
} }
@@ -36,6 +50,9 @@ export const paths = {
app() { app() {
return `${findPageDir()}/_app${ext(true)}` return `${findPageDir()}/_app${ext(true)}`
}, },
appSrcDirectory() {
return getAppSourceDir()
},
blitzServer() { blitzServer() {
return getBlitzPath("server") return getBlitzPath("server")
}, },

View File

@@ -1,5 +1,21 @@
# @blitzjs/codemod # @blitzjs/codemod
## 2.0.0-beta.26
### Patch Changes
- Updated dependencies [e82a79be5]
- Updated dependencies [38d945a3f]
- blitz@2.0.0-beta.26
- @blitzjs/generator@2.0.0-beta.26
## 2.0.0-beta.25
### Patch Changes
- @blitzjs/generator@2.0.0-beta.25
- blitz@2.0.0-beta.25
## 2.0.0-beta.24 ## 2.0.0-beta.24
### Minor Changes ### Minor Changes

View File

@@ -1,6 +1,6 @@
{ {
"name": "@blitzjs/codemod", "name": "@blitzjs/codemod",
"version": "2.0.0-beta.24", "version": "2.0.0-beta.26",
"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.0-beta.24", "@blitzjs/generator": "2.0.0-beta.26",
"arg": "5.0.1", "arg": "5.0.1",
"blitz": "2.0.0-beta.24", "blitz": "2.0.0-beta.26",
"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",

View File

@@ -1,5 +1,9 @@
# @blitzjs/config # @blitzjs/config
## 2.0.0-beta.26
## 2.0.0-beta.25
## 2.0.0-beta.24 ## 2.0.0-beta.24
## 2.0.0-beta.23 ## 2.0.0-beta.23

View File

@@ -1,7 +1,7 @@
{ {
"name": "@blitzjs/config", "name": "@blitzjs/config",
"private": true, "private": true,
"version": "2.0.0-beta.24", "version": "2.0.0-beta.26",
"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,13 @@
# @blitzjs/generator # @blitzjs/generator
## 2.0.0-beta.26
### Patch Changes
- e82a79be5: Update the version of next in the new template from 13.2 to 13.3.0
## 2.0.0-beta.25
## 2.0.0-beta.24 ## 2.0.0-beta.24
### Patch Changes ### Patch Changes

View File

@@ -1,6 +1,6 @@
{ {
"name": "@blitzjs/generator", "name": "@blitzjs/generator",
"version": "2.0.0-beta.24", "version": "2.0.0-beta.26",
"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.0-beta.24", "@blitzjs/config": "2.0.0-beta.26",
"@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

@@ -27,7 +27,7 @@ export const LabeledSelectField = forwardRef<HTMLSelectElement, LabeledSelectFie
<label> <label>
{label} {label}
<select {...input} disabled={submitting} {...props} ref={ref}> <select {...input} disabled={submitting} {...props} ref={ref}>
{options && options.map((value) => <option value={value.id}>{value[name]}</option>)} {options && options.map((value) => <option key={value.id} value={value.id}>{value[name]}</option>)}
</select> </select>
</label> </label>
@@ -57,4 +57,4 @@ export const LabeledSelectField = forwardRef<HTMLSelectElement, LabeledSelectFie
} }
) )
export default LabeledSelectField export default LabeledSelectField

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.2", "next": "^13.3.0",
"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.2", "next": "^13.3.0",
"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

@@ -20,7 +20,7 @@
"dependencies": { "dependencies": {
"@blitzjs/next": "latest", "@blitzjs/next": "latest",
"blitz": "latest", "blitz": "latest",
"next": "13.2", "next": "^13.3.0",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"ts-node": "10.9.1" "ts-node": "10.9.1"

View File

@@ -20,7 +20,7 @@
"dependencies": { "dependencies": {
"@blitzjs/next": "latest", "@blitzjs/next": "latest",
"blitz": "latest", "blitz": "latest",
"next": "13.2", "next": "^13.3.0",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"ts-node": "10.9.1" "ts-node": "10.9.1"

View File

@@ -25,7 +25,7 @@
"@typescript-eslint/parser": "5.9.1" "@typescript-eslint/parser": "5.9.1"
}, },
"devDependencies": { "devDependencies": {
"@blitzjs/config": "2.0.0-beta.24", "@blitzjs/config": "2.0.0-beta.26",
"@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",

669
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.0-beta.24", "blitz": "2.0.0-beta.26",
"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.0-beta.24", "blitz": "2.0.0-beta.26",
"jscodeshift": "0.13.0" "jscodeshift": "0.13.0"
}, },
"devDependencies": { "devDependencies": {

View File

@@ -1,5 +1,4 @@
import {addImport, paths, Program, RecipeBuilder} from "blitz/installer" import {addImport, paths, Program, RecipeBuilder} from "blitz/installer"
import type {NodePath} from "ast-types/lib/node-path"
import j from "jscodeshift" import j from "jscodeshift"
function wrapComponentWithBumbagProvider(program: Program) { function wrapComponentWithBumbagProvider(program: Program) {

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.0-beta.24", "blitz": "2.0.0-beta.26",
"jscodeshift": "0.13.0" "jscodeshift": "0.13.0"
}, },
"devDependencies": { "devDependencies": {

View File

@@ -139,7 +139,7 @@ export default RecipeBuilder()
stepId: "updateLabeledTextField", stepId: "updateLabeledTextField",
stepName: "Update the `LabeledTextField` with Chakra UI's `Input` component", stepName: "Update the `LabeledTextField` with Chakra UI's `Input` component",
explanation: `The LabeledTextField component uses Chakra UI's input component`, explanation: `The LabeledTextField component uses Chakra UI's input component`,
singleFileSearch: "src/core/components/LabeledTextField.tsx", singleFileSearch: `${paths.appSrcDirectory()}/core/components/LabeledTextField.tsx`,
transform(program) { transform(program) {
// Add ComponentPropsWithoutRef import // Add ComponentPropsWithoutRef import
program.find(j.ImportDeclaration, {source: {value: "react"}}).forEach((path) => { program.find(j.ImportDeclaration, {source: {value: "react"}}).forEach((path) => {

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.0-beta.24", "blitz": "2.0.0-beta.26",
"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.0-beta.24", "blitz": "2.0.0-beta.26",
"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.0-beta.24" "blitz": "2.0.0-beta.26"
} }
} }

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.0-beta.24" "blitz": "2.0.0-beta.26"
} }
} }

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.0-beta.24", "blitz": "2.0.0-beta.26",
"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.0-beta.24", "blitz": "2.0.0-beta.26",
"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.0-beta.24", "blitz": "2.0.0-beta.26",
"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.0-beta.24", "blitz": "2.0.0-beta.26",
"jscodeshift": "0.13.0" "jscodeshift": "0.13.0"
}, },
"devDependencies": { "devDependencies": {

View File

@@ -111,7 +111,7 @@ export default RecipeBuilder()
stepId: "updateLabeledTextField", stepId: "updateLabeledTextField",
stepName: "Update the `LabeledTextField` with Next UI's `Input` component", stepName: "Update the `LabeledTextField` with Next UI's `Input` component",
explanation: `The LabeledTextField component uses Next UI's input component`, explanation: `The LabeledTextField component uses Next UI's input component`,
singleFileSearch: "src/core/components/LabeledTextField.tsx", singleFileSearch: `${paths.appSrcDirectory()}/core/components/LabeledTextField.tsx`,
transform(program) { transform(program) {
// Add ComponentPropsWithoutRef import // Add ComponentPropsWithoutRef import
program.find(j.ImportDeclaration, {source: {value: "react"}}).forEach((path) => { program.find(j.ImportDeclaration, {source: {value: "react"}}).forEach((path) => {

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.0-beta.24", "blitz": "2.0.0-beta.26",
"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.0-beta.24" "blitz": "2.0.0-beta.26"
} }
} }

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.0-beta.24" "blitz": "2.0.0-beta.26"
} }
} }

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.0-beta.24", "blitz": "2.0.0-beta.26",
"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.0-beta.24" "blitz": "2.0.0-beta.26"
} }
} }

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.0-beta.24", "blitz": "2.0.0-beta.26",
"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.0-beta.24", "blitz": "2.0.0-beta.26",
"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.0-beta.24", "blitz": "2.0.0-beta.26",
"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.0-beta.24", "blitz": "2.0.0-beta.26",
"jscodeshift": "0.13.0" "jscodeshift": "0.13.0"
}, },
"devDependencies": { "devDependencies": {

View File

@@ -1,6 +1,6 @@
// tailwind.config.js // tailwind.config.js
module.exports = { module.exports = {
content: ["{pages,app}/**/*.{js,ts,jsx,tsx}"], content: ["./{src,app,pages}/**/*.{js,ts,jsx,tsx}"],
theme: { theme: {
extend: {}, extend: {},
}, },

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.0-beta.24", "blitz": "2.0.0-beta.26",
"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.0-beta.24", "blitz": "2.0.0-beta.26",
"jscodeshift": "0.13.0" "jscodeshift": "0.13.0"
}, },
"devDependencies": { "devDependencies": {