Skip to content

Commit ed4c38c

Browse files
diliritymatticbot
dilirity
authored and
matticbot
committed
Boost: Minify elementor compatibility (#40339)
Co-authored-by: Peter Petrov <[email protected]> Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/12066887648 Upstream-Ref: Automattic/jetpack@bcaf0d5
1 parent 65f9d90 commit ed4c38c

File tree

7 files changed

+87
-74
lines changed

7 files changed

+87
-74
lines changed

‎jetpack_vendor/automattic/jetpack-boost-core/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [0.3.2-alpha] - unreleased
9+
10+
This is an alpha version! The changes listed here are not final.
11+
12+
### Fixed
13+
- Cachable: Make the expiry overridable by child classes.
14+
815
## [0.3.1] - 2024-11-25
916
### Changed
1017
- Updated dependencies. [#40286]
@@ -93,6 +100,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
93100
### Added
94101
- Introduce new package. [#31163]
95102

103+
[0.3.2-alpha]: https://github.com/Automattic/jetpack-boost-core/compare/v0.3.1...v0.3.2-alpha
96104
[0.3.1]: https://github.com/Automattic/jetpack-boost-core/compare/v0.3.0...v0.3.1
97105
[0.3.0]: https://github.com/Automattic/jetpack-boost-core/compare/v0.2.14...v0.3.0
98106
[0.2.14]: https://github.com/Automattic/jetpack-boost-core/compare/v0.2.13...v0.2.14

‎jetpack_vendor/automattic/jetpack-boost-core/src/lib/class-cacheable.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ abstract class Cacheable implements \JsonSerializable {
1414

1515
/**
1616
* Default cache expiry.
17+
* Can be overridden by child classes.
1718
*/
18-
const DEFAULT_EXPIRY = 300; // 5 minutes.
19+
protected const DEFAULT_EXPIRY = 300; // 5 minutes.
1920

2021
/**
2122
* The ID of this object, if cached as a transient.
@@ -31,7 +32,11 @@ abstract class Cacheable implements \JsonSerializable {
3132
*
3233
* @return mixed|void
3334
*/
34-
public function store( $expiry = self::DEFAULT_EXPIRY ) {
35+
public function store( $expiry = null ) {
36+
if ( null === $expiry ) {
37+
$expiry = static::DEFAULT_EXPIRY;
38+
}
39+
3540
if ( ! $this->cache_id ) {
3641
$this->cache_id = $this->generate_cache_id();
3742
}

‎jetpack_vendor/automattic/jetpack-boost-speed-score/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"require": {
1717
"php": ">=7.2",
18-
"automattic/jetpack-boost-core": "^0.3.1"
18+
"automattic/jetpack-boost-core": "^0.3.2-alpha"
1919
},
2020
"autoload": {
2121
"classmap": [

‎jetpack_vendor/i18n-map.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
),
1515
'jetpack-boost-core' => array(
1616
'path' => 'jetpack_vendor/automattic/jetpack-boost-core',
17-
'ver' => '0.3.1',
17+
'ver' => '0.3.2-alpha1732789065',
1818
),
1919
'jetpack-boost-speed-score' => array(
2020
'path' => 'jetpack_vendor/automattic/jetpack-boost-speed-score',

‎vendor/composer/installed.json

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dist": {
88
"type": "path",
99
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
10-
"reference": "a317e3c0d43e141aa0b8b20291d2690b539896f6"
10+
"reference": "96da5c7630176c3340e61ae8c3039fde5e95d750"
1111
},
1212
"require": {
1313
"php": ">=7.2"
@@ -63,7 +63,7 @@
6363
"dist": {
6464
"type": "path",
6565
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
66-
"reference": "b801cc8ff337e63b5cf56a25e656f0aec505e1cd"
66+
"reference": "79ea545da0a12f10bb554ab26af544043ec6666a"
6767
},
6868
"require": {
6969
"php": ">=7.2"
@@ -131,7 +131,7 @@
131131
"dist": {
132132
"type": "path",
133133
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
134-
"reference": "9069abc18c3da07f2798354c70ae89397308e3f6"
134+
"reference": "b9f165f93dda783a0abbde6f327f19408d362170"
135135
},
136136
"require": {
137137
"automattic/jetpack-constants": "^3.0.1",
@@ -203,7 +203,7 @@
203203
"dist": {
204204
"type": "path",
205205
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
206-
"reference": "133290d452a843afff55c0e293d8a30e8db58b6c"
206+
"reference": "dd75a237b751b1bbb3ffdf4e8e79521021d505f2"
207207
},
208208
"require": {
209209
"composer-plugin-api": "^2.2",
@@ -274,7 +274,7 @@
274274
"dist": {
275275
"type": "path",
276276
"url": "/tmp/jetpack-build/Automattic/jetpack-backup-helper-script-manager",
277-
"reference": "9bef44a73a9ca3b032d7b87318f3463d977ff2eb"
277+
"reference": "b5f9cba4241ecd629ba2b9385f90f91c327222d4"
278278
},
279279
"require": {
280280
"php": ">=7.2"
@@ -332,12 +332,12 @@
332332
},
333333
{
334334
"name": "automattic/jetpack-boost-core",
335-
"version": "0.3.1",
336-
"version_normalized": "0.3.1.0",
335+
"version": "0.3.2-alpha.1732789065",
336+
"version_normalized": "0.3.2.0-alpha1732789065",
337337
"dist": {
338338
"type": "path",
339339
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
340-
"reference": "af95afbbeb897936abdbd8e394226de1b6dabeaf"
340+
"reference": "afc0466d71dda4943b82ebefcd7b0284502fa29f"
341341
},
342342
"require": {
343343
"automattic/jetpack-connection": "^6.1.0",
@@ -408,10 +408,10 @@
408408
"dist": {
409409
"type": "path",
410410
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
411-
"reference": "7192dbb1e4e77502efd0373cf5f2e90cdd6d71a8"
411+
"reference": "e0347bb35c2848669ee927c5fce7fd8900bc8020"
412412
},
413413
"require": {
414-
"automattic/jetpack-boost-core": "^0.3.1",
414+
"automattic/jetpack-boost-core": "^0.3.2-alpha",
415415
"php": ">=7.2"
416416
},
417417
"require-dev": {
@@ -487,7 +487,7 @@
487487
"dist": {
488488
"type": "path",
489489
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
490-
"reference": "8cf127e155c5481bfc031691dbf3d7df205558ca"
490+
"reference": "823294581d38824d078482572b8a0e3abdb5e243"
491491
},
492492
"require": {
493493
"composer-plugin-api": "^2.2",
@@ -550,7 +550,7 @@
550550
"dist": {
551551
"type": "path",
552552
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
553-
"reference": "e15135259c42d43d508b6e9cd9d5068f0aa1e07a"
553+
"reference": "8077e511dcbd559cfa9702e05a13afae8a98d4a4"
554554
},
555555
"require": {
556556
"php": ">=7.2"
@@ -625,7 +625,7 @@
625625
"dist": {
626626
"type": "path",
627627
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
628-
"reference": "c2213891b88732ba39a18a794a757ee19641a395"
628+
"reference": "8c4b6113750e177c315c65601fa82d1fe652fb6f"
629629
},
630630
"require": {
631631
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -718,7 +718,7 @@
718718
"dist": {
719719
"type": "path",
720720
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
721-
"reference": "28ee7b52bbf8b26b53f7e8f7c068b38e9bffd947"
721+
"reference": "cb307fc03f10d5e8cb1eaa021493a53dc525f2a2"
722722
},
723723
"require": {
724724
"php": ">=7.2"
@@ -775,7 +775,7 @@
775775
"dist": {
776776
"type": "path",
777777
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
778-
"reference": "24634d3ac60612cbe8e37f6aab73ab8600ea598c"
778+
"reference": "219abca8b773915ce0520587f75d54b78b51e6bb"
779779
},
780780
"require": {
781781
"php": ">=7.2"
@@ -831,7 +831,7 @@
831831
"dist": {
832832
"type": "path",
833833
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
834-
"reference": "13906ad784a86f8273db1585976ba9198d57c1cc"
834+
"reference": "623585149e99e95f389e621eae1499b5ebeda845"
835835
},
836836
"require": {
837837
"automattic/jetpack-connection": "^6.1.0",
@@ -909,7 +909,7 @@
909909
"dist": {
910910
"type": "path",
911911
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
912-
"reference": "a6d09429f8a43422d6e5c8fc136d2536985b4b2a"
912+
"reference": "78ca14c72ab8c18626b322dc486cdbee1e719dfe"
913913
},
914914
"require": {
915915
"php": ">=7.2"
@@ -970,7 +970,7 @@
970970
"dist": {
971971
"type": "path",
972972
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
973-
"reference": "23aa55a12d8d8954d62175f674e6c5a128bb620a"
973+
"reference": "f0cbd88976d1587ac6e211dec12599c3f02e45fc"
974974
},
975975
"require": {
976976
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -1048,7 +1048,7 @@
10481048
"dist": {
10491049
"type": "path",
10501050
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
1051-
"reference": "7d5d99851c902174e68334257d52828d63503508"
1051+
"reference": "2da624f81f9e3e31388254f3450ad5825a7f0492"
10521052
},
10531053
"require": {
10541054
"automattic/jetpack-connection": "^6.1.0",
@@ -1113,7 +1113,7 @@
11131113
"dist": {
11141114
"type": "path",
11151115
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
1116-
"reference": "ca67c654f115f553b3d6f3720e2b7ad5c9500c33"
1116+
"reference": "37ee08b394eb2e3eb2ad5bf30c3ca03377be091d"
11171117
},
11181118
"require": {
11191119
"php": ">=7.2"
@@ -1169,7 +1169,7 @@
11691169
"dist": {
11701170
"type": "path",
11711171
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
1172-
"reference": "1cef0e4c63817dfd88c42199d022a1ad2af60dd6"
1172+
"reference": "ef1755818f37ebe362b043c1e6d14a980337f3ba"
11731173
},
11741174
"require": {
11751175
"automattic/jetpack-admin-ui": "^0.5.1",
@@ -1274,7 +1274,7 @@
12741274
"dist": {
12751275
"type": "path",
12761276
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
1277-
"reference": "5e14c120c99e7ab1f62030414e60ef756f6e47f8"
1277+
"reference": "1700a658a9ae0a6c7771054711be7b9dac6e9264"
12781278
},
12791279
"require": {
12801280
"php": ">=7.2"
@@ -1338,7 +1338,7 @@
13381338
"dist": {
13391339
"type": "path",
13401340
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
1341-
"reference": "d3d1241ad0806b453fb77e3fa688616aecc14ad7"
1341+
"reference": "50177256280cd8d8e83870c7d45a7d1ed3965767"
13421342
},
13431343
"require": {
13441344
"automattic/jetpack-connection": "^6.1.0",
@@ -1409,7 +1409,7 @@
14091409
"dist": {
14101410
"type": "path",
14111411
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
1412-
"reference": "1248809fbe8efe7d3ee3f3029dc66d2a1748a260"
1412+
"reference": "c56a52d7ce4e28cc044f06503f57cec10e8e93e2"
14131413
},
14141414
"require": {
14151415
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -1468,7 +1468,7 @@
14681468
"dist": {
14691469
"type": "path",
14701470
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
1471-
"reference": "008c7e1a2126bbf6389c7edb3aed9d683d278f44"
1471+
"reference": "59728e9f938e5ec61fe3e7521e1fd36b7ab355c6"
14721472
},
14731473
"require": {
14741474
"php": ">=7.2"
@@ -1541,7 +1541,7 @@
15411541
"dist": {
15421542
"type": "path",
15431543
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
1544-
"reference": "ea33718b11455ab1d9a85faf3abdf6893624cd53"
1544+
"reference": "eea83c5b3a8d409be3399f06eac2a68f2a559a9f"
15451545
},
15461546
"require": {
15471547
"automattic/jetpack-connection": "^6.1.0",
@@ -1619,7 +1619,7 @@
16191619
"dist": {
16201620
"type": "path",
16211621
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
1622-
"reference": "1f754c4c9db7bbc71becdd03f1593714c6b94b18"
1622+
"reference": "cd2a414650485bf5a5e4a952e5d7b93bc3058de9"
16231623
},
16241624
"require": {
16251625
"automattic/jetpack-status": "^5.0.1",
@@ -1677,7 +1677,7 @@
16771677
"dist": {
16781678
"type": "path",
16791679
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
1680-
"reference": "f526ebbf76d520760d48893e04554e14c5b32262"
1680+
"reference": "caa9da199a84c6fcd0063e333574683289f6794d"
16811681
},
16821682
"require": {
16831683
"php": ">=7.2"
@@ -1734,7 +1734,7 @@
17341734
"dist": {
17351735
"type": "path",
17361736
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
1737-
"reference": "444c6444f24df7397f764e180322604342e99904"
1737+
"reference": "12822f955f01fce31193d632c9b2a938b3c99f4e"
17381738
},
17391739
"require": {
17401740
"automattic/jetpack-constants": "^3.0.1",
@@ -1801,7 +1801,7 @@
18011801
"dist": {
18021802
"type": "path",
18031803
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
1804-
"reference": "d72e84890151219b0bababd5c427ed9c61045f9f"
1804+
"reference": "e616af6ead7997eab086b0ee4c3adb0dd9b554e0"
18051805
},
18061806
"require": {
18071807
"automattic/jetpack-connection": "^6.1.0",
@@ -1882,7 +1882,7 @@
18821882
"dist": {
18831883
"type": "path",
18841884
"url": "/tmp/jetpack-build/Automattic/jetpack-transport-helper",
1885-
"reference": "1dffc29f68f809178608d8033c2d78e65f72d163"
1885+
"reference": "b040d9efc8e53299717fd7b5165720b766eb1001"
18861886
},
18871887
"require": {
18881888
"automattic/jetpack-backup-helper-script-manager": "^0.3.1",
@@ -1960,7 +1960,7 @@
19601960
"dist": {
19611961
"type": "path",
19621962
"url": "/tmp/jetpack-build/Automattic/jetpack-waf",
1963-
"reference": "d097b25d9b70a7dad14219a0fa08c925abfe5e63"
1963+
"reference": "d4871f639cde4a2e414a8927304f722f80f4f9e0"
19641964
},
19651965
"require": {
19661966
"automattic/jetpack-connection": "^6.1.0",

0 commit comments

Comments
 (0)