Skip to content

Commit

Permalink
feat: update dependencies (#209)
Browse files Browse the repository at this point in the history 
* feat: update dependencies

* refactor: use spacing
  • Loading branch information
@pyphilia
pyphilia authored Apr 22, 2024
1 parent 21d44ca commit 00c583e
Show file tree
Hide file tree
Showing 6 changed files with 4,222 additions and 2,214 deletions.
105 changes: 49 additions & 56 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,41 +13,41 @@
"dependencies": {
"@codemirror/lang-cpp": "^6.0.2",
"@codemirror/lang-java": "6.0.1",
"@codemirror/lang-javascript": "6.2.1",
"@codemirror/lang-javascript": "6.2.2",
"@codemirror/lang-json": "^6.0.1",
"@codemirror/lang-markdown": "^6.2.3",
"@codemirror/lang-python": "^6.1.4",
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@fortawesome/fontawesome-svg-core": "6.5.1",
"@fortawesome/free-regular-svg-icons": "6.5.1",
"@fortawesome/free-solid-svg-icons": "6.5.1",
"@codemirror/lang-markdown": "^6.2.5",
"@codemirror/lang-python": "^6.1.5",
"@emotion/react": "11.11.4",
"@emotion/styled": "11.11.5",
"@fortawesome/fontawesome-svg-core": "6.5.2",
"@fortawesome/free-regular-svg-icons": "6.5.2",
"@fortawesome/free-solid-svg-icons": "6.5.2",
"@fortawesome/react-fontawesome": "0.2.0",
"@graasp/apps-query-client": "3.4.8",
"@graasp/apps-query-client": "3.4.11",
"@graasp/pyodide": "github:graasp/graasp-pyodide",
"@graasp/sdk": "4.1.0",
"@graasp/ui": "4.1.1",
"@mui/icons-material": "5.15.1",
"@mui/lab": "5.0.0-alpha.134",
"@mui/material": "5.15.1",
"@sentry/react": "7.89.0",
"@graasp/sdk": "4.7.2",
"@graasp/ui": "4.15.0",
"@mui/icons-material": "5.15.15",
"@mui/lab": "5.0.0-alpha.170",
"@mui/material": "5.15.15",
"@sentry/react": "7.110.1",
"@tanstack/react-query": "^4.36.1",
"@tanstack/react-query-devtools": "^4.36.1",
"@types/lodash.groupby": "4.6.9",
"@types/node": "20.10.5",
"@types/react": "18.2.60",
"@types/react-dom": "18.2.19",
"@uiw/react-codemirror": "^4.21.24",
"@uppy/core": "^3.1.1",
"@uppy/dashboard": "^3.3.1",
"@uppy/drag-drop": "^3.0.1",
"@uppy/file-input": "^3.0.1",
"@uppy/progress-bar": "^3.0.1",
"@uppy/react": "^3.1.0",
"@uppy/xhr-upload": "^3.1.0",
"date-fns": "3.0.1",
"@types/node": "20.12.7",
"@types/react": "18.2.79",
"@types/react-dom": "18.2.25",
"@uiw/react-codemirror": "^4.21.25",
"@uppy/core": "^3.10.1",
"@uppy/dashboard": "^3.8.1",
"@uppy/drag-drop": "^3.1.0",
"@uppy/file-input": "^3.1.1",
"@uppy/progress-bar": "^3.1.1",
"@uppy/react": "^3.3.0",
"@uppy/xhr-upload": "^3.6.4",
"date-fns": "3.6.0",
"file-saver": "^2.0.5",
"i18next": "23.7.11",
"i18next": "23.11.2",
"lodash.countby": "4.6.0",
"lodash.groupby": "4.6.0",
"lodash.isequal": "4.5.0",
Expand All @@ -60,17 +60,17 @@
"react-csv": "2.2.2",
"react-diff-viewer": "3.1.1",
"react-dom": "18.2.0",
"react-i18next": "13.5.0",
"react-i18next": "14.1.0",
"react-markdown": "9.0.1",
"react-mde": "12.0.8",
"react-router-dom": "6.21.0",
"react-router-dom": "6.22.3",
"react-sparklines": "1.7.0",
"react-syntax-highlighter": "15.5.0",
"react-toastify": "9.1.3",
"react-toastify": "10.0.5",
"remark-breaks": "4.0.0",
"remark-gfm": "4.0.0",
"stylis-plugin-rtl": "2.1.1",
"typescript": "5.3.3"
"typescript": "5.4.5"
},
"scripts": {
"dev": "yarn vite",
Expand All @@ -97,46 +97,46 @@
"cov:report": "open ./coverage/lcov-report/index.html"
},
"devDependencies": {
"@commitlint/cli": "18.4.4",
"@commitlint/config-conventional": "18.4.4",
"@commitlint/cli": "19.2.2",
"@commitlint/config-conventional": "19.2.2",
"@cypress/code-coverage": "3.12.35",
"@trivago/prettier-plugin-sort-imports": "4.3.0",
"@types/file-saver": "^2.0.7",
"@types/i18n": "0.13.10",
"@types/lodash.countby": "^4",
"@types/lodash.countby": "^4.6.9",
"@types/lodash.isequal": "4.5.8",
"@types/lodash.isobject": "3.0.9",
"@types/lodash.isstring": "4.0.9",
"@types/lodash.orderby": "^4",
"@types/lodash.orderby": "^4.6.9",
"@types/lodash.sumby": "4.6.9",
"@types/react-csv": "1.1.10",
"@types/react-sparklines": "^1",
"@types/react-syntax-highlighter": "^15",
"@types/react-sparklines": "^1.7.5",
"@types/react-syntax-highlighter": "^15.5.11",
"@types/uuid": "9.0.8",
"@typescript-eslint/eslint-plugin": "6.15.0",
"@typescript-eslint/parser": "6.15.0",
"@typescript-eslint/eslint-plugin": "7.7.0",
"@typescript-eslint/parser": "7.7.0",
"@vitejs/plugin-react": "^4.2.1",
"concurrently": "8.2.2",
"cypress": "13.6.6",
"cypress": "13.7.3",
"env-cmd": "10.1.0",
"eslint": "8.56.0",
"eslint": "8.57.0",
"eslint-config-airbnb": "19.0.4",
"eslint-config-prettier": "9.1.0",
"eslint-config-react-app": "7.0.1",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-cypress": "2.15.1",
"eslint-plugin-cypress": "2.15.2",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-prettier": "5.1.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-hooks": "4.6.0",
"husky": "8.0.3",
"husky": "9.0.11",
"nyc": "15.1.0",
"prettier": "3.1.1",
"prettier": "3.2.5",
"uuid": "9.0.1",
"vite": "5.0.13",
"vite": "5.2.9",
"vite-plugin-checker": "0.6.4",
"vite-plugin-istanbul": "5.0.0"
"vite-plugin-istanbul": "6.0.0"
},
"browserslist": {
"production": [
Expand All @@ -160,13 +160,6 @@
"src/**/*.d.ts"
]
},
"resolutions": {
"@codemirror/state": "6.3.3",
"react": "18.2.0",
"react-dom": "18.2.0",
"@types/react": "18.2.60",
"@types/react-dom": "18.2.19"
},
"packageManager": "[email protected]",
"msw": {
"workerDirectory": "public"
Expand Down
2 changes: 1 addition & 1 deletion public/mockServiceWorker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* tslint:disable */

/**
* Mock Service Worker (1.3.2).
* Mock Service Worker (1.3.3).
* @see https://github.com/mswjs/msw
* - Please do NOT modify this file.
* - Please do NOT serve this file on production.
Expand Down
15 changes: 5 additions & 10 deletions src/data/db.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
CompleteMember,
DiscriminatedItem,
ItemType,
MemberFactory,
MemberType,
PermissionLevel,
} from '@graasp/sdk';
Expand Down Expand Up @@ -50,24 +51,18 @@ export const mockContext: LocalContext = {
};

export const mockMembers: CompleteMember[] = [
{
MemberFactory({
id: mockContext.memberId || '',
name: 'current-member',
email: '',
extra: {},
type: MemberType.Individual,
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
},
{
}),
MemberFactory({
id: 'mock-member-id-2',
name: 'mock-member-2',
email: '',
extra: {},
type: MemberType.Individual,
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
},
}),
];

const mockPythonCode = `import matplotlib.pyplot as plt
Expand Down
9 changes: 7 additions & 2 deletions src/modules/views/admin/OrphanComments.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ const OrphanComments: FC<Prop> = ({ comments }) => {
dataCy={ORPHAN_BUTTON_CYPRESS}
variant="outlined"
color="primary"
sx={{ mr: 1 }}
onClick={() => handleOnClickRemoveOrphans(orphanThreads)}
disabled={orphanThreads.length === 0}
>
Expand All @@ -62,7 +61,13 @@ const OrphanComments: FC<Prop> = ({ comments }) => {
totalComments: totalNumberOfOrphanComments,
});

return <FormControlLabel control={buttonControl} label={buttonLabel} />;
return (
<FormControlLabel
sx={{ mr: 1 }}
control={buttonControl}
label={buttonLabel}
/>
);
};

export default OrphanComments;
8 changes: 3 additions & 5 deletions src/modules/views/admin/SettingsFab.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { FC, ReactElement, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';

import { DisplaySettings as DisplaySettingsIcon } from '@mui/icons-material';
import { Box, Fab, Stack, Tooltip } from '@mui/material';
import { Fab, Stack, Tooltip } from '@mui/material';

import { Button } from '@graasp/ui';

Expand Down Expand Up @@ -64,9 +64,8 @@ const SettingsFab: FC = () => {
};

const renderActions = (): ReactElement => (
<Box>
<Stack spacing={1} direction="row">
<Button
sx={{ m: 1 }}
dataCy={SETTINGS_DIALOG_CANCEL_BUTTON_CYPRESS}
onClick={() => handleClose(false)}
color="error"
Expand All @@ -75,15 +74,14 @@ const SettingsFab: FC = () => {
{t('Cancel')}
</Button>
<Button
sx={{ m: 1 }}
dataCy={SETTINGS_DIALOG_SAVE_BUTTON_CYPRESS}
onClick={() => handleClose(true)}
disabled={!unsavedChanges}
variant="outlined"
>
{unsavedChanges ? t('Save') : t('Saved')}
</Button>
</Box>
</Stack>
);

return (
Expand Down
Loading

0 comments on commit 00c583e

Please sign in to comment.