@usermaven/nextjs 1.5.0-rc.90 → 1.5.1-rc.91

package/lib/UsermavenProvider.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { UsermavenClient } from "@usermaven/sdk-js";
 import { PropsWithChildren } from "react";
 export interface UsermavenProviderProps {
-    client: UsermavenClient;
+    client: UsermavenClient | null;
 }
 declare const UsermavenProvider: React.FC<PropsWithChildren<UsermavenProviderProps>>;
 export default UsermavenProvider;

package/lib/client.d.ts

@@ -1,3 +1,3 @@
 import { UsermavenClient, UsermavenOptions } from "@usermaven/sdk-js";
-declare function createClient(params: UsermavenOptions): UsermavenClient;
+declare function createClient(params: UsermavenOptions): UsermavenClient | null;
 export default createClient;

package/lib/client.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const sdk_js_1 = require("@usermaven/sdk-js");
 function createClient(params) {
+    if (typeof window === 'undefined') {
+        return null;
+    }
     return (0, sdk_js_1.usermavenClient)(params);
 }
 exports.default = createClient;

package/lib/index.es.js

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { createContext, useContext, useCallback, useEffect, useState } from 'react';
+import { createContext, useContext, useCallback, useRef, useEffect, useState } from 'react';
 
 const UsermavenContext = createContext(null);
 
@@ -1310,20 +1310,61 @@ u() && function(i, e) {
 }(document, window);
 
 function createClient(params) {
+    if (typeof window === 'undefined') {
+        return null;
+    }
     return ke(params);
 }
 
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+
+function __awaiter(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());
+  });
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+  var e = new Error(message);
+  return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
+const createNoopClient = () => ({
+    trackPageView: () => { },
+    id: () => __awaiter(void 0, void 0, void 0, function* () { }),
+    track: () => { },
+    rawTrack: () => { },
+    set: () => { },
+    unset: () => { },
+});
 function useUsermaven() {
     const client = useContext(UsermavenContext);
     if (!client) {
-        throw new Error("Before calling useUsermaven() hook, please wrap your component into <UsermavenProvider />. Read more in http://jitsu.com/docs/sending-data/js-sdk/react");
+        return createNoopClient();
     }
-    const id = useCallback((userData, doNotSendEvent) => client === null || client === void 0 ? void 0 : client.id(userData, doNotSendEvent), [client]);
-    const trackPageView = useCallback(() => client === null || client === void 0 ? void 0 : client.track('pageview'), [client]);
-    const track = useCallback((typeName, payload) => client === null || client === void 0 ? void 0 : client.track(typeName, payload), [client]);
-    const rawTrack = useCallback((payload) => client === null || client === void 0 ? void 0 : client.rawTrack(payload), [client]);
-    const set = useCallback((properties, opts) => client === null || client === void 0 ? void 0 : client.set(properties, opts), [client]);
-    const unset = useCallback((propertyName, opts) => client === null || client === void 0 ? void 0 : client.unset(propertyName, opts), [client]);
+    const id = useCallback((userData, doNotSendEvent) => client.id(userData, doNotSendEvent), [client]);
+    const trackPageView = useCallback(() => client.track('pageview'), [client]);
+    const track = useCallback((typeName, payload) => client.track(typeName, payload), [client]);
+    const rawTrack = useCallback((payload) => client.rawTrack(payload), [client]);
+    const set = useCallback((properties, opts) => client.set(properties, opts), [client]);
+    const unset = useCallback((propertyName, opts) => client.unset(propertyName, opts), [client]);
     return Object.assign(Object.assign({}, client), { id,
         track,
         trackPageView,
@@ -1334,41 +1375,56 @@ function useUsermaven() {
 
 function useUrlChange() {
     const [url, setUrl] = useState('');
+    const isClient = typeof window !== 'undefined';
     useEffect(() => {
+        if (!isClient)
+            return;
         setUrl(window.location.href);
         const handleUrlChange = () => {
             setUrl(window.location.href);
         };
-        window.addEventListener('popstate', handleUrlChange);
-        const originalPushState = window.history.pushState;
-        const originalReplaceState = window.history.replaceState;
-        window.history.pushState = function () {
-            originalPushState.apply(this, arguments);
-            handleUrlChange();
-        };
-        window.history.replaceState = function () {
-            originalReplaceState.apply(this, arguments);
-            handleUrlChange();
+        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;
+            };
         };
+        history.pushState = wrapHistoryMethod(originalPushState);
+        history.replaceState = wrapHistoryMethod(originalReplaceState);
+        window.addEventListener('popstate', handleUrlChange);
         return () => {
             window.removeEventListener('popstate', handleUrlChange);
-            window.history.pushState = originalPushState;
-            window.history.replaceState = originalReplaceState;
+            history.pushState = originalPushState;
+            history.replaceState = originalReplaceState;
         };
-    }, []);
+    }, [isClient]);
     return url;
 }
 function usePageView(usermaven, opts = {}) {
     const url = useUrlChange();
+    const isClient = typeof window !== 'undefined';
+    const lastTrackedUrl = useRef('');
     const trackPageView = useCallback(() => {
-        if (typeof window === 'undefined') {
+        if (!isClient || !usermaven)
             return;
-        }
+        const currentUrl = window.location.href;
+        if (lastTrackedUrl.current === currentUrl)
+            return;
+        lastTrackedUrl.current = currentUrl;
         if (opts.before) {
             opts.before(usermaven);
         }
-        usermaven.track((opts === null || opts === void 0 ? void 0 : opts.typeName) || 'pageview', Object.assign(Object.assign({}, opts.payload), { url: window.location.href, path: window.location.pathname, referrer: document.referrer, title: document.title }));
-    }, [usermaven, opts.before, opts.typeName, opts.payload]);
+        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]);
     useEffect(() => {
         if (url) {
             trackPageView();

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

@@ -3,41 +3,56 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = require("react");
 function useUrlChange() {
     const [url, setUrl] = (0, react_1.useState)('');
+    const isClient = typeof window !== 'undefined';
     (0, react_1.useEffect)(() => {
+        if (!isClient)
+            return;
         setUrl(window.location.href);
         const handleUrlChange = () => {
             setUrl(window.location.href);
         };
-        window.addEventListener('popstate', handleUrlChange);
-        const originalPushState = window.history.pushState;
-        const originalReplaceState = window.history.replaceState;
-        window.history.pushState = function () {
-            originalPushState.apply(this, arguments);
-            handleUrlChange();
-        };
-        window.history.replaceState = function () {
-            originalReplaceState.apply(this, arguments);
-            handleUrlChange();
+        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;
+            };
         };
+        history.pushState = wrapHistoryMethod(originalPushState);
+        history.replaceState = wrapHistoryMethod(originalReplaceState);
+        window.addEventListener('popstate', handleUrlChange);
         return () => {
             window.removeEventListener('popstate', handleUrlChange);
-            window.history.pushState = originalPushState;
-            window.history.replaceState = originalReplaceState;
+            history.pushState = originalPushState;
+            history.replaceState = originalReplaceState;
         };
-    }, []);
+    }, [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 (typeof window === 'undefined') {
+        if (!isClient || !usermaven)
             return;
-        }
+        const currentUrl = window.location.href;
+        if (lastTrackedUrl.current === currentUrl)
+            return;
+        lastTrackedUrl.current = currentUrl;
         if (opts.before) {
             opts.before(usermaven);
         }
-        usermaven.track((opts === null || opts === void 0 ? void 0 : opts.typeName) || 'pageview', Object.assign(Object.assign({}, opts.payload), { url: window.location.href, path: window.location.pathname, referrer: document.referrer, title: document.title }));
-    }, [usermaven, opts.before, opts.typeName, opts.payload]);
+        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();

package/lib/useUsermaven.js

@@ -1,18 +1,35 @@
 "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 <UsermavenProvider />. Read more in http://jitsu.com/docs/sending-data/js-sdk/react");
+        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 set = (0, react_1.useCallback)((properties, opts) => client === null || client === void 0 ? void 0 : client.set(properties, opts), [client]);
-    const unset = (0, react_1.useCallback)((propertyName, opts) => client === null || client === void 0 ? void 0 : client.unset(propertyName, opts), [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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usermaven/nextjs",
-  "version": "1.5.0-rc.90",
+  "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.5.0-rc.90",
+    "@usermaven/sdk-js": "1.5.1-rc.91",
     "cookie": "^0.5.0"
   },
   "peerDependencies": {
@@ -33,7 +33,8 @@
     "next": "^12.1.5",
     "react": "^17.0.2",
     "rollup": "^2.70.1",
-    "rollup-plugin-peer-deps-external": "^2.2.4"
+    "rollup-plugin-peer-deps-external": "^2.2.4",
+    "tslib": "^2.3.1"
   },
   "repository": {
     "type": "git",