Skip to content

Commit

Permalink
Feature/update dependencies (#477)
Browse files Browse the repository at this point in the history
* Remove accidentally committed script

* Update dependencies

* [ESLint] Fix issues

* Remove unnecessary "??" operator

* Update "vite" to v5.x

* Disable "no default export" rule in vite config
  • Loading branch information
schroda authored Nov 25, 2023
1 parent 5aa7fc0 commit 47b077c
Show file tree
Hide file tree
Showing 6 changed files with 739 additions and 691 deletions.
45 changes: 22 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"updateDeps": "yarn upgrade && yarn syncyarnlock -s -k && yarn && git add package.json yarn.lock && git commit -m \"Update dependencies\" && echo Updated non breaking dependencies. Check potential breaking changes below... && yarn outdated",
"gql:codegen-base": "graphql-codegen --config gql_codegen.ts",
"gql:codegen-formatter": "ts-node tools/scripts/codegenFormatter.ts",
"gql:codegen": "yarn gql:codegen-base & yarn gql:codegen-formatter",
"asdf": "echo test && yarn -v"
"gql:codegen": "yarn gql:codegen-base & yarn gql:codegen-formatter"
},
"browserslist": {
"production": [
Expand All @@ -34,42 +33,42 @@
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@fontsource/roboto": "^5.0.8",
"@mui/icons-material": "^5.14.16",
"@mui/material": "^5.14.16",
"@mui/x-date-pickers": "^6.18.0",
"@vitejs/plugin-react-swc": "^3.4.1",
"@mui/icons-material": "^5.14.18",
"@mui/material": "^5.14.18",
"@mui/x-date-pickers": "^6.18.2",
"@vitejs/plugin-react-swc": "^3.5.0",
"apollo-upload-client": "^17.0.0",
"axios": "^1.6.0",
"axios": "^1.6.2",
"dayjs": "^1.11.10",
"file-selector": "^0.6.0",
"graphql-tag": "^2.12.6",
"graphql-ws": "^5.14.2",
"i18next": "^23.6.0",
"i18next-browser-languagedetector": "^7.1.0",
"i18next": "^23.7.6",
"i18next-browser-languagedetector": "^7.2.0",
"react": "^18.2.0",
"react-beautiful-dnd": "^13.1.1",
"react-dom": "^18.2.0",
"react-i18next": "^13.3.1",
"react-router-dom": "^6.18.0",
"react-i18next": "^13.5.0",
"react-router-dom": "^6.20.0",
"react-virtuoso": "^4.6.2",
"use-query-params": "^2.2.1",
"vite": "^4.5.0",
"vite": "^5.0.2",
"vite-tsconfig-paths": "^4.2.1"
},
"devDependencies": {
"@graphql-codegen/cli": "^5.0.0",
"@graphql-codegen/client-preset": "^4.1.0",
"@graphql-codegen/typescript-apollo-client-helpers": "^3.0.0",
"@graphql-codegen/typescript-operations": "^4.0.1",
"@types/apollo-upload-client": "^17.0.4",
"@types/node": "^20.8.10",
"@types/react": "^18.2.34",
"@types/react-beautiful-dnd": "^13.1.6",
"@types/react-dom": "^18.2.14",
"@types/yargs": "^17.0.29",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.9.1",
"eslint": "^8.53.0",
"@types/apollo-upload-client": "^17.0.5",
"@types/node": "^20.10.0",
"@types/react": "^18.2.38",
"@types/react-beautiful-dnd": "^13.1.7",
"@types/react-dom": "^18.2.17",
"@types/yargs": "^17.0.32",
"@typescript-eslint/eslint-plugin": "^6.12.0",
"@typescript-eslint/parser": "^6.12.0",
"eslint": "^8.54.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-prettier": "^9.0.0",
Expand All @@ -81,10 +80,10 @@
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-unused-imports": "^3.0.0",
"prettier": "^3.0.3",
"prettier": "^3.1.0",
"syncyarnlock": "^1.0.19",
"ts-node": "^10.9.1",
"typescript": "^5.2.2",
"typescript": "^5.3.2",
"yargs": "^17.7.2"
}
}
4 changes: 2 additions & 2 deletions src/components/navbar/navigation/MobileBottomBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ export function MobileBottomBar({ navBarItems }: IProps) {
location.pathname === path
? 'primary.main'
: theme.palette.mode === 'dark'
? 'grey.A400'
: 'grey.600',
? 'grey.A400'
: 'grey.600',
}}
>
{t(title)}
Expand Down
4 changes: 2 additions & 2 deletions src/screens/SearchAll.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ const compareSourcesBySearchResult = (
sourceB: ISource,
sourceToFetchedStateMap: SourceToLoadingStateMap,
): -1 | 0 | 1 => {
const isSourceAFetched = !sourceToFetchedStateMap.get(sourceA.id)?.isLoading ?? true;
const isSourceBFetched = !sourceToFetchedStateMap.get(sourceB.id)?.isLoading ?? true;
const isSourceAFetched = !sourceToFetchedStateMap.get(sourceA.id)?.isLoading;
const isSourceBFetched = !sourceToFetchedStateMap.get(sourceB.id)?.isLoading;
if (isSourceAFetched && !isSourceBFetched) {
return -1;
}
Expand Down
4 changes: 2 additions & 2 deletions src/typings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ export type RecursivePartial<T> = {
[P in keyof T]?: T[P] extends (infer U)[]
? RecursivePartial<U>[]
: T[P] extends object | undefined
? RecursivePartial<T[P]>
: T[P];
? RecursivePartial<T[P]>
: T[P];
};

export type OptionalProperty<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
Expand Down
3 changes: 3 additions & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import { defineConfig } from 'vite';
import react from '@vitejs/plugin-react-swc';
import viteTsconfigPaths from 'vite-tsconfig-paths';

// TODO - switch to ESM - with Vite v5.x the CJS build is deprecated (https://vitejs.dev/guide/migration)

// eslint-disable-next-line import/no-default-export
export default defineConfig(() => ({
build: {
outDir: 'build',
Expand Down
Loading

0 comments on commit 47b077c

Please sign in to comment.