Skip to content

Commit

Permalink
chore: update dependencies, fix script
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisUser committed Dec 31, 2024
1 parent 0ec0384 commit eb42f81
Show file tree
Hide file tree
Showing 9 changed files with 1,753 additions and 1,574 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js → .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
parser: '@typescript-eslint/parser',
extends: ['eslint:recommended', 'plugin:react/recommended', 'plugin:@typescript-eslint/recommended'],
extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'],
plugins: ['@typescript-eslint', 'react-hooks', 'prettier'],
parserOptions: {
ecmaVersion: 2018,
Expand Down
50 changes: 28 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
"url": "https://github.com/chrisuser"
},
"dependencies": {
"@reduxjs/toolkit": "^2.2.2",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.2",
"@reduxjs/toolkit": "^2.5.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.1.0",
"@testing-library/user-event": "^14.5.2",
"axios": "^1.7.2",
"eslint-plugin-prettier": "^5.1.3",
"axios": "^1.7.9",
"eslint-plugin-prettier": "^5.2.1",
"moment": "^2.30.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-redux": "^9.1.0",
"react-router-dom": "^6.22.3",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-redux": "^9.2.0",
"react-router": "^7.1.1",
"redux-persist": "^6.0.0",
"sass": "^1.72.0",
"sass-loader": "^14.1.1"
"sass": "^1.83.0",
"sass-loader": "^16.0.4"
},
"scripts": {
"start": "vite --port 3000 --open",
Expand All @@ -29,7 +29,7 @@
"serve": "vite preview --open",
"test": "jest",
"test:coverage": "jest --silent --watchAll=false --coverage",
"lint": "eslint --cache .",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"format": "prettier --check ."
},
"eslintConfig": {
Expand All @@ -40,21 +40,27 @@
"not IE 11"
],
"devDependencies": {
"@types/jest": "^29.5.12",
"@types/node": "^20.11.30",
"@types/react": "^18.2.67",
"@types/react-dom": "^18.2.22",
"@types/react-redux": "^7.1.33",
"@vitejs/plugin-react": "^4.2.1",
"@testing-library/dom": "^10.4.0",
"@types/jest": "^29.5.14",
"@types/node": "^22.10.2",
"@types/react": "^19.0.2",
"@types/react-dom": "^19.0.2",
"@types/react-redux": "^7.1.34",
"@typescript-eslint/eslint-plugin": "^8.18.2",
"@typescript-eslint/parser": "^8.18.2",
"@vitejs/plugin-react": "^4.3.4",
"eslint": "^8.56.0",
"eslint-plugin-react-hooks": "^5.1.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"ts-jest": "^29.1.2",
"typescript": "^5.4.3",
"vite": "^5.2.4",
"prettier": "^3.4.2",
"ts-jest": "^29.2.5",
"typescript": "^5.7.2",
"vite": "^6.0.6",
"vite-plugin-env-compatible": "^2.0.1",
"vite-plugin-html": "^3.2.2",
"vitest": "^1.4.0"
"vitest": "^2.1.8"
},
"homepage": "."
}
2 changes: 1 addition & 1 deletion src/RootComponent.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { BrowserRouter as Router, Route, Routes } from 'react-router-dom'
import { BrowserRouter as Router, Route, Routes } from 'react-router'
import HomePage from './pages/HomePage'
import NotFoundPage from './pages/NotFoundPage'
import { ROUTES } from './resources/routes-constants'
Expand Down
6 changes: 5 additions & 1 deletion src/__tests__/pages/NotFoundPage.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
* @jest-environment jsdom
*/
import { render, screen } from '@testing-library/react'
import { TextEncoder, TextDecoder } from 'util'

Object.assign(global, { TextDecoder, TextEncoder })

import '@testing-library/jest-dom'
import { BrowserRouter as Router } from 'react-router-dom'
import { BrowserRouter as Router } from 'react-router'
import NotFoundPage from '../../pages/NotFoundPage'

test('renders error message', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/NotFoundPage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { useNavigate } from 'react-router-dom'
import { useNavigate } from 'react-router'
import { ROUTES } from '../resources/routes-constants'

const NotFoundPage: React.FC = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/serviceWorker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type Config = {

export const register = (config?: Config): void => {
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href)
const publicUrl = new URL(process.env.PUBLIC_URL || '', window.location.href)
if (publicUrl.origin !== window.location.origin) {
return
}
Expand Down
4 changes: 3 additions & 1 deletion src/styles/_mixins.sass
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@use './_variables' as *
$phone-size: 600px
$tablet-size: 992px
$desktop-size: 1200px

=flexbox($justify, $align, $direction, $wrap)
display: flex
Expand Down
4 changes: 0 additions & 4 deletions src/styles/_variables.sass
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,3 @@ $main-border-radius: 6px
$small-space: 16px
$medium-space: 32px
$large-space: 64px

$phone-size: 600px
$tablet-size: 992px
$desktop-size: 1200px
Loading

0 comments on commit eb42f81

Please sign in to comment.