Merge branch 'develop' into fix/6599-validate-image-src

.github/workflows/deploy_dynamic_lists_fallback.yml

@@ -27,7 +27,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GH_WORKFLOW_TOKEN }}
 

.github/workflows/deploy_plugin.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -22,7 +22,7 @@ jobs:
         id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

.github/workflows/licence_data.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

.github/workflows/lint_phpcs.yml

@@ -17,12 +17,12 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['7.4']
+        php-versions: ['8.2']
 
     name: WPRocket lint with PHPCS. PHP ${{ matrix.php-versions }} on ${{ matrix.operating-system }}.
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2

.github/workflows/lint_phpstan.yml

@@ -17,12 +17,12 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['7.4']
+        php-versions: ['8.2']
 
     name: WPRocket lint with PHP Stan. PHP ${{ matrix.php-versions }} on ${{ matrix.operating-system }}.
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2

.github/workflows/test_wprocket.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -62,7 +62,7 @@ jobs:
       run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
     - name: Cache dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ${{ steps.composercache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

.github/workflows/test_wprocket_latest_general_coverage.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -62,7 +62,7 @@ jobs:
       run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
     - name: Cache dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ${{ steps.composercache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -90,4 +90,4 @@ jobs:
       uses: codacy/codacy-coverage-reporter-action@v1
       with:
         project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-        coverage-reports: tests/report/coverage.clover
+        coverage-reports: tests/report/coverage.clover

.github/workflows/test_wprocket_latest_specific.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -62,7 +62,7 @@ jobs:
       run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
     - name: Cache dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ${{ steps.composercache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

.github/workflows/test_wprocket_php8.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -62,7 +62,7 @@ jobs:
       run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
     - name: Cache dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ${{ steps.composercache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

README.md

@@ -30,6 +30,24 @@ To be able to validate your license and use the plugin, you will also have to ma
 - `WP_ROCKET_EMAIL` which is the email for your WP Rocket account
 - `WP_ROCKET_KEY` which is your API Key
 
+## Gulp Tasks
+
+| Command                         |                                                 Description                                                  |
+|---------------------------------|:------------------------------------------------------------------------------------------------------------:|
+| **CSS Tasks**                   |                                                                                                              |
+| `gulp build:saas:unmin`         |                        Builds Full admin CSS, the unminified version (wpr-admin.css)                         |
+| `gulp build:saas:min`           |                       Builds Full admin CSS, the minified version (wpr-admin.min.css)                        |
+| `gulp build:sass:all`           |   Builds all admin CSS files (wpr-admin.css, wpr-admin.min.css, wpr-admin-rtl.css, wpr-admin-rtl.min.css)    |
+| `gulp sass:watch`               |              Watches all admin CSS files mentioned above and builds them again with any change.              |
+| **JS Tasks**                    |                                                                                                              |
+| `gulp build:js:app:unmin`       |                       Builds admin app js file, the unminified version (wpr-admin.js)                        |
+| `gulp build:js:app:min`         |                      Builds admin app js file, the minified version (wpr-admin.min.js)                       |
+| `gulp build:js:lazyloadcss:min` |                   Builds lazyload CSS js file, the minified version (lazyload-css.min.js)                    |
+| `gulp build:js:lcp:min`         |                      Builds lcp beacon script, the minified version (lcp-beacon.min.js)                      |
+| `gulp build:js:all`             | Builds all js files mentioned above (wpr-admin.js, wpr-admin.min.js, lazyload-css.min.js, lcp-beacon.min.js) |
+| `gulp js:watch`                 |                      Watches all js files changes and build them again with any change.                      |
+
+
 ## Support
 
 Need help with something? Open a [ticket](https://wp-rocket.me/support/?utm_source=github&utm_medium=wp_rocket_profile) and we will be happy to help you out!

assets/css/wpr-admin.css

@@ -92,6 +92,18 @@ a:focus, button:focus {
   justify-content: center;
 }
 
+.wpr-mt-2 {
+  margin-top: 20px;
+}
+
+.wpr-fs-sm {
+  font-size: 0.9em;
+}
+
+.wpr-fs-md {
+  font-size: 1em;
+}
+
 /*-----------------------------------------------*\
 
 	Icons in a font-icon with icomoon (https://icomoon.io/app)
@@ -279,6 +291,14 @@ a:focus, button:focus {
   content: url("../img/play-alt.svg");
 }
 
+.wpr-imagify-info:before {
+  content: url("../img/imagify-info.svg");
+}
+
+.wpr-imagify-install:before {
+  content: url("../img/imagify-install.svg");
+}
+
 .wpr-title1 {
   font-size: 1.625rem;
   line-height: 1;
@@ -2356,7 +2376,7 @@ div.wpr-upgrade-websites {
   margin-top: 30px;
 }
 .wpr-imagify-description {
-  width: 33.3333333333%;
+  width: 40%;
   padding-right: 60px;
 }
 @media (max-width: 1239px) {
@@ -2366,7 +2386,7 @@ div.wpr-upgrade-websites {
   }
 }
 .wpr-imagify-screenshot {
-  width: 66.6666666667%;
+  width: 60%;
 }
 @media (max-width: 1239px) {
   .wpr-imagify-screenshot {
@@ -2396,12 +2416,22 @@ div.wpr-upgrade-websites {
   margin-top: 0;
 }
 .wpr-imagify ul {
-  margin-top: 0;
-  margin-left: 40px;
-  list-style-type: ">";
+  margin-top: 40px;
 }
 .wpr-imagify li {
-  padding-left: 7px;
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 35px;
+}
+.wpr-imagify li:before {
+  width: 24px;
+  height: 24px;
+  margin-right: 10px;
+  flex-shrink: 0;
+}
+.wpr-imagify li .text {
+  flex-grow: 1;
+  display: inline-block;
 }
 .wpr-imagify a {
   text-decoration: none;
@@ -2423,6 +2453,41 @@ div.wpr-upgrade-websites {
   text-transform: uppercase;
 }
 
+.wpr-imagify-plugin-tile {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  padding: 20px;
+  background-color: #f9fafb;
+  margin-top: 20px;
+  border: 1px solid #ebe9e9;
+}
+.wpr-imagify-plugin-tile-info {
+  margin-left: 20px;
+}
+.wpr-imagify-plugin-tile-info .wpr-star-rating {
+  display: flex;
+  align-items: center;
+}
+.wpr-imagify-plugin-tile-info .star-rating .star {
+  font-size: 16px;
+  width: 16px;
+  height: 13px;
+}
+.wpr-imagify-plugin-tile-info .num-ratings {
+  font-size: 13px;
+  margin-left: 10px;
+}
+.wpr-imagify-plugin-tile-title {
+  margin-bottom: 5px;
+}
+.wpr-imagify-plugin-tile .wpr-button {
+  margin-left: auto;
+}
+.wpr-imagify-plugin-tile .wpr-button:before {
+  margin-right: 5px;
+}
+
 .wpr-tutorials-section {
   display: flex;
   flex-flow: row wrap;