@subiz/widget-v4 4.0.68 → 4.0.69

package/compiled_src/store/store.js

@@ -29,6 +29,14 @@ cookie.defaults.path = '/';
 cookie.expiresMultiplier = 60 * 60 * 24;
 cookie.defaults.expires = 3650;
 const MAX_CONVO = 20;
+const ga_client_id = '';
+setTimeout(() => {
+  if (window.gtag) {
+    window.gtag('get', 'UA-XXXXXXXX-Y', 'client_id', clientid => {
+      ga_client_id = clientid;
+    });
+  }
+}, 100);
 
 const page_loaded = _index.default.Date.now();
 
@@ -1182,16 +1190,16 @@ const inmemCookie = {
 };
 
 function getGaClientId() {
-  var clientId = '';
-  if (!hasGA()) return clientId;
+  if (ga_client_id) return ga_client_id;
+  if (!hasGA()) return ga_client_id;
   var allTrackers = window.ga.getAll() || [];
   allTrackers.forEach(function (tracker) {
-    clientId = tracker.get('clientId');
+    ga_client_id = tracker.get('clientId');
   });
-  return clientId;
+  return ga_client_id;
 }
 
-const hasGA = () => !!(window.ga && window.ga.getAll);
+const hasGA = () => !!(window.ga && window.ga.getAll || window.gtag);
 
 function getGaTrackingIds() {
   var trackingIds = [];
@@ -1214,11 +1222,19 @@ function sendToFBPixel(category, action, label) {
 
 function sendToGA(category, action, label) {
   if (!hasGA()) return;
-  const allTrackers = window.ga.getAll() || [];
-  allTrackers.forEach(function (tracker) {
-    const name = tracker.get('name');
-    window.ga(name + '.send', 'event', category, action, label);
-  });
+
+  if (window.gtag) {
+    window.gtag('event', category + '.' + action, label);
+    return;
+  }
+
+  if (window.ga) {
+    const allTrackers = window.ga.getAll() || [];
+    allTrackers.forEach(function (tracker) {
+      const name = tracker.get('name');
+      window.ga(name + '.send', 'event', category, action, label);
+    });
+  }
 }
 
 function sendEventToThirdParty(category, action, label) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.0.68",
+	"version": "4.0.69",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -14,16 +14,16 @@
 		"@subiz/storage": "0.0.8",
 		"@subiz/wsclient": "^3.1.7",
 		"cookie_js": "1.4.2",
-		"core-js": "^3.21.1",
+		"core-js": "^3.22.0",
 		"css-loader": "5.2.7",
 		"file-loader": "^6.2.0",
 		"less": "^4.1.2",
 		"less-loader": "^10.2.0",
-		"marked": "^4.0.12",
-		"preact": "^10.7.0"
+		"marked": "^4.0.14",
+		"preact": "^10.7.1"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.17.8",
+		"@babel/core": "^7.17.9",
 		"@babel/plugin-proposal-class-properties": "^7.16.7",
 		"@babel/plugin-transform-react-jsx": "^7.17.3",
 		"@babel/preset-env": "^7.16.11",
@@ -32,9 +32,9 @@
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.5.0",
 		"puppeteer": "^13.5.2",
-		"webpack": "^5.70.0",
+		"webpack": "^5.72.0",
 		"webpack-bundle-analyzer": "^4.5.0",
 		"webpack-cli": "^4.9.2",
-		"webpack-dev-server": "^4.7.4"
+		"webpack-dev-server": "^4.8.1"
 	}
 }

package/src/store/store.js

@@ -11,6 +11,15 @@ cookie.expiresMultiplier = 60 * 60 * 24 // days
 cookie.defaults.expires = 3650 // 10 year
 
 const MAX_CONVO = 20
+const ga_client_id = ''
+
+setTimeout(() => {
+	if (window.gtag) {
+		window.gtag('get', 'UA-XXXXXXXX-Y', 'client_id', (clientid) => {
+			ga_client_id = clientid
+		})
+	}
+}, 100)
 
 const page_loaded = sb.Date.now()
 
@@ -1091,19 +1100,18 @@ const inmemCookie = {
 // getGaClientId returns ID of the client in Google Analytics
 // return empty string if GA is not installed
 function getGaClientId() {
-	var clientId = ''
-	if (!hasGA()) return clientId
-
+	if (ga_client_id) return ga_client_id
+	if (!hasGA()) return ga_client_id
 	var allTrackers = window.ga.getAll() || []
 	allTrackers.forEach(function (tracker) {
-		clientId = tracker.get('clientId')
+		ga_client_id = tracker.get('clientId')
 	})
 
-	return clientId
+	return ga_client_id
 }
 
 // hasGA tells if the website is using Google Analytics or not
-const hasGA = () => !!(window.ga && window.ga.getAll)
+const hasGA = () => !!((window.ga && window.ga.getAll) || window.gtag)
 
 // getGaTrackingIds returns all tracking ids in Google Analytics
 // return empty array if GA is not installed
@@ -1129,11 +1137,18 @@ function sendToFBPixel(category, action, label) {
 function sendToGA(category, action, label) {
 	if (!hasGA()) return
 
-	const allTrackers = window.ga.getAll() || []
-	allTrackers.forEach(function (tracker) {
-		const name = tracker.get('name')
-		window.ga(name + '.send', 'event', category, action, label)
-	})
+	if (window.gtag) {
+		window.gtag('event', category + '.' + action, label)
+		return
+	}
+
+	if (window.ga) {
+		const allTrackers = window.ga.getAll() || []
+		allTrackers.forEach(function (tracker) {
+			const name = tracker.get('name')
+			window.ga(name + '.send', 'event', category, action, label)
+		})
+	}
 }
 
 function sendEventToThirdParty(category, action, label) {