From 25943f35b2e27eba3179cf2ae947b2d125b7c80d Mon Sep 17 00:00:00 2001 From: Yuriy Yakym Date: Wed, 29 Jan 2025 17:55:48 +0700 Subject: [PATCH] Make google configuration consistent --- packages/analytics-nextjs/src/Analytics.ts | 10 +++++----- packages/analytics-nextjs/src/types.ts | 8 +++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/analytics-nextjs/src/Analytics.ts b/packages/analytics-nextjs/src/Analytics.ts index ebb71ab..1c358ff 100644 --- a/packages/analytics-nextjs/src/Analytics.ts +++ b/packages/analytics-nextjs/src/Analytics.ts @@ -94,9 +94,9 @@ export class Analytics { } if (config.google) { + const { analyticsId } = config.google; import('./lib/loadGoogleAnalytics').then(({ loadGoogleAnalytics }) => { - // @ts-ignore - loadGoogleAnalytics(config.google.analyticsId); + loadGoogleAnalytics(analyticsId); }); } @@ -147,9 +147,9 @@ export class Analytics { this.consent = consent; - const googleAnalyticsId = this.config?.google?.analyticsId; - if (googleAnalyticsId) { - window[`ga-disable-${googleAnalyticsId}`] = this.permissions.canTrackToGoogle; + if (this.config?.google) { + const { analyticsId } = this.config.google; + window[`ga-disable-${analyticsId}`] = this.permissions.canTrackToGoogle; } this.promises.segmentInit?.then(() => { diff --git a/packages/analytics-nextjs/src/types.ts b/packages/analytics-nextjs/src/types.ts index f8cc166..c35b48e 100644 --- a/packages/analytics-nextjs/src/types.ts +++ b/packages/analytics-nextjs/src/types.ts @@ -53,9 +53,11 @@ export interface TrackingPermissions { export interface Config { consent?: Consent; trackingPolicy: TrackingPolicy; - google?: { - analyticsId: string; - }; + google?: + | false + | { + analyticsId: string; + }; plausible?: false | PlausibleOptions; segment: | false