chore: update analytics

Design-System-Pro · Jan 22, 2025 · ebbfb25 · ebbfb25
1 parent c745f15
commit ebbfb25
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 44 deletions.
diff --git 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 (
     <html lang="en">
-      <body
-        className={`${fontSans.variable} ${fontMono.variable} antialiased font-[family-name:var(--font-sans)]`}
-      >
-        <main className="mx-auto max-w-2xl px-4 py-16">{children}</main>
-        <Footer />
-        <Toaster />
-      </body>
+      <AnalyticsProvider>
+        <body
+          className={`${fontSans.variable} ${fontMono.variable} antialiased font-[family-name:var(--font-sans)]`}
+        >
+          <main className="mx-auto max-w-2xl px-4 py-16">{children}</main>
+          <Footer />
+          <Toaster />
+          <PageTracker />
+        </body>
+      </AnalyticsProvider>
     </html>
   );
 }
diff --git a/apps/engine/src/app/_components/analytics-page-tracker.tsx b/apps/engine/src/app/_components/analytics-page-tracker.tsx
diff --git 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
             )}
           >
-            <AnalyticsPageView />
+            <PageTracker />
             {children}
             <Toaster />
           </body>

diff --git a/packages/services/package.json b/packages/services/package.json
@@ -6,17 +6,17 @@
   "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"
     },
     "./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
@@ -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
@@ -1,2 +1,2 @@
-export * from './track-page-view';
 export * from './provider';
+export * from './page-tracker/page-tracker';
diff --git a/...ervices/src/analytics/track-page-view.tsx → ...alytics/page-tracker/_track-page-view.tsx b/...ervices/src/analytics/track-page-view.tsx → ...alytics/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
@@ -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
@@ -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 <TrackPageView />;
+};