Skip to content

Commit 4cbe69c

Browse files
committed
refactor get cdn to have smaller footprint
1 parent 3d31bd0 commit 4cbe69c

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@segment/analytics-next': patch
3+
---
4+
5+
Refactor get cdn to have smaller footprint

packages/browser/src/browser/__tests__/standalone-analytics.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import jsdom, { JSDOM } from 'jsdom'
22
import { InitOptions } from '../../'
3-
import { AnalyticsBrowser, loadLegacySettings } from '../../browser'
3+
import { AnalyticsBrowser } from '../../browser'
44
import { snippet } from '../../tester/__fixtures__/segment-snippet'
55
import { install, AnalyticsStandalone } from '../standalone-analytics'
66
import unfetch from 'unfetch'
@@ -127,10 +127,10 @@ describe('standalone bundle', () => {
127127
// @ts-ignore ignore Response required fields
128128
.mockImplementation((): Promise<Response> => fetchSettings)
129129

130-
await loadLegacySettings(segmentDotCom)
130+
await AnalyticsBrowser.standalone('my-write-key')
131131

132132
expect(unfetch).toHaveBeenCalledWith(
133-
'https://cdn.foo.com/v1/projects/foo/settings'
133+
'https://cdn.foo.com/v1/projects/my-write-key/settings'
134134
)
135135
})
136136

@@ -142,7 +142,7 @@ describe('standalone bundle', () => {
142142
const mockCdn = 'http://my-overridden-cdn.com'
143143

144144
window.analytics._cdn = mockCdn
145-
await loadLegacySettings(segmentDotCom)
145+
await AnalyticsBrowser.standalone('abc')
146146

147147
expect(unfetch).toHaveBeenCalledWith(expect.stringContaining(mockCdn))
148148
})

packages/browser/src/browser/index.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,9 @@ export interface AnalyticsBrowserSettings extends AnalyticsSettings {
7979

8080
export function loadLegacySettings(
8181
writeKey: string,
82-
cdnURL?: string
82+
cdnURL: string
8383
): Promise<LegacySettings> {
84-
const baseUrl = cdnURL ?? getCDN()
85-
86-
return fetch(`${baseUrl}/v1/projects/${writeKey}/settings`)
84+
return fetch(`${cdnURL}/v1/projects/${writeKey}/settings`)
8785
.then((res) => {
8886
if (!res.ok) {
8987
return res.text().then((errorResponseMessage) => {
@@ -263,7 +261,7 @@ async function loadAnalytics(
263261

264262
const legacySettings =
265263
settings.cdnSettings ??
266-
(await loadLegacySettings(settings.writeKey, settings.cdnURL))
264+
(await loadLegacySettings(settings.writeKey, settings.cdnURL || getCDN()))
267265

268266
const retryQueue: boolean =
269267
legacySettings.integrations['Segment.io']?.retryQueue ?? true

0 commit comments

Comments
 (0)