Skip to content

Commit

Permalink
Update C-S-S to 6.34.0 (#2808)
Browse files Browse the repository at this point in the history
* Update C-S-S to 6.34.0

* Adding devtools script
  • Loading branch information
jonathanKingston authored Nov 14, 2024
1 parent 3c21c9b commit 0a03026
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 88 deletions.
91 changes: 18 additions & 73 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
},
"dependencies": {
"@duckduckgo/autofill": "github:duckduckgo/duckduckgo-autofill#15.1.0",
"@duckduckgo/content-scope-scripts": "github:duckduckgo/content-scope-scripts#6.19.0",
"@duckduckgo/content-scope-scripts": "github:duckduckgo/content-scope-scripts#6.34.0",
"@duckduckgo/ddg2dnr": "file:packages/ddg2dnr",
"@duckduckgo/jsbloom": "^1.0.2",
"@duckduckgo/privacy-dashboard": "github:duckduckgo/privacy-dashboard#7.1.1",
Expand Down
2 changes: 1 addition & 1 deletion shared/js/devtools/panel.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getStackTraceOrigins } from '@duckduckgo/content-scope-scripts/src/utils';
import { getStackTraceOrigins } from '@duckduckgo/content-scope-scripts/injected/src/utils';
const table = document.querySelector('#request-table');
const clearButton = document.getElementById('clear');
const refreshButton = document.getElementById('refresh');
Expand Down
4 changes: 2 additions & 2 deletions unit-test/background/reference-tests/gpc-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ const tdsStorage = require('../../../shared/js/background/storage/tds').default;

const Site = require('../../../shared/js/background/classes/site').default;
const GPC = require('../../../shared/js/background/GPC');
const GpcContentScript = require('@duckduckgo/content-scope-scripts/src/features/gpc').default;
const GpcContentScript = require('@duckduckgo/content-scope-scripts/injected/src/features/gpc').default;
const gpcContentScript = new GpcContentScript('gpc');
const constants = require('../../../shared/data/constants');
const settings = require('../../../shared/js/background/settings');

const contentScriptUtils = require('@duckduckgo/content-scope-scripts/src/utils.js');
const contentScriptUtils = require('@duckduckgo/content-scope-scripts/injected/src/utils.js');

const testSets = require('@duckduckgo/privacy-reference-tests/global-privacy-control/tests.json');
const config = require('@duckduckgo/privacy-reference-tests/global-privacy-control/config_reference.json');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ const tdsStorage = require('../../../shared/js/background/storage/tds').default;

const tabManager = require('../../../shared/js/background/tab-manager');
const { getArgumentsObject } = require('../../../shared/js/background/helpers/arguments-object');
const JsReferrerProtection = require('@duckduckgo/content-scope-scripts/src/features/referrer').default;
const JsReferrerProtection = require('@duckduckgo/content-scope-scripts/injected/src/features/referrer').default;
const jsReferrerProtection = new JsReferrerProtection('jsReferrer');
const { isFeatureBroken } = require('@duckduckgo/content-scope-scripts/src/utils');
const { isFeatureBroken } = require('@duckduckgo/content-scope-scripts/injected/src/utils');

const limitReferrerData = require('../../../shared/js/background/events/referrer-trimming');

Expand Down
2 changes: 1 addition & 1 deletion unit-test/node/reference-tests/3p-cookies-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const { getArgumentsObject } = require('../../../shared/js/background/helpers/ar

const jsdom = require('jsdom');

const TrackingJsCookieProtection = require('@duckduckgo/content-scope-scripts/src/features/cookie').default;
const TrackingJsCookieProtection = require('@duckduckgo/content-scope-scripts/injected/src/features/cookie').default;
const trackingJsCookieProtection = new TrackingJsCookieProtection('cookie');

const trackingConfigReference = require('@duckduckgo/privacy-reference-tests/block-third-party-tracking-cookies/config_reference.json');
Expand Down
4 changes: 2 additions & 2 deletions unit-test/node/reference-tests/expire-1p-tracking-cookies.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ for (const setName of Object.keys(testSets)) {
// eslint-disable-next-line no-global-assign
globalThis = jsdomWindow;

const utils = require('@duckduckgo/content-scope-scripts/src/utils');
const utils = require('@duckduckgo/content-scope-scripts/injected/src/utils');
utils.setGlobal(jsdomWindow);

const JsCookieProtection = require('@duckduckgo/content-scope-scripts/src/features/cookie').default;
const JsCookieProtection = require('@duckduckgo/content-scope-scripts/injected/src/features/cookie').default;
const jsCookieProtection = new JsCookieProtection('cookie');

jsCookieProtection.callLoad({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ const tdsStorage = require('../../../shared/js/background/storage/tds').default;
const tabManager = require('../../../shared/js/background/tab-manager');
const { getArgumentsObject } = require('../../../shared/js/background/helpers/arguments-object');

const BatteryProtection = require('@duckduckgo/content-scope-scripts/src/features/fingerprinting-battery').default;
const BatteryProtection = require('@duckduckgo/content-scope-scripts/injected/src/features/fingerprinting-battery').default;
const batteryProtection = new BatteryProtection('fingerprintingBattery');
const HardwareProtection = require('@duckduckgo/content-scope-scripts/src/features/fingerprinting-hardware').default;
const HardwareProtection = require('@duckduckgo/content-scope-scripts/injected/src/features/fingerprinting-hardware').default;
const hardwareProtection = new HardwareProtection('fingerprintingHardware');
const ScreenProtection = require('@duckduckgo/content-scope-scripts/src/features/fingerprinting-screen-size').default;
const ScreenProtection = require('@duckduckgo/content-scope-scripts/injected/src/features/fingerprinting-screen-size').default;
const screenProtection = new ScreenProtection('fingerprintingScreenSize');
const TempStorageProtection = require('@duckduckgo/content-scope-scripts/src/features/fingerprinting-temporary-storage').default;
const TempStorageProtection = require('@duckduckgo/content-scope-scripts/injected/src/features/fingerprinting-temporary-storage').default;
const tempStorageProtection = new TempStorageProtection('fingerprintingTemporaryStorage');
const { isFeatureBroken } = require('@duckduckgo/content-scope-scripts/src/utils');
const { isFeatureBroken } = require('@duckduckgo/content-scope-scripts/injected/src/utils');

const configReference = require('@duckduckgo/privacy-reference-tests/fingerprinting-protections/config_reference.json');
const testSets = require('@duckduckgo/privacy-reference-tests/fingerprinting-protections/tests.json');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const tdsStorage = require('../../../shared/js/background/storage/tds').default;
const Site = require('../../../shared/js/background/classes/site').default;
const utils = require('../../../shared/js/background/utils');

const contentScriptUtils = require('@duckduckgo/content-scope-scripts/src/utils.js');
const contentScriptUtils = require('@duckduckgo/content-scope-scripts/injected/src/utils.js');

const testSets = require('@duckduckgo/privacy-reference-tests/privacy-configuration/tests.json');
const configs = {
Expand Down

0 comments on commit 0a03026

Please sign in to comment.