Skip to content

Commit 08a9e0e

Browse files
committed
Fix types
1 parent ccfdb00 commit 08a9e0e

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

packages/core/src/browser/types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ export interface VisualViewport extends EventTarget {
4040
}
4141

4242
// Those are native API types that are not official supported by TypeScript yet
43-
// https://github.com/microsoft/TypeScript/blob/13c374a868c926f6a907666a5599992c1351b773/src/lib/dom.generated.d.ts#L15399-L15418
4443

4544
export interface CookieStore extends EventTarget {}
4645

packages/core/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ export {
9696
deleteCookie,
9797
resetInitCookies,
9898
} from './browser/cookie'
99+
export { CookieStore } from './browser/types'
99100
export { initXhrObservable, XhrCompleteContext, XhrStartContext } from './browser/xhrObservable'
100101
export { initFetchObservable, FetchResolveContext, FetchStartContext, FetchContext } from './browser/fetchObservable'
101102
export { createPageExitObservable, PageExitEvent, PageExitReason, isPageExitReason } from './browser/pageExitObservable'

packages/rum-core/src/browser/cookieObservable.spec.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ import type { Subscription } from '@datadog/browser-core'
22
import { ONE_MINUTE, STORAGE_POLL_DELAY, deleteCookie, setCookie } from '@datadog/browser-core'
33
import type { Clock } from '@datadog/browser-core/test'
44
import { mockClock } from '@datadog/browser-core/test'
5-
import type { CookieChangeItem } from 'packages/core/src/browser/types'
65
import type { RumConfiguration } from '../domain/configuration'
76
import { createCookieObservable } from './cookieObservable'
8-
import type { CookieObservable } from './cookieObservable'
7+
import type { CookieChange, CookieObservable } from './cookieObservable'
98

109
const COOKIE_NAME = 'cookie_name'
1110
const COOKIE_DURATION = ONE_MINUTE
@@ -44,7 +43,7 @@ describe('cookieObservable', () => {
4443

4544
it('should notify observers on cookie change when cookieStore is not supported', () => {
4645
Object.defineProperty(window, 'cookieStore', { get: () => undefined })
47-
let cookieChange: CookieChangeItem | undefined
46+
let cookieChange: CookieChange | undefined
4847
observable.subscribe((change) => (cookieChange = change))
4948

5049
setCookie(COOKIE_NAME, 'foo', COOKIE_DURATION)

packages/rum-core/src/browser/cookieObservable.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { Configuration } from '@datadog/browser-core'
1+
import type { Configuration, CookieStore } from '@datadog/browser-core'
22
import {
33
setInterval,
44
clearInterval,
@@ -7,16 +7,17 @@ import {
77
ONE_SECOND,
88
findCommaSeparatedValue,
99
} from '@datadog/browser-core'
10-
import type { CookieChangeItem, CookieStore } from 'packages/core/src/browser/types'
1110

1211
export interface CookieStoreWindow extends Window {
1312
cookieStore: CookieStore
1413
}
1514

1615
export type CookieObservable = ReturnType<typeof createCookieObservable>
1716

17+
export type CookieChange = { name: string; value: string | undefined }
18+
1819
export function createCookieObservable(configuration: Configuration, cookieName: string) {
19-
return new Observable<CookieChangeItem>(
20+
return new Observable<CookieChange>(
2021
(observable) =>
2122
listenToCookieStoreChange(configuration, cookieName, (event) => observable.notify(event)) ??
2223
watchCookieFallback(cookieName, (event) => observable.notify(event))
@@ -26,7 +27,7 @@ export function createCookieObservable(configuration: Configuration, cookieName:
2627
function listenToCookieStoreChange(
2728
configuration: Configuration,
2829
cookieName: string,
29-
callback: (event: CookieChangeItem) => void
30+
callback: (event: CookieChange) => void
3031
) {
3132
if (!('cookieStore' in window)) {
3233
return

0 commit comments

Comments
 (0)