Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

thjs-64 update dependencies #112

Merged
merged 5 commits into from
Dec 18, 2023
Merged

thjs-64 update dependencies #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2bdf21d
thjs-64: * shared deps
v0ldemar01 Dec 18, 2023
5308b94
thjs-64: * server deps
v0ldemar01 Dec 18, 2023
7392b61
thjs-64: * client deps
v0ldemar01 Dec 18, 2023
376835e
thjs-64: * move typescript eslint plugins into root workspace
v0ldemar01 Dec 18, 2023
d61e4cd
thjs-64: * root deps
v0ldemar01 Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion client/.stylelintrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ plugins:

rules:
selector-class-pattern: null
declaration-colon-newline-after: null
selector-pseudo-class-no-unknown:
- true
- ignorePseudoClasses:
Expand Down
2 changes: 1 addition & 1 deletion client/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand Down
34 changes: 17 additions & 17 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@
"lint:js": "npx eslint --ext .ts,tsx src"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "6.4.0",
"@fortawesome/free-solid-svg-icons": "6.4.0",
"@fortawesome/fontawesome-svg-core": "6.5.1",
"@fortawesome/free-solid-svg-icons": "6.5.1",
"@fortawesome/react-fontawesome": "0.2.0",
"@hookform/error-message": "2.0.1",
"@hookform/resolvers": "3.1.1",
"@reduxjs/toolkit": "1.9.5",
"@hookform/resolvers": "3.3.2",
"@reduxjs/toolkit": "2.0.1",
"clsx": "2.0.0",
"events": "3.3.0",
"query-string": "8.1.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-hook-form": "7.44.3",
"react-hook-form": "7.49.2",
"react-infinite-scroll-component": "6.1.0",
"react-redux": "8.1.0",
"react-router-dom": "6.13.0",
"react-redux": "9.0.4",
"react-router-dom": "6.21.0",
"react-toastify": "9.1.3",
"socket.io-client": "4.6.2"
"socket.io-client": "4.7.2"
},
"browserslist": [
">0.2%",
Expand All @@ -40,17 +40,17 @@
"not op_mini all"
],
"devDependencies": {
"@types/react": "18.2.20",
"@types/react-dom": "18.2.7",
"@vitejs/plugin-react": "4.0.0",
"@types/react": "18.2.45",
"@types/react-dom": "18.2.18",
"@vitejs/plugin-react": "4.2.1",
"eslint-config-airbnb": "19.0.4",
"eslint-config-react-app": "7.0.1",
"eslint-plugin-jsx-a11y": "6.7.1",
"eslint-plugin-react": "7.32.2",
"sass": "1.63.4",
"stylelint-config-standard-scss": "9.0.0",
"stylelint-scss": "5.0.1",
"vite": "4.3.9",
"eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-react": "7.33.2",
"sass": "1.69.5",
"stylelint-config-standard-scss": "12.0.0",
"stylelint-scss": "6.0.0",
"vite": "5.0.10",
"vite-tsconfig-paths": "4.2.2"
}
}
3 changes: 2 additions & 1 deletion client/src/libs/components/checkbox/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
content: "";
background: #fff linear-gradient(transparent, rgba(0 0 0 / 5%));
border-radius: 50%;
box-shadow: 0 1px 2px 0 rgb(34 36 38 / 15%),
box-shadow:
0 1px 2px 0 rgb(34 36 38 / 15%),
0 0 0 1px rgb(34 36 38 / 15%) inset;
display: inline-block;
position: absolute;
Expand Down
4 changes: 3 additions & 1 deletion client/src/libs/components/message/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
.message {
background-color: #f8f8f9;
border-radius: 0.3rem;
box-shadow: 0 0 0 1px rgb(34 36 38 / 22%) inset, 0 0 0 0 transparent;
box-shadow:
0 0 0 1px rgb(34 36 38 / 22%) inset,
0 0 0 0 transparent;
margin-top: 1rem;
padding: 1rem;

Expand Down
4 changes: 3 additions & 1 deletion client/src/libs/components/post/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
.card {
background-color: white;
border-radius: 0.3rem;
box-shadow: 0 1px 3px 0 #d4d4d5, 0 0 0 1px #d4d4d5;
box-shadow:
0 1px 3px 0 #d4d4d5,
0 0 0 1px #d4d4d5;
margin-bottom: 1rem;
width: 100%;

Expand Down
10 changes: 5 additions & 5 deletions client/src/libs/packages/store/libs/types/store-package.type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {
type AnyAction,
type configureStore,
type MiddlewareArray,
type ThunkMiddleware
type ThunkMiddleware,
type Tuple,
type UnknownAction
} from '@reduxjs/toolkit';

import { type notificationApi } from '~/libs/packages/notification/notification.js';
Expand Down Expand Up @@ -31,8 +31,8 @@ type ExtraArguments = {
type StoreInstance = ReturnType<
typeof configureStore<
RootReducer,
AnyAction,
MiddlewareArray<[ThunkMiddleware<RootReducer, AnyAction, ExtraArguments>]>
UnknownAction,
Tuple<[ThunkMiddleware<RootReducer, UnknownAction, ExtraArguments>]>
>
>;

Expand Down
4 changes: 2 additions & 2 deletions ...src/libs/packages/store/middlewares/notification-socket/notification-socket.middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable unicorn/prefer-regexp-test */
import { type AnyAction, type Middleware } from '@reduxjs/toolkit';
import { type Middleware } from '@reduxjs/toolkit';

import {
NotificationMessage,
Expand Down Expand Up @@ -39,7 +39,7 @@ const notificationSocket: Middleware<unknown, unknown, AppDispatch> = ({
}
);

return next => (action: AnyAction) => {
return next => action => {
if (notificationActionCreator.joinRoom.match(action)) {
notificationSocketInstance.emit(
SocketEvent.NOTIFICATION_JOIN_ROOM,
Expand Down
14 changes: 6 additions & 8 deletions client/src/libs/packages/store/store.package.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable unicorn/prefer-spread */
import { configureStore } from '@reduxjs/toolkit';

import { AppEnvironment } from '~/libs/enums/enums.js';
Expand Down Expand Up @@ -33,14 +34,11 @@ class Store implements StorePackage {
posts: threadReducer
},
middleware: getDefaultMiddleware => {
return [
...getDefaultMiddleware({
thunk: {
extraArgument: this.extraArguments
}
}),
notificationSocket
];
return getDefaultMiddleware({
thunk: {
extraArgument: this.extraArguments
}
}).concat(notificationSocket);
}
});
}
Expand Down
Loading
Loading