From ebbfb253ff5f2bcb0e96d691b699450a24e18000 Mon Sep 17 00:00:00 2001
From: Tomas Francisco <4301103+tomasfrancisco@users.noreply.github.com>
Date: Wed, 22 Jan 2025 17:45:15 +0100
Subject: [PATCH] chore: update analytics
---
apps/blog/src/app/layout.tsx | 18 +++++++++++-------
.../app/_components/analytics-page-tracker.tsx | 17 -----------------
apps/engine/src/app/layout.tsx | 15 ++-------------
packages/services/package.json | 8 ++++----
.../services/src/analytics/env/client-env.ts | 2 +-
packages/services/src/analytics/index.ts | 2 +-
.../_track-page-view.tsx} | 2 +-
.../src/analytics/page-tracker/index.ts | 1 +
.../analytics/page-tracker/page-tracker.tsx | 14 ++++++++++++++
9 files changed, 35 insertions(+), 44 deletions(-)
delete mode 100644 apps/engine/src/app/_components/analytics-page-tracker.tsx
rename packages/services/src/analytics/{track-page-view.tsx => page-tracker/_track-page-view.tsx} (94%)
create mode 100644 packages/services/src/analytics/page-tracker/index.ts
create mode 100644 packages/services/src/analytics/page-tracker/page-tracker.tsx
diff --git a/apps/blog/src/app/layout.tsx b/apps/blog/src/app/layout.tsx
index 602cb42..236fe53 100644
--- a/apps/blog/src/app/layout.tsx
+++ b/apps/blog/src/app/layout.tsx
@@ -3,6 +3,7 @@ import { Fira_Sans, Fira_Mono } from 'next/font/google';
import './globals.css';
import { Footer } from '@/components/footer';
import { Toaster } from '@/components/ui/sonner';
+import { AnalyticsProvider, PageTracker } from '@ds-project/services/analytics';
const fontSans = Fira_Sans({
variable: '--font-sans',
@@ -28,13 +29,16 @@ export default function RootLayout({
}>) {
return (
-
- {children}
-
-
-
+
+
+ {children}
+
+
+
+
+
);
}
diff --git a/apps/engine/src/app/_components/analytics-page-tracker.tsx b/apps/engine/src/app/_components/analytics-page-tracker.tsx
deleted file mode 100644
index 0aa73dd..0000000
--- a/apps/engine/src/app/_components/analytics-page-tracker.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-'use client';
-
-import dynamic from 'next/dynamic';
-
-const AnalyticsPageView = dynamic(
- () =>
- import('@ds-project/services/analytics').then(
- (module) => module.AnalyticsPageView
- ),
- {
- ssr: false,
- }
-);
-
-export const AnalyticsTracker = () => {
- return ;
-};
diff --git a/apps/engine/src/app/layout.tsx b/apps/engine/src/app/layout.tsx
index a11246f..a2184df 100644
--- a/apps/engine/src/app/layout.tsx
+++ b/apps/engine/src/app/layout.tsx
@@ -4,23 +4,12 @@ import { Inter } from 'next/font/google';
import { cn } from '@/lib/css';
import { Toaster } from '@ds-project/components';
import { Favicon } from '@/components';
-import dynamic from 'next/dynamic';
import { getMetadata } from '@/lib/metadata';
import { TooltipProvider } from '@ds-project/components';
-import { AnalyticsProvider } from '@ds-project/services/analytics';
+import { AnalyticsProvider, PageTracker } from '@ds-project/services/analytics';
const inter = Inter({ subsets: ['latin'] });
-const AnalyticsPageView = dynamic(
- () =>
- import('@ds-project/services/analytics').then(
- (module) => module.AnalyticsPageView
- ),
- {
- ssr: false,
- }
-);
-
export const metadata = getMetadata();
export default function RootLayout({
@@ -41,7 +30,7 @@ export default function RootLayout({
inter.className
)}
>
-
+
{children}
diff --git a/packages/services/package.json b/packages/services/package.json
index 4e39777..37a4630 100644
--- a/packages/services/package.json
+++ b/packages/services/package.json
@@ -6,10 +6,6 @@
"author": "",
"type": "module",
"exports": {
- "./github": {
- "types": "./dist/github/index.d.ts",
- "default": "./src/github/index.ts"
- },
"./analytics": {
"types": "./dist/analytics/index.d.ts",
"default": "./src/analytics/index.ts"
@@ -17,6 +13,10 @@
"./analytics/rewrites.mjs": {
"types": "./dist/analytics/rewrites/index.d.ts",
"default": "./src/analytics/rewrites.mjs"
+ },
+ "./github": {
+ "types": "./dist/github/index.d.ts",
+ "default": "./src/github/index.ts"
}
},
"scripts": {
diff --git a/packages/services/src/analytics/env/client-env.ts b/packages/services/src/analytics/env/client-env.ts
index 0ff62d2..3514e5e 100644
--- a/packages/services/src/analytics/env/client-env.ts
+++ b/packages/services/src/analytics/env/client-env.ts
@@ -7,7 +7,7 @@ export const clientEnv = createEnv({
.enum(['development', 'preview', 'production'])
.optional(),
NEXT_PUBLIC_POSTHOG_KEY: z.string().min(1),
- NEXT_PUBLIC_ARE_ANALYTICS_ENABLED: z.boolean().optional(),
+ NEXT_PUBLIC_ARE_ANALYTICS_ENABLED: z.boolean(),
},
runtimeEnv: {
NEXT_PUBLIC_VERCEL_ENV: process.env.NEXT_PUBLIC_VERCEL_ENV,
diff --git a/packages/services/src/analytics/index.ts b/packages/services/src/analytics/index.ts
index bd00019..77cf400 100644
--- a/packages/services/src/analytics/index.ts
+++ b/packages/services/src/analytics/index.ts
@@ -1,2 +1,2 @@
-export * from './track-page-view';
export * from './provider';
+export * from './page-tracker/page-tracker';
diff --git a/packages/services/src/analytics/track-page-view.tsx b/packages/services/src/analytics/page-tracker/_track-page-view.tsx
similarity index 94%
rename from packages/services/src/analytics/track-page-view.tsx
rename to packages/services/src/analytics/page-tracker/_track-page-view.tsx
index 56eeccd..ce25647 100644
--- a/packages/services/src/analytics/track-page-view.tsx
+++ b/packages/services/src/analytics/page-tracker/_track-page-view.tsx
@@ -4,7 +4,7 @@ import { usePathname, useSearchParams } from 'next/navigation';
import { useEffect } from 'react';
import { usePostHog } from 'posthog-js/react';
-export function AnalyticsPageView(): null {
+export function TrackPageView(): null {
const pathname = usePathname();
const searchParams = useSearchParams();
const posthog = usePostHog();
diff --git a/packages/services/src/analytics/page-tracker/index.ts b/packages/services/src/analytics/page-tracker/index.ts
new file mode 100644
index 0000000..b4e94ce
--- /dev/null
+++ b/packages/services/src/analytics/page-tracker/index.ts
@@ -0,0 +1 @@
+export * from './page-tracker';
diff --git a/packages/services/src/analytics/page-tracker/page-tracker.tsx b/packages/services/src/analytics/page-tracker/page-tracker.tsx
new file mode 100644
index 0000000..c729ed1
--- /dev/null
+++ b/packages/services/src/analytics/page-tracker/page-tracker.tsx
@@ -0,0 +1,14 @@
+'use client';
+
+import dynamic from 'next/dynamic';
+
+const TrackPageView = dynamic(
+ () => import('./_track-page-view').then((module) => module.TrackPageView),
+ {
+ ssr: false,
+ }
+);
+
+export const PageTracker = () => {
+ return