Merge branch 'main' into rlamb/sdk-10/support-event-urls

Author: kinyoklion

packages/sdk/browser/__tests__/goals/LocationWatcher.test.ts

@@ -1,6 +1,9 @@
 import { jest } from '@jest/globals';
 
-import { DefaultLocationWatcher, LOCATION_WATCHER_INTERVAL } from '../../src/goals/LocationWatcher';
+import {
+  DefaultLocationWatcher,
+  LOCATION_WATCHER_INTERVAL_MS,
+} from '../../src/goals/LocationWatcher';
 
 let mockCallback: jest.Mock;
 
@@ -25,7 +28,7 @@ it('should call callback when URL changes', () => {
     value: { href: 'https://example.com/new-page' },
     writable: true,
   });
-  jest.advanceTimersByTime(LOCATION_WATCHER_INTERVAL);
+  jest.advanceTimersByTime(LOCATION_WATCHER_INTERVAL_MS);
 
   expect(mockCallback).toHaveBeenCalledTimes(1);
 
@@ -40,7 +43,7 @@ it('should not call callback when URL remains the same', () => {
 
   const watcher = new DefaultLocationWatcher(mockCallback);
 
-  jest.advanceTimersByTime(LOCATION_WATCHER_INTERVAL * 2);
+  jest.advanceTimersByTime(LOCATION_WATCHER_INTERVAL_MS * 2);
 
   expect(mockCallback).not.toHaveBeenCalled();
 
@@ -80,7 +83,7 @@ it('should stop watching when close is called', () => {
     value: { href: 'https://example.com/new-page' },
     writable: true,
   });
-  jest.advanceTimersByTime(LOCATION_WATCHER_INTERVAL);
+  jest.advanceTimersByTime(LOCATION_WATCHER_INTERVAL_MS);
   window.dispatchEvent(new Event('popstate'));
 
   expect(mockCallback).not.toHaveBeenCalled();

packages/sdk/browser/src/goals/GoalTracker.ts

@@ -75,9 +75,7 @@ export default class GoalTracker {
     const pageviewGoals = goalsMatchingUrl.filter((goal) => goal.kind === 'pageview');
     const clickGoals = goalsMatchingUrl.filter((goal) => goal.kind === 'click');
 
-    pageviewGoals.forEach((event) => {
-      onEvent(event);
-    });
+    pageviewGoals.forEach((event) => onEvent(event));
 
     if (clickGoals.length) {
       // Click handler is not a member function in order to avoid having to bind it for the event

packages/sdk/browser/src/goals/LocationWatcher.ts

@@ -1,4 +1,4 @@
-export const LOCATION_WATCHER_INTERVAL = 300;
+export const LOCATION_WATCHER_INTERVAL_MS = 300;
 
 // Using any for the timer handle because the type is not the same for all
 // platforms and we only need to use it opaquely.
@@ -39,7 +39,7 @@ export class DefaultLocationWatcher {
      * Details on when popstate is called:
      * https://developer.mozilla.org/en-US/docs/Web/API/Window/popstate_event#when_popstate_is_sent
      */
-    this.watcherHandle = setInterval(checkUrl, LOCATION_WATCHER_INTERVAL);
+    this.watcherHandle = setInterval(checkUrl, LOCATION_WATCHER_INTERVAL_MS);
 
     window.addEventListener('popstate', checkUrl);
 

packages/sdk/browser/src/index.ts

@@ -18,7 +18,6 @@ import {
 import { BrowserClient, LDClient } from './BrowserClient';
 import { BrowserOptions as LDOptions } from './options';
 
-// TODO: Export and use browser specific options.
 export {
   LDClient,
   LDFlagSet,

packages/sdk/vercel/examples/route-handler/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@launchdarkly/vercel-server-sdk": "workspace:^",
     "@vercel/edge-config": "^1.1.0",
-    "next": "14.1.2",
+    "next": "14.2.10",
     "react": "^18.2.0",
     "react-dom": "18.2.0"
   },

packages/shared/common/src/internal/events/EventProcessor.ts

@@ -372,6 +372,27 @@ export default class EventProcessor implements LDEventProcessor {
         };
         return out;
       }
+      case 'click': {
+        const out: ClickOutputEvent = {
+          kind: 'click',
+          creationDate: event.creationDate,
+          contextKeys: event.context.kindsAndKeys,
+          key: event.key,
+          url: event.url,
+          selector: event.selector,
+        };
+        return out;
+      }
+      case 'pageview': {
+        const out: PageviewOutputEvent = {
+          kind: 'pageview',
+          creationDate: event.creationDate,
+          contextKeys: event.context.kindsAndKeys,
+          key: event.key,
+          url: event.url,
+        };
+        return out;
+      }
       default:
         // This would happen during the addition of a new event type to the SDK.
         return event;