Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.18 main features #7165

Merged
merged 12 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/deploy_dynamic_lists_fallback.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@ jobs:
uses: engahmeds3ed/[email protected]
with:
name: "dynamic-lists.json"
url: "https://b.rucss.wp-rocket.me/api/exclusions/list"
url: "https://b.rucss.wp-rocket.me/api/v2/exclusions/list"
dir: '/'

- name: Get and save incompatible plugins lists
id: saveIncompatiblePluginsLists
uses: engahmeds3ed/[email protected]
with:
name: "dynamic-lists-incompatible-plugins.json"
url: "https://b.rucss.wp-rocket.me/api/incompatible-plugins/list"
url: "https://b.rucss.wp-rocket.me/api/v2/incompatible-plugins/list"
dir: '/'

- name: Get and Save DelayJS Lists
id: saveDynamicDelayJSLists
uses: engahmeds3ed/[email protected]
with:
name: "dynamic-lists-delayjs.json"
url: "https://b.rucss.wp-rocket.me/api/delay-js-exclusions/list"
url: "https://b.rucss.wp-rocket.me/api/v2/delay-js-exclusions/list"
dir: '/'

- name: Commit All lists JSON files
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/lint_phpcs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- branch-*
- feature/*
- enhancement/*
- fix/*

jobs:
run:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/lint_phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- branch-*
- feature/*
- enhancement/*
- fix/*

jobs:
run:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test_wprocket.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- branch-*
- feature/*
- enhancement/*
- fix/*

jobs:
run:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- branch-*
- feature/*
- enhancement/*
- fix/*

jobs:
run:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test_wprocket_latest_specific.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- branch-*
- feature/*
- enhancement/*
- fix/*

jobs:
run:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test_wprocket_php8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- branch-*
- feature/*
- enhancement/*
- fix/*

jobs:
run:
Expand Down
49 changes: 45 additions & 4 deletions assets/css/wpr-admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ a:focus, button:focus {
color: #121116;
padding: 8px 0;
padding-left: 4px;
border-bottom: 1px solid #c2cad4;
border-bottom: 1px solid rgb(194.1698113208, 202.0188679245, 211.8301886792);
}
.wpr-Popin .wp-rocket-data-table td:not(.column-primary) {
font-family: "Monaco";
Expand Down Expand Up @@ -2870,7 +2870,7 @@ div.wpr-tutorial-item {
font-family: Monaco;
color: #121116;
background: #fff;
border: 2px solid #c2cad4;
border: 2px solid rgb(194.1698113208, 202.0188679245, 211.8301886792);
border-radius: 3px;
font-size: 0.8125rem;
line-height: 1.2307692308;
Expand Down Expand Up @@ -2902,7 +2902,7 @@ div.wpr-tutorial-item {
height: 32px;
color: #121116;
background: #fff;
border: 2px solid #c2cad4;
border: 2px solid rgb(194.1698113208, 202.0188679245, 211.8301886792);
border-radius: 3px;
font-family: Monaco;
font-size: 0.75rem;
Expand Down Expand Up @@ -3117,9 +3117,37 @@ div.wpr-tutorial-item {
}
.wpr-field--categorizedmultiselect .wpr-list.open .wpr-list-header {
max-height: 32px;
cursor: pointer;
}
.wpr-field--categorizedmultiselect .wpr-list .wpr-list-header {
max-height: 32px;
cursor: pointer;
}
.wpr-field--categorizedmultiselect .wpr-list .wpr-list-header .wpr-badge-counter {
display: inline-block;
vertical-align: top;
box-sizing: border-box;
margin: 2px 0 0px 2px;
padding: 0 7px;
min-width: 18px;
height: 18px;
border-radius: 9px;
background-color: #eb714a;
color: #fff;
font-size: 11px;
font-weight: bold;
line-height: 1.6;
text-align: center;
}
.wpr-field--categorizedmultiselect .wpr-list .wpr-list-header .wpr-list-header-data {
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px;
}
.wpr-field--categorizedmultiselect .wpr-list .wpr-list-header .wpr-list-header-data img {
width: 16px;
height: 16px;
}
.wpr-field--categorizedmultiselect .wpr-list [type=checkbox] + label:before {
top: 4px;
Expand Down Expand Up @@ -3152,8 +3180,21 @@ div.wpr-tutorial-item {
color: #72777c;
}
.wpr-field--categorizedmultiselect .wpr-multiple-select-title {
cursor: pointer;
font-weight: bold;
margin-left: 5px;
}
.wpr-field--categorizedmultiselect .wpr-subsection {
padding-left: 30px;
}
.wpr-field--categorizedmultiselect .wpr-select-all {
border-bottom: 2px solid #e9e9e9;
width: 150px;
padding-bottom: 10px;
}

[data-parent=delay_js].wpr-field--children {
margin-left: 32px;
padding-left: 0;
}

@media only screen and (min-width: 782px) {
Expand Down
2 changes: 1 addition & 1 deletion assets/css/wpr-admin.min.css

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions assets/img/ad_network.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/img/analytics.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/img/others.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/img/payment.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/img/plugins.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/img/themes.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 33 additions & 3 deletions assets/js/wpr-admin.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/wpr-admin.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/wpr-admin.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dynamic-lists-delayjs.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dynamic-lists.json

Large diffs are not rendered by default.

28 changes: 28 additions & 0 deletions inc/3rd-party/plugins/autoptimize.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,34 @@ function rocket_activate_autoptimize() {
}
add_action( 'activate_autoptimize/autoptimize.php', 'rocket_activate_autoptimize', 11 );

/**
* Disable WP Rocket minification if Autoptimize css /js minification is enabled.
*
* @param array $options WP Rocket options array.
*
* @since 3.18
*
* @return array
*/
function rocket_maybe_disable_minification( $options ) {
// Bail early if plugin is not active.
if ( ! is_plugin_active( 'autoptimize/autoptimize.php' ) ) {
return $options;
}

if ( 'on' === get_option( 'autoptimize_css' ) ) {
$options['minify_css'] = 0;
}

if ( 'on' === get_option( 'autoptimize_js' ) ) {
$options['minify_js'] = 0;
}

return $options;
}

add_filter( 'rocket_first_install_options', 'rocket_maybe_disable_minification' );

/**
* Disable WP Rocket lazyload fields if Autoptimize lazyload is enabled
*
Expand Down
10 changes: 10 additions & 0 deletions inc/Engine/Admin/Beacon/Beacon.php
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,16 @@ public function get_suggest( $doc_id ) {
'url' => 'https://fr.docs.wp-rocket.me/article/1836-rendu-differe-automatique/?utm_source=wp_plugin&utm_medium=wp_rocket',
],
],
'host_fonts_locally' => [
'en' => [
'id' => '673358b02ddbd952f6241b38',
'url' => 'https://docs.wp-rocket.me/article/1847-self-host-google-fonts?utm_source=wp_plugin&utm_medium=wp_rocket',
],
'fr' => [
'id' => '675ab51d46b8d26833b2af82',
'url' => 'https://fr.docs.wp-rocket.me/article/1852-auto-heberger-google-fonts?utm_source=wp_plugin&utm_medium=wp_rocket',
],
],
];

return isset( $suggest[ $doc_id ][ $this->get_user_locale() ] )
Expand Down
Loading
Loading