Merge branch 'main' into jkt/overridenTaintMethods

Author: jonathanKingston

package-lock.json

@@ -57,7 +57,7 @@
     "@canvas/image-data": "^1.0.0",
     "@fingerprintjs/fingerprintjs": "^3.4.1",
     "@rollup/plugin-commonjs": "^25.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.2",
+    "@rollup/plugin-node-resolve": "^15.1.0",
     "@rollup/plugin-replace": "^5.0.2",
     "@types/chrome": "^0.0.237",
     "@types/jasmine": "^4.3.1",

package.json

@@ -3,6 +3,7 @@ import { logoImg, loadingImages, closeIcon } from './click-to-load/ctl-assets.js
 import { getStyles, getConfig } from './click-to-load/ctl-config.js'
 import ContentFeature from '../content-feature.js'
 import { DDGCtlPlaceholderBlockedElement } from './click-to-load/components/ctl-placeholder-blocked.js'
+import { registerCustomElements } from './click-to-load/components'
 
 /**
  * @typedef {'darkMode' | 'lightMode' | 'loginMode' | 'cancelMode'} displayMode
@@ -1751,6 +1752,13 @@ export default class ClickToLoad extends ContentFeature {
         styles = getStyles(this.assetConfig)
         isMobileApp = this.platform.name === 'ios' || this.platform.name === 'android'
 
+        /**
+         * Register Custom Elements only when Click to Load is initialized, to ensure it is only
+         * called when config is ready and any previous context have been appropriately invalidated
+         * prior when applicable (ie Firefox when hot reloading the Extension)
+         */
+        registerCustomElements()
+
         for (const entity of Object.keys(config)) {
             // Strip config entities that are first-party, or aren't enabled in the
             // extension's clickToLoad settings.

src/features/click-to-load.js

@@ -298,5 +298,3 @@ export class DDGCtlPlaceholderBlockedElement extends HTMLElement {
         }
     }
 }
-
-customElements.define(DDGCtlPlaceholderBlockedElement.CUSTOM_TAG_NAME, DDGCtlPlaceholderBlockedElement)

src/features/click-to-load/components/ctl-placeholder-blocked.js

@@ -0,0 +1,11 @@
+import { DDGCtlPlaceholderBlockedElement } from './ctl-placeholder-blocked.js'
+
+/**
+ * Register custom elements in this wrapper function to be called only when we need to
+ * and also to allow remote-config later if needed.
+ */
+export function registerCustomElements () {
+    if (!customElements.get(DDGCtlPlaceholderBlockedElement.CUSTOM_TAG_NAME)) {
+        customElements.define(DDGCtlPlaceholderBlockedElement.CUSTOM_TAG_NAME, DDGCtlPlaceholderBlockedElement)
+    }
+}