Merge tag '5.13.2'

STOMAIL-7355

.circleci/check_woocommerce_beta.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # Fetch the versions of WooCommerce from the WordPress API
-VERSIONS=$(curl -s https://api.wordpress.org/plugins/info/1.0/woocommerce.json | jq -r '.versions | keys_unsorted | .[]' | grep -v 'trunk')
-LATEST_VERSION=""
-
-# Find the latest version
-for version in $VERSIONS; do
-  LATEST_VERSION=$version
-done
+LATEST_VERSION=$(
+  curl -s https://api.wordpress.org/plugins/info/1.0/woocommerce.json | \
+  jq -r '.versions | keys_unsorted | .[]' | \
+  grep -v 'trunk' | \
+  sort -V | \
+  tail -n 1
+)
 
 # Check if the latest version is a beta/RC version
 if [[ $LATEST_VERSION != *'beta'* && $LATEST_VERSION != *'rc'* ]]; then

.circleci/config.yml

@@ -104,7 +104,7 @@ executors:
   wpcli_php_latest:
     <<: *default_job_config
     docker:
-      - image: mailpoet/wordpress:8.2_20241126.1
+      - image: mailpoet/wordpress:8.3_20250305.1
 
   wpcli_php_mysql_oldest:
     <<: *default_job_config
@@ -115,7 +115,7 @@ executors:
   wpcli_php_mysql_latest:
     <<: *default_job_config
     docker:
-      - image: mailpoet/wordpress:8.2_20241126.1
+      - image: mailpoet/wordpress:8.3_20250305.1
       - image: cimg/mysql:8.0
         command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_520_ci
 
@@ -197,10 +197,10 @@ jobs:
       - run:
           name: Download additional WP Plugins for tests
           command: |
-            ./do download:woo-commerce-zip 9.7.0
-            ./do download:woo-commerce-subscriptions-zip 7.2.1
-            ./do download:woo-commerce-memberships-zip 1.26.5
-            ./do download:automate-woo-zip 6.1.7
+            ./do download:woo-commerce-zip 10.0.4
+            ./do download:woo-commerce-subscriptions-zip 7.7.0
+            ./do download:woo-commerce-memberships-zip
+            ./do download:automate-woo-zip 6.1.15
       - run:
           name: Dump tests ENV variables for acceptance tests
           command: |
@@ -378,9 +378,6 @@ jobs:
       woo_subscriptions_version:
         type: string
         default: ''
-      woo_memberships_version:
-        type: string
-        default: ''
       automate_woo_version:
         type: string
         default: ''
@@ -471,7 +468,7 @@ jobs:
                 name: Download WooCommerce Core
                 command: |
                   cd ../tests_env/docker
-                  docker compose run --rm -w /project --entrypoint "./do download:woo-commerce-zip ${WOOCOMMERCE_VERSION}" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_acceptance
+                  docker compose run --rm -w /project --entrypoint "./do download:woo-commerce-zip ${WOOCOMMERCE_VERSION}" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_WOOCOMMERCE_TOKEN=${WP_GITHUB_WOOCOMMERCE_TOKEN} codeception_acceptance
       - when:
           condition: << parameters.woo_subscriptions_version >>
           steps:
@@ -479,15 +476,7 @@ jobs:
                 name: Download WooCommerce Subscriptions
                 command: |
                   cd ../tests_env/docker
-                  docker compose run --rm -w /project --entrypoint "./do download:woo-commerce-subscriptions-zip << parameters.woo_subscriptions_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_acceptance
-      - when:
-          condition: << parameters.woo_memberships_version >>
-          steps:
-            - run:
-                name: Download WooCommerce Memberships
-                command: |
-                  cd ../tests_env/docker
-                  docker compose run --rm -w /project --entrypoint "./do download:woo-commerce-memberships-zip << parameters.woo_memberships_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_acceptance
+                  docker compose run --rm -w /project --entrypoint "./do download:woo-commerce-subscriptions-zip << parameters.woo_subscriptions_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_WOOCOMMERCE_TOKEN=${WP_GITHUB_WOOCOMMERCE_TOKEN} codeception_acceptance
       - when:
           condition: << parameters.automate_woo_version >>
           steps:
@@ -495,7 +484,7 @@ jobs:
                 name: Download AutomateWoo
                 command: |
                   cd ../tests_env/docker
-                  docker compose run --rm -w /project --entrypoint "./do download:automate-woo-zip << parameters.automate_woo_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_acceptance
+                  docker compose run --rm -w /project --entrypoint "./do download:automate-woo-zip << parameters.automate_woo_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_WOOCOMMERCE_TOKEN=${WP_GITHUB_WOOCOMMERCE_TOKEN} codeception_acceptance
       - run:
           name: Group acceptance tests
           command: |
@@ -695,9 +684,6 @@ jobs:
       woo_subscriptions_version:
         type: string
         default: ''
-      woo_memberships_version:
-        type: string
-        default: ''
       automate_woo_version:
         type: string
         default: ''
@@ -767,7 +753,7 @@ jobs:
                 name: Download WooCommerce Core
                 command: |
                   cd ../tests_env/docker
-                  docker compose run --rm -w /project --entrypoint "./do download:woo-commerce-zip ${WOOCOMMERCE_VERSION}" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_integration
+                  docker compose run --rm -w /project --entrypoint "./do download:woo-commerce-zip ${WOOCOMMERCE_VERSION}" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_WOOCOMMERCE_TOKEN=${WP_GITHUB_WOOCOMMERCE_TOKEN} codeception_integration
       - when:
           condition: << parameters.woo_subscriptions_version >>
           steps:
@@ -775,15 +761,7 @@ jobs:
                 name: Download WooCommerce Subscriptions
                 command: |
                   cd ../tests_env/docker
-                  docker compose run --rm -w /project --entrypoint "./do download:woo-commerce-subscriptions-zip << parameters.woo_subscriptions_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_integration
-      - when:
-          condition: << parameters.woo_memberships_version >>
-          steps:
-            - run:
-                name: Download WooCommerce Memberships
-                command: |
-                  cd ../tests_env/docker
-                  docker compose run --rm -w /project --entrypoint "./do download:woo-commerce-memberships-zip << parameters.woo_memberships_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_integration
+                  docker compose run --rm -w /project --entrypoint "./do download:woo-commerce-subscriptions-zip << parameters.woo_subscriptions_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_WOOCOMMERCE_TOKEN=${WP_GITHUB_WOOCOMMERCE_TOKEN} codeception_integration
       - when:
           condition: << parameters.automate_woo_version >>
           steps:
@@ -791,7 +769,7 @@ jobs:
                 name: Download AutomateWoo
                 command: |
                   cd ../tests_env/docker
-                  docker compose run --rm -w /project --entrypoint "./do download:automate-woo-zip << parameters.automate_woo_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_integration
+                  docker compose run --rm -w /project --entrypoint "./do download:automate-woo-zip << parameters.automate_woo_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_WOOCOMMERCE_TOKEN=${WP_GITHUB_WOOCOMMERCE_TOKEN} codeception_integration
       - run:
           name: 'PHP Integration tests'
           command: |
@@ -949,14 +927,8 @@ jobs:
       - run:
           name: 'QIT Activation Tests'
           command: |
-            LATEST_WC_BETA=$(../.circleci/check_woocommerce_beta.sh | grep 'LATEST_BETA' | cut -d'=' -f2)
-            if [ -z "$LATEST_WC_BETA" ]; then
-              echo "No WooCommerce Beta version found. Using stable."
-              ./do qa:qit-activation | tee tests/_output/qit-activation
-            else
-              echo "Using WooCommerce Beta Version: $LATEST_WC_BETA"
-              ./do qa:qit-activation --wc=$LATEST_WC_BETA | tee tests/_output/qit-activation
-            fi
+            echo "Using WooCommerce RC Version"
+            ./do qa:qit-activation --wc=rc | tee tests/_output/qit-activation
       - run:
           name: 'Retrieve test results'
           command: |
@@ -980,14 +952,8 @@ jobs:
       - run:
           name: 'QIT Woo API Tests'
           command: |
-            LATEST_WC_BETA=$(../.circleci/check_woocommerce_beta.sh | grep 'LATEST_BETA' | cut -d'=' -f2)
-            if [ -z "$LATEST_WC_BETA" ]; then
-              echo "No WooCommerce Beta version found. Using stable."
-              ./do qa:qit-woo-api | tee tests/_output/qit-woo-api
-            else
-              echo "Using WooCommerce Beta Version: $LATEST_WC_BETA"
-              ./do qa:qit-woo-api --wc=$LATEST_WC_BETA | tee tests/_output/qit-woo-api
-            fi
+            echo "Using WooCommerce RC Version"
+            ./do qa:qit-woo-api --wc=rc | tee tests/_output/qit-woo-api
       - run:
           name: 'Retrieve test results'
           command: |
@@ -1012,14 +978,8 @@ jobs:
           name: 'QIT Woo E2E Tests'
           no_output_timeout: 1h # Woo E2E tests usually takes ~45m
           command: |
-            LATEST_WC_BETA=$(../.circleci/check_woocommerce_beta.sh | grep 'LATEST_BETA' | cut -d'=' -f2)
-            if [ -z "$LATEST_WC_BETA" ]; then
-              echo "No WooCommerce Beta version found. Using stable."
-              ./do qa:qit-woo-e2e | tee tests/_output/qit-woo-e2e
-            else
-              echo "Using WooCommerce Beta Version: $LATEST_WC_BETA"
-              ./do qa:qit-woo-e2e --wc=$LATEST_WC_BETA | tee tests/_output/qit-woo-e2e
-            fi
+            echo "Using WooCommerce RC Version"
+            ./do qa:qit-woo-e2e --wc=rc | tee tests/_output/qit-woo-e2e
       - run:
           name: 'Retrieve test results'
           command: |
@@ -1052,7 +1012,7 @@ workflows:
       - static_analysis:
           <<: *slack-fail-post-step
           name: static_analysis_php8
-          php_version: 80200
+          php_version: 80300
           requires:
             - build
       - security_analysis:
@@ -1222,15 +1182,14 @@ workflows:
       - acceptance_tests:
           <<: *slack-fail-post-step
           name: acceptance_oldest
-          woo_core_version: 9.6.2
-          woo_subscriptions_version: 7.1.0
-          woo_memberships_version: 1.25.2
+          woo_core_version: 9.9.5
+          woo_subscriptions_version: 7.6.0
           automate_woo_version: 6.0.33
           mysql_command: --max_allowed_packet=100M
-          mysql_image: mysql:5.5
+          mysql_image: mysql:5.6
           codeception_image_version: 7.4-cli_20220605.0
           wordpress_image_version: 6.1.1-php7.4 # We use image with PHP 7.4 and install required WordPress version via CLI
-          wordpress_version: 6.6.2
+          wordpress_version: 6.7.2
           requires:
             - build
       - performance_tests:
@@ -1263,15 +1222,14 @@ workflows:
       - integration_tests:
           <<: *slack-fail-post-step
           name: integration_oldest
-          woo_core_version: 9.6.2
-          woo_subscriptions_version: 7.1.0
-          woo_memberships_version: 1.25.2
+          woo_core_version: 9.9.5
+          woo_subscriptions_version: 7.6.0
           automate_woo_version: 6.0.33
           codeception_image_version: 7.4-cli_20220605.0
           wordpress_image_version: 6.1.1-php7.4 # We use image with PHP 7.4 and install required WordPress version via CLI # We use image with PHP 7.4 and install required WordPress version via CLI
-          wordpress_version: 6.6.2
+          wordpress_version: 6.7.2
           mysql_command: --max_allowed_packet=100M
-          mysql_image: mysql:5.5
+          mysql_image: mysql:5.6
           requires:
             - build
       - build_premium:
@@ -1326,27 +1284,25 @@ workflows:
       - acceptance_tests:
           <<: *slack-fail-post-step
           name: acceptance_with_premium_oldest
-          woo_core_version: 9.6.2
-          woo_subscriptions_version: 7.1.0
-          woo_memberships_version: 1.25.2
+          woo_core_version: 9.9.5
+          woo_subscriptions_version: 7.6.0
           automate_woo_version: 6.0.33
           codeception_image_version: 7.4-cli_20220605.0
           wordpress_image_version: 6.1.1-php7.4 # We use image with PHP 7.4 and install required WordPress version via CLI
-          wordpress_version: 6.6.2
+          wordpress_version: 6.7.2
           requires:
             - build_premium
       - integration_tests:
           <<: *slack-fail-post-step
           name: integration_with_premium_oldest
-          woo_core_version: 9.6.2
-          woo_subscriptions_version: 7.1.0
-          woo_memberships_version: 1.25.2
+          woo_core_version: 9.9.5
+          woo_subscriptions_version: 7.6.0
           automate_woo_version: 6.0.33
           codeception_image_version: 7.4-cli_20220605.0
           wordpress_image_version: 6.1.1-php7.4 # We use image with PHP 7.4 and install required WordPress version via CLI
-          wordpress_version: 6.6.2
+          wordpress_version: 6.7.2
           mysql_command: --max_allowed_packet=100M
-          mysql_image: mysql:5.5
+          mysql_image: mysql:5.6
           requires:
             - build_premium
 

.github/pull_request_template.md

@@ -24,6 +24,7 @@ _N/A_
 
 ## Tasks
 
+- [ ] I have added a changelog entry (`./do changelog:add --type=<type> --description=<description>`)
 - [ ] I followed [best practices](https://codex.wordpress.org/I18n_for_WordPress_Developers) for translations
 - [ ] I added sufficient test coverage
 - [ ] I embraced TypeScript by either creating new files in TypeScript or converting existing JavaScript files when making changes

.github/workflows/codeql-analysis.yml

@@ -1,71 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-name: 'CodeQL'
-
-on:
-  push:
-    branches: [trunk]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [trunk]
-  schedule:
-    - cron: '0 17 * * 4'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        # Override automatic language detection by changing the below list
-        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: ['javascript']
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          # We must fetch at least the immediate parents so that if this is
-          # a pull request then we can checkout the head.
-          fetch-depth: 2
-
-      # If this run was triggered by a pull request event, then checkout
-      # the head of the pull request instead of the merge commit.
-      - run: git checkout HEAD^2
-        if: ${{ github.event_name == 'pull_request' }}
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
-
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
-
-      #- run: |
-      #   make bootstrap
-      #   make release
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1

.github/workflows/email-editor-package.yml

@@ -1,212 +0,0 @@
-name: Email Editor Package Tests
-
-on:
-  push:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        php-version: ['7.4', '8.2']
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Cache Composer vendor dependencies for MailPoet
-        id: composer-mailpoet-cache
-        uses: actions/cache@v4
-        with:
-          path: mailpoet/vendor
-          key: ${{ runner.os }}-composer-mailpoet-${{ matrix.php-version }}-${{ hashFiles('mailpoet/composer.lock') }}-${{ hashFiles('mailpoet/composer.json') }}
-
-      - name: Cache Composer vendor-prefixed dependencies for MailPoet
-        id: vendor-prefixed-cache
-        uses: actions/cache@v4
-        with:
-          path: mailpoet/vendor-prefixed
-          key: ${{ runner.os }}-vendor-prefixed-${{ matrix.php-version }}-${{ hashFiles('mailpoet/prefixer/composer.lock') }}-${{ hashFiles('mailpoet/prefixer/composer.json') }}
-
-      - name: Cache Composer vendor for test environment
-        id: composer-tests-env-cache
-        uses: actions/cache@v4
-        with:
-          path: tests_env/vendor
-          key: ${{ runner.os }}-composer-mailpoet-${{ matrix.php-version }}-${{ hashFiles('tests_env/composer.lock') }}-${{ hashFiles('tests_env/composer.json') }}
-
-      - name: Cache Composer dependencies for Email Editor
-        id: composer-email-editor-cache
-        uses: actions/cache@v4
-        with:
-          path: packages/php/email-editor/vendor
-          key: ${{ runner.os }}-composer-email-editor-${{ matrix.php-version }}-${{ hashFiles('packages/php/email-editor/composer.lock') }}-${{ hashFiles('packages/php/email-editor/composer.json') }}
-
-      - name: Set up PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          extensions: gd
-
-      - name: Install tools
-        run: |
-          COMPOSER_DEV_MODE=1 php tools/install.php
-          touch .env
-        working-directory: mailpoet
-
-      # Install Test Environment dependencies only if the cache was not hit
-      - name: Install test environment dependencies
-        if: steps.composer-tests-env-cache.outputs.cache-hit != 'true'
-        run: ../mailpoet/tools/vendor/composer.phar install
-        working-directory: tests_env
-
-      # Install MailPoet dependencies only if the cache was not hit
-      - name: Install mailpoet dependencies
-        if: |
-          steps.composer-mailpoet-cache.outputs.cache-hit != 'true' || steps.vendor-prefixed-cache.outputs.cache-hit != 'true'
-        run: ./tools/vendor/composer.phar install
-        working-directory: mailpoet
-
-      # Install Email Editor dependencies only if the cache was not hit
-      - name: Install email-editor dependencies
-        if: steps.composer-email-editor-cache.outputs.cache-hit != 'true'
-        run: ../../../mailpoet/tools/vendor/composer.phar install
-        working-directory: packages/php/email-editor
-
-      # Dump Email Editor autoload
-      # This is needed to refresh classmap autoload when the composer cache is hit
-      - name: Dump email-editor autoload
-        run: ../../../mailpoet/tools/vendor/composer.phar dump-autoload
-        working-directory: packages/php/email-editor
-
-      # Dump MailPoet autoload
-      # This is needed to refresh classmap autoload when the composer cache is hit
-      - name: Dump MailPoet autoload
-        run: ./tools/vendor/composer.phar dump-autoload
-        working-directory: mailpoet
-
-      # Run Email Editor unit tests
-      - name: Run email-editor package unit tests
-        run: ../../../tests_env/vendor/bin/codecept build && ../../../mailpoet/tools/vendor/composer.phar unit-test
-        working-directory: packages/php/email-editor
-
-      - name: Run email-editor package integration tests
-        run: ../../../mailpoet/tools/vendor/composer.phar integration-test
-        working-directory: packages/php/email-editor
-
-  code-style:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.2'
-
-      - name: Install tools
-        run: |
-          COMPOSER_DEV_MODE=1 php tools/install.php
-          touch .env
-        working-directory: mailpoet
-
-      - name: Install composer dependencies
-        run: ../../tools/vendor/composer.phar install
-        working-directory: mailpoet/tasks/code_sniffer
-
-      - name: Run code style check
-        run: ../../../mailpoet/tools/vendor/composer.phar code-style
-        working-directory: packages/php/email-editor
-
-  phpstan-static-analysis:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        php-version: ['7.4', '8.2']
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Cache Composer vendor dependencies for MailPoet
-        id: composer-mailpoet-cache
-        uses: actions/cache@v4
-        with:
-          path: mailpoet/vendor
-          key: ${{ runner.os }}-composer-mailpoet-${{ matrix.php-version }}-${{ hashFiles('mailpoet/composer.lock') }}-${{ hashFiles('mailpoet/composer.json') }}
-
-      - name: Cache Composer vendor-prefixed dependencies for MailPoet
-        id: vendor-prefixed-cache
-        uses: actions/cache@v4
-        with:
-          path: mailpoet/vendor-prefixed
-          key: ${{ runner.os }}-vendor-prefixed-${{ matrix.php-version }}-${{ hashFiles('mailpoet/prefixer/composer.lock') }}-${{ hashFiles('mailpoet/prefixer/composer.json') }}
-
-      - name: Cache Composer vendor for test environment
-        id: composer-tests-env-cache
-        uses: actions/cache@v4
-        with:
-          path: tests_env/vendor
-          key: ${{ runner.os }}-composer-mailpoet-${{ matrix.php-version }}-${{ hashFiles('tests_env/composer.lock') }}-${{ hashFiles('tests_env/composer.json') }}
-
-      - name: Cache Composer dependencies for Email Editor
-        id: composer-email-editor-cache
-        uses: actions/cache@v4
-        with:
-          path: packages/php/email-editor/vendor
-          key: ${{ runner.os }}-composer-email-editor-${{ matrix.php-version }}-${{ hashFiles('packages/php/email-editor/composer.lock') }}-${{ hashFiles('packages/php/email-editor/composer.json') }}
-
-      - name: Set up PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          extensions: gd
-
-      - name: Install tools
-        run: |
-          COMPOSER_DEV_MODE=1 php tools/install.php
-          touch .env
-        working-directory: mailpoet
-
-      # Install Test Environment dependencies only if the cache was not hit
-      - name: Install test environment dependencies
-        if: steps.composer-tests-env-cache.outputs.cache-hit != 'true'
-        run: ../mailpoet/tools/vendor/composer.phar install
-        working-directory: tests_env
-
-      # Install MailPoet dependencies only if the cache was not hit
-      - name: Install mailpoet dependencies
-        if: |
-          steps.composer-mailpoet-cache.outputs.cache-hit != 'true' || steps.vendor-prefixed-cache.outputs.cache-hit != 'true'
-        run: ./tools/vendor/composer.phar install
-        working-directory: mailpoet
-
-      # Install Email Editor dependencies only if the cache was not hit
-      - name: Install email-editor dependencies
-        if: steps.composer-email-editor-cache.outputs.cache-hit != 'true'
-        run: ../../../mailpoet/tools/vendor/composer.phar install
-        working-directory: packages/php/email-editor
-
-      - name: Install composer dependencies
-        run: ../../tools/vendor/composer.phar install
-        working-directory: mailpoet/tasks/phpstan
-
-      # Dump Email Editor autoload
-      # This is needed to refresh classmap autoload when the composer cache is hit
-      - name: Dump email-editor autoload
-        run: ../../../mailpoet/tools/vendor/composer.phar dump-autoload
-        working-directory: packages/php/email-editor
-
-      # Dump MailPoet autoload
-      # This is needed to refresh classmap autoload when the composer cache is hit
-      - name: Dump MailPoet autoload
-        run: ./tools/vendor/composer.phar dump-autoload
-        working-directory: mailpoet
-
-      - name: Run code phpstan
-        run: ../../../mailpoet/tools/vendor/composer.phar phpstan -- --php-version=${{ matrix.php-version == '7.4' && '70400' || '80200' }}
-        working-directory: packages/php/email-editor

.github/workflows/release.yml

@@ -0,0 +1,39 @@
+name: Make release
+
+on:
+  push:
+    tags:
+      - '*'  # Trigger on any tag push
+
+env:
+  NODE_OPTIONS: "--max-old-space-size=8192"
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install Pre-reqs
+        run: |
+          sudo apt update
+          sudo apt install -y ca-certificates php php-symfony composer php-cli php-gd php-mysql golang npm
+          npm install -g pnpm
+
+      - name: Build zip file
+        run: |
+          cd mailpoet || { echo "Directory 'mailpoet' not found"; exit 1; }
+          cp .env.sample .env
+          composer update
+          sh build.sh
+          mkdir -p ../output
+          mv mailpoet.zip ../output
+
+      - name: Upload Release
+        uses: https://gitea.com/actions/release-action@main
+        with:
+          files: |-
+            output/mailpoet.zip
+          api_key: '${{secrets.RELEASE_SMITH_TOKEN}}'

.github/workflows/scripts/check_wordpress_versions.php

@@ -16,8 +16,14 @@ function getWordpressVersions(int $page = 1, int $pageSize = 100): array {
  * We prefer the latest patch versions of WordPress with specified PHP versions.
  * For example: 6.5.4-php8.3
  */
-function filterVersions(array $versions): array {
-  return array_filter($versions, fn($version) => preg_match('/^\d+\.\d+\.\d+-php\d+\.\d+$/', $version));
+function filterVersions(array $versions, string $maxPhpVersion): array {
+  return array_filter($versions, function($version) use ($maxPhpVersion) {
+    if (!preg_match('/^\d+\.\d+\.\d+-php(\d+\.\d+)$/', $version, $matches)) {
+      return false;
+    }
+    $phpVersion = $matches[1];
+    return version_compare($phpVersion, $maxPhpVersion, '<=');
+  });
 }
 
 /**
@@ -88,6 +94,15 @@ $maxPages = 8;
 $latestVersion = null;
 $previousVersion = null;
 
+// Get max PHP version from command line argument
+if (!isset($argv[1])) {
+  echo "Error: Maximum PHP version argument is required\n";
+  echo "Example: php check_wordpress_versions.php 8.3\n";
+  exit(1);
+}
+$maxPhpVersion = $argv[1];
+echo "Using maximum PHP version: $maxPhpVersion\n";
+
 echo "Fetching WordPress versions...\n";
 
 // We fetch the versions until we find the latest and previous versions. But there is a limit of 4 pages.
@@ -95,7 +110,7 @@ while (($latestVersion === null || $previousVersion === null) && $page <= $maxPa
   echo "Fetching page $page...\n";
   $versions = getWordpressVersions($page);
   $allVersions = array_merge($allVersions, $versions);
-  $allVersions = filterVersions($allVersions);
+  $allVersions = filterVersions($allVersions, $maxPhpVersion);
   sortVersions($allVersions);
   [$latestVersion, $previousVersion] = getLatestAndPreviousVersions($allVersions);
   $page++;

.github/workflows/scripts/helpers.php

@@ -118,10 +118,21 @@ function replacePrivatePluginVersion(
   string $configParameterName,
   string $versionsFilename
 ): void {
-// Read the GitHub token from environment variable
-  $token = getenv('GH_TOKEN');
+  // Read the GitHub token from environment variable. Set at https://github.com/mailpoet/mailpoet/settings/secrets/actions.
+
+  // If the repository is woocommerce, use the WooCommerce token, otherwise use the general token.
+  $isWooCommerceRepository = strpos($repository, 'woocommerce/') !== false;
+  if ($isWooCommerceRepository) {
+    $token = getenv('WP_GITHUB_WOOCOMMERCE_TOKEN');
+  } else {
+    $token = getenv('WP_GITHUB_TOKEN');
+  }
   if (!$token) {
-    die("GitHub token not found. Make sure it's set in the environment variable 'GH_TOKEN'.");
+    if ($isWooCommerceRepository) {
+      die("WooCommerce token not found. For WooCommerce repositories requests, make sure to set the token in the environment variable 'WP_GITHUB_WOOCOMMERCE_TOKEN'.");
+    } else {
+      die("GitHub token not found. Make sure it's set in the environment variable 'WP_GITHUB_TOKEN'.");
+    }
   }
 
   $page = 1;

.github/workflows/update-wordpress-and-plugins.yml

@@ -1,182 +0,0 @@
-name: Check new versions of plugins and WordPress
-
-on:
-  schedule:
-    - cron: '0 6 * * 1' # At 06:00 on Monday
-  workflow_dispatch: # Allows manual triggering
-
-jobs:
-  check-versions:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.3' # Specify the PHP version you want to use
-
-      # Updating used WordPress
-      - name: Check WordPress Docker Versions
-        run: php .github/workflows/scripts/check_wordpress_versions.php
-
-      - name: Check for WordPress changes
-        id: check_wp_changes
-        run: |
-          git config --global user.name 'github-actions[bot]'
-          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          if [ "$(git status --porcelain)" != "" ]; then
-            echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
-            echo "WORDPRESS_CHANGES=true" >> $GITHUB_ENV
-          fi
-
-      - name: Get WordPress versions from files
-        id: get_wp_versions
-        run: |
-          echo "WORDPRESS_LATEST_VERSION=$(cat /tmp/latest_wordpress_version.txt)" >> $GITHUB_ENV
-          echo "WORDPRESS_PREVIOUS_VERSION=$(cat /tmp/previous_wordpress_version.txt)" >> $GITHUB_ENV
-
-      - name: Commit WordPress changes
-        if: env.WORDPRESS_CHANGES == 'true'
-        run: |
-          git add .
-          git commit -m $'Update used WordPress images in Circle CI\n\n - latest version: ${{ env.WORDPRESS_LATEST_VERSION }}\n - previous version: ${{ env.WORDPRESS_PREVIOUS_VERSION }}'
-
-      # Updating used WooCommerce plugin
-      - name: Check WooCommerce Versions
-        run: php .github/workflows/scripts/check_woocommerce_versions.php
-
-      - name: Check for WooCommerce changes
-        id: check_wc_changes
-        run: |
-          git config --global user.name 'github-actions[bot]'
-          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          if [ "$(git status --porcelain)" != "" ]; then
-            echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
-            echo "WOOCOMMERCE_CHANGES=true" >> $GITHUB_ENV
-          fi
-
-      - name: Get WooCommerce versions from files
-        id: get_wc_versions
-        run: |
-          echo "WOOCOMMERCE_LATEST_VERSION=$(cat /tmp/latest_woocommerce_version.txt)" >> $GITHUB_ENV
-          echo "WOOCOMMERCE_PREVIOUS_VERSION=$(cat /tmp/previous_woocommerce_version.txt)" >> $GITHUB_ENV
-
-      - name: Commit WooCommerce changes
-        if: env.WOOCOMMERCE_CHANGES == 'true'
-        run: |
-          git add .
-          git commit -m $'Update used WooCommerce plugin in Circle CI\n\n - latest version: ${{ env.WOOCOMMERCE_LATEST_VERSION }}\n - previous version: ${{ env.WOOCOMMERCE_PREVIOUS_VERSION }}'
-
-      # Updating used Automate Woo plugin
-      - name: Check Automate Woo Versions
-        env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: php .github/workflows/scripts/check_automate_woo_versions.php
-
-      - name: Check for Automate Woo changes
-        id: check_aw_changes
-        run: |
-          git config --global user.name 'github-actions[bot]'
-          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          if [ "$(git status --porcelain)" != "" ]; then
-            echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
-            echo "AUTOMATE_WOO_CHANGES=true" >> $GITHUB_ENV
-          fi
-
-      - name: Get Automate Woo versions from files
-        id: get_aw_versions
-        run: |
-          echo "AUTOMATE_WOO_LATEST_VERSION=$(cat /tmp/latest_automate_woo_version.txt)" >> $GITHUB_ENV
-          echo "AUTOMATE_WOO_PREVIOUS_VERSION=$(cat /tmp/previous_automate_woo_version.txt)" >> $GITHUB_ENV
-
-      - name: Commit Automate Woo changes
-        if: env.AUTOMATE_WOO_CHANGES == 'true'
-        run: |
-          git add .
-          git commit -m $'Update used Automate Woo plugin in Circle CI\n\n - latest version: ${{ env.AUTOMATE_WOO_LATEST_VERSION }}\n - previous version: ${{ env.AUTOMATE_WOO_PREVIOUS_VERSION }}'
-
-      # Updating used WooCommerce Subscriptions plugin
-      - name: Check WooCommerce Subscriptions Versions
-        env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: php .github/workflows/scripts/check_woocommerce_subscriptions_versions.php
-
-      - name: Check for WooCommerce Subscriptions changes
-        id: check_ws_changes
-        run: |
-          git config --global user.name 'github-actions[bot]'
-          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          if [ "$(git status --porcelain)" != "" ]; then
-            echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
-            echo "SUBSCRIPTIONS_CHANGES=true" >> $GITHUB_ENV
-          fi
-
-      - name: Get WooCommerce Subscriptions versions from files
-        id: get_ws_versions
-        run: |
-          echo "WOOCOMMERCE_SUBSCRIPTIONS_LATEST_VERSION=$(cat /tmp/latest_woocommerce_subscriptions_version.txt)" >> $GITHUB_ENV
-          echo "WOOCOMMERCE_SUBSCRIPTIONS_PREVIOUS_VERSION=$(cat /tmp/previous_woocommerce_subscriptions_version.txt)" >> $GITHUB_ENV
-
-      - name: Commit WooCommerce Subscriptions changes
-        if: env.SUBSCRIPTIONS_CHANGES == 'true'
-        run: |
-          git add .
-          git commit -m $'Update used WooCommerce Subscriptions plugin in Circle CI\n\n - latest version: ${{ env.WOOCOMMERCE_SUBSCRIPTIONS_LATEST_VERSION }}\n - previous version: ${{ env.WOOCOMMERCE_SUBSCRIPTIONS_PREVIOUS_VERSION }}'
-
-      # Updating used WooCommerce Memberships plugin
-      - name: Check WooCommerce Memberships Versions
-        env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: php .github/workflows/scripts/check_woocommerce_memberships_versions.php
-
-      - name: Check for WooCommerce Memberships changes
-        id: check_wm_changes
-        run: |
-          git config --global user.name 'github-actions[bot]'
-          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          if [ "$(git status --porcelain)" != "" ]; then
-            echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
-            echo "MEMBERSHIPS_CHANGES=true" >> $GITHUB_ENV
-          fi
-
-      - name: Get WooCommerce Memberships versions from files
-        id: get_wm_versions
-        run: |
-          echo "WOOCOMMERCE_MEMBERSHIPS_LATEST_VERSION=$(cat /tmp/latest_woocommerce_memberships_version.txt)" >> $GITHUB_ENV
-          echo "WOOCOMMERCE_MEMBERSHIPS_PREVIOUS_VERSION=$(cat /tmp/previous_woocommerce_memberships_version.txt)" >> $GITHUB_ENV
-
-      - name: Commit WooCommerce Memberships changes
-        if: env.MEMBERSHIPS_CHANGES == 'true'
-        run: |
-          git add .
-          git commit -m $'Update used WooCommerce Memberships plugin in Circle CI\n\n - latest version: ${{ env.WOOCOMMERCE_MEMBERSHIPS_LATEST_VERSION }}\n - previous version: ${{ env.WOOCOMMERCE_MEMBERSHIPS_PREVIOUS_VERSION }}'
-
-      # Push all changes at the end if any changes were detected
-      #
-      # For local testing with act tool add following:
-      # env:
-      #   GH_PAT: ${{ secrets.GH_TOKEN }}
-      # run: |
-      #   git remote set-url origin https://${GH_PAT}@github.com/mailpoet/mailpoet
-      #   git push -f origin HEAD:refs/heads/update-plugins-and-wordpress-test
-      - name: Push changes
-        if: env.CHANGES_DETECTED == 'true'
-        run: |
-          git push -f origin HEAD:refs/heads/update-plugins-and-wordpress
-
-      # Create a pull request if there are changes
-      - name: Create Pull Request
-        if: env.CHANGES_DETECTED == 'true'
-        uses: peter-evans/create-pull-request@v6
-        with:
-          token: ${{ secrets.GH_TOKEN }}
-          branch: update-plugins-and-wordpress
-          title: Update WordPress and plugins in CI jobs
-          base: trunk
-          labels: automated, check-versions
-          body: |
-            1. If all checks passed, you can merge this PR.
-            2. If the build failed, please investigate the failure and either address the issues or delegate the job. Then, make sure these changes are merged.

.github/workflows/wordpress-playground-preview.yml

@@ -1,27 +0,0 @@
-name: Add link to WordPress Playground preview
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-
-jobs:
-  add-wp-playground-link:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Check and append description
-        shell: bash
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          PR_NUMBER="${{ github.event.pull_request.number }}"
-          BRANCH_NAME="${{ github.head_ref }}"
-          DESCRIPTION="$(gh pr view $PR_NUMBER --json body -q .body)"
-          HEADING="## Preview"
-          CONTENT="$(printf "${HEADING}\n\n[Preview in WordPress Playground](https://account.mailpoet.com/playground/new/branch:${BRANCH_NAME})\n\n_The latest successful build from \`${BRANCH_NAME}\` will be used. If none is available, the link won't work._")"
-
-          if [[ "$DESCRIPTION" != *"$HEADING"* ]]; then
-            gh pr edit $PR_NUMBER --body "$(printf "${DESCRIPTION}\n\n${CONTENT}")"
-          fi

CONTRIBUTING.md

@@ -38,9 +38,9 @@ There is a `./do` command that helps with the development process. See [README](
 
 - Do not commit to trunk.
 - Open a short-living feature branch.
-- Use good commit messages as explained here https://chris.beams.io/posts/git-commit. Include Jira ticket in the commit message.
+- Use good commit messages as explained here https://chris.beams.io/posts/git-commit. Include Linear issue ID in the commit message.
 - Use the `./do qa` command to check your code style before pushing.
-- Create a pull request when finished. Include Jira ticket in the title of the pull request.
+- Create a pull request when finished.
 - Wait for review from another developer.
 
 ## Feature flags

dev/dashboard/index.html

@@ -56,15 +56,6 @@
           <td>App for development</td>
           <td><a href="http://localhost:8002">http://localhost:8002</a></td>
         </tr>
-        <tr>
-          <td>🚥</td>
-          <td>
-            <a href="http://localhost:8003">WordPress Tests</a>
-            [<a href="http://localhost:8003/wp-admin/">wp-admin</a>]
-          </td>
-          <td>App for E2E tests</td>
-          <td><a href="http://localhost:8003">http://localhost:8003</a></td>
-        </tr>
         <tr>
           <td>💾</td>
           <td>

dev/database/create_test_db.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e
-
-RUNMYSQL="mysql --user=root --password=${MYSQL_ROOT_PASSWORD}"
-
-$RUNMYSQL <<EOSQL
-CREATE DATABASE ${MYSQL_TEST_DATABASE};
-GRANT ALL PRIVILEGES ON ${MYSQL_TEST_DATABASE}.* TO '${MYSQL_USER}'@'%';
-FLUSH PRIVILEGES;
-EOSQL

dev/php82/Dockerfile

@@ -27,7 +27,7 @@ RUN printf "account default\nhost smtp\nport 1025" > /etc/msmtprc
 
 # xdebug build an config
 ENV XDEBUGINI_PATH=/usr/local/etc/php/conf.d/xdebug.ini
-RUN git clone -b "3.3.1" --depth 1 https://github.com/xdebug/xdebug.git /usr/src/php/ext/xdebug \
+RUN git clone -b "3.4.2" --depth 1 https://github.com/xdebug/xdebug.git /usr/src/php/ext/xdebug \
     && docker-php-ext-configure xdebug --enable-xdebug-dev \
     && docker-php-ext-install xdebug \
     && mkdir /tmp/debug

dev/php83/Dockerfile

@@ -0,0 +1,46 @@
+FROM wordpress:php8.3-apache
+
+ARG UID=1000
+ARG GID=1000
+
+# additinal extensions
+RUN apt-get update \
+	&& apt-get install -y git zlib1g-dev libzip-dev zip wget gnupg msmtp libpng-dev gettext subversion \
+	&& \
+    # Install NodeJS, enable Corepack
+    curl -sL https://deb.nodesource.com/setup_19.x | bash - && \
+    apt-get install -y nodejs build-essential && \
+    corepack enable && \
+	\
+	# Install WP-CLI
+	curl -o /usr/local/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && \
+	chmod +x /usr/local/bin/wp && \
+	\
+  # Clean up
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+COPY dev/php.ini /usr/local/etc/php/conf.d/php_user.ini
+
+# msmtp config
+RUN printf "account default\nhost smtp\nport 1025" > /etc/msmtprc
+
+# xdebug build an config
+ENV XDEBUGINI_PATH=/usr/local/etc/php/conf.d/xdebug.ini
+RUN git clone -b "3.4.2" --depth 1 https://github.com/xdebug/xdebug.git /usr/src/php/ext/xdebug \
+    && docker-php-ext-configure xdebug --enable-xdebug-dev \
+    && docker-php-ext-install xdebug \
+    && mkdir /tmp/debug
+COPY dev/xdebug.ini /tmp/xdebug.ini
+RUN cat /tmp/xdebug.ini >> $XDEBUGINI_PATH
+
+# php extensions
+RUN docker-php-ext-install pdo_mysql
+RUN docker-php-ext-install mysqli
+
+# allow .htaccess files (between <Directory /var/www/> and </Directory>, which is WordPress installation)
+RUN sed -i '/<Directory \/var\/www\/>/,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf
+
+# ensure existing content in /var/www/html respects UID and GID, give Node permissions for Corepack
+RUN chown -R ${UID}:${GID} /var/www/html && \
+  mkdir -p /.node && chown -R ${UID}:${GID} /.node

dev/php84/Dockerfile

@@ -0,0 +1,46 @@
+FROM wordpress:php8.4-apache
+
+ARG UID=1000
+ARG GID=1000
+
+# additinal extensions
+RUN apt-get update \
+	&& apt-get install -y git zlib1g-dev libzip-dev zip wget gnupg msmtp libpng-dev gettext subversion \
+	&& \
+    # Install NodeJS, enable Corepack
+    curl -sL https://deb.nodesource.com/setup_19.x | bash - && \
+    apt-get install -y nodejs build-essential && \
+    corepack enable && \
+	\
+	# Install WP-CLI
+	curl -o /usr/local/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && \
+	chmod +x /usr/local/bin/wp && \
+	\
+  # Clean up
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+COPY dev/php.ini /usr/local/etc/php/conf.d/php_user.ini
+
+# msmtp config
+RUN printf "account default\nhost smtp\nport 1025" > /etc/msmtprc
+
+# xdebug build an config
+ENV XDEBUGINI_PATH=/usr/local/etc/php/conf.d/xdebug.ini
+RUN git clone -b "3.4.5" --depth 1 https://github.com/xdebug/xdebug.git /usr/src/php/ext/xdebug \
+    && docker-php-ext-configure xdebug --enable-xdebug-dev \
+    && docker-php-ext-install xdebug \
+    && mkdir /tmp/debug
+COPY dev/xdebug.ini /tmp/xdebug.ini
+RUN cat /tmp/xdebug.ini >> $XDEBUGINI_PATH
+
+# php extensions
+RUN docker-php-ext-install pdo_mysql
+RUN docker-php-ext-install mysqli
+
+# allow .htaccess files (between <Directory /var/www/> and </Directory>, which is WordPress installation)
+RUN sed -i '/<Directory \/var\/www\/>/,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf
+
+# ensure existing content in /var/www/html respects UID and GID, give Node permissions for Corepack
+RUN chown -R ${UID}:${GID} /var/www/html && \
+  mkdir -p /.node && chown -R ${UID}:${GID} /.node

docker-compose.override.macos-sample.yml

@@ -9,11 +9,6 @@ services:
       - nfs-mailpoet:/var/www/html/wp-content/plugins/mailpoet
       - nfs-mailpoet-premium:/var/www/html/wp-content/plugins/mailpoet-premium
 
-  test_wordpress:
-    volumes:
-      - nfs-mailpoet:/var/www/html/wp-content/plugins/mailpoet
-      - nfs-mailpoet-premium:/var/www/html/wp-content/plugins/mailpoet-premium
-
 volumes:
   nfs-wordpress:
     driver: local

docker-compose.yml

@@ -12,12 +12,10 @@ services:
     image: mysql:5.7
     volumes:
       - my-datavolume:/var/lib/mysql
-      - ./dev/database/create_test_db.sh:/docker-entrypoint-initdb.d/10-create_test_db.sh
     command: --sql_mode=STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION,ANSI,ONLY_FULL_GROUP_BY
     environment:
       MYSQL_ROOT_PASSWORD: somewordpress
       MYSQL_DATABASE: wordpress
-      MYSQL_TEST_DATABASE: test_wordpress
       MYSQL_USER: wordpress
       MYSQL_PASSWORD: wordpress
 
@@ -25,7 +23,7 @@ services:
     container_name: mp-wp
     build:
       context: .
-      dockerfile: dev/php82/Dockerfile
+      dockerfile: dev/php83/Dockerfile
       args:
         UID: ${UID:-1000}
         GID: ${GID:-1000}
@@ -60,31 +58,6 @@ services:
       - './packages:/var/www/html/wp-content/plugins/packages'
       - './templates:/var/www/templates'
 
-  test_wordpress:
-    container_name: mp-test-wp
-    build:
-      context: .
-      dockerfile: dev/php81/Dockerfile
-      args:
-        UID: ${UID:-1000}
-        GID: ${GID:-1000}
-    ports:
-      - '8003:80'
-    depends_on:
-      - db
-      - smtp
-    user: ${UID:-1000}:${GID:-1000}
-    environment:
-      WORDPRESS_DB_NAME: test_wordpress
-      WORDPRESS_DB_HOST: db:3306
-      WORDPRESS_DB_USER: wordpress
-      WORDPRESS_DB_PASSWORD: wordpress
-      PHP_IDE_CONFIG: 'serverName=Mailpoet'
-    volumes:
-      - './mailpoet:/var/www/html/wp-content/plugins/mailpoet'
-      - './mailpoet-premium:/var/www/html/wp-content/plugins/mailpoet-premium'
-      - './packages:/var/www/html/wp-content/plugins/packages'
-
   smtp:
     container_name: mp-mailhog
     image: mailhog/mailhog:v1.0.0

mailpoet/.env.sample

@@ -34,9 +34,8 @@ WP_CIRCLECI_TOKEN=
 WP_GITHUB_USERNAME=
 WP_GITHUB_TOKEN=
 
-# Jira username/email and a token from https://id.atlassian.com/manage/api-tokens:
-WP_JIRA_USER=
-WP_JIRA_TOKEN=
+# GitHub fine-grained token for the WooCommerce organization. Fetch it from the Secret Store by searching for "MailPoet: GitHub MailPoet CI - WooCommerce token".
+WP_GITHUB_WOOCOMMERCE_TOKEN=
 
 # k6 performance test suite
 # Get following secrets from the Secret Store, look for "MailPoet: plugin .env":

mailpoet/.gitleaksignore

@@ -0,0 +1 @@
+/mailpoet/assets/dist/js/public.js:generic-api-key:2

mailpoet/CHANGELOG.md

@@ -0,0 +1,44 @@
+# Changelog System
+
+The `changelog/` directory contains individual changelog entries that are compiled into the final changelog during releases.
+
+## How it works
+
+Create individual changelog files in this directory. Each file represents a single changelog entry.
+
+## File naming convention
+
+Files should be named using the following pattern:
+
+- `YYYY-MM-DD-HH-MM-SS-{type}-{description}.md`
+
+Examples:
+
+- `2024-01-15-14-30-00-fix-undefined-array-key.md`
+- `2024-01-15-14-35-00-improve-polylang-support.md`
+- `2024-01-15-14-40-00-update-woocommerce-segments.md`
+
+## File format
+
+Each changelog file should contain:
+
+```markdown
+# Type: {Added|Improved|Fixed|Changed|Updated|Removed}
+
+# Description
+
+Brief description of the change
+```
+
+## Types
+
+- `Added`: New features
+- `Improved`: Enhancements to existing features
+- `Fixed`: Bug fixes
+- `Changed`: Changes to existing functionality
+- `Updated`: Updates to dependencies, requirements, etc.
+- `Removed`: Removed features or functionality
+
+## Compilation
+
+During the release process, these individual files are compiled into the final changelog format used in `readme.txt` and `changelog.txt`.

mailpoet/README.md

@@ -9,8 +9,9 @@
 4. [Coding and Testing](#coding-and-testing)
    1. [DI](#di)
    2. [PHP-Scoper](#php-scoper)
-   3. [i18n](#i18n)
-   4. [Acceptance testing](#acceptance-testing)
+   3. [Changelog](#changelog)
+   4. [i18n](#i18n)
+   5. [Acceptance testing](#acceptance-testing)
 
 ## MailPoet
 
@@ -121,6 +122,8 @@ $ ./do qa                  # PHP and JS linters.
 
 $ ./do release:changelog-get  [--version-name=...]     # Prints out changelog and release notes for given version or for newest version.
 $ ./do release:changelog-update  [--version-name=...] [--quiet] # Updates changelog in readme.txt for given version or for newest version.
+$ ./do changelog:add --type=<type> --description=<description> # Creates a new changelog entry
+$ ./do changelog:preview [--version=<version>] # Preview compiled changelog for next version
 
 $ ./do container:dump      # Generates DI container cache.
 
@@ -140,6 +143,16 @@ You can check [the docs](https://symfony.com/doc/3.4/components/dependency_injec
 We use PHP-Scoper package to prevent plugin libraries conflicts in PHP. Two plugins may be using different versions of a library. PHP-Scoper prefix dependencies namespaces and they are then moved into `vendor-prefixed` directory.
 Dependencies handled by PHP-Scoper are configured in extra configuration files `prefixer/composer.json` and `prefixer/scoper.inc.php`. Installation and processing is triggered in post scripts of the main `composer.json` file.
 
+### Changelog
+
+Create changelog entries using:
+
+```bash
+./do changelog:add --type=Fixed --description="Brief description of the change"
+```
+
+See [readme](changelog/README.md) for detailed documentation.
+
 ### i18n
 
 We use functions `__()`, `_n()`, `_x()`, and `_nx()` with domain `mailpoet` to translate strings. Please follow [best practices](https://codex.wordpress.org/I18n_for_WordPress_Developers).

mailpoet/RoboFile.php

@@ -3,7 +3,6 @@
 // phpcs:disable PSR1.Classes.ClassDeclaration
 // phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
 use MailPoetVendor\Twig\Loader\FilesystemLoader as TwigFileSystem;
-use Robo\Symfony\ConsoleIO;
 
 class RoboFile extends \Robo\Tasks {
   const ZIP_BUILD_PATH = __DIR__ . '/mailpoet.zip';
@@ -524,7 +523,9 @@ class RoboFile extends \Robo\Tasks {
   }
 
   public function containerDump() {
-    define('ABSPATH', getenv('WP_ROOT') . '/');
+    if (!defined('ABSPATH')) {
+      define('ABSPATH', getenv('WP_ROOT') . '/');
+    }
     if (!file_exists(ABSPATH . 'wp-config.php')) {
       $this->yell('WP_ROOT env variable does not contain valid path to wordpress root.', 40, 'red');
       exit(1);
@@ -996,20 +997,17 @@ class RoboFile extends \Robo\Tasks {
   }
 
   public function releasePrepare($version = null) {
-    $version = $this->releaseVersionAssign($version, ['return' => true]);
+    $version = $this->releaseVersionGetNext($version);
 
     return $this->collectionBuilder()
-      ->addCode(function () use ($version) {
-        return $this->releaseCheckIssues($version);
-      })
       ->addCode(function () {
         $this->releasePrepareGit();
       })
       ->addCode(function () use ($version) {
-        return $this->releaseVersionWrite($version);
+        $this->releaseVersionWrite($version);
       })
       ->addCode(function () use ($version) {
-        return $this->releaseChangelogWrite($version);
+        $this->releaseChangelogWrite($version);
       })
       ->addCode(function () use ($version) {
         $this->releaseCreatePullRequest($version);
@@ -1023,20 +1021,6 @@ class RoboFile extends \Robo\Tasks {
       ->run();
   }
 
-  public function releaseCheckIssues($version = null) {
-    $jira = $this->createJiraController();
-    $version = $jira->getVersion($this->releaseVersionGetNext($version));
-    $issues = $jira->getIssuesDataForVersion($version);
-    $pullRequestsId = \MailPoetTasks\Release\JiraController::PULL_REQUESTS_ID;
-    foreach ($issues as $issue) {
-      if (strpos($issue['fields'][$pullRequestsId], 'state=OPEN') !== false) {
-        $key = $issue['key'];
-        $this->yell("Some pull request associated to task {$key} is not merged yet!", 40, 'red');
-        exit(1);
-      }
-    }
-  }
-
   public function releasePrepareGit() {
     // make sure working directory is clean
     $gitStatus = $this->taskGitStack()
@@ -1121,22 +1105,22 @@ class RoboFile extends \Robo\Tasks {
   }
 
   public function releasePublish($version = null) {
-    $version = $this->releaseVersionGetPrepared($version);
+    $version = $this->releaseVersionGetNext($version);
     return $this->collectionBuilder()
       ->addCode(function () use ($version) {
-        return $this->releaseCheckPullRequest($version);
+        $this->releaseCheckPullRequest($version);
       })
       ->addCode(function () use ($version) {
-        return $this->translationsCheckLanguagePacks($version);
+        $this->translationsCheckLanguagePacks($version);
       })
       ->addCode(function () {
-        return $this->releaseDownloadZip();
+        $this->releaseDownloadZip();
       })
       ->addCode(function () use ($version) {
-        return $this->releaseVerifyDownloadedZip($version);
+        $this->releaseVerifyDownloadedZip($version);
       })
       ->addCode(function () {
-        return $this->translationsGetPotFileFromBuild();
+        $this->translationsGetPotFileFromBuild();
       })
       ->addCode(function () {
         return $this->translationsPush();
@@ -1148,19 +1132,16 @@ class RoboFile extends \Robo\Tasks {
         return $this->svnPublish($version);
       })
       ->addCode(function () use ($version) {
-        return $this->releasePublishGithub($version);
+        $this->releasePublishGithub($version);
       })
       ->addCode(function () use ($version) {
-        return $this->releasePublishJira($version);
-      })
-      ->addCode(function () use ($version) {
-        return $this->releasePublishSlack($version);
+        $this->releasePublishSlack($version);
       })
       ->addCode(function () {
-        return $this->releaseMergePullRequest(\MailPoetTasks\Release\GitHubController::RELEASE_SOURCE_BRANCH);
+        $this->releaseMergePullRequest(\MailPoetTasks\Release\GitHubController::RELEASE_SOURCE_BRANCH);
       })
       ->addCode(function () {
-        return $this->releaseDeleteDownloadedZip();
+        $this->releaseDeleteDownloadedZip();
       })
       ->run();
   }
@@ -1176,84 +1157,20 @@ class RoboFile extends \Robo\Tasks {
     $this->say("Pull request for branch: '{$branch}' was successfully merged");
   }
 
-  /**
-   * This command displays how many pull request each person did recently
-   */
-  public function displayReviewers(ConsoleIO $io) {
-    $io->progressStart(2);
-    $freePluginGithubController = $this->createGitHubController();
-    $logins = $freePluginGithubController->calculateReviewers();
-
-    $io->progressAdvance();
-    $shopGithubController = $this->createGitHubController(\MailPoetTasks\Release\GitHubController::PROJECT_SHOP);
-    $loginsShop = $shopGithubController->calculateReviewers();
-    $io->progressFinish();
-
-    $printReviewers = function ($logins, $header) use ($io) {
-      $io->title($header);
-      $outputList = [];
-      foreach ($logins as $login => $num) {
-        $outputList[] = [$login => $num];
-      }
-      $io->definitionList(...$outputList);
-    };
-
-    arsort($logins);
-    $printReviewers($logins, 'Free plugin');
-
-    arsort($loginsShop);
-    $printReviewers($loginsShop, 'Shop');
-
-    foreach ($loginsShop as $loginShop => $num) {
-      if (!isset($logins[$loginShop])) {
-        $logins[$loginShop] = 0;
-      }
-      $logins[$loginShop] += $num;
-    }
-    arsort($logins);
-    $printReviewers($logins, 'Full');
-  }
-
-  public function displayCreatedPullRequests(ConsoleIO $io, int $months = 6) {
-    $projects = [
-      \MailPoetTasks\Release\GitHubController::PROJECT_SHOP,
-      \MailPoetTasks\Release\GitHubController::PROJECT_MAILPOET,
-      \MailPoetTasks\Release\GitHubController::PROJECT_PREMIUM,
-    ];
-    $io->progressStart(count($projects));
-    $counts = [];
-    foreach ($projects as $project) {
-      $githubController = $this->createGitHubController($project);
-      $countsProject = $githubController->calculatePRcounts($months);
-
-      foreach ($countsProject as $login => $num) {
-        if (!isset($counts[$login])) {
-          $counts[$login] = 0;
-        }
-        $counts[$login] += $num;
-      }
-      $io->progressAdvance();
-    }
-    $io->progressFinish();
-
-    arsort($counts);
-    $io->title('Pull Request counts');
-    $outputList = [];
-    foreach ($counts as $login => $num) {
-      $outputList[] = [
-        $login,
-        $num,
-        round($num / $months, 2),
-      ];
-    }
-    $io->table(['Login', 'Count', 'Per month'], $outputList);
-  }
-
   public function releaseCheckPullRequest($version) {
     $this->createGitHubController()
       ->checkReleasePullRequestPassed($version);
   }
 
+  public function releaseVersionGetLatest($version = null) {
+    if (!$version) {
+      $version = $this->getReleaseVersionController()
+        ->getLatestVersion();
+    }
+    $this->validateVersion($version);
+    return $version;
+  }
+
   public function releaseVersionGetNext($version = null) {
     if (!$version) {
       $version = $this->getReleaseVersionController()
@@ -1263,30 +1180,6 @@ class RoboFile extends \Robo\Tasks {
     return $version;
   }
 
-  public function releaseVersionGetPrepared($version = null) {
-    if (!$version) {
-      $version = $this->getReleaseVersionController()
-        ->getPreparedVersion();
-    }
-    $this->validateVersion($version);
-    return $version;
-  }
-
-  public function releaseVersionAssign($version = null, $opts = []) {
-    $version = $this->releaseVersionGetNext($version);
-    try {
-      [$version, $output] = $this->getReleaseVersionController()
-        ->assignVersionToCompletedTickets($version);
-    } catch (\Exception $e) {
-      $this->yell($e->getMessage(), 40, 'red');
-      exit(1);
-    }
-    $this->say($output);
-    if (!empty($opts['return'])) {
-      return $version;
-    }
-  }
-
   public function releaseVersionWrite($version) {
     $version = trim($version);
     $this->validateVersion($version);
@@ -1307,17 +1200,48 @@ class RoboFile extends \Robo\Tasks {
       ->run();
   }
 
-  public function releaseChangelogGet($version = null) {
-    $outputs = $this->getChangelogController()->get($version);
-    $this->say("Changelog \n{$outputs[0]} \n{$outputs[1]}\n");
-    $this->say("IMPORTANT NOTES \n" . ($outputs[2] ?: 'none'));
+  public function releaseChangelogGet($version) {
+    $changelog = $this->getChangelogController()->get($version);
+    $this->say("Changelog \n{$changelog}");
   }
 
-  public function releaseChangelogWrite($version = null) {
+  public function releaseChangelogWrite($version) {
     $this->say("Updating changelog");
-    $outputs = $this->getChangelogController()->update($version);
-    $this->say("Changelog \n{$outputs[0]} \n{$outputs[1]}\n\n");
-    $this->say("IMPORTANT NOTES \n" . ($outputs[2] ?: 'none'));
+    $changelog = $this->getChangelogController()->update($version);
+    $this->say("Changelog \n{$changelog}");
+  }
+
+  public function changelogAdd($opts = ['type' => '', 'description' => '']) {
+    $type = $opts['type'];
+    $description = $opts['description'];
+
+    if (empty($type)) {
+      $this->say('Please specify a type with --type=<type>');
+      $this->say('Valid types: Added, Improved, Fixed, Changed, Updated, Removed');
+      exit(1);
+    }
+
+    if (empty($description)) {
+      $this->say('Please specify a description with --description=<description>');
+      exit(1);
+    }
+
+    $changelogger = new \MailPoetTasks\Release\Changelogger();
+    $filePath = $changelogger->createChangelogEntry($type, $description);
+
+    $this->say("Changelog entry created: $filePath");
+  }
+
+  public function changelogPreview($version = null) {
+    if (!$version) {
+      $version = $this->releaseVersionGetNext($version);
+    }
+
+    $changelogger = new \MailPoetTasks\Release\Changelogger();
+    $changelog = $changelogger->compileChangelog($version);
+
+    $this->say("Preview changelog for version $version:");
+    $this->say($changelog);
   }
 
   public function releaseVerifyDownloadedZip($version) {
@@ -1357,30 +1281,21 @@ class RoboFile extends \Robo\Tasks {
   }
 
   public function releasePublishGithub($version = null) {
-    $jiraController = $this->createJiraController();
-    $version = $jiraController->getVersion($version);
-    $changelog = $this->getChangelogController()->get($version['name']);
+    $version = $this->releaseVersionGetNext($version);
+    $changelog = $this->getChangelogController()->get($version);
 
     $githubController = $this->createGitHubController();
-    $githubController->publishRelease($version['name'], $changelog[1], self::ZIP_BUILD_PATH);
-    $this->say("Release '$version[name]' was published to GitHub.");
-  }
-
-  public function releasePublishJira($version = null) {
-    $version = $this->releaseVersionGetPrepared($version);
-    $jiraController = $this->createJiraController();
-    $jiraVersion = $jiraController->releaseVersion($version);
-    $this->say("JIRA version '$jiraVersion[name]' was released.");
+    $githubController->publishRelease($version, $changelog, self::ZIP_BUILD_PATH);
+    $this->say("Release '$version' was published to GitHub.");
   }
 
   public function releasePublishSlack($version = null) {
-    $jiraController = $this->createJiraController();
-    $version = $jiraController->getVersion($version);
-    $changelog = $this->getChangelogController()->get($version['name']);
+    $version = $this->releaseVersionGetLatest($version);
+    $changelog = $this->getChangelogController()->get($version);
 
     $slackNotifier = $this->createSlackNotifier();
-    $slackNotifier->notify($version['name'], $changelog[1], $version['id']);
-    $this->say("Release '$version[name]' info was published on Slack.");
+    $slackNotifier->notify($version, $changelog);
+    $this->say("Release '$version' info was published on Slack.");
   }
 
   public function releaseRerunCircleWorkflow(?string $project = null) {
@@ -1395,30 +1310,34 @@ class RoboFile extends \Robo\Tasks {
     }
   }
 
-  public function downloadWooCommerceMembershipsZip($tag = null) {
-    if (!getenv('WP_GITHUB_USERNAME') && !getenv('WP_GITHUB_TOKEN')) {
+  public function downloadWooCommerceMembershipsZip(): void {
+    $token = getenv('WP_GITHUB_WOOCOMMERCE_TOKEN');
+    if (!getenv('WP_GITHUB_USERNAME') && !$token) {
       $this->yell("Skipping download of WooCommerce Memberships", 40, 'red');
       exit(0); // Exit with 0 since it is a valid state for some environments
     }
-    $this->createGithubClient('woocommerce/woocommerce-memberships')
-      ->downloadReleaseZip('woocommerce-memberships.zip', __DIR__ . '/tests/plugins/', $tag);
+    $this->createGithubClient('woocommerce/all-plugins', $token)
+      ->downloadRawFile('https://api.github.com/repos/woocommerce/all-plugins/contents/product-packages/woocommerce-memberships/woocommerce-memberships.zip?ref=master', 'woocommerce-memberships.zip', __DIR__ . '/tests/plugins/');
   }
 
   public function downloadWooCommerceSubscriptionsZip($tag = null) {
-    if (!getenv('WP_GITHUB_USERNAME') && !getenv('WP_GITHUB_TOKEN')) {
+    $token = getenv('WP_GITHUB_WOOCOMMERCE_TOKEN');
+    if (!getenv('WP_GITHUB_USERNAME') && !$token) {
       $this->yell("Skipping download of WooCommerce Subscriptions", 40, 'red');
       exit(0); // Exit with 0 since it is a valid state for some environments
     }
-    $this->createGithubClient('woocommerce/woocommerce-subscriptions')
+
+    $this->createGithubClient('woocommerce/woocommerce-subscriptions', $token)
       ->downloadReleaseZip('woocommerce-subscriptions.zip', __DIR__ . '/tests/plugins/', $tag);
   }
 
   public function downloadAutomateWooZip($tag = null) {
-    if (!getenv('WP_GITHUB_USERNAME') && !getenv('WP_GITHUB_TOKEN')) {
+    $token = getenv('WP_GITHUB_WOOCOMMERCE_TOKEN');
+    if (!getenv('WP_GITHUB_USERNAME') && !$token) {
       $this->yell("Skipping download of Automate Woo", 40, 'red');
       exit(0); // Exit with 0 since it is a valid state for some environments
     }
-    $this->createGithubClient('woocommerce/automatewoo')
+    $this->createGithubClient('woocommerce/automatewoo', $token)
       ->downloadReleaseZip('automatewoo.zip', __DIR__ . '/tests/plugins/', $tag);
   }
 
@@ -1554,26 +1473,13 @@ class RoboFile extends \Robo\Tasks {
   }
 
   protected function getChangelogController() {
-    return new \MailPoetTasks\Release\ChangelogController(
-      $this->createJiraController(),
-      __DIR__ . '/readme.txt'
-    );
+    return new \MailPoetTasks\Release\ChangelogController(__DIR__ . '/readme.txt');
   }
 
   protected function getReleaseVersionController() {
     return new \MailPoetTasks\Release\ReleaseVersionController(
-      $this->createJiraController(),
       $this->createGitHubController(),
-      \MailPoetTasks\Release\JiraController::PROJECT_MAILPOET
-    );
-  }
-
-  protected function createJiraController() {
-    $help = 'Use your JIRA username and a token from https://id.atlassian.com/manage/api-tokens.';
-    return new \MailPoetTasks\Release\JiraController(
-      $this->getEnv('WP_JIRA_TOKEN', $help),
-      $this->getEnv('WP_JIRA_USER', $help),
-      \MailPoetTasks\Release\JiraController::PROJECT_MAILPOET
+      \MailPoetTasks\Release\GitHubController::PROJECT_MAILPOET
     );
   }
 
@@ -1587,11 +1493,12 @@ class RoboFile extends \Robo\Tasks {
     );
   }
 
-  protected function createGitHubController($project = \MailPoetTasks\Release\GitHubController::PROJECT_MAILPOET) {
+  protected function createGitHubController($project = \MailPoetTasks\Release\GitHubController::PROJECT_MAILPOET, $token = null) {
     $help = "Use your GitHub username and a token from https://github.com/settings/tokens with 'repo' scopes.";
+    $token = $token ?: $this->getEnv('WP_GITHUB_TOKEN', $help);
     return new \MailPoetTasks\Release\GitHubController(
       $this->getEnv('WP_GITHUB_USERNAME', $help),
-      $this->getEnv('WP_GITHUB_TOKEN', $help),
+      $token,
       $project
     );
   }
@@ -1628,12 +1535,13 @@ class RoboFile extends \Robo\Tasks {
     return $exitCode;
   }
 
-  private function createGithubClient($repositoryName) {
+  private function createGithubClient($repositoryName, $token = null) {
     require_once __DIR__ . '/tasks/GithubClient.php';
+    $token = $token ?: $this->getEnv('WP_GITHUB_TOKEN');
     return new \MailPoetTasks\GithubClient(
       $repositoryName,
       getenv('WP_GITHUB_USERNAME') ?: null,
-      getenv('WP_GITHUB_TOKEN') ?: null
+      $token
     );
   }
 
@@ -1643,7 +1551,9 @@ class RoboFile extends \Robo\Tasks {
   }
 
   private function createDoctrineEntityManager() {
-    define('ABSPATH', getenv('WP_ROOT') . '/');
+    if (!defined('ABSPATH')) {
+      define('ABSPATH', getenv('WP_ROOT') . '/');
+    }
     if (\MailPoet\Config\Env::$dbPrefix === null) {
       /**
        * Ensure some prefix is set

mailpoet/assets/css/src/components-automation-listing/_listing.scss

@@ -2,10 +2,6 @@
 
 #mailpoet_automation * {
   box-sizing: border-box;
-
-  .mailpoet-add-new-button {
-    padding-right: 12px;
-  }
 }
 
 .mailpoet-automation-is-onboarding {

mailpoet/assets/css/src/components-automation-listing/_sections.scss

@@ -151,7 +151,7 @@
     }
 
     .marker {
-      color: #ff5301;
+      color: $color-secondary;
       display: inline-block;
       font-size: 16px;
       font-weight: 600;

mailpoet/assets/css/src/components-editor/components/_forms.scss

@@ -8,10 +8,6 @@
     margin-bottom: 5px;
   }
 
-  .mailpoet_form_field_title_small {
-    width: 120px;
-  }
-
   .mailpoet_form_field_title_inline {
     display: inline-block;
     margin-bottom: 0;

mailpoet/assets/css/src/components-editor/components/_sidepanel.scss

@@ -19,6 +19,10 @@
     flex-direction: column;
     justify-content: flex-start;
   }
+
+  .mailpoet_editor_settings {
+    padding: 0;
+  }
 }
 
 .mailpoet_sidepanel_field {

mailpoet/assets/css/src/components-editor/content-blocks/_container.scss

@@ -64,6 +64,10 @@
     > .mailpoet_container
     .mailpoet_automated_latest_content_block_posts
     .mailpoet_container_horizontal,
+  > .mailpoet_container_block
+    > .mailpoet_container
+    .mailpoet_dynamic_products_block_posts
+    .mailpoet_container_horizontal,
   > .mailpoet_container_block
     > .mailpoet_container
     > .mailpoet_products_block

mailpoet/assets/css/src/components-editor/content-blocks/_coupon.scss

@@ -62,6 +62,10 @@
   }
 }
 
+.mailpoet_coupon_block_settings {
+  margin: 0 -20px;
+}
+
 .mailpoet_coupon_block_settings,
 .mailpoet_coupon_block_display_options {
   @include animation-slide-open-downwards();

mailpoet/assets/css/src/components-editor/content-blocks/_dynamic-products.scss

@@ -0,0 +1,63 @@
+.mailpoet_dynamic_products_block {
+  padding: 0;
+}
+
+.mailpoet_dynamic_products_block_overlay {
+  background: rgba(#fff, 0);
+  height: 100%;
+  position: absolute;
+  transition: background 0.15s ease-out;
+  width: 100%;
+  z-index: 19;
+
+  .mailpoet_dynamic_products_block:hover & {
+    background: rgba(#fff, 0.9);
+    cursor: pointer;
+
+    .mailpoet_overlay_message {
+      display: block;
+    }
+  }
+
+  .mailpoet_overlay_message {
+    color: black;
+    display: none;
+    font-size: 20px;
+    margin: 80px;
+    text-align: center;
+  }
+}
+
+.mailpoet_dynamic_products_block_posts {
+  overflow: hidden;
+  pointer-events: none;
+
+  > .mailpoet_block {
+    width: 100%;
+  }
+
+  .mailpoet_container_block {
+    padding-bottom: 0;
+    padding-top: 0;
+  }
+}
+
+.mailpoet_dynamic_products_display_options {
+  @include animation-slide-open-downwards();
+}
+
+.mailpoet_dynamic_products_show_amount {
+  width: 38px;
+}
+
+.mailpoet_dynamic_products_content_type {
+  width: 180px;
+}
+
+.mailpoet_dynamic_products_display_options.mailpoet_closed {
+  display: none;
+}
+
+.mailpoet_dynamic_products_selected_products {
+  padding-left: 20px;
+}

mailpoet/assets/css/src/components-editor/content-blocks/_posts.scss

@@ -24,7 +24,6 @@
 .mailpoet_settings_posts_selection {
   @include animation-slide-open-downwards();
   overflow-x: hidden;
-  padding: 0 19px;
 }
 
 .mailpoet_settings_posts_show_display_options,

mailpoet/assets/css/src/components-editor/content-blocks/_products.scss

@@ -24,7 +24,6 @@
 .mailpoet_settings_products_selection {
   @include animation-slide-open-downwards();
   overflow-x: hidden;
-  padding: 0 19px;
 }
 
 .mailpoet_settings_products_show_display_options,

mailpoet/assets/css/src/components-editor/content-blocks/_social.scss

@@ -21,11 +21,33 @@
   }
 }
 
+.mailpoet_social_icons_container {
+  > input {
+    vertical-align: top;
+
+    &:checked
+      ~ #mailpoet_social_icons_styles
+      .mailpoet_social_icon_set:not([data-setname^='official']) {
+      display: block;
+    }
+  }
+
+  > label {
+    display: inline-block;
+    margin: -0.25rem 0 0.5rem;
+    vertical-align: top;
+  }
+}
+
 .mailpoet_social_icon_set {
   border: 1px solid transparent;
   margin-bottom: 5px;
   padding: 5px;
 
+  &:not([data-setname^='official']) {
+    display: none;
+  }
+
   &:hover {
     border: 1px solid $editor-social-icon-border-color-hover;
   }

mailpoet/assets/css/src/components-form-editor/_sidebar.scss

@@ -114,7 +114,7 @@
 
   &:hover {
     background-color: #fff !important;
-    color: #ff5301 !important;
+    color: $color-secondary !important;
   }
 }
 

mailpoet/assets/css/src/components-form-editor/_template-selection.scss

@@ -24,6 +24,11 @@ $mailpoet-form-template-thumbnail-height: 316px;
   .mailpoet-categories {
     grid-column: 1 / -1;
     justify-content: center;
+
+    .components-tab-panel__tabs-item {
+      padding-left: 14px;
+      padding-right: 14px;
+    }
   }
 }
 

mailpoet/assets/css/src/components-plugin/_common.scss

@@ -64,31 +64,42 @@ p.sender_email_address_warning:first-child {
   margin-bottom: $grid-gap;
 }
 
-.mailpoet-subscribers-in-plan {
-  font-size: 18px;
-  margin-bottom: 20px;
-  position: relative;
-  z-index: 1;
-
-  .mailpoet-subscribers-in-plan-spacer {
-    display: inline-block;
-    width: 20px;
-  }
-
-  .tooltip {
-    position: relative;
-    top: -1px;
-    vertical-align: middle;
-  }
-
-  @include respond-to(small-screen) {
-    margin-top: 0;
-  }
+.mailpoet-page-header {
+  align-items: center;
+  display: flex;
+  padding-top: 2px;
 }
 
-.mailpoet-subscribers-cache-notice {
-  .mailpoet-subscribers-cache-notice-button {
-    margin-left: 10px;
+.mailpoet-back-button {
+  display: flex;
+  padding-top: 5px;
+}
+
+.mailpoet-segment-subscriber-count {
+  align-items: center;
+  display: flex;
+  font-size: 13px;
+  gap: $grid-gap;
+  margin-bottom: $grid-gap-half;
+  padding-top: $grid-gap-half;
+
+  .mailpoet-segment-help-icon {
+    display: flex;
+  }
+
+  .mailpoet-segment-subscriber-count-message {
+    align-items: center;
+    display: flex;
+    font-size: 14px;
+    z-index: 1;
+  }
+
+  .mailpoet-segment-subscriber-cache {
+    color: $color-text-light;
+  }
+
+  .components-button.is-link {
+    text-decoration: none;
   }
 }
 
@@ -269,15 +280,6 @@ body .components-modal__screen-overlay {
   max-width: 1072px;
 }
 
-.mailpoet-page-header {
-  padding-top: 16px;
-
-  h1.wp-heading-inline {
-    margin: 0;
-    padding: 4px 0;
-  }
-}
-
 .mailpoet-admin-fields {
   column-gap: 24px;
   display: grid;

mailpoet/assets/css/src/components-plugin/_discounts.scss

@@ -1,6 +1,6 @@
 .mailpoet-discount-container {
   background: white;
-  border: 1px solid #ff5301;
+  border: 1px solid $color-secondary;
   margin: 15px;
   padding: 20px;
   text-align: center;

mailpoet/assets/css/src/components-plugin/_forms.scss

@@ -127,7 +127,6 @@ progress::-moz-progress-bar {
   width: 100%;
 
   .mailpoet-form-input-label {
-    background: #fff;
     bottom: 100%;
     color: $color-text-light;
     display: none;
@@ -244,3 +243,9 @@ progress::-moz-progress-bar {
 .mailpoet-form-field-disabled {
   cursor: not-allowed;
 }
+
+.mailpoet-password-input-toggle {
+  border-radius: 0 3px 3px 0 !important;
+  height: 100%;
+  padding: 0 10px !important;
+}

mailpoet/assets/css/src/components-plugin/_import-export.scss

@@ -1,3 +1,8 @@
+#mailpoet-export,
+#import_container {
+  margin-top: $grid-gap-half;
+}
+
 .mailpoet_hidden,
 .mailpoet_validation_error {
   display: none;
@@ -91,3 +96,12 @@ tr {
     font-size: $font-size;
   }
 }
+
+.mailpoet-notice-container {
+  .mailpoet_notice {
+    box-sizing: border-box;
+    margin: 0 0 1em;
+    max-width: $grid-column;
+    padding-right: 38px;
+  }
+}

mailpoet/assets/css/src/components-plugin/_landingpage.scss

@@ -1,3 +1,28 @@
+.admin_page_mailpoet-landingpage {
+  #wpcontent {
+    overflow-x: hidden;
+  }
+
+  #wpwrap {
+    background: white;
+  }
+
+  div.updated,
+  div.error,
+  .update-nag,
+  .notice {
+    display: none !important;
+  }
+
+  img {
+    max-width: 100%;
+  }
+
+  #wpfooter {
+    background: $color-grey-0;
+  }
+}
+
 #mailpoet_landingpage_container {
   $content-padding: 32px 65px;
   $mobile-content-padding: 25px;

mailpoet/assets/css/src/components-plugin/_listing-forms.scss

@@ -1,4 +1,6 @@
 .mailpoet-forms-listing {
+  margin-top: $grid-gap-half;
+
   .mailpoet-forms-add-new-row {
     text-align: center;
   }

mailpoet/assets/css/src/components-plugin/_listing-newsletters.scss

@@ -62,31 +62,6 @@
   background: $color-badge-green;
 }
 
-.mailpoet_badge_video {
-  background: $color-badge-video-guide;
-  display: inline-block;
-  line-height: 20px;
-  padding: 3px 6px;
-  text-decoration: none;
-  vertical-align: top;
-
-  &:hover,
-  &:active,
-  &:focus {
-    background: $color-badge-green;
-    color: #fff;
-  }
-
-  .dashicons {
-    font-size: 14px;
-    line-height: 20px;
-  }
-}
-
-.mailpoet_badge_video_grey {
-  background: #c3c3c3;
-}
-
 // h1.title needed to override WP styles specificity
 h1.title.mailpoet-newsletter-listing-heading {
   margin-bottom: $grid-gap;

mailpoet/assets/css/src/components-plugin/_listing.scss

@@ -20,8 +20,7 @@
   }
 
   .mailpoet-categories {
-    padding-left: $grid-gap-half;
-    padding-right: $grid-gap-half;
+    margin: 0 - $grid-gap 0 - $grid-gap $grid-gap;
   }
 
   a {
@@ -72,6 +71,12 @@ input.mailpoet-listing-current-page {
   width: 37px;
 }
 
+.mailpoet-listing-loading {
+  [data-automation-id='select_all'] {
+    display: none;
+  }
+}
+
 .mailpoet-listing-loading tbody tr,
 .mailpoet_form_loading div.mailpoet-form-grid {
   opacity: 0.2;
@@ -196,8 +201,8 @@ div.mailpoet-listing-bulk-actions-container {
     border-bottom: 1px solid $color-tertiary-light;
     box-shadow: none;
     max-width: 30vw;
-    padding: $grid-gap-medium $grid-gap-half;
-    vertical-align: middle;
+    padding: 12px $grid-gap-half;
+    vertical-align: top;
 
     @include respond-to(small-screen) {
       max-width: none;
@@ -311,13 +316,10 @@ a.mailpoet-listing-title {
 
 .mailpoet-listing-actions {
   align-items: center;
-  display: none;
+  display: flex;
   flex-wrap: wrap;
-  left: 0;
   line-height: 15px;
-  position: absolute;
-  top: 0;
-  width: 100%;
+  visibility: hidden;
 
   a {
     color: $color-text-light;
@@ -341,7 +343,7 @@ a.mailpoet-listing-title {
   }
 
   tr:hover & {
-    display: flex;
+    visibility: visible;
   }
 
   @include respond-to(small-screen) {

mailpoet/assets/css/src/components-plugin/_mp-toggle.scss

@@ -1,13 +1,12 @@
 @import '../components-automation/colors';
 
-$mp-toggle-border-radius: 0.125rem;
 $mp-toggle-transition: cubic-bezier(0, 1, 0.5, 1);
 
 .mp-toggle {
   --toggle-height: 40px;
   --font-size: 0.8125rem;
   background: #fff;
-  border-radius: $mp-toggle-border-radius;
+  border-radius: 3px;
   height: var(--toggle-height);
   position: relative;
 
@@ -32,46 +31,43 @@ $mp-toggle-transition: cubic-bezier(0, 1, 0.5, 1);
 
     .mp-toggle__switch {
       border: 1px solid $color-gutenberg-grey-400;
-      border-radius: $mp-toggle-border-radius;
+      border-radius: 3px;
       flex: 0 0 100%;
       height: var(--toggle-height);
       position: relative;
+      text-align: center;
 
       &:hover {
         cursor: pointer;
       }
 
-      &:before {
-        background-color: $color-gutenberg-grey-900;
-        border-radius: $mp-toggle-border-radius;
-        color: #fff !important;
-        content: attr(data-unchecked);
+      &:before,
+      &:after {
+        border-radius: 2px;
         font-size: var(--font-size);
-        font-weight: normal;
-        left: 0;
+        height: 100%;
         line-height: var(--toggle-height);
         min-width: 45px;
         padding: 0 12px;
         position: absolute;
-        text-align: center;
         top: 0;
         transition: background-color 0.3s $mp-toggle-transition;
         width: 50%;
       }
 
+      &:before {
+        background-color: $color-gutenberg-grey-900;
+        color: #fff;
+        content: attr(data-unchecked);
+        font-weight: normal;
+        left: 0;
+      }
+
       &:after {
+        background-color: #fff;
         color: $color-gutenberg-grey-700;
         content: attr(data-checked);
-        font-size: var(--font-size);
-        left: 50%;
-        line-height: var(--toggle-height);
-        min-width: 45px;
-        padding: 0 12px;
-        position: absolute;
-        text-align: center;
-        top: 0;
-        transition: background-color 0.3s $mp-toggle-transition;
-        width: 50%;
+        right: 0;
         z-index: 1;
       }
     }
@@ -96,46 +92,16 @@ $mp-toggle-transition: cubic-bezier(0, 1, 0.5, 1);
       ~ label {
         .mp-toggle__switch {
           &:before {
-            content: attr(data-checked);
-            left: 50%;
+            background-color: #fff;
+            color: $color-gutenberg-grey-700;
           }
 
           &:after {
-            color: $color-gutenberg-grey-700;
-            content: attr(data-unchecked);
-            left: 0;
-          }
-        }
-
-        &:hover {
-          color: $color-gutenberg-grey-700;
-        }
-      }
-
-      &:focus,
-      &:hover {
-        ~ label {
-          .mp-toggle__switch {
-            &:before {
-              background-color: $color-gutenberg-grey-900;
-              color: #fff;
-            }
+            background-color: $color-gutenberg-grey-900;
+            color: #fff;
           }
         }
       }
     }
-
-    &:focus ~ label,
-    &:hover ~ label {
-      .mp-toggle__switch {
-        &:after {
-          color: $color-gutenberg-grey-900;
-        }
-      }
-    }
-
-    &:hover ~ label {
-      color: $color-gutenberg-grey-900;
-    }
   }
 }

mailpoet/assets/css/src/components-plugin/_premium-page.scss

@@ -1,277 +0,0 @@
-.mailpoet_page_mailpoet-premium,
-.admin_page_mailpoet-premium,
-.admin_page_mailpoet-landingpage {
-  #wpcontent {
-    overflow-x: hidden;
-  }
-
-  #wpwrap {
-    background: white;
-  }
-
-  div.updated,
-  div.error,
-  .update-nag,
-  .notice {
-    display: none !important;
-  }
-
-  img {
-    max-width: 100%;
-  }
-}
-
-.admin_page_mailpoet-landingpage {
-  #wpfooter {
-    background: $color-grey-0;
-  }
-}
-
-.mailpoet-premium-page {
-  color: $color-tertiary;
-  margin: $grid-gap-large auto 0;
-  max-width: 944px;
-
-  p,
-  ul {
-    font-size: $font-size;
-    line-height: $line-height;
-
-    a {
-      color: $color-secondary;
-    }
-  }
-
-  p.mailpoet-premium-page-text-large {
-    font-size: 22px;
-  }
-
-  h1 {
-    margin-top: 0;
-  }
-
-  hr {
-    background: $color-tertiary-light;
-    border: none;
-    height: 1px;
-    margin: $grid-gap-large 0;
-    width: 100%;
-  }
-
-  .mailpoet-button {
-    margin-top: $grid-gap;
-  }
-}
-
-// "div" used for higher specificity for mobile styles
-div.mailpoet-premium-page-section {
-  padding: $grid-gap-large 0;
-  position: relative;
-  z-index: 1;
-
-  @include respond-to(small-screen) {
-    grid-template-columns: 1fr;
-    text-align: center;
-
-    > img {
-      margin: auto;
-      max-width: 150px;
-      order: -1;
-    }
-  }
-}
-
-.mailpoet-premium-page-section-narrow {
-  margin: auto;
-  max-width: 700px;
-}
-
-.mailpoet-premium-page-text-center {
-  text-align: center;
-}
-
-.mailpoet-premium-page-intro {
-  @include full-width-background(
-    linear-gradient(to top, $color-white, $color-secondary-light)
-  );
-  align-items: center;
-
-  img {
-    margin: auto;
-    max-width: 270px;
-  }
-}
-
-.mailpoet-premium-page-upgrade-to-premium .mailpoet-grid-three-columns {
-  grid-gap: $grid-gap-large;
-}
-
-.mailpoet-premium-page-get-started {
-  @include full-width-background(
-    linear-gradient(to top, $color-white, $color-secondary-light)
-  );
-}
-
-.mailpoet-premium-page-bullet-list {
-  li:before {
-    content: '·';
-    padding-right: 5px;
-  }
-}
-
-.mailpoet-premium-page-features {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  justify-content: space-around;
-
-  .mailpoet-premium-page-feature {
-    width: 29%;
-
-    @include breakpoint-max-width(640px) {
-      width: 49%;
-    }
-
-    @include breakpoint-max-width(500px) {
-      width: 100%;
-    }
-
-    p,
-    h2 {
-      text-align: left;
-    }
-  }
-}
-
-.mailpoet-premium-page-options {
-  margin: auto;
-  max-width: 1000px;
-
-  > div {
-    align-items: center;
-    background: $color-white;
-    border-radius: 8px;
-    box-shadow: 0 2px 4px 0 $color-secondary-light;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    margin-top: $grid-gap-large;
-    padding: 24px;
-  }
-
-  .mailpoet-button {
-    width: 100%;
-  }
-
-  .mailpoet-premium-page-text-large {
-    color: $color-secondary;
-    margin-top: 0;
-  }
-
-  ul {
-    color: $color-secondary;
-    display: inline-block;
-    text-align: left;
-    width: 100%;
-
-    li {
-      margin: $grid-gap 0;
-      position: relative;
-    }
-
-    li:before {
-      background-color: $color-secondary-light;
-      background-image: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0.175 -0.365 17.008 17.008"%3E%3Cpath fill="%23ff5301" d="M16.983 1.923c0 .814-.369 1.607-1.106 2.38l-.114.115-6.453 6.796c-1.37 1.44-2.539 2.555-3.502 3.341s-1.644 1.18-2.041 1.18c-.417 0-.936-.197-1.556-.59-.62-.394-1.02-.799-1.2-1.216-.152-.349-.298-1.086-.434-2.214a30.519 30.519 0 0 1-.204-3.664c0-.717.299-1.38.897-1.988.6-.609 1.261-.914 1.983-.914.689 0 1.1.63 1.232 1.89l.03.324c.111.967.24 1.643.387 2.024.148.383.347.573.597.573.104 0 .299-.112.584-.339.356-.29.697-.598 1.022-.923l6.63-6.566c.557-.557 1.055-.978 1.491-1.263.439-.286.812-.429 1.117-.429.23 0 .394.087.49.261.098.175.146.467.146.877v.345h.004z"/%3E%3C/svg%3E%0A');
-      background-position: center;
-      background-repeat: no-repeat;
-      background-size: 10px;
-      border-radius: $form-control-border-radius;
-      content: '';
-      display: inline-block;
-      height: 22px;
-      margin-right: 14px;
-      vertical-align: top;
-      width: 22px;
-    }
-  }
-}
-
-.mailpoet-premium-three-columns-two-orphans {
-  @include respond-to(not-small-screen) {
-    grid-template-columns: repeat(6, 1fr);
-
-    > div {
-      grid-column: span 2;
-    }
-
-    > div:last-child:nth-child(3n - 1) {
-      grid-column-end: -2;
-    }
-
-    > div:nth-last-child(2):nth-child(3n + 1) {
-      grid-column-end: 4;
-    }
-  }
-}
-
-.mailpoet-premium-page-options-label-wrap {
-  height: 3em;
-}
-
-.mailpoet-premium-feature-list-heading {
-  align-self: flex-start;
-  color: $color-secondary;
-  margin-bottom: 0;
-}
-
-.mailpoet-premium-page-options-label {
-  background: $color-tertiary;
-  border-radius: 0 2px 2px 0;
-  color: $color-white;
-  font-weight: bold;
-  left: 12px;
-  margin-bottom: $grid-gap;
-  padding: 2px 12px;
-  position: relative;
-
-  &:before {
-    background: $color-secondary-middle;
-    border-left: 12px solid $color-secondary;
-    border-radius: 2px 0 0 2px;
-    content: '';
-    height: 100%;
-    left: -24px;
-    position: absolute;
-    top: 0;
-    width: 12px;
-  }
-}
-
-.mailpoet-premium-page-options-divider {
-  flex-grow: 100;
-}
-
-.mailpoet-premium-page-our-agency-license {
-  align-items: center;
-  grid-template-columns: 3fr 2fr;
-}
-
-.mailpoet-premium-page-footer-image {
-  padding-bottom: 35%;
-  width: 100%;
-}
-
-.mailpoet-premium-page-footer-image img {
-  bottom: 0;
-  left: -20px;
-  position: absolute;
-  right: 0;
-  width: calc(100% + 20px);
-
-  &:before {
-    content: '';
-    display: block;
-    height: 1000px;
-    width: 100%;
-  }
-}

mailpoet/assets/css/src/components-plugin/_premium-tiers-page.scss

@@ -68,43 +68,53 @@
 .mailpoet-tiers-page-content__tier {
   align-items: flex-start;
   background: #fff;
-  border-bottom: 1px solid $color-gutenberg-grey-200;
-  border-left: 1px solid $color-gutenberg-grey-200;
-  border-radius: 4px 0 0 4px;
-  border-top: 1px solid $color-gutenberg-grey-200;
+  border: 1px solid $color-gutenberg-grey-200;
+  border-radius: 4px 4px 0 0;
   display: flex;
   flex: 1 0 0;
   flex-direction: column;
   gap: 24px;
-  height: 42.75rem;
+  min-height: 600px;
   padding: 24px;
 
   @include respond-to(small-screen) {
-    border: 1px solid $color-gutenberg-grey-200;
+    border-radius: 0;
+    flex-basis: auto;
+    min-height: 0 !important;
+  }
+
+  &:first-child {
+    border-radius: 4px 0 0 4px;
+    border-right-width: 0;
+
+    @include respond-to(small-screen) {
+      border-bottom-width: 0;
+      border-radius: 4px 4px 0 0;
+      border-right-width: 1px;
+    }
+  }
+
+  &:last-child {
+    border-left-width: 0;
+    border-radius: 0 4px 4px 0;
+
+    @include respond-to(small-screen) {
+      border-left-width: 1px;
+      border-radius: 0 0 4px 4px;
+      border-top-width: 0;
+    }
   }
 
   &.popular {
     background: #fffaf2;
     border: 1px solid #ffe9cc;
-    height: 45.75rem;
+    min-height: 648px;
   }
 
   .components-button {
     align-self: stretch;
     font-size: 0.8125rem;
     justify-content: center;
-
-    &:disabled {
-      background: $color-gutenberg-grey-100;
-      color: $color-gutenberg-grey-600;
-      gap: 4px;
-      opacity: 1;
-      padding-left: 8px;
-
-      svg {
-        fill: none;
-      }
-    }
   }
 
   p {
@@ -122,77 +132,32 @@
     padding-inline-start: 24px;
 
     li {
-      list-style-image: url('../../img/upgrade/plus.svg');
+      list-style-type: none;
       margin-bottom: 8px;
+      position: relative;
 
-      .tp-wrapper {
-        position: relative;
-      }
-
-      em {
-        font-style: normal;
-        text-decoration: underline dotted $color-gutenberg-grey-600;
-        text-underline-offset: 3px;
-      }
-
-      [role='tooltip'] {
-        background-color: $color-gutenberg-grey-900;
-        border-radius: 2px;
-        bottom: 100%;
-        color: $color-white;
-        font-size: 0.6875rem;
-        left: -4px;
-        line-height: 1rem;
-        padding: 3px 6px;
+      &:before {
+        background: url('../../img/upgrade/check.svg') no-repeat;
+        background-size: contain;
+        content: '';
+        height: 20px;
+        left: -24px;
         position: absolute;
-        right: 16px;
-        visibility: hidden;
-
-        p {
-          color: $color-white;
-          font-size: 0.6875rem;
-          line-height: 1rem;
-        }
-      }
-
-      [role='tooltip']:has(+ .tp-trigger:hover),
-      [role='tooltip']:has(+ .tp-trigger:focus) {
-        visibility: visible;
+        top: 2px;
+        width: 20px;
       }
     }
 
-    &.free {
-      li {
-        list-style-image: url('../../img/upgrade/check.svg');
-      }
+    &.free li:before {
+      background-image: url('../../img/upgrade/check.svg');
     }
 
-    &.business {
-      li {
-        list-style-image: url('../../img/upgrade/plus-orange.svg');
-      }
+    &.business li:before {
+      background-image: url('../../img/upgrade/plus-orange.svg');
     }
   }
 }
 
-.mailpoet-tiers-page-price-divider {
-  align-items: center;
-  align-self: stretch;
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  gap: 8px;
-  height: 36px;
-  justify-content: center;
-  hr {
-    background: $color-gutenberg-grey-200;
-    border: none;
-    height: 1px;
-    margin: 0;
-    width: 100%;
-  }
-}
-
 .mailpoet-tiers-page-label {
   align-items: flex-start;
   background: #f16618;
@@ -207,7 +172,7 @@
   color: #fff;
   font-size: 0.75rem;
   gap: 8px;
-  line-height: 1.333;
+  line-height: 16px;
 }
 
 .mailpoet-tiers-page-tier-header {
@@ -218,6 +183,10 @@
   gap: 8px;
   min-height: 7.5rem;
 
+  @include respond-to(small-screen) {
+    min-height: 0;
+  }
+
   p {
     color: $color-gutenberg-grey-900;
     font-size: 1rem;
@@ -242,20 +211,22 @@
 }
 
 .mailpoet-tiers-page-tier-header__icon {
+  background-position: -4px -4px;
   background-repeat: no-repeat;
-  background-size: contain;
+  background-size: 48px 48px;
   height: 40px;
-  &.free {
-    background-image: url('../../img/upgrade/1-starter-plan.svg');
-    width: 30.44px;
+  width: 40px;
+
+  &.starter {
+    background-image: url('../../img/upgrade/starter.svg');
   }
-  &.basic {
-    background-image: url('../../img/upgrade/2-tier-1-plan.svg');
-    width: 40.37px;
+
+  &.business {
+    background-image: url('../../img/upgrade/business.svg');
   }
-  &.pro {
-    background-image: url('../../img/upgrade/3-business-plan.svg');
-    width: 30.44px;
+
+  &.agency {
+    background-image: url('../../img/upgrade/agency.svg');
   }
 }
 
@@ -308,23 +279,23 @@
       }
     }
   }
-  #mailpoet-pro-monthly-price,
-  #mailpoet-basic-monthly-price {
+  #mailpoet-agency-monthly-price,
+  #mailpoet-business-monthly-price {
     display: block;
   }
-  #mailpoet-pro-yearly-price,
-  #mailpoet-basic-yearly-price {
+  #mailpoet-agency-yearly-price,
+  #mailpoet-business-yearly-price {
     display: none;
   }
 }
 
 .mailpoet-tiers-page:has(#pricing_duration:checked) {
-  .mailpoet-tiers-page-tier-price #mailpoet-pro-monthly-price,
-  .mailpoet-tiers-page-tier-price #mailpoet-basic-monthly-price {
+  .mailpoet-tiers-page-tier-price #mailpoet-agency-monthly-price,
+  .mailpoet-tiers-page-tier-price #mailpoet-business-monthly-price {
     display: none;
   }
-  .mailpoet-tiers-page-tier-price #mailpoet-pro-yearly-price,
-  .mailpoet-tiers-page-tier-price #mailpoet-basic-yearly-price {
+  .mailpoet-tiers-page-tier-price #mailpoet-agency-yearly-price,
+  .mailpoet-tiers-page-tier-price #mailpoet-business-yearly-price {
     display: block;
   }
 }

mailpoet/assets/css/src/components-plugin/_settings.scss

@@ -165,8 +165,3 @@ ul.sending-method-benefits {
 .mailpoet-verify-key-button {
   height: 36px;
 }
-
-.mailpoet-premium-key-toggle {
-  height: 34px;
-  padding: 0 10px !important;
-}

mailpoet/assets/css/src/components/_categories.scss

@@ -1,77 +1,38 @@
-.mailpoet-categories {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: flex-start;
-  line-height: 16px;
-  list-style: none;
-  margin: 0;
-  padding: $grid-gap 0 1px; // 1px to prevent https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Box_Model/Mastering_margin_collapsing
-  row-gap: $grid-gap;
-}
-
-.mailpoet-categories-item {
-  color: $color-text-light;
-  font-size: $font-size;
-  margin-bottom: $grid-gap;
-  padding-bottom: $grid-gap;
-  text-decoration: none;
-
-  &:hover,
-  &:focus {
-    box-shadow: none;
-    color: $color-text-light-hover;
+.mailpoet-templates-tab-panel,
+.mailpoet-filter-tab-panel,
+.mailpoet-categories,
+.mailpoet-tabs {
+  .components-tab-panel__tabs {
+    box-shadow: inset 0 -1px 0 0 #dcdcde;
+    flex-wrap: wrap;
   }
 
-  &.active {
-    color: $color-secondary;
-    font-weight: bold;
+  .components-tab-panel__tabs-item {
+    &:focus {
+      box-shadow: none;
+    }
+
+    &.is-active {
+      box-shadow: inset 0 -4px 0 0 var(--wp-admin-theme-color);
+
+      &:focus-visible {
+        box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus)
+          var(--wp-admin-theme-color);
+      }
+    }
+
+    &:focus-visible {
+      box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus)
+        var(--wp-admin-theme-color);
+    }
   }
 
-  + .mailpoet-categories-item {
-    margin-left: $grid-gap-large;
-  }
-}
-
-.mailpoet-categories-title {
-  display: inline-block;
-  position: relative;
-  vertical-align: top;
-
-  // Hack so the text is not jumping when changed to bold when active
-  &:before {
-    content: attr(data-title);
-    display: block;
-    font-weight: bold;
-    height: 0;
-    overflow: hidden;
-    visibility: hidden;
-  }
-
-  .mailpoet-categories-item.active &:after {
-    background: $color-secondary;
-    border-radius: 2px;
-    content: '';
-    height: 4px;
-    left: 0;
-    margin-top: 5px;
-    position: absolute;
-    top: 100%;
-    width: 100%;
-  }
-}
-
-.mailpoet-categories-count {
-  background-color: $color-tertiary-light;
-  border-radius: 8px;
-  display: inline-block;
-  font-size: $font-size-extra-small;
-  font-weight: 600;
-  line-height: 16px;
-  margin-left: $grid-gap-half;
-  padding: 0 6px;
-  vertical-align: top;
-
-  .mailpoet-categories-item.active & {
-    background-color: $color-secondary-light;
+  .count {
+    background-color: #f0f0f1;
+    border-radius: 12px;
+    font-size: 11px;
+    font-weight: 400;
+    margin-left: 6px;
+    padding: 2px 5px;
   }
 }

mailpoet/assets/css/src/components/_tabs.scss

@@ -1,110 +1,29 @@
-.mailpoet-tabs {
-  clear: both;
-  position: relative;
-  z-index: 1;
+.mailpoet-tabs > .components-tab-panel__tabs {
+  box-shadow: none;
+  margin-top: $grid-gap-half;
 
-  #screen-meta-links ~ .wrap .mailpoet-top-bar ~ & {
-    top: -20px;
-  }
+  .components-tab-panel__tabs-item {
+    border: 1px solid transparent;
+    border-bottom: none;
+    box-shadow: none;
 
-  .notice ~ &,
-  .notice ~ div > &,
-  .notice ~ .wrap &,
-  .error ~ &,
-  .error ~ div > &,
-  .error ~ .wrap &,
-  .mailpoet-subscribers-in-plan ~ &,
-  #mailpoet_notices:not(:empty) ~ div > & {
-    top: 0 !important;
-  }
-
-  @include respond-to(small-screen) {
-    top: 0 !important;
-  }
-}
-
-.mailpoet-tabs-is-open {
-  z-index: 2;
-
-  &:after {
-    background: rgba(30, 36, 40, 0.1);
-    content: '';
-    height: 100%;
-    left: 0;
-    position: absolute;
-    top: 0;
-    width: 100%;
-    z-index: 1;
-  }
-}
-
-.mailpoet-tab,
-.mailpoet-tabs-title {
-  align-items: center;
-  background: none;
-  border: 1px solid transparent;
-  border-bottom: 0;
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-  box-sizing: border-box;
-  color: $color-heading;
-  cursor: pointer;
-  display: inline-flex;
-  font-size: $font-size;
-  justify-content: center;
-  line-height: 24px;
-  margin-bottom: -1px;
-  max-width: 100%;
-  min-height: 56px;
-  padding: $grid-gap-half $grid-gap-medium;
-  position: relative;
-  text-align: center;
-  text-decoration: none;
-  vertical-align: top;
-
-  &:focus {
-    outline: none;
-  }
-
-  &.mailpoet-tab-active {
-    background: $color-white;
-    border-color: $color-tertiary-light;
-    color: $color-secondary;
-    font-weight: 600;
-  }
-
-  svg {
-    fill: currentColor;
-    height: 16px;
-    width: 16px;
-
-    &:first-child {
-      margin-right: 6px;
+    &:after {
+      background: #fff;
+      bottom: -1px;
+      box-shadow: none;
+      transition: none;
     }
 
-    &:last-child {
-      margin-left: 6px;
-    }
+    &.is-active {
+      background-color: #fff;
+      border-color: #dcdcde;
+      box-shadow: none;
 
-    &:only-child {
-      margin-left: 0;
-      margin-right: 0;
+      &:focus-visible {
+        box-shadow: none;
+      }
     }
   }
-
-  // Hack so the text is not jumping when changed to bold when active
-  > span:before {
-    content: attr(data-title);
-    display: block;
-    font-weight: bold;
-    height: 0;
-    overflow: hidden;
-    visibility: hidden;
-  }
-}
-
-.mailpoet-tabs-title {
-  display: none;
 }
 
 .mailpoet-tab-content {
@@ -122,37 +41,6 @@
 }
 
 @include respond-to(small-screen) {
-  .mailpoet-tabs {
-    margin-left: -10px;
-    margin-right: -12px;
-  }
-
-  .mailpoet-tabs-title {
-    background: $color-white;
-    border: 1px solid $color-tertiary-light;
-    border-bottom: none;
-    border-radius: 0;
-    display: flex;
-    font-weight: bold;
-    justify-content: flex-start;
-    margin-bottom: 0;
-    width: 100%;
-    z-index: 2;
-
-    &:after {
-      background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='8' viewBox='0 0 12 8'%3E%3Cpath fill='%231d2327' d='M10 0H2c-.552 0-1 .448-1 1 0 .216.07.427.2.6l4 5.333c.331.442.958.532 1.4.2.076-.057.143-.124.2-.2l4-5.333c.331-.442.242-1.069-.2-1.4-.173-.13-.384-.2-.6-.2z'/%3E%3C/svg%3E%0A")
-        no-repeat center;
-      content: '';
-      height: 8px;
-      margin-left: auto;
-      width: 12px;
-    }
-
-    .mailpoet-tabs-is-open > &:after {
-      transform: rotate(180deg);
-    }
-  }
-
   .mailpoet-tab {
     background: $color-white;
     border: 1px solid $color-tertiary-light;
@@ -161,19 +49,6 @@
     width: 100%;
   }
 
-  .mailpoet-tabs-wrapper {
-    display: none;
-    left: 0;
-    position: absolute;
-    top: 56px;
-    width: 100%;
-    z-index: 2;
-
-    .mailpoet-tabs-is-open > & {
-      display: block;
-    }
-  }
-
   .mailpoet-tab-content {
     border-radius: 0;
     padding-top: 0;

mailpoet/assets/css/src/components/_top_bar.scss

@@ -31,9 +31,10 @@
     top: 2px;
     z-index: 1;
 
-    svg {
-      max-height: 100%;
-      max-width: 100%;
+    svg,
+    img {
+      height: 23px;
+      width: 75px;
     }
   }
 
@@ -42,26 +43,6 @@
   }
 }
 
-.mailpoet-top-bar-logo-desktop {
-  display: block;
-  height: 23px;
-  width: 75px;
-
-  @include respond-to(small-screen) {
-    display: none;
-  }
-}
-
-.mailpoet-top-bar-logo-mobile {
-  display: none;
-  height: 40px;
-  width: 39px;
-
-  @include respond-to(small-screen) {
-    display: block;
-  }
-}
-
 .mailpoet-top-bar-children {
   margin-left: $grid-gap;
 

mailpoet/assets/css/src/generic/_forms-token-field.scss

@@ -3,14 +3,16 @@
   border: 1px solid $color-input-border !important;
   border-radius: $form-control-border-radius !important;
   box-sizing: border-box;
+  display: flex;
   max-width: 100%;
   min-height: $form-control-height;
   min-width: 0;
   width: $grid-column;
   // To align the left padding with the other inputs
   input[type='text'].components-form-token-field__input {
+    line-height: 16px;
     margin-left: 0;
-    min-height: 30px;
+    min-height: 24px;
     padding-left: 8px;
   }
   // For better fit when the last item is active

mailpoet/assets/css/src/generic/_grid.scss

@@ -1,5 +1,6 @@
 .mailpoet-flex {
   display: flex;
+  gap: $grid-gap;
 }
 
 .mailpoet-flex-grow {

mailpoet/assets/css/src/mailpoet-dynamic-segments.scss

@@ -5,32 +5,6 @@
   box-sizing: border-box;
 }
 
-.mailpoet-segment-subscriber-count {
-  align-items: center;
-  display: flex;
-  font-size: 13px;
-  gap: 16px;
-  padding-top: 8px;
-
-  .mailpoet-segment-help-icon {
-    display: flex;
-  }
-
-  .mailpoet-segment-subscriber-count-message {
-    align-items: center;
-    display: flex;
-    font-size: 14px;
-  }
-
-  .mailpoet-segment-subscriber-cache {
-    color: $color-text-light;
-  }
-
-  .components-button.is-link {
-    text-decoration: none;
-  }
-}
-
 .mailpoet-confirm-dialog {
   max-width: 600px;
 }

mailpoet/assets/css/src/mailpoet-editor.scss

@@ -40,6 +40,7 @@
 @import 'components-editor/content-blocks/container';
 @import 'components-editor/content-blocks/abandoned-cart-content';
 @import 'components-editor/content-blocks/automated-latest-content';
+@import 'components-editor/content-blocks/dynamic-products';
 @import 'components-editor/content-blocks/posts';
 @import 'components-editor/content-blocks/products';
 @import 'components-editor/content-blocks/button';

mailpoet/assets/css/src/mailpoet-listing.scss

@@ -15,39 +15,7 @@
   background-color: #fff;
   border: 1px solid #dcdcde;
   border-radius: 2px;
-  margin-top: 16px;
-
-  .components-tab-panel__tabs {
-    box-shadow: inset 0 -1px 0 0 #dcdcde;
-  }
-
-  .components-tab-panel__tabs-item:focus {
-    box-shadow: none;
-  }
-
-  .components-tab-panel__tabs-item.is-active {
-    box-shadow: inset 0 -4px 0 0 var(--wp-admin-theme-color);
-  }
-
-  .components-tab-panel__tabs-item:focus-visible {
-    box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus)
-      var(--wp-admin-theme-color);
-  }
-
-  .components-tab-panel__tabs-item.is-active:focus-visible {
-    box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus)
-        var(--wp-admin-theme-color),
-      inset 0 -4px 0 0 var(--wp-admin-theme-color);
-  }
-
-  .count {
-    background-color: #f0f0f1;
-    border-radius: 12px;
-    font-size: 11px;
-    font-weight: 400;
-    margin-left: 6px;
-    padding: 2px 5px;
-  }
+  margin-top: $grid-gap-half;
 }
 
 .mailpoet-listing-card.woocommerce-table {

mailpoet/assets/css/src/mailpoet-plugin.scss

@@ -78,7 +78,6 @@
 @import 'components-plugin/pages';
 @import 'components-plugin/pages-custom';
 @import 'components-plugin/premium-tiers-hero-sections';
-@import 'components-plugin/premium-page';
 @import 'components-plugin/premium-tiers-page';
 @import 'components-plugin/mp-toggle';
 @import 'components-plugin/menu';

mailpoet/assets/css/src/mailpoet-templates.scss

@@ -8,8 +8,13 @@
     background-color: #e5e5e8;
     font-size: 11px;
     font-weight: normal;
-    margin: 2px 0 2px 10px;
-    width: 26px;
+    height: auto;
+    line-height: 1.4;
+    margin-left: 6px;
+    min-height: 0;
+    min-width: 0;
+    padding: 2px 5px;
+    width: auto;
   }
 }
 

mailpoet/assets/css/src/settings/_colors.scss

@@ -20,8 +20,8 @@ $color-primary-highlight: #1e8cbe;
 $color-primary-inactive: #a4a4a4;
 $color-primary-shadow-inset: #025c80;
 $color-primary-text: #656565;
-$color-secondary: #ff5301;
-$color-secondary-hover: darken($color-secondary, 10%);
+$color-secondary: var(--wp-admin-theme-color);
+$color-secondary-hover: var(--wp-admin-theme-color-darker-20);
 $color-secondary-middle: #f5a278;
 $color-secondary-middle-hover: darken($color-secondary-middle, 10%);
 $color-secondary-light: #ffe0d0;

mailpoet/assets/css/src/settings/_form-editor.scss

@@ -1,5 +1,5 @@
 $gutenberg-control-border-color: #7e8993;
-$gutenberg-control-active-color: #ff5301;
+$gutenberg-control-active-color: $color-secondary;
 $gutenberg-control-border-color-focus: #007cba;
 $selection-item-base-color: $color-tertiary-light;
 $selection-item-text-color: #23282d;