From 7a4fbec652e505df0ca0a7aa367533d26ff0776e Mon Sep 17 00:00:00 2001
From: Seth Silesky <5115498+silesky@users.noreply.github.com>
Date: Tue, 12 Sep 2023 18:33:42 -0500
Subject: [PATCH 1/9] Update changeset

---
 .changeset/mean-apricots-hammer.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.changeset/mean-apricots-hammer.md b/.changeset/mean-apricots-hammer.md
index 76b8b9065..3b2c1d7ff 100644
--- a/.changeset/mean-apricots-hammer.md
+++ b/.changeset/mean-apricots-hammer.md
@@ -1,6 +1,5 @@
 ---
 '@segment/analytics-next': minor
-'@segment/analytics-core': minor
 ---
 
 Adds `globalAnalyticsKey` option for setting custom global window buffers

From 0a8c30a052943bafd12ee66c41623eaece6f7ec6 Mon Sep 17 00:00:00 2001
From: Seth Silesky <5115498+silesky@users.noreply.github.com>
Date: Thu, 14 Sep 2023 01:53:02 -0500
Subject: [PATCH 2/9] [docs] Update Node.js README.md

---
 packages/node/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node/README.md b/packages/node/README.md
index 81345659e..f24687291 100644
--- a/packages/node/README.md
+++ b/packages/node/README.md
@@ -103,7 +103,7 @@ import { Analytics } from '@segment/analytics-node';
 import { NextRequest, NextResponse } from 'next/server';
 
 export const analytics = new Analytics({
-  writeKey: 'DjTUVRhleGaZX31JQpj6XIAaprCIb25W',
+  writeKey: '<MY_WRITE_KEY>',
   maxEventsInBatch: 1,
 })
   .on('error', console.error)

From fcf42f68b4226b55417bbaeb6305d33129ede96d Mon Sep 17 00:00:00 2001
From: Seth Silesky <5115498+silesky@users.noreply.github.com>
Date: Thu, 14 Sep 2023 17:05:00 -0500
Subject: [PATCH 3/9] [Fix] Export UniversalStorage from
 @segment/analytics-next (#949)

---
 .changeset/clean-elephants-deny.md | 5 +++++
 packages/browser/src/index.ts      | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 .changeset/clean-elephants-deny.md

diff --git a/.changeset/clean-elephants-deny.md b/.changeset/clean-elephants-deny.md
new file mode 100644
index 000000000..c4e1fd79f
--- /dev/null
+++ b/.changeset/clean-elephants-deny.md
@@ -0,0 +1,5 @@
+---
+'@segment/analytics-next': patch
+---
+
+Fix regression where we no longer export UniversalStorage (used in destinations)
diff --git a/packages/browser/src/index.ts b/packages/browser/src/index.ts
index 625d8e91a..fdd552aa8 100644
--- a/packages/browser/src/index.ts
+++ b/packages/browser/src/index.ts
@@ -10,3 +10,4 @@ export * from './core/user'
 export type { AnalyticsSnippet } from './browser/standalone-interface'
 export type { MiddlewareFunction } from './plugins/middleware'
 export { getGlobalAnalytics } from './lib/global-analytics-helper'
+export { UniversalStorage, Store, StorageObject } from './core/storage'

From cb56224388d94936859f469c6639dd6eb50e3d4a Mon Sep 17 00:00:00 2001
From: Seth Silesky <5115498+silesky@users.noreply.github.com>
Date: Tue, 19 Sep 2023 08:06:59 -0500
Subject: [PATCH 4/9] [chore] Consent - shorten test command + make consistent
 (#951)

---
 .github/workflows/ci.yml                                      | 2 +-
 packages/consent/consent-tools-integration-tests/README.md    | 2 +-
 packages/consent/consent-tools-integration-tests/package.json | 2 +-
 turbo.json                                                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 74a89229b..6bd3821a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
           key: ${{ runner.os }}-turbo-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-turbo-
-      - run: yarn turbo run --filter='consent-tools-integration-tests' test:intg
+      - run: yarn turbo run --filter='consent-tools-integration-tests' test:int
 
 
 
diff --git a/packages/consent/consent-tools-integration-tests/README.md b/packages/consent/consent-tools-integration-tests/README.md
index e10909e33..65e606551 100644
--- a/packages/consent/consent-tools-integration-tests/README.md
+++ b/packages/consent/consent-tools-integration-tests/README.md
@@ -16,5 +16,5 @@ Why is this using wd.io instead of playwright?
 ## Development
 ### Build, start server, run tests (and exit gracefully)
 ```
-yarn . test:intg
+yarn . test:int
 ```
diff --git a/packages/consent/consent-tools-integration-tests/package.json b/packages/consent/consent-tools-integration-tests/package.json
index 7511b9245..7b8933df1 100644
--- a/packages/consent/consent-tools-integration-tests/package.json
+++ b/packages/consent/consent-tools-integration-tests/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "scripts": {
     ".": "yarn run -T turbo run --filter=@internal/consent-tools-integration-tests...",
-    "test:intg": "yarn wdio:local",
+    "test:int": "yarn wdio:local",
     "build": "webpack",
     "watch": "yarn build --watch",
     "wdio:local": "wdio wdio.conf.local.ts",
diff --git a/turbo.json b/turbo.json
index 8c818c5ac..aa1a3925b 100644
--- a/turbo.json
+++ b/turbo.json
@@ -14,7 +14,7 @@
     "test": {
       "dependsOn": ["build"]
     },
-    "test:intg": {
+    "test:int": {
       "dependsOn": ["build"]
     },
     "watch": {

From b49ed5f8194e53c581a4249a4f8578ba9153946c Mon Sep 17 00:00:00 2001
From: Seth Silesky <5115498+silesky@users.noreply.github.com>
Date: Wed, 20 Sep 2023 16:16:00 -0500
Subject: [PATCH 5/9] [docs/test] Tweak consent tests / update docs (#954)

---
 .../consent-tools-vanilla/index.ts            |  6 +---
 .../src/page-objects/base-page.ts             |  4 +--
 .../src/tests/consent-tools-vanilla.test.ts   |  9 ++++--
 .../src/tests/onetrust.test.ts                |  5 +--
 packages/consent/consent-tools/README.md      | 32 +++++++++++++------
 .../consent-wrapper-onetrust/README.md        |  2 +-
 6 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/packages/consent/consent-tools-integration-tests/src/page-bundles/consent-tools-vanilla/index.ts b/packages/consent/consent-tools-integration-tests/src/page-bundles/consent-tools-vanilla/index.ts
index 5e56c29b3..f04602e81 100644
--- a/packages/consent/consent-tools-integration-tests/src/page-bundles/consent-tools-vanilla/index.ts
+++ b/packages/consent/consent-tools-integration-tests/src/page-bundles/consent-tools-vanilla/index.ts
@@ -1,14 +1,10 @@
 import { AnalyticsBrowser } from '@segment/analytics-next'
 import { createWrapper } from '@segment/analytics-consent-tools'
 
-const fakeCategories = { Advertising: true, Analytics: true }
+const fakeCategories = { FooCategory1: true, FooCategory2: true }
 
 const withCMP = createWrapper({
   getCategories: () => fakeCategories,
-  integrationCategoryMappings: {
-    Fullstory: ['Analytics'],
-    'Actions Amplitude': ['Advertising'],
-  },
 })
 
 const analytics = new AnalyticsBrowser()
diff --git a/packages/consent/consent-tools-integration-tests/src/page-objects/base-page.ts b/packages/consent/consent-tools-integration-tests/src/page-objects/base-page.ts
index 569028cce..0da5da67d 100644
--- a/packages/consent/consent-tools-integration-tests/src/page-objects/base-page.ts
+++ b/packages/consent/consent-tools-integration-tests/src/page-objects/base-page.ts
@@ -36,13 +36,13 @@ export abstract class BasePage {
         {
           creationName: 'FullStory',
           consentSettings: {
-            categories: ['Analytics'],
+            categories: ['FooCategory2'],
           },
         },
         {
           creationName: 'Actions Amplitude',
           consentSettings: {
-            categories: ['Advertising'],
+            categories: ['FooCategory1'],
           },
         }
       )
diff --git a/packages/consent/consent-tools-integration-tests/src/tests/consent-tools-vanilla.test.ts b/packages/consent/consent-tools-integration-tests/src/tests/consent-tools-vanilla.test.ts
index 62c9c1154..2043ecdf0 100644
--- a/packages/consent/consent-tools-integration-tests/src/tests/consent-tools-vanilla.test.ts
+++ b/packages/consent/consent-tools-integration-tests/src/tests/consent-tools-vanilla.test.ts
@@ -1,7 +1,10 @@
+/**
+ * Tests targeting @segment/analytics-consent-tools
+ */
+
 import page from '../page-objects/consent-tools-vanilla'
 import { expect } from 'expect'
 
-// Verify that the consent tools wrapper is working as expected (no OneTrust)
 it('should stamp each event', async () => {
   await page.load()
 
@@ -11,8 +14,8 @@ it('should stamp each event', async () => {
 
   expect((ctx.event.context as any).consent).toEqual({
     categoryPreferences: {
-      Advertising: true,
-      Analytics: true,
+      FooCategory1: true,
+      FooCategory2: true,
     },
   })
 })
diff --git a/packages/consent/consent-tools-integration-tests/src/tests/onetrust.test.ts b/packages/consent/consent-tools-integration-tests/src/tests/onetrust.test.ts
index 40b73aa76..bc8d2227c 100644
--- a/packages/consent/consent-tools-integration-tests/src/tests/onetrust.test.ts
+++ b/packages/consent/consent-tools-integration-tests/src/tests/onetrust.test.ts
@@ -1,6 +1,7 @@
-// Verify that @segment/analytics-consent-wrapper-onetrust is working as expected
+/**
+ * Tests targeting @segment/analytics-consent-wrapper-onetrust
+ */
 
-/* eslint-disable @typescript-eslint/no-floating-promises */
 import page from '../page-objects/onetrust'
 import { expect } from 'expect'
 
diff --git a/packages/consent/consent-tools/README.md b/packages/consent/consent-tools/README.md
index a9fa8ac3d..7c851378c 100644
--- a/packages/consent/consent-tools/README.md
+++ b/packages/consent/consent-tools/README.md
@@ -7,23 +7,41 @@
 import { createWrapper, resolveWhen } from '@segment/analytics-consent-tools'
 
 export const withCMP = createWrapper({
+
+  // Do not attempt to load segment until this function returns / resolves
   shouldLoad: (ctx) => {
+    const CMP = await getCMP()
     await resolveWhen(
-      () => window.CMP !== undefined && !window.CMP.popUpVisible(),
+      () => !CMP.popUpVisible(),
       500
     )
 
+    // Optional -- for granular control of initialization
     if (noConsentNeeded) {
       ctx.abort({ loadSegmentNormally: true })
     } else if (allTrackingDisabled) {
       ctx.abort({ loadSegmentNormally: false })
     }
   },
+
   getCategories: () => {
-    // e.g. { Advertising: true, Functional: false }
-    return normalizeCategories(window.CMP.consentedCategories())
+    const CMP = await getCMP()
+    return normalizeCategories(CMP.consentedCategories()) // Expected format: { foo: true, bar: false }
+  },
+
+  registerOnConsentChanged: (setCategories) => {
+    const CMP = await getCMP()
+    CMP.onConsentChanged((event) => {
+      setCategories(normalizeCategories(event.detail))
+    })
   },
 })
+
+
+const getCMP = async () => {
+ await resolveWhen(() => window.CMP !== undefined, 500)
+ return window.CMP
+}
 ```
 
 ## Wrapper Usage API
@@ -36,9 +54,7 @@ import { AnalyticsBrowser } from '@segment/analytics-next'
 
 export const analytics = new AnalyticsBrowser()
 
-withCMP(analytics)
-
-analytics.load({
+withCMP(analytics).load({
   writeKey: '<MY_WRITE_KEY'>
 })
 
@@ -58,9 +74,7 @@ analytics.load({
 ```js
 import { withCMP } from './wrapper'
 
-withCMP(window.analytics)
-
-window.analytics.load('<MY_WRITE_KEY')
+withCMP(window.analytics).load('<MY_WRITE_KEY')
 ```
 
 ## Wrapper Examples
diff --git a/packages/consent/consent-wrapper-onetrust/README.md b/packages/consent/consent-wrapper-onetrust/README.md
index cd31350b7..8d317d69b 100644
--- a/packages/consent/consent-wrapper-onetrust/README.md
+++ b/packages/consent/consent-wrapper-onetrust/README.md
@@ -72,7 +72,7 @@ withOneTrust(analytics).load({ writeKey: '<MY_WRITE_KEY'> })
   ></script>
 
   <!-- Add OneTrust Consent Wrapper -->
-  <script src="https://cdn.jsdelivr.net/npm/@segment/analytics-consent-wrapper-onetrust@^0.2.0/dist/umd/analytics-onetrust.umd.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@segment/analytics-consent-wrapper-onetrust@latest/dist/umd/analytics-onetrust.umd.js"></script>
 
   <!--
     Add / Modify Segment Analytics Snippet

From c76698eb40313233706a8c0111fdcf8d6ea8b6d0 Mon Sep 17 00:00:00 2001
From: Seth Silesky <5115498+silesky@users.noreply.github.com>
Date: Wed, 20 Sep 2023 16:20:19 -0500
Subject: [PATCH 6/9] [docs] Update Consent README.md

---
 packages/consent/consent-tools/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/consent/consent-tools/README.md b/packages/consent/consent-tools/README.md
index 7c851378c..658c6803d 100644
--- a/packages/consent/consent-tools/README.md
+++ b/packages/consent/consent-tools/README.md
@@ -8,7 +8,7 @@ import { createWrapper, resolveWhen } from '@segment/analytics-consent-tools'
 
 export const withCMP = createWrapper({
 
-  // Do not attempt to load segment until this function returns / resolves
+  // Wrapper waits to load segment / get categories until this function returns / resolves
   shouldLoad: (ctx) => {
     const CMP = await getCMP()
     await resolveWhen(

From 03a0a9b3744b7f534601ad1d665f784d0ff13006 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 21 Sep 2023 12:15:28 -0500
Subject: [PATCH 7/9] Version Packages (#948)

---
 .changeset/clean-elephants-deny.md        |  5 -----
 .changeset/mean-apricots-hammer.md        |  5 -----
 packages/browser/CHANGELOG.md             | 10 ++++++++++
 packages/browser/package.json             |  2 +-
 packages/browser/src/generated/version.ts |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 .changeset/clean-elephants-deny.md
 delete mode 100644 .changeset/mean-apricots-hammer.md

diff --git a/.changeset/clean-elephants-deny.md b/.changeset/clean-elephants-deny.md
deleted file mode 100644
index c4e1fd79f..000000000
--- a/.changeset/clean-elephants-deny.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@segment/analytics-next': patch
----
-
-Fix regression where we no longer export UniversalStorage (used in destinations)
diff --git a/.changeset/mean-apricots-hammer.md b/.changeset/mean-apricots-hammer.md
deleted file mode 100644
index 3b2c1d7ff..000000000
--- a/.changeset/mean-apricots-hammer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@segment/analytics-next': minor
----
-
-Adds `globalAnalyticsKey` option for setting custom global window buffers
diff --git a/packages/browser/CHANGELOG.md b/packages/browser/CHANGELOG.md
index e0e2b4ffe..954808360 100644
--- a/packages/browser/CHANGELOG.md
+++ b/packages/browser/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @segment/analytics-next
 
+## 1.56.0
+
+### Minor Changes
+
+- [#928](https://github.com/segmentio/analytics-next/pull/928) [`7f4232c`](https://github.com/segmentio/analytics-next/commit/7f4232cbdb60a4475c565e5d262b25182e47baf4) Thanks [@oscb](https://github.com/oscb)! - Adds `globalAnalyticsKey` option for setting custom global window buffers
+
+### Patch Changes
+
+- [#949](https://github.com/segmentio/analytics-next/pull/949) [`fcf42f6`](https://github.com/segmentio/analytics-next/commit/fcf42f68b4226b55417bbaeb6305d33129ede96d) Thanks [@silesky](https://github.com/silesky)! - Fix regression where we no longer export UniversalStorage (used in destinations)
+
 ## 1.55.0
 
 ### Minor Changes
diff --git a/packages/browser/package.json b/packages/browser/package.json
index 015645423..e2df1c8fc 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@segment/analytics-next",
-  "version": "1.55.0",
+  "version": "1.56.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/segmentio/analytics-next",
diff --git a/packages/browser/src/generated/version.ts b/packages/browser/src/generated/version.ts
index 5acc3a383..3e0d2d55c 100644
--- a/packages/browser/src/generated/version.ts
+++ b/packages/browser/src/generated/version.ts
@@ -1,2 +1,2 @@
 // This file is generated.
-export const version = '1.55.0'
+export const version = '1.56.0'

From f5cdb824050c22a9aaa86a450b8f1f4a7f4fb144 Mon Sep 17 00:00:00 2001
From: dsjackins <danieljackins@gmail.com>
Date: Tue, 26 Sep 2023 12:22:24 -0600
Subject: [PATCH 8/9] Collect timezone and allow userAgentData to be overridden
 (#956)

Co-authored-by: Daniel Jackins <djackins@twilio.com>
---
 .changeset/cool-peaches-pay.md                |  5 +++
 .../page-enrichment/__tests__/index.test.ts   | 38 +++++++++++++++++++
 .../src/plugins/page-enrichment/index.ts      | 19 +++++++++-
 .../plugins/segmentio/__tests__/index.test.ts | 36 ------------------
 .../browser/src/plugins/segmentio/index.ts    | 19 +---------
 5 files changed, 63 insertions(+), 54 deletions(-)
 create mode 100644 .changeset/cool-peaches-pay.md

diff --git a/.changeset/cool-peaches-pay.md b/.changeset/cool-peaches-pay.md
new file mode 100644
index 000000000..3ad96cd01
--- /dev/null
+++ b/.changeset/cool-peaches-pay.md
@@ -0,0 +1,5 @@
+---
+'@segment/analytics-next': minor
+---
+
+Set timezone and allow userAgentData to be overridden
diff --git a/packages/browser/src/plugins/page-enrichment/__tests__/index.test.ts b/packages/browser/src/plugins/page-enrichment/__tests__/index.test.ts
index 90723cfcd..e0bee7514 100644
--- a/packages/browser/src/plugins/page-enrichment/__tests__/index.test.ts
+++ b/packages/browser/src/plugins/page-enrichment/__tests__/index.test.ts
@@ -6,6 +6,11 @@ import { pick } from '../../../lib/pick'
 import { SegmentioSettings } from '../../segmentio'
 import { version } from '../../../generated/version'
 import { CoreExtraContext } from '@segment/analytics-core'
+import { UADataValues } from '../../../lib/client-hints/interfaces'
+import {
+  highEntropyTestData,
+  lowEntropyTestData,
+} from '../../../test-helpers/fixtures/client-hints'
 
 let ajs: Analytics
 
@@ -262,6 +267,29 @@ describe('pageDefaults', () => {
 describe('Other visitor metadata', () => {
   let options: SegmentioSettings
   let analytics: Analytics
+  ;(window.navigator as any).userAgentData = {
+    ...lowEntropyTestData,
+    getHighEntropyValues: jest
+      .fn()
+      .mockImplementation((hints: string[]): Promise<UADataValues> => {
+        let result = {}
+        Object.entries(highEntropyTestData).forEach(([k, v]) => {
+          if (hints.includes(k)) {
+            result = {
+              ...result,
+              [k]: v,
+            }
+          }
+        })
+        return Promise.resolve({
+          ...lowEntropyTestData,
+          ...result,
+        })
+      }),
+    toJSON: jest.fn(() => {
+      return lowEntropyTestData
+    }),
+  }
 
   const amendSearchParams = (search?: any): CoreExtraContext => ({
     page: { search },
@@ -283,6 +311,11 @@ describe('Other visitor metadata', () => {
     }
   })
 
+  it('should add .timezone', async () => {
+    const ctx = await analytics.track('test')
+    assert(typeof ctx.event.context?.timezone === 'string')
+  })
+
   it('should add .library', async () => {
     const ctx = await analytics.track('test')
     assert(ctx.event.context?.library)
@@ -313,6 +346,11 @@ describe('Other visitor metadata', () => {
     assert(userAgent1 === userAgent2)
   })
 
+  it('should add .userAgentData when available', async () => {
+    const ctx = await analytics.track('event')
+    expect(ctx.event.context?.userAgentData).toEqual(lowEntropyTestData)
+  })
+
   it('should add .locale', async () => {
     const ctx = await analytics.track('test')
     assert(ctx.event.context?.locale === navigator.language)
diff --git a/packages/browser/src/plugins/page-enrichment/index.ts b/packages/browser/src/plugins/page-enrichment/index.ts
index 91cf1162f..b113dc337 100644
--- a/packages/browser/src/plugins/page-enrichment/index.ts
+++ b/packages/browser/src/plugins/page-enrichment/index.ts
@@ -10,6 +10,8 @@ import { tld } from '../../core/user/tld'
 import { gracefulDecodeURIComponent } from '../../core/query-string/gracefulDecodeURIComponent'
 import { CookieStorage, UniversalStorage } from '../../core/storage'
 import { Analytics } from '../../core/analytics'
+import { clientHints } from '../../lib/client-hints'
+import { UADataValues } from '../../lib/client-hints/interfaces'
 
 interface PageDefault {
   [key: string]: unknown
@@ -174,13 +176,21 @@ function referrerId(
 
 class PageEnrichmentPlugin implements Plugin {
   private instance!: Analytics
+  private userAgentData: UADataValues | undefined
 
   name = 'Page Enrichment'
   type: PluginType = 'before'
   version = '0.1.0'
   isLoaded = () => true
-  load = (_ctx: Context, instance: Analytics) => {
+  load = async (_ctx: Context, instance: Analytics) => {
     this.instance = instance
+    try {
+      this.userAgentData = await clientHints(
+        this.instance.options.highEntropyValuesClientHints
+      )
+    } catch (_) {
+      // if client hints API doesn't return anything leave undefined
+    }
     return Promise.resolve()
   }
 
@@ -213,6 +223,7 @@ class PageEnrichmentPlugin implements Plugin {
     const query: string = evtCtx.page.search || ''
 
     evtCtx.userAgent = navigator.userAgent
+    evtCtx.userAgentData = this.userAgentData
 
     // @ts-ignore
     const locale = navigator.userLanguage || navigator.language
@@ -241,6 +252,12 @@ class PageEnrichmentPlugin implements Plugin {
       this.instance.options.disableClientPersistence ?? false
     )
 
+    try {
+      evtCtx.timezone = Intl.DateTimeFormat().resolvedOptions().timeZone
+    } catch (_) {
+      // If browser doesn't have support leave timezone undefined
+    }
+
     return ctx
   }
 
diff --git a/packages/browser/src/plugins/segmentio/__tests__/index.test.ts b/packages/browser/src/plugins/segmentio/__tests__/index.test.ts
index d9858cb57..fdb9be1d8 100644
--- a/packages/browser/src/plugins/segmentio/__tests__/index.test.ts
+++ b/packages/browser/src/plugins/segmentio/__tests__/index.test.ts
@@ -5,11 +5,6 @@ import { Analytics } from '../../../core/analytics'
 import { Plugin } from '../../../core/plugin'
 import { pageEnrichment } from '../../page-enrichment'
 import cookie from 'js-cookie'
-import { UADataValues } from '../../../lib/client-hints/interfaces'
-import {
-  highEntropyTestData,
-  lowEntropyTestData,
-} from '../../../test-helpers/fixtures/client-hints'
 
 jest.mock('unfetch', () => {
   return jest.fn()
@@ -24,29 +19,6 @@ describe('Segment.io', () => {
   beforeEach(async () => {
     jest.resetAllMocks()
     jest.restoreAllMocks()
-    ;(window.navigator as any).userAgentData = {
-      ...lowEntropyTestData,
-      getHighEntropyValues: jest
-        .fn()
-        .mockImplementation((hints: string[]): Promise<UADataValues> => {
-          let result = {}
-          Object.entries(highEntropyTestData).forEach(([k, v]) => {
-            if (hints.includes(k)) {
-              result = {
-                ...result,
-                [k]: v,
-              }
-            }
-          })
-          return Promise.resolve({
-            ...lowEntropyTestData,
-            ...result,
-          })
-        }),
-      toJSON: jest.fn(() => {
-        return lowEntropyTestData
-      }),
-    }
 
     options = { apiKey: 'foo' }
     analytics = new Analytics({ writeKey: options.apiKey })
@@ -199,14 +171,6 @@ describe('Segment.io', () => {
       assert(body.traits == null)
       assert(body.timestamp)
     })
-
-    it('should add userAgentData when available', async () => {
-      await analytics.track('event')
-      const [_, params] = spyMock.mock.calls[0]
-      const body = JSON.parse(params.body)
-
-      expect(body.context?.userAgentData).toEqual(lowEntropyTestData)
-    })
   })
 
   describe('#group', () => {
diff --git a/packages/browser/src/plugins/segmentio/index.ts b/packages/browser/src/plugins/segmentio/index.ts
index 2dc8b2967..38f012d74 100644
--- a/packages/browser/src/plugins/segmentio/index.ts
+++ b/packages/browser/src/plugins/segmentio/index.ts
@@ -12,8 +12,6 @@ import standard, { StandardDispatcherConfig } from './fetch-dispatcher'
 import { normalize } from './normalize'
 import { scheduleFlush } from './schedule-flush'
 import { SEGMENT_API_HOST } from '../../core/constants'
-import { clientHints } from '../../lib/client-hints'
-import { UADataValues } from '../../lib/client-hints/interfaces'
 
 type DeliveryStrategy =
   | {
@@ -52,11 +50,11 @@ function onAlias(analytics: Analytics, json: JSON): JSON {
   return json
 }
 
-export async function segmentio(
+export function segmentio(
   analytics: Analytics,
   settings?: SegmentioSettings,
   integrations?: LegacySettings['integrations']
-): Promise<Plugin> {
+): Plugin {
   // Attach `pagehide` before buffer is created so that inflight events are added
   // to the buffer before the buffer persists events in its own `pagehide` handler.
   window.addEventListener('pagehide', () => {
@@ -86,15 +84,6 @@ export async function segmentio(
       ? batch(apiHost, deliveryStrategy.config)
       : standard(deliveryStrategy?.config as StandardDispatcherConfig)
 
-  let userAgentData: UADataValues | undefined
-  try {
-    userAgentData = await clientHints(
-      analytics.options.highEntropyValuesClientHints
-    )
-  } catch {
-    userAgentData = undefined
-  }
-
   async function send(ctx: Context): Promise<Context> {
     if (isOffline()) {
       buffer.push(ctx)
@@ -107,10 +96,6 @@ export async function segmentio(
 
     const path = ctx.event.type.charAt(0)
 
-    if (userAgentData && ctx.event.context) {
-      ctx.event.context.userAgentData = userAgentData
-    }
-
     let json = toFacade(ctx.event).json()
 
     if (ctx.event.type === 'track') {

From 32da78b922d6ffe030585dc7ba1b271b78d5f6dd Mon Sep 17 00:00:00 2001
From: Seth Silesky <5115498+silesky@users.noreply.github.com>
Date: Fri, 29 Sep 2023 12:10:08 -0500
Subject: [PATCH 9/9] Consent: Support older browsers like ie11 (#959)

---
 .changeset/forty-toes-stare.md                |   6 +
 package.json                                  |   2 +-
 packages/config-webpack/package.json          |   1 +
 .../config-webpack/webpack.config.common.js   |   6 +-
 packages/consent/consent-tools/tsconfig.json  |   2 +-
 .../consent-wrapper-onetrust/README.md        |   6 +-
 turbo.json                                    |   4 +-
 yarn.lock                                     | 152 +++++-------------
 8 files changed, 62 insertions(+), 117 deletions(-)
 create mode 100644 .changeset/forty-toes-stare.md

diff --git a/.changeset/forty-toes-stare.md b/.changeset/forty-toes-stare.md
new file mode 100644
index 000000000..24fc716c7
--- /dev/null
+++ b/.changeset/forty-toes-stare.md
@@ -0,0 +1,6 @@
+---
+'@segment/analytics-consent-tools': patch
+'@segment/analytics-consent-wrapper-onetrust': patch
+---
+
+Support older browsers
diff --git a/package.json b/package.json
index 64dee97c1..9d92d092f 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "prettier": "^2.6.2",
     "ts-jest": "^28.0.4",
     "ts-node": "^10.8.0",
-    "turbo": "^1.3.1",
+    "turbo": "^1.10.14",
     "typescript": "^4.7.0",
     "webpack": "^5.76.0",
     "webpack-dev-server": "^4.15.1"
diff --git a/packages/config-webpack/package.json b/packages/config-webpack/package.json
index c243c7314..fabafc794 100644
--- a/packages/config-webpack/package.json
+++ b/packages/config-webpack/package.json
@@ -11,6 +11,7 @@
     "@types/circular-dependency-plugin": "^5",
     "babel-loader": "^8.0.0",
     "circular-dependency-plugin": "^5.2.2",
+    "ecma-version-validator-webpack-plugin": "^1.2.1",
     "terser-webpack-plugin": "^5.1.4",
     "webpack": "^5.76.0",
     "webpack-cli": "^4.8.0",
diff --git a/packages/config-webpack/webpack.config.common.js b/packages/config-webpack/webpack.config.common.js
index 4710464c2..d69005c4d 100644
--- a/packages/config-webpack/webpack.config.common.js
+++ b/packages/config-webpack/webpack.config.common.js
@@ -1,5 +1,8 @@
 const TerserPlugin = require('terser-webpack-plugin')
 const CircularDependencyPlugin = require('circular-dependency-plugin')
+const {
+  ECMAVersionValidatorPlugin,
+} = require('ecma-version-validator-webpack-plugin')
 
 const isProd = process.env.NODE_ENV === 'production'
 const isWatch = process.env.WATCH === 'true'
@@ -15,6 +18,7 @@ module.exports = {
   devtool: 'source-map',
   stats: isWatch ? 'errors-warnings' : 'normal',
   mode: isProd ? 'production' : 'development',
+  target: ['web', 'es5'], // target es5 for ie11 support (generates module boilerplate in es5)
   module: {
     rules: [
       {
@@ -37,7 +41,6 @@ module.exports = {
             },
           },
         ],
-        exclude: /node_modules/,
       },
     ],
   },
@@ -67,5 +70,6 @@ module.exports = {
     new CircularDependencyPlugin({
       failOnError: true,
     }),
+    new ECMAVersionValidatorPlugin({ ecmaVersion: 5 }), // ensure our js bundle only contains syntax supported in ie11. This does not check polyfills.
   ],
 }
diff --git a/packages/consent/consent-tools/tsconfig.json b/packages/consent/consent-tools/tsconfig.json
index fb6cefa38..1af879200 100644
--- a/packages/consent/consent-tools/tsconfig.json
+++ b/packages/consent/consent-tools/tsconfig.json
@@ -3,7 +3,7 @@
   "exclude": ["node_modules", "dist"],
   "compilerOptions": {
     "module": "ESNext", // es6 modules
-    "target": "ESNext", // assume that consumers will be using webpack, so don't down-compile
+    "target": "ES2020", // don't down-compile *too much* -- if users are using webpack, they can always transpile this library themselves
     "lib": ["ES2020", "DOM", "DOM.Iterable"], // assume that consumers will be polyfilling at least down to es2020
     "moduleResolution": "node",
     "resolveJsonModule": true
diff --git a/packages/consent/consent-wrapper-onetrust/README.md b/packages/consent/consent-wrapper-onetrust/README.md
index 8d317d69b..847c1785a 100644
--- a/packages/consent/consent-wrapper-onetrust/README.md
+++ b/packages/consent/consent-wrapper-onetrust/README.md
@@ -101,13 +101,13 @@ withOneTrust(analytics).load({ writeKey: '<MY_WRITE_KEY'> })
 
 - We build three versions of the library:
 
-1. `cjs` (CommonJS modules) - for library users
-2. `esm` (es6 modules) - for library users
+1. `cjs` (CommonJS modules) - for npm library users
+2. `esm` (es6 modules) - for npm library users
 3. `umd` (bundle) - for snippet users (typically)
 
 ### Browser Support
 
-- `cjs/esm` - ONLY support modern JS syntax. We expect our typical `npm install` users to employ something like babel if they need legacy browser support.
+- `cjs/esm` - Support modern JS syntax (ES2020). These are our npm library users, so we expect them to transpile this module themselves using something like babel/webpack if they need extra legacy browser support.
 
 - `umd` - Support back to IE11, but **do not** polyfill . See our docs on [supported browsers](https://segment.com/docs/connections/sources/catalog/libraries/website/javascript/supported-browsers).
 
diff --git a/turbo.json b/turbo.json
index aa1a3925b..f4c96f090 100644
--- a/turbo.json
+++ b/turbo.json
@@ -5,9 +5,11 @@
       "dependsOn": ["^build"],
       "inputs": [
         "**/tsconfig*.json",
+        "**/babel.config*",
+        "**/webpack.config*",
         "**/*.ts",
         "**/*.tsx",
-        ":!**/__tests__/**"
+        "!**/__tests__/**"
       ],
       "outputs": ["**/dist/**", ".next/**"]
     },
diff --git a/yarn.lock b/yarn.lock
index 091772885..11d7a833e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2507,6 +2507,7 @@ __metadata:
     "@types/circular-dependency-plugin": ^5
     babel-loader: ^8.0.0
     circular-dependency-plugin: ^5.2.2
+    ecma-version-validator-webpack-plugin: ^1.2.1
     terser-webpack-plugin: ^5.1.4
     webpack: ^5.76.0
     webpack-cli: ^4.8.0
@@ -6811,7 +6812,7 @@ __metadata:
     prettier: ^2.6.2
     ts-jest: ^28.0.4
     ts-node: ^10.8.0
-    turbo: ^1.3.1
+    turbo: ^1.10.14
     typescript: ^4.7.0
     webpack: ^5.76.0
     webpack-dev-server: ^4.15.1
@@ -9707,6 +9708,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ecma-version-validator-webpack-plugin@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "ecma-version-validator-webpack-plugin@npm:1.2.1"
+  dependencies:
+    acorn: ^8.7.0
+  peerDependencies:
+    webpack: ^4.40.0 || ^5.0.0
+  checksum: 9a0f6d9beb600f1af054f65a52790c3784d5d4c19cb10b9ae7446682613349ade952b355cca0e60b45616e66ce9b1914d183a909ce136bb05b47f364dd6bfabf
+  languageName: node
+  linkType: hard
+
 "edge-paths@npm:^3.0.5":
   version: 3.0.5
   resolution: "edge-paths@npm:3.0.5"
@@ -19865,154 +19877,74 @@ __metadata:
   languageName: node
   linkType: hard
 
-"turbo-android-arm64@npm:1.3.1":
-  version: 1.3.1
-  resolution: "turbo-android-arm64@npm:1.3.1"
-  conditions: os=android & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"turbo-darwin-64@npm:1.3.1":
-  version: 1.3.1
-  resolution: "turbo-darwin-64@npm:1.3.1"
+"turbo-darwin-64@npm:1.10.14":
+  version: 1.10.14
+  resolution: "turbo-darwin-64@npm:1.10.14"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-darwin-arm64@npm:1.3.1":
-  version: 1.3.1
-  resolution: "turbo-darwin-arm64@npm:1.3.1"
+"turbo-darwin-arm64@npm:1.10.14":
+  version: 1.10.14
+  resolution: "turbo-darwin-arm64@npm:1.10.14"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo-freebsd-64@npm:1.3.1":
-  version: 1.3.1
-  resolution: "turbo-freebsd-64@npm:1.3.1"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"turbo-freebsd-arm64@npm:1.3.1":
-  version: 1.3.1
-  resolution: "turbo-freebsd-arm64@npm:1.3.1"
-  conditions: os=freebsd & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"turbo-linux-32@npm:1.3.1":
-  version: 1.3.1
-  resolution: "turbo-linux-32@npm:1.3.1"
-  conditions: os=linux & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"turbo-linux-64@npm:1.3.1":
-  version: 1.3.1
-  resolution: "turbo-linux-64@npm:1.3.1"
+"turbo-linux-64@npm:1.10.14":
+  version: 1.10.14
+  resolution: "turbo-linux-64@npm:1.10.14"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-linux-arm64@npm:1.3.1":
-  version: 1.3.1
-  resolution: "turbo-linux-arm64@npm:1.3.1"
+"turbo-linux-arm64@npm:1.10.14":
+  version: 1.10.14
+  resolution: "turbo-linux-arm64@npm:1.10.14"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo-linux-arm@npm:1.3.1":
-  version: 1.3.1
-  resolution: "turbo-linux-arm@npm:1.3.1"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
-"turbo-linux-mips64le@npm:1.3.1":
-  version: 1.3.1
-  resolution: "turbo-linux-mips64le@npm:1.3.1"
-  conditions: os=linux & cpu=mips64el
-  languageName: node
-  linkType: hard
-
-"turbo-linux-ppc64le@npm:1.3.1":
-  version: 1.3.1
-  resolution: "turbo-linux-ppc64le@npm:1.3.1"
-  conditions: os=linux & cpu=ppc64
-  languageName: node
-  linkType: hard
-
-"turbo-windows-32@npm:1.3.1":
-  version: 1.3.1
-  resolution: "turbo-windows-32@npm:1.3.1"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"turbo-windows-64@npm:1.3.1":
-  version: 1.3.1
-  resolution: "turbo-windows-64@npm:1.3.1"
+"turbo-windows-64@npm:1.10.14":
+  version: 1.10.14
+  resolution: "turbo-windows-64@npm:1.10.14"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-windows-arm64@npm:1.3.1":
-  version: 1.3.1
-  resolution: "turbo-windows-arm64@npm:1.3.1"
+"turbo-windows-arm64@npm:1.10.14":
+  version: 1.10.14
+  resolution: "turbo-windows-arm64@npm:1.10.14"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "turbo@npm:1.3.1"
-  dependencies:
-    turbo-android-arm64: 1.3.1
-    turbo-darwin-64: 1.3.1
-    turbo-darwin-arm64: 1.3.1
-    turbo-freebsd-64: 1.3.1
-    turbo-freebsd-arm64: 1.3.1
-    turbo-linux-32: 1.3.1
-    turbo-linux-64: 1.3.1
-    turbo-linux-arm: 1.3.1
-    turbo-linux-arm64: 1.3.1
-    turbo-linux-mips64le: 1.3.1
-    turbo-linux-ppc64le: 1.3.1
-    turbo-windows-32: 1.3.1
-    turbo-windows-64: 1.3.1
-    turbo-windows-arm64: 1.3.1
+"turbo@npm:^1.10.14":
+  version: 1.10.14
+  resolution: "turbo@npm:1.10.14"
+  dependencies:
+    turbo-darwin-64: 1.10.14
+    turbo-darwin-arm64: 1.10.14
+    turbo-linux-64: 1.10.14
+    turbo-linux-arm64: 1.10.14
+    turbo-windows-64: 1.10.14
+    turbo-windows-arm64: 1.10.14
   dependenciesMeta:
-    turbo-android-arm64:
-      optional: true
     turbo-darwin-64:
       optional: true
     turbo-darwin-arm64:
       optional: true
-    turbo-freebsd-64:
-      optional: true
-    turbo-freebsd-arm64:
-      optional: true
-    turbo-linux-32:
-      optional: true
     turbo-linux-64:
       optional: true
-    turbo-linux-arm:
-      optional: true
     turbo-linux-arm64:
       optional: true
-    turbo-linux-mips64le:
-      optional: true
-    turbo-linux-ppc64le:
-      optional: true
-    turbo-windows-32:
-      optional: true
     turbo-windows-64:
       optional: true
     turbo-windows-arm64:
       optional: true
   bin:
     turbo: bin/turbo
-  checksum: fced49081f2c64aaf93a2499edb057bb05d30bd2074b9652610f939c9037869501fcc50e7ad05a48cec4a8b9d344cc1c4ea505edd45fe2f9639fb138fa55182b
+  checksum: 219d245bb5cc32a9f76b136b81e86e179228d93a44cab4df3e3d487a55dd2688b5b85f4d585b66568ac53166145352399dd2d7ed0cd47f1aae63d08beb814ebb
   languageName: node
   linkType: hard