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

Compare commits

..

1 Commits

Author SHA1 Message Date
Dillon Raphael
653dac8a68 fix routes for finding blitz in node_modules 2022-08-02 14:16:52 -04:00
185 changed files with 1171 additions and 4281 deletions

View File

@@ -971,8 +971,7 @@
"profile": "https://twitter.com/dillonraphael",
"contributions": [
"code",
"doc",
"test"
"doc"
]
},
{
@@ -3650,68 +3649,6 @@
"doc",
"code"
]
},
{
"login": "chaiwattsw",
"name": "Chaiwat Trisuwan",
"avatar_url": "https://avatars.githubusercontent.com/u/30198386?v=4",
"profile": "https://chaiwattsw.com/",
"contributions": [
"doc",
"code"
]
},
{
"login": "oltdaniel",
"name": "Daniel Oltmanns",
"avatar_url": "https://avatars.githubusercontent.com/u/53529846?v=4",
"profile": "oltdaniel.eu",
"contributions": [
"doc",
"code"
]
},
{
"login": "edrickleong",
"name": "Edrick Leong",
"avatar_url": "https://avatars.githubusercontent.com/u/10529706?v=4",
"profile": "https://github.com/edrickleong",
"contributions": [
"doc",
"code",
"test"
]
},
{
"login": "siddhsuresh",
"name": "Siddharth Suresh",
"avatar_url": "https://avatars.githubusercontent.com/u/83594610?v=4",
"profile": "https://github.com/siddhsuresh",
"contributions": [
"doc",
"code"
]
},
{
"login": "orionmiz",
"name": "JH.Lee",
"avatar_url": "https://avatars.githubusercontent.com/u/39466936?v=4",
"profile": "http://jins.dev",
"contributions": [
"code",
"test",
"maintenance",
"doc"
]
},
{
"login": "corydeppen",
"name": "Cory Deppen",
"avatar_url": "https://avatars.githubusercontent.com/u/313264?v=4",
"profile": "https://github.com/corydeppen",
"contributions": [
"doc"
]
}
],
"contributorsPerLine": 7,

View File

@@ -1,13 +0,0 @@
---
"blitz": patch
"@blitzjs/auth": patch
"@blitzjs/next": patch
"@blitzjs/rpc": patch
"@blitzjs/codemod": patch
"@blitzjs/config": patch
"@blitzjs/generator": patch
---
Bump react, react-dom, @types/react and next versions
This fixes a console warning: `Warning: Received `true` for a non-boolean attribute `global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/codemod": patch
---
Throw error if cookiePrefix is undefined when running codemod

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/generator": patch
---
Print model added or updated in schema.prisma after running model generator

View File

@@ -1,6 +0,0 @@
---
"blitz": patch
"@blitzjs/generator": patch
---
Add back blitz generate command

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/generator": patch
---
Include `.env.test` file to the generator templates

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/generator": patch
---
Add `BlitzPage` type to Home pages in app templates

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/next": patch
---
Allow using `RouteUrlObject` as `redirect.destination` in `getStaticProps` and `getServerSideProps`

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/codemod": patch
---
Add DocumentProps & DocumentContext to the codemod import map

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/codemod": patch
---
Wrap middlewares with BlitzServerMiddleware function with codemod

View File

@@ -1,5 +0,0 @@
---
"blitz": patch
---
Comment out generate command import until we add the full support back

View File

@@ -1,5 +0,0 @@
---
"blitz": patch
---
Fixes loading production env variables by default for blitz build command

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/generator": patch
---
Use correct path for log utilities import

View File

@@ -1,5 +0,0 @@
---
"blitz": patch
---
Prevent `Minified react error #419` in production

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/codemod": patch
---
Change ES6 import for `withBlitz` during the codemod to the require syntax.

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/generator": patch
---
Add vscode debugging configuration to new app templates

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/generator": patch
---
Add `BlitzPage` types to auth pages in new app template

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/next": patch
---
Avoid `invalid config detected` warnings by deleting `"blitz"` key from next config object

View File

@@ -1,6 +0,0 @@
---
"@blitzjs/rpc": patch
"blitz": patch
---
Use internal branded blitz logger for @blitzjs/rpc

View File

@@ -1,5 +0,0 @@
---
"blitz": patch
---
Add BlitzServerMiddleware utility function to wrap middleware in blitz server file

View File

@@ -1,5 +0,0 @@
---
"blitz": patch
---
Runs the codegen on the blitz build command

View File

@@ -1,5 +0,0 @@
---
"blitz": patch
---
Run codegen tasks on blitz dev command

View File

@@ -1,5 +0,0 @@
---
"blitz": patch
---
Patch Next.js Suspense issue in all node environments. Previously we only patched it in the `development` environment, but now we make sure it gets patched in the `production` env (with the `blitz build` command) as well.

View File

@@ -1,5 +0,0 @@
---
"blitz": patch
---
Run `prisma generate` as a `blitz codegen` step if "prisma" is found in project's dependencies

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/generator": patch
---
Add type checking to next.config.js files in new app templates

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/generator": patch
---
Include ResetPasswordPage in new app template

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/codemod": patch
---
Remove trailing comma when removing BlitzConfig from next.config.js & Fix codemod so if route (eg. `app/auth/pages`) convert to (eg. `pages/`) instead of (eg. `pages/auth`)

View File

@@ -1,6 +0,0 @@
---
"blitz": patch
"@blitzjs/generator": patch
---
Improve `blitz new` messaging and fix minor issues

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/codemod": patch
---
Fix upgrade-legacy codemod replacing identifiers with an invalid value. Previously new values were hardcoded to `NextApiRequest`. Now we're using correct values provided as `replaceIdentifiers` function argument.

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/codemod": patch
---
Wrap `blitz.config.ts` with the `withBlitz` function during the codemod step instead of creating a blank `next.config.js` file.

View File

@@ -1,10 +0,0 @@
---
"@blitzjs/codemod": patch
"@blitzjs/generator": patch
"@blitzjs/auth": patch
"@blitzjs/next": patch
"@blitzjs/rpc": patch
"@blitzjs/config": patch
---
Set current Blitz tag to latest

View File

@@ -1,92 +1,65 @@
{
"mode": "pre",
"tag": "beta",
"tag": "alpha",
"initialVersions": {
"web": "0.0.0",
"test-auth": "0.0.0",
"test-rpc": "0.0.0",
"test-utils": "0.0.0",
"blitz": "2.0.0-beta.0",
"@blitzjs/auth": "2.0.0-beta.0",
"@blitzjs/next": "2.0.0-beta.0",
"@blitzjs/rpc": "2.0.0-beta.0",
"blitz": "2.0.0-alpha.0",
"@blitzjs/auth": "2.0.0-alpha.0",
"@blitzjs/next": "2.0.0-alpha.0",
"@blitzjs/rpc": "2.0.0-alpha.0",
"@blitzjs/config": "0.0.0",
"@blitzjs/generator": "2.0.0-beta.0",
"@blitzjs/codemod": "2.0.0-beta.0",
"@blitzjs/generator": "2.0.0-alpha.0",
"@blitzjs/codemod": "2.0.0-alpha.0",
"template": "0.0.0",
"toolkit-app": "1.0.0",
"test-qm": "0.0.0",
"test-no-suspense": "0.0.0",
"test-trailing-slash": "0.0.0",
"test-middleware": "0.0.0",
"test-react-query-utils": "0.0.0"
"test-middleware": "0.0.0"
},
"changesets": [
"afraid-dancers-juggle",
"big-phones-bow",
"blue-pigs-tan",
"breezy-cameras-double",
"breezy-moose-behave",
"bright-mangos-run",
"brown-avocados-wink",
"calm-carpets-deny",
"calm-horses-tie",
"calm-nails-wait",
"calm-tomatoes-drive",
"chilled-carrots-own",
"clean-hats-pump",
"clean-walls-wink",
"clever-radios-lie",
"cool-doors-invent",
"cool-horses-check",
"cuddly-pugs-crash",
"curly-rules-speak",
"curly-seas-serve",
"dirty-monkeys-greet",
"dirty-planets-chew",
"eleven-humans-sort",
"empty-berries-rule",
"empty-turkeys-wave",
"fair-carrots-guess",
"fair-wombats-sneeze",
"famous-kings-explain",
"fast-trainers-kneel",
"few-dogs-fetch",
"flat-bees-approve",
"fluffy-mangos-begin",
"forty-timers-rhyme",
"four-brooms-juggle",
"four-meals-fry",
"four-sheep-judge",
"fuzzy-bees-warn",
"fuzzy-jars-admire",
"gentle-dogs-reply",
"gold-horses-punch",
"good-apes-drum",
"good-insects-wink",
"gorgeous-birds-warn",
"gorgeous-buses-scream",
"gorgeous-games-obey",
"great-candles-stare",
"great-months-train",
"great-terms-rescue",
"green-papayas-do",
"green-pillows-hammer",
"happy-hotels-visit",
"healthy-rice-shout",
"heavy-apes-judge",
"hot-cups-rhyme",
"hot-drinks-approve",
"hungry-baboons-swim",
"kind-walls-suffer",
"late-steaks-give",
"lazy-maps-sort",
"lemon-games-press",
"lemon-seas-push",
"light-donkeys-double",
"long-bees-hope",
"long-lobsters-drop",
"lovely-berries-sell",
"lovely-colts-share",
"lucky-cows-try",
"mean-gorillas-reply",
@@ -103,53 +76,37 @@
"nine-onions-admire",
"ninety-lies-press",
"ninety-pets-heal",
"ninety-rice-tickle",
"olive-bees-buy",
"olive-feet-rhyme",
"olive-sheep-rhyme",
"orange-zebras-reflect",
"perfect-eyes-repeat",
"perfect-trains-double",
"plenty-bottles-swim",
"polite-lizards-love",
"poor-peas-lick",
"poor-penguins-look",
"poor-shrimps-think",
"poor-walls-relax",
"popular-teachers-pay",
"pretty-games-march",
"purple-donkeys-smash",
"purple-singers-greet",
"quick-cycles-confess",
"quiet-feet-travel",
"quiet-pans-hunt",
"quiet-sloths-rule",
"red-badgers-retire",
"rich-chairs-invent",
"rich-queens-travel",
"rotten-rocks-remember",
"shaggy-carpets-brake",
"sharp-falcons-begin",
"shy-olives-hang",
"shy-pumpkins-try",
"silent-colts-reply",
"silly-apricots-share",
"six-apricots-kick",
"slimy-humans-impress",
"slimy-needles-taste",
"slow-walls-poke",
"small-socks-confess",
"smooth-planets-admire",
"smooth-rice-clap",
"smooth-stingrays-drum",
"smooth-tools-train",
"soft-adults-smell",
"sour-lemons-hunt",
"sour-mails-lick",
"spicy-beds-float",
"spotty-dingos-stare",
"spotty-peas-hope",
"stale-jobs-drum",
"strong-apes-reply",
"stupid-walls-sell",
"sweet-kiwis-cross",
@@ -163,26 +120,19 @@
"tender-pianos-check",
"thick-parrots-float",
"thirty-countries-build",
"three-lies-pull",
"tidy-clouds-smoke",
"tough-toes-pull",
"twelve-hornets-sip",
"twelve-lemons-smile",
"twenty-beans-pump",
"two-carpets-rhyme",
"two-eyes-knock",
"two-kiwis-help",
"two-tigers-type",
"two-turtles-poke",
"unlucky-avocados-fix",
"unlucky-papayas-sleep",
"violet-bags-leave",
"violet-lions-help",
"weak-suns-shave",
"wicked-ghosts-cough",
"wicked-rings-walk",
"wise-eels-visit",
"wise-frogs-give",
"wise-rabbits-complain"
"wise-frogs-give"
]
}

View File

@@ -1,5 +0,0 @@
---
"blitz": patch
---
Exit CLI process after `blitz new` command is finished

View File

@@ -1,8 +0,0 @@
---
"blitz": patch
"@blitzjs/next": patch
"@blitzjs/rpc": patch
"@blitzjs/generator": patch
---
Fixes peer dependency warnings

View File

@@ -1,5 +0,0 @@
---
"blitz": patch
---
Run codegen tasks after creating a new app if user chose yarn as a package manager

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/generator": patch
---
Fix template path for the generator

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/generator": patch
---
Remove trailing comma from tsconfig.json file in the new app template"

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/generator": patch
---
Fix typo in a next.config.js file name

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/generator": patch
---
Add ts-jest to dependencies in new app templates

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/codemod": patch
---
Allow codemod to finish if `cookiePrefix` is undefined. Then show error at the end of running the codemod.

View File

@@ -1,8 +0,0 @@
---
"@blitzjs/auth": patch
"@blitzjs/next": patch
"@blitzjs/rpc": patch
"blitz": patch
"@blitzjs/generator": patch
---
Fixes the supports-color warning for pnpm

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/rpc": patch
---
Add `getQueryData` utility to get an existing query's cached data

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/codemod": patch
---
Add a new codemod step to update the .eslintrc.js file

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/codemod": patch
---
Set correct packages versions in package.json with upgrade-legacy codemod

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/rpc": patch
---
moves zod to devDependencies

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/codemod": patch
---
Fix codemod to accept a self closing `DocumentHead` in the `_document` page

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/codemod": patch
---
Add `Script` as a default import from next.js during the codemod.

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/generator": patch
---
Add `@testing-library/jest-dom` to new app dependecies

View File

@@ -1,11 +0,0 @@
---
"blitz": patch
"@blitzjs/auth": patch
"@blitzjs/next": patch
"@blitzjs/rpc": patch
"@blitzjs/codemod": patch
"@blitzjs/config": patch
"@blitzjs/generator": patch
---
Beta release

View File

@@ -1,5 +0,0 @@
---
"@blitzjs/generator": patch
---
Mocks @blitzjs/auth instead of blitz inside the forgotPassword mutation test & hardcodes blitz package version types instead of just using the alpha tag.

1
.gitignore vendored
View File

@@ -54,6 +54,7 @@ dist
**/.envrc
.blitz-*
.blitz-cli-cache
.vscode
.tsbuildinfo
.nvmrc
**/.test*

View File

@@ -1,6 +1,6 @@
# Contributing
[Read the Contributing Guide at Blitzjs.com](https://blitzjs.com/docs/contributing)
[Read the Contributing Guide at Blitzjs.com](https://alpha.blitzjs.com/docs/contributing)
## To run tests

View File

@@ -6,9 +6,9 @@
<img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
</a>
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-393-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-387-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
<!-- ALL-CONTRIBUTORS-BADGE:END -->
<a aria-label="License" href="https://github.com/blitz-js/blitz/blob/main/LICENSE">
<a aria-label="License" href="https://github.com/blitz-js/blitz/blob/canary/LICENSE">
<img alt="" src="https://img.shields.io/npm/l/blitz.svg?style=for-the-badge&labelColor=000000&color=blue">
</a>
<a aria-label="NPM version" href="https://www.npmjs.com/package/blitz">
@@ -66,16 +66,16 @@ Your financial contributions help ensure Blitz continues to be developed and mai
<table>
<tr>
<td><a aria-label="Andreas Asprou" href="https://andreas.fyi">
<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/andreas.jpg" width="40px"/>
<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/andreas.jpg" width="40px"/>
</a></td>
<td><a aria-label="Digas" href="https://digsas.com">
<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/digsas.svg" width="40px"/>
<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/digsas.svg" width="40px"/>
</a></td>
<td><a aria-label="userTrack" href="https://www.usertrack.net/?ref=blitzjs">
<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/usertrack.png" width="40px"/>
<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/usertrack.png" width="40px"/>
</a></td>
<td><a aria-label="MeetKai" href="https://meetkai.com/?ref=blitzjs">
<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/meetkai.png" width="40px"/>
<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/meetkai.png" width="40px"/>
</a></td>
</tr>
</table>
@@ -85,11 +85,14 @@ Your financial contributions help ensure Blitz continues to be developed and mai
<table>
<tr>
<td><a aria-label="Render.com" href="https://render.com?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2020">
<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/render-logo-color2.png" width="200px">
</a></td>
<td><a aria-label="RIT" href="https://rit-inc.co.jp/?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2021">
<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/rit_logo.png" width="200px">
<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/rit_logo.png" width="200px">
</a></td>
<td><a aria-label="Boostry" href="https://boostry.co.jp/?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2021">
<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/boostry.svg" width="200px">
<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/boostry.svg" width="200px">
</a></td>
</tr>
</table>
@@ -102,7 +105,7 @@ Your financial contributions help ensure Blitz continues to be developed and mai
<tr>
<td>
<a aria-label="Fauna" href="https://dashboard.fauna.com/accounts/register?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2020">
<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/Fauna_Logo_Blue.png" width="300px">
<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/Fauna_Logo_Blue.png" width="300px">
</a>
</td>
</tr>
@@ -116,13 +119,9 @@ Your financial contributions help ensure Blitz continues to be developed and mai
### 💎 Diamond Sponsors
<table>
<tr>
<a aria-label="Flightcontrol" href="https://www.flightcontrol.dev?ref=blitzjs">
<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/flightcontrol.png" width="400px">
</a>
</tr>
</table>
<a aria-label="Your Company" href="#">
<img alt="" src="https://dummyimage.com/1000x330/efe8ff/000000.png&text=Your+Logo+Here" width="500px">
</a>
<br>
@@ -152,7 +151,6 @@ _Code ownership, pull request approvals and merging, etc_ (see [Maintainers L2](
<table>
<tr>
<td align="center"><a href="http://simonknott.de"><img src="https://avatars1.githubusercontent.com/u/14912729?v=4" width="100px;" alt=""/><br /><sub><b>Simon Knott</b></sub></a><br />SuperJSON</td>
<td align="center"><a href="http://jins.dev"><img src="https://avatars.githubusercontent.com/u/39466936?v=4" width="100px;" alt=""/><br /><sub><b>JH.Lee</b></sub></a><br />SuperJSON</td>
<td align="center"><a href="https://juanm04.com"><img src="https://avatars0.githubusercontent.com/u/16712703?v=4" width="100px;" alt=""/><br /><sub><b>Juan Martín Seery</b></sub></a><br />Website/Docs</td>
</tr>
</table>
@@ -339,7 +337,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
</tr>
<tr>
<td align="center"><a href="https://github.com/jschepmans"><img src="https://avatars2.githubusercontent.com/u/5782977?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Johan Schepmans</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jschepmans" title="Code">💻</a></td>
<td align="center"><a href="https://twitter.com/dillonraphael"><img src="https://avatars0.githubusercontent.com/u/3496193?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dillon Raphael</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Tests">⚠️</a></td>
<td align="center"><a href="https://twitter.com/dillonraphael"><img src="https://avatars0.githubusercontent.com/u/3496193?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dillon Raphael</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/clgeoio"><img src="https://avatars2.githubusercontent.com/u/37571416?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cody G</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=clgeoio" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=clgeoio" title="Tests">⚠️</a></td>
<td align="center"><a href="https://github.com/madflow"><img src="https://avatars0.githubusercontent.com/u/183248?v=4?s=100" width="100px;" alt=""/><br /><sub><b>madflow</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=madflow" title="Documentation">📖</a></td>
<td align="center"><a href="https://twitter.com/nitaking_"><img src="https://avatars2.githubusercontent.com/u/10850034?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Satoshi Nitawaki</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nitaking" title="Code">💻</a> <a href="#maintenance-nitaking" title="Maintenance">🚧</a> <a href="#question-nitaking" title="Answering Questions">💬</a> <a href="https://github.com/blitz-js/blitz/commits?author=nitaking" title="Documentation">📖</a></td>
@@ -709,14 +707,6 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
<tr>
<td align="center"><a href="https://github.com/tommywong-dev"><img src="https://avatars.githubusercontent.com/u/79971095?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tommywong-dev</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=tommywong-dev" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/datner"><img src="https://avatars.githubusercontent.com/u/22598347?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Datner</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=datner" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=datner" title="Code">💻</a></td>
<td align="center"><a href="https://chaiwattsw.com/"><img src="https://avatars.githubusercontent.com/u/30198386?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chaiwat Trisuwan</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=chaiwattsw" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=chaiwattsw" title="Code">💻</a></td>
<td align="center"><a href="oltdaniel.eu"><img src="https://avatars.githubusercontent.com/u/53529846?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Oltmanns</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=oltdaniel" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=oltdaniel" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/edrickleong"><img src="https://avatars.githubusercontent.com/u/10529706?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Edrick Leong</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=edrickleong" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=edrickleong" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=edrickleong" title="Tests">⚠️</a></td>
<td align="center"><a href="https://github.com/siddhsuresh"><img src="https://avatars.githubusercontent.com/u/83594610?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Siddharth Suresh</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=siddhsuresh" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=siddhsuresh" title="Code">💻</a></td>
<td align="center"><a href="http://jins.dev"><img src="https://avatars.githubusercontent.com/u/39466936?v=4?s=100" width="100px;" alt=""/><br /><sub><b>JH.Lee</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=orionmiz" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=orionmiz" title="Tests">⚠️</a> <a href="#maintenance-orionmiz" title="Maintenance">🚧</a> <a href="https://github.com/blitz-js/blitz/commits?author=orionmiz" title="Documentation">📖</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/corydeppen"><img src="https://avatars.githubusercontent.com/u/313264?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cory Deppen</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=corydeppen" title="Documentation">📖</a></td>
</tr>
</table>

View File

@@ -1,28 +0,0 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Blitz: debug server-side",
"type": "node-terminal",
"request": "launch",
"command": "pnpm start:dev"
},
{
"name": "Blitz: debug client-side",
"type": "chrome",
"request": "launch",
"url": "http://localhost:3000"
},
{
"name": "Blitz: debug full stack",
"type": "node-terminal",
"request": "launch",
"command": "pnpm start:dev",
"serverReadyAction": {
"pattern": "started server on .+, url: (https?://.+)",
"uriFormat": "%s",
"action": "debugWithChrome"
}
}
]
}

View File

@@ -13,7 +13,7 @@ type ResetPasswordMailer = {
export function forgotPasswordMailer({ to, token }: ResetPasswordMailer) {
// In production, set APP_ORIGIN to your production server origin
const origin = process.env.APP_ORIGIN || process.env.BLITZ_DEV_SERVER_ORIGIN
const resetUrl = `${origin}/auth/reset-password?token=${token}`
const resetUrl = `${origin}/reset-password?token=${token}`
const msg = {
from: "TODO@example.com",

View File

@@ -1,15 +1,10 @@
// @ts-check
const withBundleAnalyzer = require("@next/bundle-analyzer")({
enabled: process.env.ANALYZE === "true",
})
const { withBlitz } = require("@blitzjs/next")
/**
* @type {import('@blitzjs/next').BlitzConfig}
**/
const config = {
reactStrictMode: true,
}
module.exports = withBlitz(withBundleAnalyzer(config))
module.exports = withBlitz(
withBundleAnalyzer({
reactStrictMode: true,
})
)

View File

@@ -29,11 +29,11 @@
"@blitzjs/rpc": "workspace:*",
"@hookform/resolvers": "2.8.8",
"@prisma/client": "4.0.0",
"blitz": "workspace:2.0.0-beta.3",
"next": "12.2.5",
"blitz": "workspace:2.0.0-alpha.65",
"next": "12.2.0",
"prisma": "4.0.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react": "18.0.0",
"react-dom": "18.0.0",
"react-hook-form": "7.29.0",
"ts-node": "10.7.0",
"zod": "3.17.3"
@@ -45,7 +45,7 @@
"@types/jest": "27.4.1",
"@types/node": "17.0.16",
"@types/preview-email": "2.0.1",
"@types/react": "18.0.17",
"@types/react": "18.0.1",
"@typescript-eslint/eslint-plugin": "5.9.1",
"eslint": "7.32.0",
"eslint-config-next": "12.2.0",

View File

@@ -4,9 +4,8 @@ import { Form, FORM_ERROR } from "app/core/components/Form"
import { ForgotPassword } from "app/auth/validations"
import forgotPassword from "app/auth/mutations/forgotPassword"
import { useMutation } from "@blitzjs/rpc"
import { BlitzPage } from "@blitzjs/next"
const ForgotPasswordPage: BlitzPage = () => {
const ForgotPasswordPage = () => {
const [forgotPasswordMutation, { isSuccess }] = useMutation(forgotPassword)
return (

View File

@@ -1,9 +1,8 @@
import Layout from "app/core/layouts/Layout"
import { LoginForm } from "app/auth/components/LoginForm"
import { useRouter } from "next/router"
import { BlitzPage } from "@blitzjs/next"
const LoginPage: BlitzPage = () => {
const LoginPage = () => {
const router = useRouter()
return (

View File

@@ -1,66 +0,0 @@
import Layout from "app/core/layouts/Layout"
import { LabeledTextField } from "app/core/components/LabeledTextField"
import { Form, FORM_ERROR } from "app/core/components/Form"
import { ResetPassword } from "app/auth/validations"
import resetPassword from "app/auth/mutations/resetPassword"
import { BlitzPage, Routes } from "@blitzjs/next"
import { useRouter } from "next/router"
import { useMutation } from "@blitzjs/rpc"
import Link from "next/link"
const ResetPasswordPage: BlitzPage = () => {
const router = useRouter()
const [resetPasswordMutation, { isSuccess }] = useMutation(resetPassword)
return (
<div>
<h1>Set a New Password</h1>
{isSuccess ? (
<div>
<h2>Password Reset Successfully</h2>
<p>
Go to the <Link href={Routes.Home()}>homepage</Link>
</p>
</div>
) : (
<Form
submitText="Reset Password"
schema={ResetPassword}
initialValues={{
password: "",
passwordConfirmation: "",
token: router.query.token as string,
}}
onSubmit={async (values) => {
try {
await resetPasswordMutation(values)
} catch (error: any) {
if (error.name === "ResetPasswordError") {
return {
[FORM_ERROR]: error.message,
}
} else {
return {
[FORM_ERROR]: "Sorry, we had an unexpected error. Please try again.",
}
}
}
}}
>
<LabeledTextField name="password" label="New Password" type="password" />
<LabeledTextField
name="passwordConfirmation"
label="Confirm New Password"
type="password"
/>
</Form>
)}
</div>
)
}
ResetPasswordPage.redirectAuthenticatedTo = "/"
ResetPasswordPage.getLayout = (page) => <Layout title="Reset Your Password">{page}</Layout>
export default ResetPasswordPage

View File

@@ -1,9 +1,9 @@
import { useRouter } from "next/router"
import Layout from "app/core/layouts/Layout"
import { SignupForm } from "app/auth/components/SignupForm"
import { BlitzPage, Routes } from "@blitzjs/next"
import { Routes } from "@blitzjs/next"
const SignupPage: BlitzPage = () => {
const SignupPage = () => {
const router = useRouter()
return (

View File

@@ -6,7 +6,7 @@ import { useCurrentUser } from "app/core/hooks/useCurrentUser"
import logout from "app/auth/mutations/logout"
import logo from "public/logo.png"
import { useMutation } from "@blitzjs/rpc"
import { Routes, BlitzPage } from "@blitzjs/next"
import { Routes } from "@blitzjs/next"
/*
* This file is just for a pleasant getting started page for your new app.
@@ -53,7 +53,7 @@ const UserInfo = () => {
}
}
const Home: BlitzPage = () => {
const Home = () => {
return (
<Layout title="Home">
<div className="container">

View File

@@ -4,7 +4,7 @@
"private": true,
"scripts": {
"start:dev": "pnpm run prisma:start && next dev",
"buildapp": "NODE_ENV=production pnpm blitz codegen && pnpm prisma generate && next build",
"buildapp": "prisma generate && next build",
"start": "next start",
"lint": "next lint",
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",
@@ -25,17 +25,17 @@
"@types/passport-twitter": "1.0.37",
"blitz": "workspace:*",
"jest": "27.5.1",
"next": "12.2.5",
"next": "12.2.0",
"passport-mock-strategy": "2.0.0",
"passport-twitter": "1.0.4",
"prisma": "4.0.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react": "18.0.0",
"react-dom": "18.0.0",
"ts-node": "10.7.0"
},
"devDependencies": {
"@next/bundle-analyzer": "12.0.8",
"@types/react": "18.0.17",
"@types/react": "18.0.1",
"eslint": "7.32.0",
"typescript": "^4.5.3"
}

View File

@@ -1,7 +0,0 @@
export default function Post() {
return (
<div>
<h1>Post</h1>
</div>
)
}

View File

@@ -1,24 +0,0 @@
import {getQueryData, useQuery} from "@blitzjs/rpc"
import getBasic from "../app/queries/getBasic"
import {useState} from "react"
function PageWithGetQueryData() {
const [data] = useQuery(getBasic, {})
const [newData, setNewData] = useState<string>()
return (
<div>
<div>{data}</div>
{newData && <div id="new-data">{newData}</div>}
<button
onClick={async () => {
const newData = getQueryData(getBasic, {})
setNewData(newData)
}}
>
Call getQueryData
</button>
</div>
)
}
export default PageWithGetQueryData

View File

@@ -1,27 +0,0 @@
import {SessionContext} from "@blitzjs/auth"
import {Routes} from "@blitzjs/next"
import {gSSP} from "app/blitz-server"
type Props = {
userId: unknown
publicData: SessionContext["$publicData"]
}
export const getServerSideProps = gSSP<Props>(async ({ctx}) => {
const {session} = ctx
return {
redirect: {destination: Routes.Post({postId: "1"})},
props: {
userId: session.userId,
publicData: session.$publicData,
publishedAt: new Date(0),
},
}
})
function PageWithGsspRedirect(props: Props) {
return <div>{JSON.stringify(props, null, 2)}</div>
}
export default PageWithGsspRedirect

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

View File

@@ -19,17 +19,17 @@
"@prisma/client": "4.0.0",
"blitz": "workspace:*",
"lowdb": "3.0.0",
"next": "12.2.5",
"next": "12.2.0",
"prisma": "4.0.0",
"react": "18.2.0",
"react-dom": "18.2.0"
"react": "18.0.0",
"react-dom": "18.0.0"
},
"devDependencies": {
"@next/bundle-analyzer": "12.0.8",
"@types/express": "4.17.13",
"@types/fs-extra": "9.0.13",
"@types/node-fetch": "2.6.1",
"@types/react": "18.0.17",
"@types/react": "18.0.1",
"b64-lite": "1.4.0",
"eslint": "7.32.0",
"fs-extra": "10.0.1",

View File

@@ -15,16 +15,16 @@
"@blitzjs/next": "workspace:*",
"@blitzjs/rpc": "workspace:*",
"blitz": "workspace:*",
"next": "12.2.5",
"react": "18.2.0",
"react-dom": "18.2.0"
"next": "12.2.0",
"react": "18.0.0",
"react-dom": "18.0.0"
},
"devDependencies": {
"@next/bundle-analyzer": "12.0.8",
"@types/express": "4.17.13",
"@types/fs-extra": "9.0.13",
"@types/node-fetch": "2.6.1",
"@types/react": "18.0.17",
"@types/react": "18.0.1",
"eslint": "7.32.0",
"fs-extra": "10.0.1",
"get-port": "6.1.2",

View File

@@ -19,10 +19,10 @@
"@prisma/client": "4.0.0",
"blitz": "workspace:*",
"lowdb": "3.0.0",
"next": "12.2.5",
"next": "12.2.0",
"prisma": "4.0.0",
"react": "18.2.0",
"react-dom": "18.2.0"
"react": "18.0.0",
"react-dom": "18.0.0"
},
"devDependencies": {
"@blitzjs/config": "workspace:*",
@@ -30,7 +30,7 @@
"@types/express": "4.17.13",
"@types/fs-extra": "9.0.13",
"@types/node-fetch": "2.6.1",
"@types/react": "18.0.17",
"@types/react": "18.0.1",
"b64-lite": "1.4.0",
"eslint": "7.32.0",
"fs-extra": "10.0.1",

View File

@@ -15,14 +15,14 @@
"@prisma/client": "4.0.0",
"@tanstack/react-query": "4.0.10",
"blitz": "workspace:*",
"next": "12.2.5",
"next": "12.2.0",
"prisma": "4.0.0",
"react": "18.2.0",
"react-dom": "18.2.0"
"react": "18.0.0",
"react-dom": "18.0.0"
},
"devDependencies": {
"@testing-library/react": "13.0.0",
"@types/react": "18.0.17",
"@types/react": "18.0.1",
"@vitejs/plugin-react": "1.3.0",
"delay": "5.0.0",
"eslint": "7.32.0",

View File

@@ -1,2 +0,0 @@
SESSION_SECRET_KEY=hsdenhJfpLHrGjgdgg3jdF8g2bYD2PaQ
HEADLESS=true

View File

@@ -1 +0,0 @@
module.exports = require("@blitzjs/config/eslint")

View File

@@ -1,3 +0,0 @@
node_modules
# Keep environment variables out of version control
*.sqlite

View File

@@ -1,14 +0,0 @@
import {BlitzRpcPlugin} from "@blitzjs/rpc"
import {setupBlitzClient} from "@blitzjs/next"
import {AuthClientPlugin} from "@blitzjs/auth"
const {withBlitz} = setupBlitzClient({
plugins: [
AuthClientPlugin({
cookiePrefix: "react-query-utils-tests-cookie-prefix",
}),
BlitzRpcPlugin({}),
],
})
export {withBlitz}

View File

@@ -1,16 +0,0 @@
import {setupBlitzServer} from "@blitzjs/next"
import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
import {simpleRolesIsAuthorized} from "@blitzjs/auth"
import db from "../db"
const {gSSP, gSP, api} = setupBlitzServer({
plugins: [
AuthServerPlugin({
cookiePrefix: "react-query-utils-tests-cookie-prefix",
storage: PrismaStorage(db),
isAuthorized: simpleRolesIsAuthorized,
}),
],
})
export {gSSP, gSP, api}

View File

@@ -1,3 +0,0 @@
export default async function getBasic() {
return "basic-result"
}

View File

@@ -1,8 +0,0 @@
import {enhancePrisma} from "blitz"
import {PrismaClient} from "@prisma/client"
const EnhancedPrisma = enhancePrisma(PrismaClient)
export * from "@prisma/client"
const prisma = new EnhancedPrisma()
export default prisma

View File

@@ -1,47 +0,0 @@
-- CreateTable
CREATE TABLE "User" (
"id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
"createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" DATETIME NOT NULL,
"name" TEXT,
"email" TEXT NOT NULL,
"hashedPassword" TEXT,
"role" TEXT NOT NULL DEFAULT 'user'
);
-- CreateTable
CREATE TABLE "Session" (
"id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
"createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" DATETIME NOT NULL,
"expiresAt" DATETIME,
"handle" TEXT NOT NULL,
"userId" INTEGER,
"hashedSessionToken" TEXT,
"antiCSRFToken" TEXT,
"publicData" TEXT,
"privateData" TEXT,
CONSTRAINT "Session_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE SET NULL ON UPDATE CASCADE
);
-- CreateTable
CREATE TABLE "Token" (
"id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
"createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" DATETIME NOT NULL,
"hashedToken" TEXT NOT NULL,
"type" TEXT NOT NULL,
"expiresAt" DATETIME NOT NULL,
"sentTo" TEXT NOT NULL,
"userId" INTEGER NOT NULL,
CONSTRAINT "Token_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
);
-- CreateIndex
CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
-- CreateIndex
CREATE UNIQUE INDEX "Session_handle_key" ON "Session"("handle");
-- CreateIndex
CREATE UNIQUE INDEX "Token_hashedToken_type_key" ON "Token"("hashedToken", "type");

View File

@@ -1,3 +0,0 @@
# Please do not edit this file manually
# It should be added in your version-control system (i.e. Git)
provider = "sqlite"

View File

@@ -1,50 +0,0 @@
datasource sqlite {
provider = "sqlite"
url = "file:./db.sqlite"
}
generator client {
provider = "prisma-client-js"
}
model User {
id Int @id @default(autoincrement())
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
name String?
email String @unique
hashedPassword String?
role String @default("user")
sessions Session[]
tokens Token[]
}
model Session {
id Int @id @default(autoincrement())
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
expiresAt DateTime?
handle String @unique
user User? @relation(fields: [userId], references: [id])
userId Int?
hashedSessionToken String?
antiCSRFToken String?
publicData String?
privateData String?
}
model Token {
id Int @id @default(autoincrement())
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
hashedToken String
type String
expiresAt DateTime
sentTo String
user User @relation(fields: [userId], references: [id])
userId Int
@@unique([hashedToken, type])
}

View File

@@ -1,7 +0,0 @@
import prisma from "./index"
const seed = async () => {
await prisma.$reset()
}
export default seed

View File

@@ -1,5 +0,0 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />
// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.

View File

@@ -1,2 +0,0 @@
const {withBlitz} = require("@blitzjs/next")
module.exports = withBlitz({})

View File

@@ -1,44 +0,0 @@
{
"name": "test-react-query-utils",
"version": "0.0.0",
"private": true,
"scripts": {
"start:dev": "pnpm run prisma:start && next dev",
"test": "pnpm run prisma:start && vitest run",
"test-watch": "vitest",
"start": "next start",
"lint": "next lint",
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",
"prisma:start": "prisma generate && prisma migrate deploy",
"prisma:studio": "prisma studio"
},
"prisma": {
"schema": "db/schema.prisma"
},
"dependencies": {
"@blitzjs/auth": "workspace:*",
"@blitzjs/next": "workspace:*",
"@blitzjs/rpc": "workspace:*",
"@prisma/client": "4.0.0",
"blitz": "workspace:*",
"lowdb": "3.0.0",
"next": "12.2.5",
"prisma": "4.0.0",
"react": "18.2.0",
"react-dom": "18.2.0"
},
"devDependencies": {
"@blitzjs/config": "workspace:*",
"@next/bundle-analyzer": "12.0.8",
"@types/express": "4.17.13",
"@types/fs-extra": "9.0.13",
"@types/node-fetch": "2.6.1",
"@types/react": "18.0.17",
"b64-lite": "1.4.0",
"eslint": "7.32.0",
"fs-extra": "10.0.1",
"get-port": "6.1.2",
"node-fetch": "3.2.3",
"typescript": "^4.5.3"
}
}

View File

@@ -1,36 +0,0 @@
import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
import {AuthenticationError, AuthorizationError} from "blitz"
import React, {Suspense} from "react"
import {withBlitz} from "../app/blitz-client"
function RootErrorFallback({error}: ErrorFallbackProps) {
if (error instanceof AuthenticationError) {
return <div>Error: You are not authenticated</div>
} else if (error instanceof AuthorizationError) {
return (
<ErrorComponent
statusCode={error.statusCode}
title="Sorry, you are not authorized to access this"
/>
)
} else {
return (
<ErrorComponent
statusCode={(error as any)?.statusCode || 400}
title={error.message || error.name}
/>
)
}
}
function MyApp({Component, pageProps}: AppProps) {
return (
<Suspense fallback="Loading...">
<ErrorBoundary FallbackComponent={RootErrorFallback}>
<Component {...pageProps} />
</ErrorBoundary>
</Suspense>
)
}
export default withBlitz(MyApp)

View File

@@ -1,4 +0,0 @@
import {rpcHandler} from "@blitzjs/rpc"
import {api} from "../../../app/blitz-server"
export default api(rpcHandler({onError: console.log}))

View File

@@ -1,35 +0,0 @@
import {getQueryData, useQuery} from "@blitzjs/rpc"
import {Suspense, useState} from "react"
import getBasic from "../app/queries/getBasic"
function Content() {
const [data] = useQuery(getBasic, undefined)
const [newData, setNewData] = useState<string>()
return (
<div>
<div>{data}</div>
{newData && <div id="new-data">{newData}</div>}
<button
id="button"
onClick={async () => {
const newData = getQueryData(getBasic, undefined)
setNewData(newData)
}}
>
Call getQueryData
</button>
</div>
)
}
function PageWithGetQueryData() {
return (
<div id="page">
<Suspense fallback={"Loading..."}>
<Content />
</Suspense>
</div>
)
}
export default PageWithGetQueryData

View File

@@ -1,59 +0,0 @@
import {describe, it, expect, beforeAll, afterAll} from "vitest"
import {killApp, findPort, launchApp, nextBuild, nextStart} from "../../utils/next-test-utils"
import webdriver from "../../utils/next-webdriver"
import {join} from "path"
let app: any
let appPort: number
const appDir = join(__dirname, "../")
const runTests = (mode?: string) => {
describe("get query data", () => {
it(
"should work",
async () => {
const browser = await webdriver(appPort, "/page-with-get-query-data")
browser.waitForElementByCss("#button", 0)
await browser.elementByCss("#button").click()
browser.waitForElementByCss("#new-data", 0)
const newText = await browser.elementByCss("#new-data").text()
expect(newText).toMatch(/basic-result/)
if (browser) await browser.close()
},
5000 * 60 * 2,
)
})
}
describe("React Query Utils Tests", () => {
describe("dev mode", () => {
beforeAll(async () => {
try {
appPort = await findPort()
app = await launchApp(appDir, appPort, {cwd: process.cwd()})
} catch (error) {
console.log(error)
}
}, 5000 * 60 * 2)
afterAll(async () => await killApp(app))
runTests()
})
describe("server mode", () => {
beforeAll(async () => {
try {
await nextBuild(appDir)
appPort = await findPort()
app = await nextStart(appDir, appPort, {cwd: process.cwd()})
} catch (err) {
console.log(err)
}
}, 5000 * 60 * 2)
afterAll(async () => await killApp(app))
runTests()
})
})

View File

@@ -1,11 +0,0 @@
{
"extends": "@blitzjs/config/tsconfig.nextjs.json",
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types"],
"compilerOptions": {
"paths": {
"react": ["./node_modules/@types/react"]
}
},
"exclude": ["node_modules"],
"baseUrl": "."
}

View File

@@ -1,15 +0,0 @@
import {SimpleRolesIsAuthorized} from "@blitzjs/auth"
import {User} from "./db"
export type Role = "ADMIN" | "USER"
declare module "@blitzjs/auth" {
export interface Session {
isAuthorized: SimpleRolesIsAuthorized<Role>
PublicData: {
userId: User["id"]
role: Role
views?: number
}
}
}

View File

@@ -12,15 +12,15 @@
"@blitzjs/next": "workspace:*",
"@blitzjs/rpc": "workspace:*",
"blitz": "workspace:*",
"next": "12.2.5",
"react": "18.2.0",
"react-dom": "18.2.0"
"next": "12.2.0",
"react": "18.0.0",
"react-dom": "18.0.0"
},
"devDependencies": {
"@types/express": "4.17.13",
"@types/fs-extra": "9.0.13",
"@types/node-fetch": "2.6.1",
"@types/react": "18.0.17",
"@types/react": "18.0.1",
"b64-lite": "1.4.0",
"eslint": "7.32.0",
"fs-extra": "10.0.1",

View File

@@ -22,10 +22,10 @@
"@prisma/client": "4.0.0",
"blitz": "workspace:*",
"lowdb": "3.0.0",
"next": "12.2.5",
"next": "12.2.0",
"prisma": "4.0.0",
"react": "18.2.0",
"react-dom": "18.2.0"
"react": "18.0.0",
"react-dom": "18.0.0"
},
"devDependencies": {
"@blitzjs/config": "workspace:*",
@@ -33,7 +33,7 @@
"@types/express": "4.17.13",
"@types/fs-extra": "9.0.13",
"@types/node-fetch": "2.6.1",
"@types/react": "18.0.17",
"@types/react": "18.0.1",
"b64-lite": "1.4.0",
"eslint": "7.32.0",
"fs-extra": "10.0.1",

View File

@@ -10,7 +10,7 @@
"@types/express": "4.17.13",
"@types/fs-extra": "9.0.13",
"@types/node-fetch": "2.6.1",
"@types/react": "18.0.17",
"@types/react": "18.0.1",
"@types/rimraf": "3.0.2",
"@types/selenium-webdriver": "4.0.18",
"chromedriver": "100.0.0",
@@ -22,8 +22,8 @@
"node-fetch": "3.2.3",
"pkg-dir": "5.0.0",
"playwright-chromium": "1.14.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react": "18.0.0",
"react-dom": "18.0.0",
"resolve-cwd": "3.0.0",
"resolve-from": "5.0.0",
"rimraf": "3.0.2",

View File

@@ -11,7 +11,7 @@
"preinstall": "npx only-allow pnpm",
"prepare": "husky install",
"build": "turbo run build",
"build:apps": "turbo run buildapp --concurrency=1",
"build:apps": "turbo run buildapp",
"dev": "turbo run dev --no-cache --parallel",
"lint": "turbo run lint",
"test": "turbo run test",
@@ -28,12 +28,12 @@
"husky": "7.0.4",
"jsdom": "^19.0.0",
"lint-staged": "12.1.7",
"next": "12.2.5",
"next": "12.2.0",
"only-allow": "1.1.0",
"prettier": "^2.5.1",
"prettier-plugin-prisma": "3.8.0",
"pretty-quick": "3.1.3",
"turbo": "1.4.2",
"turbo": "1.1.5",
"vitest": "0.8.2",
"wait-on": "6.0.1"
},

View File

@@ -1,89 +1,5 @@
# @blitzjs/auth
## 2.0.0-beta.3
### Patch Changes
- Updated dependencies [638f2319]
- blitz@2.0.0-beta.3
## 2.0.0-beta.2
### Patch Changes
- db7233db: Bump react, react-dom, @types/react and next versions
This fixes a console warning: `Warning: Received`true`for a non-boolean attribute`global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
- Updated dependencies [db7233db]
- Updated dependencies [0936cb38]
- Updated dependencies [3f9fe8f0]
- blitz@2.0.0-beta.2
## 2.0.0-beta.1
### Patch Changes
- 0f4926fd: Set current Blitz tag to latest
- blitz@2.0.0-beta.1
## 2.0.0-beta.72
### Patch Changes
- 2cc888ef: Beta release
- Updated dependencies [2cc888ef]
- blitz@2.0.0-beta.72
## 2.0.0-alpha.71
### Patch Changes
- blitz@2.0.0-alpha.71
## 2.0.0-alpha.70
### Patch Changes
- blitz@2.0.0-alpha.70
## 2.0.0-alpha.69
### Patch Changes
- Updated dependencies [fd31e56b]
- blitz@2.0.0-alpha.69
## 2.0.0-alpha.68
### Patch Changes
- Updated dependencies [271c58ac]
- Updated dependencies [630c7181]
- Updated dependencies [f0ca738d]
- Updated dependencies [41608c4c]
- blitz@2.0.0-alpha.68
## 2.0.0-alpha.67
### Patch Changes
- blitz@2.0.0-alpha.67
## 2.0.0-alpha.66
### Patch Changes
- a3e6c49c: Fixes the supports-color warning for pnpm
- Updated dependencies [928e840b]
- Updated dependencies [240f3f34]
- Updated dependencies [55b1cb20]
- Updated dependencies [4d7d126d]
- Updated dependencies [890b0c0c]
- Updated dependencies [807a2b56]
- Updated dependencies [a3e6c49c]
- blitz@2.0.0-alpha.66
## 2.0.0-alpha.65
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/auth",
"version": "2.0.0-beta.3",
"version": "2.0.0-alpha.65",
"scripts": {
"build": "unbuild",
"predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",
@@ -26,7 +26,7 @@
"@types/secure-password": "3.1.1",
"b64-lite": "1.4.0",
"bad-behavior": "1.0.1",
"blitz": "2.0.0-beta.3",
"blitz": "2.0.0-alpha.65",
"cookie": "0.4.1",
"cookie-session": "2.0.0",
"debug": "4.3.3",
@@ -36,20 +36,19 @@
"passport": "0.5.2",
"path": "0.12.7",
"secure-password": "4.0.0",
"supports-color": "8.1.1",
"url": "0.11.0"
},
"devDependencies": {
"@blitzjs/config": "workspace:2.0.0-beta.3",
"@blitzjs/config": "workspace:2.0.0-alpha.65",
"@testing-library/react": "13.0.0",
"@testing-library/react-hooks": "7.0.2",
"@types/cookie": "0.4.1",
"@types/debug": "4.1.7",
"@types/jsonwebtoken": "8.5.8",
"@types/react": "18.0.17",
"@types/react": "18.0.1",
"@types/react-dom": "17.0.14",
"react": "18.2.0",
"react-dom": "18.2.0",
"react": "18.0.0",
"react-dom": "18.0.0",
"typescript": "^4.5.3",
"unbuild": "0.7.6",
"watch": "1.0.2"

View File

@@ -1,83 +1,5 @@
# @blitzjs/next
## 2.0.0-beta.3
### Patch Changes
- @blitzjs/rpc@2.0.0-beta.3
## 2.0.0-beta.2
### Patch Changes
- db7233db: Bump react, react-dom, @types/react and next versions
This fixes a console warning: `Warning: Received`true`for a non-boolean attribute`global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
- Updated dependencies [db7233db]
- @blitzjs/rpc@2.0.0-beta.2
## 2.0.0-beta.1
### Patch Changes
- 0f4926fd: Set current Blitz tag to latest
- Updated dependencies [0f4926fd]
- @blitzjs/rpc@2.0.0-beta.1
## 2.0.0-beta.72
### Patch Changes
- 2cc888ef: Beta release
- Updated dependencies [2cc888ef]
- @blitzjs/rpc@2.0.0-beta.72
## 2.0.0-alpha.71
### Patch Changes
- @blitzjs/rpc@2.0.0-alpha.71
## 2.0.0-alpha.70
### Patch Changes
- @blitzjs/rpc@2.0.0-alpha.70
## 2.0.0-alpha.69
### Patch Changes
- a3c92cb8: Allow using `RouteUrlObject` as `redirect.destination` in `getStaticProps` and `getServerSideProps`
- Updated dependencies [49028024]
- @blitzjs/rpc@2.0.0-alpha.69
## 2.0.0-alpha.68
### Patch Changes
- Updated dependencies [630c7181]
- @blitzjs/rpc@2.0.0-alpha.68
## 2.0.0-alpha.67
### Patch Changes
- @blitzjs/rpc@2.0.0-alpha.67
## 2.0.0-alpha.66
### Patch Changes
- ccb1af8d: Avoid `invalid config detected` warnings by deleting `"blitz"` key from next config object
- 807a2b56: Fixes peer dependency warnings
- a3e6c49c: Fixes the supports-color warning for pnpm
- Updated dependencies [807a2b56]
- Updated dependencies [a3e6c49c]
- Updated dependencies [9620ef6b]
- @blitzjs/rpc@2.0.0-alpha.66
## 2.0.0-alpha.65
### Patch Changes

View File

@@ -2,7 +2,7 @@ import {BuildConfig} from "unbuild"
const config: BuildConfig = {
entries: ["./src/index-browser", "./src/index-server"],
externals: ["index-browser.cjs", "index-browser.mjs", "blitz", ".blitz", "next", "react"],
externals: ["index-browser.cjs", "index-browser.mjs", "blitz", ".blitz"],
declaration: true,
rollup: {
emitCJS: true,

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/next",
"version": "2.0.0-beta.3",
"version": "2.0.0-alpha.65",
"scripts": {
"build": "unbuild",
"dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -24,32 +24,31 @@
"eslint.js"
],
"dependencies": {
"@blitzjs/rpc": "2.0.0-beta.3",
"@blitzjs/rpc": "2.0.0-alpha.65",
"@tanstack/react-query": "4.0.10",
"@types/hoist-non-react-statics": "3.3.1",
"debug": "4.3.3",
"fs-extra": "10.0.1",
"hoist-non-react-statics": "3.3.2",
"superjson": "1.8.0",
"supports-color": "8.1.1"
"superjson": "1.8.0"
},
"devDependencies": {
"@blitzjs/config": "workspace:2.0.0-beta.3",
"@blitzjs/config": "workspace:2.0.0-alpha.65",
"@testing-library/dom": "8.13.0",
"@testing-library/jest-dom": "5.16.3",
"@testing-library/react": "13.0.0",
"@testing-library/react-hooks": "7.0.2",
"@testing-library/user-event": "13.5.0",
"@types/node": "17.0.16",
"@types/react": "18.0.17",
"@types/react": "18.0.1",
"@types/react-dom": "17.0.14",
"@types/testing-library__react-hooks": "4.0.0",
"blitz": "2.0.0-beta.3",
"blitz": "2.0.0-alpha.65",
"cross-spawn": "7.0.3",
"find-up": "4.1.0",
"next": "12.2.5",
"react": "18.2.0",
"react-dom": "18.2.0",
"next": "12.2.0",
"react": "18.0.0",
"react-dom": "18.0.0",
"resolve-from": "5.0.0",
"ts-jest": "27.1.4",
"typescript": "^4.5.3",
@@ -58,5 +57,9 @@
},
"publishConfig": {
"access": "public"
},
"peerDependencies": {
"next": ">=12.2.0",
"react": "*"
}
}

Some files were not shown because too many files have changed in this diff Show More