Merge pull request #1339 from OneSignal/fg/optimize-build-2

SDK-2870: Improve Web SDK Bundle Sizes

Author: fadi-george

__test__/support/environment/TestContext.ts

@@ -1,18 +1,20 @@
 import deepmerge from 'deepmerge';
-import ConfigManager from '../../../src/page/managers/ConfigManager';
-import { type RecursivePartial } from '../../../src/shared/context/Utils';
+import { DelayedPromptType } from 'src/shared/prompts/constants';
 import {
+  getMergedConfig,
   type AppConfig,
   type AppUserConfig,
-  ConfigIntegrationKind,
   type ConfigIntegrationKindValue,
+  type ServerAppConfig,
+} from '../../../src/shared/config';
+import {
+  ConfigIntegrationKind,
   NotificationClickActionBehavior,
   NotificationClickMatchBehavior,
-  type ServerAppConfig,
-} from '../../../src/shared/models/AppConfig';
-import { DelayedPromptType } from '../../../src/shared/models/Prompts';
+} from '../../../src/shared/config/constants';
+import type { RecursivePartial } from '../../../src/shared/context/Utils';
 import { APP_ID } from '../constants';
-import { type TestEnvironmentConfig } from './TestEnvironment';
+import type { TestEnvironmentConfig } from './TestEnvironment';
 
 export default class TestContext {
   static getFakeServerAppConfig(
@@ -462,11 +464,7 @@ export default class TestContext {
       config.integration || ConfigIntegrationKind.Custom,
       config.overrideServerConfig,
     );
-    const configManager = new ConfigManager();
-    const fakeMergedConfig = configManager.getMergedConfig(
-      fakeUserConfig,
-      fakeServerConfig,
-    );
+    const fakeMergedConfig = getMergedConfig(fakeUserConfig, fakeServerConfig);
     return fakeMergedConfig;
   }
 }

__test__/support/environment/TestEnvironment.ts

@@ -1,13 +1,13 @@
-import { type RecursivePartial } from '../../../src/shared/context/Utils';
+import type {
+  AppUserConfig,
+  ConfigIntegrationKindValue,
+  ServerAppConfig,
+} from '../../../src/shared/config';
+import type { RecursivePartial } from '../../../src/shared/context/Utils';
 import MainHelper from '../../../src/shared/helpers/MainHelper';
-import {
-  type AppUserConfig,
-  type ConfigIntegrationKindValue,
-  type ServerAppConfig,
-} from '../../../src/shared/models/AppConfig';
 import { DUMMY_ONESIGNAL_ID, DUMMY_PUSH_TOKEN } from '../constants';
 import { generateNewSubscription } from '../helpers/core';
-import type BrowserUserAgent from '../models/BrowserUserAgent';
+import BrowserUserAgent from '../models/BrowserUserAgent';
 import {
   initOSGlobals,
   mockUserAgent,

__test__/support/helpers/configHelper.ts

@@ -1,9 +1,9 @@
-import { ConfigHelper } from '../../../src/shared/helpers/ConfigHelper';
 import {
-  type AppConfig,
   ConfigIntegrationKind,
+  getServerAppConfig,
+  type AppConfig,
   type ServerAppConfig,
-} from '../../../src/shared/models/AppConfig';
+} from 'src/shared/config';
 import TestContext from '../environment/TestContext';
 
 /**
@@ -25,5 +25,5 @@ export async function getFinalAppConfig(
       resolve(fakeServerConfig);
     });
 
-  return await ConfigHelper.getAppConfig(fakeUserConfig, getFakeServerConfig);
+  return await getServerAppConfig(fakeUserConfig, getFakeServerConfig);
 }

__test__/support/helpers/requests.ts

@@ -1,6 +1,6 @@
 import { http, HttpResponse } from 'msw';
-import { type ISubscription, type IUserProperties } from 'src/core/types/api';
-import { ConfigIntegrationKind } from 'src/shared/models/AppConfig';
+import type { ISubscription, IUserProperties } from 'src/core/types/api';
+import { ConfigIntegrationKind } from 'src/shared/config';
 import {
   APP_ID,
   DUMMY_ONESIGNAL_ID,