Switch to using ts direct from privacy config (#1211)

* Switch to using ts direct from privacy config

* Reinstall config

* Add any type to build script

Author: jonathanKingston

injected/package.json

@@ -38,6 +38,7 @@
   },
   "devDependencies": {
     "@canvas/image-data": "^1.0.0",
+    "@duckduckgo/privacy-configuration": "github:duckduckgo/privacy-configuration#main",
     "@fingerprintjs/fingerprintjs": "^4.5.1",
     "@rollup/plugin-commonjs": "^28.0.1",
     "@rollup/plugin-node-resolve": "^15.3.0",
@@ -46,7 +47,6 @@
     "@types/jasmine": "^5.1.4",
     "@types/node": "^22.8.7",
     "@typescript-eslint/eslint-plugin": "^6.9.1",
-    "config-builder": "github:duckduckgo/privacy-configuration#1729260354597",
     "fast-check": "^3.23.1",
     "jasmine": "^5.4.0",
     "minimist": "^1.2.8",

injected/scripts/bundleTrackers.mjs

@@ -4,6 +4,10 @@ import { parseArgs, write } from '../../scripts/script-utils.js';
 
 const tdsUrl = 'https://staticcdn.duckduckgo.com/trackerblocking/v4/tds.json';
 const resp = await fetch(tdsUrl);
+/**
+ * Ignore 'unknown' type for now.
+ * @type any
+ */
 const tds = await resp.json();
 
 // Build a trie of tracker domains, starting with the broadest subdomain. Leaves are set to 1 to indicate success

injected/scripts/types.mjs

@@ -1,35 +1,16 @@
 import { cwd, isLaunchFile } from '../../scripts/script-utils.js';
-import { dirname, join } from 'node:path';
-import { createRequire } from 'node:module';
+import { join } from 'node:path';
 import { buildTypes } from '../../types-generator/build-types.mjs';
 
 const injectRoot = join(cwd(import.meta.url), '..');
 
-// eslint-disable-next-line no-redeclare
-const require = createRequire(import.meta.url);
-const configBuilderRoot = dirname(require.resolve('config-builder'));
-
 /** @type {Record<string, import('../../types-generator/build-types.mjs').Mapping>} */
 const injectSchemaMapping = {
     /**
      * Add more mappings here
      *  - `schema` should be an absolute path to a valid JSON Schema document
      *  - `types` should be an absolute path to the output file
      */
-    'Webcompat Settings': {
-        schema: join(configBuilderRoot, 'tests/schemas/webcompat-settings.json'),
-        types: join(injectRoot, 'src/types/webcompat-settings.d.ts'),
-        // todo: fix this on windows.
-        exclude: process.platform === 'win32',
-        kind: 'settings',
-    },
-    'Duckplayer Settings': {
-        schema: join(configBuilderRoot, 'tests/schemas/duckplayer-settings.json'),
-        types: join(injectRoot, 'src/types/duckplayer-settings.d.ts'),
-        // todo: fix this on windows.
-        exclude: process.platform === 'win32',
-        kind: 'settings',
-    },
     'Schema Messages': {
         schemaDir: join(injectRoot, 'src/messages'),
         typesDir: join(injectRoot, 'src/types'),

injected/src/features/duck-player.js

@@ -67,7 +67,7 @@ export default class DuckPlayerFeature extends ContentFeature {
 
         /**
          * Just the 'overlays' part of the settings object.
-         * @type {import("../types/duckplayer-settings.js").DuckPlayerSettings['overlays']}
+         * @type {import("@duckduckgo/privacy-configuration/schema/features/duckplayer").DuckPlayerSettings['overlays']}
          */
         const overlaySettings = this.getFeatureSetting('overlays');
         const overlaysEnabled = overlaySettings?.youtube?.state === 'enabled';
@@ -114,7 +114,7 @@ export default class DuckPlayerFeature extends ContentFeature {
 }
 
 /**
- * @typedef {Omit<import("../types/duckplayer-settings").YouTubeOverlay, "state">} OverlaysFeatureSettings
+ * @typedef {Omit<import("@duckduckgo/privacy-configuration/schema/features/duckplayer").DuckPlayerSettings['overlays']['youtube'], "state">} OverlaysFeatureSettings
  */
 
 // for docs generation

injected/src/features/web-compat.js

@@ -571,7 +571,7 @@ export class WebCompat extends ContentFeature {
      * Support for modifying localStorage entries
      */
     modifyLocalStorage() {
-        /** @type {import('../types//webcompat-settings').WebCompatSettings['modifyLocalStorage']} */
+        /** @type {import('@duckduckgo/privacy-configuration/schema/features/webcompat').WebCompatSettings['modifyLocalStorage']} */
         const settings = this.getFeatureSetting('modifyLocalStorage');
 
         if (!settings || !settings.changes) return;
@@ -587,7 +587,7 @@ export class WebCompat extends ContentFeature {
      * Support for proxying `window.webkit.messageHandlers`
      */
     messageHandlersFix() {
-        /** @type {import('../types//webcompat-settings').WebCompatSettings['messageHandlers']} */
+        /** @type {import('@duckduckgo/privacy-configuration/schema/features/webcompat').WebCompatSettings['messageHandlers']} */
         const settings = this.getFeatureSetting('messageHandlers');
 
         // Do nothing if `messageHandlers` is absent