Merge pull request #992 from acelaya-forks/feature/rtk-2

Update dependencies

.github/dependabot.yml

@@ -28,7 +28,6 @@ updates:
       vitest:
         patterns:
           - 'vitest'
-          - 'vitest-canvas-mock'
           - '@vitest/*'
     ignore:
       # Bootstrap can introduce visual breaking changes on styles

config/test/setupTests.ts

@@ -1,4 +1,3 @@
-import 'vitest-canvas-mock';
 import '@testing-library/jest-dom/vitest';
 import { cleanup } from '@testing-library/react';
 import axe from 'axe-core';
@@ -20,4 +19,5 @@ afterEach(() => {
   cleanup();
 });
 
+HTMLCanvasElement.prototype.getContext = (() => {}) as any;
 (global as any).scrollTo = () => {};

package.json

@@ -30,11 +30,11 @@
     "@fortawesome/free-solid-svg-icons": "^6.5.1",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@json2csv/plainjs": "^7.0.3",
-    "@reduxjs/toolkit": "^1.9.7",
+    "@reduxjs/toolkit": "^2.0.1",
     "@shlinkio/data-manipulation": "^1.0.2",
     "@shlinkio/shlink-frontend-kit": "^0.4.0",
     "@shlinkio/shlink-js-sdk": "^0.2.0",
-    "@shlinkio/shlink-web-component": "^0.4.0",
+    "@shlinkio/shlink-web-component": "^0.4.1",
     "bootstrap": "5.2.3",
     "bottlejs": "^2.0.1",
     "clsx": "^2.0.0",
@@ -44,8 +44,8 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-external-link": "^2.2.0",
-    "react-redux": "^8.1.3",
-    "react-router-dom": "^6.20.0",
+    "react-redux": "^9.0.2",
+    "react-router-dom": "^6.20.1",
     "reactstrap": "^9.2.1",
     "redux-localstorage-simple": "^2.5.1",
     "uuid": "^9.0.1",
@@ -66,7 +66,7 @@
     "@types/react-dom": "^18.2.17",
     "@types/uuid": "^9.0.7",
     "@vitejs/plugin-react": "^4.2.0",
-    "@vitest/coverage-v8": "^0.34.6",
+    "@vitest/coverage-v8": "^1.0.2",
     "adm-zip": "^0.5.10",
     "axe-core": "^4.8.2",
     "chalk": "^5.3.0",
@@ -78,8 +78,7 @@
     "typescript": "^5.3.2",
     "vite": "^5.0.5",
     "vite-plugin-pwa": "^0.17.2",
-    "vitest": "^0.34.6",
-    "vitest-canvas-mock": "^0.3.3"
+    "vitest": "^1.0.2"
   },
   "browserslist": [
     ">0.2%",

src/reducers/index.ts

@@ -1,11 +1,10 @@
 import { combineReducers } from '@reduxjs/toolkit';
 import type { IContainer } from 'bottlejs';
 import { appUpdatesReducer } from '../app/reducers/appUpdates';
-import type { ShlinkState } from '../container/types';
 import { serversReducer } from '../servers/reducers/servers';
 import { settingsReducer } from '../settings/reducers/settings';
 
-export const initReducers = (container: IContainer) => combineReducers<ShlinkState>({
+export const initReducers = (container: IContainer) => combineReducers({
   appUpdated: appUpdatesReducer,
   servers: serversReducer,
   selectedServer: container.selectedServerReducer,

vite.config.ts

@@ -43,10 +43,12 @@ export default defineConfig({
       ],
 
       // Required code coverage. Lower than this will make the check fail
+      thresholds: {
         statements: 95,
         branches: 95,
         functions: 90,
         lines: 95,
       },
     },
+  },
 });