remove window.gtag function (#54)

GoogleChromeLabs · Jul 24, 2024 · d39b6a0 · d39b6a0
1 parent 92b1495
commit d39b6a0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/src/third-parties/google-analytics/data.json b/src/third-parties/google-analytics/data.json
@@ -5,15 +5,15 @@
   "scripts": [
     {
       "url": "https://www.googletagmanager.com/gtag/js",
-      "params": ["id"],
+      "params": ["id", "l"],
       "strategy": "worker",
       "location": "head",
       "action": "append",
       "key": "gtag"
     },
     {
-      "code": "window.dataLayers=window.dataLayers||{};window.dataLayers['{{dataLayerName}}']=window.dataLayers['{{dataLayerName}}']||[];window.gtag=function gtag(){window.dataLayers['{{dataLayerName}}'].push(arguments);};window.gtag('js',new Date());window.gtag('config','{{id}}')",
-      "params": ["id", "dataLayerName"],
+      "code": "window['{{l}}']=window['{{l}}']||[];window['{{l}}'].push({'js':new Date()});window['{{l}}'].push({'config':'{{id}}'})",
+      "params": ["id", "l"],
       "strategy": "worker",
       "location": "head",
       "action": "append",

diff --git a/src/third-parties/google-tag-manager/data.json b/src/third-parties/google-tag-manager/data.json
@@ -5,15 +5,15 @@
     "scripts": [
       {
         "url": "https://www.googletagmanager.com/gtm.js",
-        "params": ["id"],
+        "params": ["id", "l"],
         "strategy": "worker",
         "location": "head",
         "action": "append",
         "key": "gtm"
       },
       {
-        "code": "window.dataLayers=window.dataLayers||{};window.dataLayers['{{dataLayerName}}']=window.dataLayers['{{dataLayerName}}']||[];window.dataLayers['{{dataLayerName}}'].push({'gtm.start':new Date().getTime(),event:'gtm.js'});",
-        "params": ["dataLayerName"],
+        "code": "window['{{l}}']=window['{{l}}']||[];window['{{l}}'].push({'gtm.start':new Date().getTime(),event:'gtm.js'});",
+        "params": ["l"],
         "strategy": "worker",
         "location": "head",
         "action": "append",

diff --git a/src/types/type-declarations.ts b/src/types/type-declarations.ts
@@ -62,6 +62,10 @@ export interface Output {
 /* Google Analytics */
 export interface GoogleAnalyticsParams {
   id: string;
+  /**
+   * The name of the dataLayer object. Defaults to 'dataLayer'.
+   */
+  l?: string;
 }
 
 export interface GTag {
@@ -75,14 +79,15 @@ export interface GTag {
   (fn: 'config', opt: 'reset'): void;
 }
 
-export interface GoogleAnalyticsApi {
-  dataLayers: Record<string, Record<string, any>[]>;
-  gtag: GTag;
-}
+export type DataLayer = Record<string, unknown>[];
 
 /* Google Tag Manager */
 export interface GoogleTagManagerParams {
   id: string;
+  /**
+   * The name of the dataLayer object. Defaults to 'dataLayer'.
+   */
+  l?: string;
 }
 
 interface GoogleTagManagerDataLayerApi {
@@ -100,16 +105,15 @@ type GoogleTagManagerDataLayerStatus = {
   };
 };
 
-export type GoogleTagManager = GoogleTagManagerDataLayerStatus & {
+export type GoogleTagManagerInstance = GoogleTagManagerDataLayerStatus & {
   [key: string]: {
     callback: () => void;
     dataLayer: GoogleTagManagerDataLayerApi;
   };
 };
 
 export interface GoogleTagManagerApi {
-  dataLayers: Record<string, Record<string, any>[]>;
-  google_tag_manager: GoogleTagManager;
+  google_tag_manager: GoogleTagManagerInstance;
 }
 
 /* Google Maps Embed */