1
0
mirror of synced 2026-02-04 03:01:17 -05:00

Compare commits

...

84 Commits

Author SHA1 Message Date
github-actions[bot]
81dd346c85 Version Packages (beta) (#3907)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-10-19 14:56:44 +08:00
Aleksandra
6f4349896f Fix 'ambiguous class detected' errors (#3912) 2022-10-19 13:44:33 +08:00
Aleksandra
a6e81f156b Add BlitzLogger plugin and allow customizing logging (#3886) 2022-10-18 15:50:17 +08:00
Aleksandra
4e26ae21bc Upgrade eslint-config-next in new app templates to fix linting issues on blitz build (#3910) 2022-10-18 14:54:47 +08:00
Blitz.js Bot
70ca39e059 (meta) added @janvennemann as contributor 2022-10-17 04:06:03 -04:00
Jan Vennemann
7b63f0f1f2 fix(rpc): allow return undefined in setQueryData updater function (#3898)
Co-authored-by: Dillon Raphael <dillon@creatorsneverdie.com>
Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>
2022-10-17 16:05:57 +08:00
Siddharth Suresh
2e5d7ae40c Upgrade CI Syntax (#3906) 2022-10-17 15:33:36 +08:00
github-actions[bot]
67de028732 Version Packages (beta) (#3896)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-10-13 14:02:17 +08:00
Siddharth Suresh
f39ba1ff13 #3748 Add custom template option back to blitz generate command (#3866) 2022-10-12 11:46:24 -04:00
Blitz.js Bot
149b999f67 (meta) added @oloost as contributor 2022-10-12 06:13:22 -04:00
Aleksandra
3a602b613b Fix missing blitz/installer dependency in recipes (#3895) 2022-10-12 18:11:12 +08:00
github-actions[bot]
58bb38f809 Version Packages (beta) (#3893)
* Version Packages (beta)

* Fix version

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: beerose <alexsandra.sikora@gmail.com>
2022-10-11 17:48:40 +08:00
Aleksandra
1476a577bb Update PULL_REQUEST_TEMPLATE.md (#3878) 2022-10-11 17:32:21 +08:00
github-actions[bot]
4e3c25d9a0 Version Packages (beta) (#3839)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-10-11 16:24:43 +08:00
Estevan Jantsk
2ade7268e2 Add blitz export command (#3885)
Co-authored-by: Fran Zekan <zekan.fran369@gmail.com>
Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>
2022-10-11 16:18:54 +08:00
Fran Zekan
aa34661fac Fix queryKeyGeneration when using invalidateQuery (#3728)
Co-authored-by: beerose <alexsandra.sikora@gmail.com>
2022-10-11 16:01:47 +08:00
Siddharth Suresh
d98e4bac4e Migrate blitz routes command (#3890) 2022-10-11 15:50:30 +08:00
Isuru Maldeniya
0473020555 update prisma-ast version in blitz generator package (#3882)
Co-authored-by: Isuru Maldeniya <isuru.m@synergentl.com>
Co-authored-by: beerose <alexsandra.sikora@gmail.com>
2022-10-04 18:30:33 +08:00
Jannik Schmidtke
8a88dec873 Add a .vscode/settings.json file to specify a TypeScript version (#3876) 2022-10-04 15:35:03 +08:00
Fran Zekan
d6717b9d3c Try to load prisma.schema path from pkg json (#3874)
* Try to load prisma.schema path from pkg json
2022-10-03 13:02:41 -04:00
Daniel Oltmanns
eb970f7bbc fix detecting blitz.config.(ts|js) config file (#3701)
* fix detecting blit.config.(ts|js) config file
2022-10-03 12:41:57 -04:00
Dillon Raphael
8e0c9d76b5 Migrate recipes (#3784) 2022-10-03 09:21:45 -04:00
portalninja
bd09db7533 remove views property from Session's publicData in types.ts file (#3872)
* fix: remove views from public Session data

* add changeset

* Update .changeset/strong-keys-lie.md

Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>
2022-10-03 11:29:20 +08:00
João Jesus
83281a8469 remove {} from single values in the eslint config in package.json (#3877)
* refactor(js-templates): remove {} from single values inside package.json

* Add changeset

Co-authored-by: beerose <alexsandra.sikora@gmail.com>
2022-10-03 11:05:13 +08:00
Siddharth Suresh
15d22af24a Migrate console (#3863)
Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>
2022-09-29 22:22:07 +02:00
Siddharth Suresh
1c3106eacf (meta) add @siddhsuresh as maintainer (#3868) 2022-09-29 16:47:09 +02:00
Fran Zekan
af58e2b239 CLI Version check fixes (#3675)
Co-authored-by: Dillon Raphael <dillon@creatorsneverdie.com>
Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>
2022-09-29 08:59:40 +02:00
Dillon Raphael
430f6ec782 Only generate the prisma client if it's not found (#3855) 2022-09-29 08:34:40 +02:00
Aleksandra
e2c18895da Add client testing utilities and index.test.tsx back to toolkit (#3857) 2022-09-28 16:38:58 -04:00
Aleksandra
3b3c245fb1 Update sponsors list (#3865) 2022-09-26 10:37:56 +02:00
Siddharth Suresh
7b00c17376 Add CI action that checks if changeset was added (#3850) 2022-09-23 14:22:12 +02:00
Dillon Raphael
b43c1a81cc Remove random user git config when generating a new project (#3852) 2022-09-22 12:49:48 +02:00
Aleksandra
1742eb45db Use prefetchInfiniteQuery from @tanstack/react-query for prefetching infinite Blitz queries (#3847)
* Use prefetchInfiniteQuery from @tanstack/react-query for prefetching infinite Blitz queries
2022-09-19 15:23:57 -04:00
Aleksandra
824a9b5e29 Update generator templates to stop breaking no-floating-promises rule (#3848)
* Update generator templates to stop breaking no-floating-promises rule
2022-09-19 15:07:42 -04:00
Aleksandra
9db6c88555 Fix help CLI command not working correctly (#3849)
* Fix help CLI command not working correctly
2022-09-19 14:57:53 -04:00
Jan Wilhelm
25f4526f7e Add API Route handler to the middleware stack (#3830)
Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>
2022-09-19 10:41:42 +02:00
Dillon Raphael
9fe0cc5468 Throw redirect errors when component has mounted in blitz-auth (#3842)
* Throw redirect errors when component has mounted

* Create heavy-cobras-own.md

* clean up useEffect

* Add mounted check for AuthenticationError

* remove clean up
2022-09-16 16:33:34 -04:00
Dillon Raphael
0edeaa37a3 Update regex for wildcard blitz route in webpack config (#3843)
* update regex for wildcard blitz route in webpack config

* Create itchy-spoons-tan.md

* fix regex

* Update itchy-spoons-tan.md
2022-09-16 14:05:31 -04:00
Estevan Jantsk
bf4aaf1de6 move useCurrentUser from core/hooks to users/hooks (#3831)
Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>
Co-authored-by: Dillon Raphael <dillon@creatorsneverdie.com>
2022-09-15 15:56:09 +02:00
Siddharth Suresh
b3b4c21501 convert invokeWithMiddleware to resolver call in codemod (#3764) 2022-09-14 14:38:04 -04:00
Dillon Raphael
757789c43b CI Fixes (#3834) 2022-09-14 09:42:27 -04:00
Dillon Raphael
870986b5ad rename test-get-initial-props 2022-09-13 15:22:44 -04:00
Dillon Raphael
30406891b1 rename toolkit-app-passport & fix version of blitz in toolkit-app 2022-09-13 15:19:07 -04:00
github-actions[bot]
f1ba20f690 Version Packages (beta) (#3779)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-09-13 15:01:11 -04:00
Siddharth Suresh
aba000a812 Update CI (#3824) 2022-09-13 11:30:52 -04:00
Aleksandra
0b94a45039 Upgrade superjson to the latest version (#3827) 2022-09-12 18:05:44 +02:00
Dillon Raphael
6b788b03be Fix CI & Tests (#3822)
* set bash as shell for github action
2022-09-08 11:04:43 -04:00
Siddharth Suresh
d3403cf860 #3804 Show file path on error (#3809)
* Show file path on error in codemod
2022-09-07 09:18:23 -04:00
Siddharth Suresh
39fd15d4b5 Fix remote caching in CI (#3810) 2022-09-06 12:31:31 -04:00
Dillon Raphael
e3523407b9 fix duplicates in frontmatter for changeset 2022-08-31 11:13:24 -04:00
Dillon Raphael
2f914a54d9 Remove toolkit-app from changeset since it's an ignored package 2022-08-31 11:03:44 -04:00
Siddharth Suresh
c213d521c6 Add Windows Testing to CI (#3799)
* add windows testing
2022-08-30 18:32:48 -04:00
Siddharth Suresh
da914c9294 Codemod should convert import statements to require when creating next.config.js (#3803) 2022-08-30 13:25:33 -04:00
Dillon Raphael
22344d058a Add getLayout to full & minimal app template in _app (#3802)
* Add getLayout to full & minimal app template in _app
2022-08-30 12:16:44 -04:00
Dillon Raphael
43e65cfecd Fix for codemod that removes types from the blitz config file (#3759)
* check if typeAnnotation when trying to remove types during creating the next config file with codemod
2022-08-26 16:25:46 -04:00
Dillon Raphael
a84b8de4e6 Remove -cookie-prefix appended to the cookiePrefix string (#3792)
* Remove  appended to the cookiePrefix string
2022-08-26 11:50:37 -04:00
Aleksandra
8fa9a56f63 Make minimal app template setup work (#3795) 2022-08-26 11:05:39 +02:00
Marcus Reinhardt
713aead933 Allow custom strategy name in passportAdapter (#3754)
Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>
2022-08-24 16:12:28 +02:00
Dillon Raphael
74a4ce8e85 Add AuthenticatedSessionContext to the codemod import map (#3771)
Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>
2022-08-24 11:09:14 +02:00
Siddharth Suresh
c53978d58e Update upgrade-legacy codemod imports (#3788) 2022-08-24 10:57:42 +02:00
Siddharth Suresh
161270e3b1 #3775 Only generate prisma client if it has not been generated (#3780) 2022-08-23 12:25:10 -04:00
Aleksandra
f6dac093d2 Improve RPC logging: print resolverName() insetad of /resolverName() (#3777)
* Remove  from RPC resolvers logging
2022-08-23 10:49:17 -04:00
Aleksandra
69fb280340 Copy App component properties inside withBlitz (#3778)
* Copy App component properties inside withBlitz
2022-08-23 10:24:28 -04:00
Kai Schlamp
7498aef4fc Replace blitz-env.d.ts with next-env.d.ts (#3773)
Co-authored-by: beerose <alexsandra.sikora@gmail.com>
2022-08-23 13:56:17 +02:00
github-actions[bot]
49aaaaefb0 Version Packages (beta) (#3756)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-08-22 18:08:41 -04:00
Dillon Raphael
638f2319b7 Prevent Minified react error #419 in production (#3755)
* add check for Minified React error #419 during codegen nextjs patch
2022-08-22 17:31:17 -04:00
Siddharth Suresh
3d950f7772 show file name when unexpected error occurs (#3763)
* show file name when unexpected error occurs
2022-08-22 14:26:29 -04:00
Aleksandra
2313fa61b0 Fix replaceIdentifiers codemod utility (#3766)
* Fix replaceIdentifiers utility
2022-08-22 14:11:14 -04:00
Siddharth Suresh
b72d1215c3 Add .vscode/launch.json to the generator templates (#3703)
Co-authored-by: Dillon Raphael <dillon@creatorsneverdie.com>
Co-authored-by: beerose <alexsandra.sikora@gmail.com>
2022-08-22 14:02:35 +02:00
Siddharth Suresh
1bf185d618 Fix #3737 Fix eslint config using the codemod (#3753)
* Fix #3737 Fix eslint config using the codemod

* check if .eslintrc.js exists

* change log.error in .eslintrc.js check to collectedErrors
2022-08-19 09:33:10 -04:00
github-actions[bot]
000bc2334c Version Packages (beta) (#3751)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-08-18 14:22:30 +02:00
Dillon Raphael
0936cb38a6 Remove the NODE_ENV development check when patching nextjs (#3742) 2022-08-17 17:51:31 +02:00
Aleksandra
8ada2c26f7 Include ResetPasswordPage in new app template (#3743) 2022-08-17 17:25:57 +02:00
Aleksandra
eb9715688c Add BlitzPage type to auth pages in new app template (#3750) 2022-08-17 17:17:12 +02:00
Siddharth Suresh
ebfb562bfa Fix #3735 Add Script as a Default Import of Next.js (#3736)
* Fix #3735 Add Script as a Default Import of Next,js
2022-08-17 11:03:28 -04:00
Siddharth Suresh
a3b5fdd03e Fix #3745 Change ES6 import to require syntax (#3746)
* Fix #3745 Change ES6 import to require syntax

* fix error in syntax of callExpression
2022-08-17 10:44:52 -04:00
Aleksandra
3f9fe8f043 Exit process after finishing blitz new command (#3749) 2022-08-17 16:19:13 +02:00
Guillermo Antony Cava Nuñez
db7233db6a version bump to fix hydration mismatch react error (#3739)
Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>
2022-08-17 15:34:40 +02:00
Blitz.js Bot
1a6e953976 (meta) added @corydeppen as contributor 2022-08-16 04:27:27 -04:00
Dillon Raphael
58ae66fdb5 Remove console log from blitz util file (#3738)
* remove console log from blitz util file
2022-08-15 15:06:14 -04:00
github-actions[bot]
6eb5bc8987 Version Packages (beta) (#3732)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-08-15 11:38:08 +02:00
Aleksandra
0f4926fd1f Set latest tag in package json files (#3731) 2022-08-15 11:29:21 +02:00
github-actions[bot]
dff9fd042a Version Packages (beta) (#3730)
* Version Packages (beta)

* Update version number

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: beerose <alexsandra.sikora@gmail.com>
2022-08-15 10:38:03 +02:00
Aleksandra
2cc888eff8 Update changeset config (#3729) 2022-08-15 10:13:57 +02:00
469 changed files with 15637 additions and 1284 deletions

View File

@@ -3689,7 +3689,9 @@
"profile": "https://github.com/siddhsuresh",
"contributions": [
"doc",
"code"
"code",
"test",
"maintenance"
]
},
{
@@ -3703,6 +3705,34 @@
"maintenance",
"doc"
]
},
{
"login": "corydeppen",
"name": "Cory Deppen",
"avatar_url": "https://avatars.githubusercontent.com/u/313264?v=4",
"profile": "https://github.com/corydeppen",
"contributions": [
"doc"
]
},
{
"login": "oloost",
"name": "oloost",
"avatar_url": "https://avatars.githubusercontent.com/u/72395941?v=4",
"profile": "https://github.com/oloost",
"contributions": [
"doc"
]
},
{
"login": "janvennemann",
"name": "Jan Vennemann",
"avatar_url": "https://avatars.githubusercontent.com/u/1406024?v=4",
"profile": "https://github.com/janvennemann",
"contributions": [
"doc",
"code"
]
}
],
"contributorsPerLine": 7,

View File

@@ -0,0 +1,13 @@
---
"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

@@ -0,0 +1,5 @@
---
"@blitzjs/generator": patch
---
Update prisma-ast dependency to prevent Blitz generator from failing when Prisma keywords are used as model names

View File

@@ -0,0 +1,5 @@
---
"blitz": patch
---
Fix `blitz --help` CLI command not being found

View File

@@ -7,5 +7,5 @@
"access": "restricted",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": ["web", "test-*", "toolkit-app"]
"ignore": ["web", "test-*", "toolkit-*", "@blitzjs/recipe-*"]
}

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/next": patch
---
Allow setting static page properties (e.g. `getInitialProps`) on the App component

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/codemod": patch
---
Show file path on error when running the upgrade legacy codemod.

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/codemod": patch
---
Add `AuthenticatedSessionContext` to the `upgrade-legacy` codemod import map

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/generator": patch
---
Fix `no-floating-promises` lint errors after generating pages with Blitz generator by adding `await` to `router.push` calls in the templates

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/generator": patch
---
Load schema.prisma path from `package.json` instead of assuming it's `db/schema.prisma`

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/codemod": patch
---
Remove TypeScript type annotations from `next.config.js` (a JavaScript file) in the `upgrade-legacy` codemod.

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/generator": patch
---
Fix tsconfig.json referencing blitz-env.d.ts insetad of next-env.d.ts in new app templates

View File

@@ -0,0 +1,5 @@
---
"blitz": patch
---
Add `blitz routes` CLI command back to toolkit

View File

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

View File

@@ -0,0 +1,6 @@
---
"@blitzjs/rpc": patch
"blitz": patch
---
Fix issue with the route name that's generated for nested routes in @blitzjs/rpc. This was causing issues for windows users.

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/next": patch
---
Fix prefetching infinite Blitz queries.

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/generator": patch
---
Move `useCurrentUser` hook from `core/hooks` to `users/hooks` folder

View File

@@ -0,0 +1,7 @@
---
"@blitzjs/auth": patch
"@blitzjs/next": patch
"blitz": patch
---
Fix auth related React hydration errors by not redirecting until after component mount.

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/generator": patch
---
Remove the random user (noop@blitzjs.com) & use user's default git account when commiting a new generated blitz project.

View File

@@ -0,0 +1,7 @@
---
"blitz": patch
"@blitzjs/next": patch
"@blitzjs/rpc": patch
---
Upgrade superjson to the latest version

View File

@@ -0,0 +1,5 @@
---
"blitz": patch
---
Add a global Blitz version check when generating a new Blitz project to ensure users use the latest Blitz.

View File

@@ -0,0 +1,5 @@
---
"blitz": patch
---
Fix `blitz install` not working due to missing `blitz/installer` dependency

View File

@@ -0,0 +1,5 @@
---
"blitz": patch
---
Add `blitz export` CLI command to toolkit

View File

@@ -0,0 +1,6 @@
---
"@blitzjs/rpc": patch
"blitz": patch
---
Allow for custom page extensions for the wildcard blitz route. For example [...blitz].api.ts. For more information vist https://nextjs.org/docs/api-reference/next.config.js/custom-page-extensions

View File

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

View File

@@ -0,0 +1,5 @@
---
"blitz": patch
---
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

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

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/codemod": patch
---
Convert import statements to require when creating the next.config.js file in the codemod

View File

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

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/rpc": patch
---
Improve RPC logging: print `resolverName()` insetad of `/resolverName()`

View File

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

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/generator": patch
---
New apps generated by the cli was missing the getLayout function in \_app, so when you used the getLayout property on your page, it didn't render. **You'll need to manually update your \_app if you generated an app with blitz v2**.

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/codemod": patch
---
Unwrap `invokeWithMiddleware` so the query or mutation is called directly when running the codemod

View File

@@ -0,0 +1,5 @@
---
"blitz": patch
---
Only generate the prisma client if it's not found in node_modules when running a blitz cli command.

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/generator": patch
---
Fix eslint config in new JavaScript app templates

View File

@@ -0,0 +1,5 @@
---
"@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

@@ -0,0 +1,10 @@
---
"@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,29 +1,57 @@
{
"mode": "pre",
"tag": "alpha",
"tag": "beta",
"initialVersions": {
"web": "0.0.0",
"test-auth": "0.0.0",
"test-rpc": "0.0.0",
"test-utils": "0.0.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",
"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",
"@blitzjs/config": "0.0.0",
"@blitzjs/generator": "2.0.0-alpha.0",
"@blitzjs/codemod": "2.0.0-alpha.0",
"@blitzjs/generator": "2.0.0-beta.0",
"@blitzjs/codemod": "2.0.0-beta.0",
"template": "0.0.0",
"toolkit-app": "1.0.0",
"toolkit-app-passportjs": "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-react-query-utils": "0.0.0",
"toolkit-app-passport": "1.0.1-alpha.16",
"test-get-initial-props": "0.0.0",
"@blitzjs/recipe-base-web": "0.34.0-canary.0",
"@blitzjs/recipe-bulma": "0.34.0-canary.0",
"@blitzjs/recipe-bumbag-ui": "0.34.0-canary.0",
"@blitzjs/recipe-chakra-ui": "0.34.0-canary.0",
"@blitzjs/recipe-emotion": "0.34.0-canary.0",
"@blitzjs/recipe-gh-action-yarn-mariadb": "0.34.0-canary.0",
"@blitzjs/recipe-gh-action-yarn-postgres": "0.34.0-canary.0",
"@blitzjs/recipe-ghost": "0.40.0-canary.9",
"@blitzjs/recipe-graphql": "0.34.0-canary.0",
"@blitzjs/recipe-logrocket": "0.34.0-canary.0",
"@blitzjs/recipe-material-ui": "0.34.0-canary.0",
"@blitzjs/recipe-next-ui": "0.34.0-canary.0",
"@blitzjs/recipe-passenger": "0.34.0-canary.0",
"@blitzjs/recipe-quirrel": "0.34.0-canary.0",
"@blitzjs/recipe-reflexjs": "0.34.0-canary.0",
"@blitzjs/recipe-render": "0.34.0-canary.0",
"@blitzjs/recipe-secureheaders": "0.34.0-canary.0",
"@blitzjs/recipe-stitches": "0.34.0-canary.0",
"@blitzjs/recipe-styled-components": "0.34.0-canary.0",
"@blitzjs/recipe-tailwind": "0.34.0-canary.0",
"@blitzjs/recipe-theme-ui": "0.34.0-canary.0",
"@blitzjs/recipe-vanilla-extract": "0.34.0-canary.0"
},
"changesets": [
"afraid-dancers-juggle",
"big-phones-bow",
"blue-flowers-peel",
"blue-pigs-tan",
"breezy-bees-beg",
"breezy-cameras-double",
"breezy-moose-behave",
"bright-mangos-run",
@@ -41,25 +69,40 @@
"cuddly-pugs-crash",
"curly-rules-speak",
"curly-seas-serve",
"cyan-bulldogs-heal",
"cyan-cars-greet",
"dirty-monkeys-greet",
"dirty-planets-chew",
"early-lamps-itch",
"eleven-humans-sort",
"eleven-lobsters-drop",
"empty-berries-rule",
"empty-pants-search",
"empty-turkeys-wave",
"fair-carrots-guess",
"fair-kangaroos-clean",
"fair-wombats-sneeze",
"famous-kings-explain",
"fast-clocks-push",
"fast-trainers-kneel",
"few-dogs-fetch",
"few-shrimps-leave",
"flat-bees-approve",
"fluffy-mangos-begin",
"fluffy-mice-wash",
"forty-timers-rhyme",
"four-brooms-juggle",
"four-meals-fry",
"four-sheep-judge",
"fuzzy-bees-warn",
"fuzzy-jars-admire",
"gentle-dogs-reply",
"gentle-lions-explode",
"giant-mails-tap",
"gold-horses-punch",
"good-apes-drum",
"good-insects-wink",
"gorgeous-birds-warn",
"gorgeous-buses-scream",
"gorgeous-games-obey",
"great-candles-stare",
@@ -67,29 +110,47 @@
"great-terms-rescue",
"green-papayas-do",
"green-pillows-hammer",
"happy-bees-lick",
"happy-hotels-visit",
"happy-paws-join",
"healthy-rice-shout",
"heavy-apes-judge",
"heavy-cobras-own",
"hip-buttons-dance",
"honest-candles-yawn",
"honest-cherries-push",
"hot-cups-rhyme",
"hot-drinks-approve",
"hungry-baboons-swim",
"hungry-pens-collect",
"itchy-houses-marry",
"itchy-spoons-tan",
"khaki-ducks-cheer",
"kind-walls-suffer",
"late-steaks-give",
"lazy-maps-sort",
"lemon-games-press",
"lemon-seas-push",
"light-donkeys-double",
"little-pears-ring",
"long-bees-hope",
"long-dancers-jog",
"long-lobsters-drop",
"lovely-berries-sell",
"lovely-colts-share",
"lucky-cows-try",
"lucky-months-guess",
"lucky-years-turn",
"mean-gorillas-reply",
"modern-cameras-pull",
"modern-ligers-behave",
"moody-bags-walk",
"moody-squids-cheer",
"nasty-suns-wash",
"nervous-beds-travel",
"nervous-dolls-rule",
"new-coats-turn",
"new-olives-protect",
"nice-deers-dream",
"nice-starfishes-live",
"nine-birds-confess",
@@ -99,7 +160,10 @@
"ninety-rice-tickle",
"olive-bees-buy",
"olive-feet-rhyme",
"olive-kings-invent",
"olive-sheep-rhyme",
"orange-mirrors-tap",
"orange-zebras-reflect",
"perfect-eyes-repeat",
"perfect-trains-double",
"plenty-bottles-swim",
@@ -107,26 +171,33 @@
"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",
"rare-crews-sleep",
"red-badgers-retire",
"rich-chairs-invent",
"rich-queens-travel",
"rotten-rocks-remember",
"shaggy-carpets-brake",
"sharp-falcons-begin",
"sharp-olives-sip",
"shy-olives-hang",
"shy-pumpkins-try",
"silent-colts-reply",
"silly-apricots-share",
"silly-shoes-agree",
"six-apricots-kick",
"slimy-humans-impress",
"slimy-needles-taste",
"slow-impalas-tap",
"slow-walls-camp",
"slow-walls-poke",
"small-socks-confess",
"smooth-planets-admire",
@@ -138,13 +209,18 @@
"sour-mails-lick",
"spicy-beds-float",
"spotty-dingos-stare",
"spotty-lies-visit",
"spotty-peas-hope",
"spotty-zoos-film",
"stale-jobs-drum",
"strong-apes-reply",
"strong-keys-lie",
"stupid-walls-sell",
"sweet-kiwis-cross",
"swift-drinks-dress",
"tall-meals-learn",
"tame-keys-reply",
"tame-pumpkins-nail",
"tasty-maps-fetch",
"tasty-news-collect",
"ten-hairs-listen",
@@ -152,24 +228,30 @@
"tender-pianos-check",
"thick-parrots-float",
"thirty-countries-build",
"thirty-spies-applaud",
"three-lies-pull",
"tidy-clouds-smoke",
"tough-toes-pull",
"twelve-hornets-sip",
"twelve-lemons-smile",
"twelve-needles-worry",
"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-badgers-smoke",
"wicked-ghosts-cough",
"wicked-rings-walk",
"wise-eels-visit",
"wise-frogs-give",
"wise-rabbits-complain"
"wise-rabbits-complain",
"young-birds-talk"
]
}

View File

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

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/generator": patch
---
Fix eslint and types setup in minimal app template

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/generator": patch
---
Fix upgrade-legacy `Update imports` step — import `getAntiCSRFToken` and `AuthenticatedMiddlewareCtx` from correct locations

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/generator": patch
---
Remove `-cookie-prefix` appended to the `cookiePrefix` config property in the new app template. It will also fix auth and CSRF issues for users upgrading from a legacy framework.

View File

@@ -0,0 +1,6 @@
---
"blitz": patch
"@blitzjs/generator": patch
---
Allow passing custom templates to the `blitz generate` command. Extend the `generate` command with `custom-templates` to provide an easy starting point for users to customize the default templates: `blitz generate custom-templates`.

View File

@@ -0,0 +1,5 @@
---
"blitz": patch
---
Only run the prisma generate command when the schema file changes.

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/codemod": patch
---
Fix detecting `blitz.config.(ts|js)` config file when running the codemod.

View File

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

View File

@@ -0,0 +1,5 @@
---
"blitz": patch
---
Add `blitz console` CLI command back to toolkit

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/generator": patch
---
Remove `views` property from `Session.PublicData` in `types.ts` file

View File

@@ -0,0 +1,6 @@
---
"@blitzjs/rpc": patch
"blitz": patch
---
Fix invalidateQuery generating wrong param when no param argument is passed

View File

@@ -0,0 +1,6 @@
---
"@blitzjs/rpc": patch
"blitz": patch
---
Migrate over recipe functionality from legacy framework & expose recipe builder helper functions that find and modify next.config.js, blitz-server & blitz-client.

View File

@@ -0,0 +1,7 @@
---
"blitz": patch
"@blitzjs/next": patch
"@blitzjs/generator": patch
---
Add client testing utilities and a sample test to a new blitz app template

View File

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

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/next": patch
---
Treat API Route handler as a middleware. This allows outer middlewares to completely wrap queries and mutations.

View File

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

View File

@@ -0,0 +1,5 @@
---
"@blitzjs/auth": patch
---
Allow specifying custom strategy name in Blitz's passport adapter

View File

@@ -3,6 +3,11 @@ Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible please:
- Link issue via "Closes #[issue_number]
- Choose & follow the right checklist for the change that you're making:
Please make sure to add a changeset. Run `pnpm changeset` in the root directory to do so.
Then select updated Blitz packages when prompted, and add a short message describing the changes.
The message should be user-facing — explain **what** was changed, not **how**.
Ignore if there are no user-facing changes.
-->
Closes: ?
@@ -11,9 +16,11 @@ Closes: ?
## Bug Checklist
- [ ] Changeset added (run `pnpm changeset` in the root directory)
- [ ] Integration test added (see [test docs](https://blitzjs.com/docs/contributing#running-tests) if needed)
## Feature Checklist
- [ ] Changeset added (run `pnpm changeset` in the root directory)
- [ ] Integration test added (see [test docs](https://blitzjs.com/docs/contributing#running-tests) if needed)
- [ ] Documentation added/updated (submit PR to [blitzjs.com repo `canary` branch](https://github.com/blitz-js/blitzjs.com/tree/canary))
- [ ] Documentation added/updated (submit PR to [blitzjs.com repo `main` branch](https://github.com/blitz-js/blitzjs.com))

26
.github/workflows/changeset_check.yml vendored Normal file
View File

@@ -0,0 +1,26 @@
name: Changeset
on:
pull_request:
types: [opened, synchronize, labeled, unlabeled]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
changeset:
if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-changeset') && github.event.pull_request.merged == false }}
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: 16
- name: Check if changeset is added
run: |
npx @changesets/cli@2.12.0 status --since=origin/${GITHUB_BASE_REF}

View File

@@ -1,5 +1,3 @@
# https://github.com/vercel/next.js/commits/canary/.github/workflows/build_test_deploy.yml
name: CI
on:
@@ -10,16 +8,14 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
TURBO_TOKEN: 05de0230f01174d1f8cb4845a01dc6c895ce28f04ebef2318ab11615791b871c35eabbf8
TURBO_TEAM: foo
jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os:
- ubuntu-latest
node_version:
- 16
name: Node ${{ matrix.node_version }} - ${{ matrix.os }}
lint:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
@@ -28,11 +24,161 @@ jobs:
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node_version }}
node-version: 16
cache: "pnpm"
- name: Install dependencies
run: pnpm install --frozen-lockfile
- run: pnpm manypkg check
- name: Turborepo local server
uses: felixmosh/turborepo-gh-artifacts@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
server-token: ${{ env.TURBO_TOKEN }}
- name: Build
run: pnpm build -- --api="http://127.0.0.1:9080"
- name: Lint
run: pnpm lint -- --api="http://127.0.0.1:9080"
build:
runs-on: ubuntu-latest
name: Build
steps:
- uses: actions/checkout@v2
- uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
with:
version: 6.32.6
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: 16
cache: "pnpm"
- run: pnpm install --frozen-lockfile
- run: pnpm manypkg check
- run: pnpm build
- run: pnpm lint
- run: pnpm build:apps
- run: pnpm test
- name: Turborepo local server
uses: felixmosh/turborepo-gh-artifacts@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
server-token: ${{ env.TURBO_TOKEN }}
- name: Build
run: pnpm build -- --api="http://127.0.0.1:9080"
- name: Build Apps
run: pnpm build:apps -- --api="http://127.0.0.1:9080"
Unit-Tests:
name: "Unit Test: ${{ matrix.os }} (node@16)"
runs-on: ${{ matrix.os }}
strategy:
matrix:
os:
- ubuntu-latest
- windows-latest
fail-fast: false
env:
NODE_VERSION: 16
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup PNPM
uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
with:
version: 6.32.6
- name: Setup node@16
uses: actions/setup-node@v2
with:
node-version: 16
cache: "pnpm"
- name: Install dependencies
run: pnpm install --frozen-lockfile
shell: bash
- run: pnpm manypkg check
shell: bash
- name: Turborepo local server
uses: felixmosh/turborepo-gh-artifacts@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
server-token: ${{ env.TURBO_TOKEN }}
- name: Build
run: pnpm build -- --api="http://127.0.0.1:9080"
shell: bash
- name: Test Packages
run: pnpm test -- --filter=./packages/*
shell: bash
- name: Test Apps
run: pnpm test -- --filter=./apps/*
shell: bash
find-integration-tests:
name: "Find Integration Tests"
runs-on: ubuntu-latest
outputs:
folders: ${{ steps.set-matrix.outputs.folders }}
steps:
- uses: actions/checkout@v2
- id: set-matrix
name: "Find all folders"
shell: bash
run: |
cd ./integration-tests
tree -J -d -L 1 | jq -c '.[0].contents | map(.name | tostring) | map(select(. != "utils"))'
folders=$(tree -J -d -L 1 | jq -c '.[0].contents | map(.name | tostring) | map(select(. != "utils"))')
echo "folders=$folders" >> $GITHUB_OUTPUT
Integration-Tests:
name: "Integration Test: ${{matrix.folder}} @ ${{ matrix.os }} "
needs: [find-integration-tests]
strategy:
matrix:
folder: ${{fromJSON(needs.find-integration-tests.outputs.folders)}}
os:
- ubuntu-latest
- windows-latest
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
- run: echo ${{matrix.folder}}
- name: Checkout
uses: actions/checkout@v3
- name: Setup PNPM
uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
with:
version: 6.32.6
- name: Setup node@${{ matrix.NODE_VERSION }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.NODE_VERSION }}
cache: "pnpm"
- name: Link Blitz CLI
run: pnpm link ./packages/blitz
shell: bash
- name: Install dependencies
run: pnpm install --frozen-lockfile
shell: bash
- run: pnpm manypkg check
shell: bash
- name: Turborepo local server
uses: felixmosh/turborepo-gh-artifacts@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
server-token: ${{ env.TURBO_TOKEN }}
- name: Build
run: pnpm build -- --api="http://127.0.0.1:9080"
shell: bash
- name: Test Packages
run: pnpm test -- --filter=./integration-tests/${{matrix.folder}}
shell: bash

7
.gitignore vendored
View File

@@ -48,13 +48,13 @@ tsconfig.tsbuildinfo
.next
dist
.now
# local env files
**/.env.local
**/.env.*.local
**/.envrc
.blitz-*
.blitz-cli-cache
.vscode
.tsbuildinfo
.nvmrc
**/.test*
@@ -65,7 +65,6 @@ db.sqlite-journal
**/db/db.sqlite
test/integration/**/db.json
test/**/*/out
test/**/blitz-env.d.ts
examples/**/blitz-env.d.ts
test/**/next-env.d.ts
examples/**/next-env.d.ts
.blitz**

3
.vscode/settings.json vendored Normal file
View File

@@ -0,0 +1,3 @@
{
"typescript.tsdk": "node_modules/typescript/lib"
}

View File

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

View File

@@ -6,7 +6,7 @@
<img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
</a>
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-391-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-395-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
<!-- ALL-CONTRIBUTORS-BADGE:END -->
<a aria-label="License" href="https://github.com/blitz-js/blitz/blob/main/LICENSE">
<img alt="" src="https://img.shields.io/npm/l/blitz.svg?style=for-the-badge&labelColor=000000&color=blue">
@@ -76,6 +76,9 @@ Your financial contributions help ensure Blitz continues to be developed and mai
</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"/>
</a></td>
<td><a aria-label="Simon Lammes" href="https://github.com/simon-lammes">
<img alt="" src="https://avatars.githubusercontent.com/u/46446421?v=4" width="40px"/>
</a></td>
</tr>
</table>
@@ -195,6 +198,14 @@ _Issue triage, pull request triage, community encouragement and moderation, etc_
</sub>
</a>
</td>
<td align="center">
<a href="https://siddharthsuresh.vercel.app/">
<img src="https://avatars.githubusercontent.com/u/83594610?v=4" width="100px;" alt="Siddharth Suresh avatar" /><br />
<sub>
<b>Siddharth Suresh</b>
</sub>
</a>
</td>
</tr>
</table>
<!-- markdownlint-enable -->
@@ -712,8 +723,13 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
<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" 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>
<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> <a href="https://github.com/blitz-js/blitz/commits?author=siddhsuresh" title="Tests">⚠️</a> <a href="#maintenance-siddhsuresh" title="Maintenance">🚧</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>
<td align="center"><a href="https://github.com/oloost"><img src="https://avatars.githubusercontent.com/u/72395941?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oloost</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=oloost" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/janvennemann"><img src="https://avatars.githubusercontent.com/u/1406024?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jan Vennemann</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=janvennemann" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=janvennemann" title="Code">💻</a></td>
</tr>
</table>

View File

@@ -0,0 +1,11 @@
# https://EditorConfig.org
root = true
[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

View File

@@ -0,0 +1,3 @@
# This env file should be checked into source control
# This is the place for default values for all environments
# Values in `.env.local` and `.env.production` will override these values

View File

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

56
apps/toolkit-app-passportjs/.gitignore vendored Normal file
View File

@@ -0,0 +1,56 @@
# dependencies
node_modules
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
.pnp.*
.npm
web_modules/
# blitz
/.blitz/
/.next/
*.sqlite
*.sqlite-journal
.now
.blitz**
blitz-log.log
# misc
.DS_Store
# local env files
.env.local
.env.*.local
.envrc
# Logs
logs
*.log
# Runtime data
pids
*.pid
*.seed
*.pid.lock
# Testing
.coverage
*.lcov
.nyc_output
lib-cov
# Caches
*.tsbuildinfo
.eslintcache
.node_repl_history
.yarn-integrity
# Serverless directories
.serverless/
# Stores VSCode versions used for testing VSCode extensions
.vscode-test

View File

@@ -0,0 +1,8 @@
save-exact=true
legacy-peer-deps=true
public-hoist-pattern[]=@tanstack/react-query
public-hoist-pattern[]=next
public-hoist-pattern[]=secure-password
public-hoist-pattern[]=*jest*
public-hoist-pattern[]=@testing-library/*

View File

@@ -0,0 +1,9 @@
.gitkeep
.env*
*.ico
*.lock
db/migrations
.next
.yarn
.pnp.*
node_modules

View File

@@ -0,0 +1,2 @@
# toolkit-app-passportjs

View File

@@ -0,0 +1,175 @@
TODO
[![Blitz.js](https://raw.githubusercontent.com/blitz-js/art/master/github-cover-photo.png)](https://blitzjs.com)
This is a [Blitz.js](https://github.com/blitz-js/blitz) app.
# \***\*name\*\***
## Getting Started
Run your app in the development mode.
```
blitz dev
```
Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
## Environment Variables
Ensure the `.env.local` file has required environment variables:
```
DATABASE_URL=postgresql://<YOUR_DB_USERNAME>@localhost:5432/__name__
```
Ensure the `.env.test.local` file has required environment variables:
```
DATABASE_URL=postgresql://<YOUR_DB_USERNAME>@localhost:5432/__name___test
```
## Tests
Runs your tests using Jest.
```
yarn test
```
Blitz comes with a test setup using [Jest](https://jestjs.io/) and [react-testing-library](https://testing-library.com/).
## Commands
Blitz comes with a powerful CLI that is designed to make development easy and fast. You can install it with `npm i -g blitz`
```
blitz [COMMAND]
dev Start a development server
build Create a production build
start Start a production server
export Export your Blitz app as a static application
prisma Run prisma commands
generate Generate new files for your Blitz project
console Run the Blitz console REPL
install Install a recipe
help Display help for blitz
test Run project tests
```
You can read more about it on the [CLI Overview](https://blitzjs.com/docs/cli-overview) documentation.
## What's included?
Here is the starting structure of your app.
```
__name__
├── app/
│ ├── api/
│ ├── auth/
│ │ ├── components/
│ │ │ ├── LoginForm.tsx
│ │ │ └── SignupForm.tsx
│ │ ├── mutations/
│ │ │ ├── changePassword.ts
│ │ │ ├── forgotPassword.test.ts
│ │ │ ├── forgotPassword.ts
│ │ │ ├── login.ts
│ │ │ ├── logout.ts
│ │ │ ├── resetPassword.test.ts
│ │ │ ├── resetPassword.ts
│ │ │ └── signup.ts
│ │ ├── pages/
│ │ │ ├── forgot-password.tsx
│ │ │ ├── login.tsx
│ │ │ ├── reset-password.tsx
│ │ │ └── signup.tsx
│ │ └── validations.ts
│ ├── core/
│ │ ├── components/
│ │ │ ├── Form.tsx
│ │ │ └── LabeledTextField.tsx
│ │ └── layouts/
│ │ └── Layout.tsx
│ ├── pages/
│ │ ├── _app.tsx
│ │ ├── _document.tsx
│ │ ├── 404.tsx
│ │ ├── index.test.tsx
│ │ └── index.tsx
│ └── users/
│ ├── hooks/
│ │ └── useCurrentUser.ts
│ └── queries/
│ └── getCurrentUser.ts
├── db/
│ ├── migrations/
│ ├── index.ts
│ ├── schema.prisma
│ └── seeds.ts
├── integrations/
├── mailers/
│ └── forgotPasswordMailer.ts
├── public/
│ ├── favicon.ico
│ └── logo.png
├── test/
│ ├── setup.ts
│ └── utils.tsx
├── .eslintrc.js
├── babel.config.js
├── blitz.config.ts
├── jest.config.ts
├── package.json
├── README.md
├── tsconfig.json
└── types.ts
```
These files are:
- The `app/` folder is a container for most of your project. This is where youll put any pages or API routes.
- `db/` is where your database configuration goes. If youre writing models or checking migrations, this is where to go.
- `public/` is a folder where you will put any static assets. If you have images, files, or videos which you want to use in your app, this is where to put them.
- `integrations/` is a folder to put all third-party integrations like with Stripe, Sentry, etc.
- `test/` is a folder where you can put test utilities and integration tests.
- `package.json` contains information about your dependencies and devDependencies. If youre using a tool like `npm` or `yarn`, you wont have to worry about this much.
- `tsconfig.json` is our recommended setup for TypeScript.
- `.babel.config.js`, `.eslintrc.js`, `.env`, etc. ("dotfiles") are configuration files for various bits of JavaScript tooling.
- `blitz.config.ts` is for advanced custom configuration of Blitz. [Here you can learn how to use it](https://blitzjs.com/docs/blitz-config).
- `jest.config.js` contains config for Jest tests. You can [customize it if needed](https://jestjs.io/docs/en/configuration).
You can read more about it in the [File Structure](https://blitzjs.com/docs/file-structure) section of the documentation.
### Tools included
Blitz comes with a set of tools that corrects and formats your code, facilitating its future maintenance. You can modify their options and even uninstall them.
- **ESLint**: It lints your code: searches for bad practices and tell you about it. You can customize it via the `.eslintrc.js`, and you can install (or even write) plugins to have it the way you like it. It already comes with the [`blitz`](https://github.com/blitz-js/blitz/tree/canary/packages/eslint-config) config, but you can remove it safely. [Learn More](https://blitzjs.com/docs/eslint-config).
- **Husky**: It adds [githooks](https://git-scm.com/docs/githooks), little pieces of code that get executed when certain Git events are triggerd. For example, `pre-commit` is triggered just before a commit is created. You can see the current hooks inside `.husky/`. If are having problems commiting and pushing, check out ther [troubleshooting](https://typicode.github.io/husky/#/?id=troubleshoot) guide. [Learn More](https://blitzjs.com/docs/husky-config).
- **Prettier**: It formats your code to look the same everywhere. You can configure it via the `.prettierrc` file. The `.prettierignore` contains the files that should be ignored by Prettier; useful when you have large files or when you want to keep a custom formatting. [Learn More](https://blitzjs.com/docs/prettier-config).
## Learn more
Read the [Blitz.js Documentation](https://blitzjs.com/docs/getting-started) to learn more.
The Blitz community is warm, safe, diverse, inclusive, and fun! Feel free to reach out to us in any of our communication channels.
- [Website](https://blitzjs.com)
- [Discord](https://blitzjs.com/discord)
- [Report an issue](https://github.com/blitz-js/blitz/issues/new/choose)
- [Forum discussions](https://github.com/blitz-js/blitz/discussions)
- [How to Contribute](https://blitzjs.com/docs/contributing)
- [Sponsor or donate](https://github.com/blitz-js/blitz#sponsors-and-donations)

View File

@@ -0,0 +1,59 @@
import { AuthenticationError, PromiseReturnType } from "blitz"
import Link from "next/link"
import { LabeledTextField } from "app/core/components/LabeledTextField"
import { Form, FORM_ERROR } from "app/core/components/Form"
import login from "app/auth/mutations/login"
import { Login } from "app/auth/validations"
import { useMutation } from "@blitzjs/rpc"
import { Routes } from "@blitzjs/next"
type LoginFormProps = {
onSuccess?: (user: PromiseReturnType<typeof login>) => void
}
export const LoginForm = (props: LoginFormProps) => {
const [loginMutation] = useMutation(login)
return (
<div>
<h1>Login</h1>
<Form
submitText="Login"
schema={Login}
initialValues={{ email: "", password: "" }}
onSubmit={async (values) => {
try {
const user = await loginMutation(values)
props.onSuccess?.(user)
} catch (error: any) {
if (error instanceof AuthenticationError) {
return { [FORM_ERROR]: "Sorry, those credentials are invalid" }
} else {
return {
[FORM_ERROR]:
"Sorry, we had an unexpected error. Please try again. - " + error.toString(),
}
}
}
}}
>
<LabeledTextField name="email" label="Email" placeholder="Email" />
<LabeledTextField name="password" label="Password" placeholder="Password" type="password" />
<div>
<Link href={Routes.ForgotPasswordPage()} passHref>
<a>Forgot your password?</a>
</Link>
</div>
</Form>
<div style={{ marginTop: "1rem" }}>
Or{" "}
<Link href={Routes.SignupPage()} passHref>
<a>Sign Up</a>
</Link>
</div>
</div>
)
}
export default LoginForm

View File

@@ -0,0 +1,42 @@
import { LabeledTextField } from "app/core/components/LabeledTextField"
import { Form, FORM_ERROR } from "app/core/components/Form"
import signup from "app/auth/mutations/signup"
import { Signup } from "app/auth/validations"
import { useMutation } from "@blitzjs/rpc"
type SignupFormProps = {
onSuccess?: () => void
}
export const SignupForm = (props: SignupFormProps) => {
const [signupMutation] = useMutation(signup)
return (
<div>
<h1>Create an Account</h1>
<Form
submitText="Create Account"
schema={Signup}
initialValues={{ email: "", password: "" }}
onSubmit={async (values) => {
try {
await signupMutation(values)
props.onSuccess?.()
} catch (error: any) {
if (error.code === "P2002" && error.meta?.target?.includes("email")) {
// This error comes from Prisma
return { email: "This email is already being used" }
} else {
return { [FORM_ERROR]: error.toString() }
}
}
}}
>
<LabeledTextField name="email" label="Email" placeholder="Email" />
<LabeledTextField name="password" label="Password" placeholder="Password" type="password" />
</Form>
</div>
)
}
export default SignupForm

View File

@@ -0,0 +1,25 @@
import { NotFoundError } from "blitz"
import db from "db"
import { authenticateUser } from "./login"
import { ChangePassword } from "../validations"
import { resolver } from "@blitzjs/rpc"
import { SecurePassword } from "@blitzjs/auth"
export default resolver.pipe(
resolver.zod(ChangePassword),
resolver.authorize(),
async ({ currentPassword, newPassword }, ctx) => {
const user = await db.user.findFirst({ where: { id: ctx.session.userId as number } })
if (!user) throw new NotFoundError()
await authenticateUser(user.email, currentPassword)
const hashedPassword = await SecurePassword.hash(newPassword.trim())
await db.user.update({
where: { id: user.id },
data: { hashedPassword },
})
return true
}
)

View File

@@ -0,0 +1,42 @@
import { generateToken, hash256 } from "@blitzjs/auth"
import { resolver } from "@blitzjs/rpc"
import db from "db"
import { forgotPasswordMailer } from "mailers/forgotPasswordMailer"
import { ForgotPassword } from "../validations"
const RESET_PASSWORD_TOKEN_EXPIRATION_IN_HOURS = 4
export default resolver.pipe(resolver.zod(ForgotPassword), async ({ email }) => {
// 1. Get the user
const user = await db.user.findFirst({ where: { email: email.toLowerCase() } })
// 2. Generate the token and expiration date.
const token = generateToken()
const hashedToken = hash256(token)
const expiresAt = new Date()
expiresAt.setHours(expiresAt.getHours() + RESET_PASSWORD_TOKEN_EXPIRATION_IN_HOURS)
// 3. If user with this email was found
if (user) {
// 4. Delete any existing password reset tokens
await db.token.deleteMany({ where: { type: "RESET_PASSWORD", userId: user.id } })
// 5. Save this new token in the database.
await db.token.create({
data: {
user: { connect: { id: user.id } },
type: "RESET_PASSWORD",
expiresAt,
hashedToken,
sentTo: user.email,
},
})
// 6. Send the email
await forgotPasswordMailer({ to: user.email, token }).send()
} else {
// 7. If no user found wait the same time so attackers can't tell the difference
await new Promise((resolve) => setTimeout(resolve, 750))
}
// 8. Return the same result whether a password reset email was sent or not
return
})

View File

@@ -0,0 +1,32 @@
import { SecurePassword } from "@blitzjs/auth"
import { resolver } from "@blitzjs/rpc"
import { AuthenticationError } from "blitz"
import db from "db"
import { Role } from "types"
import { Login } from "../validations"
export const authenticateUser = async (rawEmail: string, rawPassword: string) => {
const { email, password } = Login.parse({ email: rawEmail, password: rawPassword })
const user = await db.user.findFirst({ where: { email } })
if (!user) throw new AuthenticationError()
const result = await SecurePassword.verify(user.hashedPassword, password)
if (result === SecurePassword.VALID_NEEDS_REHASH) {
// Upgrade hashed password with a more secure hash
const improvedHash = await SecurePassword.hash(password)
await db.user.update({ where: { id: user.id }, data: { hashedPassword: improvedHash } })
}
const { hashedPassword, ...rest } = user
return rest
}
export default resolver.pipe(resolver.zod(Login), async ({ email, password }, ctx) => {
// This throws an error if credentials are invalid
const user = await authenticateUser(email, password)
await ctx.session.$create({ userId: user.id, role: user.role as Role })
return user
})

View File

@@ -0,0 +1,5 @@
import { Ctx } from "blitz"
export default async function logout(_: any, ctx: Ctx) {
return await ctx.session.$revoke()
}

View File

@@ -0,0 +1,48 @@
import { SecurePassword, hash256 } from "@blitzjs/auth"
import db from "db"
import { ResetPassword } from "../validations"
import login from "./login"
export class ResetPasswordError extends Error {
name = "ResetPasswordError"
message = "Reset password link is invalid or it has expired."
}
export default async function resetPassword(input, ctx) {
ResetPassword.parse(input)
// 1. Try to find this token in the database
const hashedToken = hash256(input.token)
const possibleToken = await db.token.findFirst({
where: { hashedToken, type: "RESET_PASSWORD" },
include: { user: true },
})
// 2. If token not found, error
if (!possibleToken) {
throw new ResetPasswordError()
}
const savedToken = possibleToken
// 3. Delete token so it can't be used again
await db.token.delete({ where: { id: savedToken.id } })
// 4. If token has expired, error
if (savedToken.expiresAt < new Date()) {
throw new ResetPasswordError()
}
// 5. Since token is valid, now we can update the user's password
const hashedPassword = await SecurePassword.hash(input.password.trim())
const user = await db.user.update({
where: { id: savedToken.userId },
data: { hashedPassword },
})
// 6. Revoke all existing login sessions for this user
await db.session.deleteMany({ where: { userId: user.id } })
// 7. Now log the user in with the new credentials
await login({ email: user.email, password: input.password }, ctx)
return true
}

View File

@@ -0,0 +1,21 @@
import db from "db"
import { SecurePassword } from "@blitzjs/auth"
import { Role } from "types"
export default async function signup(input, ctx) {
const blitzContext = ctx
const hashedPassword = await SecurePassword.hash((input.password as string) || "test-password")
const email = (input.email as string) || "test" + Math.random() + "@test.com"
const user = await db.user.create({
data: { email, hashedPassword, role: "user" },
select: { id: true, name: true, email: true, role: true },
})
await blitzContext.session.$create({
userId: user.id,
role: user.role as Role,
})
return { userId: blitzContext.session.userId, ...user, email: input.email }
}

View File

@@ -0,0 +1,42 @@
import { z } from "zod"
export const email = z
.string()
.email()
.transform((str) => str.toLowerCase().trim())
export const password = z
.string()
.min(10)
.max(100)
.transform((str) => str.trim())
export const Signup = z.object({
email,
password,
})
export const Login = z.object({
email,
password: z.string(),
})
export const ForgotPassword = z.object({
email,
})
export const ResetPassword = z
.object({
password: password,
passwordConfirmation: password,
token: z.string(),
})
.refine((data) => data.password === data.passwordConfirmation, {
message: "Passwords don't match",
path: ["passwordConfirmation"], // set the path of the error
})
export const ChangePassword = z.object({
currentPassword: z.string(),
newPassword: password,
})

View File

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

View File

@@ -0,0 +1,18 @@
import { setupBlitzServer } from "@blitzjs/next"
import { AuthServerPlugin, PrismaStorage } from "@blitzjs/auth"
import db from "db"
import { simpleRolesIsAuthorized } from "@blitzjs/auth"
import { BlitzLogger } from "blitz"
const { gSSP, gSP, api } = setupBlitzServer({
plugins: [
AuthServerPlugin({
cookiePrefix: "web-cookie-prefix",
storage: PrismaStorage(db),
isAuthorized: simpleRolesIsAuthorized,
}),
],
logger: BlitzLogger({}),
})
export { gSSP, gSP, api }

View File

@@ -0,0 +1,83 @@
import { useState, ReactNode, PropsWithoutRef } from "react"
import { FormProvider, useForm, UseFormProps } from "react-hook-form"
import { zodResolver } from "@hookform/resolvers/zod"
import { z } from "zod"
export interface FormProps<S extends z.ZodType<any, any>>
extends Omit<PropsWithoutRef<JSX.IntrinsicElements["form"]>, "onSubmit"> {
/** All your form fields */
children?: ReactNode
/** Text to display in the submit button */
submitText?: string
schema?: S
onSubmit: (values: z.infer<S>) => Promise<void | OnSubmitResult>
initialValues?: UseFormProps<z.infer<S>>["defaultValues"]
}
interface OnSubmitResult {
FORM_ERROR?: string
[prop: string]: any
}
export const FORM_ERROR = "FORM_ERROR"
export function Form<S extends z.ZodType<any, any>>({
children,
submitText,
schema,
initialValues,
onSubmit,
...props
}: FormProps<S>) {
const ctx = useForm<z.infer<S>>({
mode: "onBlur",
resolver: schema ? zodResolver(schema) : undefined,
defaultValues: initialValues,
})
const [formError, setFormError] = useState<string | null>(null)
return (
<FormProvider {...ctx}>
<form
onSubmit={ctx.handleSubmit(async (values) => {
const result = (await onSubmit(values)) || {}
for (const [key, value] of Object.entries(result)) {
if (key === FORM_ERROR) {
setFormError(value)
} else {
ctx.setError(key as any, {
type: "submit",
message: value,
})
}
}
})}
className="form"
{...props}
>
{/* Form fields supplied as children are rendered here */}
{children}
{formError && (
<div role="alert" style={{ color: "red" }}>
{formError}
</div>
)}
{submitText && (
<button type="submit" disabled={ctx.formState.isSubmitting}>
{submitText}
</button>
)}
<style global jsx>{`
.form > * + * {
margin-top: 1rem;
}
`}</style>
</form>
</FormProvider>
)
}
export default Form

View File

@@ -0,0 +1,59 @@
import { forwardRef, PropsWithoutRef, ComponentPropsWithoutRef } from "react"
import { useFormContext } from "react-hook-form"
export interface LabeledTextFieldProps extends PropsWithoutRef<JSX.IntrinsicElements["input"]> {
/** Field name. */
name: string
/** Field label. */
label: string
/** Field type. Doesn't include radio buttons and checkboxes */
type?: "text" | "password" | "email" | "number"
outerProps?: PropsWithoutRef<JSX.IntrinsicElements["div"]>
labelProps?: ComponentPropsWithoutRef<"label">
}
export const LabeledTextField = forwardRef<HTMLInputElement, LabeledTextFieldProps>(
({ label, outerProps, labelProps, name, ...props }, ref) => {
const {
register,
formState: { isSubmitting, errors },
} = useFormContext()
const error = Array.isArray(errors[name])
? errors[name].join(", ")
: errors[name]?.message || errors[name]
return (
<div {...outerProps}>
<label {...labelProps}>
{label}
<input disabled={isSubmitting} {...register(name)} {...props} />
</label>
{error && (
<div role="alert" style={{ color: "red" }}>
{error}
</div>
)}
<style jsx>{`
label {
display: flex;
flex-direction: column;
align-items: start;
font-size: 1rem;
}
input {
font-size: 1rem;
padding: 0.25rem 0.5rem;
border-radius: 3px;
border: 1px solid purple;
appearance: none;
margin-top: 0.5rem;
}
`}</style>
</div>
)
}
)
export default LabeledTextField

View File

@@ -0,0 +1,21 @@
import React from "react"
import Head from "next/head"
import { BlitzLayout } from "@blitzjs/next"
const Layout: BlitzLayout<{ title?: string; children?: React.ReactNode }> = ({
title,
children,
}) => {
return (
<>
<Head>
<title>{title || "__name__"}</title>
<link rel="icon" href="/favicon.ico" />
</Head>
{children}
</>
)
}
export default Layout

View File

@@ -0,0 +1,13 @@
import { Ctx } from "blitz"
import db from "db"
export default async function getCurrentUser(_ = null, { session }: Ctx) {
if (!session.userId) return null
const user = await db.user.findFirst({
where: { id: session.userId as number },
select: { id: true, name: true, email: true, role: true },
})
return user
}

View File

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

View File

@@ -0,0 +1,47 @@
-- 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,
"hashedSessionToken" TEXT,
"antiCSRFToken" TEXT,
"publicData" TEXT,
"privateData" TEXT,
"userId" INTEGER,
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

@@ -0,0 +1,65 @@
// This is your Prisma schema file,
// learn more about it in the docs: https://pris.ly/d/prisma-schema
datasource db {
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")
tokens Token[]
sessions Session[]
}
model Session {
id Int @id @default(autoincrement())
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
expiresAt DateTime?
handle String @unique
hashedSessionToken String?
antiCSRFToken String?
publicData String?
privateData String?
user User? @relation(fields: [userId], references: [id])
userId Int?
}
model Token {
id Int @id @default(autoincrement())
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
hashedToken String
type String
// See note below about TokenType enum
// type TokenType
expiresAt DateTime
sentTo String
user User @relation(fields: [userId], references: [id])
userId Int
@@unique([hashedToken, type])
}
// NOTE: It's highly recommended to use an enum for the token type
// but enums only work in Postgres.
// See: https://blitzjs.com/docs/database-overview#switch-to-postgre-sql
// enum TokenType {
// RESET_PASSWORD
// }

View File

@@ -0,0 +1,21 @@
import db from "./index"
/*
* This seed function is executed when you run `blitz db seed`.
*
* Probably you want to use a library like https://chancejs.com
* to easily generate realistic data.
*/
const seed = async () => {
await db.$reset()
for (let i = 0; i < 1; i++) {
await db.user.create({
data: {
email: "test@test.com",
},
})
}
}
export default seed

View File

@@ -0,0 +1,11 @@
const nextJest = require("@blitzjs/next/jest")
const createJestConfig = nextJest({
dir: "./",
})
const customJestConfig = {
testEnvironment: "jest-environment-jsdom",
}
module.exports = createJestConfig(customJestConfig)

View File

@@ -0,0 +1,5 @@
{
"compilerOptions": {
"baseUrl": "."
}
}

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