mirrors/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2024-12-23 09:30:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge conflicts

Browse source
This commit is contained in:
Alejandro Celaya 2023-09-30 20:24:45 +02:00
commit e33a2a74bc
2 changed files with 409 additions and 307 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

704
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

12
package.json
View file

@ -30,7 +30,7 @@
"@fortawesome/free-solid-svg-icons": "^6.4.2", "@fortawesome/free-solid-svg-icons": "^6.4.2",
"@fortawesome/react-fontawesome": "^0.2.0", "@fortawesome/react-fontawesome": "^0.2.0",
"@json2csv/plainjs": "^7.0.3", "@json2csv/plainjs": "^7.0.3",
"@reduxjs/toolkit": "^1.9.5", "@reduxjs/toolkit": "^1.9.6",
"@shlinkio/shlink-frontend-kit": "^0.4.0", "@shlinkio/shlink-frontend-kit": "^0.4.0",
"@shlinkio/shlink-js-sdk": "^0.1.0", "@shlinkio/shlink-js-sdk": "^0.1.0",
"@shlinkio/shlink-web-component": "^0.3.4", "@shlinkio/shlink-web-component": "^0.3.4",
@ -63,11 +63,11 @@
"@testing-library/user-event": "^14.5.1", "@testing-library/user-event": "^14.5.1",
"@total-typescript/shoehorn": "^0.1.1", "@total-typescript/shoehorn": "^0.1.1",
"@types/ramda": "^0.27.66", "@types/ramda": "^0.27.66",
"@types/react": "^18.2.22", "@types/react": "^18.2.23",
"@types/react-dom": "^18.2.7", "@types/react-dom": "^18.2.8",
"@types/uuid": "^9.0.4", "@types/uuid": "^9.0.4",
"@vitejs/plugin-react": "^4.0.4", "@vitejs/plugin-react": "^4.1.0",
"@vitest/coverage-v8": "^0.34.5", "@vitest/coverage-v8": "^0.34.6",
"adm-zip": "^0.5.10", "adm-zip": "^0.5.10",
"axe-core": "^4.8.2", "axe-core": "^4.8.2",
"chalk": "^5.3.0", "chalk": "^5.3.0",
@ -79,7 +79,7 @@
"typescript": "^5.2.2", "typescript": "^5.2.2",
"vite": "^4.4.9", "vite": "^4.4.9",
"vite-plugin-pwa": "^0.16.5", "vite-plugin-pwa": "^0.16.5",
"vitest": "^0.34.5", "vitest": "^0.34.6",
"vitest-canvas-mock": "^0.3.3" "vitest-canvas-mock": "^0.3.3"
}, },
"browserslist": [ "browserslist": [