Skip to content

Commit b9ac46f

Browse files
capajcapaj
authored
bump deps and implement nicer searching with persistence in url query param (#465)
* bump deps and implement nicer searching with persistence in url query param * bump deps for mobile * silence some eslint warnings
1 parent e1f7b59 commit b9ac46f

19 files changed

+5116
-6149
lines changed

‎.husky/pre-commit

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22
. "$(dirname "$0")/_/husky.sh"
33

4-
npx pretty-quick --staged
4+
npx lint-staged

‎.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v18.16
1+
v18.18

‎backend/models/AuthInputs.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import { Field, ID, InputType } from 'type-graphql'
2+
import { EncryptedSecretPatchInput } from './models'
13
import {
24
GraphQLEmailAddress,
35
GraphQLNonEmptyString,
46
GraphQLPositiveInt
57
} from 'graphql-scalars'
6-
import { Field, ID, InputType } from 'type-graphql'
7-
import { EncryptedSecretPatchInput } from './models'
88

99
@InputType()
1010
export class AddNewDeviceInput {

‎backend/models/models.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
22
import { EncryptedSecretTypeGQL } from './types/EncryptedSecretType'
3-
import { GraphQLUUID } from 'graphql-scalars'
3+
44
import { UserMutation } from './UserMutation'
5+
import { GraphQLUUID } from 'graphql-scalars'
56

67
@ObjectType()
78
export class DecryptionChallengeResponse {

‎backend/package.json

+23-20
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@
66
"overrides": {
77
"graphql": "^16.7.1"
88
},
9+
"lint-staged": {
10+
"*": "prettier --write"
11+
},
912
"dependencies": {
1013
"@fastify/aws-lambda": "3.3.0",
11-
"@fastify/cookie": "9.0.4",
12-
"@fastify/cors": "^8.3.0",
13-
"@prisma/client": "^5.2.0",
14-
"@react-native-firebase/app": "^18.3.2",
15-
"@sentry/node": "^7.68.0",
16-
"@types/jsonwebtoken": "^9.0.2",
14+
"@fastify/cookie": "9.1.0",
15+
"@fastify/cors": "^8.4.0",
16+
"@prisma/client": "^5.3.1",
17+
"@react-native-firebase/app": "^18.5.0",
18+
"@sentry/node": "^7.72.0",
19+
"@types/jsonwebtoken": "^9.0.3",
1720
"@upstash/redis": "^1.22.0",
1821
"bytes": "^3.1.2",
1922
"chalk": "^5.3.0",
@@ -22,7 +25,7 @@
2225
"cpy": "^9.0.1",
2326
"debug": "^4.3.4",
2427
"dotenv": "^16.3.1",
25-
"fastify": "^4.22.2",
28+
"fastify": "^4.23.2",
2629
"fastify-helmet": "^7.1.0",
2730
"fastify-jwt": "^4.2.0",
2831
"fastify-raw-body": "^4.2.2",
@@ -36,44 +39,44 @@
3639
"mem": "^8",
3740
"mercurius": "^13.1.0",
3841
"node-mailjet": "^6.0.4",
39-
"pino": "^8.15.0",
42+
"pino": "^8.15.1",
4043
"pino-pretty": "10.2.0",
41-
"prisma": "^5.2.0",
44+
"prisma": "^5.3.1",
4245
"prisma-generator-checker": "^2.0.1",
4346
"raw-body": "^2.5.2",
4447
"reflect-metadata": "^0.1.13",
4548
"source-map-support": "^0.5.21",
46-
"stripe": "^12.18.0",
49+
"stripe": "^13.7.0",
4750
"type-graphql": "npm:@capaj/[email protected]",
4851
"typescript": "^5.2.2",
49-
"uuid": "^9.0.0"
52+
"uuid": "^9.0.1"
5053
},
5154
"devDependencies": {
5255
"@anatine/esbuild-decorators": "^0.2.19",
5356
"@capaj/prisma-typegraphql-types-generator": "^1.6.4",
5457
"@cjsa/cpy": "^9.0.1",
55-
"@faker-js/faker": "^8.0.2",
58+
"@faker-js/faker": "^8.1.0",
5659
"@mermaid-js/mermaid-cli": "^10.4.0",
57-
"@swc/core": "^1.3.83",
60+
"@swc/core": "^1.3.89",
5861
"@types/graphql-list-fields": "^2.0.3",
5962
"@types/lodash.set": "^4.3.7",
6063
"@types/node-mailjet": "^3.3.9",
61-
"@types/uuid": "^9.0.3",
62-
"aws-cdk": "2.94.0",
63-
"aws-cdk-lib": "^2.94.0",
64+
"@types/uuid": "^9.0.4",
65+
"aws-cdk": "2.98.0",
66+
"aws-cdk-lib": "^2.98.0",
6467
"constructs": "^10.2.70",
65-
"esbuild": "^0.19.2",
66-
"graphql": "^16.8.0",
68+
"esbuild": "^0.19.3",
69+
"graphql": "^16.8.1",
6770
"is-ci": "^3.0.1",
6871
"mz": "^2.7.0",
6972
"nodemon": "^3.0.1",
7073
"prisma-erd-generator": "^1.11.1",
71-
"sql-formatter": "^12.2.4",
74+
"sql-formatter": "^13.0.0",
7275
"sql-highlight": "^4.3.3",
7376
"ts-node": "^10.9.1",
7477
"unplugin-swc": "^1.4.2",
7578
"vite": "^4.4.9",
76-
"vitest": "^0.34.3"
79+
"vitest": "^0.34.5"
7780
},
7881
"scripts": {
7982
"dev": "DEBUG=au:* pnpm nodemon --exec ts-node-transpile-only server.ts",

‎backend/schemas/RootResolver.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { constructURL } from '../../shared/urlUtils'
2121
import { GraphqlError } from '../lib/GraphqlError'
2222
import { WebInputElement } from '../models/WebInputElement'
2323
import { GraphQLEmailAddress, GraphQLUUID } from 'graphql-scalars'
24+
2425
import debug from 'debug'
2526
import { RegisterNewAccountInput } from '../models/AuthInputs'
2627
import { PrismaClientKnownRequestError } from '@prisma/engine-core/dist/common/errors/PrismaClientKnownRequestError'
@@ -45,6 +46,7 @@ import { plainToClass } from 'class-transformer'
4546

4647
import { isTorExit } from './isTorExit'
4748
import { firebaseAdmin } from '../lib/firebaseAdmin'
49+
4850
const log = debug('au:RootResolver')
4951

5052
export interface IContext {
@@ -493,16 +495,14 @@ export class RootResolver {
493495
create: forUpsert,
494496
update: forUpsert,
495497
where: {
496-
domPath: webInput.domPath,
497-
url: webInput.url,
498498
webInputIdentifier: {
499499
url: webInput.url,
500500
domPath: webInput.domPath
501501
}
502502
}
503503
})
504504
returnedInputs.push(input)
505-
} catch (err: any) {
505+
} catch (err: unknown) {
506506
console.warn('error adding web input', err)
507507
}
508508
}

‎backend/stripeClient.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ import Stripe from 'stripe'
33
export const stripeClient = new Stripe(
44
process.env.STRIPE_SECRET_KEY as string,
55
{
6-
apiVersion: '2022-11-15'
6+
apiVersion: '2023-08-16'
77
}
88
)

‎mobile-app/package.json

+66-68
Original file line numberDiff line numberDiff line change
@@ -30,36 +30,36 @@
3030
"Notifications"
3131
],
3232
"dependencies": {
33-
"@apollo/client": "^3.8.3",
34-
"@babel/preset-env": "^7.22.2",
35-
"@babel/preset-react": "^7.22.3",
33+
"@apollo/client": "^3.8.4",
34+
"@babel/preset-env": "^7.22.20",
35+
"@babel/preset-react": "^7.22.15",
3636
"@hookform/resolvers": "^2.9.11",
37-
"@lingui/core": "^4.2.0",
38-
"@lingui/react": "^4.2.0",
39-
"@react-native-async-storage/async-storage": "^1.18.1",
40-
"@react-native-clipboard/clipboard": "^1.11.2",
41-
"@react-native-community/cli": "^11.3.1",
42-
"@react-native-community/cli-platform-android": "^11.3.1",
43-
"@react-native-community/cli-platform-ios": "^11.3.1",
44-
"@react-native-community/netinfo": "^9.3.10",
37+
"@lingui/core": "^4.5.0",
38+
"@lingui/react": "^4.5.0",
39+
"@react-native-async-storage/async-storage": "^1.19.3",
40+
"@react-native-clipboard/clipboard": "^1.12.1",
41+
"@react-native-community/cli": "^11.3.8",
42+
"@react-native-community/cli-platform-android": "^11.3.8",
43+
"@react-native-community/cli-platform-ios": "^11.3.8",
44+
"@react-native-community/netinfo": "^9.4.1",
4545
"@react-native-firebase/app": "^17.5.0",
4646
"@react-native-firebase/messaging": "^17.5.0",
4747
"@react-native-masked-view/masked-view": "^0.2.9",
48-
"@react-native/metro-config": "^0.72.6",
49-
"@react-navigation/bottom-tabs": "^6.5.7",
50-
"@react-navigation/drawer": "^6.6.2",
51-
"@react-navigation/material-top-tabs": "^6.6.2",
52-
"@react-navigation/native": "^6.1.6",
53-
"@react-navigation/native-stack": "^6.9.12",
54-
"@react-navigation/stack": "^6.3.16",
48+
"@react-native/metro-config": "^0.73.1",
49+
"@react-navigation/bottom-tabs": "^6.5.9",
50+
"@react-navigation/drawer": "^6.6.4",
51+
"@react-navigation/material-top-tabs": "^6.6.4",
52+
"@react-navigation/native": "^6.1.8",
53+
"@react-navigation/native-stack": "^6.9.14",
54+
"@react-navigation/stack": "^6.3.18",
5555
"@rnx-kit/babel-preset-metro-react-native": "^1.1.4",
56-
"@rnx-kit/cli": "^0.16.9",
57-
"@rnx-kit/metro-config": "^1.3.6",
58-
"@rnx-kit/metro-resolver-symlinks": "^0.1.28",
59-
"@sentry/react-native": "5.5.0",
60-
"@shopify/flash-list": "^1.4.3",
56+
"@rnx-kit/cli": "^0.16.16",
57+
"@rnx-kit/metro-config": "^1.3.9",
58+
"@rnx-kit/metro-resolver-symlinks": "^0.1.33",
59+
"@sentry/react-native": "5.9.2",
60+
"@shopify/flash-list": "^1.6.1",
6161
"@testing-library/react": "^14.0.0",
62-
"@ts-react/form": "^1.6.4",
62+
"@ts-react/form": "^1.8.3",
6363
"@tsconfig/react-native": "^3.0.2",
6464
"apollo-link-http": "^1.5.17",
6565
"apollo-link-queue": "^3.1.0",
@@ -68,88 +68,86 @@
6868
"apollo-link-token-refresh": "^0.6.0",
6969
"apollo3-cache-persist": "^0.14.1",
7070
"babel-plugin-transform-remove-console": "^6.9.4",
71-
"cross-fetch": "^3.1.6",
71+
"cross-fetch": "^3.1.8",
7272
"date-fns": "^2.30.0",
73-
"formik": "^2.4.0",
74-
"graphql": "^16.7.1",
73+
"formik": "^2.4.5",
74+
"graphql": "^16.8.1",
7575
"graphql-tools": "^9.0.0",
7676
"intl": "^1.2.5",
77-
"jest-environment-node": "^29.5.0",
77+
"jest-environment-node": "^29.7.0",
7878
"jsc-android": "^250231.0.0",
79-
"jssha": "^3.3.0",
79+
"jssha": "^3.3.1",
8080
"jwt-decode": "^3.1.2",
8181
"lodash": "^4.17.21",
8282
"make-plural": "^7.3.0",
8383
"ms": "^2.1.3",
8484
"native-base": "^3.4.28",
8585
"query-string": "^8.1.0",
8686
"react": "18.2.0",
87-
"react-hook-form": "^7.44.2",
87+
"react-hook-form": "^7.46.2",
8888
"react-native": "0.71.11",
8989
"react-native-biometrics": "^3.0.1",
90-
"react-native-bootsplash": "^4.7.1",
90+
"react-native-bootsplash": "^4.7.5",
9191
"react-native-camera": "^4.2.1",
9292
"react-native-circular-progress-indicator": "^4.4.2",
93-
"react-native-code-push": "^8.0.2",
94-
"react-native-device-info": "^10.6.0",
93+
"react-native-code-push": "^8.1.0",
94+
"react-native-device-info": "^10.11.0",
9595
"react-native-fast-image": "^8.6.3",
96-
"react-native-gesture-handler": "2.12.0",
96+
"react-native-gesture-handler": "2.13.1",
9797
"react-native-get-random-values": "^1.9.0",
98-
"react-native-mmkv": "^2.10.0",
99-
"react-native-pager-view": "^6.2.0",
100-
"react-native-permissions": "^3.8.0",
98+
"react-native-mmkv": "^2.10.2",
99+
"react-native-pager-view": "^6.2.1",
100+
"react-native-permissions": "^3.9.2",
101101
"react-native-qrcode-scanner": "^1.6.0",
102102
"react-native-reanimated": "^2.17.0",
103-
"react-native-safe-area-context": "4.6.3",
104-
"react-native-screens": "^3.22.0",
103+
"react-native-safe-area-context": "4.7.2",
104+
"react-native-screens": "^3.25.0",
105105
"react-native-sensitive-info": "^6.0.0-alpha.9",
106-
"react-native-svg": "13.9.0",
107-
"react-native-tab-view": "^3.5.1",
106+
"react-native-svg": "13.14.0",
107+
"react-native-tab-view": "^3.5.2",
108108
"react-native-url-polyfill": "^1.3.0",
109109
"react-native-uuid": "^2.0.1",
110110
"react-native-vector-icons": "^9.2.0",
111-
"react-native-vision-camera": "^2.15.4",
112-
"react-native-webview": "12.1.0",
111+
"react-native-vision-camera": "^2.16.1",
112+
"react-native-webview": "12.4.0",
113113
"react-native-webview-crypto": "^0.0.25",
114114
"react-query": "^3.39.3",
115115
"styled-system": "^5.1.5",
116116
"text-decoding": "^1.0.0",
117117
"vision-camera-code-scanner": "^0.2.0",
118-
"zustand": "^4.3.8",
118+
"zustand": "^4.4.1",
119119
"zxcvbn-typescript": "^5.0.1"
120120
},
121121
"devDependencies": {
122122
"@apollo/react-testing": "^4.0.0",
123-
"@babel/core": "^7.22.1",
124-
"@babel/preset-typescript": "^7.21.5",
125-
"@babel/runtime": "^7.22.3",
126-
"@jest/globals": "^29.5.0",
127-
"@lingui/cli": "^4.2.0",
128-
"@lingui/macro": "^4.2.0",
123+
"@babel/core": "^7.23.0",
124+
"@babel/preset-typescript": "^7.23.0",
125+
"@babel/runtime": "^7.23.1",
126+
"@jest/globals": "^29.7.0",
127+
"@lingui/cli": "^4.5.0",
128+
"@lingui/macro": "^4.5.0",
129129
"@react-native-community/eslint-config": "^3.2.0",
130-
"@testing-library/react-native": "^12.1.2",
131-
"@types/crypto-js": "^4.1.1",
132-
"@types/jest": "^29.5.2",
133-
"@types/react": "^18.2.12",
130+
"@testing-library/react-native": "^12.3.0",
131+
"@types/crypto-js": "^4.1.2",
132+
"@types/jest": "^29.5.5",
133+
"@types/react": "^18.2.23",
134134
"@types/react-native": "^0.72.2",
135-
"@types/react-native-vector-icons": "^6.4.13",
136-
"@types/react-test-renderer": "^18.0.0",
137-
"appcenter-cli": "^2.13.8",
138-
"babel-jest": "^29.5.0",
135+
"@types/react-native-vector-icons": "^6.4.14",
136+
"@types/react-test-renderer": "^18.0.2",
137+
"appcenter-cli": "^2.14.0",
138+
"babel-jest": "^29.7.0",
139139
"babel-plugin-macros": "^3.1.0",
140140
"babel-plugin-module-resolver": "^5.0.0",
141-
"eslint": "^8.43.0",
142-
"eslint-plugin-import": "^2.27.5",
141+
"eslint": "^8.50.0",
142+
"eslint-plugin-import": "^2.28.1",
143143
"eslint-plugin-promise": "^6.1.1",
144-
"eslint-plugin-react-native": "^4.0.0",
145-
"eslint-plugin-testing-library": "^5.11.0",
146-
"jest": "^29.5.0",
147-
"metro-react-native-babel-preset": "0.76.5",
148-
"pod-install": "0.1.38",
149-
"prettier": "^2.8.8",
150-
"pretty-quick": "^3.1.3",
144+
"eslint-plugin-react-native": "^4.1.0",
145+
"eslint-plugin-testing-library": "^5.11.1",
146+
"jest": "^29.7.0",
147+
"metro-react-native-babel-preset": "0.77.0",
148+
"pod-install": "0.1.39",
151149
"react-native-codegen": "^0.72.0",
152-
"react-native-dotenv": "^3.4.8",
150+
"react-native-dotenv": "^3.4.9",
153151
"react-native-version": "^4.0.0",
154152
"react-test-renderer": "18.2.0",
155153
"typescript": "^5.2.2"

‎mobile-app/src/screens/DefaultDeviceSettingsModal.codegen.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const defaultOptions = {} as const;
66
export type DefaultDeviceSettingsModalQueryVariables = Types.Exact<{ [key: string]: never; }>;
77

88

9-
export type DefaultDeviceSettingsModalQuery = { __typename?: 'Query', me: { __typename?: 'UserQuery', id: string, devicesCount: number, defaultDeviceSettings: { __typename?: 'DefaultDeviceSettingsQuery', id?: number | null } } };
9+
export type DefaultDeviceSettingsModalQuery = { __typename?: 'Query', me: { __typename?: 'UserQuery', id: string, devicesCount: number, defaultDeviceSettings: { __typename?: 'DefaultDeviceSettingsQuery', id: number } } };
1010

1111

1212
export const DefaultDeviceSettingsModalDocument = gql`

0 commit comments

Comments
 (0)