Skip to content

Commit

Permalink
Update deps (#3957)
Browse files Browse the repository at this point in the history
  • Loading branch information
beerose authored Nov 9, 2022
1 parent 5ea068b commit 8b4bf99
Show file tree
Hide file tree
Showing 38 changed files with 1,974 additions and 1,792 deletions.
9 changes: 9 additions & 0 deletions .changeset/fuzzy-dots-cross.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
"blitz": patch
"@blitzjs/auth": patch
"@blitzjs/next": patch
"@blitzjs/rpc": patch
"@blitzjs/generator": patch
---

Update dependencies
44 changes: 23 additions & 21 deletions apps/toolkit-app-passportjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,38 +27,40 @@
"@blitzjs/config": "workspace:*",
"@blitzjs/next": "workspace:*",
"@blitzjs/rpc": "workspace:*",
"@hookform/resolvers": "2.8.8",
"@prisma/client": "4.0.0",
"@hookform/error-message": "2.0.0",
"@hookform/resolvers": "2.9.10",
"@prisma/client": "4.6.0",
"blitz": "workspace:2.0.0-beta.16",
"next": "12.2.5",
"openid-client": "5.1.8",
"prisma": "4.0.0",
"openid-client": "5.2.1",
"prisma": "4.6.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-hook-form": "7.29.0",
"ts-node": "10.7.0",
"zod": "3.17.3"
"react-hook-form": "7.39.1",
"ts-node": "10.9.1",
"zod": "3.19.1"
},
"devDependencies": {
"@next/bundle-analyzer": "12.0.8",
"@testing-library/react": "13.0.0",
"@testing-library/react-hooks": "7.0.2",
"@types/jest": "27.4.1",
"@types/node": "17.0.16",
"@testing-library/react": "13.4.0",
"@testing-library/react-hooks": "8.0.1",
"@types/jest": "29.2.2",
"@types/node": "18.11.9",
"@types/preview-email": "2.0.1",
"@types/react": "18.0.17",
"@typescript-eslint/eslint-plugin": "5.9.1",
"eslint": "7.32.0",
"@types/react": "18.0.25",
"@typescript-eslint/eslint-plugin": "5.42.1",
"eslint": "8.27.0",
"eslint-config-next": "12.3.1",
"eslint-config-prettier": "8.5.0",
"husky": "7.0.4",
"jest": "27.5.1",
"lint-staged": "12.1.7",
"prettier": "^2.5.1",
"prettier-plugin-prisma": "3.8.0",
"husky": "8.0.2",
"jest": "29.3.0",
"jest-environment-jsdom": "29.3.0",
"lint-staged": "13.0.3",
"prettier": "^2.7.1",
"prettier-plugin-prisma": "4.4.0",
"pretty-quick": "3.1.3",
"preview-email": "3.x",
"typescript": "^4.5.3"
"preview-email": "3.0.7",
"typescript": "^4.8.4"
},
"private": true
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { forwardRef, PropsWithoutRef, ComponentPropsWithoutRef } from "react"
import { useFormContext } from "react-hook-form"
import { ErrorMessage } from "@hookform/error-message"

export interface LabeledTextFieldProps extends PropsWithoutRef<JSX.IntrinsicElements["input"]> {
/** Field name. */
Expand All @@ -18,9 +19,6 @@ export const LabeledTextField = forwardRef<HTMLInputElement, LabeledTextFieldPro
register,
formState: { isSubmitting, errors },
} = useFormContext()
const error = Array.isArray(errors[name])
? errors[name].join(", ")
: errors[name]?.message || errors[name]

return (
<div {...outerProps}>
Expand All @@ -29,11 +27,15 @@ export const LabeledTextField = forwardRef<HTMLInputElement, LabeledTextFieldPro
<input disabled={isSubmitting} {...register(name)} {...props} />
</label>

{error && (
<div role="alert" style={{ color: "red" }}>
{error}
</div>
)}
<ErrorMessage
render={({ message }) => (
<div role="alert" style={{ color: "red" }}>
{message}
</div>
)}
errors={errors}
name={name}
/>

<style jsx>{`
label {
Expand Down
4 changes: 0 additions & 4 deletions apps/toolkit-app/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,4 @@ const createJestConfig = nextJest({
dir: "./",
})

const customJestConfig = {
testEnvironment: "jest-environment-jsdom",
}

module.exports = createJestConfig(customJestConfig)
42 changes: 22 additions & 20 deletions apps/toolkit-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,37 +27,39 @@
"@blitzjs/config": "workspace:*",
"@blitzjs/next": "workspace:*",
"@blitzjs/rpc": "workspace:*",
"@hookform/resolvers": "2.8.8",
"@prisma/client": "4.0.0",
"@hookform/error-message": "2.0.0",
"@hookform/resolvers": "2.9.10",
"@prisma/client": "4.6.0",
"blitz": "workspace:2.0.0-beta.16",
"next": "12.2.5",
"prisma": "4.0.0",
"prisma": "4.6.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-hook-form": "7.29.0",
"ts-node": "10.7.0",
"zod": "3.17.3"
"react-hook-form": "7.39.1",
"ts-node": "10.9.1",
"zod": "3.19.1"
},
"devDependencies": {
"@next/bundle-analyzer": "12.0.8",
"@testing-library/react": "13.0.0",
"@testing-library/react-hooks": "7.0.2",
"@types/jest": "27.4.1",
"@types/node": "17.0.16",
"@testing-library/react": "13.4.0",
"@testing-library/react-hooks": "8.0.1",
"@types/jest": "29.2.2",
"@types/node": "18.11.9",
"@types/preview-email": "2.0.1",
"@types/react": "18.0.17",
"@typescript-eslint/eslint-plugin": "5.9.1",
"eslint": "7.32.0",
"@types/react": "18.0.25",
"@typescript-eslint/eslint-plugin": "5.42.1",
"eslint": "8.27.0",
"eslint-config-next": "12.3.1",
"eslint-config-prettier": "8.5.0",
"husky": "7.0.4",
"jest": "27.5.1",
"lint-staged": "12.1.7",
"prettier": "^2.5.1",
"prettier-plugin-prisma": "3.8.0",
"husky": "8.0.2",
"jest": "29.3.0",
"jest-environment-jsdom": "29.3.0",
"lint-staged": "13.0.3",
"prettier": "^2.7.1",
"prettier-plugin-prisma": "4.4.0",
"pretty-quick": "3.1.3",
"preview-email": "3.x",
"typescript": "^4.5.3"
"preview-email": "3.0.7",
"typescript": "^4.8.4"
},
"private": true
}
18 changes: 10 additions & 8 deletions apps/toolkit-app/src/core/components/LabeledTextField.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { forwardRef, PropsWithoutRef, ComponentPropsWithoutRef } from "react"
import { useFormContext } from "react-hook-form"
import { ErrorMessage } from "@hookform/error-message"

export interface LabeledTextFieldProps extends PropsWithoutRef<JSX.IntrinsicElements["input"]> {
/** Field name. */
Expand All @@ -18,9 +19,6 @@ export const LabeledTextField = forwardRef<HTMLInputElement, LabeledTextFieldPro
register,
formState: { isSubmitting, errors },
} = useFormContext()
const error = Array.isArray(errors[name])
? errors[name].join(", ")
: errors[name]?.message || errors[name]

return (
<div {...outerProps}>
Expand All @@ -29,11 +27,15 @@ export const LabeledTextField = forwardRef<HTMLInputElement, LabeledTextFieldPro
<input disabled={isSubmitting} {...register(name)} {...props} />
</label>

{error && (
<div role="alert" style={{ color: "red" }}>
{error}
</div>
)}
<ErrorMessage
render={({ message }) => (
<div role="alert" style={{ color: "red" }}>
{message}
</div>
)}
errors={errors}
name={name}
/>

<style jsx>{`
label {
Expand Down
6 changes: 1 addition & 5 deletions apps/web/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,4 @@ const createJestConfig = nextJest({
dir: "./",
})

const customJestConfig = {
testEnvironment: "jest-environment-jsdom",
}

module.exports = createJestConfig(customJestConfig)
module.exports = createJestConfig({})
17 changes: 9 additions & 8 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,24 @@
"@blitzjs/config": "workspace:*",
"@blitzjs/next": "workspace:*",
"@blitzjs/rpc": "workspace:*",
"@prisma/client": "4.0.0",
"@types/jest": "27.4.1",
"@prisma/client": "4.6.0",
"@types/jest": "29.2.2",
"@types/passport-twitter": "1.0.37",
"blitz": "workspace:*",
"jest": "27.5.1",
"jest": "29.3.0",
"jest-environment-jsdom": "29.3.0",
"next": "12.2.5",
"passport-mock-strategy": "2.0.0",
"passport-twitter": "1.0.4",
"prisma": "4.0.0",
"prisma": "4.6.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"ts-node": "10.7.0"
"ts-node": "10.9.1"
},
"devDependencies": {
"@next/bundle-analyzer": "12.0.8",
"@types/react": "18.0.17",
"eslint": "7.32.0",
"typescript": "^4.5.3"
"@types/react": "18.0.25",
"eslint": "8.27.0",
"typescript": "^4.8.4"
}
}
10 changes: 5 additions & 5 deletions integration-tests/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
"@blitzjs/auth": "workspace:*",
"@blitzjs/config": "workspace:*",
"@blitzjs/next": "workspace:*",
"@prisma/client": "4.0.0",
"@prisma/client": "4.6.0",
"blitz": "workspace:2.0.0-beta.16",
"lowdb": "3.0.0",
"next": "12.2.5",
"prisma": "4.0.0",
"prisma": "4.6.0",
"react": "18.2.0",
"react-dom": "18.2.0"
},
Expand All @@ -34,13 +34,13 @@
"@types/fs-extra": "9.0.13",
"@types/node": "18.7.13",
"@types/node-fetch": "2.6.1",
"@types/react": "18.0.17",
"@types/react": "18.0.25",
"b64-lite": "1.4.0",
"eslint": "7.32.0",
"eslint": "8.27.0",
"fs-extra": "10.0.1",
"get-port": "6.1.2",
"node-fetch": "3.2.3",
"ts-node": "10.9.1",
"typescript": "^4.5.3"
"typescript": "^4.8.4"
}
}
10 changes: 5 additions & 5 deletions integration-tests/get-initial-props/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"@blitzjs/auth": "workspace:*",
"@blitzjs/next": "workspace:*",
"@blitzjs/rpc": "workspace:*",
"@prisma/client": "4.0.0",
"@prisma/client": "4.6.0",
"blitz": "workspace:*",
"lowdb": "3.0.0",
"next": "12.2.5",
"prisma": "4.0.0",
"prisma": "4.6.0",
"react": "18.2.0",
"react-dom": "18.2.0"
},
Expand All @@ -33,12 +33,12 @@
"@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.25",
"b64-lite": "1.4.0",
"eslint": "7.32.0",
"eslint": "8.27.0",
"fs-extra": "10.0.1",
"get-port": "6.1.2",
"node-fetch": "3.2.3",
"typescript": "^4.5.3"
"typescript": "^4.8.4"
}
}
6 changes: 3 additions & 3 deletions integration-tests/middleware/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
"@types/express": "4.17.13",
"@types/fs-extra": "9.0.13",
"@types/node-fetch": "2.6.1",
"@types/react": "18.0.17",
"eslint": "7.32.0",
"@types/react": "18.0.25",
"eslint": "8.27.0",
"fs-extra": "10.0.1",
"get-port": "6.1.2",
"node-fetch": "3.2.3",
"typescript": "^4.5.3"
"typescript": "^4.8.4"
}
}
10 changes: 5 additions & 5 deletions integration-tests/no-suspense/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"@blitzjs/auth": "workspace:*",
"@blitzjs/next": "workspace:*",
"@blitzjs/rpc": "workspace:*",
"@prisma/client": "4.0.0",
"@prisma/client": "4.6.0",
"blitz": "workspace:*",
"lowdb": "3.0.0",
"next": "12.2.5",
"prisma": "4.0.0",
"prisma": "4.6.0",
"react": "18.2.0",
"react-dom": "18.2.0"
},
Expand All @@ -33,12 +33,12 @@
"@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.25",
"b64-lite": "1.4.0",
"eslint": "7.32.0",
"eslint": "8.27.0",
"fs-extra": "10.0.1",
"get-port": "6.1.2",
"node-fetch": "3.2.3",
"typescript": "^4.5.3"
"typescript": "^4.8.4"
}
}
12 changes: 6 additions & 6 deletions integration-tests/qm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@
"@blitzjs/config": "workspace:*",
"@blitzjs/next": "workspace:*",
"@blitzjs/rpc": "workspace:*",
"@prisma/client": "4.0.0",
"@prisma/client": "4.6.0",
"@tanstack/react-query": "4.0.10",
"blitz": "workspace:*",
"next": "12.2.5",
"prisma": "4.0.0",
"prisma": "4.6.0",
"react": "18.2.0",
"react-dom": "18.2.0"
},
"devDependencies": {
"@testing-library/react": "13.0.0",
"@types/react": "18.0.17",
"@testing-library/react": "13.4.0",
"@types/react": "18.0.25",
"@vitejs/plugin-react": "1.3.0",
"delay": "5.0.0",
"eslint": "7.32.0",
"eslint": "8.27.0",
"eslint-config-next": "latest",
"eslint-plugin-testing-library": "5.0.1",
"jsdom": "^19.0.0",
"typescript": "^4.5.3"
"typescript": "^4.8.4"
}
}
Loading

0 comments on commit 8b4bf99

Please sign in to comment.