Skip to content

Commit

Permalink
Update privacy-dashboard dependency to 7.3.2
Browse files Browse the repository at this point in the history
The GetToggleReportOptions privacy-dashboard message now also handles the
"locale" param ID, so let's start passing that too.

Also, it seems that the auto-generated shared/js/ui/base/locale-resources.js
file has started failing linting checks. Let's skip those checks for the file
for now.
  • Loading branch information
kzar committed Dec 6, 2024
1 parent 0a03026 commit 2059743
Show file tree
Hide file tree
Showing 7 changed files with 88 additions and 86 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
build/**/*
docs/**/*
shared/js/ui/base/locale-resources.js
.github/**/*
**/*.md
**/*.html
Expand Down
2 changes: 1 addition & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default [
...ddgConfig,

{
ignores: ['shared/js/content-scope/sjcl.js', 'unit-test/data/reference-tests/'],
ignores: ['shared/js/content-scope/sjcl.js', 'shared/js/ui/base/locale-resources.js', 'unit-test/data/reference-tests/'],
},

{
Expand Down
12 changes: 5 additions & 7 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 @@ -63,7 +63,7 @@
"@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",
"@duckduckgo/privacy-dashboard": "github:duckduckgo/privacy-dashboard#7.3.2",
"@duckduckgo/privacy-grade": "file:packages/privacy-grade",
"@duckduckgo/privacy-reference-tests": "github:duckduckgo/privacy-reference-tests#main",
"@duckduckgo/tracker-surrogates": "github:duckduckgo/tracker-surrogates#1.3.2",
Expand Down
1 change: 1 addition & 0 deletions shared/js/background/components/toggle-reports.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export default class ToggleReports {
'features',
'httpErrorCodes',
'jsPerformance',
'locale',
'openerContext',
'requests',
'userRefreshCount',
Expand Down
154 changes: 77 additions & 77 deletions shared/js/ui/base/locale-resources.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,81 +2,81 @@
* This file is auto-generated by scripts/bundleLocales.mjs, based on the contents of the shared/locales directory.
* Any manual changes in here will be overwritten on build!
*/
import bgFeedback from '../../../locales/bg/feedback.json';
import bgOptions from '../../../locales/bg/options.json';
import bgShared from '../../../locales/bg/shared.json';
import csFeedback from '../../../locales/cs/feedback.json';
import csOptions from '../../../locales/cs/options.json';
import csShared from '../../../locales/cs/shared.json';
import daFeedback from '../../../locales/da/feedback.json';
import daOptions from '../../../locales/da/options.json';
import daShared from '../../../locales/da/shared.json';
import deFeedback from '../../../locales/de/feedback.json';
import deOptions from '../../../locales/de/options.json';
import deShared from '../../../locales/de/shared.json';
import elFeedback from '../../../locales/el/feedback.json';
import elOptions from '../../../locales/el/options.json';
import elShared from '../../../locales/el/shared.json';
import enFeedback from '../../../locales/en/feedback.json';
import enOptions from '../../../locales/en/options.json';
import enShared from '../../../locales/en/shared.json';
import esFeedback from '../../../locales/es/feedback.json';
import esOptions from '../../../locales/es/options.json';
import esShared from '../../../locales/es/shared.json';
import etFeedback from '../../../locales/et/feedback.json';
import etOptions from '../../../locales/et/options.json';
import etShared from '../../../locales/et/shared.json';
import fiFeedback from '../../../locales/fi/feedback.json';
import fiOptions from '../../../locales/fi/options.json';
import fiShared from '../../../locales/fi/shared.json';
import frFeedback from '../../../locales/fr/feedback.json';
import frOptions from '../../../locales/fr/options.json';
import frShared from '../../../locales/fr/shared.json';
import hrFeedback from '../../../locales/hr/feedback.json';
import hrOptions from '../../../locales/hr/options.json';
import hrShared from '../../../locales/hr/shared.json';
import huFeedback from '../../../locales/hu/feedback.json';
import huOptions from '../../../locales/hu/options.json';
import huShared from '../../../locales/hu/shared.json';
import itFeedback from '../../../locales/it/feedback.json';
import itOptions from '../../../locales/it/options.json';
import itShared from '../../../locales/it/shared.json';
import ltFeedback from '../../../locales/lt/feedback.json';
import ltOptions from '../../../locales/lt/options.json';
import ltShared from '../../../locales/lt/shared.json';
import lvFeedback from '../../../locales/lv/feedback.json';
import lvOptions from '../../../locales/lv/options.json';
import lvShared from '../../../locales/lv/shared.json';
import nbFeedback from '../../../locales/nb/feedback.json';
import nbOptions from '../../../locales/nb/options.json';
import nbShared from '../../../locales/nb/shared.json';
import nlFeedback from '../../../locales/nl/feedback.json';
import nlOptions from '../../../locales/nl/options.json';
import nlShared from '../../../locales/nl/shared.json';
import plFeedback from '../../../locales/pl/feedback.json';
import plOptions from '../../../locales/pl/options.json';
import plShared from '../../../locales/pl/shared.json';
import ptFeedback from '../../../locales/pt/feedback.json';
import ptOptions from '../../../locales/pt/options.json';
import ptShared from '../../../locales/pt/shared.json';
import roFeedback from '../../../locales/ro/feedback.json';
import roOptions from '../../../locales/ro/options.json';
import roShared from '../../../locales/ro/shared.json';
import ruFeedback from '../../../locales/ru/feedback.json';
import ruOptions from '../../../locales/ru/options.json';
import ruShared from '../../../locales/ru/shared.json';
import skFeedback from '../../../locales/sk/feedback.json';
import skOptions from '../../../locales/sk/options.json';
import skShared from '../../../locales/sk/shared.json';
import slFeedback from '../../../locales/sl/feedback.json';
import slOptions from '../../../locales/sl/options.json';
import slShared from '../../../locales/sl/shared.json';
import svFeedback from '../../../locales/sv/feedback.json';
import svOptions from '../../../locales/sv/options.json';
import svShared from '../../../locales/sv/shared.json';
import trFeedback from '../../../locales/tr/feedback.json';
import trOptions from '../../../locales/tr/options.json';
import trShared from '../../../locales/tr/shared.json';
import bgFeedback from '../../../locales/bg/feedback.json'
import bgOptions from '../../../locales/bg/options.json'
import bgShared from '../../../locales/bg/shared.json'
import csFeedback from '../../../locales/cs/feedback.json'
import csOptions from '../../../locales/cs/options.json'
import csShared from '../../../locales/cs/shared.json'
import daFeedback from '../../../locales/da/feedback.json'
import daOptions from '../../../locales/da/options.json'
import daShared from '../../../locales/da/shared.json'
import deFeedback from '../../../locales/de/feedback.json'
import deOptions from '../../../locales/de/options.json'
import deShared from '../../../locales/de/shared.json'
import elFeedback from '../../../locales/el/feedback.json'
import elOptions from '../../../locales/el/options.json'
import elShared from '../../../locales/el/shared.json'
import enFeedback from '../../../locales/en/feedback.json'
import enOptions from '../../../locales/en/options.json'
import enShared from '../../../locales/en/shared.json'
import esFeedback from '../../../locales/es/feedback.json'
import esOptions from '../../../locales/es/options.json'
import esShared from '../../../locales/es/shared.json'
import etFeedback from '../../../locales/et/feedback.json'
import etOptions from '../../../locales/et/options.json'
import etShared from '../../../locales/et/shared.json'
import fiFeedback from '../../../locales/fi/feedback.json'
import fiOptions from '../../../locales/fi/options.json'
import fiShared from '../../../locales/fi/shared.json'
import frFeedback from '../../../locales/fr/feedback.json'
import frOptions from '../../../locales/fr/options.json'
import frShared from '../../../locales/fr/shared.json'
import hrFeedback from '../../../locales/hr/feedback.json'
import hrOptions from '../../../locales/hr/options.json'
import hrShared from '../../../locales/hr/shared.json'
import huFeedback from '../../../locales/hu/feedback.json'
import huOptions from '../../../locales/hu/options.json'
import huShared from '../../../locales/hu/shared.json'
import itFeedback from '../../../locales/it/feedback.json'
import itOptions from '../../../locales/it/options.json'
import itShared from '../../../locales/it/shared.json'
import ltFeedback from '../../../locales/lt/feedback.json'
import ltOptions from '../../../locales/lt/options.json'
import ltShared from '../../../locales/lt/shared.json'
import lvFeedback from '../../../locales/lv/feedback.json'
import lvOptions from '../../../locales/lv/options.json'
import lvShared from '../../../locales/lv/shared.json'
import nbFeedback from '../../../locales/nb/feedback.json'
import nbOptions from '../../../locales/nb/options.json'
import nbShared from '../../../locales/nb/shared.json'
import nlFeedback from '../../../locales/nl/feedback.json'
import nlOptions from '../../../locales/nl/options.json'
import nlShared from '../../../locales/nl/shared.json'
import plFeedback from '../../../locales/pl/feedback.json'
import plOptions from '../../../locales/pl/options.json'
import plShared from '../../../locales/pl/shared.json'
import ptFeedback from '../../../locales/pt/feedback.json'
import ptOptions from '../../../locales/pt/options.json'
import ptShared from '../../../locales/pt/shared.json'
import roFeedback from '../../../locales/ro/feedback.json'
import roOptions from '../../../locales/ro/options.json'
import roShared from '../../../locales/ro/shared.json'
import ruFeedback from '../../../locales/ru/feedback.json'
import ruOptions from '../../../locales/ru/options.json'
import ruShared from '../../../locales/ru/shared.json'
import skFeedback from '../../../locales/sk/feedback.json'
import skOptions from '../../../locales/sk/options.json'
import skShared from '../../../locales/sk/shared.json'
import slFeedback from '../../../locales/sl/feedback.json'
import slOptions from '../../../locales/sl/options.json'
import slShared from '../../../locales/sl/shared.json'
import svFeedback from '../../../locales/sv/feedback.json'
import svOptions from '../../../locales/sv/options.json'
import svShared from '../../../locales/sv/shared.json'
import trFeedback from '../../../locales/tr/feedback.json'
import trOptions from '../../../locales/tr/options.json'
import trShared from '../../../locales/tr/shared.json'

export default {
bg: { feedback: bgFeedback, options: bgOptions, shared: bgShared },
Expand All @@ -103,5 +103,5 @@ export default {
sk: { feedback: skFeedback, options: skOptions, shared: skShared },
sl: { feedback: slFeedback, options: slOptions, shared: slShared },
sv: { feedback: svFeedback, options: svOptions, shared: svShared },
tr: { feedback: trFeedback, options: trOptions, shared: trShared },
};
tr: { feedback: trFeedback, options: trOptions, shared: trShared }
}
2 changes: 2 additions & 0 deletions unit-test/background/toggle-reports.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ describe('ToggleReports', () => {
{ id: 'features' },
{ id: 'httpErrorCodes' },
{ id: 'jsPerformance' },
{ id: 'locale' },
{ id: 'openerContext' },
{ id: 'requests' },
{ id: 'userRefreshCount' },
Expand All @@ -104,6 +105,7 @@ describe('ToggleReports', () => {
{ id: 'features' },
{ id: 'httpErrorCodes' },
{ id: 'jsPerformance' },
{ id: 'locale' },
{ id: 'openerContext' },
{ id: 'requests' },
{ id: 'userRefreshCount' },
Expand Down

0 comments on commit 2059743

Please sign in to comment.