Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
steve-keep committed Apr 22, 2024
2 parents 4309be7 + f4dea71 commit 02bfd4c
Show file tree
Hide file tree
Showing 36 changed files with 2,201 additions and 1,357 deletions.
6 changes: 3 additions & 3 deletions src/examples/aws-cognito/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
"dotenv": "16.4.5",
"graphql": "16.8.1",
"react": "18.2.0",
"reflect-metadata": "0.2.1"
"reflect-metadata": "0.2.2"
},
"devDependencies": {
"@types/node": "20.11.30",
"@types/node": "20.12.7",
"graphweaver": "workspace:*",
"typescript": "5.4.3"
"typescript": "5.4.5"
},
"keywords": [
"graphql",
Expand Down
10 changes: 5 additions & 5 deletions src/examples/databases/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
"@mikro-orm/postgresql": "6.1.12",
"class-validator": "0.14.1",
"graphql": "16.8.1",
"mysql2": "3.9.3",
"pg": "8.11.3",
"mysql2": "3.9.4",
"pg": "8.11.5",
"graphweaver": "workspace:*",
"reflect-metadata": "0.2.1"
"reflect-metadata": "0.2.2"
},
"devDependencies": {
"@types/node": "20.11.30",
"typescript": "5.4.3"
"@types/node": "20.12.7",
"typescript": "5.4.5"
},
"keywords": [
"graphql",
Expand Down
8 changes: 4 additions & 4 deletions src/examples/rest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
"got-cjs": "12.5.4",
"graphql": "16.8.1",
"graphweaver": "workspace:*",
"mysql2": "3.9.3",
"mysql2": "3.9.4",
"react": "18.2.0",
"reflect-metadata": "0.2.1"
"reflect-metadata": "0.2.2"
},
"devDependencies": {
"@types/node": "20.11.30",
"@types/node": "20.12.7",
"dotenv-cli": "7.4.1",
"typescript": "5.4.3"
"typescript": "5.4.5"
},
"keywords": [
"graphql",
Expand Down
10 changes: 5 additions & 5 deletions src/examples/s3-storage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"version": "npm version --no-git-tag-version"
},
"dependencies": {
"@apollo/client": "3.9.9",
"@apollo/client": "3.9.11",
"@apollo/server": "4.10.2",
"@as-integrations/aws-lambda": "3.1.0",
"@exogee/graphweaver": "workspace:*",
Expand All @@ -29,13 +29,13 @@
"@exogee/graphweaver-storage-provider": "workspace:*",
"@mikro-orm/core": "6.1.12",
"@mikro-orm/postgresql": "6.1.12",
"pg": "8.11.3",
"reflect-metadata": "0.2.1",
"pg": "8.11.5",
"reflect-metadata": "0.2.2",
"graphql": "16.8.1"
},
"devDependencies": {
"@types/node": "20.11.30",
"typescript": "5.4.3",
"@types/node": "20.12.7",
"typescript": "5.4.5",
"graphweaver": "workspace:*"
},
"keywords": [
Expand Down
6 changes: 3 additions & 3 deletions src/examples/sqlite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
"@mikro-orm/sqlite": "6.1.12",
"mikro-orm-sqlite-wasm": "workspace:*",
"node-sqlite3-wasm": "0.8.13",
"reflect-metadata": "0.2.1",
"reflect-metadata": "0.2.2",
"type-graphql": "2.0.0-beta.2",
"graphql": "16.8.1"
},
"devDependencies": {
"@types/node": "20.11.30",
"@types/node": "20.12.7",
"graphweaver": "workspace:*",
"typescript": "5.4.3"
"typescript": "5.4.5"
}
}
10 changes: 5 additions & 5 deletions src/examples/xero/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"lib"
],
"dependencies": {
"@apollo/client": "3.9.9",
"@apollo/client": "3.9.11",
"@apollo/server": "4.10.2",
"@as-integrations/aws-lambda": "3.1.0",
"@exogee/graphweaver": "workspace:*",
Expand All @@ -45,16 +45,16 @@
"react": "18.2.0",
"react-dom": "18.2.0",
"react-router-dom": "6.22.3",
"reflect-metadata": "0.2.1",
"reflect-metadata": "0.2.2",
"uuid": "9.0.1",
"xero-node": "5.1.0"
},
"devDependencies": {
"@types/node": "20.11.30",
"@types/node": "20.12.7",
"esbuild": "0.15.5",
"prettier": "3.2.5",
"ts-node": "10.9.2",
"typescript": "5.4.3",
"vite": "5.2.6"
"typescript": "5.4.5",
"vite": "5.2.8"
}
}
8 changes: 4 additions & 4 deletions src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"version:bump": "pnpm -r version"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "7.4.0",
"@typescript-eslint/parser": "7.4.0",
"@typescript-eslint/eslint-plugin": "7.6.0",
"@typescript-eslint/parser": "7.6.0",
"concurrently": "8.2.2",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
Expand All @@ -37,8 +37,8 @@
"jest": "29.7.0",
"prettier": "3.2.5",
"ts-jest": "29.1.2",
"turbo": "1.13.0",
"typescript": "5.4.3"
"turbo": "1.13.2",
"typescript": "5.4.5"
},
"pnpm": {
"overrides": {
Expand Down
12 changes: 6 additions & 6 deletions src/packages/admin-ui-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
"lib"
],
"dependencies": {
"@apollo/client": "3.9.9",
"@apollo/client": "3.9.11",
"@exogee/graphweaver-apollo-client": "workspace:*",
"@graphiql/toolkit": "0.9.1",
"clsx": "2.1.0",
"downshift": "8.5.0",
"graphiql": "3.1.1",
"graphiql": "3.2.0",
"graphql": "16.8.1",
"graphql-deduplicator": "2.0.6",
"luxon": "3.4.4",
Expand All @@ -50,17 +50,17 @@
"@types/graphql-deduplicator": "2.0.2",
"@types/luxon": "3.4.2",
"@types/papaparse": "5.3.14",
"@types/react": "18.0.25",
"@types/react": "18.2.75",
"esbuild": "0.15.5",
"esbuild-css-modules-plugin": "2.7.1",
"esbuild-plugin-copy": "2.1.1",
"esbuild-plugin-svgr": "2.1.0",
"formik": "2.4.5",
"glob": "10.3.10",
"glob": "10.3.12",
"react": "18.2.0",
"react-dom": "18.2.0",
"typescript": "5.4.3",
"vite": "5.2.6",
"typescript": "5.4.5",
"vite": "5.2.8",
"vite-plugin-svgr": "3.2.0",
"vitest": "1.4.0"
},
Expand Down
12 changes: 6 additions & 6 deletions src/packages/admin-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"version": "npm version --no-git-tag-version"
},
"dependencies": {
"@apollo/client": "3.9.9",
"@apollo/client": "3.9.11",
"@exogee/graphweaver-admin-ui-components": "workspace:*",
"clsx": "2.1.0",
"formik": "2.4.5",
Expand All @@ -34,18 +34,18 @@
},
"devDependencies": {
"@chialab/esbuild-plugin-html": "0.18.2",
"@types/react": "18.0.25",
"@types/react-dom": "18.2.22",
"@types/react": "18.2.75",
"@types/react-dom": "18.2.24",
"@types/react-modal": "3.16.3",
"@vitejs/plugin-react": "4.2.1",
"esbuild": "0.15.5",
"esbuild-css-modules-plugin": "2.7.1",
"esbuild-plugin-copy": "2.1.1",
"esbuild-plugin-svgr": "2.1.0",
"glob": "10.3.10",
"typescript": "5.4.3",
"glob": "10.3.12",
"typescript": "5.4.5",
"vite-plugin-svgr": "3.2.0",
"vite": "5.2.6"
"vite": "5.2.8"
},
"keywords": [
"graphql",
Expand Down
2 changes: 1 addition & 1 deletion src/packages/apollo-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
],
"devDependencies": {
"esbuild": "0.15.5",
"typescript": "5.4.3"
"typescript": "5.4.5"
},
"keywords": [
"graphql",
Expand Down
12 changes: 6 additions & 6 deletions src/packages/auth-ui-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"lib"
],
"dependencies": {
"@apollo/client": "3.9.9",
"@apollo/client": "3.9.11",
"@simplewebauthn/browser": "9.0.1",
"@usedapp/core": "1.2.13",
"ethers": "5.7.2",
Expand All @@ -41,16 +41,16 @@
},
"devDependencies": {
"@exogee/graphweaver-admin-ui-components": "workspace:*",
"@types/react": "18.0.25",
"@types/react-dom": "18.2.22",
"@types/react": "18.2.75",
"@types/react-dom": "18.2.24",
"esbuild": "0.15.5",
"esbuild-css-modules-plugin": "2.7.1",
"esbuild-plugin-svgr": "2.1.0",
"glob": "10.3.10",
"glob": "10.3.12",
"react": "18.2.0",
"react-dom": "18.2.0",
"typescript": "5.4.3",
"vite": "5.2.6",
"typescript": "5.4.5",
"vite": "5.2.8",
"vite-plugin-svgr": "3.2.0",
"@simplewebauthn/types": "9.0.1"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ export const MagicLinkLogin = () => {
) : (
<Formik<Form> initialValues={{ username: '' }} onSubmit={handleOnSubmit}>
{({ isSubmitting }) => (
// @ts-expect-error - Formik typing issue https://github.com/jaredpalmer/formik/issues/2120#issuecomment-566515114
<Form className={styles.wrapper}>
<GraphweaverLogo width="52" className={styles.logo} />
{sent ? (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export const OTPChallenge = () => {
{sent && !error ? (
<Formik<Form> initialValues={{ code: '' }} onSubmit={handleVerifyCode}>
{({ isSubmitting }) => (
// @ts-expect-error - Formik typing issue https://github.com/jaredpalmer/formik/issues/2120#issuecomment-566515114
<Form className={styles.wrapper}>
<div className={styles.titleContainer}>Confirm Code</div>
<Field
Expand All @@ -98,6 +99,7 @@ export const OTPChallenge = () => {
) : (
<Formik<Form> initialValues={{ code: '' }} onSubmit={handleSendCode}>
{({ isSubmitting }) => (
// @ts-expect-error - Formik typing issue https://github.com/jaredpalmer/formik/issues/2120#issuecomment-566515114
<Form className={styles.wrapper}>
<div className={styles.titleContainerCenter}>Send OTP Code</div>
<div className={styles.buttonContainerCenter}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ const RegisterButton = ({
return (
<Formik<Form> initialValues={{ code: '' }} onSubmit={handleOnRegister}>
{({ isSubmitting }) => (
// @ts-expect-error - Formik typing issue https://github.com/jaredpalmer/formik/issues/2120#issuecomment-566515114
<Form className={styles.wrapper}>
<div className={styles.titleContainerCenter}>Connect Passkey</div>
<div className={styles.buttonContainerCenter}>
Expand Down Expand Up @@ -147,6 +148,7 @@ const AuthenticateButton = ({
return (
<Formik<Form> initialValues={{ code: '' }} onSubmit={handleOnAuthenticate}>
{({ isSubmitting }) => (
// @ts-expect-error - Formik typing issue https://github.com/jaredpalmer/formik/issues/2120#issuecomment-566515114
<Form className={styles.wrapper}>
<div className={styles.titleContainerCenter}>Verify Passkey</div>
<div className={styles.buttonContainerCenter}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export const PasswordChallenge = () => {
return (
<Formik<Form> initialValues={{ password: '' }} onSubmit={handleOnSubmit}>
{({ isSubmitting }) => (
// @ts-expect-error - Formik typing issue https://github.com/jaredpalmer/formik/issues/2120#issuecomment-566515114
<Form className={styles.wrapper}>
<GraphweaverLogo width="52" className={styles.logo} />
<div className={styles.titleContainer}>Confirm your Password</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export const ForgottenPassword = () => {
) : (
<Formik<Form> initialValues={{ username: '' }} onSubmit={handleOnSubmit}>
{({ isSubmitting }) => (
// @ts-expect-error - Formik typing issue https://github.com/jaredpalmer/formik/issues/2120#issuecomment-566515114
<Form className={styles.wrapper}>
<GraphweaverLogo width="52" className={styles.logo} />
<div className={styles.titleContainer}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export const PasswordLogin = ({ canResetPassword = true }: { canResetPassword?:
<>
<Formik<Form> initialValues={{ username: '', password: '' }} onSubmit={handleOnSubmit}>
{({ isSubmitting }) => (
// @ts-expect-error - Formik typing issue https://github.com/jaredpalmer/formik/issues/2120#issuecomment-566515114
<Form className={styles.wrapper}>
<GraphweaverLogo width="52" className={styles.logo} />
<div className={styles.titleContainer}>Login</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export const ResetPassword = () => {
return (
<Formik<Form> initialValues={{ password: '', confirm: '' }} onSubmit={handleOnSubmit}>
{({ isSubmitting }) => (
// @ts-expect-error - Formik typing issue https://github.com/jaredpalmer/formik/issues/2120#issuecomment-566515114
<Form className={styles.wrapper}>
<GraphweaverLogo width="52" className={styles.logo} />
<div className={styles.titleContainer}>Please enter your new password</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ const VerifyButton = () => {
return (
<Formik<Form> initialValues={{ code: '' }} onSubmit={handleSignMessage}>
{({ isSubmitting }) => (
// @ts-expect-error - Formik typing issue https://github.com/jaredpalmer/formik/issues/2120#issuecomment-566515114
<Form className={styles.wrapper}>
<div className={styles.titleContainerCenter}>Verify Wallet</div>
<div className={styles.buttonContainerCenter}>
Expand Down
8 changes: 4 additions & 4 deletions src/packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@
"otp-generator": "4.0.1",
"type-graphql": "2.0.0-beta.2",
"web3-token": "1.0.6",
"reflect-metadata": "0.2.1"
"reflect-metadata": "0.2.2"
},
"devDependencies": {
"@simplewebauthn/types": "9.0.1",
"@types/jsonwebtoken": "9.0.6",
"@types/ms": "0.7.34",
"@types/node": "20.11.30",
"@types/node": "20.12.7",
"@types/otp-generator": "4.0.2",
"esbuild": "0.15.5",
"glob": "10.3.10",
"glob": "10.3.12",
"prettier": "3.2.5",
"ts-node": "10.9.2",
"typescript": "5.4.3",
"typescript": "5.4.5",
"vitest": "1.4.0"
},
"keywords": [
Expand Down
10 changes: 5 additions & 5 deletions src/packages/aws-cognito/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
"devDependencies": {
"@exogee/graphweaver": "workspace:*",
"esbuild": "0.17.18",
"glob": "10.3.10",
"glob": "10.3.12",
"graphql": "16.8.1",
"graphql-type-json": "0.3.2",
"prettier": "3.2.5",
"reflect-metadata": "0.2.1",
"reflect-metadata": "0.2.2",
"type-graphql": "2.0.0-beta.2",
"typescript": "5.4.3"
"typescript": "5.4.5"
},
"peerDependencies": {
"@exogee/graphweaver": "workspace:*",
Expand All @@ -40,8 +40,8 @@
"type-graphql": "2.0.0-beta.2"
},
"dependencies": {
"@aws-sdk/client-cognito-identity-provider": "3.540.0",
"@aws-sdk/client-lambda": "3.540.0",
"@aws-sdk/client-cognito-identity-provider": "3.552.0",
"@aws-sdk/client-lambda": "3.552.0",
"@exogee/graphweaver-rest": "workspace:*",
"graphql": "16.8.1",
"uuid": "9.0.1"
Expand Down
Loading

0 comments on commit 02bfd4c

Please sign in to comment.