Minor refactors and size limit bump

Author: zikaari

packages/browser/package.json

@@ -43,7 +43,7 @@
   "size-limit": [
     {
       "path": "dist/umd/index.js",
-      "limit": "27.2 KB"
+      "limit": "27.3 KB"
     }
   ],
   "dependencies": {

packages/browser/src/browser/__tests__/integration.test.ts

@@ -19,7 +19,7 @@ import { PriorityQueue } from '../../lib/priority-queue'
 import { getCDN, setGlobalCDNUrl } from '../../lib/parse-cdn'
 import { clearAjsBrowserStorage } from '../../test-helpers/browser-storage'
 import { ActionDestination } from '@/plugins/remote-loader'
-import { LegacyIntegrationBuilder } from '../../plugins/ajs-destination/types'
+import { ClassicIntegrationBuilder } from '../../plugins/ajs-destination/types'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let fetchCalls: Array<any>[] = []
@@ -1049,7 +1049,9 @@ describe('.Integrations', () => {
     const [analytics] = await AnalyticsBrowser.load(
       {
         writeKey,
-        classicIntegrations: [amplitude as unknown as LegacyIntegrationBuilder],
+        classicIntegrations: [
+          amplitude as unknown as ClassicIntegrationBuilder,
+        ],
       },
       {
         integrations: {
@@ -1077,7 +1079,7 @@ describe('.Integrations', () => {
 
     const [analytics] = await AnalyticsBrowser.load({
       writeKey,
-      classicIntegrations: [amplitude as unknown as LegacyIntegrationBuilder],
+      classicIntegrations: [amplitude as unknown as ClassicIntegrationBuilder],
     })
 
     await analytics.ready()

packages/browser/src/browser/index.ts

@@ -24,7 +24,7 @@ import {
 } from '../core/buffer'
 import { popSnippetWindowBuffer } from '../core/buffer/snippet'
 import { inspectorHost } from '../core/inspector'
-import { LegacyIntegrationSource } from '../plugins/ajs-destination/types'
+import { ClassicIntegrationSource } from '../plugins/ajs-destination/types'
 
 export interface LegacyIntegrationConfiguration {
   /* @deprecated - This does not indicate browser types anymore */
@@ -154,7 +154,7 @@ async function registerPlugins(
   opts: InitOptions,
   options: InitOptions,
   plugins: Plugin[],
-  legacyIntegrationSources: LegacyIntegrationSource[]
+  legacyIntegrationSources: ClassicIntegrationSource[]
 ): Promise<Context> {
   const tsubMiddleware = hasTsubMiddleware(legacySettings)
     ? await import(

packages/browser/src/core/analytics/index.ts

@@ -30,7 +30,7 @@ import { PersistedPriorityQueue } from '../../lib/priority-queue/persisted'
 import type { LegacyDestination } from '../../plugins/ajs-destination'
 import type {
   LegacyIntegration,
-  LegacyIntegrationSource,
+  ClassicIntegrationSource,
 } from '../../plugins/ajs-destination/types'
 import type {
   DestinationMiddlewareFunction,
@@ -61,7 +61,7 @@ export interface AnalyticsSettings {
   writeKey: string
   timeout?: number
   plugins?: Plugin[]
-  classicIntegrations?: LegacyIntegrationSource[]
+  classicIntegrations?: ClassicIntegrationSource[]
 }
 
 export interface InitOptions {

packages/browser/src/plugins/ajs-destination/index.ts

@@ -24,7 +24,7 @@ import {
   resolveVersion,
   unloadIntegration,
 } from './loader'
-import { LegacyIntegration, LegacyIntegrationSource } from './types'
+import { LegacyIntegration, ClassicIntegrationSource } from './types'
 import { isPlainObject } from '@segment/analytics-core'
 import {
   isDisabledIntegration as shouldSkipIntegration,
@@ -78,7 +78,7 @@ export class LegacyDestination implements Plugin {
   private onInitialize: Promise<unknown> | undefined
   private disableAutoISOConversion: boolean
 
-  integrationSource?: LegacyIntegrationSource
+  integrationSource?: ClassicIntegrationSource
   integration: LegacyIntegration | undefined
 
   buffer: PriorityQueue<Context>
@@ -89,7 +89,7 @@ export class LegacyDestination implements Plugin {
     version: string,
     settings: JSONObject = {},
     options: InitOptions,
-    integrationSource?: LegacyIntegrationSource
+    integrationSource?: ClassicIntegrationSource
   ) {
     this.name = name
     this.version = version
@@ -325,7 +325,7 @@ export function ajsDestinations(
   globalIntegrations: Integrations = {},
   options: InitOptions = {},
   routingMiddleware?: DestinationMiddlewareFunction,
-  legacyIntegrationSources?: LegacyIntegrationSource[]
+  legacyIntegrationSources?: ClassicIntegrationSource[]
 ): LegacyDestination[] {
   if (isServer()) {
     return []
@@ -350,16 +350,14 @@ export function ajsDestinations(
       ...acc,
       [resolveIntegrationNameFromSource(integrationSource)]: integrationSource,
     }),
-    {} as Record<string, LegacyIntegrationSource>
+    {} as Record<string, ClassicIntegrationSource>
   )
 
   const installableIntegrations = new Set([
     // Remotely configured installable integrations
-    ...Object.entries(remoteIntegrationsConfig)
-      .filter(([name, integrationSettings]) =>
-        isInstallableIntegration(name, integrationSettings)
-      )
-      .map(([name]) => name),
+    ...Object.keys(remoteIntegrationsConfig).filter((name) =>
+      isInstallableIntegration(name, remoteIntegrationsConfig[name])
+    ),
 
     // Directly provided integration sources are only installable if settings for them are available
     ...Object.keys(adhocIntegrationSources || {}).filter(

packages/browser/src/plugins/ajs-destination/loader.ts

@@ -6,8 +6,8 @@ import { User } from '../../core/user'
 import { loadScript, unloadScript } from '../../lib/load-script'
 import {
   LegacyIntegration,
-  LegacyIntegrationBuilder,
-  LegacyIntegrationSource,
+  ClassicIntegrationBuilder,
+  ClassicIntegrationSource,
 } from './types'
 
 function normalizeName(name: string): string {
@@ -19,7 +19,7 @@ function obfuscatePathName(pathName: string, obfuscate = false): string | void {
 }
 
 export function resolveIntegrationNameFromSource(
-  integrationSource: LegacyIntegrationSource
+  integrationSource: ClassicIntegrationSource
 ) {
   return (
     'Integration' in integrationSource
@@ -44,11 +44,11 @@ function recordLoadMetrics(fullPath: string, ctx: Context, name: string): void {
 }
 
 export function buildIntegration(
-  integrationSource: LegacyIntegrationSource,
+  integrationSource: ClassicIntegrationSource,
   integrationSettings: { [key: string]: any },
   analyticsInstance: Analytics
 ): LegacyIntegration {
-  let integrationCtr: LegacyIntegrationBuilder
+  let integrationCtr: ClassicIntegrationBuilder
   // GA and Appcues use a different interface to instantiating integrations
   if ('Integration' in integrationSource) {
     const analyticsStub = {
@@ -73,7 +73,7 @@ export async function loadIntegration(
   name: string,
   version: string,
   obfuscate?: boolean
-): Promise<LegacyIntegrationSource> {
+): Promise<ClassicIntegrationSource> {
   const pathName = normalizeName(name)
   const obfuscatedPathName = obfuscatePathName(pathName, obfuscate)
   const path = getNextIntegrationsURL()
@@ -100,7 +100,7 @@ export async function loadIntegration(
   return window[
     // @ts-ignore
     `${pathName}Integration`
-  ] as LegacyIntegrationSource
+  ] as ClassicIntegrationSource
 }
 
 export async function unloadIntegration(
@@ -120,7 +120,7 @@ export async function unloadIntegration(
 }
 
 export function resolveVersion(
-  settings: LegacyIntegrationConfiguration
+  settings?: LegacyIntegrationConfiguration
 ): string {
   return (
     settings?.versionSettings?.override ??

packages/browser/src/plugins/ajs-destination/types.ts

@@ -29,16 +29,16 @@ export interface LegacyIntegration extends Emitter {
   options?: object
 }
 
-export interface LegacyIntegrationBuilder {
+export interface ClassicIntegrationBuilder {
   new (options: object): LegacyIntegration
   prototype: LegacyIntegration
 }
 
-export interface LegacyIntegrationGenerator {
+export interface ClassicIntegrationGenerator {
   (analytics: { user: () => User; addIntegration: () => void }): void
-  Integration: LegacyIntegrationBuilder
+  Integration: ClassicIntegrationBuilder
 }
 
-export type LegacyIntegrationSource =
-  | LegacyIntegrationGenerator
-  | LegacyIntegrationBuilder
+export type ClassicIntegrationSource =
+  | ClassicIntegrationGenerator
+  | ClassicIntegrationBuilder