@@ -68,9 +87,6 @@ export const UserProvider = (props: { children?: React.ReactNode }) => {
);
}
- const isGuest = !user.email;
- const tier = isGuest ? "guest" : subscription?.active ? "pro" : "hobby";
-
return (
{
await session.update(newPreferences);
}}
>
- {props.children}
+ {props.children}
);
diff --git a/apps/web/src/contexts/posthog.tsx b/apps/web/src/contexts/posthog.tsx
deleted file mode 100644
index 7a9fbaf1e..000000000
--- a/apps/web/src/contexts/posthog.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-"use client";
-import { usePathname, useSearchParams } from "next/navigation";
-import posthog from "posthog-js";
-import { PostHogProvider as Provider, usePostHog } from "posthog-js/react";
-import React from "react";
-import { useMount } from "react-use";
-
-import { useUser } from "@/components/user-provider";
-import { env } from "@/env";
-
-type PostHogProviderProps = React.PropsWithChildren;
-
-if (typeof window !== "undefined" && env.NEXT_PUBLIC_POSTHOG_API_KEY) {
- posthog.init(env.NEXT_PUBLIC_POSTHOG_API_KEY, {
- debug: false,
- api_host: env.NEXT_PUBLIC_POSTHOG_API_HOST,
- capture_pageview: false,
- capture_pageleave: true,
- disable_session_recording: true,
- enable_heatmaps: false,
- persistence: "memory",
- autocapture: false,
- opt_out_capturing_by_default: false,
- });
-}
-
-function usePostHogPageView() {
- const pathname = usePathname();
- const searchParams = useSearchParams();
- const posthog = usePostHog();
- const previousUrl = React.useRef
(null);
- React.useEffect(() => {
- // Track pageviews
- if (pathname && posthog) {
- let url = window.origin + pathname;
- if (searchParams?.toString()) {
- url = url + `?${searchParams.toString()}`;
- }
- if (previousUrl.current !== url) {
- posthog.capture("$pageview", {
- $current_url: url,
- });
- previousUrl.current = url;
- }
- }
- }, [pathname, searchParams, posthog]);
-}
-
-export function PostHogProvider(props: PostHogProviderProps) {
- const { user } = useUser();
-
- usePostHogPageView();
-
- useMount(() => {
- if (user.email) {
- posthog.identify(user.id, {
- email: user.email,
- name: user.name,
- tier: user.tier,
- timeZone: user.timeZone,
- locale: user.locale,
- });
- }
- });
-
- return {props.children};
-}
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index 23e50cdb6..9c2af3fe9 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -1,4 +1,5 @@
import languages from "@rallly/languages";
+import { withPostHog } from "@rallly/posthog/next/middleware";
import { NextResponse } from "next/server";
import withAuth from "next-auth/middleware";
@@ -34,7 +35,11 @@ export const middleware = withAuth(
const res = NextResponse.rewrite(newUrl);
- await initGuest(req, res);
+ const jwt = await initGuest(req, res);
+
+ if (jwt?.sub) {
+ await withPostHog(res, { distinctID: jwt.sub });
+ }
return res;
},
diff --git a/apps/web/src/pages/api/auth/[...nextauth].ts b/apps/web/src/pages/api/auth/[...nextauth].ts
index 09e252547..5350908b6 100644
--- a/apps/web/src/pages/api/auth/[...nextauth].ts
+++ b/apps/web/src/pages/api/auth/[...nextauth].ts
@@ -1,6 +1,6 @@
+import { posthogApiHandler } from "@rallly/posthog/server";
import type { NextApiRequest, NextApiResponse } from "next";
-import { posthogApiHandler } from "@/app/posthog";
import { AuthApiRoute } from "@/auth";
import { composeApiHandlers } from "@/utils/next";
diff --git a/apps/web/src/pages/api/stripe/webhook.ts b/apps/web/src/pages/api/stripe/webhook.ts
index 028d6ad0d..ea3842047 100644
--- a/apps/web/src/pages/api/stripe/webhook.ts
+++ b/apps/web/src/pages/api/stripe/webhook.ts
@@ -1,12 +1,12 @@
import type { Stripe } from "@rallly/billing";
import { stripe } from "@rallly/billing";
import { prisma } from "@rallly/database";
+import { posthog, posthogApiHandler } from "@rallly/posthog/server";
import * as Sentry from "@sentry/node";
import { buffer } from "micro";
import type { NextApiRequest, NextApiResponse } from "next";
import { z } from "zod";
-import { posthog, posthogApiHandler } from "@/app/posthog";
import { composeApiHandlers } from "@/utils/next";
export const config = {
diff --git a/apps/web/src/pages/api/trpc/[trpc].ts b/apps/web/src/pages/api/trpc/[trpc].ts
index e57956aa7..fe3e4383a 100644
--- a/apps/web/src/pages/api/trpc/[trpc].ts
+++ b/apps/web/src/pages/api/trpc/[trpc].ts
@@ -1,10 +1,10 @@
+import { posthogApiHandler } from "@rallly/posthog/server";
import * as Sentry from "@sentry/nextjs";
import { TRPCError } from "@trpc/server";
import { createNextApiHandler } from "@trpc/server/adapters/next";
-import { posthogApiHandler } from "@/app/posthog";
import { getServerSession } from "@/auth";
-import type { AppRouter} from "@/trpc/routers";
+import type { AppRouter } from "@/trpc/routers";
import { appRouter } from "@/trpc/routers";
import { getEmailClient } from "@/utils/emails";
import { composeApiHandlers } from "@/utils/next";
diff --git a/apps/web/src/trpc/routers/auth.ts b/apps/web/src/trpc/routers/auth.ts
index 463bac65f..f119f7f13 100644
--- a/apps/web/src/trpc/routers/auth.ts
+++ b/apps/web/src/trpc/routers/auth.ts
@@ -1,8 +1,8 @@
import { prisma } from "@rallly/database";
+import { posthog } from "@rallly/posthog/server";
import { generateOtp } from "@rallly/utils/nanoid";
import { z } from "zod";
-import { posthog } from "@/app/posthog";
import { isEmailBlocked } from "@/auth";
import { createToken, decryptToken } from "@/utils/session";
diff --git a/apps/web/src/trpc/routers/polls.ts b/apps/web/src/trpc/routers/polls.ts
index 8366fb361..73df076ca 100644
--- a/apps/web/src/trpc/routers/polls.ts
+++ b/apps/web/src/trpc/routers/polls.ts
@@ -1,5 +1,6 @@
import type { PollStatus } from "@rallly/database";
import { prisma } from "@rallly/database";
+import { posthog } from "@rallly/posthog/server";
import { absoluteUrl, shortUrl } from "@rallly/utils/absolute-url";
import { nanoid } from "@rallly/utils/nanoid";
import { TRPCError } from "@trpc/server";
@@ -7,7 +8,6 @@ import dayjs from "dayjs";
import * as ics from "ics";
import { z } from "zod";
-import { posthog } from "@/app/posthog";
import { getEmailClient } from "@/utils/emails";
import { getTimeZoneAbbreviation } from "../../utils/date";
diff --git a/apps/web/src/utils/posthog.ts b/apps/web/src/utils/posthog.ts
deleted file mode 100644
index c818cc570..000000000
--- a/apps/web/src/utils/posthog.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { usePostHog as usePostHogHook } from "posthog-js/react";
-
-export const usePostHog = () => {
- const posthog = usePostHogHook();
- return process.env.NEXT_PUBLIC_POSTHOG_API_KEY ? posthog : null;
-};
diff --git a/packages/posthog/.eslintrc.js b/packages/posthog/.eslintrc.js
new file mode 100644
index 000000000..a3b5a656d
--- /dev/null
+++ b/packages/posthog/.eslintrc.js
@@ -0,0 +1,2 @@
+/** @type {import("eslint").Linter.Config} */
+module.exports = require("@rallly/eslint-config/preset")(__dirname);
diff --git a/packages/posthog/package.json b/packages/posthog/package.json
new file mode 100644
index 000000000..520ce1159
--- /dev/null
+++ b/packages/posthog/package.json
@@ -0,0 +1,18 @@
+{
+ "name": "@rallly/posthog",
+ "version": "0.0.0",
+ "private": true,
+ "exports": {
+ "./server": "./src/server/index.ts",
+ "./client": "./src/client/index.ts",
+ "./next/middleware": "./src/next/middleware.ts"
+ },
+ "dependencies": {
+ "posthog-js": "^1.178.0",
+ "posthog-node": "^4.2.1"
+ },
+ "peerDependencies": {
+ "next": "^14.2.13",
+ "react": "^18.2.0"
+ }
+}
diff --git a/packages/posthog/src/client/index.ts b/packages/posthog/src/client/index.ts
new file mode 100644
index 000000000..c3e322403
--- /dev/null
+++ b/packages/posthog/src/client/index.ts
@@ -0,0 +1,2 @@
+export { PostHogProvider } from "./provider";
+export { usePostHog } from "posthog-js/react";
diff --git a/packages/posthog/src/client/provider.tsx b/packages/posthog/src/client/provider.tsx
new file mode 100644
index 000000000..b9f12ab3a
--- /dev/null
+++ b/packages/posthog/src/client/provider.tsx
@@ -0,0 +1,36 @@
+"use client";
+import Cookies from "js-cookie";
+import posthog from "posthog-js";
+import { PostHogProvider as Provider } from "posthog-js/react";
+import React from "react";
+
+import { POSTHOG_BOOTSTAP_DATA_COOKIE_NAME } from "../constants";
+
+if (typeof window !== "undefined" && process.env.NEXT_PUBLIC_POSTHOG_API_KEY) {
+ let bootstrapData = {};
+ try {
+ const cookieData = Cookies.get(POSTHOG_BOOTSTAP_DATA_COOKIE_NAME);
+ if (cookieData) {
+ bootstrapData = JSON.parse(cookieData);
+ }
+ } catch (error) {
+ console.warn("Failed to parse PostHog bootstrap data:", error);
+ }
+
+ posthog.init(process.env.NEXT_PUBLIC_POSTHOG_API_KEY, {
+ debug: false,
+ api_host: process.env.NEXT_PUBLIC_POSTHOG_API_HOST,
+ capture_pageview: false,
+ capture_pageleave: true,
+ disable_session_recording: true,
+ enable_heatmaps: false,
+ persistence: "memory",
+ bootstrap: bootstrapData,
+ autocapture: false,
+ opt_out_capturing_by_default: false,
+ });
+}
+
+export function PostHogProvider(props: { children?: React.ReactNode }) {
+ return {props.children};
+}
diff --git a/packages/posthog/src/constants.ts b/packages/posthog/src/constants.ts
new file mode 100644
index 000000000..eb1ebedc9
--- /dev/null
+++ b/packages/posthog/src/constants.ts
@@ -0,0 +1 @@
+export const POSTHOG_BOOTSTAP_DATA_COOKIE_NAME = "posthog_bootstrap_data";
diff --git a/packages/posthog/src/next/middleware.ts b/packages/posthog/src/next/middleware.ts
new file mode 100644
index 000000000..14a3a7d9a
--- /dev/null
+++ b/packages/posthog/src/next/middleware.ts
@@ -0,0 +1,22 @@
+import { NextResponse } from "next/server";
+import { POSTHOG_BOOTSTAP_DATA_COOKIE_NAME } from "../constants";
+
+const posthogApiKey = process.env.NEXT_PUBLIC_POSTHOG_API_KEY;
+
+export async function withPostHog(
+ res: NextResponse,
+ bootstrapData: { distinctID?: string },
+) {
+ if (!posthogApiKey) {
+ return;
+ }
+
+ res.cookies.set({
+ name: POSTHOG_BOOTSTAP_DATA_COOKIE_NAME,
+ value: JSON.stringify(bootstrapData),
+ httpOnly: false,
+ secure: true,
+ sameSite: "lax",
+ path: "/",
+ });
+}
diff --git a/apps/web/src/app/posthog.ts b/packages/posthog/src/server/index.ts
similarity index 67%
rename from apps/web/src/app/posthog.ts
rename to packages/posthog/src/server/index.ts
index 828cf1055..7710c7200 100644
--- a/apps/web/src/app/posthog.ts
+++ b/packages/posthog/src/server/index.ts
@@ -1,13 +1,11 @@
import { waitUntil } from "@vercel/functions";
import { PostHog } from "posthog-node";
-import { env } from "@/env";
-
function PostHogClient() {
- if (!env.NEXT_PUBLIC_POSTHOG_API_KEY) return null;
+ if (!process.env.NEXT_PUBLIC_POSTHOG_API_KEY) return null;
- const posthogClient = new PostHog(env.NEXT_PUBLIC_POSTHOG_API_KEY, {
- host: env.NEXT_PUBLIC_POSTHOG_API_HOST,
+ const posthogClient = new PostHog(process.env.NEXT_PUBLIC_POSTHOG_API_KEY, {
+ host: process.env.NEXT_PUBLIC_POSTHOG_API_HOST,
flushAt: 1,
flushInterval: 0,
});
diff --git a/packages/posthog/tsconfig.json b/packages/posthog/tsconfig.json
new file mode 100644
index 000000000..18a4f1351
--- /dev/null
+++ b/packages/posthog/tsconfig.json
@@ -0,0 +1,5 @@
+{
+ "extends": "@rallly/tsconfig/next.json",
+ "include": ["**/*.ts", "**/*.tsx"],
+ "exclude": ["node_modules"],
+}
diff --git a/yarn.lock b/yarn.lock
index bf809b142..bdda04bf8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12718,17 +12718,17 @@ postgres-range@^1.1.1:
resolved "https://registry.yarnpkg.com/postgres-range/-/postgres-range-1.1.4.tgz#a59c5f9520909bcec5e63e8cf913a92e4c952863"
integrity sha512-i/hbxIE9803Alj/6ytL7UHQxRvZkI9O4Sy+J3HGc4F4oo/2eQAjTSNJ0bfxyse3bH0nuVesCk+3IRLaMtG3H6w==
-posthog-js@^1.154.0:
- version "1.181.0"
- resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.181.0.tgz#b2119f6a27b27297dee9540bfcd33eddab06905c"
- integrity sha512-bI+J+f4E8x4JwbGtG6LReQv1Xvss01F6cs7UDlvffHySpVhNq4ptkNjV88B92IVEsrCtNYhy/TjFnGxk6RN0Qw==
+posthog-js@^1.178.0:
+ version "1.178.0"
+ resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.178.0.tgz#80005798e6c67d4d6565a5648939a0f017b0879b"
+ integrity sha512-ILD4flNh72d5dycc4ZouKORlaVr+pDzl5TlZr1JgP0NBAoduHjhE7XZYwk7zdYkry7u0qAIpfv2306zJCW2vGg==
dependencies:
core-js "^3.38.1"
fflate "^0.4.8"
preact "^10.19.3"
web-vitals "^4.2.0"
-posthog-node@^4.0.1:
+posthog-node@^4.2.1:
version "4.2.1"
resolved "https://registry.yarnpkg.com/posthog-node/-/posthog-node-4.2.1.tgz#c9f077116bebd06dc65a3f9ae282d10db242c660"
integrity sha512-l+fsjYEkTik3m/G0pE7gMr4qBJP84LhK779oQm6MBzhBGpd4By4qieTW+4FUAlNCyzQTynn3Nhsa50c0IELSxQ==