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

Compare commits

..

4 Commits

Author SHA1 Message Date
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
23 changed files with 133 additions and 97 deletions

View File

@@ -43,18 +43,24 @@
"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",
"empty-berries-rule",
"empty-turkeys-wave",
"fair-carrots-guess",
"fair-kangaroos-clean",
"fair-wombats-sneeze",
"famous-kings-explain",
"fast-clocks-push",
"fast-trainers-kneel",
"few-dogs-fetch",
"flat-bees-approve",
"fluffy-mangos-begin",
"fluffy-mice-wash",
"forty-timers-rhyme",
"four-brooms-juggle",
"four-meals-fry",
@@ -76,6 +82,7 @@
"happy-hotels-visit",
"healthy-rice-shout",
"heavy-apes-judge",
"honest-candles-yawn",
"hot-cups-rhyme",
"hot-drinks-approve",
"hungry-baboons-swim",
@@ -86,15 +93,18 @@
"lemon-seas-push",
"light-donkeys-double",
"long-bees-hope",
"long-dancers-jog",
"long-lobsters-drop",
"lovely-berries-sell",
"lovely-colts-share",
"lucky-cows-try",
"lucky-months-guess",
"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",
@@ -125,19 +135,23 @@
"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-walls-camp",
"slow-walls-poke",
"small-socks-confess",
"smooth-planets-admire",
@@ -184,6 +198,7 @@
"wicked-rings-walk",
"wise-eels-visit",
"wise-frogs-give",
"wise-rabbits-complain"
"wise-rabbits-complain",
"young-birds-talk"
]
}

View File

@@ -1,5 +1,5 @@
{
"name": "toolkit-app",
"name": "toolkit-app-passport",
"version": "1.0.1-alpha.16",
"scripts": {
"start:dev": "pnpm run prisma:start && blitz dev",
@@ -29,7 +29,7 @@
"@blitzjs/rpc": "workspace:*",
"@hookform/resolvers": "2.8.8",
"@prisma/client": "4.0.0",
"blitz": "workspace:2.0.0-beta.3",
"blitz": "workspace:2.0.0-beta.4",
"next": "12.2.5",
"openid-client": "5.1.8",
"prisma": "4.0.0",

View File

@@ -29,7 +29,7 @@
"@blitzjs/rpc": "workspace:*",
"@hookform/resolvers": "2.8.8",
"@prisma/client": "4.0.0",
"blitz": "workspace:2.0.0-beta.3",
"blitz": "workspace:2.0.0-beta.4",
"next": "12.2.5",
"prisma": "4.0.0",
"react": "18.2.0",

View File

@@ -12,8 +12,7 @@
"start": "next start",
"lint": "next lint",
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",
"prisma:start": "prisma generate && prisma migrate dev && pnpm run prisma:seed",
"prisma:seed": "prisma db seed",
"prisma:start": "prisma generate && prisma migrate dev",
"prisma:studio": "prisma studio"
},
"dependencies": {

View File

@@ -1,22 +1,20 @@
import prisma from "./index"
import {SecurePassword} from "@blitzjs/auth"
import { SecurePassword } from "@blitzjs/auth"
const seed = async () => {
await prisma.$reset()
// await prisma.$reset()
const hashedPassword = await SecurePassword.hash("abcd1234")
await prisma.user
.create({
data: {
email: "test@test.com",
hashedPassword,
role: "user",
},
})
.catch(console.error)
await prisma.user.create({
data: {
email: "test@test.com",
hashedPassword,
role: "user",
},
}).catch(console.error)
process.exit(0)
process.exit(0);
}
seed()

View File

@@ -1,5 +1,5 @@
{
"name": "test-trailing-slash",
"name": "test-get-initial-props",
"version": "0.0.0",
"private": true,
"scripts": {

View File

@@ -1,5 +1,15 @@
# @blitzjs/auth
## 2.0.0-beta.4
### Patch Changes
- 713aead9: Allow specifying custom strategy name in Blitz's passport adapter
- Updated dependencies [c213d521]
- Updated dependencies [0b94a450]
- Updated dependencies [161270e3]
- blitz@2.0.0-beta.4
## 2.0.0-beta.3
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/auth",
"version": "2.0.0-beta.3",
"version": "2.0.0-beta.4",
"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-beta.4",
"cookie": "0.4.1",
"cookie-session": "2.0.0",
"debug": "4.3.3",
@@ -40,7 +40,7 @@
"url": "0.11.0"
},
"devDependencies": {
"@blitzjs/config": "workspace:2.0.0-beta.3",
"@blitzjs/config": "workspace:2.0.0-beta.4",
"@testing-library/react": "13.0.0",
"@testing-library/react-hooks": "7.0.2",
"@types/cookie": "0.4.1",

View File

@@ -1,5 +1,16 @@
# @blitzjs/next
## 2.0.0-beta.4
### Patch Changes
- 69fb2803: Allow setting static page properties (e.g. `getInitialProps`) on the App component
- 0b94a450: Upgrade superjson to the latest version
- Updated dependencies [c213d521]
- Updated dependencies [0b94a450]
- Updated dependencies [f6dac093]
- @blitzjs/rpc@2.0.0-beta.4
## 2.0.0-beta.3
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/next",
"version": "2.0.0-beta.3",
"version": "2.0.0-beta.4",
"scripts": {
"build": "unbuild",
"dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -24,7 +24,7 @@
"eslint.js"
],
"dependencies": {
"@blitzjs/rpc": "2.0.0-beta.3",
"@blitzjs/rpc": "2.0.0-beta.4",
"@tanstack/react-query": "4.0.10",
"@types/hoist-non-react-statics": "3.3.1",
"debug": "4.3.3",
@@ -34,7 +34,7 @@
"supports-color": "8.1.1"
},
"devDependencies": {
"@blitzjs/config": "workspace:2.0.0-beta.3",
"@blitzjs/config": "workspace:2.0.0-beta.4",
"@testing-library/dom": "8.13.0",
"@testing-library/jest-dom": "5.16.3",
"@testing-library/react": "13.0.0",
@@ -44,7 +44,7 @@
"@types/react": "18.0.17",
"@types/react-dom": "17.0.14",
"@types/testing-library__react-hooks": "4.0.0",
"blitz": "2.0.0-beta.3",
"blitz": "2.0.0-beta.4",
"cross-spawn": "7.0.3",
"find-up": "4.1.0",
"next": "12.2.5",

View File

@@ -1,5 +1,15 @@
# @blitzjs/rpc
## 2.0.0-beta.4
### Patch Changes
- c213d521: Fix issue with the route name that's generated for nested routes in @blitzjs/rpc. This was causing issues for windows users.
- 0b94a450: Upgrade superjson to the latest version
- f6dac093: Improve RPC logging: print `resolverName()` insetad of `/resolverName()`
- Updated dependencies [713aead9]
- @blitzjs/auth@2.0.0-beta.4
## 2.0.0-beta.3
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/rpc",
"version": "2.0.0-beta.3",
"version": "2.0.0-beta.4",
"scripts": {
"build": "unbuild",
"predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts && wait-on -d 250 ../blitz-auth/dist/index-browser.d.ts",
@@ -20,7 +20,7 @@
"dist/**"
],
"dependencies": {
"@blitzjs/auth": "2.0.0-beta.3",
"@blitzjs/auth": "2.0.0-beta.4",
"@tanstack/react-query": "4.0.10",
"b64-lite": "1.4.0",
"bad-behavior": "1.0.1",
@@ -30,11 +30,11 @@
"supports-color": "8.1.1"
},
"devDependencies": {
"@blitzjs/config": "workspace:2.0.0-beta.3",
"@blitzjs/config": "workspace:2.0.0-beta.4",
"@types/debug": "4.1.7",
"@types/react": "18.0.17",
"@types/react-dom": "17.0.14",
"blitz": "2.0.0-beta.3",
"blitz": "2.0.0-beta.4",
"next": "12.2.5",
"react": "18.2.0",
"react-dom": "18.2.0",

View File

@@ -1,5 +1,19 @@
# blitz
## 2.0.0-beta.4
### Patch Changes
- c213d521: Fix issue with the route name that's generated for nested routes in @blitzjs/rpc. This was causing issues for windows users.
- 0b94a450: Upgrade superjson to the latest version
- 161270e3: Only run the prisma generate command when the schema file changes.
- Updated dependencies [7498aef4]
- Updated dependencies [22344d05]
- Updated dependencies [8fa9a56f]
- Updated dependencies [c53978d5]
- Updated dependencies [a84b8de4]
- @blitzjs/generator@2.0.0-beta.4
## 2.0.0-beta.3
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "blitz",
"version": "2.0.0-beta.3",
"version": "2.0.0-beta.4",
"scripts": {
"build": "unbuild",
"dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
"blitz": "bin/blitz"
},
"dependencies": {
"@blitzjs/generator": "2.0.0-beta.3",
"@blitzjs/generator": "2.0.0-beta.4",
"arg": "5.0.1",
"boxen": "7.0.0",
"chalk": "^4.1.0",
@@ -47,7 +47,6 @@
"prompts": "2.4.2",
"resolve-cwd": "3.0.0",
"resolve-from": "5.0.0",
"shelljs": "0.8.5",
"superjson": "1.9.1",
"supports-color": "8.1.1",
"ts-node": "10.7.0",
@@ -56,7 +55,7 @@
"watchpack": "2.1.1"
},
"devDependencies": {
"@blitzjs/config": "workspace:2.0.0-beta.3",
"@blitzjs/config": "workspace:2.0.0-beta.4",
"@types/cookie": "0.4.1",
"@types/cross-spawn": "6.0.2",
"@types/debug": "4.1.7",
@@ -70,7 +69,6 @@
"@types/prompts": "2.0.14",
"@types/react": "18.0.17",
"@types/react-dom": "17.0.14",
"@types/shelljs": "0.8.11",
"@types/test-listen": "1.1.0",
"@types/watchpack": "1.1.1",
"express": "4.17.3",

View File

@@ -35,11 +35,9 @@ export const enhancePrisma = <TPrismaClientCtor extends Constructor>(
"You are calling db.$reset() in a production environment. We think you probably didn't mean to do that, so we are throwing this error instead of destroying your life's work.",
)
}
const prismaBin = which(process.cwd()).sync("prisma")
await new Promise((res, rej) => {
const process = spawn(prismaBin, ["db", "push", "--force-reset"], {
const process = spawn(prismaBin, ["migrate", "reset", "--force", "--skip-generate"], {
stdio: "ignore",
})
process.on("exit", (code) => (code === 0 ? res(0) : rej(code)))

View File

@@ -1,5 +1,24 @@
# @blitzjs/codemod
## 2.0.0-beta.4
### Patch Changes
- d3403cf8: Show file path on error when running the upgrade legacy codemod.
- 74a4ce8e: Add `AuthenticatedSessionContext` to the `upgrade-legacy` codemod import map
- 43e65cfe: Remove TypeScript type annotations from `next.config.js` (a JavaScript file) in the `upgrade-legacy` codemod.
- da914c92: Convert import statements to require when creating the next.config.js file in the codemod
- Updated dependencies [7498aef4]
- Updated dependencies [c213d521]
- Updated dependencies [0b94a450]
- Updated dependencies [22344d05]
- Updated dependencies [8fa9a56f]
- Updated dependencies [c53978d5]
- Updated dependencies [a84b8de4]
- Updated dependencies [161270e3]
- @blitzjs/generator@2.0.0-beta.4
- blitz@2.0.0-beta.4
## 2.0.0-beta.3
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/codemod",
"version": "2.0.0-beta.3",
"version": "2.0.0-beta.4",
"scripts": {
"build": "unbuild",
"dev": "watch unbuild src --wait=0.2",
@@ -25,9 +25,9 @@
"@babel/plugin-proposal-class-properties": "7.17.12",
"@babel/plugin-syntax-jsx": "7.17.12",
"@babel/plugin-syntax-typescript": "7.17.12",
"@blitzjs/generator": "2.0.0-beta.3",
"@blitzjs/generator": "2.0.0-beta.4",
"arg": "5.0.1",
"blitz": "2.0.0-beta.3",
"blitz": "2.0.0-beta.4",
"chalk": "^4.1.0",
"cross-spawn": "7.0.3",
"debug": "4.3.3",

View File

@@ -1,5 +1,7 @@
# @blitzjs/config
## 2.0.0-beta.4
## 2.0.0-beta.3
## 2.0.0-beta.2

View File

@@ -1,7 +1,7 @@
{
"name": "@blitzjs/config",
"private": true,
"version": "2.0.0-beta.3",
"version": "2.0.0-beta.4",
"license": "MIT",
"dependencies": {
"@typescript-eslint/eslint-plugin": "5.9.1",

View File

@@ -1,5 +1,15 @@
# @blitzjs/generator
## 2.0.0-beta.4
### Patch Changes
- 7498aef4: Fix tsconfig.json referencing blitz-env.d.ts insetad of next-env.d.ts in new app templates
- 22344d05: 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**.
- 8fa9a56f: Fix eslint and types setup in minimal app template
- c53978d5: Fix upgrade-legacy `Update imports` step — import `getAntiCSRFToken` and `AuthenticatedMiddlewareCtx` from correct locations
- a84b8de4: 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.
## 2.0.0-beta.3
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@blitzjs/generator",
"version": "2.0.0-beta.3",
"version": "2.0.0-beta.4",
"scripts": {
"dev": "watch unbuild src --wait=0.2",
"build": "unbuild && pnpm build:templates",
@@ -46,7 +46,7 @@
"vinyl": "2.2.1"
},
"devDependencies": {
"@blitzjs/config": "2.0.0-beta.3",
"@blitzjs/config": "2.0.0-beta.4",
"@juanm04/cpx": "2.0.1",
"@types/babel__core": "7.1.19",
"@types/diff": "5.0.2",

View File

@@ -25,7 +25,7 @@
"@typescript-eslint/parser": "5.9.1"
},
"devDependencies": {
"@blitzjs/config": "2.0.0-beta.3",
"@blitzjs/config": "2.0.0-beta.4",
"@types/react": "18.0.17",
"@types/react-dom": "17.0.14",
"react": "18.2.0",

56
pnpm-lock.yaml generated
View File

@@ -665,7 +665,6 @@ importers:
"@types/prompts": 2.0.14
"@types/react": 18.0.17
"@types/react-dom": 17.0.14
"@types/shelljs": 0.8.11
"@types/test-listen": 1.1.0
"@types/watchpack": 1.1.1
arg: 5.0.1
@@ -693,7 +692,6 @@ importers:
react: 18.2.0
resolve-cwd: 3.0.0
resolve-from: 5.0.0
shelljs: 0.8.5
superjson: 1.9.1
supports-color: 8.1.1
test-listen: 1.1.0
@@ -730,7 +728,6 @@ importers:
prompts: 2.4.2
resolve-cwd: 3.0.0
resolve-from: 5.0.0
shelljs: 0.8.5
superjson: 1.9.1
supports-color: 8.1.1
ts-node: 10.7.0_typescript@4.6.3
@@ -752,7 +749,6 @@ importers:
"@types/prompts": 2.0.14
"@types/react": 18.0.17
"@types/react-dom": 17.0.14
"@types/shelljs": 0.8.11
"@types/test-listen": 1.1.0
"@types/watchpack": 1.1.1
express: 4.17.3_supports-color@8.1.1
@@ -3239,7 +3235,6 @@ packages:
semver: 5.7.1
transitivePeerDependencies:
- supports-color
dev: false
/@babel/preset-flow/7.17.12_@babel+core@7.18.2:
resolution:
@@ -5085,7 +5080,7 @@ packages:
}
dependencies:
"@types/minimatch": 3.0.5
"@types/node": 18.7.13
"@types/node": 17.0.24
/@types/graceful-fs/4.1.5:
resolution:
@@ -5307,6 +5302,7 @@ packages:
{
integrity: sha512-46yIhxSe5xEaJZXWdIBP7GU4HDTG8/eo0qd9atdiL+lFpA03y8KS+lkTN834TWJj5767GbWv4n/P6efyTFt1Dw==,
}
dev: true
/@types/nodemailer/6.4.4:
resolution:
@@ -5520,16 +5516,6 @@ packages:
"@types/mime": 1.3.2
"@types/node": 17.0.24
/@types/shelljs/0.8.11:
resolution:
{
integrity: sha512-x9yaMvEh5BEaZKeVQC4vp3l+QoFj3BXcd4aYfuKSzIIyihjdVARAadYy3SMNIz0WCCdS2vB9JL/U6GQk5PaxQw==,
}
dependencies:
"@types/glob": 7.2.0
"@types/node": 18.7.13
dev: true
/@types/stack-utils/2.0.1:
resolution:
{
@@ -5735,7 +5721,6 @@ packages:
typescript: 4.6.3
transitivePeerDependencies:
- supports-color
dev: false
/@typescript-eslint/experimental-utils/5.28.0_hrkuebk64jiu2ut2d2sm4oylnu:
resolution:
@@ -9714,7 +9699,6 @@ packages:
transitivePeerDependencies:
- eslint-import-resolver-webpack
- supports-color
dev: false
/eslint-config-next/12.3.0_hrkuebk64jiu2ut2d2sm4oylnu:
resolution:
@@ -9752,7 +9736,6 @@ packages:
hasBin: true
peerDependencies:
eslint: ">=7.0.0"
dev: false
/eslint-config-prettier/8.5.0_eslint@7.32.0:
resolution:
@@ -11721,14 +11704,6 @@ packages:
has: 1.0.3
side-channel: 1.0.4
/interpret/1.4.0:
resolution:
{
integrity: sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==,
}
engines: {node: ">= 0.10"}
dev: false
/ip-regex/4.3.0:
resolution:
{
@@ -12433,7 +12408,7 @@ packages:
pretty-format: 27.5.1
slash: 3.0.0
strip-json-comments: 3.1.1
ts-node: 10.7.0_fxg3r7oju3tntkxsvleuiot4fa
ts-node: 10.7.0_typescript@4.6.3
transitivePeerDependencies:
- bufferutil
- canvas
@@ -16023,16 +15998,6 @@ packages:
source-map: 0.6.1
tslib: 2.4.0
/rechoir/0.6.2:
resolution:
{
integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==,
}
engines: {node: ">= 0.10"}
dependencies:
resolve: 1.22.0
dev: false
/redent/3.0.0:
resolution:
{
@@ -16735,19 +16700,6 @@ packages:
}
dev: true
/shelljs/0.8.5:
resolution:
{
integrity: sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==,
}
engines: {node: ">=4"}
hasBin: true
dependencies:
glob: 7.2.0
interpret: 1.4.0
rechoir: 0.6.2
dev: false
/side-channel/1.0.4:
resolution:
{
@@ -17790,6 +17742,7 @@ packages:
typescript: 4.6.3
v8-compile-cache-lib: 3.0.1
yn: 3.1.1
dev: false
/ts-node/10.7.0_typescript@4.6.3:
resolution:
@@ -17822,7 +17775,6 @@ packages:
typescript: 4.6.3
v8-compile-cache-lib: 3.0.1
yn: 3.1.1
dev: false
/ts-node/10.9.1_kakyiqi62sfonxvjmz3ft5vt7y:
resolution: