watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-19 12:05:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into f-nikin-fix-main-page-layout

Browse source
This commit is contained in:
nikin-devstark 2020-11-24 15:35:25 +03:00 • committed by GitHub
commit a2b78b2eaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 642 additions and 390 deletions
Download patch file Download diff file Expand all files Collapse all files

18
package.json
View file

@ -1,6 +1,6 @@
{
"name": "umami",
"version": "1.4.0",
"version": "1.6.0",
"description": "A simple, fast, website analytics alternative to Google Analytics. ",
"author": "Mike Cao <mike@mikecao.com>",
"license": "MIT",
@ -56,7 +56,7 @@
}
},
"dependencies": {
"@prisma/client": "2.10.1",
"@prisma/client": "2.11.0",
"@reduxjs/toolkit": "^1.4.0",
"bcrypt": "^5.0.0",
"chalk": "^4.1.0",
@ -76,18 +76,18 @@
"lodash.find": "^4.6.0",
"maxmind": "^4.3.1",
"moment-timezone": "^0.5.31",
"next": "^10.0.0",
"next": "^10.0.1",
"prompts": "2.4.0",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-intl": "^5.8.8",
"react-intl": "^5.10.1",
"react-loader-spinner": "^3.1.14",
"react-redux": "^7.2.2",
"react-simple-maps": "^2.3.0",
"react-spring": "^8.0.27",
"react-table": "^7.6.2",
"react-tooltip": "^4.2.10",
"react-use-measure": "^2.0.2",
"react-use-measure": "^2.0.3",
"react-window": "^1.8.6",
"redux": "^4.0.5",
"redux-thunk": "^2.3.0",
@ -100,7 +100,7 @@
},
"devDependencies": {
"@formatjs/cli": "^2.13.5",
"@prisma/cli": "2.10.1",
"@prisma/cli": "2.11.0",
"@rollup/plugin-buble": "^0.21.3",
"@rollup/plugin-node-resolve": "^10.0.0",
"@rollup/plugin-replace": "^2.3.4",
@ -108,7 +108,7 @@
"cross-env": "^7.0.2",
"del": "^6.0.0",
"dotenv-cli": "^4.0.0",
"eslint": "^7.12.1",
"eslint": "^7.13.0",
"eslint-config-prettier": "^6.15.0",
"eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-react": "^7.21.5",
@ -123,10 +123,10 @@
"postcss-preset-env": "^6.7.0",
"prettier": "^2.1.2",
"prettier-eslint": "^11.0.0",
"rollup": "^2.33.0",
"rollup": "^2.33.2",
"rollup-plugin-hashbang": "^2.2.2",
"rollup-plugin-terser": "^7.0.2",
"stylelint": "^13.7.2",
"stylelint": "^13.8.0",
"stylelint-config-css-modules": "^2.2.0",
"stylelint-config-prettier": "^8.0.1",
"stylelint-config-recommended": "^3.0.0",