3.18 main features (#7165)

Co-authored-by: Gaël Robin <[email protected]> Co-authored-by: Michael Lee <[email protected]> Co-authored-by: Opeyemi Ibrahim <[email protected]> Co-authored-by: Rémy Perona <[email protected]> Co-authored-by: Rémy Perona <[email protected]> Co-authored-by: Michael Lee <[email protected]> Co-authored-by: hanna-meda <[email protected]>
wp-media · Jan 3, 2025 · 3a73b77 · 3a73b77
1 parent dfe5a7a
commit 3a73b77
Show file tree

Hide file tree

Showing 112 changed files with 4,738 additions and 323 deletions.
diff --git a/.github/workflows/deploy_dynamic_lists_fallback.yml b/.github/workflows/deploy_dynamic_lists_fallback.yml
@@ -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

diff --git a/.github/workflows/lint_phpcs.yml b/.github/workflows/lint_phpcs.yml
@@ -8,6 +8,7 @@ on:
       - branch-*
       - feature/*
       - enhancement/*
+      - fix/*
 
 jobs:
   run:

diff --git a/.github/workflows/lint_phpstan.yml b/.github/workflows/lint_phpstan.yml
@@ -8,6 +8,7 @@ on:
       - branch-*
       - feature/*
       - enhancement/*
+      - fix/*
 
 jobs:
   run:

diff --git a/.github/workflows/test_wprocket.yml b/.github/workflows/test_wprocket.yml
@@ -8,6 +8,7 @@ on:
       - branch-*
       - feature/*
       - enhancement/*
+      - fix/*
 
 jobs:
   run:

diff --git a/.github/workflows/test_wprocket_latest_general_coverage.yml b/.github/workflows/test_wprocket_latest_general_coverage.yml
@@ -8,6 +8,7 @@ on:
       - branch-*
       - feature/*
       - enhancement/*
+      - fix/*
 
 jobs:
   run:

diff --git a/.github/workflows/test_wprocket_latest_specific.yml b/.github/workflows/test_wprocket_latest_specific.yml
@@ -8,6 +8,7 @@ on:
       - branch-*
       - feature/*
       - enhancement/*
+      - fix/*
 
 jobs:
   run:

diff --git a/.github/workflows/test_wprocket_php8.yml b/.github/workflows/test_wprocket_php8.yml
@@ -8,6 +8,7 @@ on:
       - branch-*
       - feature/*
       - enhancement/*
+      - fix/*
 
 jobs:
   run:

diff --git a/assets/css/wpr-admin.css b/assets/css/wpr-admin.css
@@ -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";
@@ -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;
@@ -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;
@@ -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;
@@ -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) {

diff --git a/assets/css/wpr-admin.min.css b/assets/css/wpr-admin.min.css
diff --git a/assets/img/ad_network.svg b/assets/img/ad_network.svg
diff --git a/assets/img/analytics.svg b/assets/img/analytics.svg
diff --git a/assets/img/others.svg b/assets/img/others.svg
diff --git a/assets/img/payment.svg b/assets/img/payment.svg
diff --git a/assets/img/plugins.svg b/assets/img/plugins.svg
diff --git a/assets/img/themes.svg b/assets/img/themes.svg
diff --git a/assets/js/wpr-admin.js b/assets/js/wpr-admin.js
diff --git a/assets/js/wpr-admin.min.js b/assets/js/wpr-admin.min.js
diff --git a/assets/js/wpr-admin.min.js.map b/assets/js/wpr-admin.min.js.map
diff --git a/dynamic-lists-delayjs.json b/dynamic-lists-delayjs.json
diff --git a/dynamic-lists.json b/dynamic-lists.json
diff --git a/inc/3rd-party/plugins/autoptimize.php b/inc/3rd-party/plugins/autoptimize.php
@@ -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
  *

diff --git a/inc/Engine/Admin/Beacon/Beacon.php b/inc/Engine/Admin/Beacon/Beacon.php
@@ -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() ] )
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ on: @@
           - branch-*
           - feature/*
           - enhancement/*
+          - fix/*
     jobs:
       run:
@@ Expand Down @@