Merge branch 'main' into devin/1773165219-sdk-2009-server-testhook-migrations

Author: joker23

.eslintignore

@@ -0,0 +1,2 @@
+# Package-level lint handles this via packages/sdk/react/.eslintrc.cjs overrides.
+packages/sdk/react/contract-tests/

.github/workflows/browser.yml

@@ -106,7 +106,7 @@ jobs:
           sleep 5  # Give the browser time to initialize and connect via WebSocket
 
       - name: Run contract tests
-        uses: launchdarkly/gh-actions/actions/contract-tests@5adb11fd6953e1bc35d9cf1fc1b4374c464e3a8b
+        uses: launchdarkly/gh-actions/actions/contract-tests@1a3dc56945c8e87bc952119b055f9481b4d642b0
         with:
           test_service_port: 8000
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/electron.yaml

@@ -66,7 +66,7 @@ jobs:
           done
 
       - name: Run contract tests
-        uses: launchdarkly/gh-actions/actions/contract-tests@5adb11fd6953e1bc35d9cf1fc1b4374c464e3a8b
+        uses: launchdarkly/gh-actions/actions/contract-tests@1a3dc56945c8e87bc952119b055f9481b4d642b0
         with:
           test_service_port: 8000
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/react-nightly.yaml

@@ -0,0 +1,21 @@
+name: sdk/react nightly
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  run-example:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        with:
+          node-version: 24
+      - uses: ./actions/run-example
+        with:
+          workspace_name: '@internal/react-sdk-example-client-only'
+          aws_assume_role: ${{ vars.AWS_ROLE_ARN }}
+          before_test: 'yarn workspace @internal/react-sdk-example-client-only playwright install --with-deps chromium'

.github/workflows/react.yaml

@@ -71,7 +71,7 @@ jobs:
           done
           sleep 5
       - name: Run contract tests
-        uses: launchdarkly/gh-actions/actions/contract-tests@5adb11fd6953e1bc35d9cf1fc1b4374c464e3a8b
+        uses: launchdarkly/gh-actions/actions/contract-tests@1a3dc56945c8e87bc952119b055f9481b4d642b0
         with:
           test_service_port: 8000
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -82,3 +82,20 @@ jobs:
           [ -f /tmp/browser.pid ] && kill $(cat /tmp/browser.pid) || true
           [ -f /tmp/entity.pid ] && kill $(cat /tmp/entity.pid) || true
           [ -f /tmp/adapter.pid ] && kill $(cat /tmp/adapter.pid) || true
+
+  run-example:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        with:
+          node-version: 24
+      - uses: ./actions/run-example
+        with:
+          workspace_name: '@internal/react-sdk-example-client-only'
+          aws_assume_role: ${{ vars.AWS_ROLE_ARN }}
+          before_test: 'yarn workspace @internal/react-sdk-example-client-only playwright install --with-deps chromium'
+
+# TODO: Add contract tests

.github/workflows/shopify-oxygen.yml

@@ -34,7 +34,7 @@ jobs:
         run: yarn workspace @launchdarkly/shopify-oxygen-contract-tests build
       - name: Launch the test service in the background
         run: yarn workspace @launchdarkly/shopify-oxygen-contract-tests start &> /dev/null &
-      - uses: launchdarkly/gh-actions/actions/contract-tests@5adb11fd6953e1bc35d9cf1fc1b4374c464e3a8b
+      - uses: launchdarkly/gh-actions/actions/contract-tests@1a3dc56945c8e87bc952119b055f9481b4d642b0
         with:
           test_service_port: 8000
           token: ${{ secrets.GITHUB_TOKEN }}

actions/run-example/action.yml

@@ -0,0 +1,44 @@
+# Composite action for running an example app e2e test.
+# Note: id-token: write permission must be declared on the calling job.
+name: Run Example App
+inputs:
+  workspace_name:
+    description: 'Yarn workspace name of the example app, e.g. @internal/react-sdk-example-client-only'
+    required: true
+  aws_assume_role:
+    description: 'AWS OIDC role ARN used to fetch secrets from SSM'
+    required: true
+  before_test:
+    description: 'Shell commands to run before the e2e test step (e.g. install Playwright browsers)'
+    default: ''
+runs:
+  using: composite
+  steps:
+    - name: Install dependencies
+      shell: bash
+      run: yarn workspaces focus ${{ inputs.workspace_name }}
+
+    - uses: launchdarkly/gh-actions/actions/release-secrets@1a3dc56945c8e87bc952119b055f9481b4d642b0
+      name: 'Get the client-side SDK key'
+      with:
+        aws_assume_role: ${{ inputs.aws_assume_role }}
+        ssm_parameter_pairs: '/sdk/common/hello-apps/client-key = LAUNCHDARKLY_CLIENT_SIDE_ID'
+
+    - uses: launchdarkly/gh-actions/actions/release-secrets@1a3dc56945c8e87bc952119b055f9481b4d642b0
+      name: 'Get the test feature flag key'
+      with:
+        aws_assume_role: ${{ inputs.aws_assume_role }}
+        ssm_parameter_pairs: '/sdk/common/hello-apps/boolean-flag-key = LAUNCHDARKLY_FLAG_KEY'
+
+    - name: Build SDK dependencies
+      shell: bash
+      run: yarn workspaces foreach -pR --topological-dev --from '${{ inputs.workspace_name }}' run build
+
+    - name: Before test hook
+      shell: bash
+      if: ${{ inputs.before_test != '' }}
+      run: ${{ inputs.before_test }}
+
+    - name: Run e2e tests
+      shell: bash
+      run: yarn workspace ${{ inputs.workspace_name }} test

packages/sdk/browser/__tests__/options.test.ts

@@ -90,3 +90,19 @@ it('does not override common config flushInterval if it is set', () => {
   const result = filterToBaseOptionsWithDefaults(opts);
   expect(result.flushInterval).toEqual(15);
 });
+
+it('passes dataSystem through to base options without stripping', () => {
+  const opts = {
+    dataSystem: { initialConnectionMode: 'polling' },
+  } as any;
+  const result = filterToBaseOptionsWithDefaults(opts);
+  expect((result as any).dataSystem).toEqual({ initialConnectionMode: 'polling' });
+});
+
+it('passes an empty dataSystem through to base options', () => {
+  const opts = {
+    dataSystem: {},
+  } as any;
+  const result = filterToBaseOptionsWithDefaults(opts);
+  expect((result as any).dataSystem).toEqual({});
+});

packages/sdk/browser/src/BrowserClient.ts

@@ -1,6 +1,7 @@
 import {
   AutoEnvAttributes,
   BasicLogger,
+  BROWSER_DATA_SYSTEM_DEFAULTS,
   browserFdv1Endpoints,
   Configuration,
   FlagManager,
@@ -110,6 +111,7 @@ class BrowserClientImpl extends LDClientImpl {
         includeAuthorizationHeader: false,
         highTimeoutThreshold: 5,
         userAgentHeaderName: 'x-launchdarkly-user-agent',
+        dataSystemDefaults: BROWSER_DATA_SYSTEM_DEFAULTS,
         trackEventModifier: (event: internal.InputCustomEvent) =>
           new internal.InputCustomEvent(
             event.context,

packages/sdk/react-native/src/ReactNativeLDClient.ts

@@ -11,6 +11,7 @@ import {
   LDEmitter,
   LDHeaders,
   LDPluginEnvironmentMetadata,
+  MOBILE_DATA_SYSTEM_DEFAULTS,
   mobileFdv1Endpoints,
 } from '@launchdarkly/js-client-sdk-common';
 
@@ -65,6 +66,7 @@ export default class ReactNativeLDClient extends LDClientImpl {
       getImplementationHooks: (_environmentMetadata: LDPluginEnvironmentMetadata) =>
         internal.safeGetHooks(logger, _environmentMetadata, validatedRnOptions.plugins),
       credentialType: 'mobileKey',
+      dataSystemDefaults: MOBILE_DATA_SYSTEM_DEFAULTS,
     };
 
     const platform = createPlatform(logger, options, validatedRnOptions.storage);