Skip to content

Commit 6457d35

Browse files
authored
Update browserslist to latest version (#13717)
* Bump browserslist to latest version * Remove logic to 'upgrade' older versions of Safari
1 parent 3c2a50f commit 6457d35

File tree

4 files changed

+14
-99
lines changed

4 files changed

+14
-99
lines changed

dotcom-rendering/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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/webpack/browser-targets.js

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,19 @@ const rawTargets = getTargetsFromBrowsersList({ browsers });
3131
* SWC however will not transpile dynamic imports when there are browser targets
3232
* that do not support them.
3333
*
34-
* ios 10.3.0 and safari 10.1.0 do not support dynamic imports:
34+
* iOS 10.3.0 does not support dynamic imports:
3535
*
3636
* https://caniuse.com/es6-module-dynamic-import
3737
*
38-
* So if unsuported versions are encountered we upgrade to the next versions that
39-
* do support dynamic imports i.e.:
38+
* So if an unsupported version is encountered we upgrade to the next version
39+
* that does support dynamic imports i.e.:
4040
*
41-
* ios 11 and safari 11.1.0
41+
* iOS 11
4242
*
4343
* This is safe as browsers without dynamic import support should be
4444
* covered by the dynamic import polyfill.
4545
*
46-
* This logic can be removed once ios 10.3 and safari 10.1 no longer
47-
* appear in browserslist.
46+
* This logic can be removed once iOS 10.3 no longer appears in browserslist.
4847
*
4948
* @typedef {Object.<string, string>} Targets
5049
* @param {Targets} targets
@@ -55,14 +54,8 @@ const upgradeTargets = (targets) => {
5554
([browser, version]) => {
5655
const versions = version.split('.').map(Number);
5756
const major = versions[0] ?? 0;
58-
const minor = versions[1] ?? 0;
5957
if (browser === 'ios' && major < 11) {
6058
return ['ios', '11'];
61-
} else if (
62-
browser === 'safari' &&
63-
(major < 11 || (major === 11 && minor === 0))
64-
) {
65-
return ['safari', '11.1.0'];
6659
}
6760
return [browser, version];
6861
},

dotcom-rendering/webpack/browser-targets.test.ts

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe('Browser targets are as expected', () => {
2323
firefox: '78.0.0',
2424
ios: '11', // upgraded
2525
opera: '105.0.0',
26-
safari: '11.1.0', // upgraded
26+
safari: '11.1.0',
2727
samsung: '17.0.0',
2828
});
2929
});
@@ -36,20 +36,6 @@ describe('Upgrade browser targets', () => {
3636
expect(upgradeTargets({ ios: '10' })).toEqual({ ios: '11' });
3737
expect(upgradeTargets({ ios: '10.3' })).toEqual({ ios: '11' });
3838
expect(upgradeTargets({ ios: '10.9.9' })).toEqual({ ios: '11' });
39-
// safari < 11.1
40-
expect(upgradeTargets({ safari: '10.11' })).toEqual({
41-
safari: '11.1.0',
42-
});
43-
expect(upgradeTargets({ safari: '11' })).toEqual({ safari: '11.1.0' });
44-
expect(upgradeTargets({ safari: '11.0' })).toEqual({
45-
safari: '11.1.0',
46-
});
47-
expect(upgradeTargets({ safari: '11.0.11' })).toEqual({
48-
safari: '11.1.0',
49-
});
50-
expect(upgradeTargets({ safari: '11.0.11' })).toEqual({
51-
safari: '11.1.0',
52-
});
5339
});
5440
test('do not modify targets for supported later versions', () => {
5541
// ios >= 11
@@ -58,13 +44,5 @@ describe('Upgrade browser targets', () => {
5844
expect(upgradeTargets({ ios: '11.0.0' })).toEqual({ ios: '11.0.0' });
5945
expect(upgradeTargets({ ios: '12' })).toEqual({ ios: '12' });
6046
expect(upgradeTargets({ ios: '14.10.1' })).toEqual({ ios: '14.10.1' });
61-
// safari >= 11.1
62-
expect(upgradeTargets({ safari: '11.1' })).toEqual({ safari: '11.1' });
63-
expect(upgradeTargets({ safari: '11.1.0' })).toEqual({
64-
safari: '11.1.0',
65-
});
66-
expect(upgradeTargets({ safari: '12.10.0' })).toEqual({
67-
safari: '12.10.0',
68-
});
6947
});
7048
});

pnpm-lock.yaml

Lines changed: 7 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)