@usermaven/nextjs 1.4.4 → 1.5.1-rc.91

package/lib/middlewareEnv.d.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
-import { ClientProperties } from "@usermaven/sdk-js/src/interface";
+import { ClientProperties } from "@usermaven/sdk-js";
 declare function middlewareEnv(req: NextRequest, res: NextResponse, opts?: {
     disableCookies?: boolean;
 }): {

package/lib/usePageView.d.ts

@@ -1,7 +1,8 @@
 import { EventPayload, UsermavenClient } from "@usermaven/sdk-js";
-declare function usePageView(usermaven: UsermavenClient, opts?: {
+interface UsePageViewOptions {
     before?: (usermaven: UsermavenClient) => void;
     typeName?: string;
     payload?: EventPayload;
-}): UsermavenClient;
+}
+declare function usePageView(usermaven: UsermavenClient | null, opts?: UsePageViewOptions): UsermavenClient | null;
 export default usePageView;

package/lib/usePageView.js

@@ -1,22 +1,63 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = require("react");
-const router_1 = require("next/router");
-function usePageView(usermaven, opts = {}) {
-    const router = (0, router_1.useRouter)();
+function useUrlChange() {
+    const [url, setUrl] = (0, react_1.useState)('');
+    const isClient = typeof window !== 'undefined';
     (0, react_1.useEffect)(() => {
-        const handleRouteChange = () => {
-            if (opts.before) {
-                opts.before(usermaven);
-            }
-            usermaven.track((opts === null || opts === void 0 ? void 0 : opts.typeName) || 'pageview', opts.payload);
+        if (!isClient)
+            return;
+        setUrl(window.location.href);
+        const handleUrlChange = () => {
+            setUrl(window.location.href);
+        };
+        const history = window.history;
+        const originalPushState = history.pushState.bind(history);
+        const originalReplaceState = history.replaceState.bind(history);
+        const wrapHistoryMethod = (original) => {
+            return function (...args) {
+                const result = original.apply(this, args);
+                handleUrlChange();
+                return result;
+            };
         };
-        handleRouteChange();
-        router.events.on('routeChangeComplete', handleRouteChange);
+        history.pushState = wrapHistoryMethod(originalPushState);
+        history.replaceState = wrapHistoryMethod(originalReplaceState);
+        window.addEventListener('popstate', handleUrlChange);
         return () => {
-            router.events.off('routeChangeComplete', handleRouteChange);
+            window.removeEventListener('popstate', handleUrlChange);
+            history.pushState = originalPushState;
+            history.replaceState = originalReplaceState;
         };
-    }, [router.events, usermaven.track, opts.payload, opts.before]);
+    }, [isClient]);
+    return url;
+}
+function usePageView(usermaven, opts = {}) {
+    const url = useUrlChange();
+    const isClient = typeof window !== 'undefined';
+    const lastTrackedUrl = (0, react_1.useRef)('');
+    const trackPageView = (0, react_1.useCallback)(() => {
+        if (!isClient || !usermaven)
+            return;
+        const currentUrl = window.location.href;
+        if (lastTrackedUrl.current === currentUrl)
+            return;
+        lastTrackedUrl.current = currentUrl;
+        if (opts.before) {
+            opts.before(usermaven);
+        }
+        try {
+            usermaven.track((opts === null || opts === void 0 ? void 0 : opts.typeName) || 'pageview', Object.assign(Object.assign({}, opts.payload), { url: currentUrl, path: window.location.pathname, referrer: document.referrer || '', title: document.title, timestamp: new Date().toISOString() }));
+        }
+        catch (error) {
+            console.warn('Usermaven pageview tracking error:', error);
+        }
+    }, [usermaven, opts.before, opts.typeName, opts.payload, isClient]);
+    (0, react_1.useEffect)(() => {
+        if (url) {
+            trackPageView();
+        }
+    }, [url, trackPageView]);
     return usermaven;
 }
 exports.default = usePageView;

package/lib/useUsermaven.d.ts

@@ -1,5 +1,17 @@
-import { UsermavenClient } from "@usermaven/sdk-js";
-declare function useUsermaven(): UsermavenClient & {
-    trackPageView: () => Promise<void>;
+import { EventPayload, UserProps } from "@usermaven/sdk-js";
+export type UsermavenClient = {
+    trackPageView: () => void;
+    id: (userData: UserProps, doNotSendEvent?: boolean) => Promise<void>;
+    track: (typeName: string, payload?: EventPayload) => void;
+    rawTrack: (payload: any) => void;
+    set: (properties: Record<string, any>, opts?: {
+        eventType?: string;
+        persist?: boolean;
+    }) => void;
+    unset: (propertyName: string, opts?: {
+        eventType?: string;
+        persist?: boolean;
+    }) => void;
 };
+declare function useUsermaven(): UsermavenClient;
 export default useUsermaven;

package/lib/useUsermaven.js

@@ -1,21 +1,40 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = require("react");
 const UsermavenContext_1 = require("./UsermavenContext");
+const createNoopClient = () => ({
+    trackPageView: () => { },
+    id: () => __awaiter(void 0, void 0, void 0, function* () { }),
+    track: () => { },
+    rawTrack: () => { },
+    set: () => { },
+    unset: () => { },
+});
 function useUsermaven() {
     const client = (0, react_1.useContext)(UsermavenContext_1.default);
     if (!client) {
-        throw new Error("Before calling useUsermaven() hook, please wrap your component into <JitsuProvider />. Read more in https://usermaven.com/docs/integrations/next");
+        return createNoopClient();
     }
-    const id = (0, react_1.useCallback)((userData, doNotSendEvent) => client === null || client === void 0 ? void 0 : client.id(userData, doNotSendEvent), [client]);
-    const trackPageView = (0, react_1.useCallback)(() => client === null || client === void 0 ? void 0 : client.track('pageview'), [client]);
-    const track = (0, react_1.useCallback)((typeName, payload) => client === null || client === void 0 ? void 0 : client.track(typeName, payload), [client]);
-    const rawTrack = (0, react_1.useCallback)((payload) => client === null || client === void 0 ? void 0 : client.rawTrack(payload), [client]);
-    const interceptAnalytics = (0, react_1.useCallback)((analytics) => client === null || client === void 0 ? void 0 : client.interceptAnalytics(analytics), [client]);
+    const id = (0, react_1.useCallback)((userData, doNotSendEvent) => client.id(userData, doNotSendEvent), [client]);
+    const trackPageView = (0, react_1.useCallback)(() => client.track('pageview'), [client]);
+    const track = (0, react_1.useCallback)((typeName, payload) => client.track(typeName, payload), [client]);
+    const rawTrack = (0, react_1.useCallback)((payload) => client.rawTrack(payload), [client]);
+    const set = (0, react_1.useCallback)((properties, opts) => client.set(properties, opts), [client]);
+    const unset = (0, react_1.useCallback)((propertyName, opts) => client.unset(propertyName, opts), [client]);
     return Object.assign(Object.assign({}, client), { id,
         track,
         trackPageView,
         rawTrack,
-        interceptAnalytics });
+        set,
+        unset });
 }
 exports.default = useUsermaven;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usermaven/nextjs",
-  "version": "1.4.4",
+  "version": "1.5.1-rc.91",
   "description": "Usermaven JavaScript SDK for NextJS",
   "author": "Usermaven <hello@usermaven.com>",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@usermaven/sdk-js": "^1.2.5",
+    "@usermaven/sdk-js": "1.5.1-rc.91",
     "cookie": "^0.5.0"
   },
   "peerDependencies": {
@@ -33,15 +33,16 @@
     "next": "^12.1.5",
     "react": "^17.0.2",
     "rollup": "^2.70.1",
-    "rollup-plugin-peer-deps-external": "^2.2.4"
-  },
-  "scripts": {
-    "build": "rollup -c && tsc",
-    "test": "echo \"Error: run tests from root\" && exit 1"
+    "rollup-plugin-peer-deps-external": "^2.2.4",
+    "tslib": "^2.3.1"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/usermaven/usermaven-js",
     "directory": "packages/nextjs"
+  },
+  "scripts": {
+    "build": "rollup -c && tsc",
+    "test": "echo \"Error: run tests from root\" && exit 1"
   }
-}
+}