Merge pull request #778 from acelaya-forks/feature/chartjs-4

Feature/chartjs 4

CHANGELOG.md

@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 * [#753](https://github.com/shlinkio/shlink-web-client/issues/753) Migrated from react-scripts/webpack to vite.
+* [#770](https://github.com/shlinkio/shlink-web-client/issues/770) Updated to latest dependencies.
 
 ### Deprecated
 * *Nothing*

config/jest/setupTests.ts

@@ -1,5 +1,6 @@
 import '@testing-library/jest-dom';
 import 'jest-canvas-mock';
+import 'chart.js/auto';
 import ResizeObserver from 'resize-observer-polyfill';
 import { setAutoFreeze } from 'immer';
 

package.json

@@ -27,42 +27,42 @@
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
-    "@fortawesome/fontawesome-free": "^6.2.0",
+    "@fortawesome/fontawesome-free": "^6.2.1",
-    "@fortawesome/fontawesome-svg-core": "^6.2.0",
+    "@fortawesome/fontawesome-svg-core": "^6.2.1",
-    "@fortawesome/free-regular-svg-icons": "^6.2.0",
+    "@fortawesome/free-regular-svg-icons": "^6.2.1",
-    "@fortawesome/free-solid-svg-icons": "^6.2.0",
+    "@fortawesome/free-solid-svg-icons": "^6.2.1",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@json2csv/plainjs": "^6.1.2",
-    "@reduxjs/toolkit": "^1.9.0",
+    "@reduxjs/toolkit": "^1.9.1",
-    "bootstrap": "^5.2.2",
+    "bootstrap": "^5.2.3",
     "bottlejs": "^2.0.1",
     "bowser": "^2.11.0",
-    "chart.js": "^3.9.1",
+    "chart.js": "^4.1.1",
-    "classnames": "^2.3.1",
+    "classnames": "^2.3.2",
-    "compare-versions": "^5.0.1",
+    "compare-versions": "^5.0.3",
     "csvtojson": "^2.0.10",
     "date-fns": "^2.29.3",
     "event-source-polyfill": "^1.0.31",
     "history": "^5.3.0",
-    "leaflet": "^1.9.2",
+    "leaflet": "^1.9.3",
     "qs": "^6.11.0",
     "ramda": "^0.27.2",
     "react": "^18.2.0",
-    "react-chartjs-2": "^4.3.1",
+    "react-chartjs-2": "^5.1.0",
     "react-colorful": "^5.6.1",
     "react-copy-to-clipboard": "^5.1.0",
     "react-datepicker": "^4.8.0",
     "react-dom": "^18.2.0",
     "react-external-link": "^2.0.0",
-    "react-leaflet": "^4.1.0",
+    "react-leaflet": "^4.2.0",
-    "react-redux": "^8.0.4",
+    "react-redux": "^8.0.5",
-    "react-router-dom": "^6.4.1",
+    "react-router-dom": "^6.6.1",
     "react-swipeable": "^7.0.0",
     "react-tag-autocomplete": "^6.3.0",
-    "reactstrap": "^9.1.4",
+    "reactstrap": "^9.1.5",
     "redux": "^4.2.0",
     "redux-localstorage-simple": "^2.5.1",
-    "redux-thunk": "^2.4.1",
+    "redux-thunk": "^2.4.2",
     "uuid": "^8.3.2",
     "workbox-core": "^6.5.4",
     "workbox-expiration": "^6.5.4",
@@ -73,40 +73,40 @@
   "devDependencies": {
     "@shlinkio/eslint-config-js-coding-standard": "~2.0.2",
     "@shlinkio/stylelint-config-css-coding-standard": "~1.0.1",
-    "@stryker-mutator/core": "^6.2.2",
+    "@stryker-mutator/core": "^6.3.1",
-    "@stryker-mutator/jest-runner": "^6.2.2",
+    "@stryker-mutator/jest-runner": "^6.3.1",
-    "@stryker-mutator/typescript-checker": "^6.2.2",
+    "@stryker-mutator/typescript-checker": "^6.3.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.4.3",
-    "@types/jest": "^29.1.1",
+    "@types/jest": "^29.2.4",
     "@types/json2csv": "^5.0.3",
-    "@types/leaflet": "^1.8.0",
+    "@types/leaflet": "^1.9.0",
     "@types/qs": "^6.9.7",
     "@types/ramda": "^0.28.15",
-    "@types/react": "^18.0.21",
+    "@types/react": "^18.0.26",
     "@types/react-color": "^3.0.6",
     "@types/react-copy-to-clipboard": "^5.0.4",
-    "@types/react-datepicker": "^4.4.2",
+    "@types/react-datepicker": "^4.8.0",
-    "@types/react-dom": "^18.0.6",
+    "@types/react-dom": "^18.0.10",
     "@types/react-tag-autocomplete": "^6.3.0",
     "@types/uuid": "^8.3.4",
     "@vitejs/plugin-react": "^3.0.0",
-    "adm-zip": "^0.5.9",
+    "adm-zip": "^0.5.10",
     "babel-jest": "^29.3.1",
-    "chalk": "^5.0.1",
+    "chalk": "^5.2.0",
-    "eslint": "^8.24.0",
+    "eslint": "^8.30.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^29.1.2",
+    "jest": "^29.3.1",
     "jest-canvas-mock": "^2.4.0",
-    "jest-environment-jsdom": "^29.1.2",
+    "jest-environment-jsdom": "^29.3.1",
     "resize-observer-polyfill": "^1.5.1",
-    "sass": "^1.55.0",
+    "sass": "^1.57.1",
-    "serve": "^14.1.1",
+    "serve": "^14.1.2",
     "stryker-cli": "^1.0.2",
-    "stylelint": "^14.13.0",
+    "stylelint": "^14.16.0",
     "ts-mockery": "^1.2.0",
-    "typescript": "^4.8.4",
+    "typescript": "^4.9.4",
     "vite": "^4.0.3",
     "vite-plugin-pwa": "^0.14.0"
   },

src/common/AsideMenu.tsx

@@ -21,6 +21,7 @@ export interface AsideMenuProps {
 
 interface AsideMenuItemProps extends NavLinkProps {
   to: string;
+  className?: string;
 }
 
 const AsideMenuItem: FC<AsideMenuItemProps> = ({ children, to, className, ...rest }) => (

src/visits/charts/LineChartCard.tsx

@@ -30,8 +30,8 @@ import { ToggleSwitch } from '../../utils/ToggleSwitch';
 import { prettify } from '../../utils/helpers/numbers';
 import { pointerOnHover, renderChartLabel } from '../../utils/helpers/charts';
 import { HIGHLIGHTED_COLOR, MAIN_COLOR } from '../../utils/theme';
-import './LineChartCard.scss';
 import { STANDARD_DATE_FORMAT } from '../../utils/helpers/date';
+import './LineChartCard.scss';
 
 interface LineChartCardProps {
   title: string;

vite.config.ts

@@ -2,6 +2,7 @@ import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
 import { VitePWA } from 'vite-plugin-pwa';
 import { manifest } from './manifest';
+import pack from './package.json';
 
 // https://vitejs.dev/config/
 export default defineConfig({
@@ -19,4 +20,5 @@ export default defineConfig({
   server: {
     port: 3000,
   },
+  base: pack.homepage ?? '/',
 });