Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Added check to disable tracking.
Mike Caoe0c2354169b4
diff --git a/package.json b/package.jsonindex 36afa5c1c..cfab3adfd 100644--- a/package.json+++ b/package.json@@ -56,7 +56,7 @@}},"dependencies": {- "@prisma/client": "2.10.0",+ "@prisma/client": "2.10.1","@reduxjs/toolkit": "^1.4.0","bcrypt": "^5.0.0","chalk": "^4.1.0",@@ -72,7 +72,7 @@"immer": "^7.0.14","is-localhost-ip": "^1.4.0","isbot-fast": "^1.2.0",- "jose": "^2.0.2",+ "jose": "^2.0.3","maxmind": "^4.3.1","moment-timezone": "^0.5.31","next": "^10.0.0",@@ -81,11 +81,11 @@"react-dom": "^17.0.1","react-intl": "^5.8.8","react-redux": "^7.2.2",- "react-simple-maps": "^2.2.0",+ "react-simple-maps": "^2.3.0","react-spring": "^8.0.27","react-tooltip": "^4.2.10","react-use-measure": "^2.0.2",- "react-window": "^1.8.5",+ "react-window": "^1.8.6","redux": "^4.0.5","redux-thunk": "^2.3.0","request-ip": "^2.1.3",@@ -97,7 +97,7 @@},"devDependencies": {"@formatjs/cli": "^2.13.5",- "@prisma/cli": "2.10.0",+ "@prisma/cli": "2.10.1","@rollup/plugin-buble": "^0.21.3","@rollup/plugin-node-resolve": "^10.0.0","@rollup/plugin-replace": "^2.3.4",@@ -112,7 +112,7 @@"eslint-plugin-react-hooks": "^4.2.0","extract-react-intl-messages": "^4.1.1","husky": "^4.3.0",- "lint-staged": "^10.5.0",+ "lint-staged": "^10.5.1","loadtest": "5.1.0","npm-run-all": "^4.1.5","postcss-flexbugs-fixes": "^4.2.1",@@ -120,7 +120,7 @@"postcss-preset-env": "^6.7.0","prettier": "^2.1.2","prettier-eslint": "^11.0.0",- "rollup": "^2.32.1",+ "rollup": "^2.33.0","rollup-plugin-hashbang": "^2.2.2","rollup-plugin-terser": "^7.0.2","stylelint": "^13.7.2",diff --git a/tracker/index.js b/tracker/index.jsindex ff0ce28d6..5257548ac 100644--- a/tracker/index.js+++ b/tracker/index.js@@ -6,6 +6,7 @@ import { removeTrailingSlash } from '../lib/url';screen: { width, height },navigator: { language },location: { hostname, pathname, search },+ localStorage,sessionStorage,document,history,@@ -24,6 +25,7 @@ import { removeTrailingSlash } from '../lib/url';const domains = attr('data-domains');const disableTracking =+ localStorage.getItem('umami.disabled') ||(dnt && doNotTrack()) ||(domains &&!domainsdiff --git a/yarn.lock b/yarn.lockindex a582d6b9c..012772682 100644--- a/yarn.lock+++ b/yarn.lock@@ -1255,30 +1255,30 @@resolved "https://registry.yarnpkg.com/@prisma/bar/-/bar-0.0.0.tgz#9daff159a1a09abf7665a8b6e40ddc1fdc1ed4f7"integrity sha512-3nez9n/vMyAr4+nmqj6Xh3cGZbreYHr3RWX0vgtrFRpiN6otuCzL+9HW8MW/DfZNuFz5YyIdfwnRSPueUZPoWQ==-"@prisma/[email protected]":- version "2.10.0"- resolved "https://registry.yarnpkg.com/@prisma/cli/-/cli-2.10.0.tgz#a51baf3a38c9e12c7fec489b675c1d4efc8aff05"- integrity sha512-qJl891HvroM1oEWYeG8+h/JJ+wNi4MCyh7x+HAnmrIYGFW45QAsCWjHbn0mUuCSXCy3KwiN/iAwaY2Fr7ZNJEw==+"@prisma/[email protected]":+ version "2.10.1"+ resolved "https://registry.yarnpkg.com/@prisma/cli/-/cli-2.10.1.tgz#e99ebff7290e27c13062543f464f169448e5587c"+ integrity sha512-I+51GBJyuGS5xsCl8pf4XfTt9HIdhCJQoaGCA9KLDzVRbFHElMQ++hhyhLohJ4buFZlSagIq8NI8yIC5yu+Wkg==dependencies:"@prisma/bar" "^0.0.0"- "@prisma/engines" "2.10.0-16-af1ae11a423edfb5d24092a85be11fa77c5e499c"+ "@prisma/engines" "2.10.1-6-7d0087eadc7265e12d4b8d8c3516b02c4c965111"-"@prisma/[email protected]":- version "2.10.0"- resolved "https://registry.yarnpkg.com/@prisma/client/-/client-2.10.0.tgz#967223bb1e1b21ddea9a098dc9758f7ace03d828"- integrity sha512-TZoT5SYmCkVqMt8rKp3NAUm6UTqjNUMp2W94IcVn2d5DVkOR5TZGkxP/u8KuSoY3KQWIG+KQy/azIKetKxc+LQ==+"@prisma/[email protected]":+ version "2.10.1"+ resolved "https://registry.yarnpkg.com/@prisma/client/-/client-2.10.1.tgz#96fe79ad0d7763d0eda1ea91870a8882e4dbb21f"+ integrity sha512-VwasxCCwdRmrcVVoLwXTEbwrBiqOYr2Umqw9btvMvHGRhA1nRKCvmt7SCiCjGrx6CuC8eCG/HGxruv04001YKQ==dependencies:- "@prisma/engines-version" "2.10.0-16-af1ae11a423edfb5d24092a85be11fa77c5e499c"+ "@prisma/engines-version" "2.10.1-6-7d0087eadc7265e12d4b8d8c3516b02c4c965111"-"@prisma/engines-version@2.10.0-16-af1ae11a423edfb5d24092a85be11fa77c5e499c":- version "2.10.0-16-af1ae11a423edfb5d24092a85be11fa77c5e499c"- resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-2.10.0-16-af1ae11a423edfb5d24092a85be11fa77c5e499c.tgz#4d02db85e5a7250676a648d3eab0d579455c1eea"- integrity sha512-8dW/oSDBv3fovNzTn2sjpITgD4IhHYPnmkbPp4Gv4rqjB14tpB0OuU1xkygVRIRJisTBRoYyjfiVaaWea/e57A==+"@prisma/engines-version@2.10.1-6-7d0087eadc7265e12d4b8d8c3516b02c4c965111":+ version "2.10.1-6-7d0087eadc7265e12d4b8d8c3516b02c4c965111"+ resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-2.10.1-6-7d0087eadc7265e12d4b8d8c3516b02c4c965111.tgz#7f96aa61085fc803f81b3df0fa32297909ce4b08"+ integrity sha512-OuOSTvEzXJwCJzNqZ9N/+J3lO64HgX9uGiVOuvlTrRSXoLZk0Q2IiLAx8qhY1U7jPpHJ7LTlZuGNScimqonpJg==-"@prisma/[email protected]":- version "2.10.0-16-af1ae11a423edfb5d24092a85be11fa77c5e499c"- resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-2.10.0-16-af1ae11a423edfb5d24092a85be11fa77c5e499c.tgz#3a981953cef6fc0524fd7a8f8c5d714202b9c26b"- integrity sha512-59htYpsqdVVe7aElozUZ3/eV/ujwrUvaE+KVcNyzFh0yFIL7FLbSly55KWlyUdDWyB+0eTyd/yV7E/iKYnOF/Q==+"@prisma/[email protected]":+ version "2.10.1-6-7d0087eadc7265e12d4b8d8c3516b02c4c965111"+ resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-2.10.1-6-7d0087eadc7265e12d4b8d8c3516b02c4c965111.tgz#614e82316270333d31a1581e533ef0c275b2b5f6"+ integrity sha512-F/I8mmYMQnEFX47jl7Su8Pmvpua1wti9Uq3IUlSCqLQsrOmuMj+GKQ5nYEewmcynqBlyVcpUyxF5iAWbmUVdjw=="@reduxjs/toolkit@^1.4.0":version "1.4.0"@@ -2801,11 +2801,16 @@ [email protected]:resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==-commander@^6.0.0, commander@^6.1.0:+commander@^6.1.0:version "6.1.0"resolved "https://registry.yarnpkg.com/commander/-/commander-6.1.0.tgz#f8d722b78103141006b66f4c7ba1e97315ba75bc"integrity sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==+commander@^6.2.0:+ version "6.2.0"+ resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75"+ integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==+common-tags@^1.4.0:version "1.8.0"resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"@@ -3280,7 +3285,7 @@ debounce@^1.2.0:resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.0.tgz#44a540abc0ea9943018dc0eaa95cce87f65cd131"integrity sha512-mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg==-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:+debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0:version "4.2.0"resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==@@ -3989,10 +3994,10 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:md5.js "^1.3.4"safe-buffer "^5.1.1"-execa@^4.0.3:- version "4.0.3"- resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2"- integrity sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==+execa@^4.1.0:+ version "4.1.0"+ resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"+ integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==dependencies:cross-spawn "^7.0.0"get-stream "^5.0.0"@@ -5220,10 +5225,10 @@ jest-worker@^26.2.1:merge-stream "^2.0.0"supports-color "^7.0.0"-jose@^2.0.2:- version "2.0.2"- resolved "https://registry.yarnpkg.com/jose/-/jose-2.0.2.tgz#fb22385b80c658cc7a0cae05b7086c04c6be49f4"- integrity sha512-yD93lsiMA1go/qxSY/vXWBodmIZJIxeB7QhFi8z1yQ3KUwKENqI9UA8VCHlQ5h3x1zWuWZjoY87ByQzkQbIrQg==+jose@^2.0.3:+ version "2.0.3"+ resolved "https://registry.yarnpkg.com/jose/-/jose-2.0.3.tgz#9c931ab3e13e2d16a5b9e6183e60b2fc40a8e1b8"+ integrity sha512-L+RlDgjO0Tk+Ki6/5IXCSEnmJCV8iMFZoBuEgu2vPQJJ4zfG/k3CAqZUMKDYNRHIDyy0QidJpOvX0NgpsAqFlw==dependencies:"@panva/asn1.js" "^1.0.0"@@ -5410,20 +5415,20 @@ lines-and-columns@^1.1.6:resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=-lint-staged@^10.5.0:- version "10.5.0"- resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.0.tgz#c923c2447a84c595874f3de696778736227e7a7a"- integrity sha512-gjC9+HGkBubOF+Yyoj9pd52Qfm/kYB+dRX1UOgWjHKvSDYl+VHkZXlBMlqSZa2cH3Kp5/uNL480sV6e2dTgXSg==+lint-staged@^10.5.1:+ version "10.5.1"+ resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.1.tgz#901e915c2360072dded0e7d752a0d9a49e079daa"+ integrity sha512-fTkTGFtwFIJJzn/PbUO3RXyEBHIhbfYBE7+rJyLcOXabViaO/h6OslgeK6zpeUtzkDrzkgyAYDTLAwx6JzDTHw==dependencies:chalk "^4.1.0"cli-truncate "^2.1.0"- commander "^6.0.0"+ commander "^6.2.0"cosmiconfig "^7.0.0"- debug "^4.1.1"+ debug "^4.2.0"dedent "^0.7.0"enquirer "^2.3.6"- execa "^4.0.3"- listr2 "^2.6.0"+ execa "^4.1.0"+ listr2 "^3.2.2"log-symbols "^4.0.0"micromatch "^4.0.2"normalize-path "^3.0.0"@@ -5431,10 +5436,10 @@ lint-staged@^10.5.0:string-argv "0.3.1"stringify-object "^3.3.0"-listr2@^2.6.0:- version "2.6.2"- resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.6.2.tgz#4912eb01e1e2dd72ec37f3895a56bf2622d6f36a"- integrity sha512-6x6pKEMs8DSIpA/tixiYY2m/GcbgMplMVmhQAaLFxEtNSKLeWTGjtmU57xvv6QCm2XcqzyNXL/cTSVf4IChCRA==+listr2@^3.2.2:+ version "3.2.2"+ resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.2.2.tgz#d20feb75015e506992b55af40722ba1af168b8f1"+ integrity sha512-AajqcZEUikF2ioph6PfH3dIuxJclhr3i3kHgTOP0xeXdWQohrvJAAmqVcV43/GI987HFY/vzT73jYXoa4esDHg==dependencies:chalk "^4.1.0"cli-truncate "^2.1.0"@@ -5442,7 +5447,7 @@ listr2@^2.6.0:indent-string "^4.0.0"log-update "^4.0.0"p-map "^4.0.0"- rxjs "^6.6.2"+ rxjs "^6.6.3"through "^2.3.8"load-json-file@^4.0.0:@@ -7492,10 +7497,10 @@ [email protected]:resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f"integrity sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==-react-simple-maps@^2.2.0:- version "2.2.0"- resolved "https://registry.yarnpkg.com/react-simple-maps/-/react-simple-maps-2.2.0.tgz#53614d590f1a6ad69b93eb0a646df71ebc6ca725"- integrity sha512-ejFSEmLJMFJUZIzYAghUzGA2kd26oVJg1c3nJ5mcmxyyTP2hAS6oaPbztV0C5hKbdQybwT2wozM0coPP7rxXUw==+react-simple-maps@^2.3.0:+ version "2.3.0"+ resolved "https://registry.yarnpkg.com/react-simple-maps/-/react-simple-maps-2.3.0.tgz#7fdb55120335a9b1ef5bf62e0dcb669511705f3e"+ integrity sha512-IZVeiPSRZKwD6I/2NvXpQ2uENYGDGZp8DvZjkapcxuJ/LQHTfl+Byb+KNgY7s+iatRA2ad8LnZ3AgqcjziCCsw==dependencies:d3-geo "^2.0.1"d3-selection "^2.0.0"@@ -7525,10 +7530,10 @@ react-use-measure@^2.0.2:dependencies:debounce "^1.2.0"-react-window@^1.8.5:- version "1.8.5"- resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.5.tgz#a56b39307e79979721021f5d06a67742ecca52d1"- integrity sha512-HeTwlNa37AFa8MDZFZOKcNEkuF2YflA0hpGPiTT9vR7OawEt+GZbfM6wqkBahD3D3pUjIabQYzsnY/BSJbgq6Q==+react-window@^1.8.6:+ version "1.8.6"+ resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.6.tgz#d011950ac643a994118632665aad0c6382e2a112"+ integrity sha512-8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg==dependencies:"@babel/runtime" "^7.0.0"memoize-one ">=3.1.1 <6"@@ -7945,10 +7950,10 @@ rollup-plugin-terser@^7.0.2:serialize-javascript "^4.0.0"terser "^5.0.0"-rollup@^2.32.1:- version "2.32.1"- resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.32.1.tgz#625a92c54f5b4d28ada12d618641491d4dbb548c"- integrity sha512-Op2vWTpvK7t6/Qnm1TTh7VjEZZkN8RWgf0DHbkKzQBwNf748YhXbozHVefqpPp/Fuyk/PQPAnYsBxAEtlMvpUw==+rollup@^2.33.0:+ version "2.33.0"+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.0.tgz#dc105b312e2817f996d0b6a192b7033f607ef08d"+ integrity sha512-7jFrmKgQj1GOWlC8rExHaPcv2SQnWMv1BFUyH/xWS5w80h6132wBUWp/qTvQkAbnlqGvi13T6iP2kHo9Sb2HxA==optionalDependencies:fsevents "~2.1.2"@@ -7969,7 +7974,7 @@ run-queue@^1.0.0, run-queue@^1.0.3:dependencies:aproba "^1.1.1"-rxjs@^6.6.0, rxjs@^6.6.2:+rxjs@^6.6.0, rxjs@^6.6.3:version "6.6.3"resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==