Skip to content

Commit 4f0d109

Browse files
mgurgelgithub-actions[bot]
mgurgel
authored and
github-actions[bot]
committed
Release build 6.16.0 [ci release]
1 parent 9f3717b commit 4f0d109

File tree

20 files changed

+644
-502
lines changed

20 files changed

+644
-502
lines changed

‎.github/dependabot.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,10 @@ updates:
77
target-branch: "main"
88
labels:
99
- "dependencies"
10+
- package-ecosystem: "github-actions"
11+
directory: "/"
12+
schedule:
13+
interval: "weekly"
14+
target-branch: "main"
15+
labels:
16+
- "dependencies"

‎.github/workflows/build-pr.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
pull_request:
55
types: [opened, synchronize, closed, ready_for_review]
66

7+
permissions: write-all
8+
79
jobs:
810
build:
911
if: github.event.pull_request.draft == false && github.event.action != 'closed'
@@ -17,6 +19,7 @@ jobs:
1719
uses: actions/setup-node@v3
1820
with:
1921
node-version: '20'
22+
cache: 'npm'
2023

2124
- name: Install dependencies
2225
run: npm install
@@ -40,7 +43,7 @@ jobs:
4043
echo "COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV
4144
4245
- name: Post comment on PR
43-
uses: actions/github-script@v6
46+
uses: actions/github-script@v7
4447
with:
4548
github-token: ${{ secrets.GITHUB_TOKEN }}
4649
script: |

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v3
1717
- uses: actions/setup-node@v3
1818
with:
19-
node-version: 18
19+
node-version: 20
2020
cache: 'npm'
2121

2222
- name: Fetch files and checkout
@@ -47,7 +47,7 @@ jobs:
4747
bash ./scripts/changelog.sh > ${{ github.workspace }}-CHANGELOG.txt
4848
4949
- name: Create Release
50-
uses: softprops/action-gh-release@v1
50+
uses: softprops/action-gh-release@v2
5151
env:
5252
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5353
with:

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
# Initializes the CodeQL tools for scanning.
3333
- name: Initialize CodeQL
34-
uses: github/codeql-action/init@v1
34+
uses: github/codeql-action/init@v3
3535
with:
3636
languages: ${{ matrix.language }}
3737
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -51,4 +51,4 @@ jobs:
5151
# make release
5252

5353
- name: Perform CodeQL Analysis
54-
uses: github/codeql-action/analyze@v1
54+
uses: github/codeql-action/analyze@v3

‎.github/workflows/tests.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/setup-node@v1
2828
with:
2929
node-version: 20.x
30-
- uses: actions/cache@v2
30+
- uses: actions/cache@v4
3131
with:
3232
path: ~/.npm
3333
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -49,7 +49,7 @@ jobs:
4949
uses: actions/setup-node@v1
5050
with:
5151
node-version: 20.x
52-
- uses: actions/cache@v2
52+
- uses: actions/cache@v4
5353
with:
5454
path: ~/.npm
5555
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -61,22 +61,22 @@ jobs:
6161
npm run build
6262
- name: Cache docs output
6363
id: docs-output
64-
uses: actions/cache@v3
64+
uses: actions/cache@v4
6565
with:
6666
path: docs
6767
key: docs-output-${{ github.run_id }}
6868
- name: Install Playwright Browsers
6969
run: npx playwright install --with-deps
7070
- run: npm run playwright
7171
# - run: npm run playwright-e2e
72-
- uses: actions/upload-artifact@v2
72+
- uses: actions/upload-artifact@v4
7373
if: always()
7474
with:
7575
name: playwright-report
7676
path: test-results
7777
retention-days: 5
7878
- run: npm run test-int-x
79-
- uses: actions/upload-artifact@v2
79+
- uses: actions/upload-artifact@v4
8080
if: always()
8181
with:
8282
name: playwright-report-pages
@@ -100,12 +100,12 @@ jobs:
100100
node-version: 20.x
101101
- name: Cache build outputs
102102
id: docs-output
103-
uses: actions/cache@v3
103+
uses: actions/cache@v4
104104
with:
105105
path: docs
106106
key: docs-output-${{ github.run_id }}
107107
- name: Setup Github Pages
108-
uses: actions/configure-pages@v2
108+
uses: actions/configure-pages@v5
109109
- name: Upload artifact
110110
uses: actions/upload-pages-artifact@v1
111111
with:

‎Sources/ContentScopeScripts/dist/contentScopeIsolated.js‎

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3356,9 +3356,7 @@
33563356
overlayInteracted: false,
33573357
privatePlayerMode: { alwaysAsk: {} }
33583358
},
3359-
ui: {
3360-
overlayCopy: this.environment.getOverlayCopyOverride() || 'default'
3361-
}
3359+
ui: {}
33623360
})
33633361
}
33643362
return this.messaging.request(MSG_NAME_INITIAL_SETUP)
@@ -3923,15 +3921,6 @@
39233921
}
39243922
};
39253923

3926-
/**
3927-
* Converts occurrences of {newline} in a string to <br> tags
3928-
* @param {string} text
3929-
*/
3930-
function nl2br (text) {
3931-
return html`${text.split('{newline}')
3932-
.map((line, i) => i === 0 ? line : html`<br>${line}`)}`
3933-
}
3934-
39353924
/**
39363925
* @typedef {ReturnType<html>} Template
39373926
*/
@@ -3946,29 +3935,15 @@
39463935
*/
39473936

39483937
/**
3949-
* @type {Record<import('../duck-player').UISettings['overlayCopy'], OverlayCopyTranslation>}
3938+
* @type {Record<'default', OverlayCopyTranslation>}
39503939
*/
39513940
const overlayCopyVariants = {
39523941
default: {
3953-
title: i18n.t('videoOverlayTitle'),
3954-
subtitle: html`<b>${i18n.t('playText')}</b> ${i18n.t('videoOverlaySubtitle')}`,
3955-
buttonOptOut: i18n.t('videoButtonOptOut'),
3956-
buttonOpen: i18n.t('videoButtonOpen'),
3957-
rememberLabel: i18n.t('rememberLabel')
3958-
},
3959-
a1: {
39603942
title: i18n.t('videoOverlayTitle2'),
39613943
subtitle: i18n.t('videoOverlaySubtitle2'),
39623944
buttonOptOut: i18n.t('videoButtonOptOut2'),
39633945
buttonOpen: i18n.t('videoButtonOpen2'),
39643946
rememberLabel: i18n.t('rememberLabel')
3965-
},
3966-
b1: {
3967-
title: nl2br(i18n.t('videoOverlayTitle3')),
3968-
subtitle: i18n.t('videoOverlaySubtitle2'),
3969-
buttonOptOut: i18n.t('videoButtonOptOut2'),
3970-
buttonOpen: i18n.t('videoButtonOpen2'),
3971-
rememberLabel: i18n.t('rememberLabel')
39723947
}
39733948
};
39743949

@@ -4620,7 +4595,7 @@
46204595
* @returns {HTMLDivElement}
46214596
*/
46224597
createOverlay () {
4623-
const overlayCopy = overlayCopyVariants[this.ui?.overlayCopy || 'default'];
4598+
const overlayCopy = overlayCopyVariants.default;
46244599
const overlayElement = document.createElement('div');
46254600
overlayElement.classList.add('ddg-video-player-overlay');
46264601
const svgIcon = trustedUnsafe(dax);
@@ -5526,22 +5501,6 @@
55265501
return false
55275502
}
55285503

5529-
/**
5530-
* @returns {import("../duck-player.js").UISettings['overlayCopy'] | null}
5531-
*/
5532-
getOverlayCopyOverride () {
5533-
if (this.isIntegrationMode()) {
5534-
const allowedOverlayCopyOverrides = ['default', 'a1', 'b1'];
5535-
5536-
const url = new URLSearchParams(window.location.href);
5537-
const override = url.get('overlayCopy');
5538-
if (override && allowedOverlayCopyOverrides.includes(override)) {
5539-
return /** @type {import("../duck-player.js").UISettings['overlayCopy']} */ (override)
5540-
}
5541-
}
5542-
return null
5543-
}
5544-
55455504
isIntegrationMode () {
55465505
return this.debug === true && this.injectName === 'integration'
55475506
}
@@ -5624,7 +5583,6 @@
56245583

56255584
/**
56265585
* @typedef UISettings - UI-specific settings
5627-
* @property {'default'|'a1'|'b1'} overlayCopy - Overlay copy experiment variant
56285586
* @property {boolean} [allowFirstVideo] - should the first video be allowed to load/play?
56295587
* @property {boolean} [playInDuckPlayer] - Forces next video to be played in Duck Player regardless of user setting
56305588
*/

‎build/android/contentScope.js‎

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -12192,9 +12192,7 @@
1219212192
overlayInteracted: false,
1219312193
privatePlayerMode: { alwaysAsk: {} }
1219412194
},
12195-
ui: {
12196-
overlayCopy: this.environment.getOverlayCopyOverride() || 'default'
12197-
}
12195+
ui: {}
1219812196
})
1219912197
}
1220012198
return this.messaging.request(MSG_NAME_INITIAL_SETUP)
@@ -12677,15 +12675,6 @@
1267712675
}
1267812676
};
1267912677

12680-
/**
12681-
* Converts occurrences of {newline} in a string to <br> tags
12682-
* @param {string} text
12683-
*/
12684-
function nl2br (text) {
12685-
return html`${text.split('{newline}')
12686-
.map((line, i) => i === 0 ? line : html`<br>${line}`)}`
12687-
}
12688-
1268912678
/**
1269012679
* @typedef {ReturnType<html>} Template
1269112680
*/
@@ -12700,29 +12689,15 @@
1270012689
*/
1270112690

1270212691
/**
12703-
* @type {Record<import('../duck-player').UISettings['overlayCopy'], OverlayCopyTranslation>}
12692+
* @type {Record<'default', OverlayCopyTranslation>}
1270412693
*/
1270512694
const overlayCopyVariants = {
1270612695
default: {
12707-
title: i18n.t('videoOverlayTitle'),
12708-
subtitle: html`<b>${i18n.t('playText')}</b> ${i18n.t('videoOverlaySubtitle')}`,
12709-
buttonOptOut: i18n.t('videoButtonOptOut'),
12710-
buttonOpen: i18n.t('videoButtonOpen'),
12711-
rememberLabel: i18n.t('rememberLabel')
12712-
},
12713-
a1: {
1271412696
title: i18n.t('videoOverlayTitle2'),
1271512697
subtitle: i18n.t('videoOverlaySubtitle2'),
1271612698
buttonOptOut: i18n.t('videoButtonOptOut2'),
1271712699
buttonOpen: i18n.t('videoButtonOpen2'),
1271812700
rememberLabel: i18n.t('rememberLabel')
12719-
},
12720-
b1: {
12721-
title: nl2br(i18n.t('videoOverlayTitle3')),
12722-
subtitle: i18n.t('videoOverlaySubtitle2'),
12723-
buttonOptOut: i18n.t('videoButtonOptOut2'),
12724-
buttonOpen: i18n.t('videoButtonOpen2'),
12725-
rememberLabel: i18n.t('rememberLabel')
1272612701
}
1272712702
};
1272812703

@@ -13374,7 +13349,7 @@
1337413349
* @returns {HTMLDivElement}
1337513350
*/
1337613351
createOverlay () {
13377-
const overlayCopy = overlayCopyVariants[this.ui?.overlayCopy || 'default'];
13352+
const overlayCopy = overlayCopyVariants.default;
1337813353
const overlayElement = document.createElement('div');
1337913354
overlayElement.classList.add('ddg-video-player-overlay');
1338013355
const svgIcon = trustedUnsafe(dax);
@@ -14280,22 +14255,6 @@
1428014255
return false
1428114256
}
1428214257

14283-
/**
14284-
* @returns {import("../duck-player.js").UISettings['overlayCopy'] | null}
14285-
*/
14286-
getOverlayCopyOverride () {
14287-
if (this.isIntegrationMode()) {
14288-
const allowedOverlayCopyOverrides = ['default', 'a1', 'b1'];
14289-
14290-
const url = new URLSearchParams(window.location.href);
14291-
const override = url.get('overlayCopy');
14292-
if (override && allowedOverlayCopyOverrides.includes(override)) {
14293-
return /** @type {import("../duck-player.js").UISettings['overlayCopy']} */ (override)
14294-
}
14295-
}
14296-
return null
14297-
}
14298-
1429914258
isIntegrationMode () {
1430014259
return this.debug === true && this.injectName === 'integration'
1430114260
}
@@ -14378,7 +14337,6 @@
1437814337

1437914338
/**
1438014339
* @typedef UISettings - UI-specific settings
14381-
* @property {'default'|'a1'|'b1'} overlayCopy - Overlay copy experiment variant
1438214340
* @property {boolean} [allowFirstVideo] - should the first video be allowed to load/play?
1438314341
* @property {boolean} [playInDuckPlayer] - Forces next video to be played in Duck Player regardless of user setting
1438414342
*/

0 commit comments

Comments
 (0)