diff --git a/.github/workflows/install-testing.yml b/.github/workflows/install-testing.yml index dfec592c2e154..ca03ebd518a00 100644 --- a/.github/workflows/install-testing.yml +++ b/.github/workflows/install-testing.yml @@ -11,11 +11,14 @@ on: paths: - '.github/workflows/install-testing.yml' - '.version-support-*.json' + - '.github/workflows/reusable-support-json-reader-v1.yml' pull_request: # Always test the workflow when changes are suggested. paths: - - '.github/workflows/install-testing.yml' - '.version-support-*.json' + - '.github/workflows/install-testing.yml' + - '.github/workflows/reusable-support-json-reader-v1.yml' + schedule: - cron: '0 0 * * 1' workflow_dispatch: @@ -37,66 +40,21 @@ concurrency: permissions: {} jobs: - # Determines the appropriate values for PHP and database versions based on the WordPress version being tested. - # - # Performs the following steps: - # - Checks out the repository. - # - Fetches the versions of PHP to test. - # - Fetches the versions of MySQL to test. - build-matrix: - name: Determine PHP Versions to test - runs-on: ubuntu-latest + # Determines the supported values for PHP and database versions based on the WordPress version being tested. + build-test-matrix: + name: Build Test Matrix + uses: WordPress/wordpress-develop/.github/workflows/reusable-support-json-reader-v1.yml@trunk + permissions: + contents: read + secrets: inherit if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} - timeout-minutes: 5 - outputs: - major-wp-version: ${{ steps.major-wp-version.outputs.version }} - php-versions: ${{ steps.php-versions.outputs.versions }} - mysql-versions: ${{ steps.mysql-versions.outputs.versions }} - - steps: - - name: Checkout repository - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - with: - show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} - - - name: Determine the major WordPress version - id: major-wp-version - run: | - if [ "${{ inputs.wp-version }}" ] && [ "${{ inputs.wp-version }}" != "nightly" ] && [ "${{ inputs.wp-version }}" != "latest" ]; then - echo "version=$(echo "${{ inputs.wp-version }}" | tr '.' '-' | cut -d '-' -f1-2)" >> $GITHUB_OUTPUT - elif [ "${{ inputs.wp-version }}" ]; then - echo "version=$(echo "${{ inputs.wp-version }}")" >> $GITHUB_OUTPUT - else - echo "version=nightly" >> $GITHUB_OUTPUT - fi - - # Look up the major version's specific PHP support policy when a version is provided. - # Otherwise, use the current PHP support policy. - - name: Get supported PHP versions - id: php-versions - run: | - if [ "${{ steps.major-wp-version.outputs.version }}" != "latest" ] && [ "${{ steps.major-wp-version.outputs.version }}" != "nightly" ]; then - echo "versions=$(jq -r '.["${{ steps.major-wp-version.outputs.version }}"] | @json' .version-support-php.json)" >> $GITHUB_OUTPUT - else - echo "versions=$(jq -r '.[ (keys[-1]) ] | @json' .version-support-php.json)" >> $GITHUB_OUTPUT - fi - - # Look up the major version's specific MySQL support policy when a version is provided. - # Otherwise, use the current MySQL support policy. - - name: Get supported MySQL versions - id: mysql-versions - run: | - if [ "${{ steps.major-wp-version.outputs.version }}" != "latest" ] && [ "${{ steps.major-wp-version.outputs.version }}" != "nightly" ]; then - echo "versions=$(jq -r '.["${{ steps.major-wp-version.outputs.version }}"] | @json' .version-support-mysql.json)" >> $GITHUB_OUTPUT - else - echo "versions=$(jq -r '.[ (keys[-1]) ] | @json' .version-support-mysql.json)" >> $GITHUB_OUTPUT - fi + with: + wp-version: ${{ inputs.wp-version }} # Test the WordPress installation process through WP-CLI. # # Performs the following steps: # - Sets up PHP. - # - Starts the database server. # - Downloads the specified version of WordPress. # - Creates a `wp-config.php` file. # - Installs WordPress. @@ -107,14 +65,14 @@ jobs: runs-on: ${{ matrix.os }} if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} timeout-minutes: 10 - needs: [ build-matrix ] + needs: [ build-test-matrix ] strategy: fail-fast: false matrix: os: [ ubuntu-latest ] - php: ${{ fromJSON( needs.build-matrix.outputs.php-versions ) }} + php: ${{ fromJSON( needs.build-test-matrix.outputs.php-versions ) }} db-type: [ 'mysql' ] - db-version: ${{ fromJSON( needs.build-matrix.outputs.mysql-versions ) }} + db-version: ${{ fromJSON( needs.build-test-matrix.outputs.mysql-versions ) }} multisite: [ false, true ] memcached: [ false ] @@ -125,6 +83,14 @@ jobs: - db-version: '5.0' - db-version: '5.1' - db-version: '5.5' + - php: '7.2' + db-version: '8.4' + - php: '7.3' + db-version: '8.4' + - php: '7.2' + db-version: '9.0' + - php: '7.3' + db-version: '9.0' services: database: @@ -133,13 +99,13 @@ jobs: - 3306 options: >- --health-cmd="mysqladmin ping" - --health-interval=30s - --health-timeout=10s - --health-retries=5 - -e MYSQL_ROOT_PASSWORD=root - -e MYSQL_DATABASE=test_db + --health-interval="30s" + --health-timeout="10s" + --health-retries="5" + -e MYSQL_ROOT_PASSWORD="root" + -e MYSQL_DATABASE="test_db" --entrypoint sh ${{ matrix.db-type }}:${{ matrix.db-version }} - -c "exec docker-entrypoint.sh mysqld${{ matrix.db-version != '5.5' && ' --default-authentication-plugin=mysql_native_password"' || '' }} + -c "exec docker-entrypoint.sh mysqld${{ matrix.db-type == 'mysql' && contains( fromJSON('["7.2", "7.3"]'), matrix.php ) && ' --default-authentication-plugin=mysql_native_password' || '' }}" steps: - name: Set up PHP ${{ matrix.php }} @@ -149,10 +115,6 @@ jobs: coverage: none tools: wp-cli${{ contains( fromJSON('["5.4", "5.5"]'), matrix.php ) && ':2.4.0' || '' }} - - name: Start the database server - run: | - sudo systemctl start ${{ matrix.db-type }} - - name: Download WordPress run: wp core download ${{ inputs.wp-version && format( '--version={0}', inputs.wp-version ) || '--version=nightly' }} diff --git a/.github/workflows/local-docker-environment.yml b/.github/workflows/local-docker-environment.yml new file mode 100644 index 0000000000000..1e25c82ef1287 --- /dev/null +++ b/.github/workflows/local-docker-environment.yml @@ -0,0 +1,154 @@ +name: Local Docker Environment + +on: + push: + branches: + - trunk + - '6.[8-9]' + - '[7-9].[0-9]' + paths: + # Any changes to Docker related files. + - '.env.example' + - 'docker-compose.yml' + # Any changes to local environment related files + - 'tools/local-env/**' + # These files manage packages used by the local environment. + - 'package*.json' + # These files configure Composer. Changes could affect the local environment. + - 'composer.*' + # These files define the versions to test. + - '.version-support-*.json' + # Changes to this and related workflow files should always be verified. + - '.github/workflows/local-docker-environment.yml' + - '.github/workflows/reusable-support-json-reader-v1.yml' + - '.github/workflows/reusable-test-docker-environment-v1.yml' + pull_request: + branches: + - trunk + - '6.[8-9]' + - '[7-9].[0-9]' + paths: + # Any changes to Docker related files. + - '.env.example' + - 'docker-compose.yml' + # Any changes to local environment related files + - 'tools/local-env/**' + # These files manage packages used by the local environment. + - 'package*.json' + # These files configure Composer. Changes could affect the local environment. + - 'composer.*' + # These files define the versions to test. + - '.version-support-*.json' + # Changes to this and related workflow files should always be verified. + - '.github/workflows/local-docker-environment.yml' + - '.github/workflows/reusable-support-json-reader-v1.yml' + - '.github/workflows/reusable-test-docker-environment-v1.yml' + workflow_dispatch: + +# Cancels all previous workflow runs for pull requests that have not completed. +concurrency: + # The concurrency group contains the workflow name and the branch name for pull requests + # or the commit hash for any other events. + group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }} + cancel-in-progress: true + +# Disable permissions for all available scopes by default. +# Any needed permissions should be configured at the job level. +permissions: {} + +jobs: + # + # Determines the appropriate supported values for PHP and database versions based on the WordPress + # version being tested. + # + build-test-matrix: + name: Build Test Matrix + uses: WordPress/wordpress-develop/.github/workflows/reusable-support-json-reader-v1.yml@trunk + permissions: + contents: read + secrets: inherit + if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} + with: + wp-version: ${{ github.event_name == 'pull_request' && github.base_ref || github.ref_name }} + + # Tests the local Docker environment. + environment-tests-mysql: + name: PHP ${{ matrix.php }} + uses: WordPress/wordpress-develop/.github/workflows/reusable-test-local-docker-environment-v1.yml@trunk + permissions: + contents: read + if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} + needs: [ build-test-matrix ] + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest ] + memcached: [ false, true ] + php: ${{ fromJSON( needs.build-test-matrix.outputs.php-versions ) }} + db-version: ${{ fromJSON( needs.build-test-matrix.outputs.mysql-versions ) }} + + exclude: + # The MySQL 5.5 containers will not start. + - db-version: '5.5' + # MySQL 9.0+ will not work on PHP 7.2 & 7.3 + - php: '7.2' + db-version: '9.0' + - php: '7.3' + db-version: '9.0' + + with: + os: ${{ matrix.os }} + php: ${{ matrix.php }} + db-type: 'mysql' + db-version: ${{ matrix.db-version }} + memcached: ${{ matrix.memcached }} + tests-domain: ${{ matrix.tests-domain }} + + slack-notifications: + name: Slack Notifications + uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk + permissions: + actions: read + contents: read + needs: [ build-test-matrix, environment-tests-mysql ] + if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }} + with: + calling_status: ${{ contains( needs.*.result, 'cancelled' ) && 'cancelled' || contains( needs.*.result, 'failure' ) && 'failure' || 'success' }} + secrets: + SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }} + SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }} + SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }} + SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }} + + failed-workflow: + name: Failed workflow tasks + runs-on: ubuntu-latest + permissions: + actions: write + needs: [ build-test-matrix, environment-tests-mysql, slack-notifications ] + if: | + always() && + github.repository == 'WordPress/wordpress-develop' && + github.event_name != 'pull_request' && + github.run_attempt < 2 && + ( + contains( needs.*.result, 'cancelled' ) || + contains( needs.*.result, 'failure' ) + ) + + steps: + - name: Dispatch workflow run + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 + with: + retries: 2 + retry-exempt-status-codes: 418 + script: | + github.rest.actions.createWorkflowDispatch({ + owner: context.repo.owner, + repo: context.repo.repo, + workflow_id: 'failed-workflow.yml', + ref: 'trunk', + inputs: { + run_id: '${{ github.run_id }}' + } + }); diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index 50e4c940c2169..62a7aa50f7718 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -47,50 +47,58 @@ jobs: os: [ ubuntu-latest ] php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] db-type: [ 'mysql' ] - db-version: [ '5.7', '8.0', '8.1', '8.2', '8.3' ] + db-version: [ '5.7', '8.0', '8.4', '9.0' ] tests-domain: [ 'example.org' ] multisite: [ false, true ] memcached: [ false ] include: - # Include jobs for PHP 7.4 with memcached. + # Include jobs that test with memcached. - os: ubuntu-latest - php: '7.4' + php: '8.3' db-type: 'mysql' - db-version: '5.7' + db-version: '8.4' tests-domain: 'example.org' multisite: false memcached: true - os: ubuntu-latest - php: '7.4' + php: '8.3' db-type: 'mysql' - db-version: '5.7' + db-version: '8.4' tests-domain: 'example.org' multisite: true memcached: true # Include jobs with a port on the test domain for both single and multisite. - os: ubuntu-latest - php: '7.4' + php: '8.4' db-type: 'mysql' - db-version: '5.7' + db-version: '8.4' tests-domain: 'example.org:8889' multisite: false memcached: false - os: ubuntu-latest - php: '7.4' + php: '8.4' db-type: 'mysql' - db-version: '5.7' + db-version: '8.4' tests-domain: 'example.org:8889' multisite: true memcached: false # Report test results to the Host Test Results. - os: ubuntu-latest db-type: 'mysql' - db-version: '8.0' + db-version: '8.4' tests-domain: 'example.org' multisite: false memcached: false report: true + + exclude: + # MySQL 9.0+ will not work on PHP 7.2 & 7.3 + - php: '7.2' + db-version: '9.0' + - php: '7.3' + db-version: '9.0' + with: os: ${{ matrix.os }} php: ${{ matrix.php }} @@ -123,15 +131,15 @@ jobs: memcached: [ false ] include: - # Include jobs for PHP 7.4 with memcached. + # Include jobs that test with memcached. - os: ubuntu-latest - php: '7.4' + php: '8.3' db-type: 'mariadb' db-version: '11.2' multisite: false memcached: true - os: ubuntu-latest - php: '7.4' + php: '8.3' db-type: 'mariadb' db-version: '11.2' multisite: true diff --git a/.github/workflows/pull-request-comments.yml b/.github/workflows/pull-request-comments.yml index 51d87691f769d..ab7eba9ceffaa 100644 --- a/.github/workflows/pull-request-comments.yml +++ b/.github/workflows/pull-request-comments.yml @@ -30,7 +30,7 @@ jobs: if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name == 'pull_request_target' }} steps: - name: Post a welcome comment - uses: wow-actions/welcome@72817eb31cda1de60f51893d80e2e82ce57f7e76 # v1.3.0 + uses: wow-actions/welcome@68019c2c271561f63162fea75bb7707ef8a02c85 # v1.3.1 with: FIRST_PR_REACTIONS: 'hooray' FIRST_PR_COMMENT: > @@ -123,6 +123,7 @@ jobs: - name: Leave a comment about testing with Playground uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 + if: ${{ github.actor != 'dependabot[bot]' }} with: script: | const fs = require( 'fs' ); @@ -171,7 +172,7 @@ jobs: permissions: issues: write pull-requests: write - if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name == 'pull_request_target' && ! github.event.pull_request.draft && github.event.pull_request.state == 'open' }} + if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name == 'pull_request_target' && ! github.event.pull_request.draft && github.event.pull_request.state == 'open' && github.actor != 'dependabot[bot]' }} steps: - name: Check for Trac ticket and manage comment uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 diff --git a/.github/workflows/reusable-coding-standards-javascript.yml b/.github/workflows/reusable-coding-standards-javascript.yml index 74207a8978bbd..156c201bc8f48 100644 --- a/.github/workflows/reusable-coding-standards-javascript.yml +++ b/.github/workflows/reusable-coding-standards-javascript.yml @@ -35,7 +35,7 @@ jobs: show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} - name: Set up Node.js - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4 + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: node-version-file: '.nvmrc' cache: npm diff --git a/.github/workflows/reusable-coding-standards-php.yml b/.github/workflows/reusable-coding-standards-php.yml index 40c4294b0ff51..b07203797eb3e 100644 --- a/.github/workflows/reusable-coding-standards-php.yml +++ b/.github/workflows/reusable-coding-standards-php.yml @@ -60,7 +60,7 @@ jobs: run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT - name: Cache PHPCS scan cache - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 with: path: | .cache/phpcs-src.json diff --git a/.github/workflows/reusable-end-to-end-tests.yml b/.github/workflows/reusable-end-to-end-tests.yml index 6a6cc5858e33c..1d2273bd588d7 100644 --- a/.github/workflows/reusable-end-to-end-tests.yml +++ b/.github/workflows/reusable-end-to-end-tests.yml @@ -72,7 +72,7 @@ jobs: show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} - name: Set up Node.js - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4 + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: node-version-file: '.nvmrc' cache: npm diff --git a/.github/workflows/reusable-javascript-tests.yml b/.github/workflows/reusable-javascript-tests.yml index 2760df118fe98..842bb034352ed 100644 --- a/.github/workflows/reusable-javascript-tests.yml +++ b/.github/workflows/reusable-javascript-tests.yml @@ -30,7 +30,7 @@ jobs: show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} - name: Set up Node.js - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4 + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: node-version-file: '.nvmrc' cache: npm diff --git a/.github/workflows/reusable-performance.yml b/.github/workflows/reusable-performance.yml index 814e7b95b8d10..68f4503d97259 100644 --- a/.github/workflows/reusable-performance.yml +++ b/.github/workflows/reusable-performance.yml @@ -122,7 +122,7 @@ jobs: run: echo "TARGET_SHA=$(git rev-parse HEAD^1)" >> $GITHUB_ENV - name: Set up Node.js - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4 + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: node-version-file: '.nvmrc' cache: npm diff --git a/.github/workflows/reusable-php-compatibility.yml b/.github/workflows/reusable-php-compatibility.yml index e22457d29e444..b68db051bf417 100644 --- a/.github/workflows/reusable-php-compatibility.yml +++ b/.github/workflows/reusable-php-compatibility.yml @@ -58,7 +58,7 @@ jobs: run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT - name: Cache PHP compatibility scan cache - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 with: path: .cache/phpcompat.json key: ${{ runner.os }}-date-${{ steps.get-date.outputs.date }}-php-${{ inputs.php-version }}-phpcompat-cache-${{ hashFiles('**/composer.json', 'phpcompat.xml.dist') }} diff --git a/.github/workflows/reusable-phpunit-tests-v1.yml b/.github/workflows/reusable-phpunit-tests-v1.yml index 3098c49066aa7..ad45726102dbe 100644 --- a/.github/workflows/reusable-phpunit-tests-v1.yml +++ b/.github/workflows/reusable-phpunit-tests-v1.yml @@ -95,7 +95,7 @@ jobs: show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} - name: Set up Node.js - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4 + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: node-version-file: '.nvmrc' cache: npm @@ -108,7 +108,7 @@ jobs: - name: Cache Composer dependencies if: ${{ env.COMPOSER_INSTALL == true }} - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 env: cache-name: cache-composer-dependencies with: diff --git a/.github/workflows/reusable-phpunit-tests-v2.yml b/.github/workflows/reusable-phpunit-tests-v2.yml index 6df304bcb9f29..d96928e3f1a07 100644 --- a/.github/workflows/reusable-phpunit-tests-v2.yml +++ b/.github/workflows/reusable-phpunit-tests-v2.yml @@ -98,7 +98,7 @@ jobs: show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} - name: Install Node.js - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4 + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: node-version-file: '.nvmrc' cache: npm @@ -111,7 +111,7 @@ jobs: run: echo "composer_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache Composer dependencies - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 env: cache-name: cache-composer-dependencies with: diff --git a/.github/workflows/reusable-phpunit-tests-v3.yml b/.github/workflows/reusable-phpunit-tests-v3.yml index 5acdbae89c338..fd21b3a9b48f5 100644 --- a/.github/workflows/reusable-phpunit-tests-v3.yml +++ b/.github/workflows/reusable-phpunit-tests-v3.yml @@ -52,6 +52,11 @@ on: required: false type: 'string' default: 'example.org' + coverage-report: + description: 'Whether to generate a code coverage report.' + required: false + type: boolean + default: false report: description: 'Whether to report results to WordPress.org Hosting Tests' required: false @@ -62,8 +67,14 @@ on: required: false type: boolean default: false + secrets: + CODECOV_TOKEN: + description: 'The Codecov token required for uploading reports.' + required: false env: LOCAL_PHP: ${{ inputs.php }}-fpm + LOCAL_PHP_XDEBUG: ${{ inputs.coverage-report || false }} + LOCAL_PHP_XDEBUG_MODE: ${{ inputs.coverage-report && 'coverage' || 'develop,debug' }} LOCAL_DB_TYPE: ${{ inputs.db-type }} LOCAL_DB_VERSION: ${{ inputs.db-version }} LOCAL_PHP_MEMCACHED: ${{ inputs.memcached }} @@ -88,13 +99,15 @@ jobs: # - Logs debug information about what's installed within the WordPress Docker containers. # - Install WordPress within the Docker container. # - Run the PHPUnit tests. + # - Upload the code coverage report to Codecov.io. + # - Upload the HTML code coverage report as an artifact. # - Ensures version-controlled files are not modified or deleted. # - Checks out the WordPress Test reporter repository. # - Submit the test results to the WordPress.org host test results. phpunit-tests: - name: PHP ${{ inputs.php }} / ${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ inputs.phpunit-test-groups && format( ' ({0})', inputs.phpunit-test-groups ) || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }} ${{ 'example.org' != inputs.tests-domain && inputs.tests-domain || '' }} + name: PHP ${{ inputs.php }} ${{ ! inputs.coverage-report && '/ ' || 'with ' }}${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ inputs.phpunit-test-groups && format( ' ({0})', inputs.phpunit-test-groups ) || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }} ${{ 'example.org' != inputs.tests-domain && inputs.tests-domain || '' }} runs-on: ${{ inputs.os }} - timeout-minutes: 20 + timeout-minutes: ${{ inputs.coverage-report && 120 || 20 }} steps: - name: Configure environment variables @@ -108,7 +121,7 @@ jobs: show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} - name: Set up Node.js - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4 + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: node-version-file: '.nvmrc' cache: npm @@ -158,7 +171,7 @@ jobs: - name: WordPress Docker container debug information run: | - docker compose run --rm mysql ${{ env.LOCAL_DB_TYPE }} --version + docker compose run --rm mysql ${{ env.LOCAL_DB_TYPE == 'mariadb' && contains( fromJSON('["5.5", "10.0", "10.1", "10.2", "10.3"]'), env.LOCAL_DB_VERSION ) && 'mysql' || env.LOCAL_DB_TYPE }} --version docker compose run --rm php php --version docker compose run --rm php php -m docker compose run --rm php php -i @@ -167,31 +180,48 @@ jobs: - name: Install WordPress run: npm run env:install - - name: Run PHPUnit tests${{ inputs.phpunit-test-groups && format( ' ({0} groups)', inputs.phpunit-test-groups ) || '' }} + - name: Run PHPUnit tests${{ inputs.phpunit-test-groups && format( ' ({0} groups)', inputs.phpunit-test-groups ) || '' }}${{ inputs.coverage-report && ' with coverage report' || '' }} continue-on-error: ${{ inputs.allow-errors }} - run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }}${{ inputs.phpunit-test-groups && format( ' --group {0}', inputs.phpunit-test-groups ) || '' }} + run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }}${{ inputs.phpunit-test-groups && format( ' --group {0}', inputs.phpunit-test-groups ) || '' }}${{ inputs.coverage-report && format( ' --coverage-clover wp-code-coverage-{0}-{1}.xml --coverage-html wp-code-coverage-{0}-{1}', ( inputs.multisite && 'multisite' || 'single' ), github.sha ) || '' }} - name: Run AJAX tests - if: ${{ ! inputs.phpunit-test-groups }} + if: ${{ ! inputs.phpunit-test-groups && ! inputs.coverage-report }} continue-on-error: ${{ inputs.allow-errors }} run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ajax - name: Run ms-files tests as a multisite install - if: ${{ inputs.multisite && ! inputs.phpunit-test-groups }} + if: ${{ inputs.multisite && ! inputs.phpunit-test-groups && ! inputs.coverage-report }} continue-on-error: ${{ inputs.allow-errors }} run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ms-files - name: Run external HTTP tests - if: ${{ ! inputs.multisite && ! inputs.phpunit-test-groups }} + if: ${{ ! inputs.multisite && ! inputs.phpunit-test-groups && ! inputs.coverage-report }} continue-on-error: ${{ inputs.allow-errors }} run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --group external-http # __fakegroup__ is excluded to force PHPUnit to ignore the settings in phpunit.xml.dist. - name: Run (Xdebug) tests - if: ${{ inputs.php != '8.4' && ! inputs.phpunit-test-groups }} + if: ${{ inputs.php != '8.4' && ! inputs.phpunit-test-groups && ! inputs.coverage-report }} continue-on-error: ${{ inputs.allow-errors }} run: LOCAL_PHP_XDEBUG=true node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit -v --group xdebug --exclude-group __fakegroup__ + - name: Upload test coverage report to Codecov + if: ${{ inputs.coverage-report }} + uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0 + with: + token: ${{ secrets.CODECOV_TOKEN }} + file: wp-code-coverage${{ inputs.multisite && '-multisite' || '-single' }}-${{ github.sha }}.xml + flags: ${{ inputs.multisite && 'multisite' || 'single' }},php + fail_ci_if_error: true + + - name: Upload HTML coverage report as artifact + if: ${{ inputs.coverage-report }} + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 + with: + name: wp-code-coverage${{ inputs.multisite && '-multisite' || '-single' }}-${{ github.sha }} + path: wp-code-coverage${{ inputs.multisite && '-multisite' || '-single' }}-${{ github.sha }} + overwrite: true + - name: Ensure version-controlled files are not modified or deleted run: git diff --exit-code diff --git a/.github/workflows/reusable-support-json-reader-v1.yml b/.github/workflows/reusable-support-json-reader-v1.yml new file mode 100644 index 0000000000000..ce574e4b2c3b7 --- /dev/null +++ b/.github/workflows/reusable-support-json-reader-v1.yml @@ -0,0 +1,127 @@ +## +# A reusable workflow that reads the .version-support-*.json files and returns values for use in a +# test matrix based on a given WordPress version. +## +name: Determine test matrix values + +on: + workflow_call: + inputs: + wp-version: + description: 'The WordPress version to test . Accepts major and minor versions, "latest", or "nightly". Major releases must not end with ".0".' + type: string + default: 'nightly' + repository: + description: 'The repository to read support JSON files from.' + type: string + default: 'WordPress/wordpress-develop' + outputs: + major-wp-version: + description: "The major WordPress version based on the version provided in wp-version" + value: ${{ jobs.major-wp-version.outputs.version }} + php-versions: + description: "The PHP versions to test for the given wp-version" + value: ${{ jobs.php-versions.outputs.versions }} + mysql-versions: + description: "The MySQL versions to test for the given wp-version" + value: ${{ jobs.mysql-versions.outputs.versions }} + +jobs: + # Determines the major version of WordPress being tested. + # + # The data in the JSON files are indexed by major version, so this is used to look up the appropriate support policy. + # + # Performs the following steps: + # - Checks out the repository + # - Returns the major WordPress version as an output based on the value passed to the wp-version input. + major-wp-version: + name: Determine major WordPress version + runs-on: ubuntu-latest + if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} + timeout-minutes: 5 + outputs: + version: ${{ steps.major-wp-version.outputs.version }} + + steps: + - name: Checkout repository + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + repository: ${{ inputs.repository }} + show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} + + - name: Determine the major WordPress version + id: major-wp-version + run: | + if [ "${{ inputs.wp-version }}" ] && [ "${{ inputs.wp-version }}" != "nightly" ] && [ "${{ inputs.wp-version }}" != "latest" ] && [ "${{ inputs.wp-version }}" != "trunk" ]; then + echo "version=$(echo "${{ inputs.wp-version }}" | tr '.' '-' | cut -d '-' -f1-2)" >> $GITHUB_OUTPUT + elif [ "${{ inputs.wp-version }}" ] && [ "${{ inputs.wp-version }}" != "trunk" ]; then + echo "version=$(echo "${{ inputs.wp-version }}")" >> $GITHUB_OUTPUT + else + echo "version=nightly" >> $GITHUB_OUTPUT + fi + + # Determines the versions of PHP supported for a version of WordPress. + # + # Performs the following steps: + # - Checks out the repository + # - Returns the versions of PHP supported for the major version of WordPress by parsing the + # .version-support-php.json file and returning the values in that version's index. + php-versions: + name: Determine PHP versions + runs-on: ubuntu-latest + if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} + needs: [ major-wp-version ] + timeout-minutes: 5 + outputs: + versions: ${{ steps.php-versions.outputs.versions }} + + steps: + - name: Checkout repository + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + repository: ${{ inputs.repository }} + show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} + + # Look up the major version's specific PHP support policy when a version is provided. + # Otherwise, use the current PHP support policy. + - name: Get supported PHP versions + id: php-versions + run: | + if [ "${{ needs.major-wp-version.outputs.version }}" != "latest" ] && [ "${{ needs.major-wp-version.outputs.version }}" != "nightly" ]; then + echo "versions=$(jq -r '.["${{ needs.major-wp-version.outputs.version }}"] | @json' .version-support-php.json)" >> $GITHUB_OUTPUT + else + echo "versions=$(jq -r '.[ (keys[-1]) ] | @json' .version-support-php.json)" >> $GITHUB_OUTPUT + fi + + # Determines the versions of MySQL supported for a version of WordPress. + # + # Performs the following steps: + # - Checks out the repository + # - Returns the versions of MySQL supported for the major version of WordPress by parsing the + # .version-support-mysql.json file and returning the values in that version's index. + mysql-versions: + name: Determine MySQL versions + runs-on: ubuntu-latest + if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} + needs: [ major-wp-version ] + timeout-minutes: 5 + outputs: + versions: ${{ steps.mysql-versions.outputs.versions }} + + steps: + - name: Checkout repository + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + repository: ${{ inputs.repository }} + show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} + + # Look up the major version's specific MySQL support policy when a version is provided. + # Otherwise, use the current MySQL support policy. + - name: Get supported MySQL versions + id: mysql-versions + run: | + if [ "${{ needs.major-wp-version.outputs.version }}" != "latest" ] && [ "${{ needs.major-wp-version.outputs.version }}" != "nightly" ]; then + echo "versions=$(jq -r '.["${{ needs.major-wp-version.outputs.version }}"] | @json' .version-support-mysql.json)" >> $GITHUB_OUTPUT + else + echo "versions=$(jq -r '.[ (keys[-1]) ] | @json' .version-support-mysql.json)" >> $GITHUB_OUTPUT + fi diff --git a/.github/workflows/reusable-test-core-build-process.yml b/.github/workflows/reusable-test-core-build-process.yml index 4a887f3b69233..e2683961471c1 100644 --- a/.github/workflows/reusable-test-core-build-process.yml +++ b/.github/workflows/reusable-test-core-build-process.yml @@ -63,7 +63,7 @@ jobs: show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} - name: Set up Node.js - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4 + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: node-version-file: '.nvmrc' cache: npm diff --git a/.github/workflows/reusable-test-gutenberg-build-process.yml b/.github/workflows/reusable-test-gutenberg-build-process.yml index 8e52b02236239..86756a5043b55 100644 --- a/.github/workflows/reusable-test-gutenberg-build-process.yml +++ b/.github/workflows/reusable-test-gutenberg-build-process.yml @@ -55,7 +55,7 @@ jobs: show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} - name: Set up Node.js - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4 + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: node-version-file: '.nvmrc' cache: npm diff --git a/.github/workflows/reusable-test-local-docker-environment-v1.yml b/.github/workflows/reusable-test-local-docker-environment-v1.yml new file mode 100644 index 0000000000000..4dccd7ef3dccd --- /dev/null +++ b/.github/workflows/reusable-test-local-docker-environment-v1.yml @@ -0,0 +1,160 @@ +## +# A reusable workflow that ensures the local Docker environment is working properly. +# +# This workflow is used by `trunk` and branches >= 6.8. +## +name: Test local Docker environment + +on: + workflow_call: + inputs: + os: + description: 'Operating system to test' + required: false + type: 'string' + default: 'ubuntu-latest' + php: + description: 'The version of PHP to use, in the format of X.Y' + required: false + type: 'string' + default: 'latest' + db-type: + description: 'Database type. Valid types are mysql and mariadb' + required: false + type: 'string' + default: 'mysql' + db-version: + description: 'Database version' + required: false + type: 'string' + default: '8.0' + memcached: + description: 'Whether to enable memcached' + required: false + type: 'boolean' + default: false + tests-domain: + description: 'The domain to use for the tests' + required: false + type: 'string' + default: 'example.org' + +env: + LOCAL_PHP: ${{ inputs.php == 'latest' && 'latest' || format( '{0}-fpm', inputs.php ) }} + LOCAL_DB_TYPE: ${{ inputs.db-type }} + LOCAL_DB_VERSION: ${{ inputs.db-version }} + LOCAL_PHP_MEMCACHED: ${{ inputs.memcached }} + LOCAL_WP_TESTS_DOMAIN: ${{ inputs.tests-domain }} + PUPPETEER_SKIP_DOWNLOAD: ${{ true }} + +jobs: + # Tests the local Docker environment. + # + # Performs the following steps: + # - Sets environment variables. + # - Checks out the repository. + # - Sets up Node.js. + # - Sets up PHP. + # - Installs Composer dependencies. + # - Installs npm dependencies + # - Logs general debug information about the runner. + # - Logs Docker debug information (about the Docker installation within the runner). + # - Starts the WordPress Docker container. + # - Logs the running Docker containers. + # - Logs debug information about what's installed within the WordPress Docker containers. + # - Install WordPress within the Docker container. + # - Restarts the Docker environment. + # - Runs a WP CLI command. + # - Tests the logs command. + # - Tests the reset command. + # - Ensures version-controlled files are not modified or deleted. + local-docker-environment-tests: + name: PHP ${{ inputs.php }} / ${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.memcached && ' with memcached' || '' }}${{ 'example.org' != inputs.tests-domain && format( ' {0}', inputs.tests-domain ) || '' }} + runs-on: ${{ inputs.os }} + timeout-minutes: 20 + + steps: + - name: Configure environment variables + run: | + echo "PHP_FPM_UID=$(id -u)" >> $GITHUB_ENV + echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV + + - name: Checkout repository + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} + + - name: Set up Node.js + uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 + with: + node-version-file: '.nvmrc' + cache: npm + + ## + # This allows Composer dependencies to be installed using a single step. + # + # Since tests are currently run within the Docker containers where the PHP version varies, + # the same PHP version needs to be configured for the action runner machine so that the correct + # dependency versions are installed and cached. + ## + - name: Set up PHP + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 + with: + php-version: '${{ inputs.php }}' + coverage: none + + # Since Composer dependencies are installed using `composer update` and no lock file is in version control, + # passing a custom cache suffix ensures that the cache is flushed at least once per week. + - name: Install Composer dependencies + uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a # v3.0.0 + with: + custom-cache-suffix: $(/bin/date -u --date='last Mon' "+%F") + + - name: Install npm dependencies + run: npm ci + + - name: General debug information + run: | + npm --version + node --version + curl --version + git --version + composer --version + locale -a + + - name: Docker debug information + run: | + docker -v + + - name: Start Docker environment + run: | + npm run env:start + + - name: Log running Docker containers + run: docker ps -a + + - name: WordPress Docker container debug information + run: | + docker compose run --rm mysql ${{ env.LOCAL_DB_TYPE }} --version + docker compose run --rm php php --version + docker compose run --rm php php -m + docker compose run --rm php php -i + docker compose run --rm php locale -a + + - name: Install WordPress + run: npm run env:install + + - name: Restart Docker environment + run: npm run env:restart + + - name: Test a CLI command + run: npm run env:cli wp option get siteurl + + - name: Test logs command + run: npm run env:logs + + - name: Reset the Docker environment + run: npm run env:reset + + - name: Ensure version-controlled files are not modified or deleted + run: git diff --exit-code diff --git a/.github/workflows/reusable-upgrade-testing.yml b/.github/workflows/reusable-upgrade-testing.yml index 6b285d190c6a3..1d4f26f91ad2c 100644 --- a/.github/workflows/reusable-upgrade-testing.yml +++ b/.github/workflows/reusable-upgrade-testing.yml @@ -42,7 +42,6 @@ jobs: # # Performs the following steps: # - Sets up PHP. - # - Starts the database server. # - Downloads the specified version of WordPress. # - Creates a `wp-config.php` file. # - Installs WordPress. @@ -58,7 +57,15 @@ jobs: image: ${{ inputs.db-type }}:${{ inputs.db-version }} ports: - 3306 - options: --health-cmd="mysqladmin ping" --health-interval=30s --health-timeout=10s --health-retries=5 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=test_db --entrypoint sh ${{ inputs.db-type }}:${{ inputs.db-version }} -c "exec docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password" + options: >- + --health-cmd="mysqladmin ping" + --health-interval="30s" + --health-timeout="10s" + --health-retries="5" + -e MYSQL_ROOT_PASSWORD="root" + -e MYSQL_DATABASE="test_db" + --entrypoint sh ${{ inputs.db-type }}:${{ inputs.db-version }} + -c "exec docker-entrypoint.sh mysqld${{ inputs.db-type == 'mysql' && contains( fromJSON('["7.2", "7.3"]'), inputs.php ) && ' --default-authentication-plugin=mysql_native_password' || '' }}" steps: - name: Set up PHP ${{ inputs.php }} @@ -68,10 +75,6 @@ jobs: coverage: none tools: wp-cli - - name: Start the database server - run: | - sudo systemctl start ${{ inputs.db-type }} - - name: Download WordPress ${{ inputs.wp }} run: wp core download --version=${{ inputs.wp }} diff --git a/.github/workflows/test-and-zip-default-themes.yml b/.github/workflows/test-and-zip-default-themes.yml index 96379495c7fe1..c7e7b3012f8f9 100644 --- a/.github/workflows/test-and-zip-default-themes.yml +++ b/.github/workflows/test-and-zip-default-themes.yml @@ -132,7 +132,7 @@ jobs: show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} - name: Set up Node.js - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4 + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: node-version-file: '.nvmrc' cache: npm diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml index f6c68ff0afead..3240671b8a29e 100644 --- a/.github/workflows/test-coverage.yml +++ b/.github/workflows/test-coverage.yml @@ -7,6 +7,7 @@ on: - trunk paths: - '.github/workflows/test-coverage.yml' + - '.github/workflows/reusable-phpunit-tests-v3.yml' - 'docker-compose.yml' - 'phpunit.xml.dist' - 'tests/phpunit/multisite.xml' @@ -15,6 +16,7 @@ on: - trunk paths: - '.github/workflows/test-coverage.yml' + - '.github/workflows/reusable-phpunit-tests-v3.yml' - 'docker-compose.yml' - 'phpunit.xml.dist' - 'tests/phpunit/multisite.xml' @@ -24,6 +26,13 @@ on: # Allow manually triggering the workflow. workflow_dispatch: +# Cancels all previous workflow runs for pull requests that have not completed. +concurrency: + # The concurrency group contains the workflow name and the branch name for pull requests + # or the commit hash for any other events. + group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }} + cancel-in-progress: true + # Disable permissions for all available scopes by default. # Any needed permissions should be configured at the job level. permissions: {} @@ -35,160 +44,26 @@ env: PUPPETEER_SKIP_DOWNLOAD: ${{ true }} jobs: - # Runs the PHPUnit tests for WordPress. # - # Performs the following steps: - # - Sets environment variables. - # - Checks out the repository. - # - Sets up Node.js. - # - Sets up PHP. - # - Installs Composer dependencies. - # - Installs npm dependencies - # - Logs general debug information about the runner. - # - Logs Docker debug information (about the Docker installation within the runner). - # - Starts the WordPress Docker container. - # - Logs the running Docker containers. - # - Logs debug information about what's installed within the WordPress Docker containers. - # - Install WordPress within the Docker container. - # - Run the PHPUnit tests as a single site. - # - Ensures version-controlled files are not modified or deleted. - # - Upload the single site code coverage report to Codecov.io. - # - Run the PHPUnit tests as a multisite installation. - # - Ensures version-controlled files are not modified or deleted. - # - Upload the multisite code coverage report to Codecov.io. + # Creates a PHPUnit test jobs for generating code coverage reports. + # test-coverage-report: - name: ${{ matrix.multisite && 'Multisite' || 'Single site' }} report (${{ matrix.format }}) - runs-on: ubuntu-latest + name: ${{ matrix.multisite && 'Multisite' || 'Single site' }} report + uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk permissions: contents: read - timeout-minutes: 120 if: ${{ github.repository == 'WordPress/wordpress-develop' }} strategy: fail-fast: false matrix: multisite: [ false, true ] - format: [ clover, html ] - - steps: - - name: Configure environment variables - run: | - echo "PHP_FPM_UID=$(id -u)" >> $GITHUB_ENV - echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV - - - name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} - - - name: Set up Node.js - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4 - with: - node-version-file: '.nvmrc' - cache: npm - - ## - # This allows Composer dependencies to be installed using a single step. - # - # Since the tests are currently run within the Docker containers where the PHP version varies, - # the same PHP version needs to be configured for the action runner machine so that the correct - # dependency versions are installed and cached. - ## - - name: Set up PHP - uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 - with: - php-version: '7.4' - coverage: none - - # Since Composer dependencies are installed using `composer update` and no lock file is in version control, - # passing a custom cache suffix ensures that the cache is flushed at least once per week. - - name: Install Composer dependencies - uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a # v3.0.0 - with: - custom-cache-suffix: $(/bin/date -u --date='last Mon' "+%F") - - - name: Install npm Dependencies - run: npm ci - - - name: Log debug information - run: | - echo "$GITHUB_REF" - echo "$GITHUB_EVENT_NAME" - npm --version - node --version - curl --version - git --version - composer --version - locale -a - - - name: Docker debug information - run: | - docker -v - - - name: Start Docker environment - run: | - npm run env:start - - - name: Log running Docker containers - run: docker ps -a - - - name: WordPress Docker container debug information - run: | - docker compose run --rm mysql mysql --version - docker compose run --rm php php --version - docker compose run --rm php php -m - docker compose run --rm php php -i - docker compose run --rm php locale -a - - - name: Install WordPress - run: npm run env:install - - - name: Run tests as a single site - if: ${{ ! matrix.multisite }} - run: npm run test:php -- --verbose -c phpunit.xml.dist --coverage-${{ 'html' == matrix.format && 'html' || 'clover' }} wp-code-coverage-single-${{ github.sha }}${{ 'clover' == matrix.format && '.xml' || '' }} - - - name: Ensure version-controlled files are not modified during the tests - run: git diff --exit-code - - - name: Upload single site report to Codecov - if: ${{ ! matrix.multisite && matrix.format == 'clover' && github.event_name != 'pull_request' }} - uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0 - with: - token: ${{ secrets.CODECOV_TOKEN }} - file: wp-code-coverage-single-${{ github.sha }}${{ 'clover' == matrix.format && '.xml' || '' }} - flags: single,php - fail_ci_if_error: true - - - name: Upload single site HTML report as artifact - if: ${{ ! matrix.multisite && matrix.format == 'html' }} - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 - with: - name: wp-code-coverage-single-${{ github.sha }} - path: wp-code-coverage-single-${{ github.sha }} - overwrite: true - - - name: Run tests as a multisite install - if: ${{ matrix.multisite }} - run: npm run test:php -- --verbose -c tests/phpunit/multisite.xml --coverage-${{ 'html' == matrix.format && 'html' || 'clover' }} wp-code-coverage-multisite-${{ github.sha }}${{ 'clover' == matrix.format && '.xml' || '' }} - - - name: Ensure version-controlled files are not modified during the tests - run: git diff --exit-code - - - name: Upload multisite report to Codecov - if: ${{ matrix.multisite && matrix.format == 'clover' && github.event_name != 'pull_request' }} - uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0 - with: - token: ${{ secrets.CODECOV_TOKEN }} - file: wp-code-coverage-multisite-${{ github.sha }}${{ 'clover' == matrix.format && '.xml' || '' }} - flags: multisite,php - fail_ci_if_error: true - - - name: Upload multisite HTML report as artifact - if: ${{ matrix.multisite && matrix.format == 'html' }} - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 - with: - name: wp-code-coverage-multisite-${{ github.sha }} - path: wp-code-coverage-multisite-${{ github.sha }} - overwrite: true + coverage-report: [ true ] + with: + php: '8.3' + multisite: ${{ matrix.multisite }} + coverage-report: ${{ matrix.coverage-report }} + secrets: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} slack-notifications: name: Slack Notifications diff --git a/.github/workflows/upgrade-testing.yml b/.github/workflows/upgrade-testing.yml index fbbf5e6c099a7..8ea2c16bfb36a 100644 --- a/.github/workflows/upgrade-testing.yml +++ b/.github/workflows/upgrade-testing.yml @@ -7,12 +7,12 @@ on: # Always test the workflow after it's updated. paths: - '.github/workflows/upgrade-testing.yml' - - '.github/workflows/upgrade-testing-run.yml' + - '.github/workflows/reusable-upgrade-testing.yml' pull_request: # Always test the workflow when changes are suggested. paths: - '.github/workflows/upgrade-testing.yml' - - '.github/workflows/upgrade-testing-run.yml' + - '.github/workflows/reusable-upgrade-testing.yml' workflow_dispatch: inputs: new-version: @@ -32,8 +32,8 @@ concurrency: permissions: {} jobs: - # Spawns upgrade testing from WordPress 6.x versions with MySQL. - upgrade-tests-wp-6x-mysql: + # Spawns upgrade testing from WordPress 6.x versions on PHP 8.x with MySQL. + upgrade-tests-wp-6x-php-8x-mysql: name: ${{ matrix.wp }} to ${{ inputs.new-version && inputs.new-version || 'latest' }} uses: WordPress/wordpress-develop/.github/workflows/reusable-upgrade-testing.yml@trunk if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} @@ -43,11 +43,43 @@ jobs: fail-fast: false matrix: os: [ 'ubuntu-latest' ] - php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] + php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ] + db-type: [ 'mysql' ] + db-version: [ '5.7', '8.0', '8.4' ] + wp: [ '6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6', '6.7' ] + multisite: [ false, true ] + + with: + os: ${{ matrix.os }} + php: ${{ matrix.php }} + db-type: ${{ matrix.db-type }} + db-version: ${{ matrix.db-version }} + wp: ${{ matrix.wp }} + new-version: ${{ inputs.new-version && inputs.new-version || 'latest' }} + multisite: ${{ matrix.multisite }} + + # Spawns upgrade testing from WordPress 6.x versions on PHP 7.x with MySQL. + upgrade-tests-wp-6x-php-7x-mysql: + name: ${{ matrix.wp }} to ${{ inputs.new-version && inputs.new-version || 'latest' }} + uses: WordPress/wordpress-develop/.github/workflows/reusable-upgrade-testing.yml@trunk + if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} + permissions: + contents: read + strategy: + fail-fast: false + matrix: + os: [ 'ubuntu-latest' ] + php: [ '7.2', '7.3', '7.4' ] db-type: [ 'mysql' ] - db-version: [ '5.7', '8.0' ] - wp: [ '6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6', '6.7-RC1' ] + db-version: [ '5.7', '8.0', '8.4' ] + wp: [ '6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6', '6.7' ] multisite: [ false, true ] + + exclude: + - php: '7.2' + db-version: '8.4' + - php: '7.3' + db-version: '8.4' with: os: ${{ matrix.os }} php: ${{ matrix.php }} @@ -68,9 +100,15 @@ jobs: os: [ 'ubuntu-latest' ] php: [ '7.2', '7.3', '7.4' ] db-type: [ 'mysql' ] - db-version: [ '5.7', '8.0' ] + db-version: [ '5.7', '8.0', '8.4' ] wp: [ '5.0', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.7', '5.8', '5.9' ] multisite: [ false, true ] + + exclude: + - php: '7.2' + db-version: '8.4' + - php: '7.3' + db-version: '8.4' with: os: ${{ matrix.os }} php: ${{ matrix.php }} @@ -95,7 +133,7 @@ jobs: os: [ 'ubuntu-latest' ] php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ] db-type: [ 'mysql' ] - db-version: [ '5.7', '8.0' ] + db-version: [ '5.7', '8.0', '8.4' ] wp: [ '5.3', '5.4', '5.5', '5.6', '5.7', '5.8', '5.9' ] multisite: [ false, true ] with: @@ -118,9 +156,15 @@ jobs: os: [ 'ubuntu-latest' ] php: [ '7.2', '7.3', '7.4' ] db-type: [ 'mysql' ] - db-version: [ '5.7', '8.0' ] + db-version: [ '5.7', '8.0', '8.4' ] wp: [ '4.1', '4.2', '4.3', '4.4', '4.5', '4.6', '4.7', '4.8', '4.9' ] multisite: [ false, true ] + + exclude: + - php: '7.2' + db-version: '8.4' + - php: '7.3' + db-version: '8.4' with: os: ${{ matrix.os }} php: ${{ matrix.php }} @@ -145,7 +189,7 @@ jobs: os: [ 'ubuntu-latest' ] php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ] db-type: [ 'mysql' ] - db-version: [ '5.7', '8.0' ] + db-version: [ '5.7', '8.0', '8.4' ] wp: [ '4.1', '4.2', '4.3', '4.4', '4.5' ] multisite: [ false, true ] with: @@ -163,7 +207,7 @@ jobs: permissions: actions: read contents: read - needs: [ upgrade-tests-wp-6x-mysql, upgrade-tests-wp-5x-php-7x-mysql, upgrade-tests-wp-5x-php-8x-mysql, upgrade-tests-wp-4x-php-7x-mysql, upgrade-tests-wp-4x-php-8x-mysql ] + needs: [ upgrade-tests-wp-6x-php-8x-mysql, upgrade-tests-wp-6x-php-7x-mysql, upgrade-tests-wp-5x-php-7x-mysql, upgrade-tests-wp-5x-php-8x-mysql, upgrade-tests-wp-4x-php-7x-mysql, upgrade-tests-wp-4x-php-8x-mysql ] if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }} with: calling_status: ${{ contains( needs.*.result, 'cancelled' ) && 'cancelled' || contains( needs.*.result, 'failure' ) && 'failure' || 'success' }} diff --git a/.gitignore b/.gitignore index 81f87c18056a3..229b3a269394b 100644 --- a/.gitignore +++ b/.gitignore @@ -42,6 +42,7 @@ wp-tests-config.php /packagehash.txt /artifacts /setup.log +/coverage # Files and folders that get created in wp-content /src/wp-content/blogs.dir diff --git a/.version-support-mysql.json b/.version-support-mysql.json index 8bc06ed611808..f6cffac449cae 100644 --- a/.version-support-mysql.json +++ b/.version-support-mysql.json @@ -1,17 +1,14 @@ { "6-8": [ - "8.3", - "8.2", - "8.1", + "9.0", + "8.4", "8.0", "5.7", "5.6", "5.5" ], "6-7": [ - "8.3", - "8.2", - "8.1", + "8.4", "8.0", "5.7", "5.6", diff --git a/Gruntfile.js b/Gruntfile.js index 70f826ac0e33c..4f8a3d6aa2e76 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1066,7 +1066,7 @@ module.exports = function(grunt) { files = spawn( 'gh', [ 'api', 'graphql', '-f', query] ); if ( 0 !== files.status ) { - grunt.fatal( 'Unable to fetch Twemoji file list' ); + grunt.fatal( files.stderr.toString() ); } try { diff --git a/README.md b/README.md index f1a12dda6952a..fc8c00f6821af 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,19 @@ npm run test:php -- --filter npm run test:php -- --group ``` +#### Generating a code coverage report +PHP code coverage reports are [generated daily](https://github.com/WordPress/wordpress-develop/actions/workflows/test-coverage.yml) and [submitted to Codecov.io](https://app.codecov.io/gh/WordPress/wordpress-develop). + +After the local Docker environment has [been installed and started](#to-start-the-development-environment-for-the-first-time), the following command can be used to generate a code coverage report. + +``` +npm run test:coverage +``` + +The command will generate three coverage reports in HTML, PHP, and text formats, saving them in the `coverage` folder. + +**Note:** xDebug is required to generate a code coverage report, which can slow down PHPUnit significantly. Passing selection-based options such as `--group` or `--filter` can decrease the overall time required but will result in an incomplete report. + #### To restart the development environment You may want to restart the environment if you've made changes to the configuration in the `docker-compose.yml` or `.env` files. Restart the environment with: @@ -126,11 +139,14 @@ The development environment can be reset. This will destroy the database and att npm run env:reset ``` -### Apple Silicone machines and old MySQL versions +### Apple Silicon machines and old MySQL/MariaDB versions + +Older MySQL and MariaDB Docker images do not support Apple Silicon processors (M1, M2, etc.). This is true for: -The MySQL Docker images do not support Apple Silicone processors (M1, M2, etc.) for MySQL versions 5.7 and earlier. +- MySQL versions 5.7 and earlier +- MariaDB 5.5 -When using MySQL <= 5.7 on an Apple Silicone machine, you must create a `docker-compose.override.yml` file with the following contents: +When using these versions on an Apple Silicon machine, you must create a `docker-compose.override.yml` file with the following contents: ``` services: diff --git a/docker-compose.yml b/docker-compose.yml index 6cd25afb638ea..ec462c8a24c5c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -79,10 +79,10 @@ services: - mysql:/var/lib/mysql # For compatibility with PHP versions that don't support the caching_sha2_password auth plugin used in MySQL 8.0. - command: --default-authentication-plugin=mysql_native_password + command: ${LOCAL_DB_AUTH_OPTION-} healthcheck: - test: [ "CMD-SHELL", "if [ \"$LOCAL_DB_TYPE\" = \"mariadb\" ]; then mariadb-admin ping -h localhost; else mysqladmin ping -h localhost; fi" ] + test: [ "CMD-SHELL", "if [ \"$LOCAL_DB_TYPE\" = \"mariadb\" ]; then case \"$LOCAL_DB_VERSION\" in 5.5|10.0|10.1|10.2|10.3) mysqladmin ping -h localhost || exit $$?;; *) mariadb-admin ping -h localhost || exit $$?;; esac; else mysqladmin ping -h localhost || exit $$?; fi" ] timeout: 5s interval: 5s retries: 10 diff --git a/package-lock.json b/package-lock.json index 79ccd533f5860..162040e719015 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,58 +14,58 @@ "@wordpress/api-fetch": "7.8.2", "@wordpress/autop": "4.8.1", "@wordpress/blob": "4.8.1", - "@wordpress/block-directory": "5.8.10", - "@wordpress/block-editor": "14.3.8", - "@wordpress/block-library": "9.8.9", + "@wordpress/block-directory": "5.8.18", + "@wordpress/block-editor": "14.3.15", + "@wordpress/block-library": "9.8.16", "@wordpress/block-serialization-default-parser": "5.8.1", "@wordpress/blocks": "13.8.5", - "@wordpress/commands": "1.8.7", - "@wordpress/components": "28.8.7", + "@wordpress/commands": "1.8.11", + "@wordpress/components": "28.8.11", "@wordpress/compose": "7.8.3", - "@wordpress/core-commands": "1.8.8", - "@wordpress/core-data": "7.8.8", - "@wordpress/customize-widgets": "5.8.9", + "@wordpress/core-commands": "1.8.15", + "@wordpress/core-data": "7.8.15", + "@wordpress/customize-widgets": "5.8.16", "@wordpress/data": "10.8.3", "@wordpress/data-controls": "4.8.3", - "@wordpress/dataviews": "4.4.7", + "@wordpress/dataviews": "4.4.11", "@wordpress/date": "5.8.2", "@wordpress/deprecated": "4.8.2", "@wordpress/dom": "4.8.2", "@wordpress/dom-ready": "4.8.1", - "@wordpress/edit-post": "8.8.10", - "@wordpress/edit-site": "6.8.10", - "@wordpress/edit-widgets": "6.8.9", - "@wordpress/editor": "14.8.10", + "@wordpress/edit-post": "8.8.18", + "@wordpress/edit-site": "6.8.18", + "@wordpress/edit-widgets": "6.8.16", + "@wordpress/editor": "14.8.18", "@wordpress/element": "6.8.1", "@wordpress/escape-html": "3.8.1", - "@wordpress/fields": "0.0.9", - "@wordpress/format-library": "5.8.8", + "@wordpress/fields": "0.0.16", + "@wordpress/format-library": "5.8.15", "@wordpress/hooks": "4.8.2", "@wordpress/html-entities": "4.8.1", "@wordpress/i18n": "5.8.2", "@wordpress/icons": "10.8.2", "@wordpress/interactivity": "6.8.5", "@wordpress/interactivity-router": "2.8.6", - "@wordpress/interface": "6.8.7", + "@wordpress/interface": "6.8.11", "@wordpress/is-shallow-equal": "5.8.1", "@wordpress/keyboard-shortcuts": "5.8.3", "@wordpress/keycodes": "4.8.2", - "@wordpress/list-reusable-blocks": "5.8.7", + "@wordpress/list-reusable-blocks": "5.8.11", "@wordpress/media-utils": "5.8.2", "@wordpress/notices": "5.8.3", - "@wordpress/nux": "9.8.7", - "@wordpress/patterns": "2.8.8", - "@wordpress/plugins": "7.8.7", - "@wordpress/preferences": "4.8.7", + "@wordpress/nux": "9.8.11", + "@wordpress/patterns": "2.8.15", + "@wordpress/plugins": "7.8.11", + "@wordpress/preferences": "4.8.11", "@wordpress/preferences-persistence": "2.8.2", "@wordpress/primitives": "4.8.1", "@wordpress/priority-queue": "3.8.1", "@wordpress/private-apis": "1.8.1", "@wordpress/redux-routine": "5.8.1", - "@wordpress/reusable-blocks": "5.8.8", + "@wordpress/reusable-blocks": "5.8.15", "@wordpress/rich-text": "7.8.3", "@wordpress/router": "1.8.1", - "@wordpress/server-side-render": "5.8.7", + "@wordpress/server-side-render": "5.8.11", "@wordpress/shortcode": "4.8.1", "@wordpress/style-engine": "2.8.1", "@wordpress/sync": "1.8.1", @@ -74,7 +74,7 @@ "@wordpress/url": "4.8.1", "@wordpress/viewport": "6.8.3", "@wordpress/warning": "3.8.1", - "@wordpress/widgets": "4.8.8", + "@wordpress/widgets": "4.8.15", "@wordpress/wordcount": "4.8.1", "backbone": "1.6.0", "clipboard": "2.0.11", @@ -6257,6 +6257,7 @@ "version": "4.8.2", "resolved": "https://registry.npmjs.org/@wordpress/a11y/-/a11y-4.8.2.tgz", "integrity": "sha512-eILr2ZYK5FYSlx18rnP06qKyPELxEyDcnosSOsjskPGw5gYT01sUf0fkAebliuG88VppT+bgI008TRo3dvtZzQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/dom-ready": "^4.8.1", @@ -6271,6 +6272,7 @@ "version": "3.8.3", "resolved": "https://registry.npmjs.org/@wordpress/annotations/-/annotations-3.8.3.tgz", "integrity": "sha512-ihDxDnDDX73j7VGZutx0XBGelMf9cZmfh3L6hNW5CFacMTaH9+FNAY4+2I55N+fWOE7h1ePlHeL5DXvz38xsug==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/data": "^10.8.3", @@ -6291,6 +6293,7 @@ "version": "7.8.2", "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-7.8.2.tgz", "integrity": "sha512-6jiodZD4+5lIelb/E6FHMa6xuldcoIkQ5vWtvHpoB30++7eOgYi0tl5b1NlzGqfReIcl9oO+Wwp5V9mRE+mJoA==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/i18n": "^5.8.2", @@ -6305,6 +6308,7 @@ "version": "4.8.1", "resolved": "https://registry.npmjs.org/@wordpress/autop/-/autop-4.8.1.tgz", "integrity": "sha512-/ah4oBIRGMZlxBBPiD6R5uamCPEXTzmsJ0iceDJxMHc5KvNcy59oHNCirD5yiRLORk8RrujUczIGfglpUjGh2Q==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -6318,6 +6322,7 @@ "resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-8.8.2.tgz", "integrity": "sha512-XhIpSw6d8GeaBe+gQ25nck01+Q3UiVQgih/yBCFWNtzB2qp/AB7195lHGxbuAYUO9RM1eXsf8kVJV2caAb4WnA==", "dev": true, + "license": "GPL-2.0-or-later", "dependencies": { "@babel/core": "^7.16.0", "@babel/plugin-transform-react-jsx": "^7.16.0", @@ -6351,6 +6356,7 @@ "version": "4.8.1", "resolved": "https://registry.npmjs.org/@wordpress/blob/-/blob-4.8.1.tgz", "integrity": "sha512-fMLWmum+B8aZi5w8Tie7mw+LEP/FF6RXVMG8AH4GwtXYYD2b3WgjbF7I4p6HYOaz3kAEnlJNo55qqLT2tFogww==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -6360,27 +6366,28 @@ } }, "node_modules/@wordpress/block-directory": { - "version": "5.8.10", - "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-5.8.10.tgz", - "integrity": "sha512-4qQZ/3cvYyDDHxeDEW2a9Se1aKfzUzO9DfOye9Y11TpCgbnR2JYtL8cTHdmyjM12YpJMfSzUJgf51Oh2APS+Zw==", + "version": "5.8.18", + "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-5.8.18.tgz", + "integrity": "sha512-lYZDKI/IFMymfi3MxFfvpBMx6nhqAOEX+IXZvpKPiHR62LL+MXBoeOdiSZYKysfztFyPH7Ism43c1TeY+fQnIg==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^4.8.2", "@wordpress/api-fetch": "^7.8.2", - "@wordpress/block-editor": "^14.3.8", + "@wordpress/block-editor": "^14.3.15", "@wordpress/blocks": "^13.8.5", - "@wordpress/components": "^28.8.7", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", - "@wordpress/core-data": "^7.8.8", + "@wordpress/core-data": "^7.8.15", "@wordpress/data": "^10.8.3", - "@wordpress/editor": "^14.8.10", + "@wordpress/editor": "^14.8.18", "@wordpress/element": "^6.8.1", "@wordpress/hooks": "^4.8.2", "@wordpress/html-entities": "^4.8.1", "@wordpress/i18n": "^5.8.2", "@wordpress/icons": "^10.8.2", "@wordpress/notices": "^5.8.3", - "@wordpress/plugins": "^7.8.7", + "@wordpress/plugins": "^7.8.11", "@wordpress/private-apis": "^1.8.1", "@wordpress/url": "^4.8.1", "change-case": "^4.1.2", @@ -6396,9 +6403,10 @@ } }, "node_modules/@wordpress/block-editor": { - "version": "14.3.8", - "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-14.3.8.tgz", - "integrity": "sha512-gMpG8+t/mco/+CdSbLO48L52WKP9cp5S1jMh6Q+HjEtzQU2vu6zFBHGqBYRg7YiXLtNAINiVZON39xMITdVNgA==", + "version": "14.3.15", + "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-14.3.15.tgz", + "integrity": "sha512-5cFdYZMXsOlzWzbzLSB34wT3aQfl2WEKw83NA9/A4IAvZ7rJXdVJx0H2ZP7itmU/Rcj2cxPC152rfit9y4/+ww==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@emotion/react": "^11.7.1", @@ -6409,8 +6417,8 @@ "@wordpress/blob": "^4.8.1", "@wordpress/block-serialization-default-parser": "^5.8.1", "@wordpress/blocks": "^13.8.5", - "@wordpress/commands": "^1.8.7", - "@wordpress/components": "^28.8.7", + "@wordpress/commands": "^1.8.11", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", "@wordpress/data": "^10.8.3", "@wordpress/date": "^5.8.2", @@ -6426,7 +6434,7 @@ "@wordpress/keyboard-shortcuts": "^5.8.3", "@wordpress/keycodes": "^4.8.2", "@wordpress/notices": "^5.8.3", - "@wordpress/preferences": "^4.8.7", + "@wordpress/preferences": "^4.8.11", "@wordpress/private-apis": "^1.8.1", "@wordpress/rich-text": "^7.8.3", "@wordpress/style-engine": "^2.8.1", @@ -6459,20 +6467,21 @@ } }, "node_modules/@wordpress/block-library": { - "version": "9.8.9", - "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-9.8.9.tgz", - "integrity": "sha512-TRX9odB29vWDAFG60WveYpnozpwotYZnv3hY1jKBxjiEi39m9MaeS6BMV/rDF8SBL2F9efCusx0CjAXq6uulTQ==", + "version": "9.8.16", + "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-9.8.16.tgz", + "integrity": "sha512-1Vo36U439E856KR22n71oHhXTJ7e7iRS/4HDWEem1NY1iSFiBK3RBoIDLv7emVExSXhdRill7RjPGmRMeiEvJg==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^4.8.2", "@wordpress/api-fetch": "^7.8.2", "@wordpress/autop": "^4.8.1", "@wordpress/blob": "^4.8.1", - "@wordpress/block-editor": "^14.3.8", + "@wordpress/block-editor": "^14.3.15", "@wordpress/blocks": "^13.8.5", - "@wordpress/components": "^28.8.7", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", - "@wordpress/core-data": "^7.8.8", + "@wordpress/core-data": "^7.8.15", "@wordpress/data": "^10.8.3", "@wordpress/date": "^5.8.2", "@wordpress/deprecated": "^4.8.2", @@ -6488,12 +6497,12 @@ "@wordpress/keyboard-shortcuts": "^5.8.3", "@wordpress/keycodes": "^4.8.2", "@wordpress/notices": "^5.8.3", - "@wordpress/patterns": "^2.8.8", + "@wordpress/patterns": "^2.8.15", "@wordpress/primitives": "^4.8.1", "@wordpress/private-apis": "^1.8.1", - "@wordpress/reusable-blocks": "^5.8.8", + "@wordpress/reusable-blocks": "^5.8.15", "@wordpress/rich-text": "^7.8.3", - "@wordpress/server-side-render": "^5.8.7", + "@wordpress/server-side-render": "^5.8.11", "@wordpress/url": "^4.8.1", "@wordpress/viewport": "^6.8.3", "@wordpress/wordcount": "^4.8.1", @@ -6520,6 +6529,7 @@ "version": "5.8.1", "resolved": "https://registry.npmjs.org/@wordpress/block-serialization-default-parser/-/block-serialization-default-parser-5.8.1.tgz", "integrity": "sha512-SmbMiM/KTh9veMcujL+t375yMR1JZlIzbVEIk6NdiGV+7pvtenUe4Av0tr+0QaINmgo3MJmc4Y3csZrKFlRr+w==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -6532,6 +6542,7 @@ "version": "13.8.5", "resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-13.8.5.tgz", "integrity": "sha512-KE0bbN370G3tA/7Oaugk0IRLaG3p06sEnfbbDvoRSyiPyxQsyYb53i921vuteHtzQ+3DEjtDzrku/bsKOn81Tg==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/autop": "^4.8.1", @@ -6580,12 +6591,13 @@ } }, "node_modules/@wordpress/commands": { - "version": "1.8.7", - "resolved": "https://registry.npmjs.org/@wordpress/commands/-/commands-1.8.7.tgz", - "integrity": "sha512-ma4pFOv1/esloo+IHKUuk6OZO6nwvDz9lGUpLIlpu6c5C2PIpD/EDDK1X4cifgzMFvxP9l1Sr3IcAQYDiUqXrw==", + "version": "1.8.11", + "resolved": "https://registry.npmjs.org/@wordpress/commands/-/commands-1.8.11.tgz", + "integrity": "sha512-CKnzWwSKO3kckqV58JXA0taU2JgIpEkVxX8xUOe3aI1isaOFjF+iwshuhNgWcs3sAiuUK0s4aQWi3ZqGhmirzA==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/components": "^28.8.7", + "@wordpress/components": "^28.8.11", "@wordpress/data": "^10.8.3", "@wordpress/element": "^6.8.1", "@wordpress/i18n": "^5.8.2", @@ -6605,9 +6617,10 @@ } }, "node_modules/@wordpress/components": { - "version": "28.8.7", - "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-28.8.7.tgz", - "integrity": "sha512-qsbAshh8FU9FYGsOi6ZGEE92lOCKda5EucEZp+kUi4jNyO9+T9+Hf7wXYWTIMdnfhrhVJJywJYIdcVbIXtJWcQ==", + "version": "28.8.11", + "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-28.8.11.tgz", + "integrity": "sha512-IfSSeFUcbBS1eS5fq1ShPIW2JEU9OJiKrkZ8Ae3FpqTfYbJppVP4+cpK+kvBWj5PLyg+EBHv4W5dx9tMUKsKRg==", + "license": "GPL-2.0-or-later", "dependencies": { "@ariakit/react": "^0.4.10", "@babel/runtime": "^7.16.0", @@ -6668,6 +6681,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-7.8.3.tgz", "integrity": "sha512-knHfFz1/rzFr69d2lDIFspXYTn56Fdd6+4Enc9QhHfkICpwi59jQCXqtNguCB2O8FdL2FNpK1YSgx1FrTo37dA==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@types/mousetrap": "^1.6.8", @@ -6692,15 +6706,16 @@ } }, "node_modules/@wordpress/core-commands": { - "version": "1.8.8", - "resolved": "https://registry.npmjs.org/@wordpress/core-commands/-/core-commands-1.8.8.tgz", - "integrity": "sha512-fnOlskd3LSnqhgowmjtrA/fRz0npPxWl+N6s+g5vBAjVQmPJeFU5zAYuTbRytOIrxo4nzUEv+QfCEDoqwB/D6Q==", + "version": "1.8.15", + "resolved": "https://registry.npmjs.org/@wordpress/core-commands/-/core-commands-1.8.15.tgz", + "integrity": "sha512-1+Pa1V6Tsc1bFFHzbAfaqSv+w58jKQ+3qqdlcmGWdkYJz8VLE6kaKG9IrgT+xm0ricGpQ6dy6T2h6BXRWT5LgQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/block-editor": "^14.3.8", - "@wordpress/commands": "^1.8.7", + "@wordpress/block-editor": "^14.3.15", + "@wordpress/commands": "^1.8.11", "@wordpress/compose": "^7.8.3", - "@wordpress/core-data": "^7.8.8", + "@wordpress/core-data": "^7.8.15", "@wordpress/data": "^10.8.3", "@wordpress/element": "^6.8.1", "@wordpress/html-entities": "^4.8.1", @@ -6721,13 +6736,14 @@ } }, "node_modules/@wordpress/core-data": { - "version": "7.8.8", - "resolved": "https://registry.npmjs.org/@wordpress/core-data/-/core-data-7.8.8.tgz", - "integrity": "sha512-tEwMp6wO2K6JfnZ19sXJTWvwbyCHYflPscqIF/JpoeK/4zbLfiFgev3qM2UN2TVdqFsFZAM3GKAhUaxdBEB0HQ==", + "version": "7.8.15", + "resolved": "https://registry.npmjs.org/@wordpress/core-data/-/core-data-7.8.15.tgz", + "integrity": "sha512-fh3/Q8UF2skuSAgERXDhQdc59yA+WxE1YweIFbW1Gh2V80T9XrkX7GHQBuAXcEScdcIsE64fZLYJkVhrrWl0jA==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/api-fetch": "^7.8.2", - "@wordpress/block-editor": "^14.3.8", + "@wordpress/block-editor": "^14.3.15", "@wordpress/blocks": "^13.8.5", "@wordpress/compose": "^7.8.3", "@wordpress/data": "^10.8.3", @@ -6758,31 +6774,32 @@ } }, "node_modules/@wordpress/customize-widgets": { - "version": "5.8.9", - "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-5.8.9.tgz", - "integrity": "sha512-XmeKxBii2DQtuTVvO7OhRFJb56Zrk/vQa/i/xyobXGr36OpSs3dehRR0odvmpBOYosBQ1Zu0xspewFml/AaZSw==", + "version": "5.8.16", + "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-5.8.16.tgz", + "integrity": "sha512-Rl3n+55RTwHfTb8MyjAJc7/y61w+rOXMubst+gpOa6Uw5EN/rq61evCopLD86tVHMesWflQvC7jDDr6MwTcmeA==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/block-editor": "^14.3.8", - "@wordpress/block-library": "^9.8.9", + "@wordpress/block-editor": "^14.3.15", + "@wordpress/block-library": "^9.8.16", "@wordpress/blocks": "^13.8.5", - "@wordpress/components": "^28.8.7", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", - "@wordpress/core-data": "^7.8.8", + "@wordpress/core-data": "^7.8.15", "@wordpress/data": "^10.8.3", "@wordpress/dom": "^4.8.2", "@wordpress/element": "^6.8.1", "@wordpress/hooks": "^4.8.2", "@wordpress/i18n": "^5.8.2", "@wordpress/icons": "^10.8.2", - "@wordpress/interface": "^6.8.7", + "@wordpress/interface": "^6.8.11", "@wordpress/is-shallow-equal": "^5.8.1", "@wordpress/keyboard-shortcuts": "^5.8.3", "@wordpress/keycodes": "^4.8.2", "@wordpress/media-utils": "^5.8.2", - "@wordpress/preferences": "^4.8.7", + "@wordpress/preferences": "^4.8.11", "@wordpress/private-apis": "^1.8.1", - "@wordpress/widgets": "^4.8.8", + "@wordpress/widgets": "^4.8.15", "clsx": "^2.1.1", "fast-deep-equal": "^3.1.3" }, @@ -6799,6 +6816,7 @@ "version": "10.8.3", "resolved": "https://registry.npmjs.org/@wordpress/data/-/data-10.8.3.tgz", "integrity": "sha512-JunqBEVVwJJz45N8JTZNh9WHFn857SUtbp7Efp55oesH/g3ejLMuNu6Ewf9/qEEGQut8VeVQ7yGhl+GQDu9u+w==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/compose": "^7.8.3", @@ -6828,6 +6846,7 @@ "version": "4.8.3", "resolved": "https://registry.npmjs.org/@wordpress/data-controls/-/data-controls-4.8.3.tgz", "integrity": "sha512-uh7ECbGDU3lFIUK+LiN0GHFRlWzgvsT+RXZeEDWE22gtbrksdGOQV8Ufz+/iSUnMaOA41r0Yz90lROfUL4mdFQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/api-fetch": "^7.8.2", @@ -6843,13 +6862,14 @@ } }, "node_modules/@wordpress/dataviews": { - "version": "4.4.7", - "resolved": "https://registry.npmjs.org/@wordpress/dataviews/-/dataviews-4.4.7.tgz", - "integrity": "sha512-qj2QPR78eGtV3Bz3aHPHmGiCAQRkXMstu+D8UTuXl0QR+qW87DSigZFZJ+w4ts1OZjoIbRohbgfLYSSsFXWLFg==", + "version": "4.4.11", + "resolved": "https://registry.npmjs.org/@wordpress/dataviews/-/dataviews-4.4.11.tgz", + "integrity": "sha512-P9E79dWb4y27eAo/H1M9lQ3l5tKi/SMm4hmoZsEBMd5Z8tYzGeFSOJlzzU6gJf0Ue1OIjg0/RO/f3mcZQe6k2A==", + "license": "GPL-2.0-or-later", "dependencies": { "@ariakit/react": "^0.4.10", "@babel/runtime": "^7.16.0", - "@wordpress/components": "^28.8.7", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", "@wordpress/data": "^10.8.3", "@wordpress/element": "^6.8.1", @@ -6873,6 +6893,7 @@ "version": "5.8.2", "resolved": "https://registry.npmjs.org/@wordpress/date/-/date-5.8.2.tgz", "integrity": "sha512-ECPE9JXQ0GN+A3ssP+bmEtt122JQnkuXzGOUXfED+kjdmFZ1MgPtyKfXBFDzyW6fPHAwzpSbyFSBXfwxevxWAQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/deprecated": "^4.8.2", @@ -6889,6 +6910,7 @@ "resolved": "https://registry.npmjs.org/@wordpress/dependency-extraction-webpack-plugin/-/dependency-extraction-webpack-plugin-6.8.3.tgz", "integrity": "sha512-2XtMyfX8wacCBK9S808o3NkDdo+qeJgtz6DQhi1nOK6XhIsw/IeSwbZgrTlIzhUk2mQ1N0Y+e3588/dxiS4kBQ==", "dev": true, + "license": "GPL-2.0-or-later", "dependencies": { "json2php": "^0.0.7" }, @@ -6911,6 +6933,7 @@ "version": "4.8.2", "resolved": "https://registry.npmjs.org/@wordpress/deprecated/-/deprecated-4.8.2.tgz", "integrity": "sha512-AMO0FeqYfIcQRNzAVYDYHZ6ISdfkPHm8Rt8HQOl0Bg7tWX3ocVYnMULUGg/VzgM8AJzAUrfBpwcXZBMF1g4Xpw==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/hooks": "^4.8.2" @@ -6924,6 +6947,7 @@ "version": "4.8.2", "resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-4.8.2.tgz", "integrity": "sha512-5VZooybouKVkQ6W2+ef7AnAYQG54lkUN8+Kzc7ly84+WL13RbrwfE4Bj9/RFE5Ew59XTfHME0+GzE3fpLNiTYA==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/deprecated": "^4.8.2" @@ -6937,6 +6961,7 @@ "version": "4.8.1", "resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-4.8.1.tgz", "integrity": "sha512-xVMNpOaLzpZS4HFH5yYE3ToOhpsDpV29PoeDzuki18XA+ZPg6SvQ/TmwggMasnI1PoyAcQWxugXMV+YUFGM8Mg==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -6950,6 +6975,7 @@ "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-11.8.2.tgz", "integrity": "sha512-ddpxERmKzUwBejem0tQweNUlyCXLab0qPwHs+bJwGDzrp75WHW29rb9pQvvem2uLvso7Sw0IfVZaO2+hVXPM+g==", "dev": true, + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/api-fetch": "^7.8.2", @@ -6973,6 +6999,7 @@ "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils-playwright/-/e2e-test-utils-playwright-1.8.1.tgz", "integrity": "sha512-BKp2EpC35/SWJg1h69Q0RP7hlcNoqyuq1UA5CJycph2yuzrfl8+tfKqkrdCYhyLU/MuW6GFh9d92vb2cTYnSOQ==", "dev": true, + "license": "GPL-2.0-or-later", "dependencies": { "change-case": "^4.1.2", "form-data": "^4.0.0", @@ -7032,25 +7059,26 @@ } }, "node_modules/@wordpress/edit-post": { - "version": "8.8.10", - "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-8.8.10.tgz", - "integrity": "sha512-tS9Jujr9OOmJ78gZFsLfpHcbzy0VyH244eGNDUTyTawpkG6WOjjbqjY7+I6b1+L26oQiK4a4SXtoWxaA8d/Vsg==", + "version": "8.8.18", + "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-8.8.18.tgz", + "integrity": "sha512-1woHpjt0RM4gKrpevaG1Zh6b2Al0biNrGFrIuAK2S71SasLrQuYzx9z3bAs5acCjXhV7VkLkLpK+ERm59256vQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^4.8.2", "@wordpress/api-fetch": "^7.8.2", - "@wordpress/block-editor": "^14.3.8", - "@wordpress/block-library": "^9.8.9", + "@wordpress/block-editor": "^14.3.15", + "@wordpress/block-library": "^9.8.16", "@wordpress/blocks": "^13.8.5", - "@wordpress/commands": "^1.8.7", - "@wordpress/components": "^28.8.7", + "@wordpress/commands": "^1.8.11", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", - "@wordpress/core-commands": "^1.8.8", - "@wordpress/core-data": "^7.8.8", + "@wordpress/core-commands": "^1.8.15", + "@wordpress/core-data": "^7.8.15", "@wordpress/data": "^10.8.3", "@wordpress/deprecated": "^4.8.2", "@wordpress/dom": "^4.8.2", - "@wordpress/editor": "^14.8.10", + "@wordpress/editor": "^14.8.18", "@wordpress/element": "^6.8.1", "@wordpress/hooks": "^4.8.2", "@wordpress/html-entities": "^4.8.1", @@ -7059,13 +7087,13 @@ "@wordpress/keyboard-shortcuts": "^5.8.3", "@wordpress/keycodes": "^4.8.2", "@wordpress/notices": "^5.8.3", - "@wordpress/plugins": "^7.8.7", - "@wordpress/preferences": "^4.8.7", + "@wordpress/plugins": "^7.8.11", + "@wordpress/preferences": "^4.8.11", "@wordpress/private-apis": "^1.8.1", "@wordpress/url": "^4.8.1", "@wordpress/viewport": "^6.8.3", "@wordpress/warning": "^3.8.1", - "@wordpress/widgets": "^4.8.8", + "@wordpress/widgets": "^4.8.15", "clsx": "^2.1.1", "memize": "^2.1.0" }, @@ -7079,29 +7107,30 @@ } }, "node_modules/@wordpress/edit-site": { - "version": "6.8.10", - "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-6.8.10.tgz", - "integrity": "sha512-7E+zISjpuo+bAzk/TwjYjRdL6IAGu2unk/+oMh16BbjRQ8By1IDnEKII3Z58O+316fcpcBIpG7i6Bi6+DXK80A==", + "version": "6.8.18", + "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-6.8.18.tgz", + "integrity": "sha512-sts/9mPt8u7MJw0+qjbWH1kh39GAT94goVw45FDMQtNB6uNe8HEDe2qoc/ObXATiRtmndEQnteNe+y1Tbbi8Dw==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@react-spring/web": "^9.4.5", "@wordpress/a11y": "^4.8.2", "@wordpress/api-fetch": "^7.8.2", "@wordpress/blob": "^4.8.1", - "@wordpress/block-editor": "^14.3.8", - "@wordpress/block-library": "^9.8.9", + "@wordpress/block-editor": "^14.3.15", + "@wordpress/block-library": "^9.8.16", "@wordpress/blocks": "^13.8.5", - "@wordpress/commands": "^1.8.7", - "@wordpress/components": "^28.8.7", + "@wordpress/commands": "^1.8.11", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", - "@wordpress/core-commands": "^1.8.8", - "@wordpress/core-data": "^7.8.8", + "@wordpress/core-commands": "^1.8.15", + "@wordpress/core-data": "^7.8.15", "@wordpress/data": "^10.8.3", - "@wordpress/dataviews": "^4.4.7", + "@wordpress/dataviews": "^4.4.11", "@wordpress/date": "^5.8.2", "@wordpress/deprecated": "^4.8.2", "@wordpress/dom": "^4.8.2", - "@wordpress/editor": "^14.8.10", + "@wordpress/editor": "^14.8.18", "@wordpress/element": "^6.8.1", "@wordpress/escape-html": "^3.8.1", "@wordpress/hooks": "^4.8.2", @@ -7111,18 +7140,18 @@ "@wordpress/keyboard-shortcuts": "^5.8.3", "@wordpress/keycodes": "^4.8.2", "@wordpress/notices": "^5.8.3", - "@wordpress/patterns": "^2.8.8", - "@wordpress/plugins": "^7.8.7", - "@wordpress/preferences": "^4.8.7", + "@wordpress/patterns": "^2.8.15", + "@wordpress/plugins": "^7.8.11", + "@wordpress/preferences": "^4.8.11", "@wordpress/primitives": "^4.8.1", "@wordpress/priority-queue": "^3.8.1", "@wordpress/private-apis": "^1.8.1", - "@wordpress/reusable-blocks": "^5.8.8", + "@wordpress/reusable-blocks": "^5.8.15", "@wordpress/router": "^1.8.1", "@wordpress/style-engine": "^2.8.1", "@wordpress/url": "^4.8.1", "@wordpress/viewport": "^6.8.3", - "@wordpress/widgets": "^4.8.8", + "@wordpress/widgets": "^4.8.15", "@wordpress/wordcount": "^4.8.1", "change-case": "^4.1.2", "clsx": "^2.1.1", @@ -7141,18 +7170,19 @@ } }, "node_modules/@wordpress/edit-widgets": { - "version": "6.8.9", - "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-6.8.9.tgz", - "integrity": "sha512-hg6P6AB1vII5kWNJZ/8XwCHDFrKbpK2Oi2iX+/FYQ8useJhi5rjCtcq6AhDlbdjm3PATcpajbMxBKpY77UzI1A==", + "version": "6.8.16", + "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-6.8.16.tgz", + "integrity": "sha512-uMLnmoi2anx3n/EKPHUKvuxYlOzhRIm3j2+BicI8nthR9cxAvXkmC9Z7QdaCgleGaxDQPD61Q0KsuFFHJtQWWQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/api-fetch": "^7.8.2", - "@wordpress/block-editor": "^14.3.8", - "@wordpress/block-library": "^9.8.9", + "@wordpress/block-editor": "^14.3.15", + "@wordpress/block-library": "^9.8.16", "@wordpress/blocks": "^13.8.5", - "@wordpress/components": "^28.8.7", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", - "@wordpress/core-data": "^7.8.8", + "@wordpress/core-data": "^7.8.15", "@wordpress/data": "^10.8.3", "@wordpress/deprecated": "^4.8.2", "@wordpress/dom": "^4.8.2", @@ -7160,18 +7190,18 @@ "@wordpress/hooks": "^4.8.2", "@wordpress/i18n": "^5.8.2", "@wordpress/icons": "^10.8.2", - "@wordpress/interface": "^6.8.7", + "@wordpress/interface": "^6.8.11", "@wordpress/keyboard-shortcuts": "^5.8.3", "@wordpress/keycodes": "^4.8.2", "@wordpress/media-utils": "^5.8.2", "@wordpress/notices": "^5.8.3", - "@wordpress/patterns": "^2.8.8", - "@wordpress/plugins": "^7.8.7", - "@wordpress/preferences": "^4.8.7", + "@wordpress/patterns": "^2.8.15", + "@wordpress/plugins": "^7.8.11", + "@wordpress/preferences": "^4.8.11", "@wordpress/private-apis": "^1.8.1", - "@wordpress/reusable-blocks": "^5.8.8", + "@wordpress/reusable-blocks": "^5.8.15", "@wordpress/url": "^4.8.1", - "@wordpress/widgets": "^4.8.8", + "@wordpress/widgets": "^4.8.15", "clsx": "^2.1.1" }, "engines": { @@ -7184,43 +7214,44 @@ } }, "node_modules/@wordpress/editor": { - "version": "14.8.10", - "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-14.8.10.tgz", - "integrity": "sha512-ZkA6SAzGUpyQLRBFT//UVhIYfL+V2zqYrzHodjmYsQIUmSfFlHnJmYKFIijbhcR67asUj5rwOV/2s5vHeoobQA==", + "version": "14.8.18", + "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-14.8.18.tgz", + "integrity": "sha512-haVx9RynZ+b4pvoVGkCoAJ1IT1drBVX/4cOZmlgRZyGLRi083HjricxKXsNlczTGbWHfXcUiJsTTZ1BMNUCWYg==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^4.8.2", "@wordpress/api-fetch": "^7.8.2", "@wordpress/blob": "^4.8.1", - "@wordpress/block-editor": "^14.3.8", + "@wordpress/block-editor": "^14.3.15", "@wordpress/blocks": "^13.8.5", - "@wordpress/commands": "^1.8.7", - "@wordpress/components": "^28.8.7", + "@wordpress/commands": "^1.8.11", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", - "@wordpress/core-data": "^7.8.8", + "@wordpress/core-data": "^7.8.15", "@wordpress/data": "^10.8.3", - "@wordpress/dataviews": "^4.4.7", + "@wordpress/dataviews": "^4.4.11", "@wordpress/date": "^5.8.2", "@wordpress/deprecated": "^4.8.2", "@wordpress/dom": "^4.8.2", "@wordpress/element": "^6.8.1", - "@wordpress/fields": "^0.0.9", + "@wordpress/fields": "^0.0.16", "@wordpress/hooks": "^4.8.2", "@wordpress/html-entities": "^4.8.1", "@wordpress/i18n": "^5.8.2", "@wordpress/icons": "^10.8.2", - "@wordpress/interface": "^6.8.7", + "@wordpress/interface": "^6.8.11", "@wordpress/keyboard-shortcuts": "^5.8.3", "@wordpress/keycodes": "^4.8.2", "@wordpress/media-utils": "^5.8.2", "@wordpress/notices": "^5.8.3", - "@wordpress/patterns": "^2.8.8", - "@wordpress/plugins": "^7.8.7", - "@wordpress/preferences": "^4.8.7", + "@wordpress/patterns": "^2.8.15", + "@wordpress/plugins": "^7.8.11", + "@wordpress/preferences": "^4.8.11", "@wordpress/private-apis": "^1.8.1", - "@wordpress/reusable-blocks": "^5.8.8", + "@wordpress/reusable-blocks": "^5.8.15", "@wordpress/rich-text": "^7.8.3", - "@wordpress/server-side-render": "^5.8.7", + "@wordpress/server-side-render": "^5.8.11", "@wordpress/url": "^4.8.1", "@wordpress/warning": "^3.8.1", "@wordpress/wordcount": "^4.8.1", @@ -7249,6 +7280,7 @@ "version": "6.8.1", "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-6.8.1.tgz", "integrity": "sha512-JUd0XUHjNtQexAUJq5TodweU9kooCdrh/3NlKj8jEMKgveDx+ipXN2zVsaJWzAcu50FBhegaL+hFH6XRtqEDdQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@types/react": "^18.2.79", @@ -7268,6 +7300,7 @@ "version": "3.8.1", "resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-3.8.1.tgz", "integrity": "sha512-JFOjsD6rSFVoFqK+f5YCeYmRycn7Hj29cX3+sBXL0p5Uox7SQLhY/rmATm6o/PiGCVtDeQlZ9I8dBeQSZBoXqQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -7335,25 +7368,26 @@ } }, "node_modules/@wordpress/fields": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/@wordpress/fields/-/fields-0.0.9.tgz", - "integrity": "sha512-gGPUAQNga64NnipzLAzZ4VnNw8esk2VvfejFSWgUZ/rCYQEed9SlQa3gajI88X2kppYkK+ydxOIE+dCh7NMM7g==", + "version": "0.0.16", + "resolved": "https://registry.npmjs.org/@wordpress/fields/-/fields-0.0.16.tgz", + "integrity": "sha512-FeziO0mS67FCiZ/uNGwRHSbcOSHVVtE7PbO6ZfKStO6APxJSisF+eubimj4l6O8wHgDmaevPPfFBzghn6m39Tw==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/blob": "^4.8.1", "@wordpress/blocks": "^13.8.5", - "@wordpress/components": "^28.8.7", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", - "@wordpress/core-data": "^7.8.8", + "@wordpress/core-data": "^7.8.15", "@wordpress/data": "^10.8.3", - "@wordpress/dataviews": "^4.4.7", + "@wordpress/dataviews": "^4.4.11", "@wordpress/element": "^6.8.1", "@wordpress/hooks": "^4.8.2", "@wordpress/html-entities": "^4.8.1", "@wordpress/i18n": "^5.8.2", "@wordpress/icons": "^10.8.2", "@wordpress/notices": "^5.8.3", - "@wordpress/patterns": "^2.8.8", + "@wordpress/patterns": "^2.8.15", "@wordpress/primitives": "^4.8.1", "@wordpress/private-apis": "^1.8.1", "@wordpress/url": "^4.8.1", @@ -7370,14 +7404,15 @@ } }, "node_modules/@wordpress/format-library": { - "version": "5.8.8", - "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-5.8.8.tgz", - "integrity": "sha512-G4s1YiFCM8aK7dr69QFqmt/4fyXIDfAoez9MtHqQ54jrp330eZ6CLXagQ4Jzc98wdLXSpSDLuOc2ltflU/vnCA==", + "version": "5.8.15", + "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-5.8.15.tgz", + "integrity": "sha512-Qp6OFwiHSb6qrluvFOaNlsoElUj1L6YMF6oAq/fBLq4UX2KANkV1UkTNN8Lo/iCe48Za+DxLle8nCa9Gt0XdDg==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^4.8.2", - "@wordpress/block-editor": "^14.3.8", - "@wordpress/components": "^28.8.7", + "@wordpress/block-editor": "^14.3.15", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", "@wordpress/data": "^10.8.3", "@wordpress/element": "^6.8.1", @@ -7401,6 +7436,7 @@ "version": "4.8.2", "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-4.8.2.tgz", "integrity": "sha512-BhhYJB/RFIng6Taydah6zCMd9iDYdSlISvByP9tBDsuHZL6iuVBmEGBXmm0Mt6ABCFHELuhFkxwdWPRjWTiqSw==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -7413,6 +7449,7 @@ "version": "4.8.1", "resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-4.8.1.tgz", "integrity": "sha512-JOiXUdts9PvanVj3cuPlzJop6UBMDApzLRWRLeZNjZPq0IsTGcI7zPhBVT++aW1C8zTzngzpdFfFaWle3p5w7Q==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -7425,6 +7462,7 @@ "version": "5.8.2", "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-5.8.2.tgz", "integrity": "sha512-evcwjw1cfGoyJoPMZlaYNwmYJAlIJh5pkgM1QWanpBPTMLsMOMcpZQGzOwvKf1uLozGOKkBAe106qQ7rgjZkoQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/hooks": "^4.8.2", @@ -7445,6 +7483,7 @@ "version": "10.8.2", "resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-10.8.2.tgz", "integrity": "sha512-ebJ3mRJo3bMgPm9vSTxc7I98HT30mgU59WGUAQyx31cElKbzMhd3jM7bD2JhYXZ1OPnJGY3W4lHovMFfU7wsOQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/element": "^6.8.1", @@ -7459,6 +7498,7 @@ "version": "6.8.5", "resolved": "https://registry.npmjs.org/@wordpress/interactivity/-/interactivity-6.8.5.tgz", "integrity": "sha512-uCLcjYyNzn0KndbGr4ZtOOhogKieTMeH29/j3zK5Bu3pxsS5IxL6Ankanh+u7qkhXTND0AkZJmES7G+Z5DOIzg==", + "license": "GPL-2.0-or-later", "dependencies": { "@preact/signals": "^1.2.2", "preact": "^10.19.3" @@ -7472,6 +7512,7 @@ "version": "2.8.6", "resolved": "https://registry.npmjs.org/@wordpress/interactivity-router/-/interactivity-router-2.8.6.tgz", "integrity": "sha512-3GO9v9im1K7PNjCvr/0dOl3IQZ3RpMxUb3Y41M348Su3R8uNawA85c+9ZdyxYUG91/0atHdehErFiVt45IToYA==", + "license": "GPL-2.0-or-later", "dependencies": { "@wordpress/a11y": "^4.8.2", "@wordpress/interactivity": "^6.8.5" @@ -7482,21 +7523,22 @@ } }, "node_modules/@wordpress/interface": { - "version": "6.8.7", - "resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-6.8.7.tgz", - "integrity": "sha512-YzeS/RFEEyAgz513Quv8zDSyFy7gOr7+Kvm6XVruuWHWyviPRdrHjObnM2rEfPO16AdnSagYj5URZzu/8sSgRw==", + "version": "6.8.11", + "resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-6.8.11.tgz", + "integrity": "sha512-h10OXs44nkAduPa1ZGOfcdg2JRaTE62d5JwNDYeNwyjFBqLmQknGsSeDS677M/DYvX/AMcseaEObRZv7U8zjQQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^4.8.2", - "@wordpress/components": "^28.8.7", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", "@wordpress/data": "^10.8.3", "@wordpress/deprecated": "^4.8.2", "@wordpress/element": "^6.8.1", "@wordpress/i18n": "^5.8.2", "@wordpress/icons": "^10.8.2", - "@wordpress/plugins": "^7.8.7", - "@wordpress/preferences": "^4.8.7", + "@wordpress/plugins": "^7.8.11", + "@wordpress/preferences": "^4.8.11", "@wordpress/private-apis": "^1.8.1", "@wordpress/viewport": "^6.8.3", "clsx": "^2.1.1" @@ -7514,6 +7556,7 @@ "version": "5.8.1", "resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-5.8.1.tgz", "integrity": "sha512-2UpGvp+y7pCxQQoNyb5PIYPptZZjfcR80evR/V/0Abyxde+N0dEJHroiOd+Nm1BJJijzhmMH1B7AlyGqnKaFXA==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -7561,6 +7604,7 @@ "version": "5.8.3", "resolved": "https://registry.npmjs.org/@wordpress/keyboard-shortcuts/-/keyboard-shortcuts-5.8.3.tgz", "integrity": "sha512-V8HUZ63/6hronEBO0dQmYxlk7aSM7+fawTDLrqHfMhqi75GWrwhztWSb2Xju0J7rOvSVO7Oc5gk+JX+ZvniWqA==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/data": "^10.8.3", @@ -7579,6 +7623,7 @@ "version": "4.8.2", "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-4.8.2.tgz", "integrity": "sha512-BxZD5tk4sDHywV7HOF/hSY924ToW7YJe6hDh4yv+7vo5LpiYQq+/uW21hyXrWEjGXZtdmT1tx69wR16BG35bYw==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/i18n": "^5.8.2" @@ -7589,14 +7634,15 @@ } }, "node_modules/@wordpress/list-reusable-blocks": { - "version": "5.8.7", - "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-5.8.7.tgz", - "integrity": "sha512-u6zI2Fopy2LsOSK0akAaYtw52+vT/2TnDkkmHavwtMxaFIFOhD1NAJIJ2K6XmBDkdSphyAdPbT3pN7FVEKwO1A==", + "version": "5.8.11", + "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-5.8.11.tgz", + "integrity": "sha512-VDWVVo2L+d0RP6kRz3qDNUHRWchQTPBfe9JXLlIfPfJYRfUyPKXc3wTOAGnfZD0qip8FzD/AIKsiLSht0NItfw==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/api-fetch": "^7.8.2", "@wordpress/blob": "^4.8.1", - "@wordpress/components": "^28.8.7", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", "@wordpress/element": "^6.8.1", "@wordpress/i18n": "^5.8.2", @@ -7615,6 +7661,7 @@ "version": "5.8.2", "resolved": "https://registry.npmjs.org/@wordpress/media-utils/-/media-utils-5.8.2.tgz", "integrity": "sha512-r8C9WapBHkoLPOU9so3Ocdo17xHwJ43EfXckc47c9Wvu9Gn3CulkZWSvnIMeQLcm1Ay/PBBRu2Vxim5PNCaTpg==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/api-fetch": "^7.8.2", @@ -7631,6 +7678,7 @@ "version": "5.8.3", "resolved": "https://registry.npmjs.org/@wordpress/notices/-/notices-5.8.3.tgz", "integrity": "sha512-k2I6vS4y3OvaDIGGO5B94up7uQqpO0Vtykz7rvez0+nXJazYylKNv88zsegyjf74bWhhJ3HpfiDl+JVehwHnxw==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^4.8.2", @@ -7658,12 +7706,13 @@ } }, "node_modules/@wordpress/nux": { - "version": "9.8.7", - "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-9.8.7.tgz", - "integrity": "sha512-8pSIyl6TLS6xOqbef22kGAJFyWnLa2AqR/oSPHusJs1cQzWqonZAOzUmZsmJpFJCINaVBYRnNi6er2WyR773hQ==", + "version": "9.8.11", + "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-9.8.11.tgz", + "integrity": "sha512-e2H4PU0tDha/Hm38cZi6nf3niaiV/yF0K20Qm5AA5wmLk3AtOd9lxxedsDPjwbAXMHWIUWvasG9Zwyn2mGCpdA==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/components": "^28.8.7", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", "@wordpress/data": "^10.8.3", "@wordpress/deprecated": "^4.8.2", @@ -7681,17 +7730,18 @@ } }, "node_modules/@wordpress/patterns": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/@wordpress/patterns/-/patterns-2.8.8.tgz", - "integrity": "sha512-xHWUzjtz2T6MZbaj8ofPNWPd2P9o9sWHucEOVL2+4oW8ZWVn2RdNT7yfv/vPfa2HqKBOZOuUXOAumxA9l2aq9g==", + "version": "2.8.15", + "resolved": "https://registry.npmjs.org/@wordpress/patterns/-/patterns-2.8.15.tgz", + "integrity": "sha512-BrZVtcbFYAVZKbRR3s55VwvOudwoTbjsQiex3JDkJSdb9fs6wP4OBQAxw+NHGEP+9Cvo65PqHWpCqWkFTl40/Q==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^4.8.2", - "@wordpress/block-editor": "^14.3.8", + "@wordpress/block-editor": "^14.3.15", "@wordpress/blocks": "^13.8.5", - "@wordpress/components": "^28.8.7", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", - "@wordpress/core-data": "^7.8.8", + "@wordpress/core-data": "^7.8.15", "@wordpress/data": "^10.8.3", "@wordpress/element": "^6.8.1", "@wordpress/html-entities": "^4.8.1", @@ -7711,12 +7761,13 @@ } }, "node_modules/@wordpress/plugins": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@wordpress/plugins/-/plugins-7.8.7.tgz", - "integrity": "sha512-27ONa5cJGvhutnSXJpy510OGkQBPEZ85FyQruR+vXmVY0ic9ro5Tn4xF+Ctr4Jzi24QTp+njCi97VLXWdeaLoQ==", + "version": "7.8.11", + "resolved": "https://registry.npmjs.org/@wordpress/plugins/-/plugins-7.8.11.tgz", + "integrity": "sha512-iNzNZh1eqCn3NpZZ7/Oo/vaazaXFOSvUGPaOecGvQcMBxh22phnVgq1ZdEAU6QG73bYZAn3kPu7sfOtrpDkLQQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/components": "^28.8.7", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", "@wordpress/element": "^6.8.1", "@wordpress/hooks": "^4.8.2", @@ -7752,13 +7803,14 @@ } }, "node_modules/@wordpress/preferences": { - "version": "4.8.7", - "resolved": "https://registry.npmjs.org/@wordpress/preferences/-/preferences-4.8.7.tgz", - "integrity": "sha512-LHLWNX8fvDowIMxDG8cr3mYXwYVB7SdUUl6yrjbp/sYW/kufHdSJCo3w3tZHqqn6/qDr71IqhaSKjrghMASCOw==", + "version": "4.8.11", + "resolved": "https://registry.npmjs.org/@wordpress/preferences/-/preferences-4.8.11.tgz", + "integrity": "sha512-5P84OWcfTmEHCE8ocHqmU7wj/F8osQmprP3gtLRYSmffw9hw7kWlSlG8Z3kErmS1jVQWfDZPRs2CoEIRNE93LA==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^4.8.2", - "@wordpress/components": "^28.8.7", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", "@wordpress/data": "^10.8.3", "@wordpress/deprecated": "^4.8.2", @@ -7781,6 +7833,7 @@ "version": "2.8.2", "resolved": "https://registry.npmjs.org/@wordpress/preferences-persistence/-/preferences-persistence-2.8.2.tgz", "integrity": "sha512-vFFSVXtV7Z5JKW0Vv0T1HjtuMb3ufUy8tsQcPWB924Js7T5tRGZt5Bidn6RflXTDYudrwGMlDwBrKIBWXY9F0g==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/api-fetch": "^7.8.2" @@ -7795,6 +7848,7 @@ "resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-4.8.1.tgz", "integrity": "sha512-JDiVChhgwv6ZGa4aVOXnDJnj/dUFkD/SSvRLFkLOdB+ZbWgddJQkVB3rpJOfREsPtEFWqgTxcJoZjnkqltNbww==", "dev": true, + "license": "GPL-2.0-or-later", "engines": { "node": ">=18.12.0", "npm": ">=8.19.2" @@ -7807,6 +7861,7 @@ "version": "4.8.1", "resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-4.8.1.tgz", "integrity": "sha512-enfNxpEWycMNnvF7lpP8QYGKotu6B0UfUVcA89oDkam4OhP8tkpP1OVZyPHPgseRWweS/hL6aW/4bvwNSklf+g==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/element": "^6.8.1", @@ -7824,6 +7879,7 @@ "version": "3.8.1", "resolved": "https://registry.npmjs.org/@wordpress/priority-queue/-/priority-queue-3.8.1.tgz", "integrity": "sha512-USgFi75o7GlWiPu1hSGSWFXcj5nOjTVjrj0jM6sV+vqa39oRXxE4zpxGkvV4EINn8OrqvHBs/17uygAFXqppZQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "requestidlecallback": "^0.3.0" @@ -7837,6 +7893,7 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/@wordpress/private-apis/-/private-apis-1.8.1.tgz", "integrity": "sha512-/5PV8+QfkaLJs9TsFTIVMc3Ns+KdysFzS5ZGSmRGgsjzzgqHZb670mxf/6YaFldNjELbg5QsvcHNm3mkfkYiQg==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -7849,6 +7906,7 @@ "version": "5.8.1", "resolved": "https://registry.npmjs.org/@wordpress/redux-routine/-/redux-routine-5.8.1.tgz", "integrity": "sha512-mScAi3R/o9dAeS5yQm7F/txNSHhXthYE/NbHtm808+iMgXvgTztAJSg4K29YpAhXgqPTFYMTX0cFiiQ1uNEGqw==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "is-plain-object": "^5.0.0", @@ -7864,15 +7922,16 @@ } }, "node_modules/@wordpress/reusable-blocks": { - "version": "5.8.8", - "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-5.8.8.tgz", - "integrity": "sha512-cPDKnhcTkTNZfj9MpEAKeIlmdGPHDnehM1l5BXPlSDMi4UPKJXRk66G0iGUKBPH3vqhNHdAH/N9mYjSOB+pFSA==", + "version": "5.8.15", + "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-5.8.15.tgz", + "integrity": "sha512-qgZlUf21UzaoF9x7WMZ7g3savI2PG6EugA0QnDWSI0bk19JnXoJ23DwkY4mm0WglTVOnsDq/HQjQWFvMNji6KA==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/block-editor": "^14.3.8", + "@wordpress/block-editor": "^14.3.15", "@wordpress/blocks": "^13.8.5", - "@wordpress/components": "^28.8.7", - "@wordpress/core-data": "^7.8.8", + "@wordpress/components": "^28.8.11", + "@wordpress/core-data": "^7.8.15", "@wordpress/data": "^10.8.3", "@wordpress/element": "^6.8.1", "@wordpress/i18n": "^5.8.2", @@ -7894,6 +7953,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@wordpress/rich-text/-/rich-text-7.8.3.tgz", "integrity": "sha512-rB2hebZbTAI5LdLLtatwijpRKzYO+UdQes1Bni2WBAd59KH0YIj4kkVnj39lYYrV3OS+CqSqH2W4UJB7HPNRWQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^4.8.2", @@ -7918,6 +7978,7 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/@wordpress/router/-/router-1.8.1.tgz", "integrity": "sha512-ASF2uFwCh4bt7HZ/OVFQs18sBoXnDvcGjg9voyCGirX6keH4jutGon3OTUorQVVLlirOrWDeeAciRJPT7TGYZA==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/element": "^6.8.1", @@ -7938,6 +7999,7 @@ "resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-30.0.6.tgz", "integrity": "sha512-vpl/qyGHEVUO3gxwQRDd5pfN3IEAGgKB6QWpyMKcaT8KTn1a6TpM8KP7w4oNkPLnUrMouqXFpLb4gUBD0BbHKQ==", "dev": true, + "license": "GPL-2.0-or-later", "dependencies": { "@babel/core": "^7.16.0", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11", @@ -9021,14 +9083,15 @@ } }, "node_modules/@wordpress/server-side-render": { - "version": "5.8.7", - "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-5.8.7.tgz", - "integrity": "sha512-wwNhR5usoP/GRp7CviRu0KYvmkTb1kLIkEIulMKc9/lrZyl2ibx14C9Ub12ytLyZLzQ7jSqfmImmlOxL2+VrcQ==", + "version": "5.8.11", + "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-5.8.11.tgz", + "integrity": "sha512-D7TM+Z6HETLVQ40qe/d7IgXQ+N8fwsuss5TtuaNgUyN0W1ZUFhk1ANd25Qmz7xGSWDMZOql75a08XCgi/7OgnQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/api-fetch": "^7.8.2", "@wordpress/blocks": "^13.8.5", - "@wordpress/components": "^28.8.7", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", "@wordpress/data": "^10.8.3", "@wordpress/deprecated": "^4.8.2", @@ -9050,6 +9113,7 @@ "version": "4.8.1", "resolved": "https://registry.npmjs.org/@wordpress/shortcode/-/shortcode-4.8.1.tgz", "integrity": "sha512-c8wYr2zmXOonAgABnFmuKRQ7wYyAIvshb3nCVrjFbpHnFmK+CHMg/y/KmcnfnPscdAO+uKDBKYNp0fnYfQBhiQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "memize": "^2.0.1" @@ -9063,6 +9127,7 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/@wordpress/style-engine/-/style-engine-2.8.1.tgz", "integrity": "sha512-wsYdvrc+CEqidp9TmpG+/9s6zm1GEUU2Qp5qIELcQWU6VNzuycc5nqzFnRiKv0Pz+6TRgksjLsb86IQrCcg2nA==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "change-case": "^4.1.2" @@ -9094,6 +9159,7 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/@wordpress/sync/-/sync-1.8.1.tgz", "integrity": "sha512-i2vYN15nh5Cf8EgryZIIKAvx0IZi34gBqXNwvSymhh1/eD4yzcFyaFfko7NS93fPeGuVy/Hxj+2M1CdZ7fd43w==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@types/simple-peer": "^9.11.5", @@ -9115,6 +9181,7 @@ "version": "3.8.1", "resolved": "https://registry.npmjs.org/@wordpress/token-list/-/token-list-3.8.1.tgz", "integrity": "sha512-uQEimvYlEsjQh5PHscYnctSnuK11ZOpUGLlYbJ10VtoisDJP2bqYwu36FBGrEuY5g0y6y/rP/Hw1BirZ+wrZyw==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -9127,6 +9194,7 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/@wordpress/undo-manager/-/undo-manager-1.8.1.tgz", "integrity": "sha512-l5U3NswNDWHVQ3sAsiCvI65JDrAFlBnAIsoKsc38zg2OkNO1m8IIf/K+D3YAqBBM+zDahSGbNaLCEftBbZVSUg==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/is-shallow-equal": "^5.8.1" @@ -9140,6 +9208,7 @@ "version": "4.8.1", "resolved": "https://registry.npmjs.org/@wordpress/url/-/url-4.8.1.tgz", "integrity": "sha512-YZcNOlJAUhkxMWlmkkc6mvSdXukkleq8j5Z8p8kBWQX9Wxng84ygyBSMiqFeFvAIs8nNDXBrqG9zGGRxMW6q/g==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "remove-accents": "^0.5.0" @@ -9153,6 +9222,7 @@ "version": "6.8.3", "resolved": "https://registry.npmjs.org/@wordpress/viewport/-/viewport-6.8.3.tgz", "integrity": "sha512-izS9YQmogTilQx0xrd9RspAeF/PT1V9N7S7QjNAH9UZ7E4k32m2Vg6ebcYQGShRgmjUReiunIDDr0VDSK5h3PQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/compose": "^7.8.3", @@ -9171,23 +9241,25 @@ "version": "3.8.1", "resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-3.8.1.tgz", "integrity": "sha512-xlo0Xw1jiyiE6nh43NAtQMAL05VDk837kY2xfjsus6wD597TeWFpj6gmcRMH25FZULTUHDB2EPfLviWXqOgUfg==", + "license": "GPL-2.0-or-later", "engines": { "node": ">=18.12.0", "npm": ">=8.19.2" } }, "node_modules/@wordpress/widgets": { - "version": "4.8.8", - "resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-4.8.8.tgz", - "integrity": "sha512-AR+1R2oq/AvI0i1kKBKSZXpqTSrc/DiCh+nMQznHN/PJXn8v0VHLJ8Kcj93X/2g/IdiZVQUsQSAZMR+xoCrg7w==", + "version": "4.8.15", + "resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-4.8.15.tgz", + "integrity": "sha512-nAlEzexJ4577KIetFUQhLFJeL4TnOhWV0MsH2Gq0bt6xaE2uCsao5mYwLm3efY64WqaOrKiLxrntHU3qvlOZCw==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", "@wordpress/api-fetch": "^7.8.2", - "@wordpress/block-editor": "^14.3.8", + "@wordpress/block-editor": "^14.3.15", "@wordpress/blocks": "^13.8.5", - "@wordpress/components": "^28.8.7", + "@wordpress/components": "^28.8.11", "@wordpress/compose": "^7.8.3", - "@wordpress/core-data": "^7.8.8", + "@wordpress/core-data": "^7.8.15", "@wordpress/data": "^10.8.3", "@wordpress/element": "^6.8.1", "@wordpress/i18n": "^5.8.2", @@ -9208,6 +9280,7 @@ "version": "4.8.1", "resolved": "https://registry.npmjs.org/@wordpress/wordcount/-/wordcount-4.8.1.tgz", "integrity": "sha512-72e8N6I6he5pA9KDwqrq3mRMb+9WtzqR67C0uBmrlQg4FT23XptG8fDVacD2Das2nWSAgaLR/4GhKv34pPj1vg==", + "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -11778,9 +11851,10 @@ "dev": true }, "node_modules/client-zip": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/client-zip/-/client-zip-2.4.5.tgz", - "integrity": "sha512-4y4d5ZeTH/szIAMQeC8ju67pxtvj+3u20wMGwOFrZk+pegy3aSEA2JkwgC8XVDTXP/Iqn1gyqNQXmkyBp4KLEQ==" + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/client-zip/-/client-zip-2.4.6.tgz", + "integrity": "sha512-e7t1u14h/yT0A12qBwFsaus8UZZ8+MCaNAEn/z53mrukLq/LFcKX7TkbntAppGu8he2p8pz9vc5NEGE/h4ohlw==", + "license": "MIT" }, "node_modules/clipboard": { "version": "2.0.11", diff --git a/package.json b/package.json index d21feccf0c40e..9720bc105bceb 100644 --- a/package.json +++ b/package.json @@ -83,58 +83,58 @@ "@wordpress/api-fetch": "7.8.2", "@wordpress/autop": "4.8.1", "@wordpress/blob": "4.8.1", - "@wordpress/block-directory": "5.8.10", - "@wordpress/block-editor": "14.3.8", - "@wordpress/block-library": "9.8.9", + "@wordpress/block-directory": "5.8.18", + "@wordpress/block-editor": "14.3.15", + "@wordpress/block-library": "9.8.16", "@wordpress/block-serialization-default-parser": "5.8.1", "@wordpress/blocks": "13.8.5", - "@wordpress/commands": "1.8.7", - "@wordpress/components": "28.8.7", + "@wordpress/commands": "1.8.11", + "@wordpress/components": "28.8.11", "@wordpress/compose": "7.8.3", - "@wordpress/core-commands": "1.8.8", - "@wordpress/core-data": "7.8.8", - "@wordpress/customize-widgets": "5.8.9", + "@wordpress/core-commands": "1.8.15", + "@wordpress/core-data": "7.8.15", + "@wordpress/customize-widgets": "5.8.16", "@wordpress/data": "10.8.3", "@wordpress/data-controls": "4.8.3", - "@wordpress/dataviews": "4.4.7", + "@wordpress/dataviews": "4.4.11", "@wordpress/date": "5.8.2", "@wordpress/deprecated": "4.8.2", "@wordpress/dom": "4.8.2", "@wordpress/dom-ready": "4.8.1", - "@wordpress/edit-post": "8.8.10", - "@wordpress/edit-site": "6.8.10", - "@wordpress/edit-widgets": "6.8.9", - "@wordpress/editor": "14.8.10", + "@wordpress/edit-post": "8.8.18", + "@wordpress/edit-site": "6.8.18", + "@wordpress/edit-widgets": "6.8.16", + "@wordpress/editor": "14.8.18", "@wordpress/element": "6.8.1", "@wordpress/escape-html": "3.8.1", - "@wordpress/fields": "0.0.9", - "@wordpress/format-library": "5.8.8", + "@wordpress/fields": "0.0.16", + "@wordpress/format-library": "5.8.15", "@wordpress/hooks": "4.8.2", "@wordpress/html-entities": "4.8.1", "@wordpress/i18n": "5.8.2", "@wordpress/icons": "10.8.2", "@wordpress/interactivity": "6.8.5", "@wordpress/interactivity-router": "2.8.6", - "@wordpress/interface": "6.8.7", + "@wordpress/interface": "6.8.11", "@wordpress/is-shallow-equal": "5.8.1", "@wordpress/keyboard-shortcuts": "5.8.3", "@wordpress/keycodes": "4.8.2", - "@wordpress/list-reusable-blocks": "5.8.7", + "@wordpress/list-reusable-blocks": "5.8.11", "@wordpress/media-utils": "5.8.2", "@wordpress/notices": "5.8.3", - "@wordpress/nux": "9.8.7", - "@wordpress/patterns": "2.8.8", - "@wordpress/plugins": "7.8.7", - "@wordpress/preferences": "4.8.7", + "@wordpress/nux": "9.8.11", + "@wordpress/patterns": "2.8.15", + "@wordpress/plugins": "7.8.11", + "@wordpress/preferences": "4.8.11", "@wordpress/preferences-persistence": "2.8.2", "@wordpress/primitives": "4.8.1", "@wordpress/priority-queue": "3.8.1", "@wordpress/private-apis": "1.8.1", "@wordpress/redux-routine": "5.8.1", - "@wordpress/reusable-blocks": "5.8.8", + "@wordpress/reusable-blocks": "5.8.15", "@wordpress/rich-text": "7.8.3", "@wordpress/router": "1.8.1", - "@wordpress/server-side-render": "5.8.7", + "@wordpress/server-side-render": "5.8.11", "@wordpress/shortcode": "4.8.1", "@wordpress/style-engine": "2.8.1", "@wordpress/sync": "1.8.1", @@ -143,7 +143,7 @@ "@wordpress/url": "4.8.1", "@wordpress/viewport": "6.8.3", "@wordpress/warning": "3.8.1", - "@wordpress/widgets": "4.8.8", + "@wordpress/widgets": "4.8.15", "@wordpress/wordcount": "4.8.1", "backbone": "1.6.0", "clipboard": "2.0.11", @@ -179,17 +179,18 @@ "grunt": "grunt", "lint:jsdoc": "wp-scripts lint-js", "lint:jsdoc:fix": "wp-scripts lint-js --fix", - "env:start": "node ./tools/local-env/scripts/start.js && node ./tools/local-env/scripts/docker.js run -T php composer update -W", + "env:start": "node ./tools/local-env/scripts/start.js && node ./tools/local-env/scripts/docker.js run -T --rm php composer update -W", "env:stop": "node ./tools/local-env/scripts/docker.js down", "env:restart": "npm run env:stop && npm run env:start", "env:clean": "node ./tools/local-env/scripts/docker.js down -v --remove-orphans", "env:reset": "node ./tools/local-env/scripts/docker.js down --rmi all -v --remove-orphans", "env:install": "node ./tools/local-env/scripts/install.js", - "env:cli": "node ./tools/local-env/scripts/docker.js run cli", + "env:cli": "node ./tools/local-env/scripts/docker.js run --rm cli", "env:logs": "node ./tools/local-env/scripts/docker.js logs", "env:pull": "node ./tools/local-env/scripts/docker.js pull", "test:performance": "wp-scripts test-playwright --config tests/performance/playwright.config.js", - "test:php": "node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit", + "test:php": "node ./tools/local-env/scripts/docker.js run --rm php ./vendor/bin/phpunit", + "test:coverage": "npm run test:php -- --coverage-html ./coverage/html/ --coverage-php ./coverage/php/report.php --coverage-text=./coverage/text/report.txt", "test:e2e": "wp-scripts test-playwright --config tests/e2e/playwright.config.js", "test:visual": "wp-scripts test-playwright --config tests/visual-regression/playwright.config.js", "sync-gutenberg-packages": "grunt sync-gutenberg-packages", diff --git a/src/js/_enqueues/admin/post.js b/src/js/_enqueues/admin/post.js index 5dd70b950fb72..3f8b42e261e8b 100644 --- a/src/js/_enqueues/admin/post.js +++ b/src/js/_enqueues/admin/post.js @@ -659,8 +659,10 @@ jQuery( function($) { 'li.popular-category > label input[type="checkbox"]', function() { var t = $(this), c = t.is(':checked'), id = t.val(); - if ( id && t.parents('#taxonomy-'+taxonomy).length ) - $('#in-' + taxonomy + '-' + id + ', #in-popular-' + taxonomy + '-' + id).prop( 'checked', c ); + if ( id && t.parents('#taxonomy-'+taxonomy).length ) { + $('input#in-' + taxonomy + '-' + id + ', input[id^="in-' + taxonomy + '-' + id + '-"]').prop('checked', c); + $('input#in-popular-' + taxonomy + '-' + id).prop('checked', c); + } } ); diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index be66268a5c087..398f54ecfddc6 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -319,7 +319,7 @@ $selected = 'selected'; } - $html += ''; + $html += ''; $.each( menuItems, function() { var menuItem = $(this), @@ -364,7 +364,13 @@ if ( i == itemPosition ) { $selected = 'selected'; } - $html += ''; + var itemString = wp.i18n.sprintf( + /* translators: 1: The current menu item number, 2: The total number of menu items. */ + wp.i18n._x( '%1$s of %2$s', 'part of a total number of menu items' ), + i, + totalMenuItems + ); + $html += ''; } } else { @@ -380,7 +386,13 @@ if ( i == itemPosition ) { $selected = 'selected'; } - $html += ''; + var submenuString = wp.i18n.sprintf( + /* translators: 1: The current submenu item number, 2: The total number of submenu items. */ + wp.i18n._x( '%1$s of %2$s', 'part of a total number of menu items' ), + i, + totalSubMenuItems + ); + $html += ''; } } diff --git a/src/js/media/controllers/library.js b/src/js/media/controllers/library.js index 91bdeea656f95..db77c8dae8241 100644 --- a/src/js/media/controllers/library.js +++ b/src/js/media/controllers/library.js @@ -196,7 +196,7 @@ Library = wp.media.controller.State.extend(/** @lends wp.media.controller.Librar isImageAttachment: function( attachment ) { // If uploading, we know the filename but not the mime type. if ( attachment.get('uploading') ) { - return /\.(jpe?g|png|gif|webp|avif|heic)$/i.test( attachment.get('filename') ); + return /\.(jpe?g|png|gif|webp|avif|heic|heif)$/i.test( attachment.get('filename') ); } return attachment.get('type') === 'image'; diff --git a/src/wp-admin/about.php b/src/wp-admin/about.php index d1e69b1b2277e..01398046f52f5 100644 --- a/src/wp-admin/about.php +++ b/src/wp-admin/about.php @@ -80,7 +80,7 @@
- +
@@ -88,7 +88,7 @@
- +
@@ -110,7 +110,7 @@
- +
@@ -118,7 +118,7 @@
- +
diff --git a/src/wp-admin/async-upload.php b/src/wp-admin/async-upload.php index 551f854b5ae15..a146f6a48a71b 100644 --- a/src/wp-admin/async-upload.php +++ b/src/wp-admin/async-upload.php @@ -74,7 +74,9 @@ } ?> - +
diff --git a/src/wp-admin/css/colors/modern/colors.scss b/src/wp-admin/css/colors/modern/colors.scss index 845d4f034dae8..a66855729fbd4 100644 --- a/src/wp-admin/css/colors/modern/colors.scss +++ b/src/wp-admin/css/colors/modern/colors.scss @@ -3,7 +3,7 @@ $scheme-name: "modern"; $base-color: #1e1e1e; $highlight-color: #3858e9; -$menu-submenu-focus-text: #33f078; +$menu-submenu-focus-text: #7b90ff; $notification-color: $highlight-color; $link: $highlight-color; diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css index c7082137d5537..6d24705d549b2 100644 --- a/src/wp-admin/css/common.css +++ b/src/wp-admin/css/common.css @@ -2462,7 +2462,7 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */ } .nav-menus-php .metabox-holder .accordion-section-title span.dashicons.dashicons-arrow-down::before { position: relative; - left: -1px + left: -1px; } .nav-menus-php .metabox-holder .accordion-section.open .accordion-section-title span.dashicons.dashicons-arrow-down { diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css index 59905ea902347..8149c28d138d6 100644 --- a/src/wp-admin/css/customize-controls.css +++ b/src/wp-admin/css/customize-controls.css @@ -553,7 +553,8 @@ body.trashing #publish-settings { .15s border-color ease-in-out; } -.accordion-section-title:has(button.accordion-trigger) { +.accordion-section-title:has(button.accordion-trigger), +#customize-controls .current-panel .control-section > h3.accordion-section-title:has(button.accordion-trigger) { padding: 0; } @@ -561,9 +562,10 @@ body.trashing #publish-settings { all: unset; width: 100%; height: 100%; - padding: 10px 10px 11px 14px; + padding: 10px 30px 11px 14px; display: flex; align-items: center; + box-sizing: border-box; } .accordion-section-title button.accordion-trigger:has(.menu-in-location) { @@ -587,6 +589,7 @@ body.trashing #publish-settings { #customize-outer-theme-controls .accordion-section-title:after { content: "\f345"; color: #a7aaad; + pointer-events: none; } #customize-theme-controls .accordion-section-content, diff --git a/src/wp-admin/css/login.css b/src/wp-admin/css/login.css index 57465ea586479..c2211d9da681e 100644 --- a/src/wp-admin/css/login.css +++ b/src/wp-admin/css/login.css @@ -269,11 +269,11 @@ p { vertical-align: baseline; } -.login .wp-login-logo { +.login h1 { text-align: center; } -.login .wp-login-logo a { +.login h1 a { background-image: url(../images/w-logo-blue.png?ver=20131202); background-image: none, url(../images/wordpress-logo.svg?ver=20131107); background-size: 84px; @@ -323,13 +323,13 @@ p { .login #nav a:hover, .login #backtoblog a:hover, -.login .wp-login-logo a:hover { +.login h1 a:hover { color: #135e96; } .login #nav a:focus, .login #backtoblog a:focus, -.login .wp-login-logo a:focus { +.login h1 a:focus { color: #043959; } @@ -390,7 +390,7 @@ body.interim-login { margin: 5px auto 20px; } -.interim-login.login .wp-login-logo a { +.interim-login.login h1 a { width: auto; } diff --git a/src/wp-admin/customize.php b/src/wp-admin/customize.php index 40857031a7ef8..b27292d9eb949 100644 --- a/src/wp-admin/customize.php +++ b/src/wp-admin/customize.php @@ -100,6 +100,12 @@ $wp_customize->set_autofocus( $autofocus ); } +// Let's roll. +header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) ); + +wp_user_settings(); +_wp_admin_html_begin(); + $registered = $wp_scripts->registered; $wp_scripts = new WP_Scripts(); $wp_scripts->registered = $registered; @@ -126,12 +132,6 @@ */ do_action( 'customize_controls_enqueue_scripts' ); -// Let's roll. -header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) ); - -wp_user_settings(); -_wp_admin_html_begin(); - $body_class = 'wp-core-ui wp-customizer js'; if ( wp_is_mobile() ) : diff --git a/src/wp-admin/edit-form-blocks.php b/src/wp-admin/edit-form-blocks.php index c4727ea3ba8a0..5dbb9f33e4970 100644 --- a/src/wp-admin/edit-form-blocks.php +++ b/src/wp-admin/edit-form-blocks.php @@ -51,6 +51,8 @@ static function ( $classes ) { $rest_path = rest_get_route_for_post( $post ); +$active_theme = get_stylesheet(); + // Preload common data. $preload_paths = array( '/wp/v2/types?context=view', @@ -65,8 +67,10 @@ static function ( $classes ) { sprintf( '%s/autosaves?context=edit', $rest_path ), '/wp/v2/settings', array( '/wp/v2/settings', 'OPTIONS' ), - '/wp/v2/global-styles/themes/' . get_stylesheet(), + '/wp/v2/global-styles/themes/' . $active_theme . '?context=view', + '/wp/v2/global-styles/themes/' . $active_theme . '/variations?context=view', '/wp/v2/themes?context=edit&status=active', + array( '/wp/v2/global-styles/' . WP_Theme_JSON_Resolver::get_user_global_styles_post_id(), 'OPTIONS' ), '/wp/v2/global-styles/' . WP_Theme_JSON_Resolver::get_user_global_styles_post_id() . '?context=edit', ); diff --git a/src/wp-admin/edit-form-comment.php b/src/wp-admin/edit-form-comment.php index 134c8bb05de07..47b44ee31dee9 100644 --- a/src/wp-admin/edit-form-comment.php +++ b/src/wp-admin/edit-form-comment.php @@ -68,7 +68,7 @@ - + diff --git a/src/wp-admin/edit-tag-form.php b/src/wp-admin/edit-tag-form.php index b6da6c6687bc8..ec40fcc52e61f 100644 --- a/src/wp-admin/edit-tag-form.php +++ b/src/wp-admin/edit-tag-form.php @@ -44,7 +44,7 @@ do_action_deprecated( 'edit_tag_form_pre', array( $tag ), '3.0.0', '{$taxonomy}_pre_edit_form' ); } -$wp_http_referer = ! empty( $_REQUEST['wp_http_referer'] ) ? sanitize_text_field( $_REQUEST['wp_http_referer'] ) : ''; +$wp_http_referer = ! empty( $_REQUEST['wp_http_referer'] ) ? sanitize_url( $_REQUEST['wp_http_referer'] ) : ''; $wp_http_referer = remove_query_arg( array( 'action', 'message', 'tag_ID' ), $wp_http_referer ); // Also used by Edit Tags. diff --git a/src/wp-admin/includes/ajax-actions.php b/src/wp-admin/includes/ajax-actions.php index 75d7a610006af..83b682634b075 100644 --- a/src/wp-admin/includes/ajax-actions.php +++ b/src/wp-admin/includes/ajax-actions.php @@ -3556,9 +3556,9 @@ function wp_ajax_get_revision_diffs() { $return = array(); - // Removes the script timeout limit by setting it to 0 allowing ample time for diff UI setup. + // Increase the script timeout limit to allow ample time for diff UI setup. if ( function_exists( 'set_time_limit' ) ) { - set_time_limit( 0 ); + set_time_limit( 5 * MINUTE_IN_SECONDS ); } foreach ( $_REQUEST['compare'] as $compare_key ) { diff --git a/src/wp-admin/includes/class-wp-automatic-updater.php b/src/wp-admin/includes/class-wp-automatic-updater.php index b497b8324d41b..4dccd94ccddbd 100644 --- a/src/wp-admin/includes/class-wp-automatic-updater.php +++ b/src/wp-admin/includes/class-wp-automatic-updater.php @@ -936,6 +936,14 @@ protected function send_email( $type, $core_update, $result = null ) { return; } + $admin_user = get_user_by( 'email', get_site_option( 'admin_email' ) ); + + if ( $admin_user ) { + $switched_locale = switch_to_user_locale( $admin_user->ID ); + } else { + $switched_locale = switch_to_locale( get_locale() ); + } + switch ( $type ) { case 'success': // We updated. /* translators: Site updated notification email subject. 1: Site title, 2: WordPress version. */ @@ -1139,8 +1147,11 @@ protected function send_email( $type, $core_update, $result = null ) { $email = apply_filters( 'auto_core_update_email', $email, $type, $core_update, $result ); wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] ); - } + if ( $switched_locale ) { + restore_previous_locale(); + } + } /** * Checks whether an email should be sent after attempting plugin or theme updates. @@ -1255,6 +1266,14 @@ protected function send_plugin_theme_email( $type, $successful_updates, $failed_ } } + $admin_user = get_user_by( 'email', get_site_option( 'admin_email' ) ); + + if ( $admin_user ) { + $switched_locale = switch_to_user_locale( $admin_user->ID ); + } else { + $switched_locale = switch_to_locale( get_locale() ); + } + $body = array(); $successful_plugins = ( ! empty( $successful_updates['plugin'] ) ); $successful_themes = ( ! empty( $successful_updates['theme'] ) ); @@ -1526,6 +1545,10 @@ protected function send_plugin_theme_email( $type, $successful_updates, $failed_ if ( $result ) { update_option( 'auto_plugin_theme_update_emails', $past_failure_emails ); } + + if ( $switched_locale ) { + restore_previous_locale(); + } } /** @@ -1534,9 +1557,12 @@ protected function send_plugin_theme_email( $type, $successful_updates, $failed_ * @since 3.7.0 */ protected function send_debug_email() { - $update_count = 0; - foreach ( $this->update_results as $type => $updates ) { - $update_count += count( $updates ); + $admin_user = get_user_by( 'email', get_site_option( 'admin_email' ) ); + + if ( $admin_user ) { + $switched_locale = switch_to_user_locale( $admin_user->ID ); + } else { + $switched_locale = switch_to_locale( get_locale() ); } $body = array(); @@ -1715,6 +1741,10 @@ protected function send_debug_email() { $email = apply_filters( 'automatic_updates_debug_email', $email, $failures, $this->update_results ); wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] ); + + if ( $switched_locale ) { + restore_previous_locale(); + } } /** diff --git a/src/wp-admin/includes/class-wp-debug-data.php b/src/wp-admin/includes/class-wp-debug-data.php index d5ff1cb7559de..f227c9fdd2f7e 100644 --- a/src/wp-admin/includes/class-wp-debug-data.php +++ b/src/wp-admin/includes/class-wp-debug-data.php @@ -30,7 +30,6 @@ public static function check_for_updates() { * @since 6.7.0 Modularized into separate theme-oriented methods. * * @throws ImagickException - * @global array $_wp_theme_features * * @return array The debug data for the site. */ @@ -39,14 +38,10 @@ public static function debug_data() { * Set up the array that holds all debug information. * * When iterating through the debug data, the ordering of the sections - * occurs in insertion-order of the assignments into this array. Setting - * up empty values here preserves that specific ordering, so it doesn't - * depend on when inside this method each section is otherwise assigned. - * - * When all sections have been modularized, this will be the final single - * assignment of the sections before filtering and none will be empty. + * occurs in insertion-order of the assignments into this array. * - * @ticket 61648 + * This is the single assignment of the sections before filtering. Null-entries will + * be automatically be removed. */ $info = array( 'wp-core' => self::get_wp_core(), @@ -726,7 +721,6 @@ private static function get_wp_media(): array { ); } - /** * Gets the WordPress MU plugins section of the debug data. * @@ -1014,6 +1008,8 @@ private static function get_wp_plugins_raw_data(): array { * * @since 6.7.0 * + * @global array $_wp_theme_features + * * @return array */ private static function get_wp_active_theme(): array { diff --git a/src/wp-admin/includes/class-wp-privacy-requests-table.php b/src/wp-admin/includes/class-wp-privacy-requests-table.php index 61a917c3f6579..1c84a21b1bae2 100644 --- a/src/wp-admin/includes/class-wp-privacy-requests-table.php +++ b/src/wp-admin/includes/class-wp-privacy-requests-table.php @@ -430,7 +430,8 @@ public function column_cb( $item ) { * @since 4.9.6 * * @param WP_User_Request $item Item being shown. - * @return string Status column markup. + * @return string|void Status column markup. Returns a string if no status is found, + * otherwise it displays the markup. */ public function column_status( $item ) { $status = get_post_status( $item->ID ); diff --git a/src/wp-admin/includes/class-wp-site-health-auto-updates.php b/src/wp-admin/includes/class-wp-site-health-auto-updates.php index 581fc44600c5f..1904acd4e08c5 100644 --- a/src/wp-admin/includes/class-wp-site-health-auto-updates.php +++ b/src/wp-admin/includes/class-wp-site-health-auto-updates.php @@ -66,7 +66,8 @@ static function ( $test ) { * @param string $constant The name of the constant to check. * @param bool|string|array $value The value that the constant should be, if set, * or an array of acceptable values. - * @return array The test results. + * @return array|null The test results if there are any constants set incorrectly, + * or null if the test passed. */ public function test_constants( $constant, $value ) { $acceptable_values = (array) $value; @@ -82,6 +83,8 @@ public function test_constants( $constant, $value ) { 'severity' => 'fail', ); } + + return null; } /** @@ -89,7 +92,8 @@ public function test_constants( $constant, $value ) { * * @since 5.2.0 * - * @return array The test results. + * @return array|null The test results if wp_version_check() is disabled, + * or null if the test passed. */ public function test_wp_version_check_attached() { if ( ( ! is_multisite() || is_main_site() && is_network_admin() ) @@ -104,6 +108,8 @@ public function test_wp_version_check_attached() { 'severity' => 'fail', ); } + + return null; } /** @@ -111,7 +117,8 @@ public function test_wp_version_check_attached() { * * @since 5.2.0 * - * @return array The test results. + * @return array|null The test results if the {@see 'automatic_updater_disabled'} filter is set, + * or null if the test passed. */ public function test_filters_automatic_updater_disabled() { /** This filter is documented in wp-admin/includes/class-wp-automatic-updater.php */ @@ -125,6 +132,8 @@ public function test_filters_automatic_updater_disabled() { 'severity' => 'fail', ); } + + return null; } /** @@ -132,7 +141,7 @@ public function test_filters_automatic_updater_disabled() { * * @since 5.3.0 * - * @return array|false The test results. False if auto-updates are enabled. + * @return array|false The test results if auto-updates are disabled, false otherwise. */ public function test_wp_automatic_updates_disabled() { if ( ! class_exists( 'WP_Automatic_Updater' ) ) { @@ -156,7 +165,7 @@ public function test_wp_automatic_updates_disabled() { * * @since 5.2.0 * - * @return array|false The test results. False if the auto-updates failed. + * @return array|false The test results if auto-updates previously failed, false otherwise. */ public function test_if_failed_update() { $failed = get_site_option( 'auto_core_update_failed' ); @@ -312,7 +321,9 @@ public function test_check_wp_filesystem_method() { * * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass. * - * @return array|false The test results. False if they're not writeable. + * @return array|false The test results if at least some of WordPress core files are writeable, + * or if a list of the checksums could not be retrieved from WordPress.org. + * False if the core files are not writeable. */ public function test_all_files_writable() { global $wp_filesystem; @@ -397,7 +408,8 @@ public function test_all_files_writable() { * * @since 5.2.0 * - * @return array|false The test results. False if it isn't a development version. + * @return array|false|null The test results if development updates are blocked. + * False if it isn't a development version. Null if the test passed. */ public function test_accepts_dev_updates() { require ABSPATH . WPINC . '/version.php'; // $wp_version; // x.y.z @@ -428,6 +440,8 @@ public function test_accepts_dev_updates() { 'severity' => 'fail', ); } + + return null; } /** @@ -435,7 +449,8 @@ public function test_accepts_dev_updates() { * * @since 5.2.0 * - * @return array The test results. + * @return array|null The test results if minor updates are blocked, + * or null if the test passed. */ public function test_accepts_minor_updates() { if ( defined( 'WP_AUTO_UPDATE_CORE' ) && false === WP_AUTO_UPDATE_CORE ) { @@ -460,5 +475,7 @@ public function test_accepts_minor_updates() { 'severity' => 'fail', ); } + + return null; } } diff --git a/src/wp-admin/includes/class-wp-upgrader.php b/src/wp-admin/includes/class-wp-upgrader.php index a9784682ebb0f..c47773569fc17 100644 --- a/src/wp-admin/includes/class-wp-upgrader.php +++ b/src/wp-admin/includes/class-wp-upgrader.php @@ -525,7 +525,11 @@ public function install_package( $args = array() ) { $destination = $args['destination']; $clear_destination = $args['clear_destination']; - // Give the upgrade an additional 300 seconds(5 minutes) to ensure the install doesn't prematurely timeout having used up the maximum script execution time upacking and downloading in WP_Upgrader->run. + /* + * Give the upgrade an additional 300 seconds (5 minutes) to ensure the install + * doesn't prematurely timeout having used up the maximum script execution time + * upacking and downloading in WP_Upgrader->run(). + */ if ( function_exists( 'set_time_limit' ) ) { set_time_limit( 300 ); } diff --git a/src/wp-admin/includes/image.php b/src/wp-admin/includes/image.php index 157169ce6ef18..8471c999c8ec5 100644 --- a/src/wp-admin/includes/image.php +++ b/src/wp-admin/includes/image.php @@ -291,7 +291,26 @@ function wp_create_image_subsizes( $file, $attachment_id ) { * If the original image's dimensions are over the threshold, * scale the image and use it as the "full" size. */ + $scale_down = false; + $convert = false; + if ( $threshold && ( $image_meta['width'] > $threshold || $image_meta['height'] > $threshold ) ) { + // The image will be converted if needed on saving. + $scale_down = true; + } else { + // The image may need to be converted regardless of its dimensions. + $output_format = wp_get_image_editor_output_format( $file, $imagesize['mime'] ); + + if ( + is_array( $output_format ) && + array_key_exists( $imagesize['mime'], $output_format ) && + $output_format[ $imagesize['mime'] ] !== $imagesize['mime'] + ) { + $convert = true; + } + } + + if ( $scale_down || $convert ) { $editor = wp_get_image_editor( $file ); if ( is_wp_error( $editor ) ) { @@ -299,14 +318,20 @@ function wp_create_image_subsizes( $file, $attachment_id ) { return $image_meta; } - // Resize the image. - $resized = $editor->resize( $threshold, $threshold ); + if ( $scale_down ) { + // Resize the image. This will also convet it if needed. + $resized = $editor->resize( $threshold, $threshold ); + } elseif ( $convert ) { + // The image will be converted (if possible) when saved. + $resized = true; + } + $rotated = null; // If there is EXIF data, rotate according to EXIF Orientation. if ( ! is_wp_error( $resized ) && is_array( $exif_meta ) ) { $resized = $editor->maybe_exif_rotate(); - $rotated = $resized; + $rotated = $resized; // bool true or WP_Error } if ( ! is_wp_error( $resized ) ) { @@ -314,7 +339,23 @@ function wp_create_image_subsizes( $file, $attachment_id ) { * Append "-scaled" to the image file name. It will look like "my_image-scaled.jpg". * This doesn't affect the sub-sizes names as they are generated from the original image (for best quality). */ - $saved = $editor->save( $editor->generate_filename( 'scaled' ) ); + if ( $scale_down ) { + $saved = $editor->save( $editor->generate_filename( 'scaled' ) ); + } elseif ( $convert ) { + /* + * Generate a new file name for the converted image. + * + * As the image file name will be unique due to the changed file extension, + * it does not need a suffix to be unique. However, the generate_filename method + * does not allow for an empty suffix, so the "-converted" suffix is required to + * be added and subsequently removed. + */ + $converted_file_name = $editor->generate_filename( 'converted' ); + $converted_file_name = preg_replace( '/(-converted\.)([a-z0-9]+)$/i', '.$2', $converted_file_name ); + $saved = $editor->save( $converted_file_name ); + } else { + $saved = $editor->save(); + } if ( ! is_wp_error( $saved ) ) { $image_meta = _wp_image_meta_replace_original( $saved, $file, $image_meta, $attachment_id ); diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php index df63128a16f4d..82187fd62e50d 100644 --- a/src/wp-admin/includes/media.php +++ b/src/wp-admin/includes/media.php @@ -773,7 +773,7 @@ function media_upload_form_handler() { $post['menu_order'] = $attachment['menu_order']; } - if ( isset( $send_id ) && $attachment_id == $send_id ) { + if ( isset( $send_id ) && $attachment_id === $send_id ) { if ( isset( $attachment['post_parent'] ) ) { $post['post_parent'] = $attachment['post_parent']; } diff --git a/src/wp-admin/includes/nav-menu.php b/src/wp-admin/includes/nav-menu.php index 5ba3276b3aea5..c3b1244f47fd9 100644 --- a/src/wp-admin/includes/nav-menu.php +++ b/src/wp-admin/includes/nav-menu.php @@ -875,7 +875,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $data_object, $box ) { } $num_pages = (int) ceil( - wp_count_terms( + (int) wp_count_terms( array_merge( $args, array( diff --git a/src/wp-admin/includes/revision.php b/src/wp-admin/includes/revision.php index b6b946fd0861a..ab3842fc552bc 100644 --- a/src/wp-admin/includes/revision.php +++ b/src/wp-admin/includes/revision.php @@ -380,7 +380,7 @@ function wp_print_revision_templates() {