Skip to content

Commit fb77fc3

Browse files
authored
fix: upgrade deps (#303)
1 parent 3048dd1 commit fb77fc3

File tree

9 files changed

+1500
-1481
lines changed

9 files changed

+1500
-1481
lines changed

.yarnrc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
defaultSemverRangePrefix: ""
2+
13
compressionLevel: mixed
24

35
enableGlobalCache: false

eslint.config.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { FlatCompat } from '@eslint/eslintrc';
33
import js from '@eslint/js';
44
import typescriptEslint from '@typescript-eslint/eslint-plugin';
55
import tsParser from '@typescript-eslint/parser';
6+
import cypressEslint from 'eslint-plugin-cypress';
67
import prettier from 'eslint-plugin-prettier';
78
import reactHooks from 'eslint-plugin-react-hooks';
89
import globals from 'globals';
@@ -38,14 +39,14 @@ export default [
3839
'airbnb',
3940
'plugin:import/typescript',
4041
'prettier',
41-
'plugin:cypress/recommended',
4242
'plugin:react/recommended',
4343
'plugin:react-hooks/recommended',
4444
'plugin:@typescript-eslint/recommended',
4545
),
4646
),
4747
{
4848
plugins: {
49+
cypress: cypressEslint,
4950
'@typescript-eslint': fixupPluginRules(typescriptEslint),
5051
prettier,
5152
'react-hooks': fixupPluginRules(reactHooks),

package.json

Lines changed: 62 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -11,45 +11,37 @@
1111
"homepage": ".",
1212
"type": "module",
1313
"dependencies": {
14-
"@codemirror/lang-javascript": "^6.2.2",
14+
"@codemirror/lang-javascript": "6.2.4",
1515
"@emotion/react": "11.14.0",
1616
"@emotion/styled": "11.14.0",
17-
"@graasp/apps-query-client": "^3.7.3",
18-
"@graasp/sdk": "^5.5.0",
19-
"@graasp/stylis-plugin-rtl": "^2.2.0",
20-
"@graasp/ui": "5.4.7",
21-
"@mui/icons-material": "6.3.1",
17+
"@graasp/apps-query-client": "3.7.5",
18+
"@graasp/sdk": "5.13.3",
19+
"@graasp/ui": "5.5.4",
20+
"@mui/icons-material": "6.4.12",
2221
"@mui/lab": "6.0.0-dev.240424162023-9968b4889d",
23-
"@mui/material": "6.3.1",
24-
"@sentry/react": "8.48.0",
25-
"@tanstack/react-query": "^4.36.1",
26-
"@tanstack/react-query-devtools": "^4.36.1",
27-
"@types/node": "22.10.7",
28-
"@types/react": "18.3.18",
29-
"@types/react-dom": "18.3.5",
30-
"@types/stopword": "^2.0.3",
31-
"@uiw/react-codemirror": "^4.23.7",
32-
"date-fns": "^4.1.0",
33-
"file-saver": "^2.0.5",
34-
"i18next": "^24.2.0",
35-
"lodash.countby": "^4.6.0",
36-
"lodash.flatten": "^4.4.0",
37-
"lodash.groupby": "^4.6.0",
38-
"lucide-react": "^0.469.0",
39-
"prism-react-renderer": "^2.4.1",
22+
"@mui/material": "6.4.12",
23+
"@sentry/react": "8.55.0",
24+
"@tanstack/react-query": "4.39.2",
25+
"@tanstack/react-query-devtools": "4.39.2",
26+
"@uiw/react-codemirror": "4.23.13",
27+
"date-fns": "4.1.0",
28+
"file-saver": "2.0.5",
29+
"i18next": "24.2.3",
30+
"lodash.countby": "4.6.0",
31+
"lodash.flatten": "4.4.0",
32+
"lodash.groupby": "4.6.0",
33+
"lucide-react": "0.515.0",
34+
"prism-react-renderer": "2.4.1",
4035
"react": "18.3.1",
4136
"react-dom": "18.3.1",
42-
"react-i18next": "^15.4.0",
43-
"react-markdown": "^9.0.3",
37+
"react-i18next": "15.5.3",
38+
"react-markdown": "9.1.0",
4439
"react-mde": "12.0.8",
45-
"react-router-dom": "^6.28.1",
46-
"react-toastify": "11.0.3",
47-
"react-wordcloud": "^1.2.7",
48-
"remark-breaks": "^4.0.0",
49-
"remark-gfm": "^4.0.0",
50-
"stopword": "^3.1.4",
51-
"string-to-color": "^2.2.2",
52-
"typescript": "5.7.3"
40+
"react-toastify": "11.0.5",
41+
"react-wordcloud": "1.2.7",
42+
"remark-breaks": "4.0.0",
43+
"remark-gfm": "4.0.1",
44+
"stopword": "3.1.5"
5345
},
5446
"scripts": {
5547
"dev": "yarn vite",
@@ -74,48 +66,53 @@
7466
"cov:report": "open ./coverage/lcov-report/index.html"
7567
},
7668
"devDependencies": {
77-
"@commitlint/cli": "19.6.1",
78-
"@commitlint/config-conventional": "19.6.0",
79-
"@cypress/code-coverage": "3.13.10",
80-
"@eslint/compat": "^1.2.4",
81-
"@eslint/eslintrc": "^3.2.0",
82-
"@eslint/js": "^9.17.0",
83-
"@trivago/prettier-plugin-sort-imports": "^5.2.1",
84-
"@types/file-saver": "^2.0.7",
69+
"@commitlint/cli": "19.8.1",
70+
"@commitlint/config-conventional": "19.8.1",
71+
"@cypress/code-coverage": "3.14.4",
72+
"@eslint/compat": "1.3.0",
73+
"@eslint/eslintrc": "3.3.1",
74+
"@eslint/js": "9.29.0",
75+
"@trivago/prettier-plugin-sort-imports": "5.2.2",
76+
"@types/file-saver": "2.0.7",
8577
"@types/i18n": "0.13.12",
86-
"@types/lodash.countby": "^4.6.9",
87-
"@types/lodash.flatten": "^4.4.9",
88-
"@types/lodash.groupby": "^4.6.9",
78+
"@types/lodash.countby": "4.6.9",
79+
"@types/lodash.flatten": "4.4.9",
80+
"@types/lodash.groupby": "4.6.9",
81+
"@types/node": "22.15.31",
82+
"@types/react": "18.3.23",
83+
"@types/react-dom": "18.3.7",
84+
"@types/stopword": "2.0.3",
8985
"@types/uuid": "10.0.0",
90-
"@typescript-eslint/eslint-plugin": "8.21.0",
91-
"@typescript-eslint/parser": "8.21.0",
92-
"@vitejs/plugin-react": "^4.3.4",
93-
"axios": "1.7.9",
86+
"@typescript-eslint/eslint-plugin": "8.34.0",
87+
"@typescript-eslint/parser": "8.34.0",
88+
"@vitejs/plugin-react": "4.5.2",
89+
"axios": "1.10.0",
9490
"concurrently": "9.1.2",
95-
"cypress": "^14.4.1",
91+
"cypress": "14.4.1",
9692
"env-cmd": "10.1.0",
97-
"eslint": "^9.17.0",
93+
"eslint": "9.29.0",
9894
"eslint-config-airbnb": "19.0.4",
99-
"eslint-config-airbnb-typescript": "^18.0.0",
100-
"eslint-config-prettier": "10.0.1",
95+
"eslint-config-airbnb-typescript": "18.0.0",
96+
"eslint-config-prettier": "10.1.5",
10197
"eslint-config-react-app": "7.0.1",
102-
"eslint-import-resolver-typescript": "^3.7.0",
103-
"eslint-plugin-cypress": "4.1.0",
98+
"eslint-import-resolver-typescript": "4.4.3",
99+
"eslint-plugin-cypress": "5.1.0",
104100
"eslint-plugin-import": "2.31.0",
105101
"eslint-plugin-jsx-a11y": "6.10.2",
106-
"eslint-plugin-prettier": "5.2.3",
107-
"eslint-plugin-react": "^7.37.3",
108-
"eslint-plugin-react-hooks": "5.1.0",
109-
"globals": "^15.14.0",
102+
"eslint-plugin-prettier": "5.4.1",
103+
"eslint-plugin-react": "7.37.5",
104+
"eslint-plugin-react-hooks": "5.2.0",
105+
"globals": "15.15.0",
110106
"husky": "9.1.7",
111-
"nock": "^13.5.6",
107+
"nock": "13.5.6",
112108
"nyc": "17.1.0",
113-
"prettier": "3.4.2",
114-
"uuid": "11.0.5",
115-
"vite": "^6.0.7",
116-
"vite-plugin-checker": "^0.8.0",
117-
"vite-plugin-istanbul": "^6.0.2",
118-
"vitest": "^3.0.0"
109+
"prettier": "3.5.3",
110+
"typescript": "5.8.3",
111+
"uuid": "11.1.0",
112+
"vite": "6.3.5",
113+
"vite-plugin-checker": "0.9.3",
114+
"vite-plugin-istanbul": "7.0.0",
115+
"vitest": "3.2.3"
119116
},
120117
"browserslist": {
121118
"production": [

src/modules/common/CommentEditor.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ import {
1111

1212
import {
1313
Box,
14+
Button,
1415
FormHelperText,
1516
Stack,
1617
TextareaAutosize,
1718
styled,
1819
} from '@mui/material';
1920

20-
import { Button } from '@graasp/ui';
21-
2221
import {
2322
Bold,
2423
Code2,
@@ -177,7 +176,7 @@ const CommentEditor = ({
177176
justifyContent="space-between"
178177
>
179178
<Button
180-
dataCy={COMMENT_EDITOR_CANCEL_BUTTON_CYPRESS}
179+
data-cy={COMMENT_EDITOR_CANCEL_BUTTON_CYPRESS}
181180
color="secondary"
182181
variant="outlined"
183182
onClick={() => onCancel()}
@@ -186,7 +185,7 @@ const CommentEditor = ({
186185
</Button>
187186
<Button
188187
endIcon={<SendHorizonal />}
189-
dataCy={COMMENT_EDITOR_SAVE_BUTTON_CYPRESS}
188+
data-cy={COMMENT_EDITOR_SAVE_BUTTON_CYPRESS}
190189
color="primary"
191190
variant="outlined"
192191
onClick={() => onSend(text)}

src/modules/common/KeywordChip.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
import React from 'react';
2-
31
import { Avatar, Chip } from '@mui/material';
42

5-
import stc from 'string-to-color';
3+
import { stringToColor } from '@graasp/ui/apps';
64

75
import { KEYWORD_CHIP_COUNT_ID, buildKeywordChipId } from '@/config/selectors';
86

@@ -17,7 +15,7 @@ const KeywordChip = ({
1715
isSelected: boolean;
1816
onClick: () => void;
1917
}): JSX.Element => {
20-
const color = stc(text);
18+
const color = stringToColor(text);
2119
return (
2220
<Chip
2321
avatar={

src/modules/common/TextWithHighlightedKeywords.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import React from 'react';
21
import { useTranslation } from 'react-i18next';
32

43
import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
54
import { Box, IconButton, Tooltip, Typography, styled } from '@mui/material';
65

7-
import stc from 'string-to-color';
6+
import { stringToColor } from '@graasp/ui/apps';
87

98
import { createRegexFromString } from '../analytics/utils';
109

@@ -51,8 +50,8 @@ const TextWithHighlightedKeywords = ({
5150
<span
5251
key={part + memberName}
5352
style={{
54-
color: stc(part),
55-
backgroundColor: `${stc(part)}20`,
53+
color: stringToColor(part),
54+
backgroundColor: `${stringToColor(part)}20`,
5655
padding: '4px',
5756
}}
5857
>

src/modules/main/AnalyticsView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import PeopleIcon from '@mui/icons-material/People';
77
import { Alert, Box, Button, Grid2, Typography } from '@mui/material';
88

99
import { AppAction } from '@graasp/sdk';
10-
import { Loader } from '@graasp/ui';
1110

1211
import groupBy from 'lodash.groupby';
1312

@@ -24,6 +23,7 @@ import FrequentWords from '../analytics/FrequentWords';
2423
import StatisticCard from '../analytics/StatisticCard';
2524
import WordCloud from '../analytics/WordCloud';
2625
import { getAllWords } from '../analytics/utils';
26+
import Loader from '../common/Loader';
2727

2828
const AnalyticsView = (): JSX.Element => {
2929
const { data: actions, isLoading } = hooks.useAppActions();
@@ -114,7 +114,7 @@ const AnalyticsView = (): JSX.Element => {
114114
}
115115

116116
if (isLoading) {
117-
return <Loader />;
117+
return <Loader>Analytics</Loader>;
118118
}
119119
return <Alert severity="error">{t('UNEXPECTED_ERROR')}</Alert>;
120120
};

src/modules/settings/OrphanComments.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { useTranslation } from 'react-i18next';
22

3-
import { FormControlLabel } from '@mui/material';
3+
import { Button, FormControlLabel } from '@mui/material';
44

55
import { UUID } from '@graasp/sdk';
6-
import { Button } from '@graasp/ui';
76

87
import { CommentAppData } from '@/config/appData';
98
import { mutations } from '@/config/queryClient';
@@ -39,7 +38,7 @@ const OrphanComments = ({ comments }: Props): JSX.Element | null => {
3938

4039
const buttonControl = (
4140
<Button
42-
dataCy={ORPHAN_BUTTON_CYPRESS}
41+
data-cy={ORPHAN_BUTTON_CYPRESS}
4342
variant="outlined"
4443
color="primary"
4544
onClick={() => handleOnClickRemoveOrphans(orphanThreads)}

0 commit comments

Comments
 (0)