Skip to content

armgit / umami

Public Imported from GitHub
0

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.

Refactor do not track code.

Mike Cao0ba7676e973d
diff --git a/lib/web.js b/lib/web.js
index 04e4466c1..4a8578f1d 100644
--- a/lib/web.js
+++ b/lib/web.js
@@ -48,26 +48,17 @@ export const hook = (_this, method, callback) => {
};
export const doNotTrack = () => {
- if (
- window.doNotTrack ||
- navigator.doNotTrack ||
- navigator.msDoNotTrack ||
- (window.external && 'msTrackingProtectionEnabled' in window.external)
- ) {
- if (
- window.doNotTrack == '1' ||
- navigator.doNotTrack == 'yes' ||
- navigator.doNotTrack == '1' ||
- navigator.msDoNotTrack == '1' ||
- (window.external &&
- window.external.msTrackingProtectionEnabled &&
- window.external.msTrackingProtectionEnabled())
- ) {
- return true;
- } else {
- return false;
- }
- } else {
- return false;
- }
+ const { doNotTrack, navigator, external } = window;
+
+ const msTracking = () => {
+ return (
+ external &&
+ typeof external.msTrackingProtectionEnabled === 'function' &&
+ external.msTrackingProtectionEnabled()
+ );
+ };
+
+ const dnt = doNotTrack || navigator.doNotTrack || navigator.msDoNotTrack || msTracking();
+
+ return dnt === true || dnt === 1 || dnt === 'yes' || dnt === '1';
};
diff --git a/rollup.tracker.config.js b/rollup.tracker.config.js
index e836955fd..ea5f709f7 100644
--- a/rollup.tracker.config.js
+++ b/rollup.tracker.config.js
@@ -1,5 +1,6 @@
import 'dotenv/config';
import buble from '@rollup/plugin-buble';
+import replace from '@rollup/plugin-replace';
import resolve from '@rollup/plugin-node-resolve';
import { terser } from 'rollup-plugin-terser';
@@ -9,5 +10,10 @@ export default {
file: 'public/umami.js',
format: 'iife',
},
- plugins: [resolve(), buble(), terser({ compress: { evaluate: false } })],
+ plugins: [
+ replace({ __DNT__: !!process.env.ENABLE_DNT }),
+ resolve(),
+ buble(),
+ terser({ compress: { evaluate: false } }),
+ ],
};
diff --git a/tracker/index.js b/tracker/index.js
index a62696dc4..8c27c8e2c 100644
--- a/tracker/index.js
+++ b/tracker/index.js
@@ -13,7 +13,7 @@ import { post, hook, doNotTrack } from '../lib/web';
const script = document.querySelector('script[data-website-id]');
- if (!script || doNotTrack()) return;
+ if (!script || (__DNT__ && doNotTrack())) return;
const website = script.getAttribute('data-website-id');
const hostUrl = new URL(script.src).origin;