Skip to content

Commit edede63

Browse files
Merge branch 'main' into @braze/web-sdk-v3-to-v4-to-v5
2 parents 108fe75 + 1c7c198 commit edede63

File tree

12 files changed

+857
-441
lines changed

12 files changed

+857
-441
lines changed

dotcom-rendering/docs/principles/browser-support.md

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,26 @@ such as supporting TLS (IE<6, Firefox 1). These browsers will not be able to see
1414
These are [browsers that we publicly recommend](https://www.theguardian.com/help/recommended-browsers) our
1515
audience use. They will receive the modern experience.
1616

17-
If a browser version has more than 0.2% of traffic, it is considered to be a candidate for recommendation.
17+
If a browser version has more than 0.01% of traffic, it is considered to be a candidate for recommendation.
18+
1819
All browser versions above and including the minimum candidate version are considered recommended browsers.
1920

20-
As of 6th November 2018, our browser usage for browsers versions with over 0.2% of traffic over the last 14 days
21-
looks like:
22-
23-
| Browser | Min version | Usage >= version |
24-
| ----------------- | ----------- | ---------------- |
25-
| Chrome | 49 | 46.95% |
26-
| iOS Safari | 10.2 | 26.97% |
27-
| Firefox | 48 | 3.07% |
28-
| Safari | 10 | 3.02% |
29-
| Internet Explorer | 11 | 2.79% |
30-
| Samsung Internet | 7 | 2.01% |
31-
| Edge | 17 | 1.31% |
32-
| UC Browser | 12 | 0.30% |
33-
| Opera | 56 | 0.25% |
34-
35-
The above table was calculated based on data from Google Analytics.
21+
As of 19th February 2024, our recommended browsers list is:
22+
23+
| Browser | Min version |
24+
| ----------------- | ----------- |
25+
| Chrome | 70 |
26+
| Chrome (Android) | 119 |
27+
| Edge | 109 |
28+
| Firefox | 78 |
29+
| Firefox (Android) | 119 |
30+
| Opera | 95 |
31+
| Opera (mobile) | 73 |
32+
| Safari | 11.1 |
33+
| Safari (iOS) | 10.3 |
34+
| Samsung Internet | 17 |
35+
36+
The above table was calculated by [@guardian/browserslist-config](https://github.com/guardian/csnx/tree/main/libs/%40guardian/browserslist-config) based on data from Google Analytics.
3637

3738
## Cutting the mustard
3839

dotcom-rendering/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"@sentry/integrations": "7.75.1",
6262
"@storybook/addon-essentials": "8.4.2",
6363
"@storybook/addon-interactions": "8.4.2",
64-
"@storybook/addon-webpack5-compiler-swc": "1.0.5",
64+
"@storybook/addon-webpack5-compiler-swc": "3.0.0",
6565
"@storybook/components": "8.4.2",
6666
"@storybook/core-events": "8.4.2",
6767
"@storybook/manager-api": "8.4.2",
@@ -71,8 +71,8 @@
7171
"@storybook/test": "8.4.2",
7272
"@storybook/theming": "8.4.2",
7373
"@svgr/webpack": "8.1.0",
74-
"@swc/cli": "0.5.2",
75-
"@swc/core": "1.9.2",
74+
"@swc/cli": "0.6.0",
75+
"@swc/core": "1.11.13",
7676
"@swc/jest": "0.2.37",
7777
"@testing-library/dom": "10.4.0",
7878
"@testing-library/jest-dom": "6.6.2",
@@ -119,7 +119,7 @@
119119
"babel-plugin-polyfill-corejs3": "0.12.0",
120120
"babel-plugin-transform-runtime": "6.23.0",
121121
"body-parser": "1.20.3",
122-
"browserslist": "4.23.0",
122+
"browserslist": "4.24.4",
123123
"buffer": "6.0.3",
124124
"chalk": "4.1.2",
125125
"clean-css": "5.3.3",

dotcom-rendering/src/client/sIndicator.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const displaySIndicatorRoundel = (
2121
const roundelElement =
2222
document.getElementById(overallRoundelElementId) ??
2323
(() => {
24-
const newElem = document.createElement('div');
24+
const newElem = document.createElement('a');
2525
newElem.id = overallRoundelElementId;
2626
document.body.appendChild(newElem);
2727
return newElem;
@@ -45,6 +45,17 @@ const displaySIndicatorRoundel = (
4545
roundelElement.style.width = '40px';
4646
roundelElement.style.height = '40px';
4747

48+
roundelElement.style.cursor = 'pointer';
49+
roundelElement.setAttribute(
50+
'href',
51+
window.location.hostname === 'localhost'
52+
? 'http://localhost:4200/sIndicator'
53+
: `https://syndication.${window.location.hostname.replace(
54+
/^(m\.|www\.)/i,
55+
'',
56+
)}/sIndicator`,
57+
);
58+
4859
switch (status) {
4960
case 'loading':
5061
roundelElement.title = 'Checking syndication status...';
@@ -66,15 +77,6 @@ const displaySIndicatorRoundel = (
6677
'There was an error checking syndication status. Click to check your CAPI key...';
6778
roundelElement.style.backgroundColor = 'yellow';
6879
roundelElement.textContent = '⚠️';
69-
roundelElement.style.cursor = 'pointer';
70-
roundelElement.addEventListener(
71-
'click',
72-
() =>
73-
(window.location.href =
74-
window.location.hostname === 'localhost'
75-
? 'http://localhost:4200/sIndicator'
76-
: `https://syndication.${window.location.hostname}/sIndicator`),
77-
);
7880
break;
7981
}
8082
};

dotcom-rendering/src/components/StickyBottomBanner/ReaderRevenueBanner.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,9 @@ export const ReaderRevenueBanner = ({
313313
(name === 'SignInPromptBanner'
314314
? /* webpackChunkName: "sign-in-prompt-banner" */
315315
import(`../marketing/banners/signInPrompt/SignInPromptBanner`)
316+
: name === 'DesignableBannerV2'
317+
? /* webpackChunkName: "designable-banner-v2" */
318+
import(`../marketing/banners/designableBanner/DesignableBannerV2`)
316319
: /* webpackChunkName: "designable-banner" */
317320
import(`../marketing/banners/designableBanner/DesignableBanner`)
318321
)

dotcom-rendering/src/components/SvgMediaControlsPlay.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
/**
2-
* TODO: This is a local copy of the updated `SvgMediaControlsPlay` icon which
3-
* is required by the new media card designs and can be removed once the Source
4-
* icon library has been updated and published.
5-
*/
61
import { css } from '@emotion/react';
72
import { visuallyHidden } from '@guardian/source/foundations';
83
import { type IconProps } from '@guardian/source/react-components';

0 commit comments

Comments
 (0)