Merge branch 'main' into jkt/overloadGetOwnPropertyDescriptors

Author: jonathanKingston

src/content-feature.js

@@ -1,7 +1,7 @@
 import { camelcase, matchHostname, processAttr, computeEnabledFeatures, parseFeatureSettings } from './utils.js'
 import { immutableJSONPatch } from 'immutable-json-patch'
 import { PerformanceMonitor } from './performance.js'
-import { MessagingContext } from '@duckduckgo/messaging'
+import { MessagingContext } from '../packages/messaging/index.js'
 
 /**
  * @typedef {object} AssetConfig

src/create-messaging.js

@@ -1,4 +1,4 @@
-import { Messaging, MessagingContext, WebkitMessagingConfig, WindowsMessagingConfig } from '@duckduckgo/messaging'
+import { Messaging, MessagingContext, WebkitMessagingConfig, WindowsMessagingConfig } from '../packages/messaging/index.js'
 
 /**
  * Extracted so we can iterate on the best way to bring this to all platforms

src/features/click-to-load.js

@@ -1,4 +1,4 @@
-import { Messaging, TestTransportConfig, WebkitMessagingConfig } from '@duckduckgo/messaging'
+import { Messaging, TestTransportConfig, WebkitMessagingConfig } from '../../packages/messaging/index.js'
 import { createCustomEvent, originalWindowDispatchEvent } from '../utils.js'
 import { logoImg, loadingImages, closeIcon } from './click-to-load/ctl-assets.js'
 import { getStyles, getConfig } from './click-to-load/ctl-config.js'

src/utils.js

@@ -389,9 +389,13 @@ export function hasTaintedMethod (scope, shouldStackCheck = false) {
     if (!shouldStackCheck || !taintedOrigins()) {
         return false
     }
+    const currentTaintedOrigins = taintedOrigins()
+    if (!currentTaintedOrigins || currentTaintedOrigins.size === 0) {
+        return false
+    }
     const stackOrigins = getStackTraceOrigins(getStack())
     for (const stackOrigin of stackOrigins) {
-        if (taintedOrigins()?.has(stackOrigin)) {
+        if (currentTaintedOrigins.has(stackOrigin)) {
             return true
         }
     }