Skip to content

Commit 8ebe94a

Browse files
v0ldemar01v0ldemar01
authored
Merge pull request #112 from BinaryStudioAcademy/task/thjs-64-update-dependencies
thjs-64 update dependencies
2 parents 3e782ee + d61e4cd commit 8ebe94a

File tree

15 files changed

+2642
-2727
lines changed

15 files changed

+2642
-2727
lines changed

‎client/.stylelintrc.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ plugins:
77

88
rules:
99
selector-class-pattern: null
10-
declaration-colon-newline-after: null
1110
selector-pseudo-class-no-unknown:
1211
- true
1312
- ignorePseudoClasses:

‎client/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />

‎client/package.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@
1515
"lint:js": "npx eslint --ext .ts,tsx src"
1616
},
1717
"dependencies": {
18-
"@fortawesome/fontawesome-svg-core": "6.4.0",
19-
"@fortawesome/free-solid-svg-icons": "6.4.0",
18+
"@fortawesome/fontawesome-svg-core": "6.5.1",
19+
"@fortawesome/free-solid-svg-icons": "6.5.1",
2020
"@fortawesome/react-fontawesome": "0.2.0",
2121
"@hookform/error-message": "2.0.1",
22-
"@hookform/resolvers": "3.1.1",
23-
"@reduxjs/toolkit": "1.9.5",
22+
"@hookform/resolvers": "3.3.2",
23+
"@reduxjs/toolkit": "2.0.1",
2424
"clsx": "2.0.0",
2525
"events": "3.3.0",
2626
"query-string": "8.1.0",
2727
"react": "18.2.0",
2828
"react-dom": "18.2.0",
29-
"react-hook-form": "7.44.3",
29+
"react-hook-form": "7.49.2",
3030
"react-infinite-scroll-component": "6.1.0",
31-
"react-redux": "8.1.0",
32-
"react-router-dom": "6.13.0",
31+
"react-redux": "9.0.4",
32+
"react-router-dom": "6.21.0",
3333
"react-toastify": "9.1.3",
34-
"socket.io-client": "4.6.2"
34+
"socket.io-client": "4.7.2"
3535
},
3636
"browserslist": [
3737
">0.2%",
@@ -40,17 +40,17 @@
4040
"not op_mini all"
4141
],
4242
"devDependencies": {
43-
"@types/react": "18.2.20",
44-
"@types/react-dom": "18.2.7",
45-
"@vitejs/plugin-react": "4.0.0",
43+
"@types/react": "18.2.45",
44+
"@types/react-dom": "18.2.18",
45+
"@vitejs/plugin-react": "4.2.1",
4646
"eslint-config-airbnb": "19.0.4",
4747
"eslint-config-react-app": "7.0.1",
48-
"eslint-plugin-jsx-a11y": "6.7.1",
49-
"eslint-plugin-react": "7.32.2",
50-
"sass": "1.63.4",
51-
"stylelint-config-standard-scss": "9.0.0",
52-
"stylelint-scss": "5.0.1",
53-
"vite": "4.3.9",
48+
"eslint-plugin-jsx-a11y": "6.8.0",
49+
"eslint-plugin-react": "7.33.2",
50+
"sass": "1.69.5",
51+
"stylelint-config-standard-scss": "12.0.0",
52+
"stylelint-scss": "6.0.0",
53+
"vite": "5.0.10",
5454
"vite-tsconfig-paths": "4.2.2"
5555
}
5656
}

‎client/src/libs/components/checkbox/styles.module.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
content: "";
3030
background: #fff linear-gradient(transparent, rgba(0 0 0 / 5%));
3131
border-radius: 50%;
32-
box-shadow: 0 1px 2px 0 rgb(34 36 38 / 15%),
32+
box-shadow:
33+
0 1px 2px 0 rgb(34 36 38 / 15%),
3334
0 0 0 1px rgb(34 36 38 / 15%) inset;
3435
display: inline-block;
3536
position: absolute;

‎client/src/libs/components/message/styles.module.scss‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
.message {
22
background-color: #f8f8f9;
33
border-radius: 0.3rem;
4-
box-shadow: 0 0 0 1px rgb(34 36 38 / 22%) inset, 0 0 0 0 transparent;
4+
box-shadow:
5+
0 0 0 1px rgb(34 36 38 / 22%) inset,
6+
0 0 0 0 transparent;
57
margin-top: 1rem;
68
padding: 1rem;
79

‎client/src/libs/components/post/styles.module.scss‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
.card {
22
background-color: white;
33
border-radius: 0.3rem;
4-
box-shadow: 0 1px 3px 0 #d4d4d5, 0 0 0 1px #d4d4d5;
4+
box-shadow:
5+
0 1px 3px 0 #d4d4d5,
6+
0 0 0 1px #d4d4d5;
57
margin-bottom: 1rem;
68
width: 100%;
79

‎client/src/libs/packages/store/libs/types/store-package.type.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {
2-
type AnyAction,
32
type configureStore,
4-
type MiddlewareArray,
5-
type ThunkMiddleware
3+
type ThunkMiddleware,
4+
type Tuple,
5+
type UnknownAction
66
} from '@reduxjs/toolkit';
77

88
import { type notificationApi } from '~/libs/packages/notification/notification.js';
@@ -31,8 +31,8 @@ type ExtraArguments = {
3131
type StoreInstance = ReturnType<
3232
typeof configureStore<
3333
RootReducer,
34-
AnyAction,
35-
MiddlewareArray<[ThunkMiddleware<RootReducer, AnyAction, ExtraArguments>]>
34+
UnknownAction,
35+
Tuple<[ThunkMiddleware<RootReducer, UnknownAction, ExtraArguments>]>
3636
>
3737
>;
3838

‎client/src/libs/packages/store/middlewares/notification-socket/notification-socket.middleware.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable unicorn/prefer-regexp-test */
2-
import { type AnyAction, type Middleware } from '@reduxjs/toolkit';
2+
import { type Middleware } from '@reduxjs/toolkit';
33

44
import {
55
NotificationMessage,
@@ -39,7 +39,7 @@ const notificationSocket: Middleware<unknown, unknown, AppDispatch> = ({
3939
}
4040
);
4141

42-
return next => (action: AnyAction) => {
42+
return next => action => {
4343
if (notificationActionCreator.joinRoom.match(action)) {
4444
notificationSocketInstance.emit(
4545
SocketEvent.NOTIFICATION_JOIN_ROOM,

‎client/src/libs/packages/store/store.package.ts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable unicorn/prefer-spread */
12
import { configureStore } from '@reduxjs/toolkit';
23

34
import { AppEnvironment } from '~/libs/enums/enums.js';
@@ -33,14 +34,11 @@ class Store implements StorePackage {
3334
posts: threadReducer
3435
},
3536
middleware: getDefaultMiddleware => {
36-
return [
37-
...getDefaultMiddleware({
38-
thunk: {
39-
extraArgument: this.extraArguments
40-
}
41-
}),
42-
notificationSocket
43-
];
37+
return getDefaultMiddleware({
38+
thunk: {
39+
extraArgument: this.extraArguments
40+
}
41+
}).concat(notificationSocket);
4442
}
4543
});
4644
}

0 commit comments

Comments
 (0)