diff --git a/.cache/.gitkeep b/.cache/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000..da9ab523a8 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,9 @@ +# Configure Dependabot scanning. +version: 2 + +updates: + # Check for updates to GitHub Actions. + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 41faf379ee..770e3512dd 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -5,7 +5,6 @@ on: # PHPCS checking was introduced in WordPress 5.1. push: branches: - - master - trunk - '3.[89]' - '[4-9].[0-9]' @@ -14,7 +13,6 @@ on: - '[4-9].[0-9]*' pull_request: branches: - - master - trunk - '3.[89]' - '[4-9].[0-9]' @@ -50,6 +48,7 @@ jobs: # - Checks out the repository. # - Sets up PHP. # - Logs debug information. + # - Configures caching for PHPCS scans. # - Installs Composer dependencies (use cache if possible). # - Make Composer packages available globally. # - Logs PHP_CodeSniffer debug information. @@ -59,14 +58,15 @@ jobs: phpcs: name: PHP coding standards runs-on: ubuntu-latest + timeout-minutes: 20 if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} steps: - name: Checkout repository - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 + uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0 - name: Set up PHP - uses: shivammathur/setup-php@afefcaf556d98dc7896cca380e181decb609ca44 # v2.10.0 + uses: shivammathur/setup-php@ac7d3d7f84d81a029c20ab72d60264bdb7535831 # v2.15.0 with: php-version: '7.4' coverage: none @@ -77,8 +77,20 @@ jobs: php --version composer --version + # This date is used to ensure that the PHPCS cache is cleared at least once every week. + # http://man7.org/linux/man-pages/man1/date.1.html + - name: "Get last Monday's date" + id: get-date + run: echo "::set-output name=date::$(/bin/date -u --date='last Mon' "+%F")" + + - name: Cache PHPCS scan cache + uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353 # v2.1.6 + with: + path: .cache/phpcs.json + key: ${{ runner.os }}-date-${{ steps.get-date.outputs.date }}-phpcs-cache-${{ hashFiles('**/composer.json', 'phpcs.xml.dist') }} + - name: Install Composer dependencies - uses: ramsey/composer-install@92a7904348d4ad30236f3611e33b7f0c6f9edd70 # v1.1.0 + uses: ramsey/composer-install@a7320a0581dcd0432930c48a0e7ced67e6ec17e8 # v1.3.0 with: composer-options: "--no-progress --no-ansi --no-interaction" @@ -112,13 +124,14 @@ jobs: jshint: name: JavaScript coding standards runs-on: ubuntu-latest + timeout-minutes: 20 if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} env: PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }} steps: - name: Checkout repository - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 + uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0 - name: Log debug information run: | @@ -128,7 +141,7 @@ jobs: svn --version - name: Install NodeJS - uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f # v2.2.2 + uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c # v2.4.1 with: node-version: 14 cache: npm @@ -149,7 +162,7 @@ jobs: slack-notifications: name: Slack Notifications - uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master + uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk needs: [ phpcs, jshint ] if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }} with: diff --git a/.github/workflows/end-to-end-tests.yml b/.github/workflows/end-to-end-tests.yml index 6bcaa9a3ff..075e94c34e 100644 --- a/.github/workflows/end-to-end-tests.yml +++ b/.github/workflows/end-to-end-tests.yml @@ -4,7 +4,6 @@ on: # The end to end test suite was introduced in WordPress 5.3. push: branches: - - master - trunk - '5.[3-9]' - '[6-9].[0-9]' @@ -13,7 +12,6 @@ on: - '[6-9].[0-9]*' pull_request: branches: - - master - trunk - '5.[3-9]' - '[6-9].[0-9]' @@ -49,6 +47,7 @@ jobs: e2e-tests: name: E2E Tests runs-on: ubuntu-latest + timeout-minutes: 20 if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} steps: @@ -58,7 +57,7 @@ jobs: echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV - name: Checkout repository - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 + uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0 - name: Log debug information run: | @@ -72,7 +71,7 @@ jobs: locale -a - name: Install NodeJS - uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f # v2.2.2 + uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c # v2.4.1 with: node-version: 14 cache: npm @@ -119,7 +118,7 @@ jobs: slack-notifications: name: Slack Notifications - uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master + uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk needs: [ e2e-tests ] if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }} with: diff --git a/.github/workflows/javascript-tests.yml b/.github/workflows/javascript-tests.yml index 4c0c6e17e1..df0e5724f8 100644 --- a/.github/workflows/javascript-tests.yml +++ b/.github/workflows/javascript-tests.yml @@ -4,7 +4,6 @@ on: # JavaScript testing was introduced in WordPress 3.8. push: branches: - - master - trunk - '3.[89]' - '[4-9].[0-9]' @@ -13,7 +12,6 @@ on: - '[4-9].[0-9]*' pull_request: branches: - - master - trunk - '3.[89]' - '[4-9].[0-9]' @@ -53,11 +51,12 @@ jobs: test-js: name: QUnit Tests runs-on: ubuntu-latest + timeout-minutes: 20 if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} steps: - name: Checkout repository - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 + uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0 - name: Log debug information run: | @@ -67,7 +66,7 @@ jobs: svn --version - name: Install NodeJS - uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f # v2.2.2 + uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c # v2.4.1 with: node-version: 14 cache: npm @@ -88,7 +87,7 @@ jobs: slack-notifications: name: Slack Notifications - uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master + uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk needs: [ test-js ] if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }} with: diff --git a/.github/workflows/php-compatibility.yml b/.github/workflows/php-compatibility.yml index de89b79a3d..daf58a458c 100644 --- a/.github/workflows/php-compatibility.yml +++ b/.github/workflows/php-compatibility.yml @@ -4,7 +4,6 @@ on: # PHP compatibility testing was introduced in WordPress 5.5. push: branches: - - master - trunk - '5.[5-9]' - '[6-9].[0-9]' @@ -13,7 +12,6 @@ on: - '[6-9].[0-9]*' pull_request: branches: - - master - trunk - '5.[5-9]' - '[6-9].[0-9]' @@ -22,7 +20,7 @@ on: - '**.php' # These files configure Composer. Changes could affect the outcome. - 'composer.*' - # This file configures PHP Compatibility scanning. Changes could affect the outcome. + # This file configures PHP compatibility scanning. Changes could affect the outcome. - 'phpcompat.xml.dist' # Changes to workflow files should always verify all workflows are successful. - '.github/workflows/*.yml' @@ -44,7 +42,8 @@ jobs: # Performs the following steps: # - Checks out the repository. # - Sets up PHP. - # - Logs debug information about the runner container. + # - Logs debug information. + # - Configures caching for PHP compatibility scans. # - Installs Composer dependencies (use cache if possible). # - Make Composer packages available globally. # - Logs PHP_CodeSniffer debug information. @@ -53,14 +52,15 @@ jobs: php-compatibility: name: Check PHP compatibility runs-on: ubuntu-latest + timeout-minutes: 20 if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} steps: - name: Checkout repository - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 + uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0 - name: Set up PHP - uses: shivammathur/setup-php@afefcaf556d98dc7896cca380e181decb609ca44 # v2.10.0 + uses: shivammathur/setup-php@ac7d3d7f84d81a029c20ab72d60264bdb7535831 # v2.15.0 with: php-version: '7.4' coverage: none @@ -71,8 +71,20 @@ jobs: php --version composer --version + # This date is used to ensure that the PHP compatibility cache is cleared at least once every week. + # http://man7.org/linux/man-pages/man1/date.1.html + - name: "Get last Monday's date" + id: get-date + run: echo "::set-output name=date::$(/bin/date -u --date='last Mon' "+%F")" + + - name: Cache PHP compatibility scan cache + uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353 # v2.1.6 + with: + path: .cache/phpcompat.json + key: ${{ runner.os }}-date-${{ steps.get-date.outputs.date }}-phpcompat-cache-${{ hashFiles('**/composer.json', 'phpcompat.xml.dist') }} + - name: Install Composer dependencies - uses: ramsey/composer-install@92a7904348d4ad30236f3611e33b7f0c6f9edd70 # v1.1.0 + uses: ramsey/composer-install@a7320a0581dcd0432930c48a0e7ced67e6ec17e8 # v1.3.0 with: composer-options: "--no-progress --no-ansi --no-interaction" @@ -90,7 +102,7 @@ jobs: slack-notifications: name: Slack Notifications - uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master + uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk needs: [ php-compatibility ] if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }} with: diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index b6ce31b99b..b5b414874a 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -3,7 +3,6 @@ name: PHPUnit Tests on: push: branches: - - master - trunk - '3.[7-9]' - '[4-9].[0-9]' @@ -12,7 +11,6 @@ on: - '[4-9].[0-9]*' pull_request: branches: - - master - trunk - '3.[7-9]' - '[4-9].[0-9]' @@ -62,6 +60,7 @@ jobs: test-php: name: ${{ matrix.php }}${{ matrix.multisite && ' multisite' || '' }}${{ matrix.split_slow && ' slow tests' || '' }}${{ matrix.memcached && ' with memcached' || '' }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} + timeout-minutes: 20 if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} strategy: fail-fast: false @@ -111,10 +110,10 @@ jobs: echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV - name: Checkout repository - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 + uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0 - name: Install NodeJS - uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f # v2.2.2 + uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c # v2.4.1 with: node-version: 14 cache: npm @@ -133,7 +132,7 @@ jobs: run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache Composer dependencies - uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4 + uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353 # v2.1.6 env: cache-name: cache-composer-dependencies with: @@ -231,21 +230,21 @@ jobs: run: git diff --exit-code - name: Checkout the WordPress Test Reporter - if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/master' && matrix.report }} - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 + if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && matrix.report }} + uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0 with: repository: 'WordPress/phpunit-test-runner' path: 'test-runner' - name: Submit test results to the WordPress.org host test results - if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/master' && matrix.report }} + if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && matrix.report }} env: WPT_REPORT_API_KEY: "${{ secrets.WPT_REPORT_API_KEY }}" run: docker-compose run --rm -e WPT_REPORT_API_KEY -e WPT_PREPARE_DIR=/var/www -e WPT_TEST_DIR=/var/www php php test-runner/report.php slack-notifications: name: Slack Notifications - uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master + uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk needs: [ test-php ] if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }} with: diff --git a/.github/workflows/slack-notifications.yml b/.github/workflows/slack-notifications.yml index ceb06c5fd4..7a58813648 100644 --- a/.github/workflows/slack-notifications.yml +++ b/.github/workflows/slack-notifications.yml @@ -61,6 +61,7 @@ jobs: prepare: name: Prepare notifications runs-on: ubuntu-latest + timeout-minutes: 5 if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event.workflow_run.event != 'pull_request' }} outputs: previous_conclusion: ${{ steps.previous-conclusion.outputs.previous_conclusion }} @@ -129,12 +130,13 @@ jobs: failure: name: Failure notifications runs-on: ubuntu-latest + timeout-minutes: 5 needs: [ prepare ] if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'failure' || inputs.calling_status == 'failure' || failure() }} steps: - name: Post failure notifications to Slack - uses: slackapi/slack-github-action@d5d276d7ae0f38f29322b80da9baf985cc80f8b1 # v1.15.0 + uses: slackapi/slack-github-action@410ae57cff5c6b682b106440be0e6c7eb8c98c9d # v1.16.0 with: payload: ${{ needs.prepare.outputs.payload }} env: @@ -144,12 +146,13 @@ jobs: fixed: name: Fixed notifications runs-on: ubuntu-latest + timeout-minutes: 5 needs: [ prepare ] if: ${{ needs.prepare.outputs.previous_conclusion == 'failure' && ( github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' || inputs.calling_status == 'success' ) && success() }} steps: - name: Post failure notifications to Slack - uses: slackapi/slack-github-action@d5d276d7ae0f38f29322b80da9baf985cc80f8b1 # v1.15.0 + uses: slackapi/slack-github-action@410ae57cff5c6b682b106440be0e6c7eb8c98c9d # v1.16.0 with: payload: ${{ needs.prepare.outputs.payload }} env: @@ -159,12 +162,13 @@ jobs: success: name: Success notifications runs-on: ubuntu-latest + timeout-minutes: 5 needs: [ prepare ] if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' || inputs.calling_status == 'success' && success() }} steps: - name: Post success notifications to Slack - uses: slackapi/slack-github-action@d5d276d7ae0f38f29322b80da9baf985cc80f8b1 # v1.15.0 + uses: slackapi/slack-github-action@410ae57cff5c6b682b106440be0e6c7eb8c98c9d # v1.16.0 with: payload: ${{ needs.prepare.outputs.payload }} env: @@ -174,12 +178,13 @@ jobs: cancelled: name: Cancelled notifications runs-on: ubuntu-latest + timeout-minutes: 5 needs: [ prepare ] if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'cancelled' || inputs.calling_status == 'cancelled' || cancelled() }} steps: - name: Post cancelled notifications to Slack - uses: slackapi/slack-github-action@d5d276d7ae0f38f29322b80da9baf985cc80f8b1 # v1.15.0 + uses: slackapi/slack-github-action@410ae57cff5c6b682b106440be0e6c7eb8c98c9d # v1.16.0 with: payload: ${{ needs.prepare.outputs.payload }} env: diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml index b11ae0348e..caece3306d 100644 --- a/.github/workflows/test-coverage.yml +++ b/.github/workflows/test-coverage.yml @@ -4,7 +4,6 @@ on: # Verify push: branches: - - master - trunk paths: - '.github/workflows/test-coverage.yml' @@ -48,6 +47,7 @@ jobs: test-coverage-report: name: ${{ matrix.multisite && 'Multisite' || 'Single site' }} report runs-on: ubuntu-latest + timeout-minutes: 120 if: ${{ github.repository == 'WordPress/wordpress-develop' }} strategy: fail-fast: false @@ -61,7 +61,7 @@ jobs: echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV - name: Checkout repository - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 + uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0 - name: Log debug information run: | @@ -77,7 +77,7 @@ jobs: locale -a - name: Install NodeJS - uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f # v2.2.2 + uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c # v2.4.1 with: node-version: 14 cache: npm @@ -96,7 +96,7 @@ jobs: run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache Composer dependencies - uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4 + uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353 # v2.1.6 env: cache-name: cache-composer-dependencies with: @@ -150,7 +150,7 @@ jobs: - name: Upload single site report to Codecov if: ${{ ! matrix.multisite }} - uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 # v1.2.1 + uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 with: file: wp-code-coverage-single-clover-${{ github.sha }}.xml flags: single,php @@ -164,14 +164,14 @@ jobs: - name: Upload multisite report to Codecov if: ${{ matrix.multisite }} - uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 # v1.2.1 + uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0 with: file: wp-code-coverage-multisite-clover-${{ github.sha }}.xml flags: multisite,php slack-notifications: name: Slack Notifications - uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master + uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk needs: [ test-coverage-report ] if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }} with: diff --git a/.github/workflows/test-npm.yml b/.github/workflows/test-npm.yml index 0b49e9ab7c..05239b4184 100644 --- a/.github/workflows/test-npm.yml +++ b/.github/workflows/test-npm.yml @@ -3,13 +3,11 @@ name: Test NPM on: push: branches: - - master - trunk - '3.[7-9]' - '[4-9].[0-9]' pull_request: branches: - - master - trunk - '3.[7-9]' - '[4-9].[0-9]' @@ -52,6 +50,7 @@ jobs: test-npm: name: Test NPM on ${{ matrix.os }} runs-on: ${{ matrix.os }} + timeout-minutes: 20 if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} strategy: fail-fast: false @@ -60,7 +59,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 + uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0 - name: Log debug information run: | @@ -71,7 +70,7 @@ jobs: svn --version - name: Install NodeJS - uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f # v2.2.2 + uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c # v2.4.1 with: node-version: 14 cache: npm @@ -115,10 +114,11 @@ jobs: test-npm-macos: name: Test NPM on MacOS runs-on: macos-latest + timeout-minutes: 20 if: ${{ github.repository == 'WordPress/wordpress-develop' }} steps: - name: Checkout repository - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 + uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0 - name: Log debug information run: | @@ -129,7 +129,7 @@ jobs: svn --version - name: Install NodeJS - uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f # v2.2.2 + uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c # v2.4.1 with: node-version: 14 cache: npm @@ -157,7 +157,7 @@ jobs: slack-notifications: name: Slack Notifications - uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master + uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk needs: [ test-npm, test-npm-macos ] if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }} with: diff --git a/.github/workflows/test-old-branches.yml b/.github/workflows/test-old-branches.yml index 1d0bc59a7e..147175197c 100644 --- a/.github/workflows/test-old-branches.yml +++ b/.github/workflows/test-old-branches.yml @@ -4,7 +4,6 @@ on: # Verify the workflow is successful when this file is updated. push: branches: - - master - trunk paths: - '.github/workflows/test-old-branches.yml' @@ -17,6 +16,7 @@ jobs: dispatch-workflows-for-old-branches: name: ${{ matrix.workflow }} for ${{ matrix.branch }} runs-on: ubuntu-latest + timeout-minutes: 20 if: ${{ github.repository == 'WordPress/wordpress-develop' }} strategy: fail-fast: false @@ -28,12 +28,14 @@ jobs: 'test-npm.yml' ] branch: [ - '5.8', '5.7', '5.6', '5.5', '5.4', '5.3', '5.2', '5.1', '5.0', + '5.9', '5.8', '5.7', '5.6', '5.5', '5.4', '5.3', '5.2', '5.1', '5.0', '4.9', '4.8', '4.7', '4.6', '4.5', '4.4', '4.3', '4.2', '4.1', '4.0', '3.9', '3.8', '3.7' ] include: # PHP Compatibility testing was introduced in 5.5. + - branch: '5.9' + workflow: 'php-compatibility.yml' - branch: '5.8' workflow: 'php-compatibility.yml' - branch: '5.7' @@ -43,9 +45,11 @@ jobs: - branch: '5.5' workflow: 'php-compatibility.yml' - # End to End testing was introduced in 5.3 but later removed as there were no meaningful assertions. - # Only the officially supported major branch runs E2E tests so that more assertions can be added, and the - # workflow does not continue to run needlessly on old branches. + # End-to-end testing was introduced in 5.3 but was later removed as there were no meaningful assertions. + # Starting in 5.8 with #52905, some additional tests with real assertions were introduced. + # Branches 5.8 and newer should be tested to confirm no regressions are introduced. + - branch: '5.9' + workflow: 'end-to-end-tests.yml' - branch: '5.8' workflow: 'end-to-end-tests.yml' exclude: @@ -58,12 +62,12 @@ jobs: # Run all branches monthly, but only the currently supported one twice per month. steps: - name: Dispatch workflow run - uses: actions/github-script@47f7cf65b5ced0830a325f705cad64f2f58dddf7 # v3.1.0 - if: ${{ github.event_name == 'push' || github.event.schedule == '0 0 15 * *' || matrix.branch == '5.7' }} + uses: actions/github-script@441359b1a30438de65712c2fbca0abe4816fa667 # v5.0.0 + if: ${{ github.event_name == 'push' || github.event.schedule == '0 0 15 * *' || matrix.branch == '5.9' }} with: github-token: ${{ secrets.GHA_OLD_BRANCH_DISPATCH }} script: | - github.actions.createWorkflowDispatch({ + github.rest.actions.createWorkflowDispatch({ owner: context.repo.owner, repo: context.repo.repo, workflow_id: '${{ matrix.workflow }}', @@ -72,7 +76,7 @@ jobs: slack-notifications: name: Slack Notifications - uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master + uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk needs: [ dispatch-workflows-for-old-branches ] if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }} with: diff --git a/.github/workflows/welcome-new-contributors.yml b/.github/workflows/welcome-new-contributors.yml index f475a432a0..44ddf0b02d 100644 --- a/.github/workflows/welcome-new-contributors.yml +++ b/.github/workflows/welcome-new-contributors.yml @@ -8,6 +8,7 @@ jobs: # Comments on a pull request when the author is a new contributor. post-welcome-message: runs-on: ubuntu-latest + timeout-minutes: 5 if: ${{ github.repository == 'WordPress/wordpress-develop' }} steps: diff --git a/.gitignore b/.gitignore index fbae7cad27..4fe178c594 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ wp-tests-config.php /phpunit.xml /.phpcs.xml /phpcs.xml +.cache/* /tests/phpunit/data/plugins/wordpress-importer /tests/phpunit/data/.trac-ticket-cache* /tests/qunit/compiled.html @@ -53,6 +54,7 @@ wp-tests-config.php !/src/wp-content/themes/twentynineteen !/src/wp-content/themes/twentytwenty !/src/wp-content/themes/twentytwentyone +!/src/wp-content/themes/twentytwentytwo /src/wp-content/upgrade /src/wp-content/uploads /src/wp-content/advanced-cache.php @@ -92,4 +94,4 @@ wp-tests-config.php /docker-compose.override.yml # Visual regression test diffs -tests/visual-regression/specs/__image_snapshots__ \ No newline at end of file +tests/visual-regression/specs/__image_snapshots__ diff --git a/.nvmrc b/.nvmrc index b009dfb9d9..8351c19397 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -lts/* +14 diff --git a/Gruntfile.js b/Gruntfile.js index 369079dc1d..f2b93adc4c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -192,6 +192,7 @@ module.exports = function(grunt) { [ WORKING_DIR + 'wp-includes/js/jquery/jquery.js' ]: [ './node_modules/jquery/dist/jquery.js' ], [ WORKING_DIR + 'wp-includes/js/jquery/jquery.min.js' ]: [ './node_modules/jquery/dist/jquery.min.js' ], [ WORKING_DIR + 'wp-includes/js/jquery/jquery.form.js' ]: [ './node_modules/jquery-form/src/jquery.form.js' ], + [ WORKING_DIR + 'wp-includes/js/jquery/jquery.color.min.js' ]: [ './node_modules/jquery-color/dist/jquery.color.min.js' ], [ WORKING_DIR + 'wp-includes/js/masonry.min.js' ]: [ './node_modules/masonry-layout/dist/masonry.pkgd.min.js' ], [ WORKING_DIR + 'wp-includes/js/twemoji.js' ]: [ './node_modules/twemoji/dist/twemoji.js' ], [ WORKING_DIR + 'wp-includes/js/underscore.js' ]: [ './node_modules/underscore/underscore.js' ], @@ -1020,16 +1021,6 @@ module.exports = function(grunt) { dest: SOURCE_DIR } }, - includes: { - emoji: { - src: BUILD_DIR + 'wp-includes/formatting.php', - dest: '.' - }, - embed: { - src: BUILD_DIR + 'wp-includes/embed.php', - dest: '.' - } - }, replace: { 'emoji-regex': { options: { @@ -1103,26 +1094,6 @@ module.exports = function(grunt) { } ] }, - 'emoji-banner-text': { - options: { - patterns: [ - { - match: new RegExp( '\\s*' + BANNER_TEXT.replace( /[\/\*\!]/g, '\\$&' ) ), - replacement: '' - } - ] - }, - files: [ - { - expand: true, - flatten: true, - src: [ - BUILD_DIR + 'wp-includes/formatting.php' - ], - dest: BUILD_DIR + 'wp-includes/' - } - ] - }, 'source-maps': { options: { patterns: [ @@ -1549,6 +1520,9 @@ module.exports = function(grunt) { * @ticket 46218 */ grunt.registerTask( 'verify:source-maps', function() { + const ignoredFiles = [ + 'build/wp-includes/js/dist/components.js' + ]; const files = buildFiles.reduce( ( acc, path ) => { // Skip excluded paths and any path that isn't a file. if ( '!' === path[0] || '**' !== path.substr( -2 ) ) { @@ -1563,18 +1537,20 @@ module.exports = function(grunt) { 'No JavaScript files found in the build directory.' ); - files.forEach( function( file ) { - const contents = fs.readFileSync( file, { - encoding: 'utf8', - } ); - // `data:` URLs are allowed: - const match = contents.match( /sourceMappingURL=((?!data:).)/ ); + files + .filter(file => ! ignoredFiles.includes( file) ) + .forEach( function( file ) { + const contents = fs.readFileSync( file, { + encoding: 'utf8', + } ); + // `data:` URLs are allowed: + const match = contents.match( /sourceMappingURL=((?!data:).)/ ); - assert( - match === null, - `The ${ file } file must not contain a sourceMappingURL.` - ); - } ); + assert( + match === null, + `The ${ file } file must not contain a sourceMappingURL.` + ); + } ); } ); grunt.registerTask( 'build', function() { @@ -1588,9 +1564,6 @@ module.exports = function(grunt) { 'build:files', 'build:js', 'build:css', - 'includes:emoji', - 'includes:embed', - 'replace:emoji-banner-text', 'replace:source-maps', 'verify:build' ] ); diff --git a/SECURITY.md b/SECURITY.md index fe8b683d6a..6d4258c52e 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -9,6 +9,7 @@ currently being supported with security updates. | Version | Supported | | ------- | ------------------ | +| 5.9.x | :white_check_mark: | | 5.8.x | :white_check_mark: | | 5.7.x | :white_check_mark: | | 5.6.x | :white_check_mark: | diff --git a/composer.json b/composer.json index 7910a75687..36ae2b7e4d 100644 --- a/composer.json +++ b/composer.json @@ -16,9 +16,14 @@ "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "squizlabs/php_codesniffer": "3.6.0", "wp-coding-standards/wpcs": "~2.3.0", - "phpcompatibility/phpcompatibility-wp": "~2.1.2", + "phpcompatibility/phpcompatibility-wp": "~2.1.3", "yoast/phpunit-polyfills": "^1.0.1" }, + "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } + }, "scripts": { "compat": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs --standard=phpcompat.xml.dist --report=summary,source", "format": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcbf --report=summary,source", diff --git a/package-lock.json b/package-lock.json index 68a5b59988..b910e787f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,38 +1,38 @@ { "name": "WordPress", - "version": "5.9.0", + "version": "6.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { "@babel/code-frame": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", - "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz", + "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==", "requires": { - "@babel/highlight": "^7.14.5" + "@babel/highlight": "^7.16.0" } }, "@babel/compat-data": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz", - "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==", + "version": "7.16.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz", + "integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==", "dev": true }, "@babel/core": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz", - "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.15.0", - "@babel/helper-compilation-targets": "^7.15.0", - "@babel/helper-module-transforms": "^7.15.0", - "@babel/helpers": "^7.14.8", - "@babel/parser": "^7.15.0", - "@babel/template": "^7.14.5", - "@babel/traverse": "^7.15.0", - "@babel/types": "^7.15.0", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.5.tgz", + "integrity": "sha512-wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.16.0", + "@babel/generator": "^7.16.5", + "@babel/helper-compilation-targets": "^7.16.3", + "@babel/helper-module-transforms": "^7.16.5", + "@babel/helpers": "^7.16.5", + "@babel/parser": "^7.16.5", + "@babel/template": "^7.16.0", + "@babel/traverse": "^7.16.5", + "@babel/types": "^7.16.0", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -42,9 +42,9 @@ }, "dependencies": { "@babel/parser": { - "version": "7.15.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz", - "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==", + "version": "7.16.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz", + "integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==", "dev": true }, "json5": { @@ -64,48 +64,108 @@ } } }, + "@babel/eslint-parser": { + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.16.5.tgz", + "integrity": "sha512-mUqYa46lgWqHKQ33Q6LNCGp/wPR3eqOYTUixHFsfrSQqRxH0+WOzca75iEjFr5RDGH1dDz622LaHhLOzOuQRUA==", + "dev": true, + "requires": { + "eslint-scope": "^5.1.1", + "eslint-visitor-keys": "^2.1.0", + "semver": "^6.3.0" + }, + "dependencies": { + "eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, "@babel/generator": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz", - "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.5.tgz", + "integrity": "sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA==", "dev": true, "requires": { - "@babel/types": "^7.15.0", + "@babel/types": "^7.16.0", "jsesc": "^2.5.1", "source-map": "^0.5.0" } }, "@babel/helper-annotate-as-pure": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz", - "integrity": "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz", + "integrity": "sha512-ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg==", "dev": true, "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.16.0" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz", - "integrity": "sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.5.tgz", + "integrity": "sha512-3JEA9G5dmmnIWdzaT9d0NmFRgYnWUThLsDaL7982H0XqqWr56lRrsmwheXFMjR+TMl7QMBb6mzy9kvgr1lRLUA==", "dev": true, "requires": { - "@babel/helper-explode-assignable-expression": "^7.14.5", - "@babel/types": "^7.14.5" + "@babel/helper-explode-assignable-expression": "^7.16.0", + "@babel/types": "^7.16.0" } }, "@babel/helper-compilation-targets": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz", - "integrity": "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==", + "version": "7.16.3", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz", + "integrity": "sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==", "dev": true, "requires": { - "@babel/compat-data": "^7.15.0", + "@babel/compat-data": "^7.16.0", "@babel/helper-validator-option": "^7.14.5", - "browserslist": "^4.16.6", + "browserslist": "^4.17.5", "semver": "^6.3.0" }, "dependencies": { + "browserslist": { + "version": "4.19.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz", + "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30001286", + "electron-to-chromium": "^1.4.17", + "escalade": "^3.1.1", + "node-releases": "^2.0.1", + "picocolors": "^1.0.0" + } + }, + "caniuse-lite": { + "version": "1.0.30001291", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001291.tgz", + "integrity": "sha512-roMV5V0HNGgJ88s42eE70sstqGW/gwFndosYrikHthw98N5tLnOTxFqMLQjZVRxTWFlJ4rn+MsgXrR7MDPY4jA==", + "dev": true + }, + "electron-to-chromium": { + "version": "1.4.25", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.25.tgz", + "integrity": "sha512-bTwub9Y/76EiNmfaiJih+hAy6xn7Ns95S4KvI2NuKNOz8TEEKKQUu44xuy0PYMudjM9zdjKRS1bitsUvHTfuUg==", + "dev": true + }, + "node-releases": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", + "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", + "dev": true + }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -115,33 +175,34 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz", - "integrity": "sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.5.tgz", + "integrity": "sha512-NEohnYA7mkB8L5JhU7BLwcBdU3j83IziR9aseMueWGeAjblbul3zzb8UvJ3a1zuBiqCMObzCJHFqKIQE6hTVmg==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.14.5", - "@babel/helper-function-name": "^7.14.5", - "@babel/helper-member-expression-to-functions": "^7.15.0", - "@babel/helper-optimise-call-expression": "^7.14.5", - "@babel/helper-replace-supers": "^7.15.0", - "@babel/helper-split-export-declaration": "^7.14.5" + "@babel/helper-annotate-as-pure": "^7.16.0", + "@babel/helper-environment-visitor": "^7.16.5", + "@babel/helper-function-name": "^7.16.0", + "@babel/helper-member-expression-to-functions": "^7.16.5", + "@babel/helper-optimise-call-expression": "^7.16.0", + "@babel/helper-replace-supers": "^7.16.5", + "@babel/helper-split-export-declaration": "^7.16.0" } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz", - "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz", + "integrity": "sha512-3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.14.5", + "@babel/helper-annotate-as-pure": "^7.16.0", "regexpu-core": "^4.7.1" } }, "@babel/helper-define-polyfill-provider": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz", - "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz", + "integrity": "sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg==", "dev": true, "requires": { "@babel/helper-compilation-targets": "^7.13.0", @@ -162,146 +223,155 @@ } } }, + "@babel/helper-environment-visitor": { + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz", + "integrity": "sha512-ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg==", + "dev": true, + "requires": { + "@babel/types": "^7.16.0" + } + }, "@babel/helper-explode-assignable-expression": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz", - "integrity": "sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz", + "integrity": "sha512-Hk2SLxC9ZbcOhLpg/yMznzJ11W++lg5GMbxt1ev6TXUiJB0N42KPC+7w8a+eWGuqDnUYuwStJoZHM7RgmIOaGQ==", "dev": true, "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.16.0" } }, "@babel/helper-function-name": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz", - "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz", + "integrity": "sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.14.5", - "@babel/template": "^7.14.5", - "@babel/types": "^7.14.5" + "@babel/helper-get-function-arity": "^7.16.0", + "@babel/template": "^7.16.0", + "@babel/types": "^7.16.0" } }, "@babel/helper-get-function-arity": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz", - "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz", + "integrity": "sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==", "dev": true, "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.16.0" } }, "@babel/helper-hoist-variables": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz", - "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz", + "integrity": "sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==", "dev": true, "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.16.0" } }, "@babel/helper-member-expression-to-functions": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz", - "integrity": "sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.5.tgz", + "integrity": "sha512-7fecSXq7ZrLE+TWshbGT+HyCLkxloWNhTbU2QM1NTI/tDqyf0oZiMcEfYtDuUDCo528EOlt39G1rftea4bRZIw==", "dev": true, "requires": { - "@babel/types": "^7.15.0" + "@babel/types": "^7.16.0" } }, "@babel/helper-module-imports": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz", - "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz", + "integrity": "sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==", "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.16.0" } }, "@babel/helper-module-transforms": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz", - "integrity": "sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz", + "integrity": "sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.14.5", - "@babel/helper-replace-supers": "^7.15.0", - "@babel/helper-simple-access": "^7.14.8", - "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/helper-validator-identifier": "^7.14.9", - "@babel/template": "^7.14.5", - "@babel/traverse": "^7.15.0", - "@babel/types": "^7.15.0" + "@babel/helper-environment-visitor": "^7.16.5", + "@babel/helper-module-imports": "^7.16.0", + "@babel/helper-simple-access": "^7.16.0", + "@babel/helper-split-export-declaration": "^7.16.0", + "@babel/helper-validator-identifier": "^7.15.7", + "@babel/template": "^7.16.0", + "@babel/traverse": "^7.16.5", + "@babel/types": "^7.16.0" } }, "@babel/helper-optimise-call-expression": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz", - "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz", + "integrity": "sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==", "dev": true, "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.16.0" } }, "@babel/helper-plugin-utils": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz", - "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==", - "dev": true + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.5.tgz", + "integrity": "sha512-59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ==" }, "@babel/helper-remap-async-to-generator": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz", - "integrity": "sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.5.tgz", + "integrity": "sha512-X+aAJldyxrOmN9v3FKp+Hu1NO69VWgYgDGq6YDykwRPzxs5f2N+X988CBXS7EQahDU+Vpet5QYMqLk+nsp+Qxw==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.14.5", - "@babel/helper-wrap-function": "^7.14.5", - "@babel/types": "^7.14.5" + "@babel/helper-annotate-as-pure": "^7.16.0", + "@babel/helper-wrap-function": "^7.16.5", + "@babel/types": "^7.16.0" } }, "@babel/helper-replace-supers": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz", - "integrity": "sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.5.tgz", + "integrity": "sha512-ao3seGVa/FZCMCCNDuBcqnBFSbdr8N2EW35mzojx3TwfIbdPmNK+JV6+2d5bR0Z71W5ocLnQp9en/cTF7pBJiQ==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "^7.15.0", - "@babel/helper-optimise-call-expression": "^7.14.5", - "@babel/traverse": "^7.15.0", - "@babel/types": "^7.15.0" + "@babel/helper-environment-visitor": "^7.16.5", + "@babel/helper-member-expression-to-functions": "^7.16.5", + "@babel/helper-optimise-call-expression": "^7.16.0", + "@babel/traverse": "^7.16.5", + "@babel/types": "^7.16.0" } }, "@babel/helper-simple-access": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz", - "integrity": "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz", + "integrity": "sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==", "dev": true, "requires": { - "@babel/types": "^7.14.8" + "@babel/types": "^7.16.0" } }, "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz", - "integrity": "sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz", + "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==", "dev": true, "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.16.0" } }, "@babel/helper-split-export-declaration": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz", - "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz", + "integrity": "sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==", "dev": true, "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.16.0" } }, "@babel/helper-validator-identifier": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz", - "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==" + "version": "7.15.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz", + "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==" }, "@babel/helper-validator-option": { "version": "7.14.5", @@ -310,34 +380,34 @@ "dev": true }, "@babel/helper-wrap-function": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz", - "integrity": "sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.5.tgz", + "integrity": "sha512-2J2pmLBqUqVdJw78U0KPNdeE2qeuIyKoG4mKV7wAq3mc4jJG282UgjZw4ZYDnqiWQuS3Y3IYdF/AQ6CpyBV3VA==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.14.5", - "@babel/template": "^7.14.5", - "@babel/traverse": "^7.14.5", - "@babel/types": "^7.14.5" + "@babel/helper-function-name": "^7.16.0", + "@babel/template": "^7.16.0", + "@babel/traverse": "^7.16.5", + "@babel/types": "^7.16.0" } }, "@babel/helpers": { - "version": "7.15.3", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz", - "integrity": "sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.5.tgz", + "integrity": "sha512-TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw==", "dev": true, "requires": { - "@babel/template": "^7.14.5", - "@babel/traverse": "^7.15.0", - "@babel/types": "^7.15.0" + "@babel/template": "^7.16.0", + "@babel/traverse": "^7.16.5", + "@babel/types": "^7.16.0" } }, "@babel/highlight": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", - "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz", + "integrity": "sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==", "requires": { - "@babel/helper-validator-identifier": "^7.14.5", + "@babel/helper-validator-identifier": "^7.15.7", "chalk": "^2.0.0", "js-tokens": "^4.0.0" }, @@ -360,173 +430,182 @@ "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==", "dev": true }, + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { + "version": "7.16.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2.tgz", + "integrity": "sha512-h37CvpLSf8gb2lIJ2CgC3t+EjFbi0t8qS7LCS1xcJIlEXE4czlofwaW7W1HA8zpgOCzI9C1nmoqNR1zWkk0pQg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz", - "integrity": "sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz", + "integrity": "sha512-4tcFwwicpWTrpl9qjf7UsoosaArgImF85AxqCRZlgc3IQDvkUHjJpruXAL58Wmj+T6fypWTC/BakfEkwIL/pwA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5", - "@babel/plugin-proposal-optional-chaining": "^7.14.5" + "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0", + "@babel/plugin-proposal-optional-chaining": "^7.16.0" } }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz", - "integrity": "sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.5.tgz", + "integrity": "sha512-C/FX+3HNLV6sz7AqbTQqEo1L9/kfrKjxcVtgyBCmvIgOjvuBVUWooDoi7trsLxOzCEo5FccjRvKHkfDsJFZlfA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-remap-async-to-generator": "^7.14.5", + "@babel/helper-plugin-utils": "^7.16.5", + "@babel/helper-remap-async-to-generator": "^7.16.5", "@babel/plugin-syntax-async-generators": "^7.8.4" } }, "@babel/plugin-proposal-class-properties": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz", - "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.5.tgz", + "integrity": "sha512-pJD3HjgRv83s5dv1sTnDbZOaTjghKEz8KUn1Kbh2eAIRhGuyQ1XSeI4xVXU3UlIEVA3DAyIdxqT1eRn7Wcn55A==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-create-class-features-plugin": "^7.16.5", + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-proposal-class-static-block": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz", - "integrity": "sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.5.tgz", + "integrity": "sha512-EEFzuLZcm/rNJ8Q5krK+FRKdVkd6FjfzT9tuSZql9sQn64K0hHA2KLJ0DqVot9/iV6+SsuadC5yI39zWnm+nmQ==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-create-class-features-plugin": "^7.16.5", + "@babel/helper-plugin-utils": "^7.16.5", "@babel/plugin-syntax-class-static-block": "^7.14.5" } }, "@babel/plugin-proposal-dynamic-import": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz", - "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.5.tgz", + "integrity": "sha512-P05/SJZTTvHz79LNYTF8ff5xXge0kk5sIIWAypcWgX4BTRUgyHc8wRxJ/Hk+mU0KXldgOOslKaeqnhthcDJCJQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-plugin-utils": "^7.16.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3" } }, "@babel/plugin-proposal-export-namespace-from": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz", - "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.5.tgz", + "integrity": "sha512-i+sltzEShH1vsVydvNaTRsgvq2vZsfyrd7K7vPLUU/KgS0D5yZMe6uipM0+izminnkKrEfdUnz7CxMRb6oHZWw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-plugin-utils": "^7.16.5", "@babel/plugin-syntax-export-namespace-from": "^7.8.3" } }, "@babel/plugin-proposal-json-strings": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz", - "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.5.tgz", + "integrity": "sha512-QQJueTFa0y9E4qHANqIvMsuxM/qcLQmKttBACtPCQzGUEizsXDACGonlPiSwynHfOa3vNw0FPMVvQzbuXwh4SQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-plugin-utils": "^7.16.5", "@babel/plugin-syntax-json-strings": "^7.8.3" } }, "@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz", - "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.5.tgz", + "integrity": "sha512-xqibl7ISO2vjuQM+MzR3rkd0zfNWltk7n9QhaD8ghMmMceVguYrNDt7MikRyj4J4v3QehpnrU8RYLnC7z/gZLA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-plugin-utils": "^7.16.5", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" } }, "@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz", - "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.5.tgz", + "integrity": "sha512-YwMsTp/oOviSBhrjwi0vzCUycseCYwoXnLiXIL3YNjHSMBHicGTz7GjVU/IGgz4DtOEXBdCNG72pvCX22ehfqg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-plugin-utils": "^7.16.5", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" } }, "@babel/plugin-proposal-numeric-separator": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz", - "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.5.tgz", + "integrity": "sha512-DvB9l/TcsCRvsIV9v4jxR/jVP45cslTVC0PMVHvaJhhNuhn2Y1SOhCSFlPK777qLB5wb8rVDaNoqMTyOqtY5Iw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-plugin-utils": "^7.16.5", "@babel/plugin-syntax-numeric-separator": "^7.10.4" } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz", - "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.5.tgz", + "integrity": "sha512-UEd6KpChoyPhCoE840KRHOlGhEZFutdPDMGj+0I56yuTTOaT51GzmnEl/0uT41fB/vD2nT+Pci2KjezyE3HmUw==", "dev": true, "requires": { - "@babel/compat-data": "^7.14.7", - "@babel/helper-compilation-targets": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5", + "@babel/compat-data": "^7.16.4", + "@babel/helper-compilation-targets": "^7.16.3", + "@babel/helper-plugin-utils": "^7.16.5", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.14.5" + "@babel/plugin-transform-parameters": "^7.16.5" } }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz", - "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.5.tgz", + "integrity": "sha512-ihCMxY1Iljmx4bWy/PIMJGXN4NS4oUj1MKynwO07kiKms23pNvIn1DMB92DNB2R0EA882sw0VXIelYGdtF7xEQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-plugin-utils": "^7.16.5", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" } }, "@babel/plugin-proposal-optional-chaining": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz", - "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.5.tgz", + "integrity": "sha512-kzdHgnaXRonttiTfKYnSVafbWngPPr2qKw9BWYBESl91W54e+9R5pP70LtWxV56g0f05f/SQrwHYkfvbwcdQ/A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5", + "@babel/helper-plugin-utils": "^7.16.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0", "@babel/plugin-syntax-optional-chaining": "^7.8.3" } }, "@babel/plugin-proposal-private-methods": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz", - "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.5.tgz", + "integrity": "sha512-+yFMO4BGT3sgzXo+lrq7orX5mAZt57DwUK6seqII6AcJnJOIhBJ8pzKH47/ql/d426uQ7YhN8DpUFirQzqYSUA==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-create-class-features-plugin": "^7.16.5", + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-proposal-private-property-in-object": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.5.tgz", + "integrity": "sha512-+YGh5Wbw0NH3y/E5YMu6ci5qTDmAEVNoZ3I54aB6nVEOZ5BQ7QJlwKq5pYVucQilMByGn/bvX0af+uNaPRCabA==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.14.5", - "@babel/helper-create-class-features-plugin": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-annotate-as-pure": "^7.16.0", + "@babel/helper-create-class-features-plugin": "^7.16.5", + "@babel/helper-plugin-utils": "^7.16.5", "@babel/plugin-syntax-private-property-in-object": "^7.14.5" } }, "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz", - "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.5.tgz", + "integrity": "sha512-s5sKtlKQyFSatt781HQwv1hoM5BQ9qRH30r+dK56OLDsHmV74mzwJNX7R1yMuE7VZKG5O6q/gmOGSAO6ikTudg==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-create-regexp-features-plugin": "^7.16.0", + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-syntax-async-generators": { @@ -602,12 +681,11 @@ } }, "@babel/plugin-syntax-jsx": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz", - "integrity": "sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==", - "dev": true, + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.5.tgz", + "integrity": "sha512-42OGssv9NPk4QHKVgIHlzeLgPOW5rGgfV5jzG90AhcXXIv6hu/eqj63w4VgvRxdvZY3AlYeDgPiSJ3BqAd1Y6Q==", "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-syntax-logical-assignment-operators": { @@ -683,322 +761,436 @@ } }, "@babel/plugin-syntax-typescript": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz", - "integrity": "sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.5.tgz", + "integrity": "sha512-/d4//lZ1Vqb4mZ5xTep3dDK888j7BGM/iKqBmndBaoYAFPlPKrGU608VVBz5JeyAb6YQDjRu1UKqj86UhwWVgw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz", - "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.5.tgz", + "integrity": "sha512-8bTHiiZyMOyfZFULjsCnYOWG059FVMes0iljEHSfARhNgFfpsqE92OrCffv3veSw9rwMkYcFe9bj0ZoXU2IGtQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz", - "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.5.tgz", + "integrity": "sha512-TMXgfioJnkXU+XRoj7P2ED7rUm5jbnDWwlCuFVTpQboMfbSya5WrmubNBAMlk7KXvywpo8rd8WuYZkis1o2H8w==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-remap-async-to-generator": "^7.14.5" + "@babel/helper-module-imports": "^7.16.0", + "@babel/helper-plugin-utils": "^7.16.5", + "@babel/helper-remap-async-to-generator": "^7.16.5" } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz", - "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.5.tgz", + "integrity": "sha512-BxmIyKLjUGksJ99+hJyL/HIxLIGnLKtw772zYDER7UuycDZ+Xvzs98ZQw6NGgM2ss4/hlFAaGiZmMNKvValEjw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-block-scoping": { - "version": "7.15.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz", - "integrity": "sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.5.tgz", + "integrity": "sha512-JxjSPNZSiOtmxjX7PBRBeRJTUKTyJ607YUYeT0QJCNdsedOe+/rXITjP08eG8xUpsLfPirgzdCFN+h0w6RI+pQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-classes": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz", - "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.14.5", - "@babel/helper-function-name": "^7.14.5", - "@babel/helper-optimise-call-expression": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-replace-supers": "^7.14.5", - "@babel/helper-split-export-declaration": "^7.14.5", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.5.tgz", + "integrity": "sha512-DzJ1vYf/7TaCYy57J3SJ9rV+JEuvmlnvvyvYKFbk5u46oQbBvuB9/0w+YsVsxkOv8zVWKpDmUoj4T5ILHoXevA==", + "dev": true, + "requires": { + "@babel/helper-annotate-as-pure": "^7.16.0", + "@babel/helper-environment-visitor": "^7.16.5", + "@babel/helper-function-name": "^7.16.0", + "@babel/helper-optimise-call-expression": "^7.16.0", + "@babel/helper-plugin-utils": "^7.16.5", + "@babel/helper-replace-supers": "^7.16.5", + "@babel/helper-split-export-declaration": "^7.16.0", "globals": "^11.1.0" } }, "@babel/plugin-transform-computed-properties": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz", - "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.5.tgz", + "integrity": "sha512-n1+O7xtU5lSLraRzX88CNcpl7vtGdPakKzww74bVwpAIRgz9JVLJJpOLb0uYqcOaXVM0TL6X0RVeIJGD2CnCkg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-destructuring": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz", - "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.5.tgz", + "integrity": "sha512-GuRVAsjq+c9YPK6NeTkRLWyQskDC099XkBSVO+6QzbnOnH2d/4mBVXYStaPrZD3dFRfg00I6BFJ9Atsjfs8mlg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz", - "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.5.tgz", + "integrity": "sha512-iQiEMt8Q4/5aRGHpGVK2Zc7a6mx7qEAO7qehgSug3SDImnuMzgmm/wtJALXaz25zUj1PmnNHtShjFgk4PDx4nw==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-create-regexp-features-plugin": "^7.16.0", + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz", - "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.5.tgz", + "integrity": "sha512-81tijpDg2a6I1Yhj4aWY1l3O1J4Cg/Pd7LfvuaH2VVInAkXtzibz9+zSPdUM1WvuUi128ksstAP0hM5w48vQgg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz", - "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.5.tgz", + "integrity": "sha512-12rba2HwemQPa7BLIKCzm1pT2/RuQHtSFHdNl41cFiC6oi4tcrp7gjB07pxQvFpcADojQywSjblQth6gJyE6CA==", "dev": true, "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.5", + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-for-of": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz", - "integrity": "sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.5.tgz", + "integrity": "sha512-+DpCAJFPAvViR17PIMi9x2AE34dll5wNlXO43wagAX2YcRGgEVHCNFC4azG85b4YyyFarvkc/iD5NPrz4Oneqw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-function-name": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz", - "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.5.tgz", + "integrity": "sha512-Fuec/KPSpVLbGo6z1RPw4EE1X+z9gZk1uQmnYy7v4xr4TO9p41v1AoUuXEtyqAI7H+xNJYSICzRqZBhDEkd3kQ==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-function-name": "^7.16.0", + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-literals": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz", - "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.5.tgz", + "integrity": "sha512-B1j9C/IfvshnPcklsc93AVLTrNVa69iSqztylZH6qnmiAsDDOmmjEYqOm3Ts2lGSgTSywnBNiqC949VdD0/gfw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-member-expression-literals": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz", - "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.5.tgz", + "integrity": "sha512-d57i3vPHWgIde/9Y8W/xSFUndhvhZN5Wu2TjRrN1MVz5KzdUihKnfDVlfP1U7mS5DNj/WHHhaE4/tTi4hIyHwQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz", - "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.5.tgz", + "integrity": "sha512-oHI15S/hdJuSCfnwIz+4lm6wu/wBn7oJ8+QrkzPPwSFGXk8kgdI/AIKcbR/XnD1nQVMg/i6eNaXpszbGuwYDRQ==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-module-transforms": "^7.16.5", + "@babel/helper-plugin-utils": "^7.16.5", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz", - "integrity": "sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.5.tgz", + "integrity": "sha512-ABhUkxvoQyqhCWyb8xXtfwqNMJD7tx+irIRnUh6lmyFud7Jln1WzONXKlax1fg/ey178EXbs4bSGNd6PngO+SQ==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.15.0", - "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-simple-access": "^7.14.8", + "@babel/helper-module-transforms": "^7.16.5", + "@babel/helper-plugin-utils": "^7.16.5", + "@babel/helper-simple-access": "^7.16.0", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz", - "integrity": "sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.5.tgz", + "integrity": "sha512-53gmLdScNN28XpjEVIm7LbWnD/b/TpbwKbLk6KV4KqC9WyU6rq1jnNmVG6UgAdQZVVGZVoik3DqHNxk4/EvrjA==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.14.5", - "@babel/helper-module-transforms": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-validator-identifier": "^7.14.5", + "@babel/helper-hoist-variables": "^7.16.0", + "@babel/helper-module-transforms": "^7.16.5", + "@babel/helper-plugin-utils": "^7.16.5", + "@babel/helper-validator-identifier": "^7.15.7", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-umd": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz", - "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.5.tgz", + "integrity": "sha512-qTFnpxHMoenNHkS3VoWRdwrcJ3FhX567GvDA3hRZKF0Dj8Fmg0UzySZp3AP2mShl/bzcywb/UWAMQIjA1bhXvw==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-module-transforms": "^7.16.5", + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz", - "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.5.tgz", + "integrity": "sha512-/wqGDgvFUeKELW6ex6QB7dLVRkd5ehjw34tpXu1nhKC0sFfmaLabIswnpf8JgDyV2NeDmZiwoOb0rAmxciNfjA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.14.5" + "@babel/helper-create-regexp-features-plugin": "^7.16.0" } }, "@babel/plugin-transform-new-target": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz", - "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.5.tgz", + "integrity": "sha512-ZaIrnXF08ZC8jnKR4/5g7YakGVL6go6V9ql6Jl3ecO8PQaQqFE74CuM384kezju7Z9nGCCA20BqZaR1tJ/WvHg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-object-super": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz", - "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.5.tgz", + "integrity": "sha512-tded+yZEXuxt9Jdtkc1RraW1zMF/GalVxaVVxh41IYwirdRgyAxxxCKZ9XB7LxZqmsjfjALxupNE1MIz9KH+Zg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-replace-supers": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5", + "@babel/helper-replace-supers": "^7.16.5" } }, "@babel/plugin-transform-parameters": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz", - "integrity": "sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.5.tgz", + "integrity": "sha512-B3O6AL5oPop1jAVg8CV+haeUte9oFuY85zu0jwnRNZZi3tVAbJriu5tag/oaO2kGaQM/7q7aGPBlTI5/sr9enA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-property-literals": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz", - "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.5.tgz", + "integrity": "sha512-+IRcVW71VdF9pEH/2R/Apab4a19LVvdVsr/gEeotH00vSDVlKD+XgfSIw+cgGWsjDB/ziqGv/pGoQZBIiQVXHg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-react-constant-elements": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.14.5.tgz", - "integrity": "sha512-NBqLEx1GxllIOXJInJAQbrnwwYJsV3WaMHIcOwD8rhYS0AabTWn7kHdHgPgu5RmHLU0q4DMxhAMu8ue/KampgQ==", + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.16.7.tgz", + "integrity": "sha512-lF+cfsyTgwWkcw715J88JhMYJ5GpysYNLhLP1PkvkhTRN7B3e74R/1KsDxFxhRpSn0UUD3IWM4GvdBR2PEbbQQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.7" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz", + "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==", + "dev": true + } } }, "@babel/plugin-transform-react-display-name": { - "version": "7.15.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.15.1.tgz", - "integrity": "sha512-yQZ/i/pUCJAHI/LbtZr413S3VT26qNrEm0M5RRxQJA947/YNYwbZbBaXGDrq6CG5QsZycI1VIP6d7pQaBfP+8Q==", + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz", + "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.7" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz", + "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==", + "dev": true + } } }, "@babel/plugin-transform-react-jsx": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz", - "integrity": "sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.5.tgz", + "integrity": "sha512-+arLIz1d7kmwX0fKxTxbnoeG85ONSnLpvdODa4P3pc1sS7CV1hfmtYWufkW/oYsPnkDrEeQFxhUWcFnrXW7jQQ==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.14.5", - "@babel/helper-module-imports": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5", - "@babel/plugin-syntax-jsx": "^7.14.5", - "@babel/types": "^7.14.9" + "@babel/helper-annotate-as-pure": "^7.16.0", + "@babel/helper-module-imports": "^7.16.0", + "@babel/helper-plugin-utils": "^7.16.5", + "@babel/plugin-syntax-jsx": "^7.16.5", + "@babel/types": "^7.16.0" } }, "@babel/plugin-transform-react-jsx-development": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz", - "integrity": "sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==", + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz", + "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==", "dev": true, "requires": { - "@babel/plugin-transform-react-jsx": "^7.14.5" + "@babel/plugin-transform-react-jsx": "^7.16.7" + }, + "dependencies": { + "@babel/helper-annotate-as-pure": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz", + "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==", + "dev": true, + "requires": { + "@babel/types": "^7.16.7" + } + }, + "@babel/helper-module-imports": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz", + "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==", + "dev": true, + "requires": { + "@babel/types": "^7.16.7" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz", + "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==", + "dev": true + }, + "@babel/helper-validator-identifier": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz", + "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==", + "dev": true + }, + "@babel/plugin-syntax-jsx": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz", + "integrity": "sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.16.7" + } + }, + "@babel/plugin-transform-react-jsx": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.7.tgz", + "integrity": "sha512-8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag==", + "dev": true, + "requires": { + "@babel/helper-annotate-as-pure": "^7.16.7", + "@babel/helper-module-imports": "^7.16.7", + "@babel/helper-plugin-utils": "^7.16.7", + "@babel/plugin-syntax-jsx": "^7.16.7", + "@babel/types": "^7.16.7" + } + }, + "@babel/types": { + "version": "7.16.8", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz", + "integrity": "sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.16.7", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/plugin-transform-react-pure-annotations": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz", - "integrity": "sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g==", + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz", + "integrity": "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-annotate-as-pure": "^7.16.7", + "@babel/helper-plugin-utils": "^7.16.7" + }, + "dependencies": { + "@babel/helper-annotate-as-pure": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz", + "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==", + "dev": true, + "requires": { + "@babel/types": "^7.16.7" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz", + "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==", + "dev": true + }, + "@babel/helper-validator-identifier": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz", + "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==", + "dev": true + }, + "@babel/types": { + "version": "7.16.8", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz", + "integrity": "sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.16.7", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/plugin-transform-regenerator": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz", - "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.5.tgz", + "integrity": "sha512-2z+it2eVWU8TtQQRauvGUqZwLy4+7rTfo6wO4npr+fvvN1SW30ZF3O/ZRCNmTuu4F5MIP8OJhXAhRV5QMJOuYg==", "dev": true, "requires": { "regenerator-transform": "^0.14.2" } }, "@babel/plugin-transform-reserved-words": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz", - "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.5.tgz", + "integrity": "sha512-aIB16u8lNcf7drkhXJRoggOxSTUAuihTSTfAcpynowGJOZiGf+Yvi7RuTwFzVYSYPmWyARsPqUGoZWWWxLiknw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-runtime": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz", - "integrity": "sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.5.tgz", + "integrity": "sha512-gxpfS8XQWDbQ8oP5NcmpXxtEgCJkbO+W9VhZlOhr0xPyVaRjAQPOv7ZDj9fg0d5s9+NiVvMCE6gbkEkcsxwGRw==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5", - "babel-plugin-polyfill-corejs2": "^0.2.2", - "babel-plugin-polyfill-corejs3": "^0.2.2", - "babel-plugin-polyfill-regenerator": "^0.2.2", + "@babel/helper-module-imports": "^7.16.0", + "@babel/helper-plugin-utils": "^7.16.5", + "babel-plugin-polyfill-corejs2": "^0.3.0", + "babel-plugin-polyfill-corejs3": "^0.4.0", + "babel-plugin-polyfill-regenerator": "^0.3.0", "semver": "^6.3.0" }, "dependencies": { @@ -1011,107 +1203,108 @@ } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz", - "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.5.tgz", + "integrity": "sha512-ZbuWVcY+MAXJuuW7qDoCwoxDUNClfZxoo7/4swVbOW1s/qYLOMHlm9YRWMsxMFuLs44eXsv4op1vAaBaBaDMVg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-spread": { - "version": "7.14.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz", - "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.5.tgz", + "integrity": "sha512-5d6l/cnG7Lw4tGHEoga4xSkYp1euP7LAtrah1h1PgJ3JY7yNsjybsxQAnVK4JbtReZ/8z6ASVmd3QhYYKLaKZw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0" } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz", - "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.5.tgz", + "integrity": "sha512-usYsuO1ID2LXxzuUxifgWtJemP7wL2uZtyrTVM4PKqsmJycdS4U4mGovL5xXkfUheds10Dd2PjoQLXw6zCsCbg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-template-literals": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz", - "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.5.tgz", + "integrity": "sha512-gnyKy9RyFhkovex4BjKWL3BVYzUDG6zC0gba7VMLbQoDuqMfJ1SDXs8k/XK41Mmt1Hyp4qNAvGFb9hKzdCqBRQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz", - "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.5.tgz", + "integrity": "sha512-ldxCkW180qbrvyCVDzAUZqB0TAeF8W/vGJoRcaf75awm6By+PxfJKvuqVAnq8N9wz5Xa6mSpM19OfVKKVmGHSQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-typescript": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.0.tgz", - "integrity": "sha512-WIIEazmngMEEHDaPTx0IZY48SaAmjVWe3TRSX7cmJXn0bEv9midFzAjxiruOWYIVf5iQ10vFx7ASDpgEO08L5w==", + "version": "7.16.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.1.tgz", + "integrity": "sha512-NO4XoryBng06jjw/qWEU2LhcLJr1tWkhpMam/H4eas/CDKMX/b2/Ylb6EI256Y7+FVPCawwSM1rrJNOpDiz+Lg==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.15.0", + "@babel/helper-create-class-features-plugin": "^7.16.0", "@babel/helper-plugin-utils": "^7.14.5", - "@babel/plugin-syntax-typescript": "^7.14.5" + "@babel/plugin-syntax-typescript": "^7.16.0" } }, "@babel/plugin-transform-unicode-escapes": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz", - "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.5.tgz", + "integrity": "sha512-shiCBHTIIChGLdyojsKQjoAyB8MBwat25lKM7MJjbe1hE0bgIppD+LX9afr41lLHOhqceqeWl4FkLp+Bgn9o1Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz", - "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.5.tgz", + "integrity": "sha512-GTJ4IW012tiPEMMubd7sD07iU9O/LOo8Q/oU4xNhcaq0Xn8+6TcUQaHtC8YxySo1T+ErQ8RaWogIEeFhKGNPzw==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.14.5", - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-create-regexp-features-plugin": "^7.16.0", + "@babel/helper-plugin-utils": "^7.16.5" } }, "@babel/preset-env": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.0.tgz", - "integrity": "sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.5.tgz", + "integrity": "sha512-MiJJW5pwsktG61NDxpZ4oJ1CKxM1ncam9bzRtx9g40/WkLRkxFP6mhpkYV0/DxcciqoiHicx291+eUQrXb/SfQ==", "dev": true, "requires": { - "@babel/compat-data": "^7.15.0", - "@babel/helper-compilation-targets": "^7.15.0", - "@babel/helper-plugin-utils": "^7.14.5", + "@babel/compat-data": "^7.16.4", + "@babel/helper-compilation-targets": "^7.16.3", + "@babel/helper-plugin-utils": "^7.16.5", "@babel/helper-validator-option": "^7.14.5", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5", - "@babel/plugin-proposal-async-generator-functions": "^7.14.9", - "@babel/plugin-proposal-class-properties": "^7.14.5", - "@babel/plugin-proposal-class-static-block": "^7.14.5", - "@babel/plugin-proposal-dynamic-import": "^7.14.5", - "@babel/plugin-proposal-export-namespace-from": "^7.14.5", - "@babel/plugin-proposal-json-strings": "^7.14.5", - "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5", - "@babel/plugin-proposal-numeric-separator": "^7.14.5", - "@babel/plugin-proposal-object-rest-spread": "^7.14.7", - "@babel/plugin-proposal-optional-catch-binding": "^7.14.5", - "@babel/plugin-proposal-optional-chaining": "^7.14.5", - "@babel/plugin-proposal-private-methods": "^7.14.5", - "@babel/plugin-proposal-private-property-in-object": "^7.14.5", - "@babel/plugin-proposal-unicode-property-regex": "^7.14.5", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.2", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.0", + "@babel/plugin-proposal-async-generator-functions": "^7.16.5", + "@babel/plugin-proposal-class-properties": "^7.16.5", + "@babel/plugin-proposal-class-static-block": "^7.16.5", + "@babel/plugin-proposal-dynamic-import": "^7.16.5", + "@babel/plugin-proposal-export-namespace-from": "^7.16.5", + "@babel/plugin-proposal-json-strings": "^7.16.5", + "@babel/plugin-proposal-logical-assignment-operators": "^7.16.5", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.5", + "@babel/plugin-proposal-numeric-separator": "^7.16.5", + "@babel/plugin-proposal-object-rest-spread": "^7.16.5", + "@babel/plugin-proposal-optional-catch-binding": "^7.16.5", + "@babel/plugin-proposal-optional-chaining": "^7.16.5", + "@babel/plugin-proposal-private-methods": "^7.16.5", + "@babel/plugin-proposal-private-property-in-object": "^7.16.5", + "@babel/plugin-proposal-unicode-property-regex": "^7.16.5", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", "@babel/plugin-syntax-class-static-block": "^7.14.5", @@ -1126,44 +1319,44 @@ "@babel/plugin-syntax-optional-chaining": "^7.8.3", "@babel/plugin-syntax-private-property-in-object": "^7.14.5", "@babel/plugin-syntax-top-level-await": "^7.14.5", - "@babel/plugin-transform-arrow-functions": "^7.14.5", - "@babel/plugin-transform-async-to-generator": "^7.14.5", - "@babel/plugin-transform-block-scoped-functions": "^7.14.5", - "@babel/plugin-transform-block-scoping": "^7.14.5", - "@babel/plugin-transform-classes": "^7.14.9", - "@babel/plugin-transform-computed-properties": "^7.14.5", - "@babel/plugin-transform-destructuring": "^7.14.7", - "@babel/plugin-transform-dotall-regex": "^7.14.5", - "@babel/plugin-transform-duplicate-keys": "^7.14.5", - "@babel/plugin-transform-exponentiation-operator": "^7.14.5", - "@babel/plugin-transform-for-of": "^7.14.5", - "@babel/plugin-transform-function-name": "^7.14.5", - "@babel/plugin-transform-literals": "^7.14.5", - "@babel/plugin-transform-member-expression-literals": "^7.14.5", - "@babel/plugin-transform-modules-amd": "^7.14.5", - "@babel/plugin-transform-modules-commonjs": "^7.15.0", - "@babel/plugin-transform-modules-systemjs": "^7.14.5", - "@babel/plugin-transform-modules-umd": "^7.14.5", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9", - "@babel/plugin-transform-new-target": "^7.14.5", - "@babel/plugin-transform-object-super": "^7.14.5", - "@babel/plugin-transform-parameters": "^7.14.5", - "@babel/plugin-transform-property-literals": "^7.14.5", - "@babel/plugin-transform-regenerator": "^7.14.5", - "@babel/plugin-transform-reserved-words": "^7.14.5", - "@babel/plugin-transform-shorthand-properties": "^7.14.5", - "@babel/plugin-transform-spread": "^7.14.6", - "@babel/plugin-transform-sticky-regex": "^7.14.5", - "@babel/plugin-transform-template-literals": "^7.14.5", - "@babel/plugin-transform-typeof-symbol": "^7.14.5", - "@babel/plugin-transform-unicode-escapes": "^7.14.5", - "@babel/plugin-transform-unicode-regex": "^7.14.5", - "@babel/preset-modules": "^0.1.4", - "@babel/types": "^7.15.0", - "babel-plugin-polyfill-corejs2": "^0.2.2", - "babel-plugin-polyfill-corejs3": "^0.2.2", - "babel-plugin-polyfill-regenerator": "^0.2.2", - "core-js-compat": "^3.16.0", + "@babel/plugin-transform-arrow-functions": "^7.16.5", + "@babel/plugin-transform-async-to-generator": "^7.16.5", + "@babel/plugin-transform-block-scoped-functions": "^7.16.5", + "@babel/plugin-transform-block-scoping": "^7.16.5", + "@babel/plugin-transform-classes": "^7.16.5", + "@babel/plugin-transform-computed-properties": "^7.16.5", + "@babel/plugin-transform-destructuring": "^7.16.5", + "@babel/plugin-transform-dotall-regex": "^7.16.5", + "@babel/plugin-transform-duplicate-keys": "^7.16.5", + "@babel/plugin-transform-exponentiation-operator": "^7.16.5", + "@babel/plugin-transform-for-of": "^7.16.5", + "@babel/plugin-transform-function-name": "^7.16.5", + "@babel/plugin-transform-literals": "^7.16.5", + "@babel/plugin-transform-member-expression-literals": "^7.16.5", + "@babel/plugin-transform-modules-amd": "^7.16.5", + "@babel/plugin-transform-modules-commonjs": "^7.16.5", + "@babel/plugin-transform-modules-systemjs": "^7.16.5", + "@babel/plugin-transform-modules-umd": "^7.16.5", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.5", + "@babel/plugin-transform-new-target": "^7.16.5", + "@babel/plugin-transform-object-super": "^7.16.5", + "@babel/plugin-transform-parameters": "^7.16.5", + "@babel/plugin-transform-property-literals": "^7.16.5", + "@babel/plugin-transform-regenerator": "^7.16.5", + "@babel/plugin-transform-reserved-words": "^7.16.5", + "@babel/plugin-transform-shorthand-properties": "^7.16.5", + "@babel/plugin-transform-spread": "^7.16.5", + "@babel/plugin-transform-sticky-regex": "^7.16.5", + "@babel/plugin-transform-template-literals": "^7.16.5", + "@babel/plugin-transform-typeof-symbol": "^7.16.5", + "@babel/plugin-transform-unicode-escapes": "^7.16.5", + "@babel/plugin-transform-unicode-regex": "^7.16.5", + "@babel/preset-modules": "^0.1.5", + "@babel/types": "^7.16.0", + "babel-plugin-polyfill-corejs2": "^0.3.0", + "babel-plugin-polyfill-corejs3": "^0.4.0", + "babel-plugin-polyfill-regenerator": "^0.3.0", + "core-js-compat": "^3.19.1", "semver": "^6.3.0" }, "dependencies": { @@ -1176,9 +1369,9 @@ } }, "@babel/preset-modules": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz", - "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==", + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", + "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -1189,98 +1382,169 @@ } }, "@babel/preset-react": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.14.5.tgz", - "integrity": "sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==", + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.16.7.tgz", + "integrity": "sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-validator-option": "^7.14.5", - "@babel/plugin-transform-react-display-name": "^7.14.5", - "@babel/plugin-transform-react-jsx": "^7.14.5", - "@babel/plugin-transform-react-jsx-development": "^7.14.5", - "@babel/plugin-transform-react-pure-annotations": "^7.14.5" + "@babel/helper-plugin-utils": "^7.16.7", + "@babel/helper-validator-option": "^7.16.7", + "@babel/plugin-transform-react-display-name": "^7.16.7", + "@babel/plugin-transform-react-jsx": "^7.16.7", + "@babel/plugin-transform-react-jsx-development": "^7.16.7", + "@babel/plugin-transform-react-pure-annotations": "^7.16.7" + }, + "dependencies": { + "@babel/helper-annotate-as-pure": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz", + "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==", + "dev": true, + "requires": { + "@babel/types": "^7.16.7" + } + }, + "@babel/helper-module-imports": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz", + "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==", + "dev": true, + "requires": { + "@babel/types": "^7.16.7" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz", + "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==", + "dev": true + }, + "@babel/helper-validator-identifier": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz", + "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==", + "dev": true + }, + "@babel/helper-validator-option": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz", + "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==", + "dev": true + }, + "@babel/plugin-syntax-jsx": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz", + "integrity": "sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.16.7" + } + }, + "@babel/plugin-transform-react-jsx": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.7.tgz", + "integrity": "sha512-8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag==", + "dev": true, + "requires": { + "@babel/helper-annotate-as-pure": "^7.16.7", + "@babel/helper-module-imports": "^7.16.7", + "@babel/helper-plugin-utils": "^7.16.7", + "@babel/plugin-syntax-jsx": "^7.16.7", + "@babel/types": "^7.16.7" + } + }, + "@babel/types": { + "version": "7.16.8", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz", + "integrity": "sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.16.7", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/preset-typescript": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.15.0.tgz", - "integrity": "sha512-lt0Y/8V3y06Wq/8H/u0WakrqciZ7Fz7mwPDHWUJAXlABL5hiUG42BNlRXiELNjeWjO5rWmnNKlx+yzJvxezHow==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.5.tgz", + "integrity": "sha512-lmAWRoJ9iOSvs3DqOndQpj8XqXkzaiQs50VG/zESiI9D3eoZhGriU675xNCr0UwvsuXrhMAGvyk1w+EVWF3u8Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-plugin-utils": "^7.16.5", "@babel/helper-validator-option": "^7.14.5", - "@babel/plugin-transform-typescript": "^7.15.0" + "@babel/plugin-transform-typescript": "^7.16.1" } }, "@babel/runtime": { - "version": "7.14.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz", - "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.5.tgz", + "integrity": "sha512-TXWihFIS3Pyv5hzR7j6ihmeLkZfrXGxAr5UfSl8CHf+6q/wpiYDkUau0czckpYG8QmnCIuPpdLtuA9VmuGGyMA==", "requires": { "regenerator-runtime": "^0.13.4" } }, "@babel/runtime-corejs3": { - "version": "7.15.3", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz", - "integrity": "sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A==", + "version": "7.16.8", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.16.8.tgz", + "integrity": "sha512-3fKhuICS1lMz0plI5ktOE/yEtBRMVxplzRkdn6mJQ197XiY0JnrzYV0+Mxozq3JZ8SBV9Ecurmw1XsGbwOf+Sg==", "dev": true, "requires": { - "core-js-pure": "^3.16.0", + "core-js-pure": "^3.20.2", "regenerator-runtime": "^0.13.4" } }, "@babel/template": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz", - "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.0.tgz", + "integrity": "sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==", "dev": true, "requires": { - "@babel/code-frame": "^7.14.5", - "@babel/parser": "^7.14.5", - "@babel/types": "^7.14.5" + "@babel/code-frame": "^7.16.0", + "@babel/parser": "^7.16.0", + "@babel/types": "^7.16.0" }, "dependencies": { "@babel/parser": { - "version": "7.15.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz", - "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==", + "version": "7.16.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz", + "integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==", "dev": true } } }, "@babel/traverse": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz", - "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.15.0", - "@babel/helper-function-name": "^7.14.5", - "@babel/helper-hoist-variables": "^7.14.5", - "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/parser": "^7.15.0", - "@babel/types": "^7.15.0", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.5.tgz", + "integrity": "sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.16.0", + "@babel/generator": "^7.16.5", + "@babel/helper-environment-visitor": "^7.16.5", + "@babel/helper-function-name": "^7.16.0", + "@babel/helper-hoist-variables": "^7.16.0", + "@babel/helper-split-export-declaration": "^7.16.0", + "@babel/parser": "^7.16.5", + "@babel/types": "^7.16.0", "debug": "^4.1.0", "globals": "^11.1.0" }, "dependencies": { "@babel/parser": { - "version": "7.15.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz", - "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==", + "version": "7.16.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz", + "integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==", "dev": true } } }, "@babel/types": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", - "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz", + "integrity": "sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==", "requires": { - "@babel/helper-validator-identifier": "^7.14.9", + "@babel/helper-validator-identifier": "^7.15.7", "to-fast-properties": "^2.0.0" } }, @@ -1309,38 +1573,60 @@ "minimist": "^1.2.0" } }, - "@emotion/cache": { - "version": "10.0.29", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz", - "integrity": "sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==", - "requires": { - "@emotion/sheet": "0.9.4", - "@emotion/stylis": "0.8.5", - "@emotion/utils": "0.11.3", - "@emotion/weak-memoize": "0.2.5" - } + "@discoveryjs/json-ext": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz", + "integrity": "sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==", + "dev": true }, - "@emotion/core": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz", - "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==", + "@emotion/babel-plugin": { + "version": "11.7.2", + "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.7.2.tgz", + "integrity": "sha512-6mGSCWi9UzXut/ZAN6lGFu33wGR3SJisNl3c0tvlmb8XChH1b2SUvxvnOh7hvLpqyRdHHU9AiazV3Cwbk5SXKQ==", "requires": { - "@babel/runtime": "^7.5.5", - "@emotion/cache": "^10.0.27", - "@emotion/css": "^10.0.27", - "@emotion/serialize": "^0.11.15", - "@emotion/sheet": "0.9.4", - "@emotion/utils": "0.11.3" + "@babel/helper-module-imports": "^7.12.13", + "@babel/plugin-syntax-jsx": "^7.12.13", + "@babel/runtime": "^7.13.10", + "@emotion/hash": "^0.8.0", + "@emotion/memoize": "^0.7.5", + "@emotion/serialize": "^1.0.2", + "babel-plugin-macros": "^2.6.1", + "convert-source-map": "^1.5.0", + "escape-string-regexp": "^4.0.0", + "find-root": "^1.1.0", + "source-map": "^0.5.7", + "stylis": "4.0.13" + }, + "dependencies": { + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + } + } + }, + "@emotion/cache": { + "version": "11.7.1", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.7.1.tgz", + "integrity": "sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==", + "requires": { + "@emotion/memoize": "^0.7.4", + "@emotion/sheet": "^1.1.0", + "@emotion/utils": "^1.0.0", + "@emotion/weak-memoize": "^0.2.5", + "stylis": "4.0.13" } }, "@emotion/css": { - "version": "10.0.27", - "resolved": "https://registry.npmjs.org/@emotion/css/-/css-10.0.27.tgz", - "integrity": "sha512-6wZjsvYeBhyZQYNrGoR5yPMYbMBNEnanDrqmsqS1mzDm1cOTu12shvl2j4QHNS36UaTE0USIJawCH9C8oW34Zw==", + "version": "11.7.1", + "resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.7.1.tgz", + "integrity": "sha512-RUUgPlMZunlc7SE5A6Hg+VWRzb2cU6O9xlV78KCFgcnl25s7Qz/20oQg71iKudpLqk7xj0vhbJlwcJJMT0BOZg==", "requires": { - "@emotion/serialize": "^0.11.15", - "@emotion/utils": "0.11.3", - "babel-plugin-emotion": "^10.0.27" + "@emotion/babel-plugin": "^11.7.1", + "@emotion/cache": "^11.7.1", + "@emotion/serialize": "^1.0.0", + "@emotion/sheet": "^1.0.3", + "@emotion/utils": "^1.0.0" } }, "@emotion/hash": { @@ -1349,76 +1635,70 @@ "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" }, "@emotion/is-prop-valid": { - "version": "0.8.8", - "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz", - "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.1.1.tgz", + "integrity": "sha512-bW1Tos67CZkOURLc0OalnfxtSXQJMrAMV0jZTVGJUPSOd4qgjF3+tTD5CwJM13PHA8cltGW1WGbbvV9NpvUZPw==", "requires": { - "@emotion/memoize": "0.7.4" + "@emotion/memoize": "^0.7.4" } }, "@emotion/memoize": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz", - "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==" + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz", + "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==" + }, + "@emotion/react": { + "version": "11.7.1", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.7.1.tgz", + "integrity": "sha512-DV2Xe3yhkF1yT4uAUoJcYL1AmrnO5SVsdfvu+fBuS7IbByDeTVx9+wFmvx9Idzv7/78+9Mgx2Hcmr7Fex3tIyw==", + "requires": { + "@babel/runtime": "^7.13.10", + "@emotion/cache": "^11.7.1", + "@emotion/serialize": "^1.0.2", + "@emotion/sheet": "^1.1.0", + "@emotion/utils": "^1.0.0", + "@emotion/weak-memoize": "^0.2.5", + "hoist-non-react-statics": "^3.3.1" + } }, "@emotion/serialize": { - "version": "0.11.16", - "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz", - "integrity": "sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.2.tgz", + "integrity": "sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A==", "requires": { - "@emotion/hash": "0.8.0", - "@emotion/memoize": "0.7.4", - "@emotion/unitless": "0.7.5", - "@emotion/utils": "0.11.3", - "csstype": "^2.5.7" - }, - "dependencies": { - "csstype": { - "version": "2.6.17", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.17.tgz", - "integrity": "sha512-u1wmTI1jJGzCJzWndZo8mk4wnPTZd1eOIYTYvuEyOQGfmDl3TrabCCfKnOC86FZwW/9djqTl933UF/cS425i9A==" - } + "@emotion/hash": "^0.8.0", + "@emotion/memoize": "^0.7.4", + "@emotion/unitless": "^0.7.5", + "@emotion/utils": "^1.0.0", + "csstype": "^3.0.2" } }, "@emotion/sheet": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.4.tgz", - "integrity": "sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.1.0.tgz", + "integrity": "sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==" }, "@emotion/styled": { - "version": "10.0.27", - "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-10.0.27.tgz", - "integrity": "sha512-iK/8Sh7+NLJzyp9a5+vIQIXTYxfT4yB/OJbjzQanB2RZpvmzBQOHZWhpAMZWYEKRNNbsD6WfBw5sVWkb6WzS/Q==", + "version": "11.6.0", + "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.6.0.tgz", + "integrity": "sha512-mxVtVyIOTmCAkFbwIp+nCjTXJNgcz4VWkOYQro87jE2QBTydnkiYusMrRGFtzuruiGK4dDaNORk4gH049iiQuw==", "requires": { - "@emotion/styled-base": "^10.0.27", - "babel-plugin-emotion": "^10.0.27" - } - }, - "@emotion/styled-base": { - "version": "10.0.31", - "resolved": "https://registry.npmjs.org/@emotion/styled-base/-/styled-base-10.0.31.tgz", - "integrity": "sha512-wTOE1NcXmqMWlyrtwdkqg87Mu6Rj1MaukEoEmEkHirO5IoHDJ8LgCQL4MjJODgxWxXibGR3opGp1p7YvkNEdXQ==", - "requires": { - "@babel/runtime": "^7.5.5", - "@emotion/is-prop-valid": "0.8.8", - "@emotion/serialize": "^0.11.15", - "@emotion/utils": "0.11.3" + "@babel/runtime": "^7.13.10", + "@emotion/babel-plugin": "^11.3.0", + "@emotion/is-prop-valid": "^1.1.1", + "@emotion/serialize": "^1.0.2", + "@emotion/utils": "^1.0.0" } }, - "@emotion/stylis": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz", - "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==" - }, "@emotion/unitless": { "version": "0.7.5", "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz", "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==" }, "@emotion/utils": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz", - "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.0.0.tgz", + "integrity": "sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==" }, "@emotion/weak-memoize": { "version": "0.2.5", @@ -1426,14 +1706,22 @@ "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, "@es-joy/jsdoccomment": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.6.0.tgz", - "integrity": "sha512-zT1EtysKMITJ7vE4RvOJqitxk/Str6It8hq+fykxkwLuTyzgak+TnVuVSIyovT/qrEz3i46ypCSXgNtIDYwNOg==", + "version": "0.10.8", + "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.10.8.tgz", + "integrity": "sha512-3P1JiGL4xaR9PoTKUHa2N/LKwa2/eUdRqGwijMWWgBqbFEqJUVpmaOi2TcjcemrsRMgFLBzQCK4ToPhrSVDiFQ==", "dev": true, "requires": { - "comment-parser": "^1.1.5", + "comment-parser": "1.2.4", "esquery": "^1.4.0", - "jsdoctypeparser": "^9.0.0" + "jsdoc-type-pratt-parser": "1.1.1" + }, + "dependencies": { + "jsdoc-type-pratt-parser": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz", + "integrity": "sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g==", + "dev": true + } } }, "@eslint/eslintrc": { @@ -1454,9 +1742,9 @@ }, "dependencies": { "globals": { - "version": "13.11.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", - "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", + "version": "13.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", + "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -1667,49 +1955,19 @@ } } }, - "@gar/promisify": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz", - "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==", - "dev": true - }, - "@hapi/address": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz", - "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==", - "dev": true - }, - "@hapi/bourne": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz", - "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==", - "dev": true - }, "@hapi/hoek": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz", - "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.1.tgz", + "integrity": "sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw==", "dev": true }, - "@hapi/joi": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz", - "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==", - "dev": true, - "requires": { - "@hapi/address": "2.x.x", - "@hapi/bourne": "1.x.x", - "@hapi/hoek": "8.x.x", - "@hapi/topo": "3.x.x" - } - }, "@hapi/topo": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz", - "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", + "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", "dev": true, "requires": { - "@hapi/hoek": "^8.3.0" + "@hapi/hoek": "^9.0.0" } }, "@humanwhocodes/config-array": { @@ -1724,9 +1982,9 @@ } }, "@humanwhocodes/object-schema": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz", - "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", + "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, "@istanbuljs/load-nyc-config": { @@ -1841,9 +2099,9 @@ }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "braces": { @@ -1881,9 +2139,9 @@ } }, "picomatch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", - "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, "rimraf": { @@ -1896,12 +2154,12 @@ } }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^5.0.1" } }, "to-regex-range": { @@ -1985,6 +2243,24 @@ "v8-to-istanbul": "^7.0.0" }, "dependencies": { + "istanbul-lib-instrument": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", + "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "dev": true, + "requires": { + "@babel/core": "^7.7.5", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -2095,9 +2371,9 @@ } }, "picomatch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", - "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, "source-map": { @@ -2171,80 +2447,74 @@ "fastq": "^1.6.0" } }, - "@npmcli/fs": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.0.0.tgz", - "integrity": "sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==", - "dev": true, + "@polka/url": { + "version": "1.0.0-next.21", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz", + "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", + "dev": true + }, + "@popperjs/core": { + "version": "2.11.2", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz", + "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==" + }, + "@react-spring/animated": { + "version": "9.4.2", + "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.4.2.tgz", + "integrity": "sha512-Dzum5Ho8e+LIAegAqRyoQFakD2IVH3ZQ2nsFXJorAFq3Xjv6IVPz/+TNxb/wSvnsMludfoF+ZIf319FSFmgD5w==", "requires": { - "@gar/promisify": "^1.0.1", - "semver": "^7.3.5" - }, - "dependencies": { - "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - } + "@react-spring/shared": "~9.4.0", + "@react-spring/types": "~9.4.0" } }, - "@npmcli/move-file": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", - "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", - "dev": true, + "@react-spring/core": { + "version": "9.4.2", + "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.4.2.tgz", + "integrity": "sha512-Ej/ULwdx8rQtMAWEpLgwbKcQEx6vPfjyG3cxLP05zAInpCoWkYpl+sXOp9tn3r99mTNQPTTt7BgQsSnmQA8+rQ==", "requires": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - }, - "dependencies": { - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - } + "@react-spring/animated": "~9.4.0", + "@react-spring/rafz": "~9.4.0", + "@react-spring/shared": "~9.4.0", + "@react-spring/types": "~9.4.0" } }, - "@polka/url": { - "version": "1.0.0-next.20", - "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.20.tgz", - "integrity": "sha512-88p7+M0QGxKpmnkfXjS4V26AnoC/eiqZutE8GLdaI5X12NY75bXSdTY9NkmYb2Xyk1O+MmkuO6Frmsj84V6I8Q==", - "dev": true + "@react-spring/rafz": { + "version": "9.4.2", + "resolved": "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.4.2.tgz", + "integrity": "sha512-rSm+G8E/XEEpnCGtT/xYN6o8VvEXlU8wN/hyKp4Q44XAZzGSMHLIFP7pY94/MmWsxCxjkw1AxUWhiFYxWrnI5Q==" }, - "@popperjs/core": { - "version": "2.9.3", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.3.tgz", - "integrity": "sha512-xDu17cEfh7Kid/d95kB6tZsLOmSWKCZKtprnhVepjsSaCij+lM3mItSJDuuHDMbCWTh8Ejmebwb+KONcCJ0eXQ==" + "@react-spring/shared": { + "version": "9.4.2", + "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.4.2.tgz", + "integrity": "sha512-mZtbQLpMm6Vy5+O1MSlY9KuAcMO8rdUQvtdnC7Or7y7xiZlnzj8oAILyO6Y2rD2ZC1PmgVS0gMev/8T+MykW+Q==", + "requires": { + "@react-spring/rafz": "~9.4.0", + "@react-spring/types": "~9.4.0" + } + }, + "@react-spring/types": { + "version": "9.4.2", + "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.4.2.tgz", + "integrity": "sha512-GGiIscTM+CEUNV52anj3g5FqAZKL2+eRKtvBOAlC99qGBbvJ3qTLImrUR/I3lXY7PRuLgzI6kh34quA1oUxWYQ==" + }, + "@react-spring/web": { + "version": "9.4.2", + "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.4.2.tgz", + "integrity": "sha512-sWfA9NkVuvVOpjSlMkD2zcF6X3i8NSHTeH/uHCGKsN3mYqgkhvAF+E8GASO/H4KKGNhbRvgCZiwJXOtOGyUg6A==", + "requires": { + "@react-spring/animated": "~9.4.0", + "@react-spring/core": "~9.4.0", + "@react-spring/shared": "~9.4.0", + "@react-spring/types": "~9.4.0" + } }, "@sideway/address": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.1.tgz", - "integrity": "sha512-+I5aaQr3m0OAmMr7RQ3fR9zx55sejEYR2BFJaxL+zT3VM2611X0SHvPWIbAUBZVTn/YzYKbV8gJ2oT/QELknfQ==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.2.tgz", + "integrity": "sha512-idTz8ibqWFrPU8kMirL0CoPH/A29XOzzAzpyN3zQ4kAWnzmNfFmRaoMNN6VI8ske5M73HZyhIaW4OuSFIdM4oA==", "dev": true, "requires": { "@hapi/hoek": "^9.0.0" - }, - "dependencies": { - "@hapi/hoek": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.1.1.tgz", - "integrity": "sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw==", - "dev": true - } } }, "@sideway/formula": { @@ -2396,9 +2666,9 @@ }, "dependencies": { "camelcase": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", - "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true }, "cosmiconfig": { @@ -2495,9 +2765,9 @@ } }, "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", + "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", "dev": true, "requires": { "big.js": "^5.2.2", @@ -2540,10 +2810,16 @@ "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "dev": true }, + "@trysound/sax": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", + "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", + "dev": true + }, "@types/babel__core": { - "version": "7.1.15", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.15.tgz", - "integrity": "sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew==", + "version": "7.1.18", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.18.tgz", + "integrity": "sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==", "dev": true, "requires": { "@babel/parser": "^7.1.0", @@ -2554,9 +2830,9 @@ } }, "@types/babel__generator": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.3.tgz", - "integrity": "sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==", + "version": "7.6.4", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", + "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", "dev": true, "requires": { "@babel/types": "^7.0.0" @@ -2605,6 +2881,32 @@ "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz", "integrity": "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ==" }, + "@types/eslint": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.2.2.tgz", + "integrity": "sha512-nQxgB8/Sg+QKhnV8e0WzPpxjIGT3tuJDDzybkDi8ItE/IgTlHo07U0shaIjzhcvQxlq9SDRE42lsJ23uvEgJ2A==", + "dev": true, + "requires": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "@types/eslint-scope": { + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", + "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", + "dev": true, + "requires": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, + "@types/estree": { + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", + "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==", + "dev": true + }, "@types/glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", @@ -2625,9 +2927,9 @@ } }, "@types/istanbul-lib-coverage": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", - "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", + "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", "dev": true }, "@types/istanbul-lib-report": { @@ -2660,6 +2962,11 @@ "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", "dev": true }, + "@types/lodash": { + "version": "4.14.178", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz", + "integrity": "sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==" + }, "@types/mdast": { "version": "3.0.10", "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz", @@ -2681,6 +2988,11 @@ "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==", "dev": true }, + "@types/mousetrap": { + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/@types/mousetrap/-/mousetrap-1.6.8.tgz", + "integrity": "sha512-zTqjvgCUT5EoXqbqmd8iJMb4NJqyV/V7pK7AIKq7qcaAsJIpGlTVJS1HQM6YkdHCdnkNSbhcQI7MXYxFfE3iCA==" + }, "@types/node": { "version": "14.14.20", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz", @@ -2698,9 +3010,9 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" }, "@types/prettier": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.2.tgz", - "integrity": "sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.3.tgz", + "integrity": "sha512-QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w==", "dev": true }, "@types/prop-types": { @@ -2715,9 +3027,9 @@ "dev": true }, "@types/react": { - "version": "16.14.14", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.14.tgz", - "integrity": "sha512-uwIWDYW8LznHzEMJl7ag9St1RsK0gw/xaFZ5+uI1ZM1HndwUgmPH3/wQkSb87GkOVg7shUxnpNW8DcN0AzvG5Q==", + "version": "16.14.21", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.21.tgz", + "integrity": "sha512-rY4DzPKK/4aohyWiDRHS2fotN5rhBSK6/rz1X37KzNna9HJyqtaGAbq9fVttrEPWF5ywpfIP1ITL8Xi2QZn6Eg==", "requires": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -2779,9 +3091,9 @@ "dev": true }, "@types/webpack": { - "version": "4.41.30", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.30.tgz", - "integrity": "sha512-GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA==", + "version": "4.41.32", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.32.tgz", + "integrity": "sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg==", "dev": true, "requires": { "@types/node": "*", @@ -2845,24 +3157,25 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz", - "integrity": "sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==", + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz", + "integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.30.0", - "@typescript-eslint/scope-manager": "4.30.0", + "@typescript-eslint/experimental-utils": "4.33.0", + "@typescript-eslint/scope-manager": "4.33.0", "debug": "^4.3.1", "functional-red-black-tree": "^1.0.1", + "ignore": "^5.1.8", "regexpp": "^3.1.0", "semver": "^7.3.5", "tsutils": "^3.21.0" }, "dependencies": { "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dev": true, "requires": { "ms": "2.1.2" @@ -2886,15 +3199,15 @@ } }, "@typescript-eslint/experimental-utils": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz", - "integrity": "sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==", + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz", + "integrity": "sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==", "dev": true, "requires": { "@types/json-schema": "^7.0.7", - "@typescript-eslint/scope-manager": "4.30.0", - "@typescript-eslint/types": "4.30.0", - "@typescript-eslint/typescript-estree": "4.30.0", + "@typescript-eslint/scope-manager": "4.33.0", + "@typescript-eslint/types": "4.33.0", + "@typescript-eslint/typescript-estree": "4.33.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -2918,21 +3231,21 @@ } }, "@typescript-eslint/parser": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.30.0.tgz", - "integrity": "sha512-HJ0XuluSZSxeboLU7Q2VQ6eLlCwXPBOGnA7CqgBnz2Db3JRQYyBDJgQnop6TZ+rsbSx5gEdWhw4rE4mDa1FnZg==", + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz", + "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.30.0", - "@typescript-eslint/types": "4.30.0", - "@typescript-eslint/typescript-estree": "4.30.0", + "@typescript-eslint/scope-manager": "4.33.0", + "@typescript-eslint/types": "4.33.0", + "@typescript-eslint/typescript-estree": "4.33.0", "debug": "^4.3.1" }, "dependencies": { "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dev": true, "requires": { "ms": "2.1.2" @@ -2947,29 +3260,29 @@ } }, "@typescript-eslint/scope-manager": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz", - "integrity": "sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==", + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz", + "integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==", "dev": true, "requires": { - "@typescript-eslint/types": "4.30.0", - "@typescript-eslint/visitor-keys": "4.30.0" + "@typescript-eslint/types": "4.33.0", + "@typescript-eslint/visitor-keys": "4.33.0" } }, "@typescript-eslint/types": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz", - "integrity": "sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==", + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz", + "integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz", - "integrity": "sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==", + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz", + "integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==", "dev": true, "requires": { - "@typescript-eslint/types": "4.30.0", - "@typescript-eslint/visitor-keys": "4.30.0", + "@typescript-eslint/types": "4.33.0", + "@typescript-eslint/visitor-keys": "4.33.0", "debug": "^4.3.1", "globby": "^11.0.3", "is-glob": "^4.0.1", @@ -2984,25 +3297,25 @@ "dev": true }, "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dev": true, "requires": { "ms": "2.1.2" } }, "globby": { - "version": "11.0.4", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", - "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", "dev": true, "requires": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", "slash": "^3.0.0" } }, @@ -3024,12 +3337,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz", - "integrity": "sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==", + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz", + "integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.30.0", + "@typescript-eslint/types": "4.33.0", "eslint-visitor-keys": "^2.0.0" } }, @@ -3086,6 +3399,31 @@ "@webassemblyjs/ast": "1.9.0" } }, + "@webassemblyjs/helper-numbers": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", + "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "dev": true, + "requires": { + "@webassemblyjs/floating-point-hex-parser": "1.11.1", + "@webassemblyjs/helper-api-error": "1.11.1", + "@xtuc/long": "4.2.2" + }, + "dependencies": { + "@webassemblyjs/floating-point-hex-parser": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", + "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", + "dev": true + }, + "@webassemblyjs/helper-api-error": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", + "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", + "dev": true + } + } + }, "@webassemblyjs/helper-wasm-bytecode": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz", @@ -3213,19 +3551,38 @@ "resolved": "https://registry.npmjs.org/@webcomponents/template/-/template-1.4.4.tgz", "integrity": "sha512-QqCmmywIKJTilkl6UIPLxEBBuqhDaOBpvQyKOnUEwl9lJuVHBrVlhMIhhnp9VSZJ6xEUnp+PiX8DST1k0q/v4Q==" }, + "@webpack-cli/configtest": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz", + "integrity": "sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==", + "dev": true + }, + "@webpack-cli/info": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.0.tgz", + "integrity": "sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw==", + "dev": true, + "requires": { + "envinfo": "^7.7.3" + } + }, + "@webpack-cli/serve": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz", + "integrity": "sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==", + "dev": true + }, "@wojtekmaj/enzyme-adapter-react-17": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.6.3.tgz", - "integrity": "sha512-Kp1ZJxtHkKEnUksaWrcMABNTOgL4wOt8VI6k2xOek2aH9PtZcWRXJNUEgnKrdJrqg5UqIjRslbVF9uUqwQJtFg==", + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.6.6.tgz", + "integrity": "sha512-gSfhg8CiL0Vwc2UgUblGVZIy7M0KyXaZsd8+QwzV8TSVRLkGyzdLtYEcs9wRWyQTsdmOd+oRGqbVgUX7AVJxug==", "dev": true, "requires": { - "@wojtekmaj/enzyme-adapter-utils": "^0.1.1", + "@wojtekmaj/enzyme-adapter-utils": "^0.1.2", "enzyme-shallow-equal": "^1.0.0", "has": "^1.0.0", - "object.assign": "^4.1.0", - "object.values": "^1.1.0", "prop-types": "^15.7.0", - "react-is": "^17.0.2", + "react-is": "^17.0.0", "react-test-renderer": "^17.0.0" }, "dependencies": { @@ -3238,59 +3595,58 @@ } }, "@wojtekmaj/enzyme-adapter-utils": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-utils/-/enzyme-adapter-utils-0.1.1.tgz", - "integrity": "sha512-bNPWtN/d8huKOkC6j1E3EkSamnRrHHT7YuR6f9JppAQqtoAm3v4/vERe4J14jQKmHLCyEBHXrlgb7H6l817hVg==", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-utils/-/enzyme-adapter-utils-0.1.2.tgz", + "integrity": "sha512-MM/DqDqvxNVlWLqSVQiUbRN9MuDLJfefmPbJ8ZKdmdf5ID8G+i42XhFpoQh5bAZUCdwzRae3+WSZl2lXcFOrhw==", "dev": true, "requires": { "function.prototype.name": "^1.1.0", "has": "^1.0.0", - "object.assign": "^4.1.0", "object.fromentries": "^2.0.0", "prop-types": "^15.7.0" } }, "@wordpress/a11y": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/a11y/-/a11y-3.1.2.tgz", - "integrity": "sha512-VUrJN4UcDdYLYVOjArMbSsHNrIPmoAfrSsJi09xpRFBJXUq67sLLPh5+yy01uptbV1aOqcIbRagyj0Zaq8I70g==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@wordpress/a11y/-/a11y-3.2.4.tgz", + "integrity": "sha512-RhDZciRy6XUx/hegJdJTgAtC/6i7DjfpUYJdy6McwvWXs56tMmCo+wBYQvC3G//+2VYdYYkwDZ8Z6eVUBSJ17w==", "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/dom-ready": "^3.1.2", - "@wordpress/i18n": "^4.1.2" + "@babel/runtime": "^7.16.0", + "@wordpress/dom-ready": "^3.2.3", + "@wordpress/i18n": "^4.2.4" } }, "@wordpress/annotations": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@wordpress/annotations/-/annotations-2.1.6.tgz", - "integrity": "sha512-z79UvFGm8GiwJZWEIgE9mzIEzoGVRPo31qwjnotFq3uHjAhKsRZk3ppmaLRNZUbJfobNOvDEyD8VT8V033Gp2A==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/data": "^5.1.6", - "@wordpress/hooks": "^3.1.1", - "@wordpress/i18n": "^4.1.2", - "@wordpress/rich-text": "^4.1.6", + "version": "2.2.9", + "resolved": "https://registry.npmjs.org/@wordpress/annotations/-/annotations-2.2.9.tgz", + "integrity": "sha512-xudNtq+QotOwyYbOAEt1XWLp40CcKJvBzE2acstf/DZqxIi/PXB++4QVxgpQuYWkr6bWIFm4EfNvsUFBQr9DWQ==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/data": "^6.1.5", + "@wordpress/hooks": "^3.2.2", + "@wordpress/i18n": "^4.2.4", + "@wordpress/rich-text": "^5.0.8", "lodash": "^4.17.21", "rememo": "^3.0.0", "uuid": "^8.3.0" } }, "@wordpress/api-fetch": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-5.1.2.tgz", - "integrity": "sha512-qdYENoku3IHfq9tHQismlOnCXerps3Vf9oHjoicUT7ukUBLawEfJWM8LeMJmuFoMRh4mc5ceuhUmTnmEfbcwIQ==", + "version": "5.2.6", + "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-5.2.6.tgz", + "integrity": "sha512-AG8KdCHwtYJWR38AAU7nEI+UbumUSqSBthQj3rShLUVyFbYGkQdpwXJJG6vFj7FjIp41zljiyj3K1Fh3cqdaAw==", "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/i18n": "^4.1.2", - "@wordpress/url": "^3.1.2" + "@babel/runtime": "^7.16.0", + "@wordpress/i18n": "^4.2.4", + "@wordpress/url": "^3.3.1" } }, "@wordpress/autop": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/autop/-/autop-3.1.2.tgz", - "integrity": "sha512-EbQ/lJwK20GjMXa0pszW8RVdIWghrQcjM1GE/IjPhSWuReD8h0R+3LpB+noZpuy4ccqiz3/Enksq9LBlnFUMvg==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/@wordpress/autop/-/autop-3.2.3.tgz", + "integrity": "sha512-o66vC+aZPmJGMie+Emqa5gtfQYKbLXqGCESTfingXyMxXEpCa4qOEOi1D6vwX61sf3+k2qJ4bvKwJ5nZXjDaSQ==", "requires": { - "@babel/runtime": "^7.13.10" + "@babel/runtime": "^7.16.0" } }, "@wordpress/babel-plugin-import-jsx-pragma": { @@ -3300,98 +3656,133 @@ "dev": true }, "@wordpress/babel-preset-default": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-6.2.1.tgz", - "integrity": "sha512-io2HbPtmLdfu3WdZg6X6T1oRVCrOTVrTouqSeUxyAZ954fNh8xyB7Q8rfHfxUZHPgGypnbzZOKBiCpUlnBRs7A==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-6.4.1.tgz", + "integrity": "sha512-T0+dPOn0Hus/FSP043H3C2awjGNWLJcSahm7LhLqT5uUtgdg6QD9yf4jSr7G5mpLO/DXgz2ZnaYMUj+d1/gk9w==", "dev": true, "requires": { - "@babel/core": "^7.13.10", - "@babel/plugin-transform-react-jsx": "^7.12.7", - "@babel/plugin-transform-runtime": "^7.13.10", - "@babel/preset-env": "^7.13.10", - "@babel/preset-typescript": "^7.13.0", - "@babel/runtime": "^7.13.10", - "@wordpress/babel-plugin-import-jsx-pragma": "^3.0.5", - "@wordpress/browserslist-config": "^4.0.1", - "@wordpress/element": "^3.1.2", - "@wordpress/warning": "^2.1.2", - "browserslist": "^4.16.6", - "core-js": "^3.12.1" + "@babel/core": "^7.16.0", + "@babel/plugin-transform-react-jsx": "^7.16.0", + "@babel/plugin-transform-runtime": "^7.16.0", + "@babel/preset-env": "^7.16.0", + "@babel/preset-typescript": "^7.16.0", + "@babel/runtime": "^7.16.0", + "@wordpress/babel-plugin-import-jsx-pragma": "^3.1.0", + "@wordpress/browserslist-config": "^4.1.0", + "@wordpress/element": "^4.0.4", + "@wordpress/warning": "^2.2.2", + "browserslist": "^4.17.6", + "core-js": "^3.19.1" + }, + "dependencies": { + "browserslist": { + "version": "4.19.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz", + "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30001286", + "electron-to-chromium": "^1.4.17", + "escalade": "^3.1.1", + "node-releases": "^2.0.1", + "picocolors": "^1.0.0" + } + }, + "caniuse-lite": { + "version": "1.0.30001291", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001291.tgz", + "integrity": "sha512-roMV5V0HNGgJ88s42eE70sstqGW/gwFndosYrikHthw98N5tLnOTxFqMLQjZVRxTWFlJ4rn+MsgXrR7MDPY4jA==", + "dev": true + }, + "electron-to-chromium": { + "version": "1.4.25", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.25.tgz", + "integrity": "sha512-bTwub9Y/76EiNmfaiJih+hAy6xn7Ns95S4KvI2NuKNOz8TEEKKQUu44xuy0PYMudjM9zdjKRS1bitsUvHTfuUg==", + "dev": true + }, + "node-releases": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", + "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", + "dev": true + } } }, "@wordpress/base-styles": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-3.6.0.tgz", - "integrity": "sha512-6/vXAmc9FSX7Y17UjKgUJoVU++Pv1U1G8uMx7iClRUaLetc7/jj2DD9PTyX/cdJjHr32e3yXuLVT9wfEbo6SEg==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-4.0.4.tgz", + "integrity": "sha512-qXiIhWLdTHWxBWawcqigJUUMeb2jkn9ElUEUC/Cn3DK2i62jiUWXOLp6tFIaf5eQMNXsYqtp5r7n2F/OllngQA==", "dev": true }, "@wordpress/blob": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/blob/-/blob-3.1.2.tgz", - "integrity": "sha512-xtuw2+fPok3Ep+fKJlNuatMzag19FUzLziDPa5XLtfncVo+WKg/Tnz+gj138EwYtrjVKnxGlGolps1zqFzH4Bg==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@wordpress/blob/-/blob-3.2.2.tgz", + "integrity": "sha512-uzOlmwcTtxZFBoQc6nDYdkTvPnd6QMK5GEmmrHt6Q1OYOZ6V2vOdC6w0IdynbQYpuNnaWwhyfcsTRh/+97UoRg==", "requires": { - "@babel/runtime": "^7.13.10" + "@babel/runtime": "^7.16.0" } }, "@wordpress/block-directory": { - "version": "2.1.21", - "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-2.1.21.tgz", - "integrity": "sha512-CCfQDyY7LpWkPxvmA7Dv9KAeSK1WiYIAZKt8FZNXJhnzZHuADsUcZy/7otopcMGHqCYycHcg+ygkpfzNyve5lA==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/a11y": "^3.1.2", - "@wordpress/api-fetch": "^5.1.2", - "@wordpress/block-editor": "^6.1.14", - "@wordpress/blocks": "^9.1.8", - "@wordpress/components": "^14.1.11", - "@wordpress/compose": "^4.1.6", - "@wordpress/core-data": "^3.1.12", - "@wordpress/data": "^5.1.6", - "@wordpress/data-controls": "^2.1.6", - "@wordpress/edit-post": "^4.1.21", - "@wordpress/editor": "^10.1.17", - "@wordpress/element": "^3.1.2", - "@wordpress/hooks": "^3.1.1", - "@wordpress/html-entities": "^3.1.2", - "@wordpress/i18n": "^4.1.2", - "@wordpress/icons": "^4.0.3", - "@wordpress/notices": "^3.1.6", - "@wordpress/plugins": "^3.1.6", - "@wordpress/url": "^3.1.2", + "version": "3.0.26", + "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.0.26.tgz", + "integrity": "sha512-+ufI3G3S3At+T6J0O3OsI37EyuYmt6NHELTnM8DmRWn+vDVWHpUFyUeHZwuPnqJCOq6orANsQctvGS45jq4BpA==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/a11y": "^3.2.4", + "@wordpress/api-fetch": "^5.2.6", + "@wordpress/block-editor": "^8.0.16", + "@wordpress/blocks": "^11.1.5", + "@wordpress/components": "^19.2.2", + "@wordpress/compose": "^5.0.7", + "@wordpress/core-data": "^4.0.9", + "@wordpress/data": "^6.1.5", + "@wordpress/edit-post": "^5.0.26", + "@wordpress/editor": "^12.0.20", + "@wordpress/element": "^4.0.4", + "@wordpress/hooks": "^3.2.2", + "@wordpress/html-entities": "^3.2.3", + "@wordpress/i18n": "^4.2.4", + "@wordpress/icons": "^6.1.1", + "@wordpress/notices": "^3.2.8", + "@wordpress/plugins": "^4.0.7", + "@wordpress/url": "^3.3.1", "lodash": "^4.17.21" } }, "@wordpress/block-editor": { - "version": "6.1.14", - "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-6.1.14.tgz", - "integrity": "sha512-4qiAPqrBSOIO6fanm+jG2nTaNuPc1vfqq+KLHnWWfEZtAA06tuKeW/C8XbHT5NdCBzdSL9sytVw+94gOJVeTww==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/a11y": "^3.1.2", - "@wordpress/blob": "^3.1.2", - "@wordpress/block-serialization-default-parser": "^4.1.2", - "@wordpress/blocks": "^9.1.8", - "@wordpress/components": "^14.1.11", - "@wordpress/compose": "^4.1.6", - "@wordpress/data": "^5.1.6", - "@wordpress/data-controls": "^2.1.6", - "@wordpress/deprecated": "^3.1.2", - "@wordpress/dom": "^3.1.5", - "@wordpress/element": "^3.1.2", - "@wordpress/hooks": "^3.1.1", - "@wordpress/html-entities": "^3.1.2", - "@wordpress/i18n": "^4.1.2", - "@wordpress/icons": "^4.0.3", - "@wordpress/is-shallow-equal": "^4.1.1", - "@wordpress/keyboard-shortcuts": "^2.1.7", - "@wordpress/keycodes": "^3.1.2", - "@wordpress/notices": "^3.1.6", - "@wordpress/rich-text": "^4.1.6", - "@wordpress/shortcode": "^3.1.2", - "@wordpress/token-list": "^2.1.1", - "@wordpress/url": "^3.1.2", - "@wordpress/wordcount": "^3.1.2", - "classnames": "^2.2.5", + "version": "8.0.16", + "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-8.0.16.tgz", + "integrity": "sha512-vXmP8OANw+ZBbcI05qFBeuPON7tc4z1bAhg4txcJVM6ACAckjDabSamg53dprOycvpNA7B+bJVCvYBgEWkV1xQ==", + "requires": { + "@babel/runtime": "^7.16.0", + "@react-spring/web": "^9.2.4", + "@wordpress/a11y": "^3.2.4", + "@wordpress/api-fetch": "^5.2.6", + "@wordpress/blob": "^3.2.2", + "@wordpress/block-serialization-default-parser": "^4.2.3", + "@wordpress/blocks": "^11.1.5", + "@wordpress/components": "^19.2.2", + "@wordpress/compose": "^5.0.7", + "@wordpress/data": "^6.1.5", + "@wordpress/deprecated": "^3.2.3", + "@wordpress/dom": "^3.2.7", + "@wordpress/element": "^4.0.4", + "@wordpress/hooks": "^3.2.2", + "@wordpress/html-entities": "^3.2.3", + "@wordpress/i18n": "^4.2.4", + "@wordpress/icons": "^6.1.1", + "@wordpress/is-shallow-equal": "^4.2.1", + "@wordpress/keyboard-shortcuts": "^3.0.7", + "@wordpress/keycodes": "^3.2.4", + "@wordpress/notices": "^3.2.8", + "@wordpress/rich-text": "^5.0.8", + "@wordpress/shortcode": "^3.2.3", + "@wordpress/token-list": "^2.2.2", + "@wordpress/url": "^3.3.1", + "@wordpress/warning": "^2.2.2", + "@wordpress/wordcount": "^3.2.3", + "classnames": "^2.3.1", + "colord": "^2.7.0", "css-mediaquery": "^0.1.2", "diff": "^4.0.2", "dom-scroll-into-view": "^1.2.1", @@ -3399,90 +3790,88 @@ "lodash": "^4.17.21", "memize": "^1.1.0", "react-autosize-textarea": "^7.1.0", - "react-spring": "^8.0.19", + "react-easy-crop": "^3.0.0", "redux-multi": "^0.1.12", "rememo": "^3.0.0", - "tinycolor2": "^1.4.2", "traverse": "^0.6.6" } }, "@wordpress/block-library": { - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-3.2.19.tgz", - "integrity": "sha512-F/Dbg9YYmoQQ9LdtanA1Nn6Bi6z7a5mC9gUankzbl6657Aqw7EcBwvbKfuG3n1TOjbbJZpA2wCCYTge6XNXLWA==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/a11y": "^3.1.2", - "@wordpress/api-fetch": "^5.1.2", - "@wordpress/autop": "^3.1.2", - "@wordpress/blob": "^3.1.2", - "@wordpress/block-editor": "^6.1.14", - "@wordpress/blocks": "^9.1.8", - "@wordpress/components": "^14.1.11", - "@wordpress/compose": "^4.1.6", - "@wordpress/core-data": "^3.1.12", - "@wordpress/data": "^5.1.6", - "@wordpress/date": "^4.1.2", - "@wordpress/deprecated": "^3.1.2", - "@wordpress/dom": "^3.1.5", - "@wordpress/element": "^3.1.2", - "@wordpress/escape-html": "^2.1.2", - "@wordpress/hooks": "^3.1.1", - "@wordpress/i18n": "^4.1.2", - "@wordpress/icons": "^4.0.3", - "@wordpress/is-shallow-equal": "^4.1.1", - "@wordpress/keycodes": "^3.1.2", - "@wordpress/notices": "^3.1.6", - "@wordpress/primitives": "^2.1.2", - "@wordpress/reusable-blocks": "^2.1.17", - "@wordpress/rich-text": "^4.1.6", - "@wordpress/server-side-render": "^2.1.12", - "@wordpress/url": "^3.1.2", - "@wordpress/viewport": "^3.1.6", - "classnames": "^2.2.5", + "version": "6.0.25", + "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.25.tgz", + "integrity": "sha512-aHabUm+Oylx3dOnwQmJ45PKBZoC1P45phuYAoof05FK/NwPSnJNgYTBiRUB2H335zKfJJzChIKRUakruY/24XA==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/a11y": "^3.2.4", + "@wordpress/api-fetch": "^5.2.6", + "@wordpress/autop": "^3.2.3", + "@wordpress/blob": "^3.2.2", + "@wordpress/block-editor": "^8.0.16", + "@wordpress/blocks": "^11.1.5", + "@wordpress/components": "^19.2.2", + "@wordpress/compose": "^5.0.7", + "@wordpress/core-data": "^4.0.9", + "@wordpress/data": "^6.1.5", + "@wordpress/date": "^4.2.3", + "@wordpress/deprecated": "^3.2.3", + "@wordpress/dom": "^3.2.7", + "@wordpress/element": "^4.0.4", + "@wordpress/escape-html": "^2.2.3", + "@wordpress/hooks": "^3.2.2", + "@wordpress/html-entities": "^3.2.3", + "@wordpress/i18n": "^4.2.4", + "@wordpress/icons": "^6.1.1", + "@wordpress/is-shallow-equal": "^4.2.1", + "@wordpress/keycodes": "^3.2.4", + "@wordpress/notices": "^3.2.8", + "@wordpress/primitives": "^3.0.4", + "@wordpress/reusable-blocks": "^3.0.22", + "@wordpress/rich-text": "^5.0.8", + "@wordpress/server-side-render": "^3.0.19", + "@wordpress/url": "^3.3.1", + "@wordpress/viewport": "^4.0.7", + "classnames": "^2.3.1", + "colord": "^2.7.0", "fast-average-color": "4.3.0", "lodash": "^4.17.21", "memize": "^1.1.0", - "micromodal": "^0.4.6", - "moment": "^2.22.1", - "react-easy-crop": "^3.0.0", - "tinycolor2": "^1.4.2" + "micromodal": "^0.4.10", + "moment": "^2.22.1" } }, "@wordpress/block-serialization-default-parser": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/block-serialization-default-parser/-/block-serialization-default-parser-4.1.2.tgz", - "integrity": "sha512-jJoXfn6hYYReEl211alNoTFA5Hdgu9LMTkTQJF2g8cGJS5UpDw1lcpJP0hmpfhwzTmUUemy5RXM7noOa2c/RUw==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/@wordpress/block-serialization-default-parser/-/block-serialization-default-parser-4.2.3.tgz", + "integrity": "sha512-VAgRRijd/gZ0ET7lXXEG4/efK5zaBH4RqFV2VJsnuNDQe8CmtmHoCxQC2cUHHhnm9KpubffvVtK+R0mscSmH2Q==", "requires": { - "@babel/runtime": "^7.13.10" + "@babel/runtime": "^7.16.0" } }, "@wordpress/blocks": { - "version": "9.1.8", - "resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-9.1.8.tgz", - "integrity": "sha512-RYemYN+q5/M0k5mESBkQbsB101p9hWSOTSlGLzEPBj7yXJp/OnyQVdc2hAr6CQgX16CxOyRRXx1CYQdiOtXGYg==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/autop": "^3.1.2", - "@wordpress/blob": "^3.1.2", - "@wordpress/block-serialization-default-parser": "^4.1.2", - "@wordpress/compose": "^4.1.6", - "@wordpress/data": "^5.1.6", - "@wordpress/deprecated": "^3.1.2", - "@wordpress/dom": "^3.1.5", - "@wordpress/element": "^3.1.2", - "@wordpress/hooks": "^3.1.1", - "@wordpress/html-entities": "^3.1.2", - "@wordpress/i18n": "^4.1.2", - "@wordpress/icons": "^4.0.3", - "@wordpress/is-shallow-equal": "^4.1.1", - "@wordpress/shortcode": "^3.1.2", + "version": "11.1.5", + "resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-11.1.5.tgz", + "integrity": "sha512-r4xNTQPpUqJ7vqsJqH4D5+GeRQVOLF+9dkeNxkKQnJSFZ5y6POd28d0gMsOcTdGtAzXN6sak104DaKry2SWQNA==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/autop": "^3.2.3", + "@wordpress/blob": "^3.2.2", + "@wordpress/block-serialization-default-parser": "^4.2.3", + "@wordpress/compose": "^5.0.7", + "@wordpress/data": "^6.1.5", + "@wordpress/deprecated": "^3.2.3", + "@wordpress/dom": "^3.2.7", + "@wordpress/element": "^4.0.4", + "@wordpress/hooks": "^3.2.2", + "@wordpress/html-entities": "^3.2.3", + "@wordpress/i18n": "^4.2.4", + "@wordpress/is-shallow-equal": "^4.2.1", + "@wordpress/shortcode": "^3.2.3", + "colord": "^2.7.0", "hpq": "^1.3.0", "lodash": "^4.17.21", "rememo": "^3.0.0", "showdown": "^1.9.1", "simple-html-tokenizer": "^0.5.7", - "tinycolor2": "^1.4.2", "uuid": "^8.3.0" } }, @@ -3493,84 +3882,86 @@ "dev": true }, "@wordpress/components": { - "version": "14.1.11", - "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-14.1.11.tgz", - "integrity": "sha512-umsDXCtH0eqOaAVXq/N3f5QO4u9ovo2F+RMg7c566Q+StOgCVw0jRnKuyKQtBb1CEv4IIYIDWp/pL3cId8Vz2w==", - "requires": { - "@babel/runtime": "^7.13.10", - "@emotion/cache": "^10.0.27", - "@emotion/core": "^10.1.1", - "@emotion/css": "^10.0.22", - "@emotion/styled": "^10.0.23", - "@wordpress/a11y": "^3.1.2", - "@wordpress/compose": "^4.1.6", - "@wordpress/date": "^4.1.2", - "@wordpress/deprecated": "^3.1.2", - "@wordpress/dom": "^3.1.5", - "@wordpress/element": "^3.1.2", - "@wordpress/hooks": "^3.1.1", - "@wordpress/i18n": "^4.1.2", - "@wordpress/icons": "^4.0.3", - "@wordpress/is-shallow-equal": "^4.1.1", - "@wordpress/keycodes": "^3.1.2", - "@wordpress/primitives": "^2.1.2", - "@wordpress/rich-text": "^4.1.6", - "@wordpress/warning": "^2.1.2", - "classnames": "^2.2.5", + "version": "19.2.2", + "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-19.2.2.tgz", + "integrity": "sha512-/bRyC7rteZ+Etieu0SBMpuibYP3lrgzJnCUcHX+L8b5e8AesXL8Ky0Ssz0LQrwZBmWEJuZnkAnP8++16SpVPiw==", + "requires": { + "@babel/runtime": "^7.16.0", + "@emotion/cache": "^11.4.0", + "@emotion/css": "^11.1.3", + "@emotion/react": "^11.4.1", + "@emotion/styled": "^11.3.0", + "@emotion/utils": "1.0.0", + "@wordpress/a11y": "^3.2.4", + "@wordpress/compose": "^5.0.7", + "@wordpress/date": "^4.2.3", + "@wordpress/deprecated": "^3.2.3", + "@wordpress/dom": "^3.2.7", + "@wordpress/element": "^4.0.4", + "@wordpress/hooks": "^3.2.2", + "@wordpress/i18n": "^4.2.4", + "@wordpress/icons": "^6.1.1", + "@wordpress/is-shallow-equal": "^4.2.1", + "@wordpress/keycodes": "^3.2.4", + "@wordpress/primitives": "^3.0.4", + "@wordpress/rich-text": "^5.0.8", + "@wordpress/warning": "^2.2.2", + "classnames": "^2.3.1", + "colord": "^2.7.0", "dom-scroll-into-view": "^1.2.1", "downshift": "^6.0.15", - "emotion": "^10.0.23", + "framer-motion": "^4.1.17", "gradient-parser": "^0.1.5", "highlight-words-core": "^1.2.2", "lodash": "^4.17.21", "memize": "^1.1.0", "moment": "^2.22.1", "re-resizable": "^6.4.0", + "react-colorful": "^5.3.1", "react-dates": "^17.1.1", "react-resize-aware": "^3.1.0", - "react-spring": "^8.0.20", "react-use-gesture": "^9.0.0", - "reakit": "^1.3.5", + "reakit": "^1.3.8", "rememo": "^3.0.0", - "tinycolor2": "^1.4.2", "uuid": "^8.3.0" } }, "@wordpress/compose": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-4.1.6.tgz", - "integrity": "sha512-rzSHBvMMwkR70+qOmSGnZpOEa2fnseGbylR3DEN3IAlscxdAn08Ejyz+bZSQ8GgQ6Uq2OkwvYjHjPUD2llpQ/g==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/deprecated": "^3.1.2", - "@wordpress/dom": "^3.1.5", - "@wordpress/element": "^3.1.2", - "@wordpress/is-shallow-equal": "^4.1.1", - "@wordpress/keycodes": "^3.1.2", - "@wordpress/priority-queue": "^2.1.2", - "clipboard": "^2.0.1", + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-5.0.7.tgz", + "integrity": "sha512-5PJmxW85tlw4lteiXKKycloZ3tNzcKSCYpnZa07XHKHYvq5aoKRrHwh+t3oSnLjjavczVd6Lcd7EQPpD18MSbw==", + "requires": { + "@babel/runtime": "^7.16.0", + "@types/lodash": "^4.14.172", + "@types/mousetrap": "^1.6.8", + "@wordpress/deprecated": "^3.2.3", + "@wordpress/dom": "^3.2.7", + "@wordpress/element": "^4.0.4", + "@wordpress/is-shallow-equal": "^4.2.1", + "@wordpress/keycodes": "^3.2.4", + "@wordpress/priority-queue": "^2.2.3", + "clipboard": "^2.0.8", "lodash": "^4.17.21", - "memize": "^1.1.0", "mousetrap": "^1.6.5", "react-resize-aware": "^3.1.0", "use-memo-one": "^1.1.1" } }, "@wordpress/core-data": { - "version": "3.1.12", - "resolved": "https://registry.npmjs.org/@wordpress/core-data/-/core-data-3.1.12.tgz", - "integrity": "sha512-GUvuWc5SQi0eBKi6gaWDz3Xg8eQyAM4YmYPpWNhWP8oNeAwsLL/RM2kXv6O4ssnGGlS/W3zJtLFTy7yDo0c74Q==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/api-fetch": "^5.1.2", - "@wordpress/blocks": "^9.1.8", - "@wordpress/data": "^5.1.6", - "@wordpress/data-controls": "^2.1.6", - "@wordpress/element": "^3.1.2", - "@wordpress/html-entities": "^3.1.2", - "@wordpress/i18n": "^4.1.2", - "@wordpress/is-shallow-equal": "^4.1.1", - "@wordpress/url": "^3.1.2", + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/@wordpress/core-data/-/core-data-4.0.9.tgz", + "integrity": "sha512-BCHqGWLre2GBClI901ar9+S5T0EmNQ56wdYqPE6aZJlTV3/QWgFoL241NqGvjAJ6ipC9+clpwwndX7JFG3juKw==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/api-fetch": "^5.2.6", + "@wordpress/blocks": "^11.1.5", + "@wordpress/data": "^6.1.5", + "@wordpress/deprecated": "^3.2.3", + "@wordpress/element": "^4.0.4", + "@wordpress/html-entities": "^3.2.3", + "@wordpress/i18n": "^4.2.4", + "@wordpress/is-shallow-equal": "^4.2.1", + "@wordpress/url": "^3.3.1", "equivalent-key-map": "^0.2.2", "lodash": "^4.17.21", "rememo": "^3.0.0", @@ -3578,88 +3969,88 @@ } }, "@wordpress/custom-templated-path-webpack-plugin": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@wordpress/custom-templated-path-webpack-plugin/-/custom-templated-path-webpack-plugin-2.0.5.tgz", - "integrity": "sha512-8tEcTEkr4tB55UFo0oalmpj54jf3sfTNJEqqnu0VpfB3Zk2lh3nRYmo+/vL1ks5uP47k3+iXYiPEFy9rJ4lGLw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@wordpress/custom-templated-path-webpack-plugin/-/custom-templated-path-webpack-plugin-2.1.0.tgz", + "integrity": "sha512-ObO5PVU3NAl+LHc6g1gMdvg0bNNaIjU9jxy7WBkenQVCaO/rIbmFhTUUXZFhZ0k3UNsWsY7ufpFob3IiBtXbrw==", "dev": true, "requires": { "escape-string-regexp": "^1.0.5" } }, "@wordpress/customize-widgets": { - "version": "1.0.20", - "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-1.0.20.tgz", - "integrity": "sha512-2zHmZ3IcnkXMD+n1FPRjZTvfTkxt1onxe4oqfQjpobdYjPTSMl3HKaYuHB1lBaVN7qw4sOk/3WgB9cH1kqWpqg==", - "requires": { - "@babel/runtime": "^7.11.2", - "@wordpress/a11y": "^3.1.2", - "@wordpress/block-editor": "^6.1.14", - "@wordpress/block-library": "^3.2.19", - "@wordpress/blocks": "^9.1.8", - "@wordpress/components": "^14.1.11", - "@wordpress/compose": "^4.1.6", - "@wordpress/core-data": "^3.1.12", - "@wordpress/data": "^5.1.6", - "@wordpress/dom": "^3.1.5", - "@wordpress/element": "^3.1.2", - "@wordpress/hooks": "^3.1.1", - "@wordpress/i18n": "^4.1.2", - "@wordpress/icons": "^4.0.3", - "@wordpress/is-shallow-equal": "^4.1.1", - "@wordpress/keyboard-shortcuts": "^2.1.7", - "@wordpress/keycodes": "^3.1.2", - "@wordpress/media-utils": "^2.1.2", - "@wordpress/widgets": "^1.1.19", - "classnames": "^2.2.6", + "version": "2.0.26", + "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-2.0.26.tgz", + "integrity": "sha512-8BKJ3rasSD+H0utiieSoW6YsirPVdzSgyn3Q23d+iHioCNWkbaiaPiSDONFqHxhC3Lb2tc4cJ4WiGb/ucP7sGA==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/a11y": "^3.2.4", + "@wordpress/block-editor": "^8.0.16", + "@wordpress/block-library": "^6.0.25", + "@wordpress/blocks": "^11.1.5", + "@wordpress/components": "^19.2.2", + "@wordpress/compose": "^5.0.7", + "@wordpress/core-data": "^4.0.9", + "@wordpress/data": "^6.1.5", + "@wordpress/dom": "^3.2.7", + "@wordpress/element": "^4.0.4", + "@wordpress/hooks": "^3.2.2", + "@wordpress/i18n": "^4.2.4", + "@wordpress/icons": "^6.1.1", + "@wordpress/interface": "^4.1.17", + "@wordpress/is-shallow-equal": "^4.2.1", + "@wordpress/keyboard-shortcuts": "^3.0.7", + "@wordpress/keycodes": "^3.2.4", + "@wordpress/media-utils": "^3.0.5", + "@wordpress/widgets": "^2.0.22", + "classnames": "^2.3.1", "lodash": "^4.17.21" } }, "@wordpress/data": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/@wordpress/data/-/data-5.1.6.tgz", - "integrity": "sha512-KKcAcYh6XuRXkQvIQOv1/ci5Tj1kXEE2gwNzujN4SytJZmQTNP2EEE8u9bBnhEPoS7bORzlqeNQuMW0Rz74qgg==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/compose": "^4.1.6", - "@wordpress/deprecated": "^3.1.2", - "@wordpress/element": "^3.1.2", - "@wordpress/is-shallow-equal": "^4.1.1", - "@wordpress/priority-queue": "^2.1.2", - "@wordpress/redux-routine": "^4.1.2", + "version": "6.1.5", + "resolved": "https://registry.npmjs.org/@wordpress/data/-/data-6.1.5.tgz", + "integrity": "sha512-v31NAUpDUqlCma2FYqP45cUrCz5EfMH4m6X50c4lbuAV2ScVsWCRxb5X8mgHjZjDhKcp97fbknviCAD/pFEOng==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/compose": "^5.0.7", + "@wordpress/deprecated": "^3.2.3", + "@wordpress/element": "^4.0.4", + "@wordpress/is-shallow-equal": "^4.2.1", + "@wordpress/priority-queue": "^2.2.3", + "@wordpress/redux-routine": "^4.2.2", "equivalent-key-map": "^0.2.2", "is-promise": "^4.0.0", "lodash": "^4.17.21", "memize": "^1.1.0", - "redux": "^4.1.0", "turbo-combine-reducers": "^1.0.2", "use-memo-one": "^1.1.1" } }, "@wordpress/data-controls": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@wordpress/data-controls/-/data-controls-2.1.6.tgz", - "integrity": "sha512-AON1ZQLGhVQsJQIeW+4D1aB31TBJbDIQUMwnimiMkJ2n0M9V1Q0hvW4P7URC1k2aouNstnF2/TJ4xFPPRINf4Q==", + "version": "2.2.8", + "resolved": "https://registry.npmjs.org/@wordpress/data-controls/-/data-controls-2.2.8.tgz", + "integrity": "sha512-hoaYLeZEmgUBJvHsv5SeGUKx433HfQfJ5sPu/8PiouUK/vr+8rMGM02ydTye6saWAMOHxvOxa08rzIWvWnZg/w==", "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/api-fetch": "^5.1.2", - "@wordpress/data": "^5.1.6", - "@wordpress/deprecated": "^3.1.2" + "@babel/runtime": "^7.16.0", + "@wordpress/api-fetch": "^5.2.6", + "@wordpress/data": "^6.1.5", + "@wordpress/deprecated": "^3.2.3" } }, "@wordpress/date": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/date/-/date-4.1.2.tgz", - "integrity": "sha512-t1cM1eLCQkLJeypcnFQIBJW0+aS8ZUvZLNSxlMH0jVybF9+bjVIbKY+aRkGwP4OMxxrdQkvF2qFj349bn3nz3Q==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/@wordpress/date/-/date-4.2.3.tgz", + "integrity": "sha512-5hZDhFwTtKcbJGZdqvIzoLsW/QgBjUjf4ohgDqRlMBX8Zi6/n11O8LDRPOpmJLVSnIx1fgNSGkzXOzzQmbWuqQ==", "requires": { - "@babel/runtime": "^7.13.10", + "@babel/runtime": "^7.16.0", "moment": "^2.22.1", "moment-timezone": "^0.5.31" } }, "@wordpress/dependency-extraction-webpack-plugin": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/@wordpress/dependency-extraction-webpack-plugin/-/dependency-extraction-webpack-plugin-3.1.4.tgz", - "integrity": "sha512-SoFdhgt75symEJz57QwzDrcZzuSZ9Fxxr1adplSHHYfvRXBm/vDM0x6jeb2pHtVWH0Ltax4Z/yelRgv982nNYA==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@wordpress/dependency-extraction-webpack-plugin/-/dependency-extraction-webpack-plugin-3.2.1.tgz", + "integrity": "sha512-Ltd+1CJb7PMh6iN2Mse+3yN/oMORug5qXSj/3xmuZERzZO2SO6xNEJGml8yK9ev747cbHktEpitK4H+8VO3Ekg==", "dev": true, "requires": { "json2php": "^0.0.4", @@ -3673,9 +4064,9 @@ "dev": true }, "webpack-sources": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.0.tgz", - "integrity": "sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz", + "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==", "dev": true, "requires": { "source-list-map": "^2.0.1", @@ -3685,103 +4076,46 @@ } }, "@wordpress/deprecated": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/deprecated/-/deprecated-3.1.2.tgz", - "integrity": "sha512-kURIhVWssN6lv4YZNMqeFU8ZHk1Dh3SNbHHDs/Ah4Qcql9uHJisF89lLIQBCs063wgkeXfFxdvM/BXD4kfK6fw==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/@wordpress/deprecated/-/deprecated-3.2.3.tgz", + "integrity": "sha512-YoJos/hW216PIlxbtNyb24kPR3TUFTSsfeVT23SxudW4jhmwM12vkl3KY1RDbhD/qi89OE4k+8xsBo5cM3lCSw==", "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/hooks": "^3.1.1" + "@babel/runtime": "^7.16.0", + "@wordpress/hooks": "^3.2.2" } }, "@wordpress/dom": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-3.1.5.tgz", - "integrity": "sha512-EDX1BXtIEHw3LjAunASJO9lnbU2KU1gi4UBrjaa+Cem4u6npmfYHh6XkXO2ryA21yjx7rCWPbD0id6E7qlJ4Tw==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-3.2.7.tgz", + "integrity": "sha512-/e7sFaiwKHWmgqUFsClYw9YI6Wq/eZ1iBsxtGgqX5zrU8KyFJaziNeHDE8tTZLkiURS1vlBQm0mY6bX7Bo4CEA==", "requires": { - "@babel/runtime": "^7.13.10", + "@babel/runtime": "^7.16.0", "lodash": "^4.17.21" } }, "@wordpress/dom-ready": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-3.1.2.tgz", - "integrity": "sha512-g2zmgC/+6JYgWYzUMByRmjRAXs75q57wnNdYUTXmRFrtLs2+PNa1bUuYWZop15rTZbxuvP6ScVnPxZ5tyQLRUw==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-3.2.3.tgz", + "integrity": "sha512-AvHrfYFflycWRX8CIU7UGty05aXrKvILwrNT2YRXmOmgh+POud98QQU54hitwL2cyVkWUt8dvCNRK4nnjBqqJQ==", "requires": { - "@babel/runtime": "^7.13.10" + "@babel/runtime": "^7.16.0" } }, "@wordpress/e2e-test-utils": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-5.4.3.tgz", - "integrity": "sha512-DDLIO/QZipMLpqfiYB570nVtxOGlC9ByZkyd/+dqjwViBc7ST9pWMQzQPahlGjkArU2EMB96fvPumPnjrReZOA==", + "version": "5.4.10", + "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-5.4.10.tgz", + "integrity": "sha512-JRp1f7uQ9INpN3t0x4X07P3uBMwaitou9lvYWpDwVsHRcDn21NyFpVYbsX/T63ADIpvcqIhql58RnkVJRUWYxg==", "dev": true, "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/api-fetch": "^5.2.2", - "@wordpress/keycodes": "^3.2.2", - "@wordpress/url": "^3.2.2", + "@babel/runtime": "^7.16.0", + "@wordpress/api-fetch": "^5.2.6", + "@wordpress/keycodes": "^3.2.4", + "@wordpress/url": "^3.3.1", "form-data": "^4.0.0", "lodash": "^4.17.21", "node-fetch": "^2.6.0" }, "dependencies": { - "@wordpress/api-fetch": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-5.2.2.tgz", - "integrity": "sha512-WwJHOe6qiI4Oa1BSSo+Fpietdtm/0UgaN5A9k/TlEkARqIE+Fh56sfbC3JbjJDfQxz9TsAxMm+WWO5aNapantQ==", - "dev": true, - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/i18n": "^4.2.2", - "@wordpress/url": "^3.2.2" - } - }, - "@wordpress/hooks": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-3.2.0.tgz", - "integrity": "sha512-nVR6V9kPxl8+aYQzQJdoDt+aKBKHHD0zplcYZbu2MHxjmHMvppAeL9mjzVhQZj/3n10NR2Ftk94mHQzHWfhCCg==", - "dev": true, - "requires": { - "@babel/runtime": "^7.13.10" - } - }, - "@wordpress/i18n": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.2.2.tgz", - "integrity": "sha512-6PrfTDpeW5dfWyuqUx4Z5ApKFbh45CAbCs/G3PuZLlKJlXs/8p2Oq6Zxs0gLZk1QfHkw0t5qMx61lDlxWQhuPw==", - "dev": true, - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/hooks": "^3.2.0", - "gettext-parser": "^1.3.1", - "lodash": "^4.17.21", - "memize": "^1.1.0", - "sprintf-js": "^1.1.1", - "tannin": "^1.2.0" - } - }, - "@wordpress/keycodes": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-3.2.2.tgz", - "integrity": "sha512-z4B4vby+iGciJ9gvUBIozsseDkdQXDNuWm5szMnG5g1Nn7UGDWmfCNc9IHNs3alXySmAFev6d0T/o/zgm9BBvQ==", - "dev": true, - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/i18n": "^4.2.2", - "lodash": "^4.17.21" - } - }, - "@wordpress/url": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@wordpress/url/-/url-3.2.2.tgz", - "integrity": "sha512-TYWE7V9F8nj0ZkCJy1eFD0crdDTS7iB3cVNW2yIDOn1RTWJJtzINXQFMASokVsjuh+NetAIOu8ru2mIfoRMG8Q==", - "dev": true, - "requires": { - "@babel/runtime": "^7.13.10", - "lodash": "^4.17.21", - "react-native-url-polyfill": "^1.1.2" - } - }, "form-data": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", @@ -3796,38 +4130,37 @@ } }, "@wordpress/edit-post": { - "version": "4.1.21", - "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-4.1.21.tgz", - "integrity": "sha512-tthVG2vA/cEkM5Ksb+AWlfYdRQRh3TE45C0NPMTjRTQaETJjZGZp1VCVl6f+EBMIiW90mzgOfP6t0bvDHBtcFg==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/a11y": "^3.1.2", - "@wordpress/api-fetch": "^5.1.2", - "@wordpress/block-editor": "^6.1.14", - "@wordpress/block-library": "^3.2.19", - "@wordpress/blocks": "^9.1.8", - "@wordpress/components": "^14.1.11", - "@wordpress/compose": "^4.1.6", - "@wordpress/core-data": "^3.1.12", - "@wordpress/data": "^5.1.6", - "@wordpress/data-controls": "^2.1.6", - "@wordpress/editor": "^10.1.17", - "@wordpress/element": "^3.1.2", - "@wordpress/hooks": "^3.1.1", - "@wordpress/i18n": "^4.1.2", - "@wordpress/icons": "^4.0.3", - "@wordpress/interface": "^3.1.12", - "@wordpress/keyboard-shortcuts": "^2.1.7", - "@wordpress/keycodes": "^3.1.2", - "@wordpress/media-utils": "^2.1.2", - "@wordpress/notices": "^3.1.6", - "@wordpress/plugins": "^3.1.6", - "@wordpress/primitives": "^2.1.2", - "@wordpress/url": "^3.1.2", - "@wordpress/viewport": "^3.1.6", - "@wordpress/warning": "^2.1.2", - "classnames": "^2.2.5", - "framer-motion": "^4.1.3", + "version": "5.0.26", + "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.26.tgz", + "integrity": "sha512-KCws7pLvjxaOnPjMtEgmxEt3+bZt2qu1GdtP3LaPpQVBuvYVZUtHf3KLZcwlBJscBony/4XZBdvmGSvlUX050Q==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/a11y": "^3.2.4", + "@wordpress/api-fetch": "^5.2.6", + "@wordpress/block-editor": "^8.0.16", + "@wordpress/block-library": "^6.0.25", + "@wordpress/blocks": "^11.1.5", + "@wordpress/components": "^19.2.2", + "@wordpress/compose": "^5.0.7", + "@wordpress/core-data": "^4.0.9", + "@wordpress/data": "^6.1.5", + "@wordpress/data-controls": "^2.2.8", + "@wordpress/editor": "^12.0.20", + "@wordpress/element": "^4.0.4", + "@wordpress/hooks": "^3.2.2", + "@wordpress/i18n": "^4.2.4", + "@wordpress/icons": "^6.1.1", + "@wordpress/interface": "^4.1.17", + "@wordpress/keyboard-shortcuts": "^3.0.7", + "@wordpress/keycodes": "^3.2.4", + "@wordpress/media-utils": "^3.0.5", + "@wordpress/notices": "^3.2.8", + "@wordpress/plugins": "^4.0.7", + "@wordpress/primitives": "^3.0.4", + "@wordpress/url": "^3.3.1", + "@wordpress/viewport": "^4.0.7", + "@wordpress/warning": "^2.2.2", + "classnames": "^2.3.1", "lodash": "^4.17.21", "memize": "^1.1.0", "rememo": "^3.0.0", @@ -3841,77 +4174,118 @@ } } }, + "@wordpress/edit-site": { + "version": "3.0.26", + "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-3.0.26.tgz", + "integrity": "sha512-KqpImFUS3cBT9gOcJENCm1j7vPpmQ+0k/zybZk+sYIWIR6hCcWo1HuKIJCfYTcBuQZG45r8ggtDeebrthjaT8Q==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/a11y": "^3.2.4", + "@wordpress/api-fetch": "^5.2.6", + "@wordpress/block-editor": "^8.0.16", + "@wordpress/block-library": "^6.0.25", + "@wordpress/blocks": "^11.1.5", + "@wordpress/components": "^19.2.2", + "@wordpress/compose": "^5.0.7", + "@wordpress/core-data": "^4.0.9", + "@wordpress/data": "^6.1.5", + "@wordpress/data-controls": "^2.2.8", + "@wordpress/editor": "^12.0.20", + "@wordpress/element": "^4.0.4", + "@wordpress/hooks": "^3.2.2", + "@wordpress/html-entities": "^3.2.3", + "@wordpress/i18n": "^4.2.4", + "@wordpress/icons": "^6.1.1", + "@wordpress/interface": "^4.1.17", + "@wordpress/keyboard-shortcuts": "^3.0.7", + "@wordpress/keycodes": "^3.2.4", + "@wordpress/media-utils": "^3.0.5", + "@wordpress/notices": "^3.2.8", + "@wordpress/plugins": "^4.0.7", + "@wordpress/primitives": "^3.0.4", + "@wordpress/reusable-blocks": "^3.0.22", + "@wordpress/url": "^3.3.1", + "@wordpress/viewport": "^4.0.7", + "classnames": "^2.3.1", + "downloadjs": "^1.4.7", + "file-saver": "^2.0.2", + "history": "^5.1.0", + "jszip": "^3.2.2", + "lodash": "^4.17.21", + "rememo": "^3.0.0" + } + }, "@wordpress/edit-widgets": { - "version": "2.1.21", - "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-2.1.21.tgz", - "integrity": "sha512-dkINHh3yPJnCtqXfcKX0+Wf85ztGJLEnt35pUdcif6fkxDvBciYX6maezo+m+r6TgI0J9wUO2t9+G6kX6bda0Q==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/a11y": "^3.1.2", - "@wordpress/api-fetch": "^5.1.2", - "@wordpress/block-editor": "^6.1.14", - "@wordpress/block-library": "^3.2.19", - "@wordpress/blocks": "^9.1.8", - "@wordpress/components": "^14.1.11", - "@wordpress/compose": "^4.1.6", - "@wordpress/core-data": "^3.1.12", - "@wordpress/data": "^5.1.6", - "@wordpress/data-controls": "^2.1.6", - "@wordpress/dom": "^3.1.5", - "@wordpress/element": "^3.1.2", - "@wordpress/hooks": "^3.1.1", - "@wordpress/i18n": "^4.1.2", - "@wordpress/icons": "^4.0.3", - "@wordpress/interface": "^3.1.12", - "@wordpress/keyboard-shortcuts": "^2.1.7", - "@wordpress/keycodes": "^3.1.2", - "@wordpress/media-utils": "^2.1.2", - "@wordpress/notices": "^3.1.6", - "@wordpress/plugins": "^3.1.6", - "@wordpress/reusable-blocks": "^2.1.17", - "@wordpress/server-side-render": "^2.1.12", - "@wordpress/url": "^3.1.2", - "@wordpress/widgets": "^1.1.19", - "classnames": "^2.2.5", + "version": "3.1.21", + "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-3.1.21.tgz", + "integrity": "sha512-5jQ6XMmMgKP8dbp0ts29OHOFg0b2f+2hwvSij2lWH1dPogQ29oDfDdFkUu+3+8n2hJU7K2ShGq/xhMhT0+fTkw==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/a11y": "^3.2.4", + "@wordpress/api-fetch": "^5.2.6", + "@wordpress/block-editor": "^8.0.16", + "@wordpress/block-library": "^6.0.25", + "@wordpress/blocks": "^11.1.5", + "@wordpress/components": "^19.2.2", + "@wordpress/compose": "^5.0.7", + "@wordpress/core-data": "^4.0.9", + "@wordpress/data": "^6.1.5", + "@wordpress/dom": "^3.2.7", + "@wordpress/element": "^4.0.4", + "@wordpress/hooks": "^3.2.2", + "@wordpress/i18n": "^4.2.4", + "@wordpress/icons": "^6.1.1", + "@wordpress/interface": "^4.1.17", + "@wordpress/keyboard-shortcuts": "^3.0.7", + "@wordpress/keycodes": "^3.2.4", + "@wordpress/media-utils": "^3.0.5", + "@wordpress/notices": "^3.2.8", + "@wordpress/plugins": "^4.0.7", + "@wordpress/reusable-blocks": "^3.0.22", + "@wordpress/server-side-render": "^3.0.19", + "@wordpress/url": "^3.3.1", + "@wordpress/widgets": "^2.0.22", + "classnames": "^2.3.1", "lodash": "^4.17.21", "rememo": "^3.0.0", "uuid": "^8.3.0" } }, "@wordpress/editor": { - "version": "10.1.17", - "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-10.1.17.tgz", - "integrity": "sha512-ALvuojonwMEjWN1tbQR+mZF3ggR/fdkvOKe4esxRL3U10eTfcsSw6qA2QzB8zHrjb1cZd/90gZWixAdE398f+w==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/api-fetch": "^5.1.2", - "@wordpress/autop": "^3.1.2", - "@wordpress/blob": "^3.1.2", - "@wordpress/block-editor": "^6.1.14", - "@wordpress/blocks": "^9.1.8", - "@wordpress/components": "^14.1.11", - "@wordpress/compose": "^4.1.6", - "@wordpress/core-data": "^3.1.12", - "@wordpress/data": "^5.1.6", - "@wordpress/data-controls": "^2.1.6", - "@wordpress/date": "^4.1.2", - "@wordpress/deprecated": "^3.1.2", - "@wordpress/element": "^3.1.2", - "@wordpress/hooks": "^3.1.1", - "@wordpress/html-entities": "^3.1.2", - "@wordpress/i18n": "^4.1.2", - "@wordpress/icons": "^4.0.3", - "@wordpress/is-shallow-equal": "^4.1.1", - "@wordpress/keyboard-shortcuts": "^2.1.7", - "@wordpress/keycodes": "^3.1.2", - "@wordpress/media-utils": "^2.1.2", - "@wordpress/notices": "^3.1.6", - "@wordpress/reusable-blocks": "^2.1.17", - "@wordpress/rich-text": "^4.1.6", - "@wordpress/server-side-render": "^2.1.12", - "@wordpress/url": "^3.1.2", - "@wordpress/wordcount": "^3.1.2", - "classnames": "^2.2.5", + "version": "12.0.20", + "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-12.0.20.tgz", + "integrity": "sha512-+b1WiBKv2ZTcPcJTbxsvLYjAe8pG2aZvFoW4rt7jqXvyV4sf1cgJeVSeGEuydNuGPIuMGo1jLWsQiU+otEjGLA==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/a11y": "^3.2.4", + "@wordpress/api-fetch": "^5.2.6", + "@wordpress/autop": "^3.2.3", + "@wordpress/blob": "^3.2.2", + "@wordpress/block-editor": "^8.0.16", + "@wordpress/blocks": "^11.1.5", + "@wordpress/components": "^19.2.2", + "@wordpress/compose": "^5.0.7", + "@wordpress/core-data": "^4.0.9", + "@wordpress/data": "^6.1.5", + "@wordpress/data-controls": "^2.2.8", + "@wordpress/date": "^4.2.3", + "@wordpress/deprecated": "^3.2.3", + "@wordpress/element": "^4.0.4", + "@wordpress/hooks": "^3.2.2", + "@wordpress/html-entities": "^3.2.3", + "@wordpress/i18n": "^4.2.4", + "@wordpress/icons": "^6.1.1", + "@wordpress/is-shallow-equal": "^4.2.1", + "@wordpress/keyboard-shortcuts": "^3.0.7", + "@wordpress/keycodes": "^3.2.4", + "@wordpress/media-utils": "^3.0.5", + "@wordpress/notices": "^3.2.8", + "@wordpress/reusable-blocks": "^3.0.22", + "@wordpress/rich-text": "^5.0.8", + "@wordpress/server-side-render": "^3.0.19", + "@wordpress/url": "^3.3.1", + "@wordpress/wordcount": "^3.2.3", + "classnames": "^2.3.1", "lodash": "^4.17.21", "memize": "^1.1.0", "react-autosize-textarea": "^7.1.0", @@ -3919,42 +4293,42 @@ } }, "@wordpress/element": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-3.1.2.tgz", - "integrity": "sha512-6ZDhwXkkohcocZSXp+IE4Xn774+PNHJTNsEOLJRAeDo/clIvly5HoczX03z1GLgvEB3VYik8qHaqrouNIcjZvA==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-4.0.4.tgz", + "integrity": "sha512-GbYVSZrHitOmupQCjb7cSlewVigXHorpZUBpvWnkU3rhyh1tF/N9qve3fgg7Q3s2szjtTP+eEutB+4mmkwHQOA==", "requires": { - "@babel/runtime": "^7.13.10", + "@babel/runtime": "^7.16.0", "@types/react": "^16.9.0", "@types/react-dom": "^16.9.0", - "@wordpress/escape-html": "^2.1.2", + "@wordpress/escape-html": "^2.2.3", "lodash": "^4.17.21", - "react": "^16.13.1", - "react-dom": "^16.13.1" + "react": "^17.0.1", + "react-dom": "^17.0.1" } }, "@wordpress/escape-html": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-2.1.2.tgz", - "integrity": "sha512-nEKvwzjMkuyV5MBnD5Um/McydurQ65mLjV1NG8bVlljZlP6/263qdZ5otH2uwr6cf2Lz1meupmi9sV3ef4TalQ==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-2.2.3.tgz", + "integrity": "sha512-nYIwT8WzHfAzjjwHLiwDQWrzn4/gUNr5zud465XQszM2cAItN2wnC26/ovSpPomDGkvjcG0YltgnSqc1T62olA==", "requires": { - "@babel/runtime": "^7.13.10" + "@babel/runtime": "^7.16.0" } }, "@wordpress/eslint-plugin": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-9.1.1.tgz", - "integrity": "sha512-GduOwoTTHh132RHTfLU82ujOmzuLpkA9izq+gzKtzhoDGzcpORXIht7tnbB8fzima4PYIiePz2LmuMCSuP18RA==", + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-9.3.0.tgz", + "integrity": "sha512-9F7B60gHAjiTIi9vBw5ZoH0MZW3UnmbuKols4kWpJVdgsvG4X1Wj6XXTLmQKrzh/Em7mD1CCIbCSyWknEzIOLw==", "dev": true, "requires": { - "@typescript-eslint/eslint-plugin": "^4.15.0", - "@typescript-eslint/parser": "^4.15.0", - "@wordpress/prettier-config": "^1.1.0", - "babel-eslint": "^10.1.0", + "@babel/eslint-parser": "^7.16.0", + "@typescript-eslint/eslint-plugin": "^4.31.0", + "@typescript-eslint/parser": "^4.31.0", + "@wordpress/prettier-config": "^1.1.1", "cosmiconfig": "^7.0.0", "eslint-config-prettier": "^7.1.0", - "eslint-plugin-import": "^2.23.4", + "eslint-plugin-import": "^2.25.2", "eslint-plugin-jest": "^24.1.3", - "eslint-plugin-jsdoc": "^34.1.0", + "eslint-plugin-jsdoc": "^36.0.8", "eslint-plugin-jsx-a11y": "^6.4.1", "eslint-plugin-prettier": "^3.3.0", "eslint-plugin-react": "^7.22.0", @@ -3995,50 +4369,50 @@ } }, "@wordpress/format-library": { - "version": "2.1.14", - "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-2.1.14.tgz", - "integrity": "sha512-INmmTyJX0FDBkG8PTJqvIBi+yTfYHpdpkWqP/JswG7kslrG++elm4jyrA2EsV1anZyxDfsSrP3aSCy+arYkTgA==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/a11y": "^3.1.2", - "@wordpress/block-editor": "^6.1.14", - "@wordpress/components": "^14.1.11", - "@wordpress/compose": "^4.1.6", - "@wordpress/data": "^5.1.6", - "@wordpress/dom": "^3.1.5", - "@wordpress/element": "^3.1.2", - "@wordpress/html-entities": "^3.1.2", - "@wordpress/i18n": "^4.1.2", - "@wordpress/icons": "^4.0.3", - "@wordpress/keycodes": "^3.1.2", - "@wordpress/rich-text": "^4.1.6", - "@wordpress/url": "^3.1.2", + "version": "3.0.22", + "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-3.0.22.tgz", + "integrity": "sha512-lVVPW7w78Ip/6wOf+yXOmLnusnZ7pXioqKRoxeJCVnwq/xKb9O5vmiB2Izc7lZjPYxyKnC2LK+qEaZEctJwN/A==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/a11y": "^3.2.4", + "@wordpress/block-editor": "^8.0.16", + "@wordpress/components": "^19.2.2", + "@wordpress/compose": "^5.0.7", + "@wordpress/data": "^6.1.5", + "@wordpress/dom": "^3.2.7", + "@wordpress/element": "^4.0.4", + "@wordpress/html-entities": "^3.2.3", + "@wordpress/i18n": "^4.2.4", + "@wordpress/icons": "^6.1.1", + "@wordpress/keycodes": "^3.2.4", + "@wordpress/rich-text": "^5.0.8", + "@wordpress/url": "^3.3.1", "lodash": "^4.17.21" } }, "@wordpress/hooks": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-3.1.1.tgz", - "integrity": "sha512-9f6H9WBwu6x/MM4ZCVLGGBuMiBcyaLapmAku5IwcWaeB2PtPduwjmk2NfGx35TuhBQD554DUg8WtTjIS019UAg==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-3.2.2.tgz", + "integrity": "sha512-MlFWyu2ttJhmzDFBVWPRwZwIMqQdHFZTjFWFWm50NlzUzIJ3gEtNA95mHNtav1Fone24N+I2YkaYMNb6PEPTyA==", "requires": { - "@babel/runtime": "^7.13.10" + "@babel/runtime": "^7.16.0" } }, "@wordpress/html-entities": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-3.1.2.tgz", - "integrity": "sha512-pPbEBxUTZm9YA/ynq50UEGmefaqFIW4g07KrxDQfa+xm0jb3kFZOtxFqdX7gXNofNCn/f5v4jlpFGmmYYpJMaw==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-3.2.3.tgz", + "integrity": "sha512-406VUz8CuKgKGrW/wjRB877soSqGhGDwK4sSuNoIC1FvpfniZ0ijpqfsdhJOOynWdz+RYN1wAsfogBpzuREJOg==", "requires": { - "@babel/runtime": "^7.13.10" + "@babel/runtime": "^7.16.0" } }, "@wordpress/i18n": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.1.2.tgz", - "integrity": "sha512-Bp0BnGoN2XQyhFjACh74f3fDIQx/AnBIyZsDIhSlNYedFjuJ9b4M246/YTmCDlRHyCqLyG/OuS0hEZKksKAoRQ==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.2.4.tgz", + "integrity": "sha512-36PnV7wTaLKCb+JZoapR3AtfrLTluhO5bIR6cUTG+QBBJ+g3gjRAdNFihnV8kz66FANu8PqDMI0T1jow/mrbYw==", "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/hooks": "^3.1.1", + "@babel/runtime": "^7.16.0", + "@wordpress/hooks": "^3.2.2", "gettext-parser": "^1.3.1", "lodash": "^4.17.21", "memize": "^1.1.0", @@ -4047,94 +4421,95 @@ } }, "@wordpress/icons": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-4.0.3.tgz", - "integrity": "sha512-I68iAysutXkYP6JrvnPlha/DKtNhtI1u88PuroZC/RgG+R0WwmxphB/bPoj92BCYDjgrMI8P625Ivttuh1spFA==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-6.1.1.tgz", + "integrity": "sha512-UaFAOF8hqlEhjTm5kba0JwSDDeEgPSJToDJNADoz8jkxt22kEG5ACi9IaS0BRIy1X7kR6QaCE394v9+GkToE+g==", "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/element": "^3.1.2", - "@wordpress/primitives": "^2.1.2" + "@babel/runtime": "^7.16.0", + "@wordpress/element": "^4.0.4", + "@wordpress/primitives": "^3.0.4" } }, "@wordpress/interface": { - "version": "3.1.12", - "resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-3.1.12.tgz", - "integrity": "sha512-t7ksL3IIlWB47+r8UJ9CyAZZVlEVbA7lN9aqA5Ly6+QPIPwtvATDDM1agiUjGPwGLAsFSoZyda9MDjfVNDvXmw==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/components": "^14.1.11", - "@wordpress/compose": "^4.1.6", - "@wordpress/data": "^5.1.6", - "@wordpress/deprecated": "^3.1.2", - "@wordpress/element": "^3.1.2", - "@wordpress/i18n": "^4.1.2", - "@wordpress/icons": "^4.0.3", - "@wordpress/plugins": "^3.1.6", - "@wordpress/viewport": "^3.1.6", - "classnames": "^2.2.5", + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-4.1.17.tgz", + "integrity": "sha512-n+oE/DBTxAHHuWd78bZgFn8FXpmCyfgM+ndJzPnfgdM1KENdEE9qrcVaeqzDpf/zdpYK92OsX35x202nbbMZYQ==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/a11y": "^3.2.4", + "@wordpress/components": "^19.2.2", + "@wordpress/compose": "^5.0.7", + "@wordpress/data": "^6.1.5", + "@wordpress/deprecated": "^3.2.3", + "@wordpress/element": "^4.0.4", + "@wordpress/i18n": "^4.2.4", + "@wordpress/icons": "^6.1.1", + "@wordpress/plugins": "^4.0.7", + "@wordpress/viewport": "^4.0.7", + "classnames": "^2.3.1", "lodash": "^4.17.21" } }, "@wordpress/is-shallow-equal": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.1.1.tgz", - "integrity": "sha512-Bc782s4Kte98RKLtuDXOaUBpyJWUgN4XZJevEoFasKQTpABZUDF+Y2C0/dhnlJeYF5TDEd8TQgFfpF5csxEUNw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.2.1.tgz", + "integrity": "sha512-XczqD3S6euQcSlLY+RFmmQIOwI/X/R/Q1uXS7vPVOnhz6MH63nrmGOtq4vTTzWv+qyRMPSkq0nmuX31U7DNdRA==", "requires": { - "@babel/runtime": "^7.13.10" + "@babel/runtime": "^7.16.0" } }, "@wordpress/jest-console": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@wordpress/jest-console/-/jest-console-4.1.0.tgz", - "integrity": "sha512-MAbEfYUH+odlYYtPNKoKnWzSZKZjSc2r2kvFJ7FR920ZdteEgSAPIOvjyv4r4UbJy3ZuKemnXHuVtcTAKca5Tw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@wordpress/jest-console/-/jest-console-4.1.1.tgz", + "integrity": "sha512-f/DwduxU6k53tULurpCox4TKzp877+IWTHRUxE91+FOXS+2OsnhUPKfMiMEex4nu81a54EArwekPVKxaq4swbA==", "dev": true, "requires": { - "@babel/runtime": "^7.13.10", + "@babel/runtime": "^7.16.0", "jest-matcher-utils": "^26.6.2", "lodash": "^4.17.21" } }, "@wordpress/jest-preset-default": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@wordpress/jest-preset-default/-/jest-preset-default-7.1.0.tgz", - "integrity": "sha512-N6OwVfvNodRTgIkmBor6YOGx3FbLdvPp9ZTGHJ1uw1u+HUuPwVWN9nhcGTnuP8Ht2RWyN5VpN2Peo5+dz5gp0w==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/@wordpress/jest-preset-default/-/jest-preset-default-7.1.3.tgz", + "integrity": "sha512-rz9V/YRr3TjLdZJQu7DAZHo848PpZ4N5ThtP4Lujy1O/UtcvtKF0r34SZTNDlFQO/G1USZQX/WL6HRhgl57iHA==", "dev": true, "requires": { "@wojtekmaj/enzyme-adapter-react-17": "^0.6.1", - "@wordpress/jest-console": "^4.1.0", + "@wordpress/jest-console": "^4.1.1", "babel-jest": "^26.6.3", "enzyme": "^3.11.0", "enzyme-to-json": "^3.4.4" } }, "@wordpress/keyboard-shortcuts": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/@wordpress/keyboard-shortcuts/-/keyboard-shortcuts-2.1.7.tgz", - "integrity": "sha512-V04mCe0Uwxhe2qIkfJ4h5//KsngZA25G/3kI0Ab6vL2N8OrQZQojZ4fnCK3x/P7mvdjXKQn78+vjnp3KiMvRqg==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/compose": "^4.1.6", - "@wordpress/data": "^5.1.6", - "@wordpress/element": "^3.1.2", - "@wordpress/keycodes": "^3.1.2", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@wordpress/keyboard-shortcuts/-/keyboard-shortcuts-3.0.7.tgz", + "integrity": "sha512-qBlM4Wa1ntzX7MQM7oifOKnHgH+sWGdynmut4rCuCUqfGqqB6hwBE3nkg3sMMWYKTxA8AtE8wcxPr9bQffnx1w==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/compose": "^5.0.7", + "@wordpress/data": "^6.1.5", + "@wordpress/element": "^4.0.4", + "@wordpress/keycodes": "^3.2.4", "lodash": "^4.17.21", "rememo": "^3.0.0" } }, "@wordpress/keycodes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-3.1.2.tgz", - "integrity": "sha512-8N0JiHquULMezdWEAu/MjaW5cQ4EN8z61HkA4/sIIB8JPd2TvNEkE1SeEotzpPICcBitEoQzclQ3uOUPld0WAg==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-3.2.4.tgz", + "integrity": "sha512-o6/WFO8Amoyk3r3JtCJ1ctt0bLfvCqyfV7SdA39QDtAe8ufIkDNRwyQOjzaVMbHznNCuBL1FhClPzGy+RH0o9w==", "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/i18n": "^4.1.2", + "@babel/runtime": "^7.16.0", + "@wordpress/i18n": "^4.2.4", "lodash": "^4.17.21" } }, "@wordpress/library-export-default-webpack-plugin": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@wordpress/library-export-default-webpack-plugin/-/library-export-default-webpack-plugin-2.0.5.tgz", - "integrity": "sha512-qqyna9btIqoQ3XhdvG3+0rEibgpt2EKCwwyZ7o6IN1TeyiR9ymgHSVwE2yOK9wKcAVyBayFCpN1Sy4MEzpwhog==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@wordpress/library-export-default-webpack-plugin/-/library-export-default-webpack-plugin-2.2.0.tgz", + "integrity": "sha512-FW3lmSlqmQv5u2A4vT9BqYwFmBaUuseH1X0bpajTY1sGNzguoh4hmw5Jvjq208+zut7F3rX5tEAJFcaI3fMycA==", "dev": true, "requires": { "lodash": "^4.17.21", @@ -4148,9 +4523,9 @@ "dev": true }, "webpack-sources": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.0.tgz", - "integrity": "sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz", + "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==", "dev": true, "requires": { "source-list-map": "^2.0.1", @@ -4160,40 +4535,40 @@ } }, "@wordpress/list-reusable-blocks": { - "version": "2.1.11", - "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-2.1.11.tgz", - "integrity": "sha512-/y9YbYKL0E0jGs0QJHzdAK3OHrpWec9/dt2oy/RkB6+r+SjHUMBbCyxtL67SPhqZAliXDO10tJSih0OFK0gULw==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/api-fetch": "^5.1.2", - "@wordpress/components": "^14.1.11", - "@wordpress/compose": "^4.1.6", - "@wordpress/element": "^3.1.2", - "@wordpress/i18n": "^4.1.2", + "version": "3.0.19", + "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-3.0.19.tgz", + "integrity": "sha512-MUg+nZqlh9MVS38rPqEk3QWO/qsKOrecAGQgvn3uKBy1lcFE9NkUmcON227IAjRI/UQ3dzxFIiJMaMyraJ0r1w==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/api-fetch": "^5.2.6", + "@wordpress/components": "^19.2.2", + "@wordpress/compose": "^5.0.7", + "@wordpress/element": "^4.0.4", + "@wordpress/i18n": "^4.2.4", "lodash": "^4.17.21" } }, "@wordpress/media-utils": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/media-utils/-/media-utils-2.1.2.tgz", - "integrity": "sha512-LhZ52JdLz4Lwr1H1YB90pAHTlAowv9R2HwQXjjmKmkSfGwCOhd6xigSRnDVKEjJxT4sUsVVCJdnb4Og/SVk0Nw==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/api-fetch": "^5.1.2", - "@wordpress/blob": "^3.1.2", - "@wordpress/element": "^3.1.2", - "@wordpress/i18n": "^4.1.2", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@wordpress/media-utils/-/media-utils-3.0.5.tgz", + "integrity": "sha512-BshnzzBECsH8JuxU/qgJkRCBoPNPQ/z9PeWzTFMY3hPYtbd23hMtZpPqc9EGkjU+Ovs1AF8qEjNr9wPOCDq3nA==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/api-fetch": "^5.2.6", + "@wordpress/blob": "^3.2.2", + "@wordpress/element": "^4.0.4", + "@wordpress/i18n": "^4.2.4", "lodash": "^4.17.21" } }, "@wordpress/notices": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/@wordpress/notices/-/notices-3.1.6.tgz", - "integrity": "sha512-I+xDHCY7n5I/mBeZvlker7BoMtRFgaHBe/XySGJv2V2D3ZxgpAGXeVv13v+ohSvhaEjFhll+RgszpZOW/8SMLA==", + "version": "3.2.8", + "resolved": "https://registry.npmjs.org/@wordpress/notices/-/notices-3.2.8.tgz", + "integrity": "sha512-SC7O+L81Xf50ntHSfUGpvnb1FutSV4RZxZQyEDdiRe4Ril1dnm4ddU49AXunPHsQ68VYNUBxs8P30EplXtZp5g==", "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/a11y": "^3.1.2", - "@wordpress/data": "^5.1.6", + "@babel/runtime": "^7.16.0", + "@wordpress/a11y": "^3.2.4", + "@wordpress/data": "^6.1.5", "lodash": "^4.17.21" } }, @@ -4204,762 +4579,1134 @@ "dev": true }, "@wordpress/nux": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-4.1.11.tgz", - "integrity": "sha512-GRuQW4guMp12NjdUQPpQHJ+YoLt9lzigWO5za5sPXtWzgpYjzzTGIvBrC8hU5s5dXAlvHzZ0yk6swCEBXGqVDw==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/components": "^14.1.11", - "@wordpress/compose": "^4.1.6", - "@wordpress/data": "^5.1.6", - "@wordpress/deprecated": "^3.1.2", - "@wordpress/element": "^3.1.2", - "@wordpress/i18n": "^4.1.2", - "@wordpress/icons": "^4.0.3", + "version": "5.0.19", + "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-5.0.19.tgz", + "integrity": "sha512-V4FuGan6rTtDc8TXybhfCpfHd839ADWUy0rZWMikQBsFhMLDeUqmbtHouI+nPqPpWYwSNVPzHYSBcveO9vUE8g==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/components": "^19.2.2", + "@wordpress/compose": "^5.0.7", + "@wordpress/data": "^6.1.5", + "@wordpress/deprecated": "^3.2.3", + "@wordpress/element": "^4.0.4", + "@wordpress/i18n": "^4.2.4", + "@wordpress/icons": "^6.1.1", "lodash": "^4.17.21", "rememo": "^3.0.0" } }, "@wordpress/plugins": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/@wordpress/plugins/-/plugins-3.1.6.tgz", - "integrity": "sha512-I2ZE6M/IzkLDDy0YOWLqMebutuubeYCk5Y3QkSRVmQYiuTP0o6q2vO8iJjfL87L8wxB3BgkZwNxusFB1not+lw==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/compose": "^4.1.6", - "@wordpress/element": "^3.1.2", - "@wordpress/hooks": "^3.1.1", - "@wordpress/icons": "^4.0.3", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/@wordpress/plugins/-/plugins-4.0.7.tgz", + "integrity": "sha512-dSvSOTkGuoJ7kfst/eLJpHNHf12If+UYsB5WuGXy5sk3z5H9EIOe6XC5272ZVrS/5DUGloCxZP7k7m2vG5iXuQ==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/compose": "^5.0.7", + "@wordpress/element": "^4.0.4", + "@wordpress/hooks": "^3.2.2", + "@wordpress/icons": "^6.1.1", "lodash": "^4.17.21", "memize": "^1.1.0" } }, "@wordpress/postcss-plugins-preset": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-3.2.0.tgz", - "integrity": "sha512-vYzlqr92pq9cIdN6eO5/h1hyDjEIUUvRlm3Tgd822dPPr6EpkM8uJ82quObE1pPt4JfmXYhTj+gMgOUzRNLHJg==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-3.2.5.tgz", + "integrity": "sha512-R+UKnjSJivvVEZ8rhGrXxsj/BlVeNO2FRXq3IxEOPv5ZRfAS0g8k8EO3xsCIV1RfnozvAApkKEYRClDYXIt+vA==", "dev": true, "requires": { - "@wordpress/base-styles": "^3.6.0", + "@wordpress/base-styles": "^4.0.4", "autoprefixer": "^10.2.5" }, "dependencies": { "autoprefixer": { - "version": "10.3.3", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.3.tgz", - "integrity": "sha512-yRzjxfnggrP/+qVHlUuZz5FZzEbkT+Yt0/Df6ScEMnbbZBLzYB2W0KLxoQCW+THm1SpOsM1ZPcTHAwuvmibIsQ==", + "version": "10.4.2", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.2.tgz", + "integrity": "sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==", "dev": true, "requires": { - "browserslist": "^4.16.8", - "caniuse-lite": "^1.0.30001252", - "colorette": "^1.3.0", - "fraction.js": "^4.1.1", + "browserslist": "^4.19.1", + "caniuse-lite": "^1.0.30001297", + "fraction.js": "^4.1.2", "normalize-range": "^0.1.2", - "postcss-value-parser": "^4.1.0" + "picocolors": "^1.0.0", + "postcss-value-parser": "^4.2.0" } }, "browserslist": { - "version": "4.16.8", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz", - "integrity": "sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ==", + "version": "4.19.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz", + "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001251", - "colorette": "^1.3.0", - "electron-to-chromium": "^1.3.811", + "caniuse-lite": "^1.0.30001286", + "electron-to-chromium": "^1.4.17", "escalade": "^3.1.1", - "node-releases": "^1.1.75" + "node-releases": "^2.0.1", + "picocolors": "^1.0.0" } }, "caniuse-lite": { - "version": "1.0.30001252", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz", - "integrity": "sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw==", - "dev": true - }, - "colorette": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz", - "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==", + "version": "1.0.30001300", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001300.tgz", + "integrity": "sha512-cVjiJHWGcNlJi8TZVKNMnvMid3Z3TTdDHmLDzlOdIiZq138Exvo0G+G0wTdVYolxKb4AYwC+38pxodiInVtJSA==", "dev": true }, "electron-to-chromium": { - "version": "1.3.826", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.826.tgz", - "integrity": "sha512-bpLc4QU4B8PYmdO4MSu2ZBTMD8lAaEXRS43C09lB31BvYwuk9UxgBRXbY5OJBw7VuMGcg2MZG5FyTaP9u4PQnw==", + "version": "1.4.47", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.47.tgz", + "integrity": "sha512-ZHc8i3/cgeCRK/vC7W2htAG6JqUmOUgDNn/f9yY9J8UjfLjwzwOVEt4MWmgJAdvmxyrsR5KIFA/6+kUHGY0eUA==", "dev": true }, "node-releases": { - "version": "1.1.75", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz", - "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", + "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", "dev": true }, "postcss-value-parser": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", - "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "dev": true } } }, "@wordpress/prettier-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-1.1.0.tgz", - "integrity": "sha512-cMYc/dtuiRo9VAb+m8S2Mvv/jELvoJAtcPsq6HT6XMppXC9slZ5z0q1A4PNf3ewMvvHtodjwkl2oHbO+vaAYzg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-1.1.1.tgz", + "integrity": "sha512-qjpBK5KB2ieCLv+1fGNKRW4urf5tFN1eUn3Qy+JINxNwAx6Jj9uhfXA4AldCSnD+WkzsN2UgBvgAj5/SWwzRZQ==", "dev": true }, "@wordpress/primitives": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-2.1.2.tgz", - "integrity": "sha512-Eof+TK+zoKIr6w4lMlwxq+HvP+nKXBoidukjP3YhNUPOdB7H27+X6/V/IJd/Zza2xKN2ExkJybssBAGqi5NS6g==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-3.0.4.tgz", + "integrity": "sha512-yu3BEpr09vpPM0QOYGm5Kmwo/tfo7u7Ez4hN5+AL2dT53VNr3QOmDo0Ym7sewI7+GgU18H4VkAi1QOydrc4vDw==", "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/element": "^3.1.2", - "classnames": "^2.2.5" + "@babel/runtime": "^7.16.0", + "@wordpress/element": "^4.0.4", + "classnames": "^2.3.1" } }, "@wordpress/priority-queue": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/priority-queue/-/priority-queue-2.1.2.tgz", - "integrity": "sha512-qXZzmfTRH6ssSZpCbJEHnj/w9W8bjpYm8V1tLKUqBXEYkHbII4O2FIL21LGI5aFhPPWsHG7tlYz3Z4lA/MHALQ==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@wordpress/priority-queue/-/priority-queue-2.2.3.tgz", + "integrity": "sha512-VI1VhkpgNs5b2LkpmlOIfJz7mVHOxMvh+MtG+NsuKc+0t6iOftfq8xxZ+8PbVLspZ8gd7p0rS+oXmSSqr9nc9g==", "requires": { - "@babel/runtime": "^7.13.10" + "@babel/runtime": "^7.16.0" } }, "@wordpress/redux-routine": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/redux-routine/-/redux-routine-4.1.2.tgz", - "integrity": "sha512-1wOH4zdp58VNeMCoTNRHc1wHTGL3ZWqx8kCCqeA3NhULnRBx2RkI/v6nemKCho5QRbMdIWWUYXffFsLbDOUOSg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@wordpress/redux-routine/-/redux-routine-4.2.2.tgz", + "integrity": "sha512-zfL8qsSvwI2lAvgPSVfOFCWDg0f0zusba0+uEIVZjPVstmjJtxO902mRZfWsg5+ooFSYq0T7rieet4nasYJX7g==", "requires": { - "@babel/runtime": "^7.13.10", + "@babel/runtime": "^7.16.0", "is-promise": "^4.0.0", "lodash": "^4.17.21", + "redux": "^4.1.0", "rungen": "^0.3.2" } }, "@wordpress/reusable-blocks": { - "version": "2.1.17", - "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-2.1.17.tgz", - "integrity": "sha512-54tZPQppe4kmDeivxsUk5ZZhTlSY8jum+5OEcYs0jJVctEXhRVh7rU3p2hqSWWriNghqVz4i3cuJ57tqt/tIsw==", - "requires": { - "@wordpress/block-editor": "^6.1.14", - "@wordpress/blocks": "^9.1.8", - "@wordpress/components": "^14.1.11", - "@wordpress/compose": "^4.1.6", - "@wordpress/core-data": "^3.1.12", - "@wordpress/data": "^5.1.6", - "@wordpress/element": "^3.1.2", - "@wordpress/i18n": "^4.1.2", - "@wordpress/icons": "^4.0.3", - "@wordpress/notices": "^3.1.6", - "@wordpress/url": "^3.1.2", + "version": "3.0.22", + "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-3.0.22.tgz", + "integrity": "sha512-LFCElCO/y0u2XK6J/iZsTcnHdR77E37YCphecSVXHZ71v+PhRotTAvjMD9+4vQ7fLvsfLG4Zd94KI2TGz4IoOg==", + "requires": { + "@wordpress/block-editor": "^8.0.16", + "@wordpress/blocks": "^11.1.5", + "@wordpress/components": "^19.2.2", + "@wordpress/compose": "^5.0.7", + "@wordpress/core-data": "^4.0.9", + "@wordpress/data": "^6.1.5", + "@wordpress/element": "^4.0.4", + "@wordpress/i18n": "^4.2.4", + "@wordpress/icons": "^6.1.1", + "@wordpress/notices": "^3.2.8", + "@wordpress/url": "^3.3.1", "lodash": "^4.17.21" } }, "@wordpress/rich-text": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/@wordpress/rich-text/-/rich-text-4.1.6.tgz", - "integrity": "sha512-wF60RXrGIQ0xgAvMSNwh1dP8lM4RRMWbRS5ZKOf1ld2s7oTsezEodBwCIHhFkHeraM/ORbeFoBPFsLbGf3oXwQ==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/compose": "^4.1.6", - "@wordpress/data": "^5.1.6", - "@wordpress/dom": "^3.1.5", - "@wordpress/element": "^3.1.2", - "@wordpress/escape-html": "^2.1.2", - "@wordpress/is-shallow-equal": "^4.1.1", - "@wordpress/keycodes": "^3.1.2", - "classnames": "^2.2.5", + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/@wordpress/rich-text/-/rich-text-5.0.8.tgz", + "integrity": "sha512-RjIbgP/C0OL2H+66TD2xt5KSi6N9lrj4bnYSdfhAoRZTjWvrtsyryaIRPbz4QZQvd/uMxsR651R1dFoL3+vZuA==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/a11y": "^3.2.4", + "@wordpress/compose": "^5.0.7", + "@wordpress/data": "^6.1.5", + "@wordpress/dom": "^3.2.7", + "@wordpress/element": "^4.0.4", + "@wordpress/escape-html": "^2.2.3", + "@wordpress/i18n": "^4.2.4", + "@wordpress/is-shallow-equal": "^4.2.1", + "@wordpress/keycodes": "^3.2.4", + "classnames": "^2.3.1", "lodash": "^4.17.21", "memize": "^1.1.0", "rememo": "^3.0.0" } }, "@wordpress/scripts": { - "version": "16.1.5", - "resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-16.1.5.tgz", - "integrity": "sha512-EF63cT5UGbWEMEJBBhxvcoNAuJIooKlqAAaMq5wN1urzsJRpQOTHTV658onoKFfgAxWB78CD7svuwIqNPGQdIw==", - "dev": true, - "requires": { - "@svgr/webpack": "^5.2.0", - "@wordpress/babel-preset-default": "^6.2.1", - "@wordpress/dependency-extraction-webpack-plugin": "^3.1.4", - "@wordpress/eslint-plugin": "^9.0.6", - "@wordpress/jest-preset-default": "^7.0.5", - "@wordpress/npm-package-json-lint-config": "^4.0.5", - "@wordpress/postcss-plugins-preset": "^3.1.4", - "@wordpress/prettier-config": "^1.0.5", - "@wordpress/stylelint-config": "^19.0.5", + "version": "19.2.4", + "resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-19.2.4.tgz", + "integrity": "sha512-klkfjBOPfr/RT/3Tvmx+gLbZ+dxq5L0dJQHCHxEURMRW/A8SfJJPtmC29L9sE1KhO3zUMWxrkn2L6HhSzbvQbA==", + "dev": true, + "requires": { + "@svgr/webpack": "^5.5.0", + "@wordpress/babel-preset-default": "^6.4.1", + "@wordpress/browserslist-config": "^4.1.0", + "@wordpress/dependency-extraction-webpack-plugin": "^3.2.1", + "@wordpress/eslint-plugin": "^9.3.0", + "@wordpress/jest-preset-default": "^7.1.3", + "@wordpress/npm-package-json-lint-config": "^4.1.0", + "@wordpress/postcss-plugins-preset": "^3.2.5", + "@wordpress/prettier-config": "^1.1.1", + "@wordpress/stylelint-config": "^19.1.0", "babel-jest": "^26.6.3", - "babel-loader": "^8.2.2", + "babel-loader": "^8.2.3", + "browserslist": "^4.17.6", "chalk": "^4.0.0", "check-node-version": "^4.1.0", "clean-webpack-plugin": "^3.0.0", "cross-spawn": "^5.1.0", - "css-loader": "^5.1.3", + "css-loader": "^6.2.0", + "cssnano": "^5.0.7", "cwd": "^0.10.0", "dir-glob": "^3.0.1", "eslint": "^7.17.0", - "eslint-plugin-markdown": "^1.0.2", + "eslint-plugin-markdown": "^2.2.0", "expect-puppeteer": "^4.4.0", - "file-loader": "^6.2.0", "filenamify": "^4.2.0", - "ignore-emit-webpack-plugin": "^2.0.6", "jest": "^26.6.3", "jest-circus": "^26.6.3", - "jest-dev-server": "^4.4.0", + "jest-dev-server": "^5.0.3", "jest-environment-node": "^26.6.2", - "markdownlint": "^0.18.0", - "markdownlint-cli": "^0.21.0", + "markdownlint": "^0.23.1", + "markdownlint-cli": "^0.27.1", "merge-deep": "^3.0.3", - "mini-css-extract-plugin": "^1.3.9", + "mini-css-extract-plugin": "^2.5.0", "minimist": "^1.2.0", "npm-package-json-lint": "^5.0.0", "postcss": "^8.2.15", - "postcss-loader": "^4.2.0", + "postcss-loader": "^6.1.1", "prettier": "npm:wp-prettier@2.2.1-beta-1", - "puppeteer-core": "^9.0.0", + "puppeteer-core": "^10.1.0", "read-pkg-up": "^1.0.1", "resolve-bin": "^0.4.0", - "sass": "^1.26.11", - "sass-loader": "^10.1.1", - "source-map-loader": "^0.2.4", + "sass": "^1.35.2", + "sass-loader": "^12.1.0", + "source-map-loader": "^3.0.0", "stylelint": "^13.8.0", - "terser-webpack-plugin": "^3.0.3", - "thread-loader": "^3.0.1", + "terser-webpack-plugin": "^5.1.4", "url-loader": "^4.1.1", - "webpack": "^4.46.0", - "webpack-bundle-analyzer": "^4.2.0", - "webpack-cli": "^3.3.11", - "webpack-livereload-plugin": "^2.3.0", - "webpack-sources": "^2.2.0" + "webpack": "^5.47.1", + "webpack-bundle-analyzer": "^4.4.2", + "webpack-cli": "^4.7.2", + "webpack-livereload-plugin": "^3.0.1" }, "dependencies": { - "cacache": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", - "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==", - "dev": true, - "requires": { - "@npmcli/fs": "^1.0.0", - "@npmcli/move-file": "^1.0.1", - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "glob": "^7.1.4", - "infer-owner": "^1.0.4", - "lru-cache": "^6.0.0", - "minipass": "^3.1.1", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.2", - "mkdirp": "^1.0.3", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^8.0.1", - "tar": "^6.0.2", - "unique-filename": "^1.1.1" - } - }, - "chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true - }, - "colorette": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz", - "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==", + "@types/json-schema": { + "version": "7.0.9", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", + "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", "dev": true }, - "enhanced-resolve": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz", - "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==", + "@webassemblyjs/ast": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", + "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.5.0", - "tapable": "^1.0.0" - }, - "dependencies": { - "memory-fs": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", - "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", - "dev": true, - "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" - } - } + "@webassemblyjs/helper-numbers": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1" } }, - "filenamify": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz", - "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==", - "dev": true, - "requires": { - "filename-reserved-regex": "^2.0.0", - "strip-outer": "^1.0.1", - "trim-repeated": "^1.0.0" - } + "@webassemblyjs/helper-api-error": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", + "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", + "dev": true }, - "find-cache-dir": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", - "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" - } + "@webassemblyjs/helper-buffer": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", + "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", + "dev": true }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "@webassemblyjs/helper-wasm-bytecode": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", + "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", + "dev": true + }, + "@webassemblyjs/helper-wasm-section": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", + "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", "dev": true, "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1" } }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "@webassemblyjs/ieee754": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", + "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", "dev": true, "requires": { - "p-locate": "^4.1.0" + "@xtuc/ieee754": "^1.2.0" } }, - "make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "@webassemblyjs/leb128": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", + "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", "dev": true, "requires": { - "semver": "^6.0.0" + "@xtuc/long": "4.2.2" } }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "@webassemblyjs/utf8": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", + "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", "dev": true }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "@webassemblyjs/wasm-edit": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", + "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", "dev": true, "requires": { - "yocto-queue": "^0.1.0" + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/helper-wasm-section": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1", + "@webassemblyjs/wasm-opt": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1", + "@webassemblyjs/wast-printer": "1.11.1" } }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "@webassemblyjs/wasm-gen": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", + "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", "dev": true, "requires": { - "p-limit": "^2.2.0" - }, - "dependencies": { - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - } + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/ieee754": "1.11.1", + "@webassemblyjs/leb128": "1.11.1", + "@webassemblyjs/utf8": "1.11.1" } }, - "p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "@webassemblyjs/wasm-opt": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", + "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", "dev": true, "requires": { - "aggregate-error": "^3.0.0" + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1" } }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "@webassemblyjs/wasm-parser": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", + "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", "dev": true, "requires": { - "find-up": "^4.0.0" + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/ieee754": "1.11.1", + "@webassemblyjs/leb128": "1.11.1", + "@webassemblyjs/utf8": "1.11.1" } }, - "postcss": { - "version": "8.3.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz", - "integrity": "sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==", + "@webassemblyjs/wast-printer": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", + "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", "dev": true, "requires": { - "colorette": "^1.2.2", - "nanoid": "^3.1.23", - "source-map-js": "^0.6.2" + "@webassemblyjs/ast": "1.11.1", + "@xtuc/long": "4.2.2" } }, - "prettier": { - "version": "npm:wp-prettier@2.2.1-beta-1", - "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.2.1-beta-1.tgz", - "integrity": "sha512-+JHkqs9LC/JPp51yy1hzs3lQ7qeuWCwOcSzpQNeeY/G7oSpnF61vxt7hRh87zNRTr6ob2ndy0W8rVzhgrcA+Gw==", + "acorn": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", + "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", "dev": true }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "schema-utils": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", - "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", + "browserslist": { + "version": "4.19.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz", + "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==", "dev": true, "requires": { - "@types/json-schema": "^7.0.5", - "ajv": "^6.12.4", - "ajv-keywords": "^3.5.2" + "caniuse-lite": "^1.0.30001286", + "electron-to-chromium": "^1.4.17", + "escalade": "^3.1.1", + "node-releases": "^2.0.1", + "picocolors": "^1.0.0" } }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "caniuse-lite": { + "version": "1.0.30001300", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001300.tgz", + "integrity": "sha512-cVjiJHWGcNlJi8TZVKNMnvMid3Z3TTdDHmLDzlOdIiZq138Exvo0G+G0wTdVYolxKb4AYwC+38pxodiInVtJSA==", "dev": true }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", "dev": true }, - "source-map-loader": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz", - "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==", + "css-declaration-sorter": { + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz", + "integrity": "sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw==", "dev": true, "requires": { - "async": "^2.5.0", - "loader-utils": "^1.1.0" + "timsort": "^0.3.0" } }, - "ssri": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", - "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", + "css-select": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz", + "integrity": "sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==", "dev": true, "requires": { - "minipass": "^3.1.1" + "boolbase": "^1.0.0", + "css-what": "^5.1.0", + "domhandler": "^4.3.0", + "domutils": "^2.8.0", + "nth-check": "^2.0.1" } }, - "terser-webpack-plugin": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.1.0.tgz", - "integrity": "sha512-cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA==", - "dev": true, + "css-tree": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", + "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", + "dev": true, "requires": { - "cacache": "^15.0.5", - "find-cache-dir": "^3.3.1", - "jest-worker": "^26.2.1", - "p-limit": "^3.0.2", - "schema-utils": "^2.6.6", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.8.0", - "webpack-sources": "^1.4.3" + "mdn-data": "2.0.14", + "source-map": "^0.6.1" + } + }, + "css-what": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", + "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==", + "dev": true + }, + "cssnano": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.15.tgz", + "integrity": "sha512-ppZsS7oPpi2sfiyV5+i+NbB/3GtQ+ab2Vs1azrZaXWujUSN4o+WdTxlCZIMcT9yLW3VO/5yX3vpyDaQ1nIn8CQ==", + "dev": true, + "requires": { + "cssnano-preset-default": "^5.1.10", + "lilconfig": "^2.0.3", + "yaml": "^1.10.2" + } + }, + "cssnano-preset-default": { + "version": "5.1.10", + "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.10.tgz", + "integrity": "sha512-BcpSzUVygHMOnp9uG5rfPzTOCb0GAHQkqtUQx8j1oMNF9A1Q8hziOOhiM4bdICpmrBIU85BE64RD5XGYsVQZNA==", + "dev": true, + "requires": { + "css-declaration-sorter": "^6.0.3", + "cssnano-utils": "^3.0.0", + "postcss-calc": "^8.2.0", + "postcss-colormin": "^5.2.3", + "postcss-convert-values": "^5.0.2", + "postcss-discard-comments": "^5.0.1", + "postcss-discard-duplicates": "^5.0.1", + "postcss-discard-empty": "^5.0.1", + "postcss-discard-overridden": "^5.0.2", + "postcss-merge-longhand": "^5.0.4", + "postcss-merge-rules": "^5.0.4", + "postcss-minify-font-values": "^5.0.2", + "postcss-minify-gradients": "^5.0.4", + "postcss-minify-params": "^5.0.3", + "postcss-minify-selectors": "^5.1.1", + "postcss-normalize-charset": "^5.0.1", + "postcss-normalize-display-values": "^5.0.2", + "postcss-normalize-positions": "^5.0.2", + "postcss-normalize-repeat-style": "^5.0.2", + "postcss-normalize-string": "^5.0.2", + "postcss-normalize-timing-functions": "^5.0.2", + "postcss-normalize-unicode": "^5.0.2", + "postcss-normalize-url": "^5.0.4", + "postcss-normalize-whitespace": "^5.0.2", + "postcss-ordered-values": "^5.0.3", + "postcss-reduce-initial": "^5.0.2", + "postcss-reduce-transforms": "^5.0.2", + "postcss-svgo": "^5.0.3", + "postcss-unique-selectors": "^5.0.2" + } + }, + "dom-serializer": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", + "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", + "dev": true, + "requires": { + "domelementtype": "^2.0.1", + "domhandler": "^4.2.0", + "entities": "^2.0.0" + } + }, + "domelementtype": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", + "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", + "dev": true + }, + "domutils": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", + "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "dev": true, + "requires": { + "dom-serializer": "^1.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.2.0" + } + }, + "electron-to-chromium": { + "version": "1.4.47", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.47.tgz", + "integrity": "sha512-ZHc8i3/cgeCRK/vC7W2htAG6JqUmOUgDNn/f9yY9J8UjfLjwzwOVEt4MWmgJAdvmxyrsR5KIFA/6+kUHGY0eUA==", + "dev": true + }, + "enhanced-resolve": { + "version": "5.8.3", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz", + "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + } + }, + "filenamify": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz", + "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==", + "dev": true, + "requires": { + "filename-reserved-regex": "^2.0.0", + "strip-outer": "^1.0.1", + "trim-repeated": "^1.0.0" + } + }, + "glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.9", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", + "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + } + }, + "jest-worker": { + "version": "27.4.6", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.6.tgz", + "integrity": "sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + } + }, + "loader-runner": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz", + "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==", + "dev": true + }, + "mdn-data": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", + "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", + "dev": true + }, + "node-releases": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", + "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", + "dev": true + }, + "nth-check": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", + "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==", + "dev": true, + "requires": { + "boolbase": "^1.0.0" + } + }, + "postcss": { + "version": "8.4.5", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz", + "integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==", + "dev": true, + "requires": { + "nanoid": "^3.1.30", + "picocolors": "^1.0.0", + "source-map-js": "^1.0.1" + } + }, + "postcss-calc": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.2.tgz", + "integrity": "sha512-B5R0UeB4zLJvxNt1FVCaDZULdzsKLPc6FhjFJ+xwFiq7VG4i9cuaJLxVjNtExNK8ocm3n2o4unXXLiVX1SCqxA==", + "dev": true, + "requires": { + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^4.0.2" + } + }, + "postcss-colormin": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.3.tgz", + "integrity": "sha512-dra4xoAjub2wha6RUXAgadHEn2lGxbj8drhFcIGLOMn914Eu7DkPUurugDXgstwttCYkJtZ/+PkWRWdp3UHRIA==", + "dev": true, + "requires": { + "browserslist": "^4.16.6", + "caniuse-api": "^3.0.0", + "colord": "^2.9.1", + "postcss-value-parser": "^4.2.0" + } + }, + "postcss-convert-values": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.2.tgz", + "integrity": "sha512-KQ04E2yadmfa1LqXm7UIDwW1ftxU/QWZmz6NKnHnUvJ3LEYbbcX6i329f/ig+WnEByHegulocXrECaZGLpL8Zg==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.1.0" + } + }, + "postcss-discard-comments": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz", + "integrity": "sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==", + "dev": true + }, + "postcss-discard-duplicates": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz", + "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==", + "dev": true + }, + "postcss-discard-empty": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz", + "integrity": "sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==", + "dev": true + }, + "postcss-discard-overridden": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.2.tgz", + "integrity": "sha512-+56BLP6NSSUuWUXjRgAQuho1p5xs/hU5Sw7+xt9S3JSg+7R6+WMGnJW7Hre/6tTuZ2xiXMB42ObkiZJ2hy/Pew==", + "dev": true + }, + "postcss-merge-longhand": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.4.tgz", + "integrity": "sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.1.0", + "stylehacks": "^5.0.1" + } + }, + "postcss-merge-rules": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.4.tgz", + "integrity": "sha512-yOj7bW3NxlQxaERBB0lEY1sH5y+RzevjbdH4DBJurjKERNpknRByFNdNe+V72i5pIZL12woM9uGdS5xbSB+kDQ==", + "dev": true, + "requires": { + "browserslist": "^4.16.6", + "caniuse-api": "^3.0.0", + "cssnano-utils": "^3.0.0", + "postcss-selector-parser": "^6.0.5" }, "dependencies": { - "webpack-sources": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", - "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", + "postcss-selector-parser": { + "version": "6.0.8", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz", + "integrity": "sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==", "dev": true, "requires": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" } } } }, - "webpack": { - "version": "4.46.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", - "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "postcss-minify-font-values": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.2.tgz", + "integrity": "sha512-R6MJZryq28Cw0AmnyhXrM7naqJZZLoa1paBltIzh2wM7yb4D45TLur+eubTQ4jCmZU9SGeZdWsc5KcSoqTMeTg==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.2.0" + } + }, + "postcss-minify-gradients": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.4.tgz", + "integrity": "sha512-RVwZA7NC4R4J76u8X0Q0j+J7ItKUWAeBUJ8oEEZWmtv3Xoh19uNJaJwzNpsydQjk6PkuhRrK+YwwMf+c+68EYg==", + "dev": true, + "requires": { + "colord": "^2.9.1", + "cssnano-utils": "^3.0.0", + "postcss-value-parser": "^4.2.0" + } + }, + "postcss-minify-params": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.3.tgz", + "integrity": "sha512-NY92FUikE+wralaiVexFd5gwb7oJTIDhgTNeIw89i1Ymsgt4RWiPXfz3bg7hDy4NL6gepcThJwOYNtZO/eNi7Q==", + "dev": true, + "requires": { + "alphanum-sort": "^1.0.2", + "browserslist": "^4.16.6", + "cssnano-utils": "^3.0.0", + "postcss-value-parser": "^4.2.0" + } + }, + "postcss-minify-selectors": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.1.tgz", + "integrity": "sha512-TOzqOPXt91O2luJInaVPiivh90a2SIK5Nf1Ea7yEIM/5w+XA5BGrZGUSW8aEx9pJ/oNj7ZJBhjvigSiBV+bC1Q==", + "dev": true, + "requires": { + "alphanum-sort": "^1.0.2", + "postcss-selector-parser": "^6.0.5" }, "dependencies": { - "cacache": { - "version": "12.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", - "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", - "dev": true, - "requires": { - "bluebird": "^3.5.5", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.4", - "graceful-fs": "^4.1.15", - "infer-owner": "^1.0.3", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" - } - }, - "chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "dev": true - }, - "find-cache-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", - "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^2.0.0", - "pkg-dir": "^3.0.0" - } - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "dev": true, - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - } - }, - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "postcss-selector-parser": { + "version": "6.0.8", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz", + "integrity": "sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==", "dev": true, "requires": { - "p-try": "^2.0.0" + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + } + } + }, + "postcss-normalize-charset": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz", + "integrity": "sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==", + "dev": true + }, + "postcss-normalize-display-values": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.2.tgz", + "integrity": "sha512-RxXoJPUR0shSjkMMzgEZDjGPrgXUVYyWA/YwQRicb48H15OClPuaDR7tYokLAlGZ2tCSENEN5WxjgxSD5m4cUw==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.2.0" + } + }, + "postcss-normalize-positions": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.2.tgz", + "integrity": "sha512-tqghWFVDp2btqFg1gYob1etPNxXLNh3uVeWgZE2AQGh6b2F8AK2Gj36v5Vhyh+APwIzNjmt6jwZ9pTBP+/OM8g==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.2.0" + } + }, + "postcss-normalize-repeat-style": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.2.tgz", + "integrity": "sha512-/rIZn8X9bBzC7KvY4iKUhXUGW3MmbXwfPF23jC9wT9xTi7kAvgj8sEgwxjixBmoL6MVa4WOgxNz2hAR6wTK8tw==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.2.0" + } + }, + "postcss-normalize-string": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.2.tgz", + "integrity": "sha512-zaI1yzwL+a/FkIzUWMQoH25YwCYxi917J4pYm1nRXtdgiCdnlTkx5eRzqWEC64HtRa06WCJ9TIutpb6GmW4gFw==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.2.0" + } + }, + "postcss-normalize-timing-functions": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.2.tgz", + "integrity": "sha512-Ao0PP6MoYsRU1LxeVUW740ioknvdIUmfr6uAA3xWlQJ9s69/Tupy8qwhuKG3xWfl+KvLMAP9p2WXF9cwuk/7Bg==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.2.0" + } + }, + "postcss-normalize-unicode": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.2.tgz", + "integrity": "sha512-3y/V+vjZ19HNcTizeqwrbZSUsE69ZMRHfiiyLAJb7C7hJtYmM4Gsbajy7gKagu97E8q5rlS9k8FhojA8cpGhWw==", + "dev": true, + "requires": { + "browserslist": "^4.16.6", + "postcss-value-parser": "^4.2.0" + } + }, + "postcss-normalize-url": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.4.tgz", + "integrity": "sha512-cNj3RzK2pgQQyNp7dzq0dqpUpQ/wYtdDZM3DepPmFjCmYIfceuD9VIAcOdvrNetjIU65g1B4uwdP/Krf6AFdXg==", + "dev": true, + "requires": { + "normalize-url": "^6.0.1", + "postcss-value-parser": "^4.2.0" + } + }, + "postcss-normalize-whitespace": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.2.tgz", + "integrity": "sha512-CXBx+9fVlzSgbk0IXA/dcZn9lXixnQRndnsPC5ht3HxlQ1bVh77KQDL1GffJx1LTzzfae8ftMulsjYmO2yegxA==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.2.0" + } + }, + "postcss-ordered-values": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.3.tgz", + "integrity": "sha512-T9pDS+P9bWeFvqivXd5ACzQmrCmHjv3ZP+djn8E1UZY7iK79pFSm7i3WbKw2VSmFmdbMm8sQ12OPcNpzBo3Z2w==", + "dev": true, + "requires": { + "cssnano-utils": "^3.0.0", + "postcss-value-parser": "^4.2.0" + } + }, + "postcss-reduce-initial": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.0.2.tgz", + "integrity": "sha512-v/kbAAQ+S1V5v9TJvbGkV98V2ERPdU6XvMcKMjqAlYiJ2NtsHGlKYLPjWWcXlaTKNxooId7BGxeraK8qXvzKtw==", + "dev": true, + "requires": { + "browserslist": "^4.16.6", + "caniuse-api": "^3.0.0" + } + }, + "postcss-reduce-transforms": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.2.tgz", + "integrity": "sha512-25HeDeFsgiPSUx69jJXZn8I06tMxLQJJNF5h7i9gsUg8iP4KOOJ8EX8fj3seeoLt3SLU2YDD6UPnDYVGUO7DEA==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.2.0" + } + }, + "postcss-svgo": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.0.3.tgz", + "integrity": "sha512-41XZUA1wNDAZrQ3XgWREL/M2zSw8LJPvb5ZWivljBsUQAGoEKMYm6okHsTjJxKYI4M75RQEH4KYlEM52VwdXVA==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.1.0", + "svgo": "^2.7.0" + } + }, + "postcss-unique-selectors": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.2.tgz", + "integrity": "sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA==", + "dev": true, + "requires": { + "alphanum-sort": "^1.0.2", + "postcss-selector-parser": "^6.0.5" + }, + "dependencies": { + "postcss-selector-parser": { + "version": "6.0.8", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz", + "integrity": "sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==", "dev": true, "requires": { - "p-limit": "^2.0.0" + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" } - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + } + } + }, + "postcss-value-parser": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", + "dev": true + }, + "prettier": { + "version": "npm:wp-prettier@2.2.1-beta-1", + "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.2.1-beta-1.tgz", + "integrity": "sha512-+JHkqs9LC/JPp51yy1hzs3lQ7qeuWCwOcSzpQNeeY/G7oSpnF61vxt7hRh87zNRTr6ob2ndy0W8rVzhgrcA+Gw==", + "dev": true + }, + "schema-utils": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", + "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + } + }, + "serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "dev": true, + "requires": { + "randombytes": "^2.1.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-loader": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.1.tgz", + "integrity": "sha512-Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA==", + "dev": true, + "requires": { + "abab": "^2.0.5", + "iconv-lite": "^0.6.3", + "source-map-js": "^1.0.1" + } + }, + "source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "stylehacks": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.1.tgz", + "integrity": "sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==", + "dev": true, + "requires": { + "browserslist": "^4.16.0", + "postcss-selector-parser": "^6.0.4" + } + }, + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "svgo": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz", + "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==", + "dev": true, + "requires": { + "@trysound/sax": "0.2.0", + "commander": "^7.2.0", + "css-select": "^4.1.3", + "css-tree": "^1.1.3", + "csso": "^4.2.0", + "picocolors": "^1.0.0", + "stable": "^0.1.8" + } + }, + "tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "dev": true + }, + "terser": { + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz", + "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==", + "dev": true, + "requires": { + "commander": "^2.20.0", + "source-map": "~0.7.2", + "source-map-support": "~0.5.20" + }, + "dependencies": { + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, - "pkg-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", - "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", - "dev": true, - "requires": { - "find-up": "^3.0.0" - } - }, - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", "dev": true - }, - "ssri": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz", - "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==", - "dev": true, - "requires": { - "figgy-pudding": "^3.5.1" - } - }, - "terser-webpack-plugin": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", - "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", - "dev": true, - "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" - } - }, - "webpack-sources": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", - "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", - "dev": true, - "requires": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" - } } } }, - "webpack-sources": { + "terser-webpack-plugin": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz", + "integrity": "sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ==", + "dev": true, + "requires": { + "jest-worker": "^27.4.1", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.0", + "source-map": "^0.6.1", + "terser": "^5.7.2" + } + }, + "watchpack": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz", - "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", + "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==", "dev": true, "requires": { - "source-list-map": "^2.0.1", - "source-map": "^0.6.1" + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" } }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "webpack": { + "version": "5.66.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.66.0.tgz", + "integrity": "sha512-NJNtGT7IKpGzdW7Iwpn/09OXz9inIkeIQ/ibY6B+MdV1x6+uReqz/5z1L89ezWnpPDWpXF0TY5PCYKQdWVn8Vg==", + "dev": true, + "requires": { + "@types/eslint-scope": "^3.7.0", + "@types/estree": "^0.0.50", + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/wasm-edit": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1", + "acorn": "^8.4.1", + "acorn-import-assertions": "^1.7.6", + "browserslist": "^4.14.5", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.8.3", + "es-module-lexer": "^0.9.0", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-better-errors": "^1.0.2", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.1.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.1.3", + "watchpack": "^2.3.1", + "webpack-sources": "^3.2.2" + } + }, + "webpack-livereload-plugin": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/webpack-livereload-plugin/-/webpack-livereload-plugin-3.0.2.tgz", + "integrity": "sha512-5JeZ2dgsvSNG+clrkD/u2sEiPcNk4qwCVZZmW8KpqKcNlkGv7IJjdVrq13+etAmMZYaCF1EGXdHkVFuLgP4zfw==", + "dev": true, + "requires": { + "anymatch": "^3.1.1", + "portfinder": "^1.0.17", + "schema-utils": ">1.0.0", + "tiny-lr": "^1.1.1" + } + }, + "webpack-sources": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", "dev": true } } }, "@wordpress/server-side-render": { - "version": "2.1.12", - "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-2.1.12.tgz", - "integrity": "sha512-NrxFv/u6xzs97Pgyb0BbhB2f7pAII2trD8nyDY+/JfjNcTguulthRh9kmmPWp/vo6kgyEO1xyo6yHUnHLnh/vQ==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/api-fetch": "^5.1.2", - "@wordpress/blocks": "^9.1.8", - "@wordpress/components": "^14.1.11", - "@wordpress/compose": "^4.1.6", - "@wordpress/data": "^5.1.6", - "@wordpress/deprecated": "^3.1.2", - "@wordpress/element": "^3.1.2", - "@wordpress/i18n": "^4.1.2", - "@wordpress/url": "^3.1.2", + "version": "3.0.19", + "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-3.0.19.tgz", + "integrity": "sha512-9k3WOkIOFraWpfzK5Lh63jt74xhcw/FtlT8n0Yy0amUeM6PhBxkG7V2F2w8KeXUCh5yU4z2aG3QxwEV+0b99Ww==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/api-fetch": "^5.2.6", + "@wordpress/blocks": "^11.1.5", + "@wordpress/components": "^19.2.2", + "@wordpress/compose": "^5.0.7", + "@wordpress/data": "^6.1.5", + "@wordpress/deprecated": "^3.2.3", + "@wordpress/element": "^4.0.4", + "@wordpress/i18n": "^4.2.4", + "@wordpress/url": "^3.3.1", "lodash": "^4.17.21" } }, "@wordpress/shortcode": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/shortcode/-/shortcode-3.1.2.tgz", - "integrity": "sha512-pZQf4nu4iQdyQIz3OnphvPcKTL9jlEIR1a58icis+PDnqbr0gv4PGwS3Hbamlm4p7+bkxm5Pskfj3n3ykqwGLQ==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/@wordpress/shortcode/-/shortcode-3.2.3.tgz", + "integrity": "sha512-zXIg2AbwJhJNCp55roC+wuyZQnMC/GLdgh95pAa5a7Hd+ThXf0hbBg+DP9lo1x+cxAZAEGZ/Bns/+SCUr1boTA==", "requires": { - "@babel/runtime": "^7.13.10", + "@babel/runtime": "^7.16.0", "lodash": "^4.17.21", "memize": "^1.1.0" } @@ -4976,68 +5723,67 @@ } }, "@wordpress/token-list": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@wordpress/token-list/-/token-list-2.1.1.tgz", - "integrity": "sha512-haBjgsroaRjNBZ/wHd6nZamYL3Yfrt0s13Py+aR1ZKtYv+/Rmwu9VB45iB6Xb/G+v3xexopEM8uA8Zks5PNxbQ==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@wordpress/token-list/-/token-list-2.2.2.tgz", + "integrity": "sha512-JElgvK1NsQVfSnR51qWDV7cEB/2U7saV+MKDxdmP7mhcwg538AVyKTkOdmzYrx/9fqOEf0bkWOt3WX9xLD35kQ==", "requires": { - "@babel/runtime": "^7.13.10", + "@babel/runtime": "^7.16.0", "lodash": "^4.17.21" } }, "@wordpress/url": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/url/-/url-3.1.2.tgz", - "integrity": "sha512-hT214NQG2p+FiL4jdKPJItHMEeA70uqvhKlnPOa7qqf9u+6QMnhVplxFxWSIu5cB7glmx5JQG4EMR2Ohz3jgTg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@wordpress/url/-/url-3.3.1.tgz", + "integrity": "sha512-lEuvkNjPoVuzYy0zn6n9gfMdNlHJW36EsPI2yDzMICjIAV5lRv1/uOg2Ls3lbDaRR2vm1FAiMpB2RAMzfR8Nfg==", "requires": { - "@babel/runtime": "^7.13.10", - "lodash": "^4.17.21", - "react-native-url-polyfill": "^1.1.2" + "@babel/runtime": "^7.16.0", + "lodash": "^4.17.21" } }, "@wordpress/viewport": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/@wordpress/viewport/-/viewport-3.1.6.tgz", - "integrity": "sha512-SwIL26Nd691mO8R21GUrODjVqJx1Y1DVNHbX9VusJxvf7citc94dZnXXHiQ8zc7vlg5ryMBF49/EFn8rZ8Zn8w==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/@wordpress/viewport/-/viewport-4.0.7.tgz", + "integrity": "sha512-huxUrFW6JNhj/hUfvftZeht3B6HF0jk10oyHW3dPcFW57ceecJTDB9BdS7a99B1LBP8AWjdN8x/3SqrMwE4yfg==", "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/compose": "^4.1.6", - "@wordpress/data": "^5.1.6", + "@babel/runtime": "^7.16.0", + "@wordpress/compose": "^5.0.7", + "@wordpress/data": "^6.1.5", "lodash": "^4.17.21" } }, "@wordpress/warning": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-2.1.2.tgz", - "integrity": "sha512-MqMo5AYffG/Gi3h1uRFJGBxp4TGmxw+7A4W81oe7VC9linJYhbNyeyvaMlL02m06KG2szWwl4fn0bdhyre433w==" + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-2.2.2.tgz", + "integrity": "sha512-iG1Hq56RK3N6AJqAD1sRLWRIJatfYn+NrPyrfqRNZNYXHM8Vj/s7ABNMbIU0Y99vXkBE83rvCdbMkugNoI2jXA==" }, "@wordpress/widgets": { - "version": "1.1.19", - "resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-1.1.19.tgz", - "integrity": "sha512-6ojIQVbeeS3fhXs+nNdmKIc6BtYnPoPq6qXLcTFGV9yXPJs8zX5RRdI3ziEFeV/IILCoIk4fmbw87ncIQwahQA==", - "requires": { - "@babel/runtime": "^7.13.10", - "@wordpress/api-fetch": "^5.1.2", - "@wordpress/block-editor": "^6.1.14", - "@wordpress/blocks": "^9.1.8", - "@wordpress/components": "^14.1.11", - "@wordpress/compose": "^4.1.6", - "@wordpress/core-data": "^3.1.12", - "@wordpress/data": "^5.1.6", - "@wordpress/element": "^3.1.2", - "@wordpress/i18n": "^4.1.2", - "@wordpress/icons": "^4.0.3", - "@wordpress/notices": "^3.1.6", - "@wordpress/url": "^3.1.2", - "classnames": "^2.2.5", + "version": "2.0.22", + "resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-2.0.22.tgz", + "integrity": "sha512-6aMNxq3tbzcC5vqxCZSvTeo64mlN2ri4BX1kZNHkE+tSMhnzWwDQKSRFDZbH9k5U+KAIXrUA+HzbcjHrDiWpEg==", + "requires": { + "@babel/runtime": "^7.16.0", + "@wordpress/api-fetch": "^5.2.6", + "@wordpress/block-editor": "^8.0.16", + "@wordpress/blocks": "^11.1.5", + "@wordpress/components": "^19.2.2", + "@wordpress/compose": "^5.0.7", + "@wordpress/core-data": "^4.0.9", + "@wordpress/data": "^6.1.5", + "@wordpress/element": "^4.0.4", + "@wordpress/i18n": "^4.2.4", + "@wordpress/icons": "^6.1.1", + "@wordpress/notices": "^3.2.8", + "@wordpress/url": "^3.3.1", + "classnames": "^2.3.1", "lodash": "^4.17.21" } }, "@wordpress/wordcount": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/wordcount/-/wordcount-3.1.2.tgz", - "integrity": "sha512-jFumH3IJzbEtGupxfre7asRMF6zHmNPeOlNgJw7luaeE1YFwgXkCtflDFf2Y6fC09xJmwuDPwxLnoII8RLhNtQ==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/@wordpress/wordcount/-/wordcount-3.2.3.tgz", + "integrity": "sha512-iguvGA4zU1tB0avpzIzVdVrIeH0CbeiOlhbYgtkQ5J2UqdRs6lo7pZFlp/3HAvmtBo8r2iGlbc+QZgKzR6gdJw==", "requires": { - "@babel/runtime": "^7.13.10", + "@babel/runtime": "^7.16.0", "lodash": "^4.17.21" } }, @@ -5111,6 +5857,12 @@ } } }, + "acorn-import-assertions": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", + "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "dev": true + }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", @@ -5129,24 +5881,6 @@ "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==", "dev": true }, - "aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "dependencies": { - "indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true - } - } - }, "airbnb-prop-types": { "version": "2.16.0", "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz", @@ -5181,6 +5915,35 @@ "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", "dev": true }, + "ajv-formats": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", + "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "dev": true, + "requires": { + "ajv": "^8.0.0" + }, + "dependencies": { + "ajv": { + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz", + "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + } + } + }, "ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", @@ -5351,16 +6114,16 @@ "dev": true }, "array-includes": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz", - "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz", + "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", + "es-abstract": "^1.19.1", "get-intrinsic": "^1.1.1", - "is-string": "^1.0.5" + "is-string": "^1.0.7" }, "dependencies": { "call-bind": { @@ -5374,22 +6137,25 @@ } }, "es-abstract": { - "version": "1.18.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz", - "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", - "is-callable": "^1.2.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", @@ -5406,16 +6172,157 @@ } } }, - "get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1" - } + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } + }, + "is-callable": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", + "dev": true + }, + "is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + } + }, + "object-inspect": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", + "dev": true + }, + "string.prototype.trimend": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", + "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + } + }, + "string.prototype.trimstart": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", + "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + } + } + } + }, + "array-slice": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", + "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==", + "dev": true + }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dev": true, + "requires": { + "array-uniq": "^1.0.1" + } + }, + "array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true + }, + "array.prototype.filter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.1.tgz", + "integrity": "sha512-Dk3Ty7N42Odk7PjU/Ci3zT4pLj20YvuVnneG/58ICM6bt4Ij5kZaJTVQ9TSaWaIECX2sFyz4KItkVZqHNnciqw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.0", + "es-array-method-boxes-properly": "^1.0.0", + "is-string": "^1.0.7" + }, + "dependencies": { + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, + "es-abstract": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", + "has": "^1.0.3", + "has-symbols": "^1.0.2", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", + "is-negative-zero": "^2.0.1", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", + "object-inspect": "^1.11.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.2", + "string.prototype.trimend": "^1.0.4", + "string.prototype.trimstart": "^1.0.4", + "unbox-primitive": "^1.0.1" + }, + "dependencies": { + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } + } + } + }, + "has-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", + "dev": true }, "is-callable": { "version": "1.2.4", @@ -5434,9 +6341,9 @@ } }, "object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", "dev": true }, "string.prototype.trimend": { @@ -5461,73 +6368,44 @@ } } }, - "array-slice": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", - "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==", - "dev": true - }, - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "requires": { - "array-uniq": "^1.0.1" - } - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true - }, - "array.prototype.filter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.0.tgz", - "integrity": "sha512-TfO1gz+tLm+Bswq0FBOXPqAchtCr2Rn48T8dLJoRFl8NoEosjZmzptmuo1X8aZBzZcqsR1W8U761tjACJtngTQ==", - "dev": true, + "array.prototype.find": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.2.tgz", + "integrity": "sha512-00S1O4ewO95OmmJW7EesWfQlrCrLEL8kZ40w3+GkLX2yTt0m2ggcePPa2uHPJ9KUmJvwRq+lCV9bD8Yim23x/Q==", "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0", - "es-array-method-boxes-properly": "^1.0.0", - "is-string": "^1.0.5" + "es-abstract": "^1.19.0" }, "dependencies": { "call-bind": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, "requires": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" } }, "es-abstract": { - "version": "1.18.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz", - "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==", - "dev": true, + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", - "is-callable": "^1.2.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", @@ -5540,7 +6418,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", - "dev": true, "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -5552,36 +6429,31 @@ "has-symbols": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", - "dev": true + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==" }, "is-callable": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", - "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", - "dev": true + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==" }, "is-regex": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, "requires": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" } }, "object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", - "dev": true + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==" }, "string.prototype.trimend": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", - "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" @@ -5591,7 +6463,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", - "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" @@ -5599,41 +6470,44 @@ } } }, - "array.prototype.find": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.1.tgz", - "integrity": "sha512-mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA==", - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.4" - } - }, "array.prototype.flat": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz", - "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz", + "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==", "requires": { - "call-bind": "^1.0.0", + "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1" + "es-abstract": "^1.19.0" }, "dependencies": { + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, "es-abstract": { - "version": "1.18.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz", - "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", - "is-callable": "^1.2.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", @@ -5642,27 +6516,18 @@ "unbox-primitive": "^1.0.1" }, "dependencies": { - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", "requires": { "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "has": "^1.0.3", + "has-symbols": "^1.0.1" } } } }, - "get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1" - } - }, "has-symbols": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", @@ -5680,23 +6545,12 @@ "requires": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" - }, - "dependencies": { - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - } } }, "object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==" + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==" }, "string.prototype.trimend": { "version": "1.0.4", @@ -5705,17 +6559,6 @@ "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" - }, - "dependencies": { - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - } } }, "string.prototype.trimstart": { @@ -5725,50 +6568,41 @@ "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" - }, - "dependencies": { - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - } } } } }, "array.prototype.flatmap": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz", - "integrity": "sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz", + "integrity": "sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==", "dev": true, "requires": { "call-bind": "^1.0.0", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1", - "function-bind": "^1.1.1" + "es-abstract": "^1.19.0" }, "dependencies": { "es-abstract": { - "version": "1.18.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz", - "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", - "is-callable": "^1.2.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", @@ -5835,9 +6669,9 @@ } }, "object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", "dev": true }, "string.prototype.trimend": { @@ -6005,20 +6839,26 @@ "integrity": "sha1-S3KPrwoZVVGU1PvQVYL4M/3NE3s=" }, "autoprefixer": { - "version": "9.8.6", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz", - "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==", + "version": "9.8.8", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz", + "integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==", "dev": true, "requires": { "browserslist": "^4.12.0", "caniuse-lite": "^1.0.30001109", - "colorette": "^1.2.1", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", + "picocolors": "^0.2.1", "postcss": "^7.0.32", "postcss-value-parser": "^4.1.0" }, "dependencies": { + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true + }, "postcss-value-parser": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", @@ -6045,18 +6885,26 @@ "dev": true }, "axe-core": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.3.tgz", - "integrity": "sha512-/lqqLAmuIPi79WYfRpy2i8z+x+vxU3zX2uAm0gs1q52qTuKwolOj1P8XbufpXcsydrpKx2yGn2wzAnxCMV86QA==", + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.5.tgz", + "integrity": "sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==", "dev": true }, "axios": { - "version": "0.21.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", - "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", "dev": true, "requires": { - "follow-redirects": "^1.10.0" + "follow-redirects": "^1.14.0" + }, + "dependencies": { + "follow-redirects": { + "version": "1.14.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", + "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==", + "dev": true + } } }, "axobject-query": { @@ -6065,28 +6913,6 @@ "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==", "dev": true }, - "babel-eslint": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz", - "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.0", - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0", - "eslint-visitor-keys": "^1.0.0", - "resolve": "^1.12.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - } - } - }, "babel-jest": { "version": "26.6.3", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz", @@ -6104,9 +6930,9 @@ } }, "babel-loader": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz", - "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==", + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz", + "integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==", "dev": true, "requires": { "find-cache-dir": "^3.3.1", @@ -6206,33 +7032,16 @@ "object.assign": "^4.1.0" } }, - "babel-plugin-emotion": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.2.2.tgz", - "integrity": "sha512-SMSkGoqTbTyUTDeuVuPIWifPdUGkTk1Kf9BWRiXIOIcuyMfsdp2EjeiiFvOzX8NOBvEh/ypKYvUh2rkgAJMCLA==", - "requires": { - "@babel/helper-module-imports": "^7.0.0", - "@emotion/hash": "0.8.0", - "@emotion/memoize": "0.7.4", - "@emotion/serialize": "^0.11.16", - "babel-plugin-macros": "^2.0.0", - "babel-plugin-syntax-jsx": "^6.18.0", - "convert-source-map": "^1.5.0", - "escape-string-regexp": "^1.0.5", - "find-root": "^1.1.0", - "source-map": "^0.5.7" - } - }, "babel-plugin-istanbul": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz", - "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", "@istanbuljs/load-nyc-config": "^1.0.0", "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-instrument": "^5.0.4", "test-exclude": "^6.0.0" } }, @@ -6259,13 +7068,13 @@ } }, "babel-plugin-polyfill-corejs2": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz", - "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz", + "integrity": "sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA==", "dev": true, "requires": { "@babel/compat-data": "^7.13.11", - "@babel/helper-define-polyfill-provider": "^0.2.2", + "@babel/helper-define-polyfill-provider": "^0.3.0", "semver": "^6.1.1" }, "dependencies": { @@ -6278,29 +7087,24 @@ } }, "babel-plugin-polyfill-corejs3": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz", - "integrity": "sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz", + "integrity": "sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw==", "dev": true, "requires": { - "@babel/helper-define-polyfill-provider": "^0.2.2", - "core-js-compat": "^3.14.0" + "@babel/helper-define-polyfill-provider": "^0.3.0", + "core-js-compat": "^3.18.0" } }, "babel-plugin-polyfill-regenerator": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz", - "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz", + "integrity": "sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg==", "dev": true, "requires": { - "@babel/helper-define-polyfill-provider": "^0.2.2" + "@babel/helper-define-polyfill-provider": "^0.3.0" } }, - "babel-plugin-syntax-jsx": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz", - "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=" - }, "babel-preset-current-node-syntax": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", @@ -6419,7 +7223,8 @@ "base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true }, "base64id": { "version": "2.0.0", @@ -7060,6 +7865,7 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, "requires": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -7391,9 +8197,9 @@ } }, "chalk": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -7573,12 +8379,6 @@ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", "dev": true - }, - "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true } } }, @@ -7596,22 +8396,22 @@ }, "dependencies": { "css-select": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz", - "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz", + "integrity": "sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==", "dev": true, "requires": { "boolbase": "^1.0.0", - "css-what": "^5.0.0", - "domhandler": "^4.2.0", - "domutils": "^2.6.0", - "nth-check": "^2.0.0" + "css-what": "^5.1.0", + "domhandler": "^4.3.0", + "domutils": "^2.8.0", + "nth-check": "^2.0.1" } }, "css-what": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz", - "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", + "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==", "dev": true }, "dom-serializer": { @@ -7643,9 +8443,9 @@ } }, "nth-check": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz", - "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", + "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==", "dev": true, "requires": { "boolbase": "^1.0.0" @@ -7794,12 +8594,6 @@ } } }, - "clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true - }, "clean-webpack-plugin": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz", @@ -7923,12 +8717,6 @@ "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==", "dev": true }, - "collapse-white-space": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz", - "integrity": "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==", - "dev": true - }, "collect-v8-coverage": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", @@ -7978,10 +8766,15 @@ "simple-swizzle": "^0.2.2" } }, + "colord": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz", + "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==" + }, "colorette": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz", - "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", + "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", "dev": true }, "colors": { @@ -8006,9 +8799,9 @@ "dev": true }, "comment-parser": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.5.tgz", - "integrity": "sha512-RePCE4leIhBlmrqiYTvaqEeGYg7qpSl4etaIabKtdOQVi+mSTIBBklGUwIr79GXYnl3LpMwmDw4KeR2stNc6FA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.2.4.tgz", + "integrity": "sha512-pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw==", "dev": true }, "commondir": { @@ -8338,56 +9131,50 @@ } }, "core-js": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.17.0.tgz", - "integrity": "sha512-zXT4rclS9jM6tikbAUKAGLonuRKOJ2ZvBnZCEOJAbzuTLw4kKcuA5plNt8juzdU6O/py/EgAehzvLh0VXEdBbQ==", + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.0.tgz", + "integrity": "sha512-KjbKU7UEfg4YPpskMtMXPhUKn7m/1OdTHTVjy09ScR2LVaoUXe8Jh0UdvN2EKUR6iKTJph52SJP95mAB0MnVLQ==", "dev": true }, "core-js-compat": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.17.0.tgz", - "integrity": "sha512-haEcBrfU3hu83JXWpcLHzeg8Ypf05LGK4GIjzLiYgFJYXuxrkdN2MrDBeHt/t5/ZFmIzLcdsT2x8Xw654wXsuw==", + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.20.0.tgz", + "integrity": "sha512-relrah5h+sslXssTTOkvqcC/6RURifB0W5yhYBdBkaPYa5/2KBMiog3XiD+s3TwEHWxInWVv4Jx2/Lw0vng+IQ==", "dev": true, "requires": { - "browserslist": "^4.16.8", + "browserslist": "^4.19.1", "semver": "7.0.0" }, "dependencies": { "browserslist": { - "version": "4.16.8", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz", - "integrity": "sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ==", + "version": "4.19.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz", + "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001251", - "colorette": "^1.3.0", - "electron-to-chromium": "^1.3.811", + "caniuse-lite": "^1.0.30001286", + "electron-to-chromium": "^1.4.17", "escalade": "^3.1.1", - "node-releases": "^1.1.75" + "node-releases": "^2.0.1", + "picocolors": "^1.0.0" } }, "caniuse-lite": { - "version": "1.0.30001252", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz", - "integrity": "sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw==", - "dev": true - }, - "colorette": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz", - "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==", + "version": "1.0.30001291", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001291.tgz", + "integrity": "sha512-roMV5V0HNGgJ88s42eE70sstqGW/gwFndosYrikHthw98N5tLnOTxFqMLQjZVRxTWFlJ4rn+MsgXrR7MDPY4jA==", "dev": true }, "electron-to-chromium": { - "version": "1.3.826", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.826.tgz", - "integrity": "sha512-bpLc4QU4B8PYmdO4MSu2ZBTMD8lAaEXRS43C09lB31BvYwuk9UxgBRXbY5OJBw7VuMGcg2MZG5FyTaP9u4PQnw==", + "version": "1.4.25", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.25.tgz", + "integrity": "sha512-bTwub9Y/76EiNmfaiJih+hAy6xn7Ns95S4KvI2NuKNOz8TEEKKQUu44xuy0PYMudjM9zdjKRS1bitsUvHTfuUg==", "dev": true }, "node-releases": { - "version": "1.1.75", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz", - "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", + "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", "dev": true }, "semver": { @@ -8399,9 +9186,9 @@ } }, "core-js-pure": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.17.0.tgz", - "integrity": "sha512-O5RvMRWW+I0hfR227mrIwU+gPLVaa4kPEq+9b8FcjuFed4QckOvYc94c2KSI/X5dlvcsj/V1Sp5F5cecYpNQOQ==", + "version": "3.20.3", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.20.3.tgz", + "integrity": "sha512-Q2H6tQ5MtPtcC7f3HxJ48i4Q7T9ybPKgvWyuH7JXIoNa2pm0KuBnycsET/qw1SLLZYfbsbrZQNMeIOClb+6WIA==", "dev": true }, "core-js-url-browser": { @@ -8453,17 +9240,6 @@ } } }, - "create-emotion": { - "version": "10.0.27", - "resolved": "https://registry.npmjs.org/create-emotion/-/create-emotion-10.0.27.tgz", - "integrity": "sha512-fIK73w82HPPn/RsAij7+Zt8eCE8SptcJ3WoRMfxMtjteYxud8GDTKKld7MYwAX2TVhrw29uR1N/bVGxeStHILg==", - "requires": { - "@emotion/cache": "^10.0.27", - "@emotion/serialize": "^0.11.15", - "@emotion/sheet": "0.9.4", - "@emotion/utils": "0.11.3" - } - }, "create-hash": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", @@ -8574,82 +9350,37 @@ } }, "css-loader": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.7.tgz", - "integrity": "sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.5.1.tgz", + "integrity": "sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ==", "dev": true, "requires": { "icss-utils": "^5.1.0", - "loader-utils": "^2.0.0", "postcss": "^8.2.15", "postcss-modules-extract-imports": "^3.0.0", "postcss-modules-local-by-default": "^4.0.0", "postcss-modules-scope": "^3.0.0", "postcss-modules-values": "^4.0.0", "postcss-value-parser": "^4.1.0", - "schema-utils": "^3.0.0", "semver": "^7.3.5" }, "dependencies": { - "@types/json-schema": { - "version": "7.0.9", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", - "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", - "dev": true - }, - "colorette": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz", - "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==", - "dev": true - }, - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, "postcss": { - "version": "8.3.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz", - "integrity": "sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==", + "version": "8.4.5", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz", + "integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==", "dev": true, "requires": { - "colorette": "^1.2.2", - "nanoid": "^3.1.23", - "source-map-js": "^0.6.2" + "nanoid": "^3.1.30", + "picocolors": "^1.0.0", + "source-map-js": "^1.0.1" } }, - "postcss-value-parser": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", - "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", - "dev": true - }, - "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } + "postcss-value-parser": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", + "dev": true }, "semver": { "version": "7.3.5", @@ -8832,6 +9563,12 @@ "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==", "dev": true }, + "cssnano-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.0.0.tgz", + "integrity": "sha512-Pzs7/BZ6OgT+tXXuF12DKR8SmSbzUeVYCtMBbS8lI0uAm3mrYmkyqCXXPsQESI6kmLfEVBppbdVY/el3hg3nAA==", + "dev": true + }, "csso": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", @@ -8889,9 +9626,9 @@ } }, "csstype": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz", - "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==" + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz", + "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==" }, "current-script-polyfill": { "version": "1.0.0", @@ -8930,9 +9667,9 @@ "dev": true }, "damerau-levenshtein": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz", - "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", + "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==", "dev": true }, "dashdash": { @@ -8953,6 +9690,34 @@ "abab": "^2.0.3", "whatwg-mimetype": "^2.3.0", "whatwg-url": "^8.0.0" + }, + "dependencies": { + "tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "dev": true, + "requires": { + "punycode": "^2.1.1" + } + }, + "webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "dev": true + }, + "whatwg-url": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", + "dev": true, + "requires": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + } + } } }, "date-format": { @@ -9215,9 +9980,9 @@ } }, "deep-extend": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", - "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true }, "deep-for-each": { @@ -9375,9 +10140,9 @@ "dev": true }, "devtools-protocol": { - "version": "0.0.869402", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz", - "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==", + "version": "0.0.901419", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz", + "integrity": "sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==", "dev": true }, "di": { @@ -9530,12 +10295,20 @@ "dev": true, "requires": { "webidl-conversions": "^5.0.0" + }, + "dependencies": { + "webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "dev": true + } } }, "domhandler": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz", - "integrity": "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz", + "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==", "dev": true, "requires": { "domelementtype": "^2.2.0" @@ -9633,6 +10406,11 @@ } } }, + "downloadjs": { + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/downloadjs/-/downloadjs-1.4.7.tgz", + "integrity": "sha1-9p+W+UDg0FU9rCkROYZaPNAQHjw=" + }, "downshift": { "version": "6.1.7", "resolved": "https://registry.npmjs.org/downshift/-/downshift-6.1.7.tgz", @@ -9645,23 +10423,10 @@ "tslib": "^2.3.0" }, "dependencies": { - "@babel/runtime": { - "version": "7.15.3", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz", - "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==", - "requires": { - "regenerator-runtime": "^0.13.4" - } - }, "react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" - }, - "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" } } }, @@ -9756,15 +10521,6 @@ "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", "dev": true }, - "emotion": { - "version": "10.0.27", - "resolved": "https://registry.npmjs.org/emotion/-/emotion-10.0.27.tgz", - "integrity": "sha512-2xdDzdWWzue8R8lu4G76uWX5WhyQuzATon9LmNeCy/2BHVC6dsEpfhN1a0qhELgtDVdjyEA6J8Y/VlI5ZnaH0g==", - "requires": { - "babel-plugin-emotion": "^10.0.27", - "create-emotion": "^10.0.27" - } - }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -9872,6 +10628,12 @@ "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==", "dev": true }, + "envinfo": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", + "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", + "dev": true + }, "enzyme": { "version": "3.11.0", "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.11.0.tgz", @@ -9958,6 +10720,7 @@ "version": "1.17.7", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "dev": true, "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -9978,6 +10741,12 @@ "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", "dev": true }, + "es-module-lexer": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", + "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", + "dev": true + }, "es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -10017,9 +10786,9 @@ }, "dependencies": { "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true }, "levn": { @@ -10128,9 +10897,9 @@ } }, "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "cross-spawn": { @@ -10187,9 +10956,9 @@ } }, "globals": { - "version": "13.11.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", - "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", + "version": "13.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", + "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -10223,12 +10992,12 @@ "dev": true }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^5.0.1" } }, "type-fest": { @@ -10264,26 +11033,36 @@ "ms": "^2.1.1" } }, + "is-core-module": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", + "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, "resolve": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", - "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz", + "integrity": "sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==", "dev": true, "requires": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" + "is-core-module": "^2.8.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" } } } }, "eslint-module-utils": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz", - "integrity": "sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q==", + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz", + "integrity": "sha512-zquepFnWCY2ISMFwD/DqzaM++H+7PDzOpUvotJWm/y1BAFt5R4oeULgdrTejKqLkz7MA/tgstsUMNYc7wNdTrg==", "dev": true, "requires": { "debug": "^3.2.7", - "pkg-dir": "^2.0.0" + "find-up": "^2.1.0" }, "dependencies": { "debug": { @@ -10337,39 +11116,28 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true - }, - "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", - "dev": true, - "requires": { - "find-up": "^2.1.0" - } } } }, "eslint-plugin-import": { - "version": "2.24.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz", - "integrity": "sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==", + "version": "2.25.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz", + "integrity": "sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==", "dev": true, "requires": { - "array-includes": "^3.1.3", - "array.prototype.flat": "^1.2.4", + "array-includes": "^3.1.4", + "array.prototype.flat": "^1.2.5", "debug": "^2.6.9", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.6", - "eslint-module-utils": "^2.6.2", - "find-up": "^2.0.0", + "eslint-module-utils": "^2.7.2", "has": "^1.0.3", - "is-core-module": "^2.6.0", + "is-core-module": "^2.8.0", + "is-glob": "^4.0.3", "minimatch": "^3.0.4", - "object.values": "^1.1.4", - "pkg-up": "^2.0.0", - "read-pkg-up": "^3.0.0", + "object.values": "^1.1.5", "resolve": "^1.20.0", - "tsconfig-paths": "^3.11.0" + "tsconfig-paths": "^3.12.0" }, "dependencies": { "call-bind": { @@ -10392,22 +11160,25 @@ } }, "es-abstract": { - "version": "1.18.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz", - "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", - "is-callable": "^1.2.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", @@ -10429,15 +11200,6 @@ } } }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, "has-symbols": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", @@ -10451,14 +11213,23 @@ "dev": true }, "is-core-module": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz", - "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", + "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", "dev": true, "requires": { "has": "^1.0.3" } }, + "is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + }, "is-regex": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", @@ -10469,16 +11240,6 @@ "has-tostringtag": "^1.0.0" } }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -10486,64 +11247,31 @@ "dev": true }, "object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", "dev": true }, "object.values": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz", - "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz", + "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.2" - } - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, - "read-pkg-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", - "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", - "dev": true, - "requires": { - "find-up": "^2.0.0", - "read-pkg": "^3.0.0" + "es-abstract": "^1.19.1" } }, "resolve": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", - "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz", + "integrity": "sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==", "dev": true, "requires": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" + "is-core-module": "^2.8.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" } }, "string.prototype.trimend": { @@ -10569,35 +11297,35 @@ } }, "eslint-plugin-jest": { - "version": "24.4.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz", - "integrity": "sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg==", + "version": "24.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.7.0.tgz", + "integrity": "sha512-wUxdF2bAZiYSKBclsUMrYHH6WxiBreNjyDxbRv345TIvPeoCEgPNEn3Sa+ZrSqsf1Dl9SqqSREXMHExlMMu1DA==", "dev": true, "requires": { "@typescript-eslint/experimental-utils": "^4.0.1" } }, "eslint-plugin-jsdoc": { - "version": "34.8.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-34.8.2.tgz", - "integrity": "sha512-UOU9A40Cl806JMtla2vF+RM6sNqfLPbhLv9FZqhcC7+LmChD3DVaWqM7ADxpF0kMyZNWe1QKUnqGnXaA3NTn+w==", + "version": "36.1.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.1.tgz", + "integrity": "sha512-nuLDvH1EJaKx0PCa9oeQIxH6pACIhZd1gkalTUxZbaxxwokjs7TplqY0Q8Ew3CoZaf5aowm0g/Z3JGHCatt+gQ==", "dev": true, "requires": { - "@es-joy/jsdoccomment": "^0.6.0", - "comment-parser": "1.1.5", - "debug": "^4.3.1", + "@es-joy/jsdoccomment": "0.10.8", + "comment-parser": "1.2.4", + "debug": "^4.3.2", "esquery": "^1.4.0", - "jsdoctypeparser": "^9.0.0", + "jsdoc-type-pratt-parser": "^1.1.1", "lodash": "^4.17.21", - "regextras": "^0.7.1", + "regextras": "^0.8.0", "semver": "^7.3.5", "spdx-expression-parse": "^3.0.1" }, "dependencies": { "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dev": true, "requires": { "ms": "2.1.2" @@ -10621,22 +11349,23 @@ } }, "eslint-plugin-jsx-a11y": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz", - "integrity": "sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz", + "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==", "dev": true, "requires": { - "@babel/runtime": "^7.11.2", + "@babel/runtime": "^7.16.3", "aria-query": "^4.2.2", - "array-includes": "^3.1.1", + "array-includes": "^3.1.4", "ast-types-flow": "^0.0.7", - "axe-core": "^4.0.2", + "axe-core": "^4.3.5", "axobject-query": "^2.2.0", - "damerau-levenshtein": "^1.0.6", - "emoji-regex": "^9.0.0", + "damerau-levenshtein": "^1.0.7", + "emoji-regex": "^9.2.2", "has": "^1.0.3", - "jsx-ast-utils": "^3.1.0", - "language-tags": "^1.0.5" + "jsx-ast-utils": "^3.2.1", + "language-tags": "^1.0.5", + "minimatch": "^3.0.4" }, "dependencies": { "emoji-regex": { @@ -10648,14 +11377,12 @@ } }, "eslint-plugin-markdown": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-markdown/-/eslint-plugin-markdown-1.0.2.tgz", - "integrity": "sha512-BfvXKsO0K+zvdarNc801jsE/NTLmig4oKhZ1U3aSUgTf2dB/US5+CrfGxMsCK2Ki1vS1R3HPok+uYpufFndhzw==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-markdown/-/eslint-plugin-markdown-2.2.1.tgz", + "integrity": "sha512-FgWp4iyYvTFxPwfbxofTvXxgzPsDuSKHQy2S+a8Ve6savbujey+lgrFFbXQA0HPygISpRYWYBjooPzhYSF81iA==", "dev": true, "requires": { - "object-assign": "^4.0.1", - "remark-parse": "^5.0.0", - "unified": "^6.1.2" + "mdast-util-from-markdown": "^0.8.5" } }, "eslint-plugin-prettier": { @@ -10668,24 +11395,25 @@ } }, "eslint-plugin-react": { - "version": "7.25.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.25.1.tgz", - "integrity": "sha512-P4j9K1dHoFXxDNP05AtixcJEvIT6ht8FhYKsrkY0MPCPaUMYijhpWwNiRDZVtA8KFuZOkGSeft6QwH8KuVpJug==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.28.0.tgz", + "integrity": "sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw==", "dev": true, "requires": { - "array-includes": "^3.1.3", - "array.prototype.flatmap": "^1.2.4", + "array-includes": "^3.1.4", + "array.prototype.flatmap": "^1.2.5", "doctrine": "^2.1.0", - "estraverse": "^5.2.0", - "has": "^1.0.3", + "estraverse": "^5.3.0", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.0.4", - "object.entries": "^1.1.4", - "object.fromentries": "^2.0.4", - "object.values": "^1.1.4", + "object.entries": "^1.1.5", + "object.fromentries": "^2.0.5", + "object.hasown": "^1.1.0", + "object.values": "^1.1.5", "prop-types": "^15.7.2", "resolve": "^2.0.0-next.3", - "string.prototype.matchall": "^4.0.5" + "semver": "^6.3.0", + "string.prototype.matchall": "^4.0.6" }, "dependencies": { "call-bind": { @@ -10699,22 +11427,25 @@ } }, "es-abstract": { - "version": "1.18.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz", - "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", - "is-callable": "^1.2.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", @@ -10737,9 +11468,9 @@ } }, "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true }, "has-symbols": { @@ -10765,20 +11496,20 @@ } }, "object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", "dev": true }, "object.values": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz", - "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz", + "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.2" + "es-abstract": "^1.19.1" } }, "resolve": { @@ -10791,6 +11522,12 @@ "path-parse": "^1.0.6" } }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, "string.prototype.trimend": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", @@ -10814,9 +11551,9 @@ } }, "eslint-plugin-react-hooks": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz", - "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz", + "integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==", "dev": true }, "eslint-scope": { @@ -10885,9 +11622,9 @@ }, "dependencies": { "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true } } @@ -11468,9 +12205,9 @@ "dev": true }, "fast-glob": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", - "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", + "version": "3.2.11", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", + "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", @@ -11515,9 +12252,9 @@ } }, "picomatch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", - "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, "to-regex-range": { @@ -11548,6 +12285,16 @@ "resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz", "integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==" }, + "fast-xml-parser": { + "version": "3.21.1", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz", + "integrity": "sha512-FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg==", + "dev": true, + "optional": true, + "requires": { + "strnum": "^1.0.4" + } + }, "fastest-levenshtein": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", @@ -11560,9 +12307,9 @@ "integrity": "sha512-Pb8d48e+oIuY4MaM64Cd7OW1gt4nxCHs7/ddPPZ/Ic3sg8yVGM7O9wDvZ7us6ScaUupzM+pfBolwtYhN1IxBIw==" }, "fastq": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.12.0.tgz", - "integrity": "sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", + "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", "dev": true, "requires": { "reusify": "^1.0.4" @@ -11586,94 +12333,50 @@ "bser": "2.1.1" } }, - "fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", - "dev": true, - "requires": { - "pend": "~1.2.0" - } - }, - "fetch-blob": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-2.1.2.tgz", - "integrity": "sha512-YKqtUDwqLyfyMnmbw8XD6Q8j9i/HggKtPEI+pZ1+8bvheBu78biSmNaXWusx1TauGqtUUGx/cBb1mKdq2rLYow==" - }, - "figgy-pudding": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", - "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==", - "dev": true - }, - "figures": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", - "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5", - "object-assign": "^4.1.0" - } - }, - "file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "requires": { - "flat-cache": "^3.0.4" - } - }, - "file-loader": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz", - "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==", - "dev": true, - "requires": { - "loader-utils": "^2.0.0", - "schema-utils": "^3.0.0" - }, - "dependencies": { - "@types/json-schema": { - "version": "7.0.9", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", - "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", - "dev": true - }, - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } - } - } - }, + "fd-slicer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", + "dev": true, + "requires": { + "pend": "~1.2.0" + } + }, + "fetch-blob": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-2.1.2.tgz", + "integrity": "sha512-YKqtUDwqLyfyMnmbw8XD6Q8j9i/HggKtPEI+pZ1+8bvheBu78biSmNaXWusx1TauGqtUUGx/cBb1mKdq2rLYow==" + }, + "figgy-pudding": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", + "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==", + "dev": true + }, + "figures": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", + "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5", + "object-assign": "^4.1.0" + } + }, + "file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "requires": { + "flat-cache": "^3.0.4" + } + }, + "file-saver": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" + }, "file-sync-cmp": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz", @@ -11800,9 +12503,9 @@ } }, "find-process": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.4.tgz", - "integrity": "sha512-rRSuT1LE4b+BFK588D2V8/VG9liW0Ark1XJgroxZXI0LtwmQJOb490DvDYvbm+Hek9ETFzTutGfJ90gumITPhQ==", + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz", + "integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==", "dev": true, "requires": { "chalk": "^4.0.0", @@ -11841,72 +12544,6 @@ "semver-regex": "^2.0.0" } }, - "findup-sync": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz", - "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==", - "dev": true, - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^4.0.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" - }, - "dependencies": { - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "dev": true, - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "dev": true, - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", - "dev": true, - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - } - }, - "resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", - "dev": true, - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - } - }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, "fined": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz", @@ -11967,9 +12604,9 @@ } }, "flatted": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz", - "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz", + "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==", "dev": true }, "flush-write-stream": { @@ -12035,9 +12672,9 @@ "dev": true }, "fraction.js": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz", - "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.2.tgz", + "integrity": "sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA==", "dev": true }, "fragment-cache": { @@ -12062,10 +12699,20 @@ "tslib": "^2.1.0" }, "dependencies": { - "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + "@emotion/is-prop-valid": { + "version": "0.8.8", + "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz", + "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==", + "optional": true, + "requires": { + "@emotion/memoize": "0.7.4" + } + }, + "@emotion/memoize": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz", + "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==", + "optional": true } } }, @@ -12075,13 +12722,6 @@ "integrity": "sha512-oc5m68HDO/tuK2blj7ZcdEBRx3p1PjrgHazL8GYEpvULhrtGIFbQArN6cQS2QhW8mitffaB+VYzMjDqBxxQeoA==", "requires": { "tslib": "^2.1.0" - }, - "dependencies": { - "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" - } } }, "fresh": { @@ -12139,15 +12779,6 @@ } } }, - "fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - } - }, "fs-write-stream-atomic": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", @@ -12177,13 +12808,13 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "function.prototype.name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.4.tgz", - "integrity": "sha512-iqy1pIotY/RmhdFZygSSlW0wko2yxkSCKqsuv4pr8QESohpYyG/Z7B/XXvPRKTJS//960rgguE5mSRUsDdaJrQ==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", + "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", + "es-abstract": "^1.19.0", "functions-have-names": "^1.2.2" }, "dependencies": { @@ -12197,21 +12828,24 @@ } }, "es-abstract": { - "version": "1.18.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz", - "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", - "is-callable": "^1.2.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", @@ -12252,9 +12886,9 @@ } }, "object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==" + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==" }, "string.prototype.trimend": { "version": "1.0.4", @@ -12353,6 +12987,36 @@ "pump": "^3.0.0" } }, + "get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + }, + "dependencies": { + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } + } + } + }, "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", @@ -12595,12 +13259,6 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" }, - "graceful-readlink": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", - "dev": true - }, "gradient-parser": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/gradient-parser/-/gradient-parser-0.1.5.tgz", @@ -12779,55 +13437,13 @@ } }, "grunt-contrib-concat": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-1.0.1.tgz", - "integrity": "sha1-YVCYYwhOhx1+ht5IwBUlntl3Rb0=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-2.0.0.tgz", + "integrity": "sha512-/cfWwsGiprVTOl7c2bZwMdQ8hIf3e1f4szm1i7qhY9hOnR/X2KL+Xe7dynNweTYHa6aWPZx2B5GPsUpxAXNCaA==", "dev": true, "requires": { - "chalk": "^1.0.0", + "chalk": "^4.1.2", "source-map": "^0.5.3" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } } }, "grunt-contrib-copy": { @@ -12990,60 +13606,32 @@ } }, "grunt-contrib-jshint": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-3.0.0.tgz", - "integrity": "sha512-o0V3HNK54+w2Lss/AP0LsAUCEmPDQIcgsDFvTy0sE8sdPXq/8vHdNdMEitK9Wcfoq7H6v02v6soiiwJ0wavT7A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-3.1.1.tgz", + "integrity": "sha512-EwMY6L91FqTcMlZTVoDeeq/EZL+7MoFyo1rxIea9sxyv73geVggeE37jcUhNbu5hLbxHE82CGIUqitHuR2/q+g==", "dev": true, "requires": { "chalk": "^4.1.0", "hooker": "^0.2.3", - "jshint": "~2.12.0" + "jshint": "~2.13.0" } }, "grunt-contrib-qunit": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-4.0.0.tgz", - "integrity": "sha512-XP9Ks+uoSQzic0eic6koD8kYAKQnSYfu2G1HBqvrvUyXaDDnSSXOKELND8j7dwudnJj4N6KgW6OU7AHeM5PGKA==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-5.1.1.tgz", + "integrity": "sha512-W1V+55kWF8TARdCDWEwzrbAoielwqrKKppiTwnu3N2kMa73oQIlKNQOnOq32tzruXdTDZX4B5yYustfNp3bdRA==", "dev": true, "requires": { "eventemitter2": "^6.4.2", "p-each-series": "^2.1.0", - "puppeteer": "^4.0.0" + "puppeteer": "^5.0.0" }, "dependencies": { "eventemitter2": { - "version": "6.4.3", - "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.3.tgz", - "integrity": "sha512-t0A2msp6BzOf+QAcI6z9XMktLj52OjGQg+8SJH6v5+3uxNpWYRR3wQmfA+6xtMU9kOC59qk9licus5dYcrYkMQ==", + "version": "6.4.5", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.5.tgz", + "integrity": "sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw==", "dev": true - }, - "puppeteer": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-4.0.1.tgz", - "integrity": "sha512-LIiSWTRqpTnnm3R2yAoMBx1inSeKwVZy66RFSkgSTDINzheJZPd5z5mMbPM0FkvwWAZ27a+69j5nZf+Fpyhn3Q==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "extract-zip": "^2.0.0", - "https-proxy-agent": "^4.0.0", - "mime": "^2.0.3", - "mitt": "^2.0.1", - "progress": "^2.0.1", - "proxy-from-env": "^1.0.0", - "rimraf": "^3.0.2", - "tar-fs": "^2.0.0", - "unbzip2-stream": "^1.3.3", - "ws": "^7.2.3" - } - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } } } }, @@ -13090,12 +13678,6 @@ "integrity": "sha1-P376M2lvoFdwsoCU9EUIyvxdLto=", "dev": true }, - "grunt-includes": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/grunt-includes/-/grunt-includes-1.1.0.tgz", - "integrity": "sha512-aZQfL+fiAonPI173QUjGyuCkaUTJci7+a5SkmSAbezUikwLban7Jp6W+vbA/Mnacmy+EPipnuK5kAF6O0SvrDw==", - "dev": true - }, "grunt-jsdoc": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/grunt-jsdoc/-/grunt-jsdoc-2.4.1.tgz", @@ -13580,6 +14162,14 @@ "resolved": "https://registry.npmjs.org/highlight-words-core/-/highlight-words-core-1.2.2.tgz", "integrity": "sha512-BXUKIkUuh6cmmxzi5OIbUJxrG8OAk2MqoL1DtO3Wo9D2faJg2ph5ntyuQeLqaHJmzER6H5tllCDA9ZnNe9BVGg==" }, + "history": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/history/-/history-5.2.0.tgz", + "integrity": "sha512-uPSF6lAJb3nSePJ43hN3eKj1dTWpN9gMod0ZssbFTIsen+WehTmEadgL+kg78xLJFdRfrrC//SavDzmRVdE+Ig==", + "requires": { + "@babel/runtime": "^7.7.6" + } + }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -13654,13 +14244,6 @@ "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=", "dev": true }, - "html-comment-regex": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz", - "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==", - "dev": true, - "optional": true - }, "html-element-map": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/html-element-map/-/html-element-map-1.3.1.tgz", @@ -13889,7 +14472,8 @@ "ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true }, "iferr": { "version": "0.1.5", @@ -13898,15 +14482,9 @@ "dev": true }, "ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true - }, - "ignore-emit-webpack-plugin": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/ignore-emit-webpack-plugin/-/ignore-emit-webpack-plugin-2.0.6.tgz", - "integrity": "sha512-/zC18RWCC2wz4ZwnS4UoujGWzvSKy28DLjtE+jrGBOXej6YdmityhBDzE8E0NlktEqi4tgdNbydX8B6G4haHSQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", + "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", "dev": true }, "imagemin": { @@ -14090,18 +14668,6 @@ "requires": { "is-svg": "^4.2.1", "svgo": "^1.3.2" - }, - "dependencies": { - "is-svg": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-4.2.1.tgz", - "integrity": "sha512-PHx3ANecKsKNl5y5+Jvt53Y4J7MfMpbNZkv384QNiswMKAWIbvcqbPz+sYbFKJI8Xv3be01GSFniPmoaP+Ai5A==", - "dev": true, - "optional": true, - "requires": { - "html-comment-regex": "^1.1.2" - } - } } }, "imagesloaded": { @@ -14112,6 +14678,11 @@ "ev-emitter": "^1.0.0" } }, + "immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=" + }, "import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -14128,9 +14699,9 @@ "dev": true }, "import-local": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz", - "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", + "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", "dev": true, "requires": { "pkg-dir": "^4.2.0", @@ -14353,9 +14924,9 @@ } }, "interpret": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", - "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", + "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==", "dev": true }, "into-stream": { @@ -14771,6 +15342,11 @@ "dev": true, "optional": true }, + "is-shared-array-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz", + "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==" + }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", @@ -14791,6 +15367,16 @@ "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=", "dev": true }, + "is-svg": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-4.3.1.tgz", + "integrity": "sha512-h2CGs+yPUyvkgTJQS9cJzo9lYK06WgRiXUqBBHtglSzVKAuH4/oWsqk7LGfbSa1hGk9QcZ0SyQtVggvBA8LZXA==", + "dev": true, + "optional": true, + "requires": { + "fast-xml-parser": "^3.19.0" + } + }, "is-symbol": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", @@ -14836,11 +15422,24 @@ "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", "dev": true }, - "is-whitespace-character": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz", - "integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==", - "dev": true + "is-weakref": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "requires": { + "call-bind": "^1.0.2" + }, + "dependencies": { + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + } + } }, "is-windows": { "version": "1.0.2", @@ -14848,12 +15447,6 @@ "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", "dev": true }, - "is-word-character": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz", - "integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==", - "dev": true - }, "is-wsl": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", @@ -14899,23 +15492,30 @@ "dev": true }, "istanbul-lib-coverage": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", - "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", + "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", "dev": true }, "istanbul-lib-instrument": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", - "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz", + "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==", "dev": true, "requires": { - "@babel/core": "^7.7.5", + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-coverage": "^3.2.0", "semver": "^6.3.0" }, "dependencies": { + "@babel/parser": { + "version": "7.16.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.8.tgz", + "integrity": "sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==", + "dev": true + }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -14968,9 +15568,9 @@ } }, "istanbul-lib-source-maps": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz", - "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", "dev": true, "requires": { "debug": "^4.1.1", @@ -14987,9 +15587,9 @@ } }, "istanbul-reports": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz", - "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.3.tgz", + "integrity": "sha512-x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg==", "dev": true, "requires": { "html-escaper": "^2.0.0", @@ -15019,9 +15619,9 @@ }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { @@ -15127,23 +15727,23 @@ "dev": true }, "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "strip-ansi": "^6.0.1" } }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^5.0.1" } }, "wrap-ansi": { @@ -15370,9 +15970,9 @@ } }, "picomatch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", - "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, "to-regex-range": { @@ -15387,86 +15987,46 @@ } }, "jest-dev-server": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-4.4.0.tgz", - "integrity": "sha512-STEHJ3iPSC8HbrQ3TME0ozGX2KT28lbT4XopPxUm2WimsX3fcB3YOptRh12YphQisMhfqNSNTZUmWyT3HEXS2A==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-5.0.3.tgz", + "integrity": "sha512-aJR3a5KdY18Lsz+VbREKwx2HM3iukiui+J9rlv9o6iYTwZCSsJazSTStcD9K1q0AIF3oA+FqLOKDyo/sc7+fJw==", "dev": true, "requires": { - "chalk": "^3.0.0", + "chalk": "^4.1.1", "cwd": "^0.10.0", - "find-process": "^1.4.3", - "prompts": "^2.3.0", - "spawnd": "^4.4.0", + "find-process": "^1.4.4", + "prompts": "^2.4.1", + "spawnd": "^5.0.0", "tree-kill": "^1.2.2", - "wait-on": "^3.3.0" + "wait-on": "^5.3.0" }, "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", "dev": true, "requires": { - "color-name": "~1.1.4" + "tslib": "^1.9.0" } }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "core-js": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", - "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, "wait-on": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-3.3.0.tgz", - "integrity": "sha512-97dEuUapx4+Y12aknWZn7D25kkjMk16PbWoYzpSdA8bYpVfS6hpl2a2pOWZ3c+Tyt3/i4/pglyZctG3J4V1hWQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.3.0.tgz", + "integrity": "sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==", "dev": true, "requires": { - "@hapi/joi": "^15.0.3", - "core-js": "^2.6.5", - "minimist": "^1.2.0", - "request": "^2.88.0", - "rx": "^4.1.0" + "axios": "^0.21.1", + "joi": "^17.3.0", + "lodash": "^4.17.21", + "minimist": "^1.2.5", + "rxjs": "^6.6.3" } } } @@ -15597,9 +16157,9 @@ } }, "picomatch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", - "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, "to-regex-range": { @@ -15771,9 +16331,9 @@ } }, "picomatch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", - "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, "to-regex-range": { @@ -15859,26 +16419,6 @@ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true }, - "read-pkg": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", - "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", - "dev": true, - "requires": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" - }, - "dependencies": { - "type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true - } - } - }, "read-pkg-up": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", @@ -15967,9 +16507,9 @@ }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { @@ -16054,23 +16594,23 @@ "dev": true }, "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "strip-ansi": "^6.0.1" } }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^5.0.1" } }, "strip-bom": { @@ -16204,9 +16744,9 @@ } }, "picomatch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", - "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, "to-regex-range": { @@ -16235,9 +16775,9 @@ }, "dependencies": { "camelcase": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", - "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true } } @@ -16286,9 +16826,9 @@ } }, "joi": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.0.tgz", - "integrity": "sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.2.tgz", + "integrity": "sha512-Lm56PP+n0+Z2A2rfRvsfWVDXGEWjXxatPopkQ8qQ5mxCEhwHG+Ettgg5o98FFaxilOxozoa14cFhrE/hOzh/Nw==", "dev": true, "requires": { "@hapi/hoek": "^9.0.0", @@ -16296,23 +16836,6 @@ "@sideway/address": "^4.1.0", "@sideway/formula": "^3.0.0", "@sideway/pinpoint": "^2.0.0" - }, - "dependencies": { - "@hapi/hoek": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.1.1.tgz", - "integrity": "sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw==", - "dev": true - }, - "@hapi/topo": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz", - "integrity": "sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==", - "dev": true, - "requires": { - "@hapi/hoek": "^9.0.0" - } - } } }, "jpegtran-bin": { @@ -16346,9 +16869,9 @@ } }, "jquery-hoverintent": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/jquery-hoverintent/-/jquery-hoverintent-1.10.1.tgz", - "integrity": "sha512-PNZAVnNcuIB5MDmZPWK7H2lQINRJ4Z8+EGLseIZd/gnd5Q9W3dBOKv0vKG7WPFxG2/Na1YX0/soeufucO6bCJQ==", + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/jquery-hoverintent/-/jquery-hoverintent-1.10.2.tgz", + "integrity": "sha512-YU4xvTywSu+/aZvbtSV8Svgcv7F3iMsXXO8Fm1Scvt9wvKDP7C1F6w1j3Pjn0lQqICxc5s7MnsL3Nbh8DEeOcg==", "requires": { "jquery": ">=1.7.0" } @@ -16424,10 +16947,10 @@ } } }, - "jsdoctypeparser": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz", - "integrity": "sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==", + "jsdoc-type-pratt-parser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.2.0.tgz", + "integrity": "sha512-4STjeF14jp4bqha44nKMY1OUI6d2/g6uclHWUCZ7B4DoLzaB5bmpTkQrpqU+vSVzMD0LsKAOskcnI3I3VfIpmg==", "dev": true }, "jsdom": { @@ -16466,9 +16989,9 @@ }, "dependencies": { "acorn": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz", - "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", + "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", "dev": true }, "agent-base": { @@ -16501,11 +17024,31 @@ "debug": "4" } }, + "tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "dev": true, + "requires": { + "punycode": "^2.1.1" + } + }, "webidl-conversions": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", "dev": true + }, + "whatwg-url": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", + "dev": true, + "requires": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + } } } }, @@ -16516,16 +17059,16 @@ "dev": true }, "jshint": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.12.0.tgz", - "integrity": "sha512-TwuuaUDmra0JMkuqvqy+WGo2xGHSNjv1BA1nTIgtH2K5z1jHuAEeAgp7laaR+hLRmajRjcrM71+vByBDanCyYA==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.13.1.tgz", + "integrity": "sha512-vymzfR3OysF5P774x6zYv0bD4EpH6NWRxpq54wO9mA9RuY49yb1teKSICkLx2Ryx+mfzlVVNNbTBtsRtg78t7g==", "dev": true, "requires": { "cli": "~1.0.0", "console-browserify": "1.1.x", "exit": "0.1.x", "htmlparser2": "3.8.x", - "lodash": "~4.17.19", + "lodash": "~4.17.21", "minimatch": "~3.0.2", "shelljs": "0.3.x", "strip-json-comments": "1.0.x" @@ -16673,9 +17216,9 @@ } }, "jsonc-parser": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.2.1.tgz", - "integrity": "sha512-o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz", + "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==", "dev": true }, "jsonfile": { @@ -16700,15 +17243,26 @@ } }, "jsx-ast-utils": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz", - "integrity": "sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz", + "integrity": "sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==", "dev": true, "requires": { - "array-includes": "^3.1.2", + "array-includes": "^3.1.3", "object.assign": "^4.1.2" } }, + "jszip": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz", + "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==", + "requires": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "set-immediate-shim": "~1.0.1" + } + }, "just-extend": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz", @@ -16940,9 +17494,9 @@ "dev": true }, "klona": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz", - "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", + "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==", "dev": true }, "known-css-properties": { @@ -16987,6 +17541,14 @@ "type-check": "~0.4.0" } }, + "lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "requires": { + "immediate": "~3.0.5" + } + }, "liftup": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz", @@ -17118,6 +17680,12 @@ } } }, + "lilconfig": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz", + "integrity": "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==", + "dev": true + }, "line-height": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/line-height/-/line-height-0.3.1.tgz", @@ -17127,9 +17695,9 @@ } }, "lines-and-columns": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" }, "linkify-it": { "version": "2.2.0", @@ -17216,12 +17784,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, "lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", @@ -17443,12 +18005,12 @@ } }, "makeerror": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz", - "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=", + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", + "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", "dev": true, "requires": { - "tmpl": "1.0.x" + "tmpl": "1.0.5" } }, "map-cache": { @@ -17478,12 +18040,6 @@ "object-visit": "^1.0.0" } }, - "markdown-escapes": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz", - "integrity": "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==", - "dev": true - }, "markdown-it": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz", @@ -17512,60 +18068,105 @@ "dev": true }, "markdownlint": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.18.0.tgz", - "integrity": "sha512-nQAfK9Pbq0ZRoMC/abNGterEnV3kL8MZmi0WHhw8WJKoIbsm3cXGufGsxzCRvjW15cxe74KWcxRSKqwplS26Bw==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.23.1.tgz", + "integrity": "sha512-iOEwhDfNmq2IJlaA8mzEkHYUi/Hwoa6Ss+HO5jkwUR6wQ4quFr0WzSx+Z9rsWZKUaPbyirIdL1zGmJRkWawr4Q==", "dev": true, "requires": { - "markdown-it": "10.0.0" + "markdown-it": "12.0.4" + }, + "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "linkify-it": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz", + "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==", + "dev": true, + "requires": { + "uc.micro": "^1.0.1" + } + }, + "markdown-it": { + "version": "12.0.4", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.0.4.tgz", + "integrity": "sha512-34RwOXZT8kyuOJy25oJNJoulO8L0bTHYWXcdZBYZqFnjIy3NgjeoM3FmPXIOFQ26/lSHYMr8oc62B6adxXcb3Q==", + "dev": true, + "requires": { + "argparse": "^2.0.1", + "entities": "~2.1.0", + "linkify-it": "^3.0.1", + "mdurl": "^1.0.1", + "uc.micro": "^1.0.5" + } + } } }, "markdownlint-cli": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.21.0.tgz", - "integrity": "sha512-gvnczz3W3Wgex851/cIQ/2y8GNhY+EVK8Ael8kRd8hoSQ0ps9xjhtwPwMyJPoiYbAoPxG6vSBFISiysaAbCEZg==", + "version": "0.27.1", + "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.27.1.tgz", + "integrity": "sha512-p1VV6aSbGrDlpUWzHizAnSNEQAweVR3qUI/AIUubxW7BGPXziSXkIED+uRtSohUlRS/jmqp3Wi4es5j6fIrdeQ==", "dev": true, "requires": { - "commander": "~2.9.0", - "deep-extend": "~0.5.1", - "get-stdin": "~5.0.1", - "glob": "~7.1.2", - "ignore": "~5.1.4", - "js-yaml": "~3.13.1", - "jsonc-parser": "~2.2.0", + "commander": "~7.1.0", + "deep-extend": "~0.6.0", + "get-stdin": "~8.0.0", + "glob": "~7.1.6", + "ignore": "~5.1.8", + "js-yaml": "^4.0.0", + "jsonc-parser": "~3.0.0", "lodash.differencewith": "~4.5.0", "lodash.flatten": "~4.4.0", - "markdownlint": "~0.18.0", - "markdownlint-rule-helpers": "~0.6.0", + "markdownlint": "~0.23.1", + "markdownlint-rule-helpers": "~0.14.0", "minimatch": "~3.0.4", - "rc": "~1.2.7" + "minimist": "~1.2.5", + "rc": "~1.2.8" }, "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, "commander": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", - "dev": true, - "requires": { - "graceful-readlink": ">= 1.0.0" - } + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz", + "integrity": "sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==", + "dev": true + }, + "get-stdin": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "dev": true + }, + "ignore": { + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz", + "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==", + "dev": true }, "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "^2.0.1" } } } }, "markdownlint-rule-helpers": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.6.0.tgz", - "integrity": "sha512-LiZVAbg9/cqkBHtLNNqHV3xuy4Y2L/KuGU6+ZXqCT9NnCdEkIoxeI5/96t+ExquBY0iHy2CVWxPH16nG1RKQVQ==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.14.0.tgz", + "integrity": "sha512-vRTPqSU4JK8vVXmjICHSBhwXUvbfh/VJo+j7hvxqe15tLJyomv3FLgFdFgb8kpj0Fe8SsJa/TZUAXv7/sN+N7A==", "dev": true }, "marked": { @@ -17761,31 +18362,6 @@ "micromark": "~2.11.0", "parse-entities": "^2.0.0", "unist-util-stringify-position": "^2.0.0" - }, - "dependencies": { - "parse-entities": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", - "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", - "dev": true, - "requires": { - "character-entities": "^1.0.0", - "character-entities-legacy": "^1.0.0", - "character-reference-invalid": "^1.0.0", - "is-alphanumerical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-hexadecimal": "^1.0.0" - } - }, - "unist-util-stringify-position": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", - "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", - "dev": true, - "requires": { - "@types/unist": "^2.0.2" - } - } } }, "mdast-util-to-markdown": { @@ -17795,27 +18371,11 @@ "dev": true, "requires": { "@types/unist": "^2.0.0", - "longest-streak": "^2.0.0", - "mdast-util-to-string": "^2.0.0", - "parse-entities": "^2.0.0", - "repeat-string": "^1.0.0", - "zwitch": "^1.0.0" - }, - "dependencies": { - "parse-entities": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", - "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", - "dev": true, - "requires": { - "character-entities": "^1.0.0", - "character-entities-legacy": "^1.0.0", - "character-reference-invalid": "^1.0.0", - "is-alphanumerical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-hexadecimal": "^1.0.0" - } - } + "longest-streak": "^2.0.0", + "mdast-util-to-string": "^2.0.0", + "parse-entities": "^2.0.0", + "repeat-string": "^1.0.0", + "zwitch": "^1.0.0" } }, "mdast-util-to-string": { @@ -17917,22 +18477,6 @@ "requires": { "debug": "^4.0.0", "parse-entities": "^2.0.0" - }, - "dependencies": { - "parse-entities": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", - "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", - "dev": true, - "requires": { - "character-entities": "^1.0.0", - "character-entities-legacy": "^1.0.0", - "character-reference-invalid": "^1.0.0", - "is-alphanumerical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-hexadecimal": "^1.0.0" - } - } } }, "micromatch": { @@ -17965,9 +18509,9 @@ } }, "micromodal": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/micromodal/-/micromodal-0.4.6.tgz", - "integrity": "sha512-2VDso2a22jWPpqwuWT/4RomVpoU3Bl9qF9D01xzwlNp5UVsImeA0gY4nSpF44vqcQtQOtkiMUV9EZkAJSRxBsg==" + "version": "0.4.10", + "resolved": "https://registry.npmjs.org/micromodal/-/micromodal-0.4.10.tgz", + "integrity": "sha512-BUrEnzMPFBwK8nOE4xUDYHLrlGlLULQVjpja99tpJQPSUEWgw3kTLp1n1qv0HmKU29AiHE7Y7sMLiRziDK4ghQ==" }, "miller-rabin": { "version": "4.0.1", @@ -18025,14 +18569,12 @@ "dev": true }, "mini-css-extract-plugin": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz", - "integrity": "sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.2.tgz", + "integrity": "sha512-Lwgq9qLNyBK6yNLgzssXnq4r2+mB9Mz3cJWlM8kseysHIvTicFhDNimFgY94jjqlwhNzLPsq8wv4X+vOHtMdYA==", "dev": true, "requires": { - "loader-utils": "^2.0.0", - "schema-utils": "^3.0.0", - "webpack-sources": "^1.1.0" + "schema-utils": "^4.0.0" }, "dependencies": { "@types/json-schema": { @@ -18041,35 +18583,43 @@ "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", "dev": true }, - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "ajv": { + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz", + "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==", "dev": true, "requires": { - "minimist": "^1.2.5" + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" } }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", "dev": true, "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" + "fast-deep-equal": "^3.1.3" } }, + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", + "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", "dev": true, "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" + "@types/json-schema": "^7.0.9", + "ajv": "^8.8.0", + "ajv-formats": "^2.1.1", + "ajv-keywords": "^5.0.0" } } } @@ -18119,52 +18669,6 @@ } } }, - "minipass": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz", - "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - } - }, - "minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - } - }, - "minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - } - }, - "minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, - "requires": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - } - }, "mississippi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", @@ -18183,12 +18687,6 @@ "through2": "^2.0.0" } }, - "mitt": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mitt/-/mitt-2.1.0.tgz", - "integrity": "sha512-ILj2TpLiysu2wkBbWjAmww7TkZb65aiQO+DkVdUTBpBXq+MHYiETENkKFMtsJZX1Lf4pe4QOrTSjIfUwN5lRdg==", - "dev": true - }, "mixin-deep": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", @@ -18257,9 +18755,9 @@ "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==" }, "moment-timezone": { - "version": "0.5.33", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz", - "integrity": "sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==", + "version": "0.5.34", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.34.tgz", + "integrity": "sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==", "requires": { "moment": ">= 2.9.0" } @@ -18289,6 +18787,12 @@ "run-queue": "^1.0.3" } }, + "mrmime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.0.tgz", + "integrity": "sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ==", + "dev": true + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -18329,9 +18833,9 @@ "optional": true }, "nanoid": { - "version": "3.1.25", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz", - "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", + "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==", "dev": true }, "nanomatch": { @@ -18421,9 +18925,9 @@ }, "dependencies": { "@sinonjs/fake-timers": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.1.tgz", - "integrity": "sha512-am34LJf0N2nON/PT9G7pauA+xjcwX9P6x31m4hBgfUeSXYRZBRv/R6EcdWs8iV4XJjPO++NTsrj7ua/cN2s6ZA==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz", + "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==", "dev": true, "requires": { "@sinonjs/commons": "^1.7.0" @@ -18447,10 +18951,13 @@ } }, "node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", - "dev": true + "version": "2.6.6", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz", + "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==", + "dev": true, + "requires": { + "whatwg-url": "^5.0.0" + } }, "node-forge": { "version": "0.10.0", @@ -18514,12 +19021,6 @@ } } }, - "node-modules-regexp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz", - "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=", - "dev": true - }, "node-notifier": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz", @@ -18554,9 +19055,9 @@ "dev": true }, "node-watch": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/node-watch/-/node-watch-0.7.1.tgz", - "integrity": "sha512-UWblPYuZYrkCQCW5PxAwYSxaELNBLUckrTBBk8xr1/bUgyOkYYTsUcV4e3ytcazFEOyiRyiUrsG37pu6I0I05g==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/node-watch/-/node-watch-0.7.2.tgz", + "integrity": "sha512-g53VjSARRv1JdST0LZRIg8RiuLr1TaBbVPsVvxh0/0Ymvi0xYUjDuoqQQAWtHJQUXhiShowPT/aXKNeHBcyQsw==", "dev": true }, "nopt": { @@ -18605,6 +19106,12 @@ "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=", "dev": true }, + "normalize-url": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", + "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", + "dev": true + }, "normalize-wheel": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", @@ -18631,20 +19138,20 @@ } }, "npm-package-json-lint": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/npm-package-json-lint/-/npm-package-json-lint-5.2.3.tgz", - "integrity": "sha512-rSgc4eVhtfwrU7AWwovqFWy8OEkgQL99vD3vWJmqtU9gxxJxKzi6Wqgo3gF7lhrBpyVcnlKxy/L2JCsvjWruDA==", + "version": "5.4.2", + "resolved": "https://registry.npmjs.org/npm-package-json-lint/-/npm-package-json-lint-5.4.2.tgz", + "integrity": "sha512-DH1MSvYvm+cuQFXcPehIIu/WiYzMYs7BOxlhOOFHaH2SNrA+P2uDtTEe5LOG90Ci7PTwgF/dCmSKM2HWTgWXNA==", "dev": true, "requires": { "ajv": "^6.12.6", "ajv-errors": "^1.0.1", "chalk": "^4.1.2", - "cosmiconfig": "^6.0.0", + "cosmiconfig": "^7.0.1", "debug": "^4.3.2", "globby": "^11.0.4", - "ignore": "^5.1.8", + "ignore": "^5.1.9", "is-plain-obj": "^3.0.0", - "jsonc-parser": "^2.3.1", + "jsonc-parser": "^3.0.0", "log-symbols": "^4.1.0", "meow": "^6.1.1", "plur": "^4.0.0", @@ -18653,15 +19160,6 @@ "strip-json-comments": "^3.1.1" }, "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, "array-union": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", @@ -18679,35 +19177,23 @@ "quick-lru": "^4.0.1" } }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "cosmiconfig": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", + "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", "dev": true, "requires": { - "color-name": "~1.1.4" + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.2.1", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.10.0" } }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dev": true, "requires": { "ms": "2.1.2" @@ -18724,25 +19210,19 @@ } }, "globby": { - "version": "11.0.4", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", - "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", "dev": true, "requires": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", "slash": "^3.0.0" } }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, "indent-string": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", @@ -18755,12 +19235,6 @@ "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", "dev": true }, - "jsonc-parser": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz", - "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==", - "dev": true - }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -18771,9 +19245,9 @@ } }, "map-obj": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz", - "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", "dev": true }, "meow": { @@ -18816,26 +19290,6 @@ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true }, - "read-pkg": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", - "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", - "dev": true, - "requires": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" - }, - "dependencies": { - "type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true - } - } - }, "read-pkg-up": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", @@ -18883,15 +19337,6 @@ "min-indent": "^1.0.0" } }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, "trim-newlines": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", @@ -19054,13 +19499,13 @@ } }, "object.entries": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz", - "integrity": "sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz", + "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==", "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.2" + "es-abstract": "^1.19.1" }, "dependencies": { "call-bind": { @@ -19073,21 +19518,24 @@ } }, "es-abstract": { - "version": "1.18.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz", - "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", - "is-callable": "^1.2.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", @@ -19128,9 +19576,9 @@ } }, "object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==" + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==" }, "string.prototype.trimend": { "version": "1.0.4", @@ -19153,15 +19601,14 @@ } }, "object.fromentries": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.4.tgz", - "integrity": "sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz", + "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", - "has": "^1.0.3" + "es-abstract": "^1.19.1" }, "dependencies": { "call-bind": { @@ -19175,22 +19622,25 @@ } }, "es-abstract": { - "version": "1.18.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz", - "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", - "is-callable": "^1.2.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", @@ -19235,9 +19685,9 @@ } }, "object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", "dev": true }, "string.prototype.trimend": { @@ -19295,6 +19745,115 @@ } } }, + "object.hasown": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.0.tgz", + "integrity": "sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.19.1" + }, + "dependencies": { + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, + "es-abstract": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", + "has": "^1.0.3", + "has-symbols": "^1.0.2", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", + "is-negative-zero": "^2.0.1", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", + "object-inspect": "^1.11.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.2", + "string.prototype.trimend": "^1.0.4", + "string.prototype.trimstart": "^1.0.4", + "unbox-primitive": "^1.0.1" + } + }, + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } + }, + "has-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", + "dev": true + }, + "is-callable": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", + "dev": true + }, + "is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + } + }, + "object-inspect": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", + "dev": true + }, + "string.prototype.trimend": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", + "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + } + }, + "string.prototype.trimstart": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", + "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + } + } + } + }, "object.map": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", @@ -19610,8 +20169,7 @@ "pako": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", - "dev": true + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" }, "parallel-transform": { "version": "1.2.0", @@ -19646,9 +20204,9 @@ } }, "parse-entities": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz", - "integrity": "sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", + "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", "dev": true, "requires": { "character-entities": "^1.0.0", @@ -19754,9 +20312,9 @@ "dev": true }, "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "path-root": { "version": "0.1.1", @@ -19809,6 +20367,12 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "dev": true }, + "picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + }, "picomatch": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", @@ -19841,13 +20405,10 @@ } }, "pirates": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz", - "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==", - "dev": true, - "requires": { - "node-modules-regexp": "^1.0.0" - } + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz", + "integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==", + "dev": true }, "pixelmatch": { "version": "5.2.1", @@ -19875,60 +20436,6 @@ "find-up": "^3.0.0" } }, - "pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz", - "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=", - "dev": true, - "requires": { - "find-up": "^2.1.0" - }, - "dependencies": { - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - } - } - }, "plur": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz", @@ -20054,13 +20561,6 @@ "hey-listen": "^1.0.8", "style-value-types": "4.1.4", "tslib": "^2.1.0" - }, - "dependencies": { - "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" - } } }, "portfinder": { @@ -20092,52 +20592,26 @@ "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" + "picocolors": "^0.2.1", + "source-map": "^0.6.1" }, "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, @@ -20280,24 +20754,16 @@ } }, "postcss-loader": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.3.0.tgz", - "integrity": "sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz", + "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==", "dev": true, "requires": { "cosmiconfig": "^7.0.0", - "klona": "^2.0.4", - "loader-utils": "^2.0.0", - "schema-utils": "^3.0.0", - "semver": "^7.3.4" + "klona": "^2.0.5", + "semver": "^7.3.5" }, "dependencies": { - "@types/json-schema": { - "version": "7.0.9", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", - "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", - "dev": true - }, "cosmiconfig": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", @@ -20311,35 +20777,13 @@ "yaml": "^1.10.0" } }, - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "dev": true, "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" + "lru-cache": "^6.0.0" } } } @@ -20468,9 +20912,9 @@ }, "dependencies": { "postcss-value-parser": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", - "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "dev": true } } @@ -20765,9 +21209,9 @@ }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { @@ -20831,9 +21275,9 @@ "integrity": "sha1-zQTv9G9clcOn0EVZHXm14+AfEtc=" }, "prompts": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz", - "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", "dev": true, "requires": { "kleur": "^3.0.3", @@ -20841,13 +21285,13 @@ } }, "prop-types": { - "version": "15.7.2", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", - "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", "requires": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", - "react-is": "^16.8.1" + "react-is": "^16.13.1" } }, "prop-types-exact": { @@ -20959,27 +21403,108 @@ "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true }, - "puppeteer-core": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz", - "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==", + "puppeteer": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-5.5.0.tgz", + "integrity": "sha512-OM8ZvTXAhfgFA7wBIIGlPQzvyEETzDjeRa4mZRCRHxYL+GNH5WAuYUQdja3rpWZvkX/JKqmuVgbsxDNsDFjMEg==", "dev": true, "requires": { "debug": "^4.1.0", - "devtools-protocol": "0.0.869402", + "devtools-protocol": "0.0.818844", "extract-zip": "^2.0.0", - "https-proxy-agent": "^5.0.0", + "https-proxy-agent": "^4.0.0", "node-fetch": "^2.6.1", "pkg-dir": "^4.2.0", "progress": "^2.0.1", - "proxy-from-env": "^1.1.0", + "proxy-from-env": "^1.0.0", "rimraf": "^3.0.2", "tar-fs": "^2.0.0", "unbzip2-stream": "^1.3.3", "ws": "^7.2.3" }, + "dependencies": { + "devtools-protocol": { + "version": "0.0.818844", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz", + "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg==", + "dev": true + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "^4.0.0" + } + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + } + } + }, + "puppeteer-core": { + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-10.4.0.tgz", + "integrity": "sha512-KU8zyb7AIOqNjLCN3wkrFXxh+EVaG+zrs2P03ATNjc3iwSxHsu5/EvZiREpQ/IJiT9xfQbDVgKcsvRuzLCxglQ==", + "dev": true, + "requires": { + "debug": "4.3.1", + "devtools-protocol": "0.0.901419", + "extract-zip": "2.0.1", + "https-proxy-agent": "5.0.0", + "node-fetch": "2.6.1", + "pkg-dir": "4.2.0", + "progress": "2.0.1", + "proxy-from-env": "1.1.0", + "rimraf": "3.0.2", + "tar-fs": "2.0.0", + "unbzip2-stream": "1.3.3", + "ws": "7.4.6" + }, "dependencies": { "agent-base": { "version": "6.0.2", @@ -20990,6 +21515,15 @@ "debug": "4" } }, + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, "find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -21019,6 +21553,18 @@ "p-locate": "^4.1.0" } }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", + "dev": true + }, "p-locate": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", @@ -21043,6 +21589,12 @@ "find-up": "^4.0.0" } }, + "progress": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz", + "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==", + "dev": true + }, "rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -21051,6 +21603,28 @@ "requires": { "glob": "^7.1.3" } + }, + "tar-fs": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz", + "integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==", + "dev": true, + "requires": { + "chownr": "^1.1.1", + "mkdirp": "^0.5.1", + "pump": "^3.0.0", + "tar-stream": "^2.0.0" + } + }, + "unbzip2-stream": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz", + "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==", + "dev": true, + "requires": { + "buffer": "^5.2.1", + "through": "^2.3.8" + } } } }, @@ -21096,20 +21670,20 @@ "dev": true }, "qunit": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/qunit/-/qunit-2.16.0.tgz", - "integrity": "sha512-88x9t+rRMbB6IrCIUZvYU4pJy7NiBEv7SX8jD4LZAsIj+dV+kwGnFStOmPNvqa6HM96VZMD8CIIFKH2+3qvluA==", + "version": "2.17.2", + "resolved": "https://registry.npmjs.org/qunit/-/qunit-2.17.2.tgz", + "integrity": "sha512-17isVvuOmALzsPjiV7wFg/6O5vJYXBrQZPwocfQSSh0I/rXvfX7bKMFJ4GMVW3U4P8r2mBeUy8EAngti4QD2Vw==", "dev": true, "requires": { - "commander": "7.1.0", - "node-watch": "0.7.1", - "tiny-glob": "0.2.8" + "commander": "7.2.0", + "node-watch": "0.7.2", + "tiny-glob": "0.2.9" }, "dependencies": { "commander": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz", - "integrity": "sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", "dev": true } } @@ -21196,12 +21770,6 @@ "strip-json-comments": "~2.0.1" }, "dependencies": { - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true - }, "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", @@ -21211,21 +21779,20 @@ } }, "re-resizable": { - "version": "6.9.0", - "resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.0.tgz", - "integrity": "sha512-3cUDG81ylyqI0Pdgle/RHwwRYq0ORZzsUaySOCO8IbEtNyaRtrIHYm/jMQ5pjcNiKCxR3vsSymIQZHwJq4gg2Q==", + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.1.tgz", + "integrity": "sha512-KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ==", "requires": { "fast-memoize": "^2.5.1" } }, "react": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz", - "integrity": "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==", + "version": "17.0.1", + "resolved": "https://registry.npmjs.org/react/-/react-17.0.1.tgz", + "integrity": "sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==", "requires": { "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2" + "object-assign": "^4.1.1" } }, "react-addons-shallow-compare": { @@ -21246,6 +21813,11 @@ "prop-types": "^15.5.6" } }, + "react-colorful": { + "version": "5.5.1", + "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.5.1.tgz", + "integrity": "sha512-M1TJH2X3RXEt12sWkpa6hLc/bbYS0H6F4rIqjQZ+RxNBstpY67d9TrFXtqdZwhpmBXcCwEi7stKqFue3ZRkiOg==" + }, "react-dates": { "version": "17.2.0", "resolved": "https://registry.npmjs.org/react-dates/-/react-dates-17.2.0.tgz", @@ -21267,20 +21839,19 @@ } }, "react-dom": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz", - "integrity": "sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==", + "version": "17.0.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.1.tgz", + "integrity": "sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "scheduler": "^0.19.1" + "scheduler": "^0.20.1" } }, "react-easy-crop": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/react-easy-crop/-/react-easy-crop-3.5.2.tgz", - "integrity": "sha512-cwSGO/wk42XDpEyrdAcnQ6OJetVDZZO2ry1i19+kSGZQ750aN06RU9y9z95B5QI6sW3SnaWQRKv5r5GSqVV//g==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/react-easy-crop/-/react-easy-crop-3.5.3.tgz", + "integrity": "sha512-ApTbh+lzKAvKqYW81ihd5J6ZTNN3vPDwi6ncFuUrHPI4bko2DlYOESkRm+0NYoW0H8YLaD7bxox+Z3EvIzAbUA==", "requires": { "normalize-wheel": "^1.0.1", "tslib": "2.0.1" @@ -21306,14 +21877,6 @@ "moment": ">=1.6.0" } }, - "react-native-url-polyfill": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/react-native-url-polyfill/-/react-native-url-polyfill-1.3.0.tgz", - "integrity": "sha512-w9JfSkvpqqlix9UjDvJjm1EjSt652zVQ6iwCIj1cVVkwXf4jQhQgTNXY6EVTwuAmUjg6BC6k9RHCBynoLFo3IQ==", - "requires": { - "whatwg-url-without-unicode": "8.0.0-3" - } - }, "react-outside-click-handler": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/react-outside-click-handler/-/react-outside-click-handler-1.3.0.tgz", @@ -21335,9 +21898,9 @@ } }, "react-resize-aware": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/react-resize-aware/-/react-resize-aware-3.1.0.tgz", - "integrity": "sha512-bIhHlxVTX7xKUz14ksXMEHjzCZPTpQZKZISY3nbTD273pDKPABGFNFBP6Tr42KECxzC5YQiKpMchjTVJCqaxpA==" + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/react-resize-aware/-/react-resize-aware-3.1.1.tgz", + "integrity": "sha512-M8IyVLBN8D6tEUss+bxQlWte3ZYtNEGhg7rBxtCVG8yEBjUlZwUo5EFLq6tnvTZXcgAbCLjsQn+NCoTJKumRYg==" }, "react-shallow-renderer": { "version": "16.14.1", @@ -21349,15 +21912,6 @@ "react-is": "^16.12.0 || ^17.0.0" } }, - "react-spring": { - "version": "8.0.27", - "resolved": "https://registry.npmjs.org/react-spring/-/react-spring-8.0.27.tgz", - "integrity": "sha512-nDpWBe3ZVezukNRandTeLSPcwwTMjNVu1IDq9qA/AMiUqHuRN4BeSWvKr3eIxxg1vtiYiOLy4FqdfCP5IoP77g==", - "requires": { - "@babel/runtime": "^7.3.1", - "prop-types": "^15.5.8" - } - }, "react-test-renderer": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-17.0.2.tgz", @@ -21375,16 +21929,6 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", "dev": true - }, - "scheduler": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz", - "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==", - "dev": true, - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } } } }, @@ -21394,18 +21938,120 @@ "integrity": "sha512-CdqA2SmS/fj3kkS2W8ZU8wjTbVBAIwDWaRprX7OKaj7HlGwBasGEFggmk5qNklknqk9zK/h8D355bEJFTpqEMg==" }, "react-with-direction": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/react-with-direction/-/react-with-direction-1.3.1.tgz", - "integrity": "sha512-aGcM21ZzhqeXFvDCfPj0rVNYuaVXfTz5D3Rbn0QMz/unZe+CCiLHthrjQWO7s6qdfXORgYFtmS7OVsRgSk5LXQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/react-with-direction/-/react-with-direction-1.4.0.tgz", + "integrity": "sha512-ybHNPiAmaJpoWwugwqry9Hd1Irl2hnNXlo/2SXQBwbLn/jGMauMS2y9jw+ydyX5V9ICryCqObNSthNt5R94xpg==", "requires": { - "airbnb-prop-types": "^2.10.0", + "airbnb-prop-types": "^2.16.0", "brcast": "^2.0.2", "deepmerge": "^1.5.2", - "direction": "^1.0.2", - "hoist-non-react-statics": "^3.3.0", - "object.assign": "^4.1.0", - "object.values": "^1.0.4", - "prop-types": "^15.6.2" + "direction": "^1.0.4", + "hoist-non-react-statics": "^3.3.2", + "object.assign": "^4.1.2", + "object.values": "^1.1.5", + "prop-types": "^15.7.2" + }, + "dependencies": { + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, + "es-abstract": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", + "requires": { + "call-bind": "^1.0.2", + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", + "has": "^1.0.3", + "has-symbols": "^1.0.2", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", + "is-negative-zero": "^2.0.1", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", + "object-inspect": "^1.11.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.2", + "string.prototype.trimend": "^1.0.4", + "string.prototype.trimstart": "^1.0.4", + "unbox-primitive": "^1.0.1" + }, + "dependencies": { + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } + } + } + }, + "has-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==" + }, + "is-callable": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==" + }, + "is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "requires": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + } + }, + "object-inspect": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==" + }, + "object.values": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz", + "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==", + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.1" + } + }, + "string.prototype.trimend": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", + "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + } + }, + "string.prototype.trimstart": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", + "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + } + } } }, "react-with-styles": { @@ -21429,51 +22075,21 @@ } }, "read-pkg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", "dev": true, "requires": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" }, "dependencies": { - "load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" - } - }, - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - }, - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "requires": { - "pify": "^3.0.0" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", "dev": true } } @@ -21567,36 +22183,36 @@ } }, "reakit": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/reakit/-/reakit-1.3.8.tgz", - "integrity": "sha512-8SVejx6FUaFi2+Q9eXoDAd4wWi/xAn6v8JgXH8x2xnzye8pb6v5bYvegACVpYVZnrS5w/JUgMTGh1Xy8MkkPww==", + "version": "1.3.11", + "resolved": "https://registry.npmjs.org/reakit/-/reakit-1.3.11.tgz", + "integrity": "sha512-mYxw2z0fsJNOQKAEn5FJCPTU3rcrY33YZ/HzoWqZX0G7FwySp1wkCYW79WhuYMNIUFQ8s3Baob1RtsEywmZSig==", "requires": { "@popperjs/core": "^2.5.4", "body-scroll-lock": "^3.1.5", - "reakit-system": "^0.15.1", - "reakit-utils": "^0.15.1", - "reakit-warning": "^0.6.1" + "reakit-system": "^0.15.2", + "reakit-utils": "^0.15.2", + "reakit-warning": "^0.6.2" } }, "reakit-system": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/reakit-system/-/reakit-system-0.15.1.tgz", - "integrity": "sha512-PkqfAyEohtcEu/gUvKriCv42NywDtUgvocEN3147BI45dOFAB89nrT7wRIbIcKJiUT598F+JlPXAZZVLWhc1Kg==", + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/reakit-system/-/reakit-system-0.15.2.tgz", + "integrity": "sha512-TvRthEz0DmD0rcJkGamMYx+bATwnGNWJpe/lc8UV2Js8nnPvkaxrHk5fX9cVASFrWbaIyegZHCWUBfxr30bmmA==", "requires": { - "reakit-utils": "^0.15.1" + "reakit-utils": "^0.15.2" } }, "reakit-utils": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/reakit-utils/-/reakit-utils-0.15.1.tgz", - "integrity": "sha512-6cZgKGvOkAMQgkwU9jdYbHfkuIN1Pr+vwcB19plLvcTfVN0Or10JhIuj9X+JaPZyI7ydqTDFaKNdUcDP69o/+Q==" + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/reakit-utils/-/reakit-utils-0.15.2.tgz", + "integrity": "sha512-i/RYkq+W6hvfFmXw5QW7zvfJJT/K8a4qZ0hjA79T61JAFPGt23DsfxwyBbyK91GZrJ9HMrXFVXWMovsKBc1qEQ==" }, "reakit-warning": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/reakit-warning/-/reakit-warning-0.6.1.tgz", - "integrity": "sha512-poFUV0EyxB+CcV9uTNBAFmcgsnR2DzAbOTkld4Ul+QOKSeEHZB3b3+MoZQgcYHmbvG19Na1uWaM7ES+/Eyr8tQ==", + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/reakit-warning/-/reakit-warning-0.6.2.tgz", + "integrity": "sha512-z/3fvuc46DJyD3nJAUOto6inz2EbSQTjvI/KBQDqxwB0y02HDyeP8IWOJxvkuAUGkWpeSx+H3QWQFSNiPcHtmw==", "requires": { - "reakit-utils": "^0.15.1" + "reakit-utils": "^0.15.2" } }, "rechoir": { @@ -21620,9 +22236,9 @@ } }, "redux": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/redux/-/redux-4.1.1.tgz", - "integrity": "sha512-hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.1.2.tgz", + "integrity": "sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==", "requires": { "@babel/runtime": "^7.9.2" } @@ -21644,18 +22260,18 @@ "dev": true }, "regenerate-unicode-properties": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", - "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz", + "integrity": "sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==", "dev": true, "requires": { - "regenerate": "^1.4.0" + "regenerate": "^1.4.2" } }, "regenerator-runtime": { - "version": "0.13.7", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", - "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==" + "version": "0.13.9", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" }, "regenerator-transform": { "version": "0.14.5", @@ -21693,23 +22309,23 @@ "dev": true }, "regexpu-core": { - "version": "4.7.1", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz", - "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz", + "integrity": "sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==", "dev": true, "requires": { - "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^8.2.0", - "regjsgen": "^0.5.1", - "regjsparser": "^0.6.4", - "unicode-match-property-ecmascript": "^1.0.4", - "unicode-match-property-value-ecmascript": "^1.2.0" + "regenerate": "^1.4.2", + "regenerate-unicode-properties": "^9.0.0", + "regjsgen": "^0.5.2", + "regjsparser": "^0.7.0", + "unicode-match-property-ecmascript": "^2.0.0", + "unicode-match-property-value-ecmascript": "^2.0.0" } }, "regextras": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz", - "integrity": "sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz", + "integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==", "dev": true }, "regjsgen": { @@ -21719,9 +22335,9 @@ "dev": true }, "regjsparser": { - "version": "0.6.9", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz", - "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz", + "integrity": "sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==", "dev": true, "requires": { "jsesc": "~0.5.0" @@ -21744,97 +22360,15 @@ "remark-parse": "^9.0.0", "remark-stringify": "^9.0.0", "unified": "^9.1.0" - }, - "dependencies": { - "is-buffer": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", - "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", - "dev": true - }, - "is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", - "dev": true - }, - "remark-parse": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz", - "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==", - "dev": true, - "requires": { - "mdast-util-from-markdown": "^0.8.0" - } - }, - "unified": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz", - "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==", - "dev": true, - "requires": { - "bail": "^1.0.0", - "extend": "^3.0.0", - "is-buffer": "^2.0.0", - "is-plain-obj": "^2.0.0", - "trough": "^1.0.0", - "vfile": "^4.0.0" - } - }, - "unist-util-stringify-position": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", - "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", - "dev": true, - "requires": { - "@types/unist": "^2.0.2" - } - }, - "vfile": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", - "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "is-buffer": "^2.0.0", - "unist-util-stringify-position": "^2.0.0", - "vfile-message": "^2.0.0" - } - }, - "vfile-message": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", - "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" - } - } } }, "remark-parse": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-5.0.0.tgz", - "integrity": "sha512-b3iXszZLH1TLoyUzrATcTQUZrwNl1rE70rVdSruJFlDaJ9z5aMkhrG43Pp68OgfHndL/ADz6V69Zow8cTQu+JA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz", + "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==", "dev": true, "requires": { - "collapse-white-space": "^1.0.2", - "is-alphabetical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-whitespace-character": "^1.0.0", - "is-word-character": "^1.0.0", - "markdown-escapes": "^1.0.0", - "parse-entities": "^1.1.0", - "repeat-string": "^1.5.4", - "state-toggle": "^1.0.0", - "trim": "0.0.1", - "trim-trailing-lines": "^1.0.0", - "unherit": "^1.0.4", - "unist-util-remove-position": "^1.0.0", - "vfile-location": "^2.0.0", - "xtend": "^4.0.1" + "mdast-util-from-markdown": "^0.8.0" } }, "remark-stringify": { @@ -21982,9 +22516,9 @@ } }, "resolve-bin": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/resolve-bin/-/resolve-bin-0.4.1.tgz", - "integrity": "sha512-cPOo/AQjgGONYhFbAcJd1+nuVHKs5NZ8K96Zb6mW+nDl55a7+ya9MWkeYuSMDv/S+YpksZ3EbeAnGWs5x04x8w==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/resolve-bin/-/resolve-bin-0.4.3.tgz", + "integrity": "sha512-9u8TMpc+SEHXxQXblXHz5yRvRZERkCZimFN9oz85QI3uhkh7nqfjm6OGTLg+8vucpXGcY4jLK6WkylPmt7GSvw==", "dev": true, "requires": { "find-parent-dir": "~0.3.0" @@ -22218,12 +22752,6 @@ "resolved": "https://registry.npmjs.org/rungen/-/rungen-0.3.2.tgz", "integrity": "sha1-QAwJ6+kU57F+C27zJjQA/Cq8fLM=" }, - "rx": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz", - "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=", - "dev": true - }, "rxjs": { "version": "5.5.12", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz", @@ -22390,64 +22918,22 @@ } }, "sass": { - "version": "1.34.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.1.tgz", - "integrity": "sha512-scLA7EIZM+MmYlej6sdVr0HRbZX5caX5ofDT9asWnUJj21oqgsC+1LuNfm0eg+vM0fCTZHhwImTiCU0sx9h9CQ==", + "version": "1.43.4", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.43.4.tgz", + "integrity": "sha512-/ptG7KE9lxpGSYiXn7Ar+lKOv37xfWsZRtFYal2QHNigyVQDx685VFT/h7ejVr+R8w7H4tmUgtulsKl5YpveOg==", "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0" } }, "sass-loader": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.2.0.tgz", - "integrity": "sha512-kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.4.0.tgz", + "integrity": "sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg==", "dev": true, "requires": { "klona": "^2.0.4", - "loader-utils": "^2.0.0", - "neo-async": "^2.6.2", - "schema-utils": "^3.0.0", - "semver": "^7.3.2" - }, - "dependencies": { - "@types/json-schema": { - "version": "7.0.9", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", - "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", - "dev": true - }, - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } - } + "neo-async": "^2.6.2" } }, "sax": { @@ -22466,9 +22952,9 @@ } }, "scheduler": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", - "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz", + "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -22688,6 +23174,11 @@ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, + "set-immediate-shim": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" + }, "set-value": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", @@ -22836,13 +23327,13 @@ } }, "sinon": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-11.1.1.tgz", - "integrity": "sha512-ZSSmlkSyhUWbkF01Z9tEbxZLF/5tRC9eojCdFh33gtQaP7ITQVaMWQHGuFM7Cuf/KEfihuh1tTl3/ABju3AQMg==", + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-12.0.1.tgz", + "integrity": "sha512-iGu29Xhym33ydkAT+aNQFBINakjq69kKO6ByPvTsm3yyIACfyQttRTP03aBP/I8GfhFmLzrnKwNNkr0ORb1udg==", "dev": true, "requires": { "@sinonjs/commons": "^1.8.3", - "@sinonjs/fake-timers": "^7.1.0", + "@sinonjs/fake-timers": "^8.1.0", "@sinonjs/samsam": "^6.0.2", "diff": "^5.0.0", "nise": "^5.1.0", @@ -22859,9 +23350,9 @@ } }, "@sinonjs/fake-timers": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.1.tgz", - "integrity": "sha512-am34LJf0N2nON/PT9G7pauA+xjcwX9P6x31m4hBgfUeSXYRZBRv/R6EcdWs8iV4XJjPO++NTsrj7ua/cN2s6ZA==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz", + "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==", "dev": true, "requires": { "@sinonjs/commons": "^1.7.0" @@ -22891,19 +23382,19 @@ } }, "sinon-test": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/sinon-test/-/sinon-test-3.1.0.tgz", - "integrity": "sha512-aGQwq6Xl9eJg/8Ugv4Ko4LQWUqjwRYNI8UtxnKa9hmcMEz3HBTR3nnzYrbW4isuRLsJWFuJTUcPGuz7f4XvODg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/sinon-test/-/sinon-test-3.1.1.tgz", + "integrity": "sha512-1sM7QhfTGHXU8umSSyDyIQuAwPkUX2I0JK5WFcjzhChNxDYlVw5Vj0fGoJAaS/FvywKmN2U4YgGC/XqDKhYOTA==", "dev": true }, "sirv": { - "version": "1.0.17", - "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.17.tgz", - "integrity": "sha512-qx9go5yraB7ekT7bCMqUHJ5jEaOC/GXBxUWv+jeWnb7WzHUFdcQPGWk7YmAwFBaQBrogpuSqd/azbC2lZRqqmw==", + "version": "1.0.19", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz", + "integrity": "sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==", "dev": true, "requires": { "@polka/url": "^1.0.0-next.20", - "mime": "^2.3.1", + "mrmime": "^1.0.0", "totalist": "^1.0.0" } }, @@ -23234,9 +23725,9 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" }, "source-map-js": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz", - "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz", + "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==", "dev": true }, "source-map-loader": { @@ -23330,15 +23821,15 @@ "dev": true }, "spawnd": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/spawnd/-/spawnd-4.4.0.tgz", - "integrity": "sha512-jLPOfB6QOEgMOQY15Z6+lwZEhH3F5ncXxIaZ7WHPIapwNNLyjrs61okj3VJ3K6tmP5TZ6cO0VAu9rEY4MD4YQg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/spawnd/-/spawnd-5.0.0.tgz", + "integrity": "sha512-28+AJr82moMVWolQvlAIv3JcYDkjkFTEmfDc503wxrF5l2rQ3dFz6DpbXp3kD4zmgGGldfM4xM4v1sFj/ZaIOA==", "dev": true, "requires": { "exit": "^0.1.2", - "signal-exit": "^3.0.2", + "signal-exit": "^3.0.3", "tree-kill": "^1.2.2", - "wait-port": "^0.2.7" + "wait-port": "^0.2.9" } }, "spdx-correct": { @@ -23540,9 +24031,9 @@ "dev": true }, "stack-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz", - "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz", + "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==", "dev": true, "requires": { "escape-string-regexp": "^2.0.0" @@ -23556,12 +24047,6 @@ } } }, - "state-toggle": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz", - "integrity": "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==", - "dev": true - }, "static-extend": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", @@ -23680,18 +24165,18 @@ }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^5.0.1" } } } @@ -23713,14 +24198,14 @@ } }, "string.prototype.matchall": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz", - "integrity": "sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz", + "integrity": "sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.2", + "es-abstract": "^1.19.1", "get-intrinsic": "^1.1.1", "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", @@ -23739,22 +24224,25 @@ } }, "es-abstract": { - "version": "1.18.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz", - "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", - "is-callable": "^1.2.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", @@ -23797,15 +24285,15 @@ } }, "object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", "dev": true }, "regexp.prototype.flags": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz", - "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz", + "integrity": "sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==", "dev": true, "requires": { "call-bind": "^1.0.2", @@ -23835,14 +24323,14 @@ } }, "string.prototype.trim": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz", - "integrity": "sha512-hWCk/iqf7lp0/AgTF7/ddO1IWtSNPASjlzCicV5irAVdE1grjsneK26YG6xACMBEdCvO8fUST0UzDMh/2Qy+9Q==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.5.tgz", + "integrity": "sha512-Lnh17webJVsD6ECeovpVN17RlAKjmz4rF9S+8Y45CkMc/ufVpTkU3vZIyIC7sllQ1FCvObZnnCdNs/HXTUOTlg==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2" + "es-abstract": "^1.19.1" }, "dependencies": { "call-bind": { @@ -23856,22 +24344,25 @@ } }, "es-abstract": { - "version": "1.18.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz", - "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", - "is-callable": "^1.2.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", @@ -23916,9 +24407,9 @@ } }, "object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", "dev": true }, "string.prototype.trimend": { @@ -24046,6 +24537,13 @@ "escape-string-regexp": "^1.0.2" } }, + "strnum": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.4.tgz", + "integrity": "sha512-lMzNMfDpaQOLt4B2mEbfzYS0+T7dvCXeojnlGf6f1AygvWDMcWyXYaLbyICfjVu29sErR8fnRagQfBW/N/hGgw==", + "dev": true, + "optional": true + }, "style-search": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz", @@ -24059,13 +24557,6 @@ "requires": { "hey-listen": "^1.0.8", "tslib": "^2.1.0" - }, - "dependencies": { - "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" - } } }, "stylehacks": { @@ -24149,9 +24640,9 @@ }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "array-union": { @@ -24200,9 +24691,9 @@ } }, "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dev": true, "requires": { "ms": "2.1.2" @@ -24260,23 +24751,23 @@ } }, "globby": { - "version": "11.0.4", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", - "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", "dev": true, "requires": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", "slash": "^3.0.0" } }, "hosted-git-info": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz", - "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -24289,9 +24780,9 @@ "dev": true }, "is-core-module": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz", - "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", + "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", "dev": true, "requires": { "has": "^1.0.3" @@ -24325,9 +24816,9 @@ } }, "map-obj": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz", - "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", "dev": true }, "meow": { @@ -24394,15 +24885,15 @@ "dev": true }, "picomatch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", - "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, "postcss-selector-parser": { - "version": "6.0.6", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz", - "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==", + "version": "6.0.8", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz", + "integrity": "sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==", "dev": true, "requires": { "cssesc": "^3.0.0", @@ -24410,55 +24901,11 @@ } }, "postcss-value-parser": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", - "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "dev": true }, - "read-pkg": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", - "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", - "dev": true, - "requires": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" - }, - "dependencies": { - "hosted-git-info": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true - }, - "normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - }, - "type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true - } - } - }, "read-pkg-up": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", @@ -24495,23 +24942,23 @@ "dev": true }, "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "strip-ansi": "^6.0.1" } }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^5.0.1" } }, "strip-indent": { @@ -24585,9 +25032,9 @@ } }, "stylelint-scss": { - "version": "3.20.1", - "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.20.1.tgz", - "integrity": "sha512-OTd55O1TTAC5nGKkVmUDLpz53LlK39R3MImv1CfuvsK7/qugktqiZAeQLuuC4UBhzxCnsc7fp9u/gfRZwFAIkA==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.21.0.tgz", + "integrity": "sha512-CMI2wSHL+XVlNExpauy/+DbUcB/oUZLARDtMIXkpV/5yd8nthzylYd1cdHeDMJVBXeYHldsnebUX6MoV5zPW4A==", "dev": true, "requires": { "lodash": "^4.17.15", @@ -24598,13 +25045,18 @@ }, "dependencies": { "postcss-value-parser": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", - "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "dev": true } } }, + "stylis": { + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz", + "integrity": "sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==" + }, "sugarss": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz", @@ -24649,6 +25101,12 @@ } } }, + "supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true + }, "svg-parser": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz", @@ -24702,23 +25160,22 @@ "dev": true }, "table": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz", - "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==", + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz", + "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==", "dev": true, "requires": { "ajv": "^8.0.1", - "lodash.clonedeep": "^4.5.0", "lodash.truncate": "^4.4.2", "slice-ansi": "^4.0.0", - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0" + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1" }, "dependencies": { "ajv": { - "version": "8.6.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz", - "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz", + "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -24728,9 +25185,9 @@ } }, "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "emoji-regex": { @@ -24752,23 +25209,23 @@ "dev": true }, "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "strip-ansi": "^6.0.1" } }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^5.0.1" } } } @@ -24793,34 +25250,6 @@ "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==", "dev": true }, - "tar": { - "version": "6.1.11", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", - "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", - "dev": true, - "requires": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^3.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "dependencies": { - "chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true - }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - } - } - }, "tar-fs": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", @@ -24957,64 +25386,6 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, - "thread-loader": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/thread-loader/-/thread-loader-3.0.4.tgz", - "integrity": "sha512-ByaL2TPb+m6yArpqQUZvP+5S1mZtXsEP7nWKKlAUTm7fCml8kB5s1uI3+eHRP2bk5mVYfRSBI7FFf+tWEyLZwA==", - "dev": true, - "requires": { - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^4.1.0", - "loader-utils": "^2.0.0", - "neo-async": "^2.6.2", - "schema-utils": "^3.0.0" - }, - "dependencies": { - "@types/json-schema": { - "version": "7.0.9", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", - "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", - "dev": true - }, - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "loader-runner": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz", - "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==", - "dev": true - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } - } - } - }, "throat": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz", @@ -25071,9 +25442,9 @@ "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" }, "tiny-glob": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.8.tgz", - "integrity": "sha512-vkQP7qOslq63XRX9kMswlby99kyO5OvKptw7AMwBVMjXEI7Tb61eoI5DydyEMOseyGS5anDN1VPoVxEvH01q8w==", + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz", + "integrity": "sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==", "dev": true, "requires": { "globalyzer": "0.1.0", @@ -25105,11 +25476,6 @@ } } }, - "tinycolor2": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz", - "integrity": "sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==" - }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -25120,9 +25486,9 @@ } }, "tmpl": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", - "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", "dev": true }, "to-arraybuffer": { @@ -25202,13 +25568,10 @@ } }, "tr46": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", - "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", - "dev": true, - "requires": { - "punycode": "^2.1.1" - } + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", + "dev": true }, "traverse": { "version": "0.6.6", @@ -25221,12 +25584,6 @@ "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", "dev": true }, - "trim": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz", - "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=", - "dev": true - }, "trim-newlines": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", @@ -25243,12 +25600,6 @@ "escape-string-regexp": "^1.0.2" } }, - "trim-trailing-lines": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz", - "integrity": "sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==", - "dev": true - }, "trough": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", @@ -25256,9 +25607,9 @@ "dev": true }, "tsconfig-paths": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz", - "integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==", + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz", + "integrity": "sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==", "dev": true, "requires": { "@types/json5": "^0.0.29", @@ -25268,10 +25619,9 @@ } }, "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, "tsutils": { "version": "3.21.0", @@ -25280,6 +25630,14 @@ "dev": true, "requires": { "tslib": "^1.8.1" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "tty-browserify": { @@ -25381,9 +25739,9 @@ "dev": true }, "uglify-js": { - "version": "3.13.9", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.9.tgz", - "integrity": "sha512-wZbyTQ1w6Y7fHdt8sJnHfSIuWeDgk6B5rCb4E/AM6QNNPbOMIZph21PW5dRB3h7Df0GszN+t7RuUH6sWK5bF0g==", + "version": "3.14.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.3.tgz", + "integrity": "sha512-mic3aOdiq01DuSVx0TseaEzMIVqebMZ0Z3vaeDhFEh9bsc24hV1TFvN74reA2vs08D0ZWfNjAcJ3UbVLaBss+g==", "dev": true }, "uglify-to-browserify": { @@ -25472,56 +25830,60 @@ "util-deprecate": "^1.0.2" } }, - "unherit": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz", - "integrity": "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==", - "dev": true, - "requires": { - "inherits": "^2.0.0", - "xtend": "^4.0.0" - } - }, "unicode-canonical-property-names-ecmascript": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", - "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", + "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", "dev": true }, "unicode-match-property-ecmascript": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz", - "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", + "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", "dev": true, "requires": { - "unicode-canonical-property-names-ecmascript": "^1.0.4", - "unicode-property-aliases-ecmascript": "^1.0.4" + "unicode-canonical-property-names-ecmascript": "^2.0.0", + "unicode-property-aliases-ecmascript": "^2.0.0" } }, "unicode-match-property-value-ecmascript": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", - "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz", + "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==", "dev": true }, "unicode-property-aliases-ecmascript": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz", - "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz", + "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==", "dev": true }, "unified": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/unified/-/unified-6.2.0.tgz", - "integrity": "sha512-1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA==", + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz", + "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==", "dev": true, "requires": { "bail": "^1.0.0", "extend": "^3.0.0", - "is-plain-obj": "^1.1.0", + "is-buffer": "^2.0.0", + "is-plain-obj": "^2.0.0", "trough": "^1.0.0", - "vfile": "^2.0.0", - "x-is-string": "^0.1.0" + "vfile": "^4.0.0" + }, + "dependencies": { + "is-buffer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", + "dev": true + }, + "is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true + } } }, "union-value": { @@ -25567,59 +25929,27 @@ } }, "unist-util-find-all-after": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz", - "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==", - "dev": true, - "requires": { - "unist-util-is": "^4.0.0" - }, - "dependencies": { - "unist-util-is": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", - "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", - "dev": true - } - } - }, - "unist-util-is": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz", - "integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==", - "dev": true - }, - "unist-util-remove-position": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz", - "integrity": "sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==", - "dev": true, - "requires": { - "unist-util-visit": "^1.1.0" - } - }, - "unist-util-stringify-position": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz", - "integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==", - "dev": true - }, - "unist-util-visit": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", - "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz", + "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==", "dev": true, "requires": { - "unist-util-visit-parents": "^2.0.0" + "unist-util-is": "^4.0.0" } }, - "unist-util-visit-parents": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz", - "integrity": "sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==", + "unist-util-is": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", + "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", + "dev": true + }, + "unist-util-stringify-position": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", + "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", "dev": true, "requires": { - "unist-util-is": "^3.0.0" + "@types/unist": "^2.0.2" } }, "universalify": { @@ -25755,9 +26085,9 @@ } }, "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", + "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", "dev": true, "requires": { "big.js": "^5.2.2", @@ -25779,9 +26109,9 @@ } }, "url-parse": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz", - "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz", + "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==", "dev": true, "requires": { "querystringify": "^2.1.1", @@ -25932,30 +26262,33 @@ } }, "vfile": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-2.3.0.tgz", - "integrity": "sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", + "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==", "dev": true, "requires": { - "is-buffer": "^1.1.4", - "replace-ext": "1.0.0", - "unist-util-stringify-position": "^1.0.0", - "vfile-message": "^1.0.0" + "@types/unist": "^2.0.0", + "is-buffer": "^2.0.0", + "unist-util-stringify-position": "^2.0.0", + "vfile-message": "^2.0.0" + }, + "dependencies": { + "is-buffer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", + "dev": true + } } }, - "vfile-location": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.6.tgz", - "integrity": "sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==", - "dev": true - }, "vfile-message": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz", - "integrity": "sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", + "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", "dev": true, "requires": { - "unist-util-stringify-position": "^1.1.1" + "@types/unist": "^2.0.0", + "unist-util-stringify-position": "^2.0.0" } }, "vm-browserify": { @@ -25988,26 +26321,32 @@ } }, "wait-on": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.3.0.tgz", - "integrity": "sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-6.0.0.tgz", + "integrity": "sha512-tnUJr9p5r+bEYXPUdRseolmz5XqJTTj98JgOsfBn7Oz2dxfE2g3zw1jE+Mo8lopM3j3et/Mq1yW7kKX6qw7RVw==", "dev": true, "requires": { "axios": "^0.21.1", - "joi": "^17.3.0", + "joi": "^17.4.0", "lodash": "^4.17.21", "minimist": "^1.2.5", - "rxjs": "^6.6.3" + "rxjs": "^7.1.0" }, "dependencies": { "rxjs": { - "version": "6.6.6", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.6.tgz", - "integrity": "sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "~2.1.0" } + }, + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "dev": true } } }, @@ -26042,12 +26381,12 @@ } }, "walker": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz", - "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", + "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", "dev": true, "requires": { - "makeerror": "1.0.x" + "makeerror": "1.0.12" } }, "watchpack": { @@ -26196,9 +26535,10 @@ "integrity": "sha512-TOMFWtQdxzjWp8qx4DAraTWTsdhxVSiWa6NkPFSaPtZ1diKUxTn4yTix73A1euG1WbSOMMPcY51cnjTIHrGtDA==" }, "webidl-conversions": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", - "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", + "dev": true }, "webpack": { "version": "4.43.0", @@ -26232,15 +26572,15 @@ } }, "webpack-bundle-analyzer": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz", - "integrity": "sha512-PIagMYhlEzFfhMYOzs5gFT55DkUdkyrJi/SxJp8EF3YMWhS+T9vvs2EoTetpk5qb6VsCq02eXTlRDOydRhDFAQ==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz", + "integrity": "sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==", "dev": true, "requires": { "acorn": "^8.0.4", "acorn-walk": "^8.0.0", "chalk": "^4.1.0", - "commander": "^6.2.0", + "commander": "^7.2.0", "gzip-size": "^6.0.0", "lodash": "^4.17.20", "opener": "^1.5.2", @@ -26249,181 +26589,126 @@ }, "dependencies": { "acorn": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz", - "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", + "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", "dev": true }, "acorn-walk": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.1.tgz", - "integrity": "sha512-FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", "dev": true }, "commander": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", - "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", "dev": true } } }, "webpack-cli": { - "version": "3.3.12", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz", - "integrity": "sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "cross-spawn": "^6.0.5", - "enhanced-resolve": "^4.1.1", - "findup-sync": "^3.0.0", - "global-modules": "^2.0.0", - "import-local": "^2.0.0", - "interpret": "^1.4.0", - "loader-utils": "^1.4.0", - "supports-color": "^6.1.0", - "v8-compile-cache": "^2.1.1", - "yargs": "^13.3.2" + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.1.tgz", + "integrity": "sha512-JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ==", + "dev": true, + "requires": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^1.1.0", + "@webpack-cli/info": "^1.4.0", + "@webpack-cli/serve": "^1.6.0", + "colorette": "^2.0.14", + "commander": "^7.0.0", + "execa": "^5.0.0", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^2.2.0", + "rechoir": "^0.7.0", + "webpack-merge": "^5.7.3" }, "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } + "commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "dev": true }, "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "global-modules": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", - "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", - "dev": true, - "requires": { - "global-prefix": "^3.0.0" - } - }, - "global-prefix": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", - "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, "requires": { - "ini": "^1.3.5", - "kind-of": "^6.0.2", - "which": "^1.3.1" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" } }, - "import-local": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", - "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", + "execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dev": true, "requires": { - "pkg-dir": "^3.0.0", - "resolve-cwd": "^2.0.0" + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" } }, - "kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "dev": true }, - "resolve-cwd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", - "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", - "dev": true, - "requires": { - "resolve-from": "^3.0.0" - } - }, - "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", + "human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", "dev": true }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "path-key": "^3.0.0" } }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true }, - "yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" + "shebang-regex": "^3.0.0" } }, - "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true } } }, @@ -26723,6 +27008,44 @@ } } }, + "webpack-merge": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", + "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", + "dev": true, + "requires": { + "clone-deep": "^4.0.1", + "wildcard": "^2.0.0" + }, + "dependencies": { + "clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + } + }, + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + }, + "shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "dev": true, + "requires": { + "kind-of": "^6.0.2" + } + } + } + }, "webpack-sources": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", @@ -26790,32 +27113,13 @@ "dev": true }, "whatwg-url": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", - "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", "dev": true, "requires": { - "lodash": "^4.7.0", - "tr46": "^2.1.0", - "webidl-conversions": "^6.1.0" - }, - "dependencies": { - "webidl-conversions": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", - "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", - "dev": true - } - } - }, - "whatwg-url-without-unicode": { - "version": "8.0.0-3", - "resolved": "https://registry.npmjs.org/whatwg-url-without-unicode/-/whatwg-url-without-unicode-8.0.0-3.tgz", - "integrity": "sha512-HoKuzZrUlgpz35YO27XgD28uh/WJH4B0+3ttFqRo//lmq+9T/mIOJ6kqmINI9HpUpz1imRC/nR/lxKpJiv0uig==", - "requires": { - "buffer": "^5.4.3", - "punycode": "^2.1.1", - "webidl-conversions": "^5.0.0" + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" } }, "which": { @@ -26849,6 +27153,12 @@ "resolved": "https://registry.npmjs.org/wicg-inert/-/wicg-inert-3.1.1.tgz", "integrity": "sha512-PhBaNh8ur9Xm4Ggy4umelwNIP6pPP1bv3EaWaKqfb/QNme2rdLjm7wIInvV4WhxVHhzA4Spgw9qNSqWtB/ca2A==" }, + "wildcard": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", + "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", + "dev": true + }, "window-size": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", @@ -26906,12 +27216,6 @@ "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==" }, - "x-is-string": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz", - "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=", - "dev": true - }, "xml-name-validator": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", @@ -27009,12 +27313,6 @@ "fd-slicer": "~1.1.0" } }, - "yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true - }, "zwitch": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", diff --git a/package.json b/package.json index d3b6998d60..ba128fee6a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "WordPress", - "version": "5.9.0", + "version": "6.0.0", "description": "WordPress is open source software you can use to create a beautiful website, blog, or app.", "repository": { "type": "svn", @@ -24,14 +24,14 @@ "last 2 Opera versions" ], "devDependencies": { - "@wordpress/babel-preset-default": "6.2.1", - "@wordpress/custom-templated-path-webpack-plugin": "2.0.5", - "@wordpress/dependency-extraction-webpack-plugin": "3.1.4", - "@wordpress/e2e-test-utils": "5.4.3", - "@wordpress/library-export-default-webpack-plugin": "2.0.5", - "@wordpress/scripts": "16.1.5", - "autoprefixer": "^9.8.6", - "chalk": "4.1.1", + "@wordpress/babel-preset-default": "6.4.1", + "@wordpress/custom-templated-path-webpack-plugin": "2.1.0", + "@wordpress/dependency-extraction-webpack-plugin": "3.2.1", + "@wordpress/e2e-test-utils": "5.4.10", + "@wordpress/library-export-default-webpack-plugin": "2.2.0", + "@wordpress/scripts": "19.2.4", + "autoprefixer": "^9.8.8", + "chalk": "4.1.2", "check-node-version": "4.1.0", "copy-webpack-plugin": "^5.1.2", "cssnano": "4.1.11", @@ -40,16 +40,15 @@ "grunt": "~1.4.1", "grunt-banner": "^0.6.0", "grunt-contrib-clean": "~2.0.0", - "grunt-contrib-concat": "1.0.1", + "grunt-contrib-concat": "2.0.0", "grunt-contrib-copy": "~1.0.0", "grunt-contrib-cssmin": "~4.0.0", "grunt-contrib-imagemin": "~4.0.0", - "grunt-contrib-jshint": "3.0.0", - "grunt-contrib-qunit": "^4.0.0", + "grunt-contrib-jshint": "3.1.1", + "grunt-contrib-qunit": "^5.1.1", "grunt-contrib-uglify": "~5.0.1", "grunt-contrib-watch": "~1.1.0", "grunt-file-append": "0.0.7", - "grunt-includes": "~1.1.0", "grunt-jsdoc": "2.4.1", "grunt-jsvalidate": "~0.2.2", "grunt-legacy-util": "^2.0.1", @@ -64,72 +63,73 @@ "jest-image-snapshot": "3.0.1", "matchdep": "~2.0.0", "prettier": "npm:wp-prettier@2.0.5", - "qunit": "~2.16.0", - "sass": "^1.34.1", - "sinon": "~11.1.1", - "sinon-test": "~3.1.0", + "qunit": "~2.17.2", + "sass": "^1.43.4", + "sinon": "~12.0.1", + "sinon-test": "~3.1.1", "source-map-loader": "^1.1.3", - "uglify-js": "^3.13.9", + "uglify-js": "^3.14.3", "uglifyjs-webpack-plugin": "2.2.0", "uuid": "8.3.2", - "wait-on": "5.3.0", + "wait-on": "6.0.0", "webpack": "4.43.0", "webpack-dev-server": "3.11.2", "webpack-livereload-plugin": "2.3.0" }, "dependencies": { - "@wordpress/a11y": "3.1.2", - "@wordpress/annotations": "2.1.6", - "@wordpress/api-fetch": "5.1.2", - "@wordpress/autop": "3.1.2", - "@wordpress/blob": "3.1.2", - "@wordpress/block-directory": "2.1.21", - "@wordpress/block-editor": "6.1.14", - "@wordpress/block-library": "3.2.19", - "@wordpress/block-serialization-default-parser": "4.1.2", - "@wordpress/blocks": "9.1.8", - "@wordpress/components": "14.1.11", - "@wordpress/compose": "4.1.6", - "@wordpress/core-data": "3.1.12", - "@wordpress/customize-widgets": "1.0.20", - "@wordpress/data": "5.1.6", - "@wordpress/data-controls": "2.1.6", - "@wordpress/date": "4.1.2", - "@wordpress/deprecated": "3.1.2", - "@wordpress/dom": "3.1.5", - "@wordpress/dom-ready": "3.1.2", - "@wordpress/edit-post": "4.1.21", - "@wordpress/edit-widgets": "2.1.21", - "@wordpress/editor": "10.1.17", - "@wordpress/element": "3.1.2", - "@wordpress/escape-html": "2.1.2", - "@wordpress/format-library": "2.1.14", - "@wordpress/hooks": "3.1.1", - "@wordpress/html-entities": "3.1.2", - "@wordpress/i18n": "4.1.2", - "@wordpress/icons": "4.0.3", - "@wordpress/interface": "3.1.12", - "@wordpress/is-shallow-equal": "4.1.1", - "@wordpress/keyboard-shortcuts": "2.1.7", - "@wordpress/keycodes": "3.1.2", - "@wordpress/list-reusable-blocks": "2.1.11", - "@wordpress/media-utils": "2.1.2", - "@wordpress/notices": "3.1.6", - "@wordpress/nux": "4.1.11", - "@wordpress/plugins": "3.1.6", - "@wordpress/primitives": "2.1.2", - "@wordpress/priority-queue": "2.1.2", - "@wordpress/redux-routine": "4.1.2", - "@wordpress/reusable-blocks": "2.1.17", - "@wordpress/rich-text": "4.1.6", - "@wordpress/server-side-render": "2.1.12", - "@wordpress/shortcode": "3.1.2", - "@wordpress/token-list": "2.1.1", - "@wordpress/url": "3.1.2", - "@wordpress/viewport": "3.1.6", - "@wordpress/warning": "2.1.2", - "@wordpress/widgets": "1.1.19", - "@wordpress/wordcount": "3.1.2", + "@wordpress/a11y": "3.2.4", + "@wordpress/annotations": "2.2.9", + "@wordpress/api-fetch": "5.2.6", + "@wordpress/autop": "3.2.3", + "@wordpress/blob": "3.2.2", + "@wordpress/block-directory": "3.0.26", + "@wordpress/block-editor": "8.0.16", + "@wordpress/block-library": "6.0.25", + "@wordpress/block-serialization-default-parser": "4.2.3", + "@wordpress/blocks": "11.1.5", + "@wordpress/components": "19.2.2", + "@wordpress/compose": "5.0.7", + "@wordpress/core-data": "4.0.9", + "@wordpress/customize-widgets": "2.0.26", + "@wordpress/data": "6.1.5", + "@wordpress/data-controls": "2.2.8", + "@wordpress/date": "4.2.3", + "@wordpress/deprecated": "3.2.3", + "@wordpress/dom": "3.2.7", + "@wordpress/dom-ready": "3.2.3", + "@wordpress/edit-post": "5.0.26", + "@wordpress/edit-site": "3.0.26", + "@wordpress/edit-widgets": "3.1.21", + "@wordpress/editor": "12.0.20", + "@wordpress/element": "4.0.4", + "@wordpress/escape-html": "2.2.3", + "@wordpress/format-library": "3.0.22", + "@wordpress/hooks": "3.2.2", + "@wordpress/html-entities": "3.2.3", + "@wordpress/i18n": "4.2.4", + "@wordpress/icons": "6.1.1", + "@wordpress/interface": "4.1.17", + "@wordpress/is-shallow-equal": "4.2.1", + "@wordpress/keyboard-shortcuts": "3.0.7", + "@wordpress/keycodes": "3.2.4", + "@wordpress/list-reusable-blocks": "3.0.19", + "@wordpress/media-utils": "3.0.5", + "@wordpress/notices": "3.2.8", + "@wordpress/nux": "5.0.19", + "@wordpress/plugins": "4.0.7", + "@wordpress/primitives": "3.0.4", + "@wordpress/priority-queue": "2.2.3", + "@wordpress/redux-routine": "4.2.2", + "@wordpress/reusable-blocks": "3.0.22", + "@wordpress/rich-text": "5.0.8", + "@wordpress/server-side-render": "3.0.19", + "@wordpress/shortcode": "3.2.3", + "@wordpress/token-list": "2.2.2", + "@wordpress/url": "3.3.1", + "@wordpress/viewport": "4.0.7", + "@wordpress/warning": "2.2.2", + "@wordpress/widgets": "2.0.22", + "@wordpress/wordcount": "3.2.3", "backbone": "1.4.0", "clipboard": "2.0.8", "core-js-url-browser": "3.6.4", @@ -140,15 +140,15 @@ "jquery": "3.6.0", "jquery-color": "2.2.0", "jquery-form": "4.3.0", - "jquery-hoverintent": "1.10.1", + "jquery-hoverintent": "1.10.2", "lodash": "4.17.21", "masonry-layout": "4.2.2", "moment": "2.29.1", "objectFitPolyfill": "2.3.5", "polyfill-library": "3.105.0", - "react": "16.13.1", - "react-dom": "16.13.1", - "regenerator-runtime": "0.13.7", + "react": "17.0.1", + "react-dom": "17.0.1", + "regenerator-runtime": "0.13.9", "twemoji": "13.1.0", "underscore": "1.13.1", "whatwg-fetch": "3.6.2" diff --git a/phpcompat.xml.dist b/phpcompat.xml.dist index 5af8e2a503..fbc436cf0d 100644 --- a/phpcompat.xml.dist +++ b/phpcompat.xml.dist @@ -11,7 +11,7 @@ - + /vendor/* + + /src/wp-content/mu-plugins/* + + + /src/wp-content/plugins/* + + + /src/wp-content/themes/(?!twenty)* + - + -

' . esc_html__( '"Few people are capable of expressing with equanimity opinions which differ from the prejudices of their social eznvironment. Most people are even incapable of forming such opinions."', 'twentytwelve' ) . '

+

' . esc_html__( '"Few people are capable of expressing with equanimity opinions which differ from the prejudices of their social environment. Most people are even incapable of forming such opinions."', 'twentytwelve' ) . '

' . esc_html__( '— Albert Einstein', 'twentytwelve' ) . '

', diff --git a/src/wp-content/themes/twentytwelve/readme.txt b/src/wp-content/themes/twentytwelve/readme.txt index d0ab68cb18..e6dba1a221 100644 --- a/src/wp-content/themes/twentytwelve/readme.txt +++ b/src/wp-content/themes/twentytwelve/readme.txt @@ -1,7 +1,7 @@ === Twenty Twelve === Contributors: wordpressdotorg -Tested up to: 5.8 -Stable tag: 3.5 +Tested up to: 5.9 +Stable tag: 3.6 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready, block-patterns @@ -21,7 +21,7 @@ For more information about Twenty Twelve please go to https://codex.wordpress.or == Copyright == -Twenty Twelve WordPress Theme, Copyright 2012-2021 WordPress.org & Automattic.com +Twenty Twelve WordPress Theme, Copyright 2012-2022 WordPress.org & Automattic.com Twenty Twelve is Distributed under the terms of the GNU GPL This program is free software: you can redistribute it and/or modify @@ -46,10 +46,15 @@ Source: https://github.com/aFarkas/html5shiv == Changelog == += 3.6 = +* Released: January 25, 2022 + +https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_3.6 + = 3.5 = * Released: July 26, 2021 -https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_3.4 +https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_3.5 = 3.4 = * Released: July 20, 2021 diff --git a/src/wp-content/themes/twentytwelve/style.css b/src/wp-content/themes/twentytwelve/style.css index abbd5361de..b3989fc47d 100644 --- a/src/wp-content/themes/twentytwelve/style.css +++ b/src/wp-content/themes/twentytwelve/style.css @@ -4,7 +4,8 @@ Theme URI: https://wordpress.org/themes/twentytwelve/ Author: the WordPress team Author URI: https://wordpress.org/ Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background. -Version: 3.5 +Version: 3.6 +Tested up to: 5.9 Requires at least: 3.5 Requires PHP: 5.2.4 License: GNU General Public License v2 or later diff --git a/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css b/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css index fe56bd3389..c3261fd203 100644 --- a/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css +++ b/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css @@ -115,11 +115,12 @@ Inter variable font. Usage: .editor-styles-wrapper ul, .editor-styles-wrapper dl, .editor-styles-wrapper dt { - font-family: NonBreakingSpaceOverride, "Hoefler Text", Garamond, "Times New Roman", serif; + font-family: NonBreakingSpaceOverride, "Hoefler Text", "Noto Serif", Garamond, "Times New Roman", serif; letter-spacing: normal; } .editor-post-title__block .editor-post-title__input, +.editor-styles-wrapper .wp-block-post-title, .editor-styles-wrapper .wp-block h1, .editor-styles-wrapper .wp-block h2, .editor-styles-wrapper .wp-block h3, @@ -136,6 +137,7 @@ Inter variable font. Usage: @supports ( font-variation-settings: normal ) { .editor-post-title__block .editor-post-title__input, + .editor-styles-wrapper .wp-block-post-title, .editor-styles-wrapper .wp-block h1, .editor-styles-wrapper .wp-block h2, .editor-styles-wrapper .wp-block h3, @@ -235,6 +237,7 @@ Inter variable font. Usage: } .editor-post-title__block .editor-post-title__input, +.editor-styles-wrapper .wp-block-post-title, .editor-styles-wrapper .wp-block h1, .editor-styles-wrapper .wp-block h2, .editor-styles-wrapper .wp-block h3, @@ -251,6 +254,7 @@ Inter variable font. Usage: } .editor-post-title__block .editor-post-title__input, +.editor-styles-wrapper .wp-block-post-title, .editor-styles-wrapper .wp-block h1 { font-size: 36px; font-weight: 800; @@ -287,6 +291,12 @@ Inter variable font. Usage: /* POST TITLE */ +.editor-styles-wrapper .wp-block-post-title { + max-width: 1000px; + margin: 0 auto; + text-align: center; +} + .wp-block.editor-post-title__block { max-width: 1000px; } @@ -1217,6 +1227,7 @@ hr.wp-block-separator.is-style-dots::before { /* TYPOGRAPHY */ .editor-post-title__block .editor-post-title__input, + .editor-styles-wrapper .wp-block-post-title, .editor-styles-wrapper .wp-block h1 { font-size: 64px; } @@ -1395,6 +1406,7 @@ hr.wp-block-separator.is-style-dots::before { /* TYPOGRAPHY */ .editor-post-title__block .editor-post-title__input, + .editor-styles-wrapper .wp-block-post-title, .editor-styles-wrapper .wp-block h1 { font-size: 84px; } diff --git a/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css b/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css index 1fac49c182..11a3a33f50 100644 --- a/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css +++ b/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css @@ -115,11 +115,12 @@ Inter variable font. Usage: .editor-styles-wrapper ul, .editor-styles-wrapper dl, .editor-styles-wrapper dt { - font-family: NonBreakingSpaceOverride, "Hoefler Text", Garamond, "Times New Roman", serif; + font-family: NonBreakingSpaceOverride, "Hoefler Text", "Noto Serif", Garamond, "Times New Roman", serif; letter-spacing: normal; } .editor-post-title__block .editor-post-title__input, +.editor-styles-wrapper .wp-block-post-title, .editor-styles-wrapper .wp-block h1, .editor-styles-wrapper .wp-block h2, .editor-styles-wrapper .wp-block h3, @@ -136,6 +137,7 @@ Inter variable font. Usage: @supports ( font-variation-settings: normal ) { .editor-post-title__block .editor-post-title__input, + .editor-styles-wrapper .wp-block-post-title, .editor-styles-wrapper .wp-block h1, .editor-styles-wrapper .wp-block h2, .editor-styles-wrapper .wp-block h3, @@ -235,6 +237,7 @@ Inter variable font. Usage: } .editor-post-title__block .editor-post-title__input, +.editor-styles-wrapper .wp-block-post-title, .editor-styles-wrapper .wp-block h1, .editor-styles-wrapper .wp-block h2, .editor-styles-wrapper .wp-block h3, @@ -251,6 +254,7 @@ Inter variable font. Usage: } .editor-post-title__block .editor-post-title__input, +.editor-styles-wrapper .wp-block-post-title, .editor-styles-wrapper .wp-block h1 { font-size: 36px; font-weight: 800; @@ -287,6 +291,12 @@ Inter variable font. Usage: /* POST TITLE */ +.editor-styles-wrapper .wp-block-post-title { + max-width: 1000px; + margin: 0 auto; + text-align: center; +} + .wp-block.editor-post-title__block { max-width: 1000px; } @@ -1217,6 +1227,7 @@ hr.wp-block-separator.is-style-dots::before { /* TYPOGRAPHY */ .editor-post-title__block .editor-post-title__input, + .editor-styles-wrapper .wp-block-post-title, .editor-styles-wrapper .wp-block h1 { font-size: 64px; } @@ -1395,6 +1406,7 @@ hr.wp-block-separator.is-style-dots::before { /* TYPOGRAPHY */ .editor-post-title__block .editor-post-title__input, + .editor-styles-wrapper .wp-block-post-title, .editor-styles-wrapper .wp-block h1 { font-size: 84px; } diff --git a/src/wp-content/themes/twentytwenty/assets/css/editor-style-classic-rtl.css b/src/wp-content/themes/twentytwenty/assets/css/editor-style-classic-rtl.css index 7cac2383bb..89ec55a63a 100644 --- a/src/wp-content/themes/twentytwenty/assets/css/editor-style-classic-rtl.css +++ b/src/wp-content/themes/twentytwenty/assets/css/editor-style-classic-rtl.css @@ -74,7 +74,7 @@ body#tinymce.wp-editor.content ol, body#tinymce.wp-editor.content ul, body#tinymce.wp-editor.content dl, body#tinymce.wp-editor.content dt { - font-family: NonBreakingSpaceOverride, "Hoefler Text", Garamond, "Times New Roman", serif; + font-family: NonBreakingSpaceOverride, "Hoefler Text", "Noto Serif", Garamond, "Times New Roman", serif; letter-spacing: normal; } diff --git a/src/wp-content/themes/twentytwenty/assets/css/editor-style-classic.css b/src/wp-content/themes/twentytwenty/assets/css/editor-style-classic.css index f3382c5c23..4a4a00e967 100644 --- a/src/wp-content/themes/twentytwenty/assets/css/editor-style-classic.css +++ b/src/wp-content/themes/twentytwenty/assets/css/editor-style-classic.css @@ -74,7 +74,7 @@ body#tinymce.wp-editor.content ol, body#tinymce.wp-editor.content ul, body#tinymce.wp-editor.content dl, body#tinymce.wp-editor.content dt { - font-family: NonBreakingSpaceOverride, "Hoefler Text", Garamond, "Times New Roman", serif; + font-family: NonBreakingSpaceOverride, "Hoefler Text", "Noto Serif", Garamond, "Times New Roman", serif; letter-spacing: normal; } diff --git a/src/wp-content/themes/twentytwenty/assets/js/customize-preview.js b/src/wp-content/themes/twentytwenty/assets/js/customize-preview.js index fb76429ffe..36608f724a 100644 --- a/src/wp-content/themes/twentytwenty/assets/js/customize-preview.js +++ b/src/wp-content/themes/twentytwenty/assets/js/customize-preview.js @@ -186,7 +186,7 @@ stylesheet.html( styles ); } // Generate styles on load. Handles page-changes on the preview pane. - $( document ).ready( function() { + $( function() { twentyTwentyGenerateColorA11yPreviewStyles( 'content' ); twentyTwentyGenerateColorA11yPreviewStyles( 'header-footer' ); } ); diff --git a/src/wp-content/themes/twentytwenty/assets/js/customize.js b/src/wp-content/themes/twentytwenty/assets/js/customize.js index 2a38ace1d8..944aae95bf 100644 --- a/src/wp-content/themes/twentytwenty/assets/js/customize.js +++ b/src/wp-content/themes/twentytwenty/assets/js/customize.js @@ -1,7 +1,7 @@ /* global wp, jQuery */ ( function( $, api ) { - $( document ).ready( function() { + $( function() { // Make it possible to reset the color based on a radio input's value. // `active` can be either `custom` or `default`. api.control( 'accent_hue_active' ).setting.bind( function( active ) { diff --git a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php index 0c4951ef48..731064eda3 100644 --- a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php +++ b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php @@ -119,7 +119,7 @@ if ( ! class_exists( 'TwentyTwenty_Non_Latin_Languages' ) ) { 'twentytwenty_get_localized_font_family_elements', array( 'front-end' => array( 'body', 'input', 'textarea', 'button', '.button', '.faux-button', '.wp-block-button__link', '.wp-block-file__button', '.has-drop-cap:not(:focus)::first-letter', '.entry-content .wp-block-archives', '.entry-content .wp-block-categories', '.entry-content .wp-block-cover-image', '.entry-content .wp-block-latest-comments', '.entry-content .wp-block-latest-posts', '.entry-content .wp-block-pullquote', '.entry-content .wp-block-quote.is-large', '.entry-content .wp-block-quote.is-style-large', '.entry-content .wp-block-archives *', '.entry-content .wp-block-categories *', '.entry-content .wp-block-latest-posts *', '.entry-content .wp-block-latest-comments *', '.entry-content p', '.entry-content ol', '.entry-content ul', '.entry-content dl', '.entry-content dt', '.entry-content cite', '.entry-content figcaption', '.entry-content .wp-caption-text', '.comment-content p', '.comment-content ol', '.comment-content ul', '.comment-content dl', '.comment-content dt', '.comment-content cite', '.comment-content figcaption', '.comment-content .wp-caption-text', '.widget_text p', '.widget_text ol', '.widget_text ul', '.widget_text dl', '.widget_text dt', '.widget-content .rssSummary', '.widget-content cite', '.widget-content figcaption', '.widget-content .wp-caption-text' ), - 'block-editor' => array( '.editor-styles-wrapper > *', '.editor-styles-wrapper p', '.editor-styles-wrapper ol', '.editor-styles-wrapper ul', '.editor-styles-wrapper dl', '.editor-styles-wrapper dt', '.editor-post-title__block .editor-post-title__input', '.editor-styles-wrapper .wp-block h1', '.editor-styles-wrapper .wp-block h2', '.editor-styles-wrapper .wp-block h3', '.editor-styles-wrapper .wp-block h4', '.editor-styles-wrapper .wp-block h5', '.editor-styles-wrapper .wp-block h6', '.editor-styles-wrapper .has-drop-cap:not(:focus)::first-letter', '.editor-styles-wrapper cite', '.editor-styles-wrapper figcaption', '.editor-styles-wrapper .wp-caption-text' ), + 'block-editor' => array( '.editor-styles-wrapper > *', '.editor-styles-wrapper p', '.editor-styles-wrapper ol', '.editor-styles-wrapper ul', '.editor-styles-wrapper dl', '.editor-styles-wrapper dt', '.editor-post-title__block .editor-post-title__input', '.editor-styles-wrapper .wp-block-post-title', '.editor-styles-wrapper .wp-block h1', '.editor-styles-wrapper .wp-block h2', '.editor-styles-wrapper .wp-block h3', '.editor-styles-wrapper .wp-block h4', '.editor-styles-wrapper .wp-block h5', '.editor-styles-wrapper .wp-block h6', '.editor-styles-wrapper .has-drop-cap:not(:focus)::first-letter', '.editor-styles-wrapper cite', '.editor-styles-wrapper figcaption', '.editor-styles-wrapper .wp-caption-text' ), 'classic-editor' => array( 'body#tinymce.wp-editor', 'body#tinymce.wp-editor p', 'body#tinymce.wp-editor ol', 'body#tinymce.wp-editor ul', 'body#tinymce.wp-editor dl', 'body#tinymce.wp-editor dt', 'body#tinymce.wp-editor figcaption', 'body#tinymce.wp-editor .wp-caption-text', 'body#tinymce.wp-editor .wp-caption-dd', 'body#tinymce.wp-editor cite', 'body#tinymce.wp-editor table' ), ) ); diff --git a/src/wp-content/themes/twentytwenty/package-lock.json b/src/wp-content/themes/twentytwenty/package-lock.json index 1e78a230bd..9a8150e9cd 100644 --- a/src/wp-content/themes/twentytwenty/package-lock.json +++ b/src/wp-content/themes/twentytwenty/package-lock.json @@ -1,6 +1,6 @@ { "name": "twentytwenty", - "version": "1.8.0", + "version": "1.9.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2544,6 +2544,12 @@ "requires": { "type-fest": "^0.8.1" } + }, + "prettier": { + "version": "npm:wp-prettier@2.2.1-beta-1", + "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.2.1-beta-1.tgz", + "integrity": "sha512-+JHkqs9LC/JPp51yy1hzs3lQ7qeuWCwOcSzpQNeeY/G7oSpnF61vxt7hRh87zNRTr6ob2ndy0W8rVzhgrcA+Gw==", + "dev": true } } }, @@ -2651,6 +2657,14 @@ "webpack-cli": "^3.3.11", "webpack-livereload-plugin": "^2.3.0", "webpack-sources": "^2.2.0" + }, + "dependencies": { + "prettier": { + "version": "npm:wp-prettier@2.2.1-beta-1", + "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.2.1-beta-1.tgz", + "integrity": "sha512-+JHkqs9LC/JPp51yy1hzs3lQ7qeuWCwOcSzpQNeeY/G7oSpnF61vxt7hRh87zNRTr6ob2ndy0W8rVzhgrcA+Gw==", + "dev": true + } } }, "@wordpress/stylelint-config": { @@ -2800,9 +2814,9 @@ } }, "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { @@ -3052,12 +3066,6 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, - "at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "dev": true - }, "atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", @@ -3065,23 +3073,48 @@ "dev": true }, "autoprefixer": { - "version": "10.2.6", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.6.tgz", - "integrity": "sha512-8lChSmdU6dCNMCQopIf4Pe5kipkAGj/fvTMslCsih0uHpOrXOPUEVOmYMMqmw3cekQkSD7EhIeuYl5y0BLdKqg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.0.tgz", + "integrity": "sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA==", "dev": true, "requires": { - "browserslist": "^4.16.6", - "caniuse-lite": "^1.0.30001230", - "colorette": "^1.2.2", + "browserslist": "^4.17.5", + "caniuse-lite": "^1.0.30001272", "fraction.js": "^4.1.1", "normalize-range": "^0.1.2", + "picocolors": "^1.0.0", "postcss-value-parser": "^4.1.0" }, "dependencies": { - "colorette": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", + "browserslist": { + "version": "4.17.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.6.tgz", + "integrity": "sha512-uPgz3vyRTlEiCv4ee9KlsKgo2V6qPk7Jsn0KAn2OBqbqKo3iNcPEC1Ti6J4dwnz+aIRfEEEuOzC9IBk8tXUomw==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30001274", + "electron-to-chromium": "^1.3.886", + "escalade": "^3.1.1", + "node-releases": "^2.0.1", + "picocolors": "^1.0.0" + } + }, + "caniuse-lite": { + "version": "1.0.30001278", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001278.tgz", + "integrity": "sha512-mpF9KeH8u5cMoEmIic/cr7PNS+F5LWBk0t2ekGT60lFf0Wq+n9LspAj0g3P+o7DQhD3sUdlMln4YFAWhFYn9jg==", + "dev": true + }, + "electron-to-chromium": { + "version": "1.3.890", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.890.tgz", + "integrity": "sha512-VWlVXSkv0cA/OOehrEyqjUTHwV8YXCPTfPvbtoeU2aHR21vI4Ejh5aC4AxUwOmbLbBgb6Gd3URZahoCxtBqCYQ==", + "dev": true + }, + "node-releases": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", + "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", "dev": true } } @@ -3980,9 +4013,9 @@ } }, "nth-check": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz", - "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", + "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==", "dev": true, "requires": { "boolbase": "^1.0.0" @@ -4274,15 +4307,14 @@ } }, "concurrently": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.2.0.tgz", - "integrity": "sha512-v9I4Y3wFoXCSY2L73yYgwA9ESrQMpRn80jMcqMgHx720Hecz2GZAvTI6bREVST6lkddNypDKRN22qhK0X8Y00g==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.3.0.tgz", + "integrity": "sha512-k4k1jQGHHKsfbqzkUszVf29qECBrkvBKkcPJEUDTyVR7tZd1G/JOfnst4g1sYbFvJ4UjHZisj1aWQR8yLKpGPw==", "dev": true, "requires": { "chalk": "^4.1.0", "date-fns": "^2.16.1", "lodash": "^4.17.21", - "read-pkg": "^5.2.0", "rxjs": "^6.6.3", "spawn-command": "^0.0.2-1", "supports-color": "^8.1.0", @@ -4331,18 +4363,6 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "read-pkg": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", - "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", - "dev": true, - "requires": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" - } - }, "supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -4352,12 +4372,6 @@ "has-flag": "^4.0.0" } }, - "type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true - }, "wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -4391,9 +4405,9 @@ } }, "yargs-parser": { - "version": "20.2.7", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", - "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true } } @@ -4780,9 +4794,9 @@ } }, "date-fns": { - "version": "2.21.3", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.21.3.tgz", - "integrity": "sha512-HeYdzCaFflc1i4tGbj7JKMjM4cKGYoyxwcIIkHzNgCkX8xXDNJDZXgDDVchIWpN4eQc3lH37WarduXFZJOtxfw==", + "version": "2.25.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.25.0.tgz", + "integrity": "sha512-ovYRFnTrbGPD4nqaEqescPEv1mNwvt+UTqI3Ay9SzNtey9NZnYu6E2qCcBBgJ6/2VF1zGGygpyTDITqpQQ5e+w==", "dev": true }, "debug": { @@ -4964,9 +4978,9 @@ "dev": true }, "dependency-graph": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.9.0.tgz", - "integrity": "sha512-9YLIBURXj4DJMFALxXw9K3Y3rwb5Fk0X5/8ipCzaN84+gKxoHK43tVKRNakCQbiEx07E8Uwhuq21BpUagFhZ8w==", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz", + "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==", "dev": true }, "des.js": { @@ -6904,12 +6918,11 @@ "dev": true }, "fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", + "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", "dev": true, "requires": { - "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" @@ -7514,6 +7527,15 @@ "integrity": "sha512-/zC18RWCC2wz4ZwnS4UoujGWzvSKy28DLjtE+jrGBOXej6YdmityhBDzE8E0NlktEqi4tgdNbydX8B6G4haHSQ==", "dev": true }, + "import-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz", + "integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==", + "dev": true, + "requires": { + "import-from": "^3.0.0" + } + }, "import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -7524,6 +7546,23 @@ "resolve-from": "^4.0.0" } }, + "import-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz", + "integrity": "sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==", + "dev": true, + "requires": { + "resolve-from": "^5.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true + } + } + }, "import-lazy": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", @@ -9066,6 +9105,12 @@ "type-check": "~0.4.0" } }, + "lilconfig": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz", + "integrity": "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==", + "dev": true + }, "lines-and-columns": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", @@ -10002,9 +10047,9 @@ "optional": true }, "nanoid": { - "version": "3.1.23", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz", - "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==", + "version": "3.1.30", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", + "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==", "dev": true }, "nanomatch": { @@ -10708,9 +10753,9 @@ "dev": true }, "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, "path-type": { @@ -10744,6 +10789,12 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "dev": true }, + "picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + }, "picomatch": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", @@ -10836,42 +10887,34 @@ "dev": true }, "postcss": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.0.tgz", - "integrity": "sha512-+ogXpdAjWGa+fdYY5BQ96V/6tAo+TdSSIMP5huJBIygdWwKtVoB5JWZ7yUd4xZ8r+8Kvvx4nyg/PQ071H4UtcQ==", + "version": "8.3.11", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz", + "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==", "dev": true, "requires": { - "colorette": "^1.2.2", - "nanoid": "^3.1.23", + "nanoid": "^3.1.30", + "picocolors": "^1.0.0", "source-map-js": "^0.6.2" - }, - "dependencies": { - "colorette": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", - "dev": true - } } }, "postcss-cli": { - "version": "8.3.1", - "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.3.1.tgz", - "integrity": "sha512-leHXsQRq89S3JC9zw/tKyiVV2jAhnfQe0J8VI4eQQbUjwIe0XxVqLrR+7UsahF1s9wi4GlqP6SJ8ydf44cgF2Q==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-9.0.2.tgz", + "integrity": "sha512-08Wujoy7YGhKCFrGsT9OXqWjtHlGQ+JmyaD/4McjCiwor2IUTRVzXiJd+xmLTGdSWjceS6/TePaJQwBlkVWHiw==", "dev": true, "requires": { - "chalk": "^4.0.0", "chokidar": "^3.3.0", - "dependency-graph": "^0.9.0", - "fs-extra": "^9.0.0", - "get-stdin": "^8.0.0", - "globby": "^11.0.0", + "dependency-graph": "^0.11.0", + "fs-extra": "^10.0.0", + "get-stdin": "^9.0.0", + "globby": "^12.0.0", + "picocolors": "^1.0.0", "postcss-load-config": "^3.0.0", "postcss-reporter": "^7.0.0", "pretty-hrtime": "^1.0.3", "read-cache": "^1.0.0", - "slash": "^3.0.0", - "yargs": "^16.0.0" + "slash": "^4.0.0", + "yargs": "^17.0.0" }, "dependencies": { "ansi-styles": { @@ -10883,6 +10926,12 @@ "color-convert": "^2.0.1" } }, + "array-union": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz", + "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==", + "dev": true + }, "cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -10909,44 +10958,59 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "get-stdin": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", - "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", - "dev": true - }, - "import-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz", - "integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==", + "fast-glob": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", "dev": true, "requires": { - "import-from": "^3.0.0" + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" } }, - "import-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz", - "integrity": "sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==", + "get-stdin": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz", + "integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==", + "dev": true + }, + "globby": { + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-12.0.2.tgz", + "integrity": "sha512-lAsmb/5Lww4r7MM9nCCliDZVIKbZTavrsunAsHLr9oHthrZP1qi7/gAnHOsUs9bLvEt2vKVJhHmxuL7QbDuPdQ==", "dev": true, "requires": { - "resolve-from": "^5.0.0" + "array-union": "^3.0.1", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.7", + "ignore": "^5.1.8", + "merge2": "^1.4.1", + "slash": "^4.0.0" } }, - "postcss-load-config": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.0.1.tgz", - "integrity": "sha512-/pDHe30UYZUD11IeG8GWx9lNtu1ToyTsZHnyy45B4Mrwr/Kb6NgYl7k753+05CJNKnjbwh4975amoPJ+TEjHNQ==", + "micromatch": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", + "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", "dev": true, "requires": { - "cosmiconfig": "^7.0.0", - "import-cwd": "^3.0.0" + "braces": "^3.0.1", + "picomatch": "^2.2.3" } }, - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "picomatch": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "dev": true + }, + "slash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", + "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", "dev": true }, "wrap-ansi": { @@ -10961,15 +11025,15 @@ } }, "y18n": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.6.tgz", - "integrity": "sha512-PlVX4Y0lDTN6E2V4ES2tEdyvXkeKzxa8c/vo0pxPr/TqbztddTP0yn7zZylIyiAuxerqj0Q5GhpJ1YJCP8LaZQ==", + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true }, "yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "version": "17.2.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.2.1.tgz", + "integrity": "sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==", "dev": true, "requires": { "cliui": "^7.0.2", @@ -10982,9 +11046,9 @@ } }, "yargs-parser": { - "version": "20.2.7", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", - "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true } } @@ -11038,37 +11102,20 @@ "postcss": "^7.0.14" }, "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" + "picocolors": "^0.2.1", + "source-map": "^0.6.1" } }, "source-map": { @@ -11076,18 +11123,20 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, + "postcss-load-config": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.0.tgz", + "integrity": "sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g==", + "dev": true, + "requires": { + "import-cwd": "^3.0.0", + "lilconfig": "^2.0.3", + "yaml": "^1.10.2" + } + }, "postcss-loader": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.3.0.tgz", @@ -11165,17 +11214,17 @@ } }, "postcss-reporter": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.2.tgz", - "integrity": "sha512-JyQ96NTQQsso42y6L1H1RqHfWH1C3Jr0pt91mVv5IdYddZAE9DUZxuferNgk6q0o6vBVOrfVJb10X1FgDzjmDw==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.4.tgz", + "integrity": "sha512-jY/fnpGSin7kwJeunXbY35STp5O3VIxSFdjee5JkoPQ+FfGH5JW3N+Xe9oAPcL9UkjWjkK+JC72o8XH4XXKdhw==", "dev": true, "requires": { - "colorette": "^1.2.1", "lodash.difference": "^4.5.0", "lodash.forown": "^4.4.0", "lodash.get": "^4.4.2", "lodash.groupby": "^4.6.0", - "lodash.sortby": "^4.7.0" + "lodash.sortby": "^4.7.0", + "picocolors": "^1.0.0" } }, "postcss-resolve-nested-selector": { @@ -11193,37 +11242,20 @@ "postcss": "^7.0.26" }, "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" + "picocolors": "^0.2.1", + "source-map": "^0.6.1" } }, "source-map": { @@ -11231,15 +11263,6 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, @@ -11253,37 +11276,20 @@ "postcss": "^7.0.21" }, "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" + "picocolors": "^0.2.1", + "source-map": "^0.6.1" } }, "source-map": { @@ -11291,15 +11297,6 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, @@ -11312,37 +11309,20 @@ "postcss": "^7.0.6" }, "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" + "picocolors": "^0.2.1", + "source-map": "^0.6.1" } }, "source-map": { @@ -11350,15 +11330,6 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, @@ -11390,12 +11361,6 @@ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true }, - "prettier": { - "version": "npm:wp-prettier@2.2.1-beta-1", - "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.2.1-beta-1.tgz", - "integrity": "sha512-+JHkqs9LC/JPp51yy1hzs3lQ7qeuWCwOcSzpQNeeY/G7oSpnF61vxt7hRh87zNRTr6ob2ndy0W8rVzhgrcA+Gw==", - "dev": true - }, "prettier-linter-helpers": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", @@ -12428,15 +12393,14 @@ "dev": true }, "rtlcss": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-3.2.0.tgz", - "integrity": "sha512-nV3UmaTmA5TkP2dYOR16ULu6FkMOqZRbiXbFZnmWIN9coPfx3gin31VGOPV7vrVMPjNds7pCS2UYy0mwQUdFCQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-3.5.0.tgz", + "integrity": "sha512-wzgMaMFHQTnyi9YOwsx9LjOxYXJPzS8sYnFaKm6R5ysvTkwzHiB0vxnbHwchHQT65PTdBjDG21/kQBWI7q9O7A==", "dev": true, "requires": { - "chalk": "^4.1.0", "find-up": "^5.0.0", - "mkdirp": "^1.0.4", - "postcss": "^8.2.4", + "picocolors": "^1.0.0", + "postcss": "^8.3.11", "strip-json-comments": "^3.1.1" }, "dependencies": { @@ -12459,12 +12423,6 @@ "p-locate": "^5.0.0" } }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, "p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -13817,6 +13775,12 @@ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true }, + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true + }, "picomatch": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", @@ -13824,38 +13788,13 @@ "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - } + "picocolors": "^0.2.1", + "source-map": "^0.6.1" } }, "read-pkg": { @@ -13942,15 +13881,6 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - }, "type-fest": { "version": "0.18.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", @@ -14008,37 +13938,20 @@ "postcss": "^7.0.2" }, "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" + "picocolors": "^0.2.1", + "source-map": "^0.6.1" } }, "source-map": { @@ -14046,15 +13959,6 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, @@ -14187,9 +14091,9 @@ "dev": true }, "tar": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz", - "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==", + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", "dev": true, "requires": { "chownr": "^2.0.0", @@ -14438,9 +14342,9 @@ } }, "tmpl": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", - "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", "dev": true }, "to-arraybuffer": { diff --git a/src/wp-content/themes/twentytwenty/package.json b/src/wp-content/themes/twentytwenty/package.json index 50448a29c9..18b98886d9 100644 --- a/src/wp-content/themes/twentytwenty/package.json +++ b/src/wp-content/themes/twentytwenty/package.json @@ -1,6 +1,6 @@ { "name": "twentytwenty", - "version": "1.8.0", + "version": "1.9.0", "description": "Default WP Theme", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", @@ -16,11 +16,11 @@ "devDependencies": { "@wordpress/browserslist-config": "^4.0.1", "@wordpress/scripts": "^16.1.2", - "autoprefixer": "^10.2.6", - "concurrently": "^6.2.0", - "postcss-cli": "^8.3.1", - "postcss": "^8.3.0", - "rtlcss": "^3.2.0", + "autoprefixer": "^10.4.0", + "concurrently": "^6.3.0", + "postcss-cli": "^9.0.2", + "postcss": "^8.3.11", + "rtlcss": "^3.5.0", "stylelint-a11y": "^1.2.3" }, "browserslist": [ diff --git a/src/wp-content/themes/twentytwenty/readme.txt b/src/wp-content/themes/twentytwenty/readme.txt index 9d7ad469bc..5ce24c1388 100644 --- a/src/wp-content/themes/twentytwenty/readme.txt +++ b/src/wp-content/themes/twentytwenty/readme.txt @@ -1,7 +1,7 @@ === Twenty Twenty === Contributors: the WordPress team -Tested up to: 5.8 -Stable tag: 1.8 +Tested up to: 5.9 +Stable tag: 1.9 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -22,6 +22,11 @@ you pick, ensuring a high, accessible color contrast for your visitors. == Changelog == += 1.9 = +* Released: January 25, 2022 + +https://wordpress.org/support/article/twenty-twenty-changelog/#Version_1.9 + = 1.8 = * Released: July 20, 2021 @@ -69,7 +74,7 @@ Initial release == Copyright == -Twenty Twenty WordPress Theme, Copyright 2019-2021 WordPress.org +Twenty Twenty WordPress Theme, Copyright 2019-2022 WordPress.org Twenty Twenty is distributed under the terms of the GNU GPL. This program is free software: you can redistribute it and/or modify @@ -118,7 +123,7 @@ License URI: http://www.gnu.org/licenses/gpl-2.0.html Source: WordPress Social Link Block (See wp-includes\blocks\social-link.php) Code from Twenty Nineteen -Copyright (c) 2018-2021 WordPress.org +Copyright (c) 2018-2022 WordPress.org License: GPLv2 Source: https://wordpress.org/themes/twentynineteen/ Included as part of the following classes and functions: @@ -128,11 +133,11 @@ Included as part of the following classes and functions: - twentytwenty_nav_menu_social_icons() Code from Twenty Seventeen -Copyright (c) 2016-2021 WordPress.org +Copyright (c) 2016-2022 WordPress.org License: GPLv2 Source: https://wordpress.org/themes/twentyseventeen/ Included as part of the following classes and functions: - twentytwenty_unique_id() Underscores -https://underscores.me/, (C) 2012-2021 Automattic, Inc., [GPLv2 or later](https://www.gnu.org/licenses/gpl-2.0.html) +https://underscores.me/, (C) 2012-2022 Automattic, Inc., [GPLv2 or later](https://www.gnu.org/licenses/gpl-2.0.html) diff --git a/src/wp-content/themes/twentytwenty/style-rtl.css b/src/wp-content/themes/twentytwenty/style-rtl.css index aa87bedf03..0e5191d247 100644 --- a/src/wp-content/themes/twentytwenty/style-rtl.css +++ b/src/wp-content/themes/twentytwenty/style-rtl.css @@ -1,7 +1,8 @@ /* Theme Name: Twenty Twenty Text Domain: twentytwenty -Version: 1.8 +Version: 1.9 +Tested up to: 5.9 Requires at least: 4.7 Requires PHP: 5.2.4 Description: Our default theme for 2020 is designed to take full advantage of the flexibility of the block editor. Organizations and businesses have the ability to create dynamic landing pages with endless layouts using the group and column blocks. The centered content column and fine-tuned typography also makes it perfect for traditional blogs. Complete editor styles give you a good idea of what your content will look like, even before you publish. You can give your site a personal touch by changing the background colors and the accent color in the Customizer. The colors of all elements on your site are automatically calculated based on the colors you pick, ensuring a high, accessible color contrast for your visitors. @@ -3524,7 +3525,7 @@ figure.wp-block-table.is-style-stripes { /* Font Families ----------------------------- */ .entry-content { - font-family: NonBreakingSpaceOverride, "Hoefler Text", Garamond, "Times New Roman", serif; + font-family: NonBreakingSpaceOverride, "Hoefler Text", "Noto Serif", Garamond, "Times New Roman", serif; letter-spacing: normal; } @@ -4119,7 +4120,7 @@ div.comment:first-of-type { .widget_text dl, .widget_text dt, .widget-content .rssSummary { - font-family: NonBreakingSpaceOverride, "Hoefler Text", Garamond, "Times New Roman", serif; + font-family: NonBreakingSpaceOverride, "Hoefler Text", "Noto Serif", Garamond, "Times New Roman", serif; letter-spacing: normal; } diff --git a/src/wp-content/themes/twentytwenty/style.css b/src/wp-content/themes/twentytwenty/style.css index b5a99f90f5..27053cc3e0 100644 --- a/src/wp-content/themes/twentytwenty/style.css +++ b/src/wp-content/themes/twentytwenty/style.css @@ -1,7 +1,8 @@ /* Theme Name: Twenty Twenty Text Domain: twentytwenty -Version: 1.8 +Version: 1.9 +Tested up to: 5.9 Requires at least: 4.7 Requires PHP: 5.2.4 Description: Our default theme for 2020 is designed to take full advantage of the flexibility of the block editor. Organizations and businesses have the ability to create dynamic landing pages with endless layouts using the group and column blocks. The centered content column and fine-tuned typography also makes it perfect for traditional blogs. Complete editor styles give you a good idea of what your content will look like, even before you publish. You can give your site a personal touch by changing the background colors and the accent color in the Customizer. The colors of all elements on your site are automatically calculated based on the colors you pick, ensuring a high, accessible color contrast for your visitors. @@ -3546,7 +3547,7 @@ figure.wp-block-table.is-style-stripes { /* Font Families ----------------------------- */ .entry-content { - font-family: NonBreakingSpaceOverride, "Hoefler Text", Garamond, "Times New Roman", serif; + font-family: NonBreakingSpaceOverride, "Hoefler Text", "Noto Serif", Garamond, "Times New Roman", serif; letter-spacing: normal; } @@ -4153,7 +4154,7 @@ div.comment:first-of-type { .widget_text dl, .widget_text dt, .widget-content .rssSummary { - font-family: NonBreakingSpaceOverride, "Hoefler Text", Garamond, "Times New Roman", serif; + font-family: NonBreakingSpaceOverride, "Hoefler Text", "Noto Serif", Garamond, "Times New Roman", serif; letter-spacing: normal; } diff --git a/src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css b/src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css index 9665360514..5afd750a7a 100644 --- a/src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css +++ b/src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css @@ -147,11 +147,7 @@ blockquote p { line-height: 1.7; } -blockquote cite { - font-weight: normal; - letter-spacing: normal; -} - +blockquote cite, blockquote footer { font-weight: normal; letter-spacing: normal; @@ -162,33 +158,16 @@ blockquote.alignright { padding-left: inherit; } -blockquote.alignleft p { - font-size: 1.125rem; - max-width: inherit; - width: inherit; -} - +blockquote.alignleft p, blockquote.alignright p { font-size: 1.125rem; max-width: inherit; width: inherit; } -blockquote.alignleft cite { - font-size: 1rem; - letter-spacing: normal; -} - -blockquote.alignleft footer { - font-size: 1rem; - letter-spacing: normal; -} - -blockquote.alignright cite { - font-size: 1rem; - letter-spacing: normal; -} - +blockquote.alignleft cite, +blockquote.alignleft footer, +blockquote.alignright cite, blockquote.alignright footer { font-size: 1rem; letter-spacing: normal; @@ -206,18 +185,8 @@ blockquote:before { left: -12px; } -blockquote .wp-block-quote__citation { - color: #28303d; - font-size: 1rem; - font-style: normal; -} - -blockquote cite { - color: #28303d; - font-size: 1rem; - font-style: normal; -} - +blockquote .wp-block-quote__citation, +blockquote cite, blockquote footer { color: #28303d; font-size: 1rem; @@ -236,16 +205,14 @@ blockquote footer { img { height: auto; - max-width: 100%; vertical-align: middle; } /* Classic editor images */ -.entry-content img { - max-width: 100%; -} /* Make sure embeds and iframes fit their containers. */ +img, +.entry-content img, embed, iframe, object, @@ -254,33 +221,9 @@ video { } /* Media captions */ -figcaption { - color: currentColor; - font-size: 1rem; - line-height: 1.7; - margin-top: 10px; - margin-bottom: 20px; - text-align: center; -} - -.wp-caption { - color: currentColor; - font-size: 1rem; - line-height: 1.7; - margin-top: 10px; - margin-bottom: 20px; - text-align: center; -} - -.wp-caption-text { - color: currentColor; - font-size: 1rem; - line-height: 1.7; - margin-top: 10px; - margin-bottom: 20px; - text-align: center; -} - +figcaption, +.wp-caption, +.wp-caption-text, .wp-block-embed figcaption { color: currentColor; font-size: 1rem; @@ -580,13 +523,7 @@ a:hover { color: currentColor; } -.wp-block-cover { - background-color: #000; - min-height: 450px; - margin-top: inherit; - margin-bottom: inherit; -} - +.wp-block-cover, .wp-block-cover-image { background-color: #000; min-height: 450px; @@ -629,10 +566,7 @@ a:hover { .wp-block-cover-image .wp-block-cover__inner-container, .wp-block-cover-image .wp-block-cover-image-text, .wp-block-cover-image .wp-block-cover-text, -.wp-block-cover-image .block-editor-block-list__block { - color: currentColor; -} - +.wp-block-cover-image .block-editor-block-list__block, .wp-block-cover .wp-block-cover__inner-container a, .wp-block-cover .wp-block-cover-image-text a, .wp-block-cover .wp-block-cover-text a, @@ -644,34 +578,13 @@ a:hover { color: currentColor; } -.wp-block-cover .wp-block-cover__inner-container .has-link-color a { - color: #28303d; -} - -.wp-block-cover .wp-block-cover-image-text .has-link-color a { - color: #28303d; -} - -.wp-block-cover .wp-block-cover-text .has-link-color a { - color: #28303d; -} - -.wp-block-cover .block-editor-block-list__block .has-link-color a { - color: #28303d; -} - -.wp-block-cover-image .wp-block-cover__inner-container .has-link-color a { - color: #28303d; -} - -.wp-block-cover-image .wp-block-cover-image-text .has-link-color a { - color: #28303d; -} - -.wp-block-cover-image .wp-block-cover-text .has-link-color a { - color: #28303d; -} - +.wp-block-cover .wp-block-cover__inner-container .has-link-color a, +.wp-block-cover .wp-block-cover-image-text .has-link-color a, +.wp-block-cover .wp-block-cover-text .has-link-color a, +.wp-block-cover .block-editor-block-list__block .has-link-color a, +.wp-block-cover-image .wp-block-cover__inner-container .has-link-color a, +.wp-block-cover-image .wp-block-cover-image-text .has-link-color a, +.wp-block-cover-image .wp-block-cover-text .has-link-color a, .wp-block-cover-image .block-editor-block-list__block .has-link-color a { color: #28303d; } @@ -753,10 +666,7 @@ a:hover { text-align: right; } -.wp-block-cover.is-style-twentytwentyone-border { - border: 3px solid #28303d; -} - +.wp-block-cover.is-style-twentytwentyone-border, .wp-block-cover-image.is-style-twentytwentyone-border { border: 3px solid #28303d; } @@ -1019,182 +929,46 @@ a:hover { width: 100%; } -.wp-block-heading h1 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h1 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h1 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.wp-block-heading h2 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h2 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h2 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.wp-block-heading h3 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h3 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h3 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.wp-block-heading h4 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h4 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h4 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.wp-block-heading h5 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h5 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h5 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.wp-block-heading h6 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h6 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - +.wp-block-heading h1, +h1, +.h1, +.wp-block-heading h2, +h2, +.h2, +.wp-block-heading h3, +h3, +.h3, +.wp-block-heading h4, +h4, +.h4, +.wp-block-heading h5, +h5, +.h5, +.wp-block-heading h6, +h6, .h6 { clear: both; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; font-weight: normal; } -.wp-block-heading h1 strong { - font-weight: 600; -} - -h1 strong { - font-weight: 600; -} - -.h1 strong { - font-weight: 600; -} - -.wp-block-heading h2 strong { - font-weight: 600; -} - -h2 strong { - font-weight: 600; -} - -.h2 strong { - font-weight: 600; -} - -.wp-block-heading h3 strong { - font-weight: 600; -} - -h3 strong { - font-weight: 600; -} - -.h3 strong { - font-weight: 600; -} - -.wp-block-heading h4 strong { - font-weight: 600; -} - -h4 strong { - font-weight: 600; -} - -.h4 strong { - font-weight: 600; -} - -.wp-block-heading h5 strong { - font-weight: 600; -} - -h5 strong { - font-weight: 600; -} - -.h5 strong { - font-weight: 600; -} - -.wp-block-heading h6 strong { - font-weight: 600; -} - -h6 strong { - font-weight: 600; -} - +.wp-block-heading h1 strong, +h1 strong, +.h1 strong, +.wp-block-heading h2 strong, +h2 strong, +.h2 strong, +.wp-block-heading h3 strong, +h3 strong, +.h3 strong, +.wp-block-heading h4 strong, +h4 strong, +.h4 strong, +.wp-block-heading h5 strong, +h5 strong, +.h5 strong, +.wp-block-heading h6 strong, +h6 strong, .h6 strong { font-weight: 600; } @@ -1388,20 +1162,8 @@ h3 { } } -.wp-block-heading h4 { - font-size: 1.5rem; - font-weight: 600; - letter-spacing: normal; - line-height: 1.3; -} - -h4 { - font-size: 1.5rem; - font-weight: 600; - letter-spacing: normal; - line-height: 1.3; -} - +.wp-block-heading h4, +h4, .h4 { font-size: 1.5rem; font-weight: 600; @@ -1409,20 +1171,8 @@ h4 { line-height: 1.3; } -.wp-block-heading h5 { - font-size: 1.125rem; - font-weight: 600; - letter-spacing: 0.05em; - line-height: 1.3; -} - -h5 { - font-size: 1.125rem; - font-weight: 600; - letter-spacing: 0.05em; - line-height: 1.3; -} - +.wp-block-heading h5, +h5, .h5 { font-size: 1.125rem; font-weight: 600; @@ -1430,20 +1180,8 @@ h5 { line-height: 1.3; } -.wp-block-heading h6 { - font-size: 1rem; - font-weight: 600; - letter-spacing: 0.05em; - line-height: 1.3; -} - -h6 { - font-size: 1rem; - font-weight: 600; - letter-spacing: 0.05em; - line-height: 1.3; -} - +.wp-block-heading h6, +h6, .h6 { font-size: 1rem; font-weight: 600; @@ -1458,7 +1196,8 @@ h6 { } /* Center image block by default in the editor */ -.wp-block-image > div { +.wp-block-image, +.wp-block-image > div:not(.components-placeholder) { text-align: center; } @@ -1467,10 +1206,7 @@ h6 { } /* Block Styles */ -.wp-block-image.is-style-twentytwentyone-border img { - border: 3px solid #28303d; -} - +.wp-block-image.is-style-twentytwentyone-border img, .wp-block-image.is-style-twentytwentyone-image-frame img { border: 3px solid #28303d; } @@ -1479,10 +1215,7 @@ h6 { padding: 20px; } -.wp-block-latest-comments { - padding-left: 0; -} - +.wp-block-latest-comments, .wp-block-latest-posts { padding-left: 0; } @@ -1558,13 +1291,7 @@ h6 { color: currentColor; } -.wp-block-latest-posts .wp-block-latest-posts__post-excerpt { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 1.125rem; - line-height: 1.7; - margin-top: 20px; -} - +.wp-block-latest-posts .wp-block-latest-posts__post-excerpt, .wp-block-latest-posts .wp-block-latest-posts__post-full-content { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; font-size: 1.125rem; @@ -1692,12 +1419,7 @@ h6 { display: block; } -ul { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - margin: 30px 0; - padding-left: 50px; -} - +ul, ol { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; margin: 30px 0; @@ -1841,18 +1563,8 @@ pre.wp-block-preformatted { color: currentColor; } -.wp-block-pullquote .wp-block-pullquote__citation { - font-size: 1rem; - font-style: normal; - text-transform: none; -} - -.wp-block-pullquote cite { - font-size: 1rem; - font-style: normal; - text-transform: none; -} - +.wp-block-pullquote .wp-block-pullquote__citation, +.wp-block-pullquote cite, .wp-block-pullquote footer { font-size: 1rem; font-style: normal; @@ -1882,12 +1594,7 @@ pre.wp-block-preformatted { text-align: left; } -.wp-block-pullquote.is-style-solid-color.alignleft blockquote { - padding-left: 20px; - padding-right: 20px; - max-width: inherit; -} - +.wp-block-pullquote.is-style-solid-color.alignleft blockquote, .wp-block-pullquote.is-style-solid-color.alignright blockquote { padding-left: 20px; padding-right: 20px; @@ -2001,14 +1708,7 @@ pre.wp-block-preformatted { display: none; } -.wp-block-quote.is-large { - padding-left: 0; - - /* Resetting margins to match _block-container.scss */ - margin-top: 30px; - margin-bottom: 30px; -} - +.wp-block-quote.is-large, .wp-block-quote.is-style-large { padding-left: 0; @@ -2099,10 +1799,7 @@ pre.wp-block-preformatted { } @media only screen and (max-width: 481px) { - .wp-block-quote.is-large { - padding-left: 25px; - } - + .wp-block-quote.is-large, .wp-block-quote.is-style-large { padding-left: 25px; } @@ -2112,11 +1809,7 @@ pre.wp-block-preformatted { left: 0; } - .wp-block-quote.is-large.has-text-align-right { - padding-left: 0; - padding-right: 25px; - } - + .wp-block-quote.is-large.has-text-align-right, .wp-block-quote.is-style-large.has-text-align-right { padding-left: 0; padding-right: 25px; @@ -2249,13 +1942,7 @@ pre.wp-block-preformatted { color: currentColor; } -.wp-block-rss .wp-block-rss__item-excerpt { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 1.125rem; - line-height: 1.7; - margin-top: 20px; -} - +.wp-block-rss .wp-block-rss__item-excerpt, .wp-block-rss .wp-block-rss__item-full-content { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; font-size: 1.125rem; @@ -2298,17 +1985,7 @@ pre.wp-block-preformatted { margin-bottom: 10px; } -.wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper { - border: 3px solid #39414d; - border-radius: 0; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 1.125rem; - line-height: 1.7; - max-width: inherit; - margin-right: -3px; - padding: 10px; -} - +.wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper, .wp-block-search .wp-block-search__input { border: 3px solid #39414d; border-radius: 0; @@ -2320,18 +1997,12 @@ pre.wp-block-preformatted { padding: 10px; } -.is-dark-theme .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper { - background: rgba(255, 255, 255, 0.9); -} - +.is-dark-theme .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper, .is-dark-theme .wp-block-search .wp-block-search__input { background: rgba(255, 255, 255, 0.9); } -.has-background .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper { - border-color: #28303d !important; -} - +.has-background .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper, .has-background .wp-block-search .wp-block-search__input { border-color: #28303d !important; } @@ -2437,10 +2108,7 @@ pre.wp-block-preformatted { color: #28303d; } -.is-dark-theme .wp-block-search.wp-block-search__button-inside.wp-block-search__text-button .wp-block-search__button { - color: #28303d; -} - +.is-dark-theme .wp-block-search.wp-block-search__button-inside.wp-block-search__text-button .wp-block-search__button, .is-dark-theme .wp-block-search.wp-block-search__button-inside.wp-block-search__icon-button .wp-block-search__button { color: #28303d; } @@ -2467,12 +2135,7 @@ pre.wp-block-preformatted { justify-content: center; } -.wp-block-separator { - border-bottom: 1px solid #28303d; - clear: both; - opacity: 1; -} - +.wp-block-separator, hr { border-bottom: 1px solid #28303d; clear: both; @@ -2534,10 +2197,7 @@ hr:not(.is-style-dots) { max-width: inherit; } -.wp-block-separator.is-style-twentytwentyone-separator-thick { - border-bottom-width: 3px; -} - +.wp-block-separator.is-style-twentytwentyone-separator-thick, hr.is-style-twentytwentyone-separator-thick { border-bottom-width: 3px; } @@ -2600,74 +2260,32 @@ table tfoot, text-align: center; } -table th { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; -} - +table th, .wp-block-table th { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; } -table td { - padding: 10px; -} - -table th { - padding: 10px; -} - -.wp-block-table td { - padding: 10px; -} - +table td, +table th, +.wp-block-table td, .wp-block-table th { padding: 10px; } -table.is-style-regular .has-background { - color: #28303d; -} - -table.is-style-stripes .has-background { - color: #28303d; -} - -table.is-style-stripes .has-background thead tr { - color: #28303d; -} - -table.is-style-stripes .has-background tfoot tr { - color: #28303d; -} - -table.is-style-stripes .has-background tbody tr { - color: #28303d; -} - -.wp-block-table.is-style-regular .has-background { - color: #28303d; -} - -.wp-block-table.is-style-stripes .has-background { - color: #28303d; -} - -.wp-block-table.is-style-stripes .has-background thead tr { - color: #28303d; -} - -.wp-block-table.is-style-stripes .has-background tfoot tr { - color: #28303d; -} - +table.is-style-regular .has-background, +table.is-style-stripes .has-background, +table.is-style-stripes .has-background thead tr, +table.is-style-stripes .has-background tfoot tr, +table.is-style-stripes .has-background tbody tr, +.wp-block-table.is-style-regular .has-background, +.wp-block-table.is-style-stripes .has-background, +.wp-block-table.is-style-stripes .has-background thead tr, +.wp-block-table.is-style-stripes .has-background tfoot tr, .wp-block-table.is-style-stripes .has-background tbody tr { color: #28303d; } -table.is-style-stripes { - border-color: #f0f0f0; -} - +table.is-style-stripes, .wp-block-table.is-style-stripes { border-color: #f0f0f0; } @@ -3064,20 +2682,23 @@ pre.wp-block-verse { } html { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; line-height: 1.7; } +html, body { - color: #28303d; - background-color: #d1e4dd; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; +} + +body { + background-color: #d1e4dd; font-size: 1.25rem; font-weight: normal; -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; } +body, .wp-block a { color: #28303d; } @@ -3091,10 +2712,7 @@ body { text-decoration: none; } -.has-background .has-link-color a { - color: #28303d; -} - +.has-background .has-link-color a, .has-background.has-link-color a { color: #28303d; } diff --git a/src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css.map b/src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css.map index b61cebedcd..24926990c8 100644 --- a/src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css.map +++ b/src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css.map @@ -1 +1 @@ -{"version":3,"sources":["style-editor.css","../sass/style-editor.scss","../sass/01-settings/global.scss","../sass/03-generic/breakpoints.scss","../sass/04-elements/blockquote.scss","../sass/04-elements/media.scss","../sass/04-elements/forms-editor.scss","../sass/04-elements/links.scss","../sass/05-blocks/button/_editor.scss","../sass/02-tools/mixins.scss","../sass/05-blocks/code/_editor.scss","../sass/05-blocks/cover/_editor.scss","../sass/05-blocks/columns/_editor.scss","../sass/05-blocks/file/_editor.scss","../sass/05-blocks/gallery/_editor.scss","../sass/05-blocks/group/_editor.scss","../sass/05-blocks/heading/_editor.scss","../sass/05-blocks/html/_editor.scss","../sass/05-blocks/image/_editor.scss","../sass/05-blocks/latest-comments/_editor.scss","../sass/05-blocks/latest-posts/_editor.scss","../sass/05-blocks/legacy/_editor.scss","../sass/05-blocks/list/_editor.scss","../sass/05-blocks/media-text/_editor.scss","../sass/05-blocks/navigation/_editor.scss","../sass/05-blocks/paragraph/_editor.scss","../sass/05-blocks/preformatted/_editor.scss","../sass/05-blocks/pullquote/_editor.scss","../sass/05-blocks/query-loop/_editor.scss","../sass/05-blocks/quote/_editor.scss","../sass/05-blocks/rss/_editor.scss","../sass/05-blocks/search/_editor.scss","../sass/05-blocks/separator/_editor.scss","../sass/05-blocks/social-icons/_editor.scss","../sass/05-blocks/table/_editor.scss","../sass/05-blocks/tag-clould/_editor.scss","../sass/05-blocks/verse/_editor.scss","../sass/05-blocks/utilities/_font-sizes.scss","../sass/05-blocks/utilities/_editor.scss","../sass/06-components/editor.scss","../sass/07-utilities/color-palette.scss"],"names":[],"mappings":"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AhBg2BD;;AgBp3BA;EAkBC,WAAA;EACA,gIAAA;EACA,mBAAA;AhBg2BD;;AgBp3BA;EAkBC,WAAA;EACA,gIAAA;EACA,mBAAA;AhBg2BD;;AgBp3BA;EAkBC,WAAA;EACA,gIAAA;EACA,mBAAA;AhBg2BD;;AgBp3BA;EAkBC,WAAA;EACA,gIAAA;EACA,mBAAA;AhBg2BD;;AgBp3BA;EAkBC,WAAA;EACA,gIAAA;EACA,mBAAA;AhBg2BD;AgB91BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgB92BC;EACC,gBAAA;AhBi4BF;AgBl4BC;EACC,gBAAA;AhBi4BF;AgBl4BC;EACC,gBAAA;AhBi4BF;AgBl4BC;EACC,gBAAA;AhBi4BF;AgBl4BC;EACC,gBAAA;AhBi4BF;AgBl4BC;EACC,gBAAA;AhBi4BF;AgBl4BC;EACC,gBAAA;AhBi4BF;AgBl4BC;EACC,gBAAA;AhBi4BF;AgBl4BC;EACC,gBAAA;AhBi4BF;AgBl4BC;EACC,gBAAA;AhBi4BF;AgBl4BC;EACC,gBAAA;AhBi4BF;AgBl4BC;EACC,gBAAA;AhBi4BF;AgBl4BC;EACC,gBAAA;AhBi4BF;AgBl4BC;EACC,gBAAA;AhBi4BF;AgBl4BC;EACC,gBAAA;AhBi4BF;AgBl4BC;EACC,gBAAA;AhBi4BF;AgBl4BC;EACC,gBAAA;AhBi4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37DC;EAEC,cAAA;AxC67DF;;AwCx7DA;EAMC,WAAA;AxCs7DD;AwC17DC;EAEC,WAAA;AxC47DF;;AwCp7DC;;;;;;;;EAQC,mBAAA;AxCu7DF;;AwCn7DA;EAMC,sBAAA;AxCi7DD;AwCr7DC;EAEC,sBAAA;AxCu7DF;;AwCl7DA;EAMC,yBAAA;AxCg7DD;AwCp7DC;EAEC,yBAAA;AxCs7DF;;AwCj7DA;EAMC,yBAAA;AxC+6DD;AwCn7DC;EAEC,yBAAA;AxCq7DF;;AwCh7DA;EAMC,yBAAA;AxC86DD;AwCl7DC;EAEC,yBAAA;AxCo7DF;;AwC/6DA;EAMC,yBAAA;AxC66DD;AwCj7DC;EAEC,yBAAA;AxCm7DF;;AwC96DA;EAMC,yBAAA;AxC46DD;AwCh7DC;EAEC,yBAAA;AxCk7DF;;AwC76DA;EAMC,yBAAA;AxC26DD;AwC/6DC;EAEC,yBAAA;AxCi7DF;;AwC56DA;EAMC,yBAAA;AxC06DD;AwC96DC;EAEC,yBAAA;AxCg7DF;;AwC36DA;EAMC,yBAAA;AxCy6DD;AwC76DC;EAEC,yBAAA;AxC+6DF;;AwC16DA;EAMC,yBAAA;AxCw6DD;AwC56DC;EAEC,yBAAA;AxC86DF;;AwCz6DA;EAMC,sBAAA;AxCu6DD;AwC36DC;EAEC,sBAAA;AxC66DF;;AwCt6DC;EAGG,WAAA;AxCu6DJ;;AwC16DC;EAGG,WAAA;AxCu6DJ;;AwC16DC;EAGG,WAAA;AxCu6DJ;AwCp6DE;EAMC;AxCk6DH;AwCx6DE;EAMC;AxCk6DH;AwCx6DE;EAMC;AxCk6DH;AwC95DC;EAOG,cAAA;AxC65DJ;AwCp6DC;EAOG,cAAA;AxC65DJ;AwCp6DC;EAOG,cAAA;AxC65DJ;AwCp6DC;EAOG,cAAA;AxC65DJ;AwCp6DC;EAOG,cAAA;AxC65DJ;AwCp6DC;EAOG,cAAA;AxC65DJ;AwCp6DC;EAOG,cAAA;AxC65DJ;AwC15DE;EAMC;AxCw5DH;AwC95DE;EAMC;AxCw5DH;AwC95DE;EAMC;AxCw5DH;AwC95DE;EAMC;AxCw5DH;AwC95DE;EAMC;AxCw5DH;AwC95DE;EAMC;AxCw5DH;AwC95DE;EAMC;AxCw5DH;;AwCl5DA;EACC,qDAAA;AxCw5DD;;AwCr5DA;EACC,qDAAA;AxCw5DD;;AwCr5DA;EACC,qDAAA;AxCw5DD;;AwCr5DA;EACC,qDAAA;AxCw5DD;;AwCr5DA;EACC,qDAAA;AxCw5DD;;AwCr5DA;EACC,qDAAA;AxCw5DD;;AwCr5DA;EACC,qDAAA;AxCw5DD;;AwCr5DA;EACC,qDAAA;AxCw5DD","file":"ie-editor.css"} \ No newline at end of file +{"version":3,"sources":["style-editor.css","../sass/style-editor.scss","../sass/01-settings/global.scss","../sass/03-generic/breakpoints.scss","../sass/04-elements/blockquote.scss","../sass/04-elements/media.scss","../sass/04-elements/forms-editor.scss","../sass/04-elements/links.scss","../sass/05-blocks/button/_editor.scss","../sass/02-tools/mixins.scss","../sass/05-blocks/code/_editor.scss","../sass/05-blocks/cover/_editor.scss","../sass/05-blocks/columns/_editor.scss","../sass/05-blocks/file/_editor.scss","../sass/05-blocks/gallery/_editor.scss","../sass/05-blocks/group/_editor.scss","../sass/05-blocks/heading/_editor.scss","../sass/05-blocks/html/_editor.scss","../sass/05-blocks/image/_editor.scss","../sass/05-blocks/latest-posts/_editor.scss","../sass/05-blocks/legacy/_editor.scss","../sass/05-blocks/list/_editor.scss","../sass/05-blocks/media-text/_editor.scss","../sass/05-blocks/navigation/_editor.scss","../sass/05-blocks/paragraph/_editor.scss","../sass/05-blocks/preformatted/_editor.scss","../sass/05-blocks/pullquote/_editor.scss","../sass/05-blocks/query-loop/_editor.scss","../sass/05-blocks/quote/_editor.scss","../sass/05-blocks/rss/_editor.scss","../sass/05-blocks/search/_editor.scss","../sass/05-blocks/separator/_editor.scss","../sass/05-blocks/social-icons/_editor.scss","../sass/05-blocks/table/_editor.scss","../sass/05-blocks/tag-clould/_editor.scss","../sass/05-blocks/verse/_editor.scss","../sass/05-blocks/utilities/_font-sizes.scss","../sass/05-blocks/utilities/_editor.scss","../sass/06-components/editor.scss","../sass/07-utilities/color-palette.scss"],"names":[],"mappings":"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;;AuCz7DA;EAMC,WAAA;AvCu7DD;AuC37DC;EAEC,WAAA;AvC67DF;;AuCr7DC;;;;;;;;EAQC,mBAAA;AvCw7DF;;AuCp7DA;EAMC,sBAAA;AvCk7DD;AuCt7DC;EAEC,sBAAA;AvCw7DF;;AuCn7DA;EAMC,yBAAA;AvCi7DD;AuCr7DC;EAEC,yBAAA;AvCu7DF;;AuCl7DA;EAMC,yBAAA;AvCg7DD;AuCp7DC;EAEC,yBAAA;AvCs7DF;;AuCj7DA;EAMC,yBAAA;AvC+6DD;AuCn7DC;EAEC,yBAAA;AvCq7DF;;AuCh7DA;EAMC,yBAAA;AvC86DD;AuCl7DC;EAEC,yBAAA;AvCo7DF;;AuC/6DA;EAMC,yBAAA;AvC66DD;AuCj7DC;EAEC,yBAAA;AvCm7DF;;AuC96DA;EAMC,yBAAA;AvC46DD;AuCh7DC;EAEC,yBAAA;AvCk7DF;;AuC76DA;EAMC,yBAAA;AvC26DD;AuC/6DC;EAEC,yBAAA;AvCi7DF;;AuC56DA;EAMC,yBAAA;AvC06DD;AuC96DC;EAEC,yBAAA;AvCg7DF;;AuC36DA;EAMC,yBAAA;AvCy6DD;AuC76DC;EAEC,yBAAA;AvC+6DF;;AuC16DA;EAMC,sBAAA;AvCw6DD;AuC56DC;EAEC,sBAAA;AvC86DF;;AuCv6DC;EAGG,WAAA;AvCw6DJ;;AuC36DC;EAGG,WAAA;AvCw6DJ;;AuC36DC;EAGG,WAAA;AvCw6DJ;AuCr6DE;EAMC;AvCm6DH;AuCz6DE;EAMC;AvCm6DH;AuCz6DE;EAMC;AvCm6DH;AuC/5DC;EAOG,cAAA;AvC85DJ;AuCr6DC;EAOG,cAAA;AvC85DJ;AuCr6DC;EAOG,cAAA;AvC85DJ;AuCr6DC;EAOG,cAAA;AvC85DJ;AuCr6DC;EAOG,cAAA;AvC85DJ;AuCr6DC;EAOG,cAAA;AvC85DJ;AuCr6DC;EAOG,cAAA;AvC85DJ;AuC35DE;EAMC;AvCy5DH;AuC/5DE;EAMC;AvCy5DH;AuC/5DE;EAMC;AvCy5DH;AuC/5DE;EAMC;AvCy5DH;AuC/5DE;EAMC;AvCy5DH;AuC/5DE;EAMC;AvCy5DH;AuC/5DE;EAMC;AvCy5DH;;AuCn5DA;EACC,qDAAA;AvCy5DD;;AuCt5DA;EACC,qDAAA;AvCy5DD;;AuCt5DA;EACC,qDAAA;AvCy5DD;;AuCt5DA;EACC,qDAAA;AvCy5DD;;AuCt5DA;EACC,qDAAA;AvCy5DD;;AuCt5DA;EACC,qDAAA;AvCy5DD;;AuCt5DA;EACC,qDAAA;AvCy5DD;;AuCt5DA;EACC,qDAAA;AvCy5DD","file":"ie-editor.css"} \ No newline at end of file diff --git a/src/wp-content/themes/twentytwentyone/assets/css/ie.css b/src/wp-content/themes/twentytwentyone/assets/css/ie.css index 02af1e03c8..d2a042d4cf 100644 --- a/src/wp-content/themes/twentytwentyone/assets/css/ie.css +++ b/src/wp-content/themes/twentytwentyone/assets/css/ie.css @@ -7,9 +7,9 @@ Author: the WordPress team Author URI: https://wordpress.org/ Description: Twenty Twenty-One is a blank canvas for your ideas and it makes the block editor your best brush. With new block patterns, which allow you to create a beautiful layout in a matter of seconds, this theme’s soft colors and eye-catching — yet timeless — design will let your work shine. Take it for a spin! See how Twenty Twenty-One elevates your portfolio, business website, or personal blog. Requires at least: 5.3 -Tested up to: 5.8 +Tested up to: 5.9 Requires PHP: 5.6 -Version: 1.4 +Version: 1.5 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Text Domain: twentytwentyone @@ -808,13 +808,7 @@ template { @media only screen and (min-width: 482px) { - .alignfull { - max-width: 100%; - width: auto; - margin-left: auto; - margin-right: auto; - } - + .alignfull, .full-max-width { max-width: 100%; width: auto; @@ -959,27 +953,9 @@ template { * Top Level Wrappers (header, main, footer) * - Set vertical padding and horizontal margins */ -.site-header { - padding-top: 30px; - padding-bottom: 30px; - margin-left: auto; - margin-right: auto; -} - -.site-main { - padding-top: 30px; - padding-bottom: 30px; - margin-left: auto; - margin-right: auto; -} - -.widget-area { - padding-top: 30px; - padding-bottom: 30px; - margin-left: auto; - margin-right: auto; -} - +.site-header, +.site-main, +.widget-area, .site-footer { padding-top: 30px; padding-bottom: 30px; @@ -1031,34 +1007,10 @@ template { * Block & non-gutenberg content wrappers * - Set margins */ -.entry-header { - margin-top: 30px; - margin-right: auto; - margin-bottom: 30px; - margin-left: auto; -} - -.post-thumbnail { - margin-top: 30px; - margin-right: auto; - margin-bottom: 30px; - margin-left: auto; -} - -.entry-content { - margin-top: 30px; - margin-right: auto; - margin-bottom: 30px; - margin-left: auto; -} - -.entry-footer { - margin-top: 30px; - margin-right: auto; - margin-bottom: 30px; - margin-left: auto; -} - +.entry-header, +.post-thumbnail, +.entry-content, +.entry-footer, .author-bio { margin-top: 30px; margin-right: auto; @@ -1365,11 +1317,7 @@ blockquote p { line-height: 1.7; } -blockquote cite { - font-weight: normal; - letter-spacing: normal; -} - +blockquote cite, blockquote footer { font-weight: normal; letter-spacing: normal; @@ -1380,33 +1328,16 @@ blockquote.alignright { padding-left: inherit; } -blockquote.alignleft p { - font-size: 1.125rem; - max-width: inherit; - width: inherit; -} - +blockquote.alignleft p, blockquote.alignright p { font-size: 1.125rem; max-width: inherit; width: inherit; } -blockquote.alignleft cite { - font-size: 1rem; - letter-spacing: normal; -} - -blockquote.alignleft footer { - font-size: 1rem; - letter-spacing: normal; -} - -blockquote.alignright cite { - font-size: 1rem; - letter-spacing: normal; -} - +blockquote.alignleft cite, +blockquote.alignleft footer, +blockquote.alignright cite, blockquote.alignright footer { font-size: 1rem; letter-spacing: normal; @@ -1424,18 +1355,8 @@ blockquote:before { left: -12px; } -blockquote .wp-block-quote__citation { - color: #28303d; - font-size: 1rem; - font-style: normal; -} - -blockquote cite { - color: #28303d; - font-size: 1rem; - font-style: normal; -} - +blockquote .wp-block-quote__citation, +blockquote cite, blockquote footer { color: #28303d; font-size: 1rem; @@ -2084,16 +2005,14 @@ fieldset input[type=checkbox] + label { img { height: auto; - max-width: 100%; vertical-align: middle; } /* Classic editor images */ -.entry-content img { - max-width: 100%; -} /* Make sure embeds and iframes fit their containers. */ +img, +.entry-content img, embed, iframe, object, @@ -2102,33 +2021,9 @@ video { } /* Media captions */ -figcaption { - color: currentColor; - font-size: 1rem; - line-height: 1.7; - margin-top: 10px; - margin-bottom: 20px; - text-align: center; -} - -.wp-caption { - color: currentColor; - font-size: 1rem; - line-height: 1.7; - margin-top: 10px; - margin-bottom: 20px; - text-align: center; -} - -.wp-caption-text { - color: currentColor; - font-size: 1rem; - line-height: 1.7; - margin-top: 10px; - margin-bottom: 20px; - text-align: center; -} - +figcaption, +.wp-caption, +.wp-caption-text, .wp-block-embed figcaption { color: currentColor; font-size: 1rem; @@ -2242,10 +2137,7 @@ a:hover { outline: 2px dotted #28303d; } -.has-background .has-link-color a { - color: #28303d; -} - +.has-background .has-link-color a, .has-background.has-link-color a { color: #28303d; } @@ -2259,18 +2151,7 @@ a:hover { /** * Button */ -.site .button { - border: 3px solid transparent; - border-radius: 0; - cursor: pointer; - font-weight: 500; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 1.25rem; - line-height: 1.5; - padding: 15px 30px; - text-decoration: none; -} - +.site .button, button { border: 3px solid transparent; border-radius: 0; @@ -2307,30 +2188,8 @@ input[type=reset] { text-decoration: none; } -.wp-block-search .wp-block-search__button { - border: 3px solid transparent; - border-radius: 0; - cursor: pointer; - font-weight: 500; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 1.25rem; - line-height: 1.5; - padding: 15px 30px; - text-decoration: none; -} - -.wp-block-button .wp-block-button__link { - border: 3px solid transparent; - border-radius: 0; - cursor: pointer; - font-weight: 500; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 1.25rem; - line-height: 1.5; - padding: 15px 30px; - text-decoration: none; -} - +.wp-block-search .wp-block-search__button, +.wp-block-button .wp-block-button__link, .wp-block-file a.wp-block-file__button { border: 3px solid transparent; border-radius: 0; @@ -2819,21 +2678,7 @@ input[type=reset]:disabled { padding-right: 20px; } -.wp-block-cover { - background-color: #000; - min-height: 450px; - margin-top: inherit; - margin-bottom: inherit; - - /* default & custom background-color */ - - /* Treating H2 separately to account for legacy /core styles */ - - /* Block Styles */ - - /* The background color class is used just for the overlay, and does not need to be applied to the inner container. */ -} - +.wp-block-cover, .wp-block-cover-image { background-color: #000; min-height: 450px; @@ -2860,36 +2705,11 @@ input[type=reset]:disabled { margin-bottom: 0; } -.wp-block-cover .wp-block-cover__inner-container { - color: currentColor; - margin-top: 30px; - margin-bottom: 30px; -} - -.wp-block-cover .wp-block-cover-image-text { - color: currentColor; - margin-top: 30px; - margin-bottom: 30px; -} - -.wp-block-cover .wp-block-cover-text { - color: currentColor; - margin-top: 30px; - margin-bottom: 30px; -} - -.wp-block-cover-image .wp-block-cover__inner-container { - color: currentColor; - margin-top: 30px; - margin-bottom: 30px; -} - -.wp-block-cover-image .wp-block-cover-image-text { - color: currentColor; - margin-top: 30px; - margin-bottom: 30px; -} - +.wp-block-cover .wp-block-cover__inner-container, +.wp-block-cover .wp-block-cover-image-text, +.wp-block-cover .wp-block-cover-text, +.wp-block-cover-image .wp-block-cover__inner-container, +.wp-block-cover-image .wp-block-cover-image-text, .wp-block-cover-image .wp-block-cover-text { color: currentColor; margin-top: 30px; @@ -2905,26 +2725,11 @@ input[type=reset]:disabled { color: currentColor; } -.wp-block-cover .wp-block-cover__inner-container .has-link-color a { - color: #28303d; -} - -.wp-block-cover .wp-block-cover-image-text .has-link-color a { - color: #28303d; -} - -.wp-block-cover .wp-block-cover-text .has-link-color a { - color: #28303d; -} - -.wp-block-cover-image .wp-block-cover__inner-container .has-link-color a { - color: #28303d; -} - -.wp-block-cover-image .wp-block-cover-image-text .has-link-color a { - color: #28303d; -} - +.wp-block-cover .wp-block-cover__inner-container .has-link-color a, +.wp-block-cover .wp-block-cover-image-text .has-link-color a, +.wp-block-cover .wp-block-cover-text .has-link-color a, +.wp-block-cover-image .wp-block-cover__inner-container .has-link-color a, +.wp-block-cover-image .wp-block-cover-image-text .has-link-color a, .wp-block-cover-image .wp-block-cover-text .has-link-color a { color: #28303d; } @@ -2998,10 +2803,7 @@ input[type=reset]:disabled { text-align: right; } -.wp-block-cover .wp-block-cover__inner-container { - width: calc(100% - 60px); -} - +.wp-block-cover .wp-block-cover__inner-container, .wp-block-cover-image .wp-block-cover__inner-container { width: calc(100% - 60px); } @@ -3084,10 +2886,7 @@ input[type=reset]:disabled { justify-content: center; } -.wp-block-cover.is-style-twentytwentyone-border { - border: 3px solid #28303d; -} - +.wp-block-cover.is-style-twentytwentyone-border, .wp-block-cover-image.is-style-twentytwentyone-border { border: 3px solid #28303d; } @@ -3111,30 +2910,19 @@ input[type=reset]:disabled { margin: 0 auto; } -.wp-block-gallery .blocks-gallery-image { - width: calc(50% - 10px); -} - +.wp-block-gallery .blocks-gallery-image, .wp-block-gallery .blocks-gallery-item { width: calc(50% - 10px); } -.wp-block-gallery .blocks-gallery-image figcaption { - margin: 0; - color: #fff; - font-size: 1rem; -} - +.wp-block-gallery .blocks-gallery-image figcaption, .wp-block-gallery .blocks-gallery-item figcaption { margin: 0; color: #fff; font-size: 1rem; } -.wp-block-gallery .blocks-gallery-image figcaption a { - color: #fff; -} - +.wp-block-gallery .blocks-gallery-image figcaption a, .wp-block-gallery .blocks-gallery-item figcaption a { color: #fff; } @@ -3233,122 +3021,34 @@ input[type=reset]:disabled { margin-left: -30px; } -h1 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h1 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h2 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h2 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h3 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h3 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h4 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h4 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h5 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h5 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h6 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - +h1, +.h1, +h2, +.h2, +h3, +.h3, +h4, +.h4, +h5, +.h5, +h6, .h6 { clear: both; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; font-weight: normal; } -h1 strong { - font-weight: 600; -} - -.h1 strong { - font-weight: 600; -} - -h2 strong { - font-weight: 600; -} - -.h2 strong { - font-weight: 600; -} - -h3 strong { - font-weight: 600; -} - -.h3 strong { - font-weight: 600; -} - -h4 strong { - font-weight: 600; -} - -.h4 strong { - font-weight: 600; -} - -h5 strong { - font-weight: 600; -} - -.h5 strong { - font-weight: 600; -} - -h6 strong { - font-weight: 600; -} - +h1 strong, +.h1 strong, +h2 strong, +.h2 strong, +h3 strong, +.h3 strong, +h4 strong, +.h4 strong, +h5 strong, +.h5 strong, +h6 strong, .h6 strong { font-weight: 600; } @@ -3431,13 +3131,7 @@ h3 { } } -h4 { - font-size: 1.5rem; - font-weight: 600; - letter-spacing: normal; - line-height: 1.3; -} - +h4, .h4 { font-size: 1.5rem; font-weight: 600; @@ -3445,13 +3139,7 @@ h4 { line-height: 1.3; } -h5 { - font-size: 1.125rem; - font-weight: 600; - letter-spacing: 0.05em; - line-height: 1.3; -} - +h5, .h5 { font-size: 1.125rem; font-weight: 600; @@ -3459,13 +3147,7 @@ h5 { line-height: 1.3; } -h6 { - font-size: 1rem; - font-weight: 600; - letter-spacing: 0.05em; - line-height: 1.3; -} - +h6, .h6 { font-size: 1rem; font-weight: 600; @@ -3509,10 +3191,7 @@ h6 { margin-top: 0; } -.wp-block-image.is-style-twentytwentyone-border img { - border: 3px solid #28303d; -} - +.wp-block-image.is-style-twentytwentyone-border img, .wp-block-image.is-style-twentytwentyone-image-frame img { border: 3px solid #28303d; } @@ -3671,13 +3350,7 @@ h6 { color: currentColor; } -.wp-block-latest-posts .wp-block-latest-posts__post-excerpt { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 1.125rem; - line-height: 1.7; - margin-top: 20px; -} - +.wp-block-latest-posts .wp-block-latest-posts__post-excerpt, .wp-block-latest-posts .wp-block-latest-posts__post-full-content { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; font-size: 1.125rem; @@ -3827,12 +3500,7 @@ figure.wp-caption a:focus img { outline-offset: 2px; } -ul { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - margin: 0; - padding-left: 50px; -} - +ul, ol { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; margin: 0; @@ -3840,16 +3508,16 @@ ol { } ul.aligncenter, -ol.aligncenter { +ol.aligncenter, +ul.alignright, +ol.alignright { list-style-position: inside; padding: 0; } ul.alignright, ol.alignright { - list-style-position: inside; text-align: right; - padding: 0; } ul { @@ -4110,22 +3778,8 @@ pre.wp-block-preformatted { color: currentColor; } -.wp-block-pullquote .wp-block-pullquote__citation { - color: currentColor; - display: block; - font-size: 1rem; - font-style: normal; - text-transform: none; -} - -.wp-block-pullquote cite { - color: currentColor; - display: block; - font-size: 1rem; - font-style: normal; - text-transform: none; -} - +.wp-block-pullquote .wp-block-pullquote__citation, +.wp-block-pullquote cite, .wp-block-pullquote footer { color: currentColor; display: block; @@ -4222,10 +3876,7 @@ pre.wp-block-preformatted { color: currentColor; } -.wp-block-pullquote.is-style-solid-color.alignleft { - padding: 20px; -} - +.wp-block-pullquote.is-style-solid-color.alignleft, .wp-block-pullquote.is-style-solid-color.alignright { padding: 20px; } @@ -4301,15 +3952,7 @@ pre.wp-block-preformatted { display: none; } -.wp-block-quote.is-large { - padding-left: 0; - padding-right: 0; - - /* Resetting margins to match _block-container.scss */ - margin-top: 30px; - margin-bottom: 30px; -} - +.wp-block-quote.is-large, .wp-block-quote.is-style-large { padding-left: 0; padding-right: 0; @@ -4400,41 +4043,18 @@ pre.wp-block-preformatted { } } -.wp-block-quote.is-large .wp-block-quote__citation { - color: #28303d; - font-size: 1.125rem; -} - -.wp-block-quote.is-large cite { - color: #28303d; - font-size: 1.125rem; -} - -.wp-block-quote.is-large footer { - color: #28303d; - font-size: 1.125rem; -} - -.wp-block-quote.is-style-large .wp-block-quote__citation { - color: #28303d; - font-size: 1.125rem; -} - -.wp-block-quote.is-style-large cite { - color: #28303d; - font-size: 1.125rem; -} - +.wp-block-quote.is-large .wp-block-quote__citation, +.wp-block-quote.is-large cite, +.wp-block-quote.is-large footer, +.wp-block-quote.is-style-large .wp-block-quote__citation, +.wp-block-quote.is-style-large cite, .wp-block-quote.is-style-large footer { color: #28303d; font-size: 1.125rem; } @media only screen and (max-width: 481px) { - .wp-block-quote.is-large { - padding-left: 25px; - } - + .wp-block-quote.is-large, .wp-block-quote.is-style-large { padding-left: 25px; } @@ -4444,11 +4064,7 @@ pre.wp-block-preformatted { left: 0; } - .wp-block-quote.is-large.has-text-align-right { - padding-left: 0; - padding-right: 25px; - } - + .wp-block-quote.is-large.has-text-align-right, .wp-block-quote.is-style-large.has-text-align-right { padding-left: 0; padding-right: 25px; @@ -4464,13 +4080,13 @@ pre.wp-block-preformatted { padding-left: 0; padding-right: 0; } -} -@media only screen and (max-width: 481px) { .wp-block-quote.has-text-align-right { padding-left: 0; padding-right: 13px; } +} +@media only screen and (max-width: 481px) { .wp-block-quote.has-text-align-right:before { right: 0; @@ -4564,18 +4180,12 @@ pre.wp-block-preformatted { line-height: 1.7; } -[class*=inner-container] .wp-block-rss .wp-block-rss__item-publish-date, -.has-background .wp-block-rss .wp-block-rss__item-publish-date { - color: currentColor; -} - -.wp-block-rss .wp-block-rss__item-excerpt { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 1.125rem; - line-height: 1.7; - margin-top: 20px; +[class*=inner-container] .wp-block-rss .wp-block-rss__item-publish-date, +.has-background .wp-block-rss .wp-block-rss__item-publish-date { + color: currentColor; } +.wp-block-rss .wp-block-rss__item-excerpt, .wp-block-rss .wp-block-rss__item-full-content { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; font-size: 1.125rem; @@ -4724,14 +4334,17 @@ pre.wp-block-preformatted { hr { border-style: none; - border-bottom: 1px solid #28303d; clear: both; margin-left: auto; margin-right: auto; } +hr, hr.wp-block-separator { border-bottom: 1px solid #28303d; +} + +hr.wp-block-separator { opacity: 1; /** @@ -4848,88 +4461,39 @@ table tfoot, text-align: center; } -table th { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; -} - +table th, .wp-block-table th { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; } -table td { - padding: 10px; - border: 1px solid; -} - -table th { - padding: 10px; - border: 1px solid; -} - -.wp-block-table td { - padding: 10px; - border: 1px solid; -} - +table td, +table th, +.wp-block-table td, .wp-block-table th { padding: 10px; border: 1px solid; } -table figcaption { - color: #28303d; - font-size: 1rem; -} - +table figcaption, .wp-block-table figcaption { color: #28303d; font-size: 1rem; } -table.is-style-regular .has-background { - color: #28303d; -} - -table.is-style-stripes .has-background { - color: #28303d; -} - -table.is-style-stripes .has-background thead tr { - color: #28303d; -} - -table.is-style-stripes .has-background tfoot tr { - color: #28303d; -} - -table.is-style-stripes .has-background tbody tr { - color: #28303d; -} - -.wp-block-table.is-style-regular .has-background { - color: #28303d; -} - -.wp-block-table.is-style-stripes .has-background { - color: #28303d; -} - -.wp-block-table.is-style-stripes .has-background thead tr { - color: #28303d; -} - -.wp-block-table.is-style-stripes .has-background tfoot tr { - color: #28303d; -} - +table.is-style-regular .has-background, +table.is-style-stripes .has-background, +table.is-style-stripes .has-background thead tr, +table.is-style-stripes .has-background tfoot tr, +table.is-style-stripes .has-background tbody tr, +.wp-block-table.is-style-regular .has-background, +.wp-block-table.is-style-stripes .has-background, +.wp-block-table.is-style-stripes .has-background thead tr, +.wp-block-table.is-style-stripes .has-background tfoot tr, .wp-block-table.is-style-stripes .has-background tbody tr { color: #28303d; } -table.is-style-stripes { - border-color: #f0f0f0; -} - +table.is-style-stripes, .wp-block-table.is-style-stripes { border-color: #f0f0f0; } @@ -5304,13 +4868,11 @@ table.wp-calendar-table caption { /** * .alignwide */ -.alignwide { - clear: both; -} /** * .alignfull */ +.alignwide, .alignfull { clear: both; } @@ -5573,6 +5135,10 @@ table.wp-calendar-table caption { font-size: 1.5rem; } +.site-footer > .site-info .privacy-policy { + margin-top: 15px; +} + .site-footer > .site-info .powered-by { margin-top: 15px; } @@ -5583,10 +5149,19 @@ table.wp-calendar-table caption { align-items: center; } + .site-footer > .site-info .site-name { + margin-right: 15px; + } + + .site-footer > .site-info .privacy-policy, .site-footer > .site-info .powered-by { margin-top: initial; margin-left: auto; } + + .site-footer > .site-info .privacy-policy + .powered-by { + margin-left: 15px; + } } .site-footer > .site-info a { @@ -5710,10 +5285,7 @@ h1.entry-title { /** * Entry Content */ -.entry-content { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; -} - +.entry-content, .entry-summary { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; } @@ -5898,10 +5470,7 @@ body:not(.single) .site-main > article:last-of-type .entry-footer { } } -h1.page-title { - font-weight: 300; -} - +h1.page-title, h2.page-title { font-weight: 300; } @@ -5915,74 +5484,26 @@ h1.page-title { padding-bottom: 60px; } -.archive .content-area .format-aside .entry-content { - font-size: 1.5rem; -} - -.archive .content-area .format-status .entry-content { - font-size: 1.5rem; -} - -.archive .content-area .format-link .entry-content { - font-size: 1.5rem; -} - -.search .content-area .format-aside .entry-content { - font-size: 1.5rem; -} - -.search .content-area .format-status .entry-content { - font-size: 1.5rem; -} - -.search .content-area .format-link .entry-content { - font-size: 1.5rem; -} - -.blog .content-area .format-aside .entry-content { - font-size: 1.5rem; -} - -.blog .content-area .format-status .entry-content { - font-size: 1.5rem; -} - +.archive .content-area .format-aside .entry-content, +.archive .content-area .format-status .entry-content, +.archive .content-area .format-link .entry-content, +.search .content-area .format-aside .entry-content, +.search .content-area .format-status .entry-content, +.search .content-area .format-link .entry-content, +.blog .content-area .format-aside .entry-content, +.blog .content-area .format-status .entry-content, .blog .content-area .format-link .entry-content { font-size: 1.5rem; } -.archive .format-image .entry-content { - margin-top: 60px; -} - -.archive .format-gallery .entry-content { - margin-top: 60px; -} - -.archive .format-video .entry-content { - margin-top: 60px; -} - -.search .format-image .entry-content { - margin-top: 60px; -} - -.search .format-gallery .entry-content { - margin-top: 60px; -} - -.search .format-video .entry-content { - margin-top: 60px; -} - -.blog .format-image .entry-content { - margin-top: 60px; -} - -.blog .format-gallery .entry-content { - margin-top: 60px; -} - +.archive .format-image .entry-content, +.archive .format-gallery .entry-content, +.archive .format-video .entry-content, +.search .format-image .entry-content, +.search .format-gallery .entry-content, +.search .format-video .entry-content, +.blog .format-image .entry-content, +.blog .format-gallery .entry-content, .blog .format-video .entry-content { margin-top: 60px; } @@ -5996,14 +5517,8 @@ h1.page-title { display: block; } -.archive.logged-in .entry-footer .posted-on { - margin-right: 10px; -} - -.search.logged-in .entry-footer .posted-on { - margin-right: 10px; -} - +.archive.logged-in .entry-footer .posted-on, +.search.logged-in .entry-footer .posted-on, .blog.logged-in .entry-footer .posted-on { margin-right: 10px; } @@ -6129,10 +5644,7 @@ h1.page-title { @media only screen and (min-width: 482px) { - .comment-list .depth-2 { - padding-left: 100px; - } - + .comment-list .depth-2, .comment-list .depth-3 { padding-left: 100px; } @@ -6195,10 +5707,7 @@ h1.page-title { display: none; } -.pingback .url { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; -} - +.pingback .url, .trackback .url { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; } @@ -6221,11 +5730,7 @@ h1.page-title { word-wrap: break-word; } -.pingback .comment-body { - margin-top: 30px; - margin-bottom: 30px; -} - +.pingback .comment-body, .trackback .comment-body { margin-top: 30px; margin-bottom: 30px; @@ -6979,12 +6484,12 @@ h1.page-title { } /* Next/Previous navigation */ -.navigation { +.navigation, +.navigation a { color: #28303d; } .navigation a { - color: #28303d; text-decoration: none; } @@ -7024,13 +6529,7 @@ h1.page-title { flex-wrap: wrap; } - .navigation .nav-links .nav-next { - flex: 0 1 auto; - margin-bottom: inherit; - margin-top: inherit; - max-width: calc(50% - 10px); - } - + .navigation .nav-links .nav-next, .navigation .nav-links .nav-previous { flex: 0 1 auto; margin-bottom: inherit; @@ -7050,21 +6549,13 @@ h1.page-title { position: relative; } -.navigation .nav-previous .svg-icon { - top: -2px; - margin-right: 5px; -} - +.navigation .nav-previous .svg-icon, .navigation .prev .svg-icon { top: -2px; margin-right: 5px; } -.navigation .nav-next .svg-icon { - top: -1px; - margin-left: 5px; -} - +.navigation .nav-next .svg-icon, .navigation .next .svg-icon { top: -1px; margin-left: 5px; @@ -7105,11 +6596,7 @@ h1.page-title { } } -.post-navigation .nav-next { - margin-top: 30px; - margin-bottom: 30px; -} - +.post-navigation .nav-next, .post-navigation .nav-previous { margin-top: 30px; margin-bottom: 30px; @@ -7125,12 +6612,7 @@ h1.page-title { margin-bottom: 0; } -.pagination { - border-top: 3px solid #28303d; - padding-top: 30px; - margin: 30px auto; -} - +.pagination, .comments-pagination { border-top: 3px solid #28303d; padding-top: 30px; @@ -7138,19 +6620,13 @@ h1.page-title { } @media only screen and (min-width: 822px) { - .pagination { - margin: 30px auto; - } - + .pagination, .comments-pagination { margin: 30px auto; } } -.pagination .nav-links { - margin-top: -30px; -} - +.pagination .nav-links, .comments-pagination .nav-links { margin-top: -30px; } @@ -7332,51 +6808,6 @@ h1.page-title { } } -.widget-area ul { - list-style-type: none; - padding: 0; -} - -.widget-area ul li { - line-height: 1.9; -} - -.widget-area ul.sub-menu { - margin-left: 13px; -} - -.widget-area ul.children { - margin-left: 13px; -} - -.widget-area ul .sub-menu-toggle { - display: none; -} - -.widget-area a { - color: #28303d; - text-decoration: underline; - text-decoration-style: solid; - text-decoration-color: currentColor; -} - -.widget-area a:link { - color: #28303d; -} - -.widget-area a:visited { - color: #28303d; -} - -.widget-area a:active { - color: #28303d; -} - -.widget-area a:hover { - color: #28303d; - text-decoration-style: dotted; -} - .widget-area .wp-block-social-links.alignright { margin-top: 30px; justify-content: flex-end; @@ -7392,58 +6823,71 @@ h1.page-title { clear: both; } -.widget h1 { +.widget h1, +.widget h2, +.widget h3, +.widget h4, +.widget h5, +.widget h6 { font-weight: 700; line-height: 1.4; } +.widget h1 { + font-size: 1.25rem; +} + .widget h2 { - font-weight: 700; - line-height: 1.4; + font-size: 1.125rem; } -.widget h3 { - font-weight: 700; - line-height: 1.4; +.widget h3, +.widget h4, +.widget h5, +.widget h6 { + font-size: 1rem; } -.widget h4 { - font-weight: 700; - line-height: 1.4; +.widget ul { + list-style-type: none; + padding: 0; } -.widget h5 { - font-weight: 700; - line-height: 1.4; +.widget ul li { + line-height: 1.9; } -.widget h6 { - font-weight: 700; - line-height: 1.4; +.widget ul.sub-menu, +.widget ul.children { + margin-left: 13px; } -.widget h1 { - font-size: 1.25rem; +.widget ul .sub-menu-toggle { + display: none; } -.widget h2 { - font-size: 1.125rem; +.widget a { + color: #28303d; + text-decoration: underline; + text-decoration-style: solid; + text-decoration-color: currentColor; } -.widget h3 { - font-size: 1rem; +.widget a:link { + color: #28303d; } -.widget h4 { - font-size: 1rem; +.widget a:visited { + color: #28303d; } -.widget h5 { - font-size: 1rem; +.widget a:active { + color: #28303d; } -.widget h6 { - font-size: 1rem; +.widget a:hover { + color: #28303d; + text-decoration-style: dotted; } .search-form { @@ -7841,14 +7285,8 @@ h1.page-title { background: linear-gradient(160deg, #e4d1d1, #d1d1e4); } -header * { - max-width: unset; -} - -main * { - max-width: unset; -} - +header *, +main *, footer * { max-width: unset; } diff --git a/src/wp-content/themes/twentytwentyone/assets/css/ie.css.map b/src/wp-content/themes/twentytwentyone/assets/css/ie.css.map index 3ff269338b..6b3e130734 100644 --- a/src/wp-content/themes/twentytwentyone/assets/css/ie.css.map +++ b/src/wp-content/themes/twentytwentyone/assets/css/ie.css.map @@ -1 +1 @@ -{"version":3,"sources":["../../style.css","../../assets/sass/01-settings/file-header.scss","../../assets/sass/style.scss","../../assets/sass/01-settings/global.scss","../../assets/sass/03-generic/normalize.scss","../../assets/sass/03-generic/breakpoints.scss","../../assets/sass/03-generic/vertical-margins.scss","../../assets/sass/03-generic/reset.scss","../../assets/sass/03-generic/clearings.scss","../../assets/sass/04-elements/blockquote.scss","../../assets/sass/04-elements/forms.scss","../../assets/sass/04-elements/media.scss","../../assets/sass/04-elements/misc.scss","../../assets/sass/04-elements/links.scss","../../assets/sass/05-blocks/audio/_style.scss","../../assets/sass/05-blocks/button/_style.scss","../../assets/sass/02-tools/mixins.scss","../../assets/sass/05-blocks/code/_style.scss","../../assets/sass/05-blocks/columns/_style.scss","../../assets/sass/05-blocks/cover/_style.scss","../../assets/sass/05-blocks/file/_style.scss","../../assets/sass/05-blocks/gallery/_style.scss","../../assets/sass/05-blocks/group/_style.scss","../../assets/sass/05-blocks/heading/_style.scss","../../assets/sass/05-blocks/image/_style.scss","../../assets/sass/05-blocks/latest-comments/_style.scss","../../assets/sass/05-blocks/latest-posts/_style.scss","../../assets/sass/05-blocks/legacy/_style.scss","../../assets/sass/05-blocks/list/_style.scss","../../assets/sass/05-blocks/media-text/_style.scss","../../assets/sass/05-blocks/navigation/_style.scss","../../assets/sass/05-blocks/paragraph/_style.scss","../../assets/sass/05-blocks/preformatted/_style.scss","../../assets/sass/05-blocks/pullquote/_style.scss","../../assets/sass/05-blocks/query-loop/_style.scss","../../assets/sass/05-blocks/quote/_style.scss","../../assets/sass/05-blocks/rss/_style.scss","../../assets/sass/05-blocks/search/_style.scss","../../assets/sass/05-blocks/separator/_style.scss","../../assets/sass/05-blocks/social-icons/_style.scss","../../assets/sass/05-blocks/spacer/_style.scss","../../assets/sass/05-blocks/table/_style.scss","../../assets/sass/05-blocks/tag-clould/_style.scss","../../assets/sass/05-blocks/verse/_style.scss","../../assets/sass/05-blocks/video/_style.scss","../../assets/sass/05-blocks/utilities/_font-sizes.scss","../../assets/sass/05-blocks/utilities/_style.scss","../../assets/sass/06-components/header.scss","../../assets/sass/06-components/footer.scss","../../assets/sass/06-components/single.scss","../../assets/sass/06-components/posts-and-pages.scss","../../assets/sass/06-components/entry.scss","../../assets/sass/06-components/archives.scss","../../assets/sass/06-components/404.scss","../../assets/sass/06-components/search.scss","../../assets/sass/06-components/comments.scss","../../assets/sass/06-components/navigation.scss","../../assets/sass/06-components/footer-navigation.scss","../../assets/sass/06-components/pagination.scss","../../assets/sass/06-components/widgets.scss","../../assets/sass/07-utilities/a11y.scss","../../assets/sass/07-utilities/color-palette.scss","../../assets/sass/07-utilities/measure.scss","../../assets/sass/07-utilities/ie.scss"],"names":[],"mappings":"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DwrJD;A6D5rJC;EAEC,yBAAA;A7D8rJF;;A6DzrJA;EAMC,yBAAA;A7DurJD;A6D3rJC;EAEC,yBAAA;A7D6rJF;;A6DxrJA;EAMC,yBAAA;A7DsrJD;A6D1rJC;EAEC,yBAAA;A7D4rJF;;A6DvrJA;EAMC,yBAAA;A7DqrJD;A6DzrJC;EAEC,yBAAA;A7D2rJF;;A6DtrJA;EAMC,yBAAA;A7DorJD;A6DxrJC;EAEC,yBAAA;A7D0rJF;;A6DrrJA;EAMC,yBAAA;A7DmrJD;A6DvrJC;EAEC,yBAAA;A7DyrJF;;A6DprJA;EAMC,yBAAA;A7DkrJD;A6DtrJC;EAEC,yBAAA;A7DwrJF;;A6DnrJA;EAMC,yBAAA;A7DirJD;A6DrrJC;EAEC,yBAAA;A7DurJF;;A6DlrJA;EAMC,yBAAA;A7DgrJD;A6DprJC;EAEC,yBAAA;A7DsrJF;;A6DjrJA;EAMC,sBAAA;A7D+qJD;A6DnrJC;EAEC,sBAAA;A7DqrJF;;A6D9qJC;EAGG,WAAA;A7D+qJJ;;A6DlrJC;EAGG,WAAA;A7D+qJJ;;A6DlrJC;EAGG,WAAA;A7D+qJJ;A6D5qJE;EAMC;A7D0qJH;A6DhrJE;EAMC;A7D0qJH;A6DhrJE;EAMC;A7D0qJH;A6DtqJC;EAOG,cAAA;A7DqqJJ;A6D5qJC;EAOG,cAAA;A7DqqJJ;A6D5qJC;EAOG,cAAA;A7DqqJJ;A6D5qJC;EAOG,cAAA;A7DqqJJ;A6D5qJC;EAOG,cAAA;A7DqqJJ;A6D5qJC;EAOG,cAAA;A7DqqJJ;A6D5qJC;EAOG,cAAA;A7DqqJJ;A6DlqJE;EAMC;A7DgqJH;A6DtqJE;EAMC;A7DgqJH;A6DtqJE;EAMC;A7DgqJH;A6DtqJE;EAMC;A7DgqJH;A6DtqJE;EAMC;A7DgqJH;A6DtqJE;EAMC;A7DgqJH;A6DtqJE;EAMC;A7DgqJH;;A6D1pJA;EACC,qDAAA;A7DgqJD;;A6D7pJA;EACC,qDAAA;A7DgqJD;;A6D7pJA;EACC,qDAAA;A7DgqJD;;A6D7pJA;EACC,qDAAA;A7DgqJD;;A6D7pJA;EACC,qDAAA;A7DgqJD;;A6D7pJA;EACC,qDAAA;A7DgqJD;;A6D7pJA;EACC,qDAAA;A7DgqJD;;A6D7pJA;EACC,qDAAA;A7DgqJD;;A8Dh7JA;EAGC,gBAAA;A9Dm7JD;;A8Dt7JA;EAGC,gBAAA;A9Dm7JD;;A8Dt7JA;EAGC,gBAAA;A9Dm7JD;;A8Dh7JA;;;;;;;;;;;EAWC,eAAA;A9Dm7JD;;A+Dr8JC;EACC,WAAA;A/Dw8JF;A+Dt8JE;;;;;;;;;;;EAWC,WAAA;A/Dw8JH;A+Dr8JE;;;;EAIC,UAAA;A/Du8JH;A+Dp8JE;EACC,gBAAA;A/Ds8JH;AK78JE;E0DaE;;IAEC,sBAAA;E/Dm8JH;AACF;A+D/7JE;EACC,cAAA;A/Di8JH;A+D77JC;EACC,cAAA;A/D+7JF;A+D57JC;EACC,eAAA;A/D87JF","file":"ie.css"} \ No newline at end of file +{"version":3,"sources":["../../style.css","../../assets/sass/01-settings/file-header.scss","../../assets/sass/style.scss","../../assets/sass/01-settings/global.scss","../../assets/sass/03-generic/normalize.scss","../../assets/sass/03-generic/breakpoints.scss","../../assets/sass/03-generic/vertical-margins.scss","../../assets/sass/03-generic/reset.scss","../../assets/sass/03-generic/clearings.scss","../../assets/sass/04-elements/blockquote.scss","../../assets/sass/04-elements/forms.scss","../../assets/sass/04-elements/media.scss","../../assets/sass/04-elements/misc.scss","../../assets/sass/04-elements/links.scss","../../assets/sass/05-blocks/audio/_style.scss","../../assets/sass/05-blocks/button/_style.scss","../../assets/sass/02-tools/mixins.scss","../../assets/sass/05-blocks/code/_style.scss","../../assets/sass/05-blocks/columns/_style.scss","../../assets/sass/05-blocks/cover/_style.scss","../../assets/sass/05-blocks/file/_style.scss","../../assets/sass/05-blocks/gallery/_style.scss","../../assets/sass/05-blocks/group/_style.scss","../../assets/sass/05-blocks/heading/_style.scss","../../assets/sass/05-blocks/image/_style.scss","../../assets/sass/05-blocks/latest-comments/_style.scss","../../assets/sass/05-blocks/latest-posts/_style.scss","../../assets/sass/05-blocks/legacy/_style.scss","../../assets/sass/05-blocks/list/_style.scss","../../assets/sass/05-blocks/media-text/_style.scss","../../assets/sass/05-blocks/navigation/_style.scss","../../assets/sass/05-blocks/paragraph/_style.scss","../../assets/sass/05-blocks/preformatted/_style.scss","../../assets/sass/05-blocks/pullquote/_style.scss","../../assets/sass/05-blocks/query-loop/_style.scss","../../assets/sass/05-blocks/quote/_style.scss","../../assets/sass/05-blocks/rss/_style.scss","../../assets/sass/05-blocks/search/_style.scss","../../assets/sass/05-blocks/separator/_style.scss","../../assets/sass/05-blocks/social-icons/_style.scss","../../assets/sass/05-blocks/spacer/_style.scss","../../assets/sass/05-blocks/table/_style.scss","../../assets/sass/05-blocks/tag-clould/_style.scss","../../assets/sass/05-blocks/verse/_style.scss","../../assets/sass/05-blocks/video/_style.scss","../../assets/sass/05-blocks/utilities/_font-sizes.scss","../../assets/sass/05-blocks/utilities/_style.scss","../../assets/sass/06-components/header.scss","../../assets/sass/06-components/footer.scss","../../assets/sass/06-components/single.scss","../../assets/sass/06-components/posts-and-pages.scss","../../assets/sass/06-components/entry.scss","../../assets/sass/06-components/archives.scss","../../assets/sass/06-components/404.scss","../../assets/sass/06-components/search.scss","../../assets/sass/06-components/comments.scss","../../assets/sass/06-components/navigation.scss","../../assets/sass/06-components/footer-navigation.scss","../../assets/sass/06-components/pagination.scss","../../assets/sass/06-components/widgets.scss","../../assets/sass/07-utilities/a11y.scss","../../assets/sass/07-utilities/color-palette.scss","../../assets/sass/07-utilities/measure.scss","../../assets/sass/07-utilities/ie.scss"],"names":[],"mappings":"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A;IACA,kCAAA;E5DsqJA;AACF;A6DltJA;EAMC,WAAA;A7D+sJD;A6DntJC;EAEC,WAAA;A7DqtJF;;A6DhtJA;EAMC,cAAA;A7D8sJD;A6DltJC;EAEC,cAAA;A7DotJF;;A6D/sJA;EAMC,cAAA;A7D6sJD;A6DjtJC;EAEC,cAAA;A7DmtJF;;A6D9sJA;EAMC,cAAA;A7D4sJD;A6DhtJC;EAEC,cAAA;A7DktJF;;A6D7sJA;EAMC,cAAA;A7D2sJD;A6D/sJC;EAEC,cAAA;A7DitJF;;A6D5sJA;EAMC,cAAA;A7D0sJD;A6D9sJC;EAEC,cAAA;A7DgtJF;;A6D3sJA;EAMC,cAAA;A7DysJD;A6D7sJC;EAEC,cAAA;A7D+sJF;;A6D1sJA;EAMC,cAAA;A7DwsJD;A6D5sJC;EAEC,cAAA;A7D8sJF;;A6DzsJA;EAMC,cAAA;A7DusJD;A6D3sJC;EAEC,cAAA;A7D6sJF;;A6DxsJA;EAMC,WAAA;A7DssJD;A6D1sJC;EAEC,WAAA;A7D4sJF;;A6DpsJC;;;;;;;;EAQC,mBAAA;A7DusJF;;A6DnsJA;EAMC,sBAAA;A7DisJD;A6DrsJC;EAEC,sBAAA;A7DusJF;;A6DlsJA;EAMC,yBAAA;A7DgsJD;A6DpsJC;EAEC,yBAAA;A7DssJF;;A6DjsJA;EAMC,yBAAA;A7D+rJD;A6DnsJC;EAEC,yBAAA;A7DqsJF;;A6DhsJA;EAMC,yBAAA;A7D8rJD;A6DlsJC;EAEC,yBAAA;A7DosJF;;A6D/rJA;EAMC,yBAAA;A7D6rJD;A6DjsJC;EAEC,yBAAA;A7DmsJF;;A6D9rJA;EAMC,yBAAA;A7D4rJD;A6DhsJC;EAEC,yBAAA;A7DksJF;;A6D7rJA;EAMC,yBAAA;A7D2rJD;A6D/rJC;EAEC,yBAAA;A7DisJF;;A6D5rJA;EAMC,yBAAA;A7D0rJD;A6D9rJC;EAEC,yBAAA;A7DgsJF;;A6D3rJA;EAMC,yBAAA;A7DyrJD;A6D7rJC;EAEC,yBAAA;A7D+rJF;;A6D1rJA;EAMC,yBAAA;A7DwrJD;A6D5rJC;EAEC,yBAAA;A7D8rJF;;A6DzrJA;EAMC,sBAAA;A7DurJD;A6D3rJC;EAEC,sBAAA;A7D6rJF;;A6DtrJC;EAGG,WAAA;A7DurJJ;;A6D1rJC;EAGG,WAAA;A7DurJJ;;A6D1rJC;EAGG,WAAA;A7DurJJ;A6DprJE;EAMC;A7DkrJH;A6DxrJE;EAMC;A7DkrJH;A6DxrJE;EAMC;A7DkrJH;A6D9qJC;EAOG,cAAA;A7D6qJJ;A6DprJC;EAOG,cAAA;A7D6qJJ;A6DprJC;EAOG,cAAA;A7D6qJJ;A6DprJC;EAOG,cAAA;A7D6qJJ;A6DprJC;EAOG,cAAA;A7D6qJJ;A6DprJC;EAOG,cAAA;A7D6qJJ;A6DprJC;EAOG,cAAA;A7D6qJJ;A6D1qJE;EAMC;A7DwqJH;A6D9qJE;EAMC;A7DwqJH;A6D9qJE;EAMC;A7DwqJH;A6D9qJE;EAMC;A7DwqJH;A6D9qJE;EAMC;A7DwqJH;A6D9qJE;EAMC;A7DwqJH;A6D9qJE;EAMC;A7DwqJH;;A6DlqJA;EACC,qDAAA;A7DwqJD;;A6DrqJA;EACC,qDAAA;A7DwqJD;;A6DrqJA;EACC,qDAAA;A7DwqJD;;A6DrqJA;EACC,qDAAA;A7DwqJD;;A6DrqJA;EACC,qDAAA;A7DwqJD;;A6DrqJA;EACC,qDAAA;A7DwqJD;;A6DrqJA;EACC,qDAAA;A7DwqJD;;A6DrqJA;EACC,qDAAA;A7DwqJD;;A8Dx7JA;EAGC,gBAAA;A9D27JD;;A8Dx7JA;;;;;;;;;;;EAWC,eAAA;A9D27JD;;A+D78JC;EACC,WAAA;A/Dg9JF;A+D98JE;;;;;;;;;;;EAWC,WAAA;A/Dg9JH;A+D78JE;;;;EAIC,UAAA;A/D+8JH;A+D58JE;EACC,gBAAA;A/D88JH;AKr9JE;E0DaE;;IAEC,sBAAA;E/D28JH;AACF;A+Dv8JE;EACC,cAAA;A/Dy8JH;A+Dr8JC;EACC,cAAA;A/Du8JF;A+Dp8JC;EACC,eAAA;A/Ds8JF","file":"ie.css"} \ No newline at end of file diff --git a/src/wp-content/themes/twentytwentyone/assets/css/style-dark-mode-rtl.css b/src/wp-content/themes/twentytwentyone/assets/css/style-dark-mode-rtl.css index a5daf1bfd1..8037e922f9 100644 --- a/src/wp-content/themes/twentytwentyone/assets/css/style-dark-mode-rtl.css +++ b/src/wp-content/themes/twentytwentyone/assets/css/style-dark-mode-rtl.css @@ -82,7 +82,7 @@ @media only screen and (max-width: 481px) { body:not(.primary-navigation-open) #dark-mode-toggler.relative ~ nav { - top: calc(44px + 44px); + top: 88px; } } @media only screen { diff --git a/src/wp-content/themes/twentytwentyone/assets/css/style-dark-mode.css b/src/wp-content/themes/twentytwentyone/assets/css/style-dark-mode.css index 679d1c6b4d..12290f0b0c 100644 --- a/src/wp-content/themes/twentytwentyone/assets/css/style-dark-mode.css +++ b/src/wp-content/themes/twentytwentyone/assets/css/style-dark-mode.css @@ -82,7 +82,7 @@ @media only screen and (max-width: 481px) { body:not(.primary-navigation-open) #dark-mode-toggler.relative ~ nav { - top: calc(44px + 44px); + top: 88px; } } @media only screen { diff --git a/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css b/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css index 8a9413982b..d6019c45bb 100644 --- a/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css +++ b/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css @@ -981,8 +981,8 @@ a:hover { } .wp-block-group.is-style-twentytwentyone-border .wp-block-group__inner-container > [data-align=full] { - max-width: calc(var(--responsive--alignfull-width) + (2 * var(--global--spacing-vertical))); - width: calc(var(--responsive--alignfull-width) + (2 * var(--global--spacing-vertical))); + max-width: calc(var(--responsive--alignfull-width) + 2 * var(--global--spacing-vertical)); + width: calc(var(--responsive--alignfull-width) + 2 * var(--global--spacing-vertical)); margin-left: calc(-1 * var(--global--spacing-vertical)); } @@ -1127,7 +1127,8 @@ h6, } /* Center image block by default in the editor */ -.wp-block-image > div { +.wp-block-image, +.wp-block-image > div:not(.components-placeholder) { text-align: center; } @@ -1262,23 +1263,23 @@ h6, @media screen and (min-width: 600px) { .wp-block-latest-posts.is-style-twentytwentyone-latest-posts-dividers.is-grid.columns-2 li { - width: calc((100% / 2)); + width: calc(100% / 2); } .wp-block-latest-posts.is-style-twentytwentyone-latest-posts-dividers.is-grid.columns-3 li { - width: calc((100% / 3)); + width: calc(100% / 3); } .wp-block-latest-posts.is-style-twentytwentyone-latest-posts-dividers.is-grid.columns-4 li { - width: calc((100% / 4)); + width: calc(100% / 4); } .wp-block-latest-posts.is-style-twentytwentyone-latest-posts-dividers.is-grid.columns-5 li { - width: calc((100% / 5)); + width: calc(100% / 5); } .wp-block-latest-posts.is-style-twentytwentyone-latest-posts-dividers.is-grid.columns-6 li { - width: calc((100% / 6)); + width: calc(100% / 6); } } diff --git a/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css.map b/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css.map index adfdea746e..8006c92667 100644 --- a/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css.map +++ b/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../sass/style-editor.scss","../sass/01-settings/global.scss","../sass/03-generic/breakpoints.scss","../sass/04-elements/blockquote.scss","../sass/04-elements/media.scss","../sass/04-elements/forms-editor.scss","../sass/04-elements/links.scss","../sass/05-blocks/button/_editor.scss","../sass/02-tools/mixins.scss","../sass/05-blocks/code/_editor.scss","../sass/05-blocks/cover/_editor.scss","../sass/05-blocks/columns/_editor.scss","../sass/05-blocks/file/_editor.scss","../sass/05-blocks/gallery/_editor.scss","../sass/05-blocks/group/_editor.scss","../sass/05-blocks/heading/_editor.scss","../sass/05-blocks/html/_editor.scss","../sass/05-blocks/image/_editor.scss","../sass/05-blocks/latest-comments/_editor.scss","../sass/05-blocks/latest-posts/_editor.scss","../sass/05-blocks/legacy/_editor.scss","../sass/05-blocks/list/_editor.scss","../sass/05-blocks/media-text/_editor.scss","../sass/05-blocks/navigation/_editor.scss","../sass/05-blocks/paragraph/_editor.scss","../sass/05-blocks/preformatted/_editor.scss","../sass/05-blocks/pullquote/_editor.scss","../sass/05-blocks/query-loop/_editor.scss","../sass/05-blocks/quote/_editor.scss","../sass/05-blocks/rss/_editor.scss","../sass/05-blocks/search/_editor.scss","../sass/05-blocks/separator/_editor.scss","../sass/05-blocks/social-icons/_editor.scss","../sass/05-blocks/table/_editor.scss","../sass/05-blocks/tag-clould/_editor.scss","../sass/05-blocks/verse/_editor.scss","../sass/05-blocks/utilities/_font-sizes.scss","../sass/05-blocks/utilities/_editor.scss","../sass/06-components/editor.scss","../sass/07-utilities/color-palette.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;ACAA;AAKA;AAEC;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;AAEA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;AAAyD;EACzD;AAAsD;EACtD;EACA;AAAwD;EACxD;AAAsD;AAEtD;EACA;EACA;EACA;EACA;AAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;AAEA;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;;;AAGD;EACC;;AAEA;EAHD;IAIE;;;;AAIF;EACC;IACC;IACA;IACA;IACA;IACA;;;ACtPF;AAAA;AAAA;AAIA;AAAA;AAAA;AA4EA;AAAA;AAAA;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;;;AA/DC;EAoED;IACC;IACA;IACA;IACA;;;AApCA;EA0CD;IACC;IACA;;;AAIF;AAAA;AAAA;AAGA;EACC;EACA;EACA;;;AAGD;EACC;EACA;EACA;;;AAhGC;EA2GD;IACC;IACA;IACA;IACA;;;ACzIF;EACC;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAIF;EACC;EACA;EACA;EACA;EACA;EACA;;AAGD;AAAA;EAEC;EACA;EACA;EACA;;AAGD;EAGC;;AAEA;EACC;EACA;EACA;;AAGD;AAAA;AAAA;EAEC;EACA;;AAIF;EACC;;AAGD;EACC;EACA;EACA;EACA;EACA;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;;ADlDA;ECpBF;IA0EE;;EAEA;IACC;;;;AC7EH;EACC;EACA;EACA;;;AAGD;AACA;EACC;;;AAGD;AACA;AAAA;AAAA;AAAA;EAIC;;;AAGD;AACA;AAAA;AAAA;AAAA;EAIC;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAEC;;;AAIF;AACA;AAAA;AAAA;EAGC;EACA;EACA;EACA;;;AC5CD;AAAA;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;ACXD;AAAA;AAAA;AAAA;AAAA;AAKA;EACC;EACA;EACA;EACA;;;AAGD;EACC;EACA;;;AAGD;AAEC;EACA;EAEA;EACA;EACA;;AAGA;EACC;EACA;EACA;;AAEA;EACC;;AAKF;EACC;EACA;;AAEA;EACC;;AAIF;AAEC;EACA;EACA;;AAEA;EACC;EACA;;AAIF;EACC;;AAGD;EACC;;;AAQD;EAEC;;;AC1EF;ECsBC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAMC;EACC;;AAGA;EACC;;AAEA;EACC;;AAMH;EACC;;AAGA;EACC;;AAMH;EAEC;EACA;EACA;;AAID;EACC;EACA;;AAID;EACC;EACA;EACA;;;ADzEF;AAAA;AAAA;AAMA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;;AAYC;EACC;;AAGA;EACC;;AAEA;EACC;;AAMH;EACC;;AAGA;EACC;;AAMH;AAAA;EAEC;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CA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;;AAIF;EACC;;;ACxCD;AAAA;EAEC;EACA;EACA;;AAGA;AAAA;EACC;EACA;EACA;;AAGD;AAAA;EACC;EACA;EACA;;;AAMD;AAAA;EAEC;;;AAIF;EACC;EACA;;;AC5BA;EACC;EACA;;AdiFD;EACC;;AAID;EACC;;AAID;EAEC;;AcxFD;EACC;;AAID;EACC;;;ACbD;EACC;EACA;;AAKA;EACC;;AAGD;EACC;EACA;EACA;;AAMD;EACC;;AAUC;EAEC;;AAKH;EACC;;;ACzCH;EACC;;AAEA;EACC;;;ACJF;EACC;EACA;EACA;;;ACHD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;;AAID;EACC;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;AAEA;EARD;IASE;;;AAGD;EACC;;AAGD;EAEC;EACA;EACA;;AAGD;EACC;EACA;;AAEA;EACC;;AAIF;AAAA;AAAA;EAGC;;;AAUD;EACC;;;AAQF;AAAA;EACC;;;ACrGD;EACC;;AzBuBA;EyBxBD;IAIE;;;;ACNH;EACC;EACA;EACA;;AAEA;EACC;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;EACC;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAEA;EAIC;;AAIF;EACC;EACA;EACA;;AAGA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;;AAIF;EACC;;AAEA;EACC;;AAIF;EAEC;AAEA;EACA;EACA;;AAEA;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAMA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;;A1B9EF;E0B6CD;IAsCE;;EAEA;IACC;;EAGD;IACC;IACA;;EAEA;IACC;;;A1B9FH;E0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","file":"style-editor.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../sass/style-editor.scss","../sass/01-settings/global.scss","../sass/03-generic/breakpoints.scss","../sass/04-elements/blockquote.scss","../sass/04-elements/media.scss","../sass/04-elements/forms-editor.scss","../sass/04-elements/links.scss","../sass/05-blocks/button/_editor.scss","../sass/02-tools/mixins.scss","../sass/05-blocks/code/_editor.scss","../sass/05-blocks/cover/_editor.scss","../sass/05-blocks/columns/_editor.scss","../sass/05-blocks/file/_editor.scss","../sass/05-blocks/gallery/_editor.scss","../sass/05-blocks/group/_editor.scss","../sass/05-blocks/heading/_editor.scss","../sass/05-blocks/html/_editor.scss","../sass/05-blocks/image/_editor.scss","../sass/05-blocks/latest-comments/_editor.scss","../sass/05-blocks/latest-posts/_editor.scss","../sass/05-blocks/legacy/_editor.scss","../sass/05-blocks/list/_editor.scss","../sass/05-blocks/media-text/_editor.scss","../sass/05-blocks/navigation/_editor.scss","../sass/05-blocks/paragraph/_editor.scss","../sass/05-blocks/preformatted/_editor.scss","../sass/05-blocks/pullquote/_editor.scss","../sass/05-blocks/query-loop/_editor.scss","../sass/05-blocks/quote/_editor.scss","../sass/05-blocks/rss/_editor.scss","../sass/05-blocks/search/_editor.scss","../sass/05-blocks/separator/_editor.scss","../sass/05-blocks/social-icons/_editor.scss","../sass/05-blocks/table/_editor.scss","../sass/05-blocks/tag-clould/_editor.scss","../sass/05-blocks/verse/_editor.scss","../sass/05-blocks/utilities/_font-sizes.scss","../sass/05-blocks/utilities/_editor.scss","../sass/06-components/editor.scss","../sass/07-utilities/color-palette.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;ACAA;AAKA;AAEC;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;AAEA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;AAAyD;EACzD;AAAsD;EACtD;EACA;AAAwD;EACxD;AAAsD;AAEtD;EACA;EACA;EACA;EACA;AAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;AAEA;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;;;AAGD;EACC;;AAEA;EAHD;IAIE;;;;AAIF;EACC;IACC;IACA;IACA;IACA;IACA;;;ACtPF;AAAA;AAAA;AAIA;AAAA;AAAA;AA4EA;AAAA;AAAA;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;;;AA/DC;EAoED;IACC;IACA;IACA;IACA;;;AApCA;EA0CD;IACC;IACA;;;AAIF;AAAA;AAAA;AAGA;EACC;EACA;EACA;;;AAGD;EACC;EACA;EACA;;;AAhGC;EA2GD;IACC;IACA;IACA;IACA;;;ACzIF;EACC;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAIF;EACC;EACA;EACA;EACA;EACA;EACA;;AAGD;AAAA;EAEC;EACA;EACA;EACA;;AAGD;EAGC;;AAEA;EACC;EACA;EACA;;AAGD;AAAA;AAAA;EAEC;EACA;;AAIF;EACC;;AAGD;EACC;EACA;EACA;EACA;EACA;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;;ADlDA;ECpBF;IA0EE;;EAEA;IACC;;;;AC7EH;EACC;EACA;EACA;;;AAGD;AACA;EACC;;;AAGD;AACA;AAAA;AAAA;AAAA;EAIC;;;AAGD;AACA;AAAA;AAAA;AAAA;EAIC;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAEC;;;AAIF;AACA;AAAA;AAAA;EAGC;EACA;EACA;EACA;;;AC5CD;AAAA;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;ACXD;AAAA;AAAA;AAAA;AAAA;AAKA;EACC;EACA;EACA;EACA;;;AAGD;EACC;EACA;;;AAGD;AAEC;EACA;EAEA;EACA;EACA;;AAGA;EACC;EACA;EACA;;AAEA;EACC;;AAKF;EACC;EACA;;AAEA;EACC;;AAIF;AAEC;EACA;EACA;;AAEA;EACC;EACA;;AAIF;EACC;;AAGD;EACC;;;AAQD;EAEC;;;AC1EF;ECsBC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAMC;EACC;;AAGA;EACC;;AAEA;EACC;;AAMH;EACC;;AAGA;EACC;;AAMH;EAEC;EACA;EACA;;AAID;EACC;EACA;;AAID;EACC;EACA;EACA;;;ADzEF;AAAA;AAAA;AAMA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;;AAYC;EACC;;AAGA;EACC;;AAEA;EACC;;AAMH;EACC;;AAGA;EACC;;AAMH;AAAA;EAEC;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CC;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;;AAIF;EACC;;;ACxCD;AAAA;EAEC;EACA;EACA;;AAGA;AAAA;EACC;EACA;EACA;;AAGD;AAAA;EACC;EACA;EACA;;;AAMD;AAAA;EAEC;;;AAIF;EACC;EACA;;;AC5BA;EACC;EACA;;AdiFD;EACC;;AAID;EACC;;AAID;EAEC;;AcxFD;EACC;;AAID;EACC;;;ACbD;EACC;EACA;;AAKA;EACC;;AAGD;EACC;EACA;EACA;;AAMD;EACC;;AAUC;EAEC;;AAKH;EACC;;;ACzCH;EACC;;AAEA;EACC;;;ACJF;EACC;EACA;EACA;;;ACHD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;;AAID;EACC;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;AAEA;EARD;IASE;;;AAGD;EACC;;AAGD;EAEC;EACA;EACA;;AAGD;EACC;EACA;;AAEA;EACC;;AAIF;AAAA;AAAA;EAGC;;;AAUD;EACC;;;AAQF;AAAA;EACC;;;ACrGD;EACC;;AzBuBA;EyBxBD;IAIE;;;;ACNH;EACC;EACA;EACA;;AAEA;EACC;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;EACC;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAEA;EAIC;;AAIF;EACC;EACA;EACA;;AAGA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;;AAIF;EACC;;AAEA;EACC;;AAIF;EAEC;AAEA;EACA;EACA;;AAEA;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAMA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;;A1B9EF;E0B6CD;IAsCE;;EAEA;IACC;;EAGD;IACC;IACA;;EAEA;IACC;;;A1B9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","file":"style-editor.css"} \ No newline at end of file diff --git a/src/wp-content/themes/twentytwentyone/assets/js/primary-navigation.js b/src/wp-content/themes/twentytwentyone/assets/js/primary-navigation.js index 4c88190f12..ec15e106dc 100644 --- a/src/wp-content/themes/twentytwentyone/assets/js/primary-navigation.js +++ b/src/wp-content/themes/twentytwentyone/assets/js/primary-navigation.js @@ -180,7 +180,9 @@ function twentytwentyoneExpandSubMenu( el ) { // jshint ignore:line // Wait 550 and scroll to the anchor. setTimeout(function () { var anchor = document.getElementById(event.target.hash.slice(1)); - anchor.scrollIntoView(); + if ( anchor ) { + anchor.scrollIntoView(); + } }, 550); } } ); diff --git a/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/file-header.scss b/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/file-header.scss index 43a6960b32..dd3693f65a 100644 --- a/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/file-header.scss +++ b/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/file-header.scss @@ -5,9 +5,9 @@ Author: the WordPress team Author URI: https://wordpress.org/ Description: Twenty Twenty-One is a blank canvas for your ideas and it makes the block editor your best brush. With new block patterns, which allow you to create a beautiful layout in a matter of seconds, this theme’s soft colors and eye-catching — yet timeless — design will let your work shine. Take it for a spin! See how Twenty Twenty-One elevates your portfolio, business website, or personal blog. Requires at least: 5.3 -Tested up to: 5.8 +Tested up to: 5.9 Requires PHP: 5.6 -Version: 1.4 +Version: 1.5 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Text Domain: twentytwentyone diff --git a/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/image/_editor.scss b/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/image/_editor.scss index e4ed9d7a01..c108a60f9a 100644 --- a/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/image/_editor.scss +++ b/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/image/_editor.scss @@ -1,6 +1,7 @@ /* Center image block by default in the editor */ -.wp-block-image > div { +.wp-block-image, +.wp-block-image > div:not(.components-placeholder) { text-align: center; } diff --git a/src/wp-content/themes/twentytwentyone/assets/sass/06-components/footer.scss b/src/wp-content/themes/twentytwentyone/assets/sass/06-components/footer.scss index 6223c3446a..0707f3c1ca 100644 --- a/src/wp-content/themes/twentytwentyone/assets/sass/06-components/footer.scss +++ b/src/wp-content/themes/twentytwentyone/assets/sass/06-components/footer.scss @@ -31,6 +31,7 @@ font-size: var(--branding--title--font-size); } + .privacy-policy, .powered-by { margin-top: calc(0.5 * var(--global--spacing-vertical)); } @@ -39,10 +40,19 @@ display: flex; align-items: center; + .site-name { + margin-right: calc(0.5 * var(--global--spacing-vertical)); + } + + .privacy-policy, .powered-by { margin-top: initial; margin-left: auto; } + + .privacy-policy + .powered-by { + margin-left: calc(0.5 * var(--global--spacing-vertical)); + } } a { diff --git a/src/wp-content/themes/twentytwentyone/assets/sass/06-components/widgets.scss b/src/wp-content/themes/twentytwentyone/assets/sass/06-components/widgets.scss index 5fb85df9fd..b896c6bf62 100755 --- a/src/wp-content/themes/twentytwentyone/assets/sass/06-components/widgets.scss +++ b/src/wp-content/themes/twentytwentyone/assets/sass/06-components/widgets.scss @@ -20,42 +20,6 @@ margin-top: calc(3 * var(--global--spacing-vertical)); } - ul { - list-style-type: none; - padding: 0; - - li { - line-height: var(--widget--line-height-list); - } - - &.sub-menu, - &.children { - margin-left: var(--widget--spacing-menu); - } - - .sub-menu-toggle { - display: none; - } - } - - a { - color: var(--footer--color-link); - text-decoration: underline; - text-decoration-style: solid; - text-decoration-color: currentColor; - - &:link, - &:visited, - &:active { - color: var(--footer--color-link); - } - - &:hover { - color: var(--footer--color-link-hover); - text-decoration-style: dotted; - } - } - .wp-block-social-links { &.alignright { @@ -110,6 +74,42 @@ h6 { font-size: var(--global--font-size-xs); } + + ul { + list-style-type: none; + padding: 0; + + li { + line-height: var(--widget--line-height-list); + } + + &.sub-menu, + &.children { + margin-left: var(--widget--spacing-menu); + } + + .sub-menu-toggle { + display: none; + } + } + + a { + color: var(--footer--color-link); + text-decoration: underline; + text-decoration-style: solid; + text-decoration-color: currentColor; + + &:link, + &:visited, + &:active { + color: var(--footer--color-link); + } + + &:hover { + color: var(--footer--color-link-hover); + text-decoration-style: dotted; + } + } } // Search widget styles diff --git a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php index 4de201c1b9..854cb2e0cf 100644 --- a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php +++ b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php @@ -178,7 +178,7 @@ class Twenty_Twenty_One_Dark_Mode { esc_url( __( 'https://wordpress.org/support/article/twenty-twenty-one/#dark-mode-support', 'twentytwentyone' ) ) ); $description .= '

'; - $description .= '

' . __( 'Dark Mode can also be turned on and off with a button that you can find in the bottom right corner of the page.', 'twentytwentyone' ) . '

'; + $description .= '

' . __( 'Dark Mode can also be turned on and off with a button that you can find in the bottom corner of the page.', 'twentytwentyone' ) . '

'; $wp_customize->add_control( 'respect_user_color_preference', diff --git a/src/wp-content/themes/twentytwentyone/comments.php b/src/wp-content/themes/twentytwentyone/comments.php index cb86fef26e..06e3d029d0 100644 --- a/src/wp-content/themes/twentytwentyone/comments.php +++ b/src/wp-content/themes/twentytwentyone/comments.php @@ -82,7 +82,6 @@ $twenty_twenty_one_comment_count = get_comments_number(); null, 'title_reply' => esc_html__( 'Leave a comment', 'twentytwentyone' ), 'title_reply_before' => '

', 'title_reply_after' => '

', diff --git a/src/wp-content/themes/twentytwentyone/footer.php b/src/wp-content/themes/twentytwentyone/footer.php index eac1082932..4fc472d9cf 100644 --- a/src/wp-content/themes/twentytwentyone/footer.php +++ b/src/wp-content/themes/twentytwentyone/footer.php @@ -53,6 +53,13 @@ + + ', '' ); + } + ?> +
'; include get_template_directory() . '/assets/js/skip-link-focus-fix.js'; echo ''; + } else { + // The following is minified via `npx terser --compress --mangle -- assets/js/skip-link-focus-fix.js`. + ?> + + - - ID ) { $meta = wp_get_attachment_metadata( $attachment->ID ); - if ( $meta['width'] && $meta['height'] ) { + if ( isset( $meta['width'] ) && isset( $meta['height'] ) ) { $width = (int) $meta['width']; $height = (int) $meta['height']; } diff --git a/src/wp-content/themes/twentytwentyone/package-lock.json b/src/wp-content/themes/twentytwentyone/package-lock.json index 060fcbd18f..e2e41e99b7 100644 --- a/src/wp-content/themes/twentytwentyone/package-lock.json +++ b/src/wp-content/themes/twentytwentyone/package-lock.json @@ -1,6 +1,6 @@ { "name": "twentytwentyone", - "version": "1.4.0", + "version": "1.5.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -232,21 +232,21 @@ "dev": true }, "@babel/runtime": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz", - "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.0.tgz", + "integrity": "sha512-Nht8L0O8YCktmsDV6FqFue7vQLRx3Hb0B37lS5y0jDRqRxlBG4wIJHnf9/bgSE2UyipKFA01YtS+npRdTWBUyw==", "dev": true, "requires": { "regenerator-runtime": "^0.13.4" } }, "@babel/runtime-corejs3": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.0.tgz", - "integrity": "sha512-0R0HTZWHLk6G8jIk0FtoX+AatCtKnswS98VhXwGImFc759PJRp4Tru0PQYZofyijTFUr+gT8Mu7sgXVJLQ0ceg==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.16.0.tgz", + "integrity": "sha512-Oi2qwQ21X7/d9gn3WiwkDTJmq3TQtYNz89lRnoFy8VeZpWlsyXvzSwiRrRZ8cXluvSwqKxqHJ6dBd9Rv+p0ZGQ==", "dev": true, "requires": { - "core-js-pure": "^3.0.0", + "core-js-pure": "^3.19.0", "regenerator-runtime": "^0.13.4" } }, @@ -303,27 +303,55 @@ } } }, + "@es-joy/jsdoccomment": { + "version": "0.10.8", + "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.10.8.tgz", + "integrity": "sha512-3P1JiGL4xaR9PoTKUHa2N/LKwa2/eUdRqGwijMWWgBqbFEqJUVpmaOi2TcjcemrsRMgFLBzQCK4ToPhrSVDiFQ==", + "dev": true, + "requires": { + "comment-parser": "1.2.4", + "esquery": "^1.4.0", + "jsdoc-type-pratt-parser": "1.1.1" + }, + "dependencies": { + "jsdoc-type-pratt-parser": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz", + "integrity": "sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g==", + "dev": true + } + } + }, "@eslint/eslintrc": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz", - "integrity": "sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.4.tgz", + "integrity": "sha512-h8Vx6MdxwWI2WM8/zREHMoqdgLNXEL4QX3MWSVMdyNJGvXVOs+6lp+m2hc3FnuMHDc4poxFNI20vCk0OmI4G0Q==", "dev": true, "requires": { "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", + "debug": "^4.3.2", + "espree": "^9.0.0", "globals": "^13.9.0", "ignore": "^4.0.6", "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", + "js-yaml": "^4.1.0", "minimatch": "^3.0.4", "strip-json-comments": "^3.1.1" }, "dependencies": { + "debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, "globals": { - "version": "13.9.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz", - "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==", + "version": "13.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", + "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -343,6 +371,23 @@ } } }, + "@humanwhocodes/config-array": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.6.0.tgz", + "integrity": "sha512-JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A==", + "dev": true, + "requires": { + "@humanwhocodes/object-schema": "^1.2.0", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + } + }, + "@humanwhocodes/object-schema": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", + "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "dev": true + }, "@nodelib/fs.scandir": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", @@ -389,9 +434,9 @@ } }, "@types/json-schema": { - "version": "7.0.7", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz", - "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==", + "version": "7.0.9", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", + "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", "dev": true }, "@types/json5": { @@ -434,71 +479,71 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.1.tgz", - "integrity": "sha512-aoIusj/8CR+xDWmZxARivZjbMBQTT9dImUtdZ8tVCVRXgBUuuZyM5Of5A9D9arQPxbi/0rlJLcuArclz/rCMJw==", + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz", + "integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.26.1", - "@typescript-eslint/scope-manager": "4.26.1", + "@typescript-eslint/experimental-utils": "4.33.0", + "@typescript-eslint/scope-manager": "4.33.0", "debug": "^4.3.1", "functional-red-black-tree": "^1.0.1", - "lodash": "^4.17.21", + "ignore": "^5.1.8", "regexpp": "^3.1.0", "semver": "^7.3.5", "tsutils": "^3.21.0" } }, "@typescript-eslint/experimental-utils": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.1.tgz", - "integrity": "sha512-sQHBugRhrXzRCs9PaGg6rowie4i8s/iD/DpTB+EXte8OMDfdCG5TvO73XlO9Wc/zi0uyN4qOmX9hIjQEyhnbmQ==", + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz", + "integrity": "sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==", "dev": true, "requires": { "@types/json-schema": "^7.0.7", - "@typescript-eslint/scope-manager": "4.26.1", - "@typescript-eslint/types": "4.26.1", - "@typescript-eslint/typescript-estree": "4.26.1", + "@typescript-eslint/scope-manager": "4.33.0", + "@typescript-eslint/types": "4.33.0", + "@typescript-eslint/typescript-estree": "4.33.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" } }, "@typescript-eslint/parser": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.1.tgz", - "integrity": "sha512-q7F3zSo/nU6YJpPJvQveVlIIzx9/wu75lr6oDbDzoeIRWxpoc/HQ43G4rmMoCc5my/3uSj2VEpg/D83LYZF5HQ==", + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz", + "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.26.1", - "@typescript-eslint/types": "4.26.1", - "@typescript-eslint/typescript-estree": "4.26.1", + "@typescript-eslint/scope-manager": "4.33.0", + "@typescript-eslint/types": "4.33.0", + "@typescript-eslint/typescript-estree": "4.33.0", "debug": "^4.3.1" } }, "@typescript-eslint/scope-manager": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.1.tgz", - "integrity": "sha512-TW1X2p62FQ8Rlne+WEShyd7ac2LA6o27S9i131W4NwDSfyeVlQWhw8ylldNNS8JG6oJB9Ha9Xyc+IUcqipvheQ==", + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz", + "integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==", "dev": true, "requires": { - "@typescript-eslint/types": "4.26.1", - "@typescript-eslint/visitor-keys": "4.26.1" + "@typescript-eslint/types": "4.33.0", + "@typescript-eslint/visitor-keys": "4.33.0" } }, "@typescript-eslint/types": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.1.tgz", - "integrity": "sha512-STyMPxR3cS+LaNvS8yK15rb8Y0iL0tFXq0uyl6gY45glyI7w0CsyqyEXl/Fa0JlQy+pVANeK3sbwPneCbWE7yg==", + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz", + "integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.1.tgz", - "integrity": "sha512-l3ZXob+h0NQzz80lBGaykdScYaiEbFqznEs99uwzm8fPHhDjwaBFfQkjUC/slw6Sm7npFL8qrGEAMxcfBsBJUg==", + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz", + "integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==", "dev": true, "requires": { - "@typescript-eslint/types": "4.26.1", - "@typescript-eslint/visitor-keys": "4.26.1", + "@typescript-eslint/types": "4.33.0", + "@typescript-eslint/visitor-keys": "4.33.0", "debug": "^4.3.1", "globby": "^11.0.3", "is-glob": "^4.0.1", @@ -507,12 +552,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.1.tgz", - "integrity": "sha512-IGouNSSd+6x/fHtYRyLOM6/C+QxMDzWlDtN41ea+flWuSF9g02iqcIlX8wM53JkfljoIjP0U+yp7SiTS1onEkw==", + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz", + "integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.26.1", + "@typescript-eslint/types": "4.33.0", "eslint-visitor-keys": "^2.0.0" } }, @@ -523,20 +568,20 @@ "dev": true }, "@wordpress/eslint-plugin": { - "version": "9.0.6", - "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-9.0.6.tgz", - "integrity": "sha512-ytkG93uzlHlItPR2MDkhUXtnnyw80rwSFZDovsHvMKrB9JjDem2pZnnUjwIOl+zb/9nittUJw6HA5AwCBDw+MQ==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-9.2.0.tgz", + "integrity": "sha512-x0vI4EWeG20TyewXdiyUhGSJRqXR8vw47WZjzdmL8iuitDCoyWkKe73wtEs/mWLDrSNms8S0bTnp0dK6UAMXJw==", "dev": true, "requires": { - "@typescript-eslint/eslint-plugin": "^4.15.0", - "@typescript-eslint/parser": "^4.15.0", - "@wordpress/prettier-config": "^1.0.5", + "@typescript-eslint/eslint-plugin": "^4.31.0", + "@typescript-eslint/parser": "^4.31.0", + "@wordpress/prettier-config": "^1.1.1", "babel-eslint": "^10.1.0", "cosmiconfig": "^7.0.0", "eslint-config-prettier": "^7.1.0", - "eslint-plugin-import": "^2.22.1", + "eslint-plugin-import": "^2.23.4", "eslint-plugin-jest": "^24.1.3", - "eslint-plugin-jsdoc": "^30.7.13", + "eslint-plugin-jsdoc": "^36.0.8", "eslint-plugin-jsx-a11y": "^6.4.1", "eslint-plugin-prettier": "^3.3.0", "eslint-plugin-react": "^7.22.0", @@ -544,35 +589,62 @@ "globals": "^12.0.0", "prettier": "npm:wp-prettier@2.2.1-beta-1", "requireindex": "^1.2.0" + }, + "dependencies": { + "prettier": { + "version": "npm:wp-prettier@2.2.1-beta-1", + "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.2.1-beta-1.tgz", + "integrity": "sha512-+JHkqs9LC/JPp51yy1hzs3lQ7qeuWCwOcSzpQNeeY/G7oSpnF61vxt7hRh87zNRTr6ob2ndy0W8rVzhgrcA+Gw==", + "dev": true + } } }, "@wordpress/prettier-config": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-1.0.5.tgz", - "integrity": "sha512-kZ1EzXmDKOe+QxSJJSu70zx+x2g1awqYJjX7Z947K0affv4l8/oPA+k3SgNi3U9Q5Sbwtb5xLgDr9k0HGJSw7g==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-1.1.1.tgz", + "integrity": "sha512-qjpBK5KB2ieCLv+1fGNKRW4urf5tFN1eUn3Qy+JINxNwAx6Jj9uhfXA4AldCSnD+WkzsN2UgBvgAj5/SWwzRZQ==", "dev": true }, "@wordpress/stylelint-config": { - "version": "19.0.5", - "resolved": "https://registry.npmjs.org/@wordpress/stylelint-config/-/stylelint-config-19.0.5.tgz", - "integrity": "sha512-VI89jNS4wqr6Bd2PklGiTlrzrTH2RLQe2mHkWsYABVcFBFlsv6bTDQbO2c4xX1jd/9yYH7lEyvuzb3sHnyxMSA==", + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@wordpress/stylelint-config/-/stylelint-config-19.1.0.tgz", + "integrity": "sha512-K/wB9rhB+pH5WvDh3fV3DN5C3Bud+jPGXmnPY8fOXKMYI3twCFozK/j6sVuaJHqGp/0kKEF0hkkGh+HhD30KGQ==", "dev": true, "requires": { "stylelint-config-recommended": "^3.0.0", "stylelint-config-recommended-scss": "^4.2.0", "stylelint-scss": "^3.17.2" + }, + "dependencies": { + "stylelint-config-recommended-scss": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-4.3.0.tgz", + "integrity": "sha512-/noGjXlO8pJTr/Z3qGMoaRFK8n1BFfOqmAbX1RjTIcl4Yalr+LUb1zb9iQ7pRx1GsEBXOAm4g2z5/jou/pfMPg==", + "dev": true, + "requires": { + "stylelint-config-recommended": "^5.0.0" + }, + "dependencies": { + "stylelint-config-recommended": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-5.0.0.tgz", + "integrity": "sha512-c8aubuARSu5A3vEHLBeOSJt1udOdS+1iue7BmJDTSXoCBmfEQmmWX+59vYIj3NQdJBY6a/QRv1ozVFpaB9jaqA==", + "dev": true + } + } + } } }, "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", + "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", "dev": true }, "acorn-jsx": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", - "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true }, "ajv": { @@ -609,9 +681,9 @@ } }, "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "dev": true, "requires": { "normalize-path": "^3.0.0", @@ -619,13 +691,10 @@ } }, "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "aria-query": { "version": "4.2.2", @@ -638,16 +707,16 @@ } }, "array-includes": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz", - "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz", + "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", + "es-abstract": "^1.19.1", "get-intrinsic": "^1.1.1", - "is-string": "^1.0.5" + "is-string": "^1.0.7" }, "dependencies": { "call-bind": { @@ -661,22 +730,26 @@ } }, "es-abstract": { - "version": "1.18.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz", - "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", - "is-callable": "^1.2.3", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", - "object-inspect": "^1.10.3", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", + "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", "string.prototype.trimend": "^1.0.4", @@ -704,9 +777,9 @@ } }, "is-callable": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", - "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", "dev": true }, "is-negative-zero": { @@ -716,27 +789,19 @@ "dev": true }, "is-regex": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz", - "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "dev": true, "requires": { "call-bind": "^1.0.2", - "has-symbols": "^1.0.2" - }, - "dependencies": { - "has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", - "dev": true - } + "has-tostringtag": "^1.0.0" } }, "object-inspect": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz", - "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", + "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", "dev": true }, "string.prototype.trimend": { @@ -768,26 +833,275 @@ "dev": true }, "array.prototype.flat": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz", - "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz", + "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==", "dev": true, "requires": { - "call-bind": "^1.0.0", + "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1" + "es-abstract": "^1.19.0" + }, + "dependencies": { + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, + "es-abstract": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", + "has": "^1.0.3", + "has-symbols": "^1.0.2", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", + "is-negative-zero": "^2.0.1", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", + "object-inspect": "^1.11.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.2", + "string.prototype.trimend": "^1.0.4", + "string.prototype.trimstart": "^1.0.4", + "unbox-primitive": "^1.0.1" + }, + "dependencies": { + "has-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", + "dev": true + } + } + }, + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } + }, + "is-callable": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", + "dev": true + }, + "is-negative-zero": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz", + "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==", + "dev": true + }, + "is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + } + }, + "object-inspect": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", + "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", + "dev": true + }, + "string.prototype.trimend": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", + "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + } + }, + "string.prototype.trimstart": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", + "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + } + } } }, "array.prototype.flatmap": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz", - "integrity": "sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz", + "integrity": "sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==", "dev": true, "requires": { "call-bind": "^1.0.0", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1", - "function-bind": "^1.1.1" + "es-abstract": "^1.19.0" + }, + "dependencies": { + "es-abstract": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", + "has": "^1.0.3", + "has-symbols": "^1.0.2", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", + "is-negative-zero": "^2.0.1", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", + "object-inspect": "^1.11.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.2", + "string.prototype.trimend": "^1.0.4", + "string.prototype.trimstart": "^1.0.4", + "unbox-primitive": "^1.0.1" + }, + "dependencies": { + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + } + } + }, + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } + }, + "has-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", + "dev": true + }, + "is-callable": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", + "dev": true + }, + "is-negative-zero": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz", + "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==", + "dev": true + }, + "is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "dependencies": { + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + } + } + }, + "object-inspect": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", + "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", + "dev": true + }, + "string.prototype.trimend": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", + "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + }, + "dependencies": { + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + } + } + }, + "string.prototype.trimstart": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", + "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + }, + "dependencies": { + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + } + } + } } }, "arrify": { @@ -808,44 +1122,57 @@ "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "dev": true }, - "at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "dev": true - }, "autoprefixer": { - "version": "10.2.6", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.6.tgz", - "integrity": "sha512-8lChSmdU6dCNMCQopIf4Pe5kipkAGj/fvTMslCsih0uHpOrXOPUEVOmYMMqmw3cekQkSD7EhIeuYl5y0BLdKqg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.0.tgz", + "integrity": "sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA==", "dev": true, "requires": { - "browserslist": "^4.16.6", - "caniuse-lite": "^1.0.30001230", - "colorette": "^1.2.2", + "browserslist": "^4.17.5", + "caniuse-lite": "^1.0.30001272", "fraction.js": "^4.1.1", "normalize-range": "^0.1.2", + "picocolors": "^1.0.0", "postcss-value-parser": "^4.1.0" }, "dependencies": { + "browserslist": { + "version": "4.17.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.6.tgz", + "integrity": "sha512-uPgz3vyRTlEiCv4ee9KlsKgo2V6qPk7Jsn0KAn2OBqbqKo3iNcPEC1Ti6J4dwnz+aIRfEEEuOzC9IBk8tXUomw==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30001274", + "electron-to-chromium": "^1.3.886", + "escalade": "^3.1.1", + "node-releases": "^2.0.1", + "picocolors": "^1.0.0" + } + }, "caniuse-lite": { - "version": "1.0.30001235", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001235.tgz", - "integrity": "sha512-zWEwIVqnzPkSAXOUlQnPW2oKoYb2aLQ4Q5ejdjBcnH63rfypaW34CxaeBn1VMya2XaEU3P/R2qHpWyj+l0BT1A==", + "version": "1.0.30001278", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001278.tgz", + "integrity": "sha512-mpF9KeH8u5cMoEmIic/cr7PNS+F5LWBk0t2ekGT60lFf0Wq+n9LspAj0g3P+o7DQhD3sUdlMln4YFAWhFYn9jg==", "dev": true }, - "colorette": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", + "electron-to-chromium": { + "version": "1.3.890", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.890.tgz", + "integrity": "sha512-VWlVXSkv0cA/OOehrEyqjUTHwV8YXCPTfPvbtoeU2aHR21vI4Ejh5aC4AxUwOmbLbBgb6Gd3URZahoCxtBqCYQ==", + "dev": true + }, + "node-releases": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", + "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", "dev": true } } }, "axe-core": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.2.2.tgz", - "integrity": "sha512-OKRkKM4ojMEZRJ5UNJHmq9tht7cEnRnqKG6KyB/trYws00Xtkv12mHtlJ0SK7cmuNbrU8dPUova3ELTuilfBbw==", + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.5.tgz", + "integrity": "sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==", "dev": true }, "axobject-query": { @@ -889,9 +1216,9 @@ "dev": true }, "binary-extensions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", - "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, "brace-expansion": { @@ -973,6 +1300,18 @@ "quick-lru": "^4.0.1" } }, + "caniuse-api": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", + "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", + "dev": true, + "requires": { + "browserslist": "^4.0.0", + "caniuse-lite": "^1.0.0", + "lodash.memoize": "^4.1.2", + "lodash.uniq": "^4.5.0" + } + }, "caniuse-lite": { "version": "1.0.30001164", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001164.tgz", @@ -1009,28 +1348,28 @@ "dev": true }, "chokidar": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", - "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", + "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", "dev": true, "requires": { - "anymatch": "~3.1.1", + "anymatch": "~3.1.2", "braces": "~3.0.2", - "fsevents": "~2.1.2", - "glob-parent": "~5.1.0", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.5.0" + "readdirp": "~3.6.0" } }, "chokidar-cli": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/chokidar-cli/-/chokidar-cli-2.1.0.tgz", - "integrity": "sha512-6n21AVpW6ywuEPoxJcLXMA2p4T+SLjWsXKny/9yTWFz0kKxESI3eUylpeV97LylING/27T/RVTY0f2/0QaWq9Q==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chokidar-cli/-/chokidar-cli-3.0.0.tgz", + "integrity": "sha512-xVW+Qeh7z15uZRxHOkP93Ux8A0xbPzwK4GaqD8dQOYc34TlkqUhVSS59fK36DOp5WdJlrRzlYSy02Ht99FjZqQ==", "dev": true, "requires": { - "chokidar": "^3.2.3", + "chokidar": "^3.5.2", "lodash.debounce": "^4.0.8", "lodash.throttle": "^4.1.1", "yargs": "^13.3.0" @@ -1078,9 +1417,9 @@ "dev": true }, "comment-parser": { - "version": "0.7.6", - "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-0.7.6.tgz", - "integrity": "sha512-GKNxVA7/iuTnAqGADlTWX4tkhzxZKXp5fLJqKTlQLHkE65XDUKutZ3BHaJC5IGcper2tT3QRD1xr4o3jNpgXXg==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.2.4.tgz", + "integrity": "sha512-pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw==", "dev": true }, "concat-map": { @@ -1099,9 +1438,9 @@ } }, "core-js-pure": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.14.0.tgz", - "integrity": "sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==", + "version": "3.19.1", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.1.tgz", + "integrity": "sha512-Q0Knr8Es84vtv62ei6/6jXH/7izKmOrtrxH9WJTHLCMAVeU+8TF8z8Nr08CsH4Ot0oJKzBzJJL9SJBYIv7WlfQ==", "dev": true }, "cosmiconfig": { @@ -1134,6 +1473,12 @@ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true }, + "cssnano-utils": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-2.0.1.tgz", + "integrity": "sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ==", + "dev": true + }, "damerau-levenshtein": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz", @@ -1174,9 +1519,9 @@ } }, "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, "define-properties": { @@ -1189,9 +1534,9 @@ } }, "dependency-graph": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.9.0.tgz", - "integrity": "sha512-9YLIBURXj4DJMFALxXw9K3Y3rwb5Fk0X5/8ipCzaN84+gKxoHK43tVKRNakCQbiEx07E8Uwhuq21BpUagFhZ8w==", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz", + "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==", "dev": true }, "dir-glob": { @@ -1341,36 +1686,36 @@ "dev": true }, "eslint": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz", - "integrity": "sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.2.0.tgz", + "integrity": "sha512-erw7XmM+CLxTOickrimJ1SiF55jiNlVSp2qqm0NuBWPtHYQCegD5ZMaW0c3i5ytPqL+SSLaCxdvQXFPLJn+ABw==", "dev": true, "requires": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.2", + "@eslint/eslintrc": "^1.0.4", + "@humanwhocodes/config-array": "^0.6.0", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", - "debug": "^4.0.1", + "debug": "^4.3.2", "doctrine": "^3.0.0", "enquirer": "^2.3.5", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.1", + "eslint-scope": "^6.0.0", + "eslint-utils": "^3.0.0", + "eslint-visitor-keys": "^3.0.0", + "espree": "^9.0.0", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.1.2", + "glob-parent": "^6.0.1", "globals": "^13.6.0", "ignore": "^4.0.6", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", + "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", @@ -1378,28 +1723,18 @@ "natural-compare": "^1.4.0", "optionator": "^0.9.1", "progress": "^2.0.0", - "regexpp": "^3.1.0", + "regexpp": "^3.2.0", "semver": "^7.2.1", - "strip-ansi": "^6.0.0", + "strip-ansi": "^6.0.1", "strip-json-comments": "^3.1.0", - "table": "^6.0.9", "text-table": "^0.2.0", "v8-compile-cache": "^2.0.3" }, "dependencies": { - "@babel/code-frame": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", - "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dev": true, - "requires": { - "@babel/highlight": "^7.10.4" - } - }, "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { @@ -1412,9 +1747,9 @@ } }, "chalk": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -1436,6 +1771,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, "doctrine": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", @@ -1451,27 +1795,52 @@ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true }, - "eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "eslint-scope": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-6.0.0.tgz", + "integrity": "sha512-uRDL9MWmQCkaFus8RF5K9/L/2fn+80yoW3jkD53l4shjCh26fCtvJGasxjUqP5OT87SYTxCVA3BwTUzuELx9kA==", + "dev": true, + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + } + }, + "eslint-visitor-keys": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", + "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", + "dev": true + }, + "estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true + }, + "glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, "requires": { - "eslint-visitor-keys": "^1.1.0" + "is-glob": "^4.0.3" }, "dependencies": { - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true + "is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } } } }, "globals": { - "version": "13.9.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz", - "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==", + "version": "13.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", + "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -1490,12 +1859,12 @@ "dev": true }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^5.0.1" } }, "supports-color": { @@ -1522,39 +1891,44 @@ "dev": true }, "eslint-import-resolver-node": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz", - "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==", + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz", + "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==", "dev": true, "requires": { - "debug": "^2.6.9", - "resolve": "^1.13.1" + "debug": "^3.2.7", + "resolve": "^1.20.0" }, "dependencies": { "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "^2.1.1" + } + }, + "resolve": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "dev": true, + "requires": { + "is-core-module": "^2.2.0", + "path-parse": "^1.0.6" } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true } } }, "eslint-module-utils": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz", - "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz", + "integrity": "sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==", "dev": true, "requires": { "debug": "^3.2.7", + "find-up": "^2.1.0", "pkg-dir": "^2.0.0" }, "dependencies": { @@ -1570,26 +1944,24 @@ } }, "eslint-plugin-import": { - "version": "2.23.4", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz", - "integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==", + "version": "2.25.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz", + "integrity": "sha512-qCwQr9TYfoBHOFcVGKY9C9unq05uOxxdklmBXLVvcwo68y5Hta6/GzCZEMx2zQiu0woKNEER0LE7ZgaOfBU14g==", "dev": true, "requires": { - "array-includes": "^3.1.3", - "array.prototype.flat": "^1.2.4", + "array-includes": "^3.1.4", + "array.prototype.flat": "^1.2.5", "debug": "^2.6.9", "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.4", - "eslint-module-utils": "^2.6.1", - "find-up": "^2.0.0", + "eslint-import-resolver-node": "^0.3.6", + "eslint-module-utils": "^2.7.0", "has": "^1.0.3", - "is-core-module": "^2.4.0", + "is-core-module": "^2.7.0", + "is-glob": "^4.0.3", "minimatch": "^3.0.4", - "object.values": "^1.1.3", - "pkg-up": "^2.0.0", - "read-pkg-up": "^3.0.0", + "object.values": "^1.1.5", "resolve": "^1.20.0", - "tsconfig-paths": "^3.9.0" + "tsconfig-paths": "^3.11.0" }, "dependencies": { "debug": { @@ -1601,32 +1973,22 @@ "ms": "2.0.0" } }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, "is-core-module": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz", - "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", + "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", "dev": true, "requires": { "has": "^1.0.3" } }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" + "is-extglob": "^2.1.1" } }, "ms": { @@ -1635,30 +1997,6 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, "resolve": { "version": "1.20.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", @@ -1672,27 +2010,40 @@ } }, "eslint-plugin-jest": { - "version": "24.3.6", - "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz", - "integrity": "sha512-WOVH4TIaBLIeCX576rLcOgjNXqP+jNlCiEmRgFTfQtJ52DpwnIQKAVGlGPAN7CZ33bW6eNfHD6s8ZbEUTQubJg==", + "version": "24.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.7.0.tgz", + "integrity": "sha512-wUxdF2bAZiYSKBclsUMrYHH6WxiBreNjyDxbRv345TIvPeoCEgPNEn3Sa+ZrSqsf1Dl9SqqSREXMHExlMMu1DA==", "dev": true, "requires": { "@typescript-eslint/experimental-utils": "^4.0.1" } }, "eslint-plugin-jsdoc": { - "version": "30.7.13", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.13.tgz", - "integrity": "sha512-YM4WIsmurrp0rHX6XiXQppqKB8Ne5ATiZLJe2+/fkp9l9ExXFr43BbAbjZaVrpCT+tuPYOZ8k1MICARHnURUNQ==", + "version": "36.1.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.1.tgz", + "integrity": "sha512-nuLDvH1EJaKx0PCa9oeQIxH6pACIhZd1gkalTUxZbaxxwokjs7TplqY0Q8Ew3CoZaf5aowm0g/Z3JGHCatt+gQ==", "dev": true, "requires": { - "comment-parser": "^0.7.6", - "debug": "^4.3.1", - "jsdoctypeparser": "^9.0.0", - "lodash": "^4.17.20", - "regextras": "^0.7.1", - "semver": "^7.3.4", + "@es-joy/jsdoccomment": "0.10.8", + "comment-parser": "1.2.4", + "debug": "^4.3.2", + "esquery": "^1.4.0", + "jsdoc-type-pratt-parser": "^1.1.1", + "lodash": "^4.17.21", + "regextras": "^0.8.0", + "semver": "^7.3.5", "spdx-expression-parse": "^3.0.1" + }, + "dependencies": { + "debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + } } }, "eslint-plugin-jsx-a11y": { @@ -1715,34 +2066,42 @@ } }, "eslint-plugin-prettier": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz", - "integrity": "sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz", + "integrity": "sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==", "dev": true, "requires": { "prettier-linter-helpers": "^1.0.0" } }, "eslint-plugin-react": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz", - "integrity": "sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==", + "version": "7.26.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz", + "integrity": "sha512-Lug0+NOFXeOE+ORZ5pbsh6mSKjBKXDXItUD2sQoT+5Yl0eoT82DqnXeTMfUare4QVCn9QwXbfzO/dBLjLXwVjQ==", "dev": true, "requires": { "array-includes": "^3.1.3", "array.prototype.flatmap": "^1.2.4", "doctrine": "^2.1.0", - "has": "^1.0.3", + "estraverse": "^5.2.0", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.0.4", "object.entries": "^1.1.4", "object.fromentries": "^2.0.4", + "object.hasown": "^1.0.0", "object.values": "^1.1.4", "prop-types": "^15.7.2", "resolve": "^2.0.0-next.3", + "semver": "^6.3.0", "string.prototype.matchall": "^4.0.5" }, "dependencies": { + "estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true + }, "resolve": { "version": "2.0.0-next.3", "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz", @@ -1752,6 +2111,12 @@ "is-core-module": "^2.2.0", "path-parse": "^1.0.6" } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true } } }, @@ -1787,30 +2152,24 @@ "dev": true }, "espree": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", - "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.0.0.tgz", + "integrity": "sha512-r5EQJcYZ2oaGbeR0jR0fFVijGOcwai07/690YRXLINuhmVeRY4UKSAsQPe/0BNuDgwP7Ophoc1PRsr2E3tkbdQ==", "dev": true, "requires": { - "acorn": "^7.4.0", + "acorn": "^8.5.0", "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" + "eslint-visitor-keys": "^3.0.0" }, "dependencies": { "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", + "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", "dev": true } } }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, "esquery": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", @@ -1821,9 +2180,9 @@ }, "dependencies": { "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true } } @@ -1838,9 +2197,9 @@ }, "dependencies": { "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true } } @@ -1944,12 +2303,12 @@ } }, "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "^3.0.0" + "locate-path": "^2.0.0" } }, "flat-cache": { @@ -1975,12 +2334,11 @@ "dev": true }, "fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", + "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", "dev": true, "requires": { - "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" @@ -1993,9 +2351,9 @@ "dev": true }, "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "optional": true }, @@ -2040,6 +2398,39 @@ "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", "dev": true }, + "get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + }, + "dependencies": { + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } + } + } + }, "glob": { "version": "7.1.7", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", @@ -2171,6 +2562,23 @@ "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", "dev": true }, + "has-tostringtag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.2" + }, + "dependencies": { + "has-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", + "dev": true + } + } + }, "hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", @@ -2332,10 +2740,13 @@ "dev": true }, "is-bigint": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz", - "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==", - "dev": true + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, + "requires": { + "has-bigints": "^1.0.1" + } }, "is-binary-path": { "version": "2.1.0", @@ -2347,12 +2758,13 @@ } }, "is-boolean-object": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz", - "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", "dev": true, "requires": { - "call-bind": "^1.0.2" + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" }, "dependencies": { "call-bind": { @@ -2451,10 +2863,13 @@ "dev": true }, "is-number-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz", - "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==", - "dev": true + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz", + "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==", + "dev": true, + "requires": { + "has-tostringtag": "^1.0.0" + } }, "is-plain-obj": { "version": "2.1.0", @@ -2477,12 +2892,21 @@ "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==", "dev": true }, - "is-string": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz", - "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==", + "is-shared-array-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz", + "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==", "dev": true }, + "is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, + "requires": { + "has-tostringtag": "^1.0.0" + } + }, "is-symbol": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", @@ -2504,6 +2928,15 @@ "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true }, + "is-weakref": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz", + "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.0" + } + }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -2517,19 +2950,18 @@ "dev": true }, "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "^2.0.1" } }, - "jsdoctypeparser": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz", - "integrity": "sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==", + "jsdoc-type-pratt-parser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.2.0.tgz", + "integrity": "sha512-4STjeF14jp4bqha44nKMY1OUI6d2/g6uclHWUCZ7B4DoLzaB5bmpTkQrpqU+vSVzMD0LsKAOskcnI3I3VfIpmg==", "dev": true }, "jsesc": { @@ -2582,12 +3014,12 @@ } }, "jsx-ast-utils": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz", - "integrity": "sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz", + "integrity": "sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==", "dev": true, "requires": { - "array-includes": "^3.1.2", + "array-includes": "^3.1.3", "object.assign": "^4.1.2" } }, @@ -2628,6 +3060,12 @@ "type-check": "~0.4.0" } }, + "lilconfig": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz", + "integrity": "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==", + "dev": true + }, "lines-and-columns": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", @@ -2659,12 +3097,12 @@ } }, "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "^3.0.0", + "p-locate": "^2.0.0", "path-exists": "^3.0.0" } }, @@ -2710,6 +3148,12 @@ "integrity": "sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E=", "dev": true }, + "lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", + "dev": true + }, "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -2734,6 +3178,12 @@ "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", "dev": true }, + "lodash.uniq": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", + "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", + "dev": true + }, "log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -3098,12 +3548,6 @@ } } }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -3111,9 +3555,9 @@ "dev": true }, "nanoid": { - "version": "3.1.23", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz", - "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==", + "version": "3.1.30", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", + "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==", "dev": true }, "natural-compare": { @@ -3276,15 +3720,133 @@ "object-keys": "^1.1.1" } }, - "object.entries": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz", - "integrity": "sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==", + "object.entries": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz", + "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.1" + }, + "dependencies": { + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, + "es-abstract": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", + "has": "^1.0.3", + "has-symbols": "^1.0.2", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", + "is-negative-zero": "^2.0.1", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", + "object-inspect": "^1.11.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.2", + "string.prototype.trimend": "^1.0.4", + "string.prototype.trimstart": "^1.0.4", + "unbox-primitive": "^1.0.1" + }, + "dependencies": { + "has-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", + "dev": true + } + } + }, + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } + }, + "is-callable": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", + "dev": true + }, + "is-negative-zero": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz", + "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==", + "dev": true + }, + "is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + } + }, + "object-inspect": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", + "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", + "dev": true + }, + "string.prototype.trimend": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", + "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + } + }, + "string.prototype.trimstart": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", + "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + } + } + } + }, + "object.fromentries": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz", + "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.2" + "es-abstract": "^1.19.1" }, "dependencies": { "call-bind": { @@ -3298,22 +3860,26 @@ } }, "es-abstract": { - "version": "1.18.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz", - "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", - "is-callable": "^1.2.3", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", - "object-inspect": "^1.10.3", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", + "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", "string.prototype.trimend": "^1.0.4", @@ -3341,9 +3907,9 @@ } }, "is-callable": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", - "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", "dev": true }, "is-negative-zero": { @@ -3353,27 +3919,19 @@ "dev": true }, "is-regex": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz", - "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "dev": true, "requires": { "call-bind": "^1.0.2", - "has-symbols": "^1.0.2" - }, - "dependencies": { - "has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", - "dev": true - } + "has-tostringtag": "^1.0.0" } }, "object-inspect": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz", - "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", + "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", "dev": true }, "string.prototype.trimend": { @@ -3398,16 +3956,14 @@ } } }, - "object.fromentries": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.4.tgz", - "integrity": "sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==", + "object.hasown": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.0.tgz", + "integrity": "sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==", "dev": true, "requires": { - "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", - "has": "^1.0.3" + "es-abstract": "^1.19.1" }, "dependencies": { "call-bind": { @@ -3421,35 +3977,31 @@ } }, "es-abstract": { - "version": "1.18.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz", - "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", - "is-callable": "^1.2.3", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", - "object-inspect": "^1.10.3", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", + "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", "string.prototype.trimend": "^1.0.4", "string.prototype.trimstart": "^1.0.4", "unbox-primitive": "^1.0.1" - }, - "dependencies": { - "has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", - "dev": true - } } }, "get-intrinsic": { @@ -3463,10 +4015,16 @@ "has-symbols": "^1.0.1" } }, + "has-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", + "dev": true + }, "is-callable": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", - "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", "dev": true }, "is-negative-zero": { @@ -3476,27 +4034,19 @@ "dev": true }, "is-regex": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz", - "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "dev": true, "requires": { "call-bind": "^1.0.2", - "has-symbols": "^1.0.2" - }, - "dependencies": { - "has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", - "dev": true - } + "has-tostringtag": "^1.0.0" } }, "object-inspect": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz", - "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", + "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", "dev": true }, "string.prototype.trimend": { @@ -3522,14 +4072,14 @@ } }, "object.values": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz", - "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz", + "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.2" + "es-abstract": "^1.19.1" }, "dependencies": { "call-bind": { @@ -3543,22 +4093,26 @@ } }, "es-abstract": { - "version": "1.18.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz", - "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", - "is-callable": "^1.2.3", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", - "object-inspect": "^1.10.3", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", + "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", "string.prototype.trimend": "^1.0.4", @@ -3586,9 +4140,9 @@ } }, "is-callable": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", - "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", "dev": true }, "is-negative-zero": { @@ -3598,27 +4152,19 @@ "dev": true }, "is-regex": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz", - "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "dev": true, "requires": { "call-bind": "^1.0.2", - "has-symbols": "^1.0.2" - }, - "dependencies": { - "has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", - "dev": true - } + "has-tostringtag": "^1.0.0" } }, "object-inspect": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz", - "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", + "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", "dev": true }, "string.prototype.trimend": { @@ -3676,12 +4222,29 @@ } }, "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "^2.0.0" + "p-limit": "^1.1.0" + }, + "dependencies": { + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + } } }, "p-try": { @@ -3744,9 +4307,9 @@ "dev": true }, "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, "path-type": { @@ -3755,6 +4318,12 @@ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true }, + "picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + }, "picomatch": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", @@ -3780,124 +4349,17 @@ "dev": true, "requires": { "find-up": "^2.1.0" - }, - "dependencies": { - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - } - } - }, - "pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz", - "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=", - "dev": true, - "requires": { - "find-up": "^2.1.0" - }, - "dependencies": { - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - } } }, "postcss": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.0.tgz", - "integrity": "sha512-+ogXpdAjWGa+fdYY5BQ96V/6tAo+TdSSIMP5huJBIygdWwKtVoB5JWZ7yUd4xZ8r+8Kvvx4nyg/PQ071H4UtcQ==", + "version": "8.3.11", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz", + "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==", "dev": true, "requires": { - "colorette": "^1.2.2", - "nanoid": "^3.1.23", + "nanoid": "^3.1.30", + "picocolors": "^1.0.0", "source-map-js": "^0.6.2" - }, - "dependencies": { - "colorette": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", - "dev": true - } } }, "postcss-calc": { @@ -3911,29 +4373,29 @@ } }, "postcss-cli": { - "version": "8.3.1", - "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.3.1.tgz", - "integrity": "sha512-leHXsQRq89S3JC9zw/tKyiVV2jAhnfQe0J8VI4eQQbUjwIe0XxVqLrR+7UsahF1s9wi4GlqP6SJ8ydf44cgF2Q==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-9.0.2.tgz", + "integrity": "sha512-08Wujoy7YGhKCFrGsT9OXqWjtHlGQ+JmyaD/4McjCiwor2IUTRVzXiJd+xmLTGdSWjceS6/TePaJQwBlkVWHiw==", "dev": true, "requires": { - "chalk": "^4.0.0", "chokidar": "^3.3.0", - "dependency-graph": "^0.9.0", - "fs-extra": "^9.0.0", - "get-stdin": "^8.0.0", - "globby": "^11.0.0", + "dependency-graph": "^0.11.0", + "fs-extra": "^10.0.0", + "get-stdin": "^9.0.0", + "globby": "^12.0.0", + "picocolors": "^1.0.0", "postcss-load-config": "^3.0.0", "postcss-reporter": "^7.0.0", "pretty-hrtime": "^1.0.3", "read-cache": "^1.0.0", - "slash": "^3.0.0", - "yargs": "^16.0.0" + "slash": "^4.0.0", + "yargs": "^17.0.0" }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { @@ -3945,15 +4407,11 @@ "color-convert": "^2.0.1" } }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } + "array-union": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz", + "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==", + "dev": true }, "cliui": { "version": "7.0.4", @@ -3987,45 +4445,85 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "fast-glob": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + } + }, + "get-stdin": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz", + "integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==", "dev": true }, + "globby": { + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-12.0.2.tgz", + "integrity": "sha512-lAsmb/5Lww4r7MM9nCCliDZVIKbZTavrsunAsHLr9oHthrZP1qi7/gAnHOsUs9bLvEt2vKVJhHmxuL7QbDuPdQ==", + "dev": true, + "requires": { + "array-union": "^3.0.1", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.7", + "ignore": "^5.1.8", + "merge2": "^1.4.1", + "slash": "^4.0.0" + } + }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, - "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "micromatch": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", + "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", "dev": true, "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "braces": "^3.0.1", + "picomatch": "^2.2.3" } }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "picomatch": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "dev": true + }, + "slash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", + "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", + "dev": true + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" } }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { - "has-flag": "^4.0.0" + "ansi-regex": "^5.0.1" } }, "wrap-ansi": { @@ -4040,15 +4538,15 @@ } }, "y18n": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.6.tgz", - "integrity": "sha512-PlVX4Y0lDTN6E2V4ES2tEdyvXkeKzxa8c/vo0pxPr/TqbztddTP0yn7zZylIyiAuxerqj0Q5GhpJ1YJCP8LaZQ==", + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true }, "yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "version": "17.2.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.2.1.tgz", + "integrity": "sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==", "dev": true, "requires": { "cliui": "^7.0.2", @@ -4061,9 +4559,9 @@ } }, "yargs-parser": { - "version": "20.2.7", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", - "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true } } @@ -4082,51 +4580,20 @@ "postcss-custom-media": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz", - "integrity": "sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==", - "dev": true - }, - "postcss-discard-duplicates": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz", - "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==", - "dev": true - }, - "postcss-focus-within": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-4.0.0.tgz", - "integrity": "sha512-fO+5/StoHEswmdDQ7V3rhlx4i1cUOjQItae3scu8Nki5h35/fvr8J1vakFnSN4gZ7zzthflpedVsMZPDXNzxaA==", - "dev": true, - "requires": { - "postcss": "^7.0.27" - }, - "dependencies": { - "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } + "integrity": "sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==", + "dev": true + }, + "postcss-discard-duplicates": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz", + "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==", + "dev": true + }, + "postcss-focus-within": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.1.tgz", + "integrity": "sha512-50v1AZVlFSVzLTNdBQG521Aa54VABf/X1RkhR8Fm/9dDQby0W0XdwOnuo8Juvf0ZZXbKkxyTkyyQD0QaNVZVGg==", + "dev": true }, "postcss-html": { "version": "0.36.0", @@ -4146,15 +4613,20 @@ "postcss": "^7.0.14" }, "dependencies": { + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true + }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" + "picocolors": "^0.2.1", + "source-map": "^0.6.1" } }, "source-map": { @@ -4162,26 +4634,18 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, "postcss-load-config": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.0.1.tgz", - "integrity": "sha512-/pDHe30UYZUD11IeG8GWx9lNtu1ToyTsZHnyy45B4Mrwr/Kb6NgYl7k753+05CJNKnjbwh4975amoPJ+TEjHNQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.0.tgz", + "integrity": "sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g==", "dev": true, "requires": { - "cosmiconfig": "^7.0.0", - "import-cwd": "^3.0.0" + "import-cwd": "^3.0.0", + "lilconfig": "^2.0.3", + "yaml": "^1.10.2" } }, "postcss-media-query-parser": { @@ -4190,27 +4654,63 @@ "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=", "dev": true }, + "postcss-merge-rules": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.3.tgz", + "integrity": "sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg==", + "dev": true, + "requires": { + "browserslist": "^4.16.6", + "caniuse-api": "^3.0.0", + "cssnano-utils": "^2.0.1", + "postcss-selector-parser": "^6.0.5" + }, + "dependencies": { + "postcss-selector-parser": { + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz", + "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==", + "dev": true, + "requires": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + } + } + } + }, "postcss-nested": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.5.tgz", - "integrity": "sha512-GSRXYz5bccobpTzLQZXOnSOfKl6TwVr5CyAQJUPub4nuRJSOECK5AqurxVgmtxP48p0Kc/ndY/YyS1yqldX0Ew==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.6.tgz", + "integrity": "sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==", "dev": true, "requires": { - "postcss-selector-parser": "^6.0.4" + "postcss-selector-parser": "^6.0.6" + }, + "dependencies": { + "postcss-selector-parser": { + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz", + "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==", + "dev": true, + "requires": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + } + } } }, "postcss-reporter": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.2.tgz", - "integrity": "sha512-JyQ96NTQQsso42y6L1H1RqHfWH1C3Jr0pt91mVv5IdYddZAE9DUZxuferNgk6q0o6vBVOrfVJb10X1FgDzjmDw==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.4.tgz", + "integrity": "sha512-jY/fnpGSin7kwJeunXbY35STp5O3VIxSFdjee5JkoPQ+FfGH5JW3N+Xe9oAPcL9UkjWjkK+JC72o8XH4XXKdhw==", "dev": true, "requires": { - "colorette": "^1.2.1", "lodash.difference": "^4.5.0", "lodash.forown": "^4.4.0", "lodash.get": "^4.4.2", "lodash.groupby": "^4.6.0", - "lodash.sortby": "^4.7.0" + "lodash.sortby": "^4.7.0", + "picocolors": "^1.0.0" } }, "postcss-resolve-nested-selector": { @@ -4228,15 +4728,20 @@ "postcss": "^7.0.26" }, "dependencies": { + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true + }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" + "picocolors": "^0.2.1", + "source-map": "^0.6.1" } }, "source-map": { @@ -4244,15 +4749,6 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, @@ -4266,15 +4762,20 @@ "postcss": "^7.0.21" }, "dependencies": { + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true + }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" + "picocolors": "^0.2.1", + "source-map": "^0.6.1" } }, "source-map": { @@ -4282,15 +4783,6 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, @@ -4303,15 +4795,20 @@ "postcss": "^7.0.6" }, "dependencies": { + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true + }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" + "picocolors": "^0.2.1", + "source-map": "^0.6.1" } }, "source-map": { @@ -4319,15 +4816,6 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, @@ -4361,12 +4849,6 @@ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true }, - "prettier": { - "version": "npm:wp-prettier@2.2.1-beta-1", - "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.2.1-beta-1.tgz", - "integrity": "sha512-+JHkqs9LC/JPp51yy1hzs3lQ7qeuWCwOcSzpQNeeY/G7oSpnF61vxt7hRh87zNRTr6ob2ndy0W8rVzhgrcA+Gw==", - "dev": true - }, "prettier-linter-helpers": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", @@ -4462,61 +4944,6 @@ } } }, - "read-pkg-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", - "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", - "dev": true, - "requires": { - "find-up": "^2.0.0", - "read-pkg": "^3.0.0" - }, - "dependencies": { - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - } - } - }, "readable-stream": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", @@ -4529,9 +4956,9 @@ } }, "readdirp": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", - "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, "requires": { "picomatch": "^2.2.1" @@ -4548,9 +4975,9 @@ } }, "regenerator-runtime": { - "version": "0.13.7", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", - "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==", + "version": "0.13.9", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", "dev": true }, "regexp.prototype.flags": { @@ -4587,15 +5014,15 @@ } }, "regexpp": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", - "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", "dev": true }, "regextras": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz", - "integrity": "sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz", + "integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==", "dev": true }, "remark": { @@ -4689,52 +5116,17 @@ } }, "rtlcss": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-3.2.0.tgz", - "integrity": "sha512-nV3UmaTmA5TkP2dYOR16ULu6FkMOqZRbiXbFZnmWIN9coPfx3gin31VGOPV7vrVMPjNds7pCS2UYy0mwQUdFCQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-3.5.0.tgz", + "integrity": "sha512-wzgMaMFHQTnyi9YOwsx9LjOxYXJPzS8sYnFaKm6R5ysvTkwzHiB0vxnbHwchHQT65PTdBjDG21/kQBWI7q9O7A==", "dev": true, "requires": { - "chalk": "^4.1.0", "find-up": "^5.0.0", - "mkdirp": "^1.0.4", - "postcss": "^8.2.4", + "picocolors": "^1.0.0", + "postcss": "^8.3.11", "strip-json-comments": "^3.1.1" }, "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -4745,12 +5137,6 @@ "path-exists": "^4.0.0" } }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, "locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -4783,15 +5169,6 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } } } }, @@ -4811,9 +5188,9 @@ "dev": true }, "sass": { - "version": "1.34.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.1.tgz", - "integrity": "sha512-scLA7EIZM+MmYlej6sdVr0HRbZX5caX5ofDT9asWnUJj21oqgsC+1LuNfm0eg+vM0fCTZHhwImTiCU0sx9h9CQ==", + "version": "1.43.4", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.43.4.tgz", + "integrity": "sha512-/ptG7KE9lxpGSYiXn7Ar+lKOv37xfWsZRtFYal2QHNigyVQDx685VFT/h7ejVr+R8w7H4tmUgtulsKl5YpveOg==", "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0" @@ -4984,12 +5361,6 @@ "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==", "dev": true }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, "string-width": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", @@ -5010,14 +5381,14 @@ } }, "string.prototype.matchall": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz", - "integrity": "sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz", + "integrity": "sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.2", + "es-abstract": "^1.19.1", "get-intrinsic": "^1.1.1", "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", @@ -5036,22 +5407,26 @@ } }, "es-abstract": { - "version": "1.18.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz", - "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", - "is-callable": "^1.2.3", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", - "object-inspect": "^1.10.3", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", + "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", "string.prototype.trimend": "^1.0.4", @@ -5077,9 +5452,9 @@ "dev": true }, "is-callable": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", - "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", "dev": true }, "is-negative-zero": { @@ -5089,19 +5464,19 @@ "dev": true }, "is-regex": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz", - "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "dev": true, "requires": { "call-bind": "^1.0.2", - "has-symbols": "^1.0.2" + "has-tostringtag": "^1.0.0" } }, "object-inspect": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz", - "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", + "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", "dev": true }, "string.prototype.trimend": { @@ -5267,9 +5642,9 @@ }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { @@ -5361,6 +5736,12 @@ "picomatch": "^2.2.3" } }, + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true + }, "picomatch": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", @@ -5368,77 +5749,13 @@ "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } + "picocolors": "^0.2.1", + "source-map": "^0.6.1" } }, "postcss-selector-parser": { @@ -5501,18 +5818,57 @@ "dev": true }, "stylelint-config-recommended-scss": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-4.2.0.tgz", - "integrity": "sha512-4bI5BYbabo/GCQ6LbRZx/ZlVkK65a1jivNNsD+ix/Lw0U3iAch+jQcvliGnnAX8SUPaZ0UqzNVNNAF3urswa7g==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-5.0.1.tgz", + "integrity": "sha512-kVI5lX8jtaw9uNnnxxziw+LhW59m0x/JzGj8zVepeFQJ56eM4HazN4gMyCRQQSLr/8CXlIHGOW34CV5hIMr3FQ==", "dev": true, "requires": { - "stylelint-config-recommended": "^3.0.0" + "postcss-scss": "^4.0.1", + "stylelint-config-recommended": "^6.0.0", + "stylelint-scss": "^4.0.0" + }, + "dependencies": { + "postcss-scss": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.2.tgz", + "integrity": "sha512-xfdkU128CkKKKVAwkyt0M8OdnelJ3MRcIRAPPQkRpoPeuzWY3RIeg7piRCpZ79MK7Q16diLXMMAD9dN5mauPlQ==", + "dev": true + }, + "postcss-selector-parser": { + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz", + "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==", + "dev": true, + "requires": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + } + }, + "stylelint-config-recommended": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz", + "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==", + "dev": true + }, + "stylelint-scss": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.0.0.tgz", + "integrity": "sha512-lIRhPqtI6I065EJ6aI4mWKsmQt8Krnu6aF9XSL9s8Nd2f/cDKImST0T9TfjnUul3ReKYWozkG9dlpNTZH2FB9w==", + "dev": true, + "requires": { + "lodash": "^4.17.15", + "postcss-media-query-parser": "^0.2.3", + "postcss-resolve-nested-selector": "^0.1.1", + "postcss-selector-parser": "^6.0.6", + "postcss-value-parser": "^4.1.0" + } + } } }, "stylelint-scss": { - "version": "3.19.0", - "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.19.0.tgz", - "integrity": "sha512-Ic5bsmpS4wVucOw44doC1Yi9f5qbeVL4wPFiEOaUElgsOuLEN6Ofn/krKI8BeNL2gAn53Zu+IcVV4E345r6rBw==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.21.0.tgz", + "integrity": "sha512-CMI2wSHL+XVlNExpauy/+DbUcB/oUZLARDtMIXkpV/5yd8nthzylYd1cdHeDMJVBXeYHldsnebUX6MoV5zPW4A==", "dev": true, "requires": { "lodash": "^4.17.15", @@ -5531,15 +5887,20 @@ "postcss": "^7.0.2" }, "dependencies": { + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true + }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" + "picocolors": "^0.2.1", + "source-map": "^0.6.1" } }, "source-map": { @@ -5547,15 +5908,6 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, @@ -5601,9 +5953,9 @@ } }, "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "emoji-regex": { @@ -5680,9 +6032,9 @@ "dev": true }, "tsconfig-paths": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", - "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz", + "integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==", "dev": true, "requires": { "@types/json5": "^0.0.29", @@ -5917,9 +6269,9 @@ } }, "y18n": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", - "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", "dev": true }, "yallist": { @@ -5950,6 +6302,36 @@ "which-module": "^2.0.0", "y18n": "^4.0.0", "yargs-parser": "^13.1.2" + }, + "dependencies": { + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + } } }, "yargs-parser": { diff --git a/src/wp-content/themes/twentytwentyone/package.json b/src/wp-content/themes/twentytwentyone/package.json index 558a4fdb04..405262b4de 100644 --- a/src/wp-content/themes/twentytwentyone/package.json +++ b/src/wp-content/themes/twentytwentyone/package.json @@ -1,6 +1,6 @@ { "name": "twentytwentyone", - "version": "1.4.0", + "version": "1.5.0", "description": "Default WP Theme", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", @@ -14,25 +14,26 @@ "homepage": "https://wordpress.org/themes/twentytwentyone/", "devDependencies": { "@wordpress/browserslist-config": "^4.0.1", - "@wordpress/eslint-plugin": "^9.0.6", - "@wordpress/stylelint-config": "^19.0.5", - "autoprefixer": "^10.2.6", - "chokidar-cli": "^2.1.0", - "eslint": "^7.28.0", + "@wordpress/eslint-plugin": "^9.2.0", + "@wordpress/stylelint-config": "^19.1.0", + "autoprefixer": "^10.4.0", + "chokidar-cli": "^3.0.0", + "eslint": "^8.2.0", "minimist": "^1.2.2", "npm-run-all": "^4.1.5", "postcss-calc": "^8.0.0", - "postcss-cli": "^8.3.1", - "postcss": "^8.3.0", + "postcss-cli": "^9.0.2", + "postcss": "^8.3.11", "postcss-css-variables": "^0.18.0", "postcss-custom-media": "^8.0.0", "postcss-discard-duplicates": "^5.0.1", - "postcss-focus-within": "^4.0.0", - "postcss-nested": "^5.0.5", - "rtlcss": "^3.2.0", - "sass": "^1.34.1", + "postcss-focus-within": "^5.0.1", + "postcss-merge-rules": "^5.0.3", + "postcss-nested": "^5.0.6", + "rtlcss": "^3.5.0", + "sass": "^1.43.4", "stylelint": "^13.13.1", - "stylelint-config-recommended-scss": "^4.2.0" + "stylelint-config-recommended-scss": "^5.0.1" }, "rtlcssConfig": { "options": { diff --git a/src/wp-content/themes/twentytwentyone/postcss.config.js b/src/wp-content/themes/twentytwentyone/postcss.config.js index c291aae9e6..d889f314ba 100644 --- a/src/wp-content/themes/twentytwentyone/postcss.config.js +++ b/src/wp-content/themes/twentytwentyone/postcss.config.js @@ -8,6 +8,7 @@ module.exports = { require('postcss-calc')({ precision: 0 }), - require('postcss-discard-duplicates') + require('postcss-discard-duplicates'), + require('postcss-merge-rules') ] }; diff --git a/src/wp-content/themes/twentytwentyone/readme.txt b/src/wp-content/themes/twentytwentyone/readme.txt index 29dc5b8dff..23b782b6bf 100644 --- a/src/wp-content/themes/twentytwentyone/readme.txt +++ b/src/wp-content/themes/twentytwentyone/readme.txt @@ -1,9 +1,9 @@ === Twenty Twenty-One === Contributors: wordpressdotorg Requires at least: 5.3 -Tested up to: 5.8 +Tested up to: 5.9 Requires PHP: 5.6 -Stable tag: 1.4 +Stable tag: 1.5 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -30,6 +30,11 @@ No data is saved in the database or transferred. == Changelog == += 1.5 = +* Released: January 25, 2022 + +https://wordpress.org/support/article/twenty-twenty-one-changelog#Version_1.5 + = 1.4 = * Released: July 20, 2021 @@ -57,7 +62,7 @@ https://wordpress.org/support/article/twenty-twenty-one-changelog#Version_1.0 == Copyright == -Twenty Twenty-One WordPress Theme, 2020-2021 WordPress.org +Twenty Twenty-One WordPress Theme, 2020-2022 WordPress.org Twenty Twenty-One is distributed under the terms of the GNU GPL. This program is free software: you can redistribute it and/or modify @@ -75,19 +80,19 @@ Twenty Twenty-One is derived from Seedlet, (C) 2020 Automattic, Inc. Twenty Twenty-One is also based on: -Twenty Nineteen. 2018-2021 WordPress.org +Twenty Nineteen. 2018-2022 WordPress.org Twenty Nineteen is distributed under the terms of the GNU GPL v2 or later. -Twenty Seventeen. Copyright (C) 2016-2021 WordPress.org +Twenty Seventeen. Copyright (C) 2016-2022 WordPress.org Twenty Seventeen is distributed under the terms of the GNU GPL v2 or later. -Twenty Sixteen. Copyright (C) 2015-2021 WordPress.org +Twenty Sixteen. Copyright (C) 2015-2022 WordPress.org Twenty Sixteen is distributed under the terms of the GNU GPL v2 or later. -Twenty Twenty. Copyright (C) 2020-2021 WordPress.org +Twenty Twenty. Copyright (C) 2020-2022 WordPress.org Twenty Twenty is distributed under the terms of the GNU GPL v2 or later. -Underscores https://underscores.me/, Copyright (C) 2012-2021 Automattic, Inc. +Underscores https://underscores.me/, Copyright (C) 2012-2022 Automattic, Inc. Underscores is distributed under the terms of the GNU GPL v2 or later. Normalizing styles have been helped along thanks to the fine work of diff --git a/src/wp-content/themes/twentytwentyone/style-rtl.css b/src/wp-content/themes/twentytwentyone/style-rtl.css index 9ef3535644..4da41840a0 100644 --- a/src/wp-content/themes/twentytwentyone/style-rtl.css +++ b/src/wp-content/themes/twentytwentyone/style-rtl.css @@ -7,9 +7,9 @@ Author: the WordPress team Author URI: https://wordpress.org/ Description: Twenty Twenty-One is a blank canvas for your ideas and it makes the block editor your best brush. With new block patterns, which allow you to create a beautiful layout in a matter of seconds, this theme’s soft colors and eye-catching — yet timeless — design will let your work shine. Take it for a spin! See how Twenty Twenty-One elevates your portfolio, business website, or personal blog. Requires at least: 5.3 -Tested up to: 5.8 +Tested up to: 5.9 Requires PHP: 5.6 -Version: 1.4 +Version: 1.5 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Text Domain: twentytwentyone @@ -2104,7 +2104,7 @@ input[type=reset]:disabled, .wp-block-cover .wp-block-cover__inner-container, .wp-block-cover-image .wp-block-cover__inner-container { - width: calc(100% - calc(2 * var(--global--spacing-vertical))); + width: calc(100% - 2 * var(--global--spacing-vertical)); } .wp-block-cover .wp-block-cover__inner-container > *, @@ -2266,8 +2266,8 @@ input[type=reset]:disabled, .wp-block-group.has-background .wp-block-group__inner-container > hr.wp-block-separator:not(.is-style-dots):not(.alignwide).alignfull, .wp-block-group.is-style-twentytwentyone-border .wp-block-group__inner-container > .alignfull, .wp-block-group.is-style-twentytwentyone-border .wp-block-group__inner-container > hr.wp-block-separator:not(.is-style-dots):not(.alignwide).alignfull { - max-width: calc(var(--responsive--alignfull-width) + (2 * var(--global--spacing-vertical))); - width: calc(var(--responsive--alignfull-width) + (2 * var(--global--spacing-vertical))); + max-width: calc(var(--responsive--alignfull-width) + 2 * var(--global--spacing-vertical)); + width: calc(var(--responsive--alignfull-width) + 2 * var(--global--spacing-vertical)); margin-right: calc(-1 * var(--global--spacing-vertical)); } @@ -2592,23 +2592,23 @@ h6, @media screen and (min-width: 600px) { .wp-block-latest-posts.is-style-twentytwentyone-latest-posts-dividers.is-grid.columns-2 li { - width: calc((100% / 2)); + width: calc(100% / 2); } .wp-block-latest-posts.is-style-twentytwentyone-latest-posts-dividers.is-grid.columns-3 li { - width: calc((100% / 3)); + width: calc(100% / 3); } .wp-block-latest-posts.is-style-twentytwentyone-latest-posts-dividers.is-grid.columns-4 li { - width: calc((100% / 4)); + width: calc(100% / 4); } .wp-block-latest-posts.is-style-twentytwentyone-latest-posts-dividers.is-grid.columns-5 li { - width: calc((100% / 5)); + width: calc(100% / 5); } .wp-block-latest-posts.is-style-twentytwentyone-latest-posts-dividers.is-grid.columns-6 li { - width: calc((100% / 6)); + width: calc(100% / 6); } } @@ -3896,7 +3896,7 @@ table.wp-calendar-table caption { } .site-header.has-logo:not(.has-title-and-tagline).has-menu .site-logo img { - max-height: calc(var(--button--padding-vertical) - (0.25 * var(--global--spacing-unit)) + 1.7em); + max-height: calc(var(--button--padding-vertical) - 0.25 * var(--global--spacing-unit) + 1.7em); } .site-header.has-logo.has-title-and-tagline { @@ -3927,7 +3927,7 @@ table.wp-calendar-table caption { body:not(.primary-navigation-open) .site-header.has-logo.has-title-and-tagline .menu-button-container { position: relative; padding-top: 0; - margin-top: calc(0px - var(--button--padding-vertical) + (0.25 * var(--global--spacing-unit))); + margin-top: calc(0px - var(--button--padding-vertical) + 0.25 * var(--global--spacing-unit)); } body:not(.primary-navigation-open) .site-header.has-logo.has-title-and-tagline .menu-button-container #primary-mobile-menu { @@ -3975,6 +3975,7 @@ table.wp-calendar-table caption { font-size: var(--branding--title--font-size); } +.site-footer > .site-info .privacy-policy, .site-footer > .site-info .powered-by { margin-top: calc(0.5 * var(--global--spacing-vertical)); } @@ -3985,10 +3986,19 @@ table.wp-calendar-table caption { align-items: center; } + .site-footer > .site-info .site-name { + margin-left: calc(0.5 * var(--global--spacing-vertical)); + } + + .site-footer > .site-info .privacy-policy, .site-footer > .site-info .powered-by { margin-top: initial; margin-right: auto; } + + .site-footer > .site-info .privacy-policy + .powered-by { + margin-right: calc(0.5 * var(--global--spacing-vertical)); + } } .site-footer > .site-info a { @@ -4571,7 +4581,7 @@ h1.page-title { .comment-form > p textarea { display: block; font-size: var(--global--font-size-sm); - margin-bottom: calc(.5 * var(--global--spacing-unit)); + margin-bottom: calc(0.5 * var(--global--spacing-unit)); width: 100%; font-weight: var(--form--label-weight); } @@ -4609,7 +4619,7 @@ h1.page-title { .menu-button-container #primary-mobile-menu { display: flex; margin-right: auto; - padding: calc(var(--button--padding-vertical) - (0.25 * var(--global--spacing-unit))) calc(0.5 * var(--button--padding-horizontal)); + padding: calc(var(--button--padding-vertical) - 0.25 * var(--global--spacing-unit)) calc(0.5 * var(--button--padding-horizontal)); font-size: var(--primary-nav--font-size-button); font-weight: var(--primary-nav--font-weight-button); background-color: transparent; @@ -5185,7 +5195,7 @@ h1.page-title { flex: 0 1 auto; margin-bottom: inherit; margin-top: inherit; - max-width: calc(50% - (0.5 * var(--global--spacing-unit))); + max-width: calc(50% - 0.5 * var(--global--spacing-unit)); } .navigation .nav-links .nav-next { @@ -5237,7 +5247,7 @@ h1.page-title { @media only screen and (min-width: 822px) { .post-navigation .post-title { - margin: 5px calc(24px + (0.25 * var(--global--spacing-unit))) 0; + margin: 5px calc(24px + 0.25 * var(--global--spacing-unit)) 0; } } @media only screen and (min-width: 482px) { @@ -5417,42 +5427,6 @@ h1.page-title { } } -.widget-area ul { - list-style-type: none; - padding: 0; -} - -.widget-area ul li { - line-height: var(--widget--line-height-list); -} - -.widget-area ul.sub-menu, -.widget-area ul.children { - margin-right: var(--widget--spacing-menu); -} - -.widget-area ul .sub-menu-toggle { - display: none; -} - -.widget-area a { - color: var(--footer--color-link); - text-decoration: underline; - text-decoration-style: solid; - text-decoration-color: currentColor; -} - -.widget-area a:link, -.widget-area a:visited, -.widget-area a:active { - color: var(--footer--color-link); -} - -.widget-area a:hover { - color: var(--footer--color-link-hover); - text-decoration-style: dotted; -} - .widget-area .wp-block-social-links.alignright { margin-top: var(--global--spacing-vertical); justify-content: flex-end; @@ -5502,6 +5476,42 @@ h1.page-title { font-size: var(--global--font-size-xs); } +.widget ul { + list-style-type: none; + padding: 0; +} + +.widget ul li { + line-height: var(--widget--line-height-list); +} + +.widget ul.sub-menu, +.widget ul.children { + margin-right: var(--widget--spacing-menu); +} + +.widget ul .sub-menu-toggle { + display: none; +} + +.widget a { + color: var(--footer--color-link); + text-decoration: underline; + text-decoration-style: solid; + text-decoration-color: currentColor; +} + +.widget a:link, +.widget a:visited, +.widget a:active { + color: var(--footer--color-link); +} + +.widget a:hover { + color: var(--footer--color-link-hover); + text-decoration-style: dotted; +} + .search-form { display: flex; flex-wrap: wrap; diff --git a/src/wp-content/themes/twentytwentyone/style.css b/src/wp-content/themes/twentytwentyone/style.css index b7035bd304..fed5ec25cd 100644 --- a/src/wp-content/themes/twentytwentyone/style.css +++ b/src/wp-content/themes/twentytwentyone/style.css @@ -7,9 +7,9 @@ Author: the WordPress team Author URI: https://wordpress.org/ Description: Twenty Twenty-One is a blank canvas for your ideas and it makes the block editor your best brush. With new block patterns, which allow you to create a beautiful layout in a matter of seconds, this theme’s soft colors and eye-catching — yet timeless — design will let your work shine. Take it for a spin! See how Twenty Twenty-One elevates your portfolio, business website, or personal blog. Requires at least: 5.3 -Tested up to: 5.8 +Tested up to: 5.9 Requires PHP: 5.6 -Version: 1.4 +Version: 1.5 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Text Domain: twentytwentyone @@ -2114,7 +2114,7 @@ input[type=reset]:disabled, .wp-block-cover .wp-block-cover__inner-container, .wp-block-cover-image .wp-block-cover__inner-container { - width: calc(100% - calc(2 * var(--global--spacing-vertical))); + width: calc(100% - 2 * var(--global--spacing-vertical)); } .wp-block-cover .wp-block-cover__inner-container > *, @@ -2276,8 +2276,8 @@ input[type=reset]:disabled, .wp-block-group.has-background .wp-block-group__inner-container > hr.wp-block-separator:not(.is-style-dots):not(.alignwide).alignfull, .wp-block-group.is-style-twentytwentyone-border .wp-block-group__inner-container > .alignfull, .wp-block-group.is-style-twentytwentyone-border .wp-block-group__inner-container > hr.wp-block-separator:not(.is-style-dots):not(.alignwide).alignfull { - max-width: calc(var(--responsive--alignfull-width) + (2 * var(--global--spacing-vertical))); - width: calc(var(--responsive--alignfull-width) + (2 * var(--global--spacing-vertical))); + max-width: calc(var(--responsive--alignfull-width) + 2 * var(--global--spacing-vertical)); + width: calc(var(--responsive--alignfull-width) + 2 * var(--global--spacing-vertical)); margin-left: calc(-1 * var(--global--spacing-vertical)); } @@ -2602,23 +2602,23 @@ h6, @media screen and (min-width: 600px) { .wp-block-latest-posts.is-style-twentytwentyone-latest-posts-dividers.is-grid.columns-2 li { - width: calc((100% / 2)); + width: calc(100% / 2); } .wp-block-latest-posts.is-style-twentytwentyone-latest-posts-dividers.is-grid.columns-3 li { - width: calc((100% / 3)); + width: calc(100% / 3); } .wp-block-latest-posts.is-style-twentytwentyone-latest-posts-dividers.is-grid.columns-4 li { - width: calc((100% / 4)); + width: calc(100% / 4); } .wp-block-latest-posts.is-style-twentytwentyone-latest-posts-dividers.is-grid.columns-5 li { - width: calc((100% / 5)); + width: calc(100% / 5); } .wp-block-latest-posts.is-style-twentytwentyone-latest-posts-dividers.is-grid.columns-6 li { - width: calc((100% / 6)); + width: calc(100% / 6); } } @@ -3916,7 +3916,7 @@ table.wp-calendar-table caption { } .site-header.has-logo:not(.has-title-and-tagline).has-menu .site-logo img { - max-height: calc(var(--button--padding-vertical) - (0.25 * var(--global--spacing-unit)) + 1.7em); + max-height: calc(var(--button--padding-vertical) - 0.25 * var(--global--spacing-unit) + 1.7em); } .site-header.has-logo.has-title-and-tagline { @@ -3947,7 +3947,7 @@ table.wp-calendar-table caption { body:not(.primary-navigation-open) .site-header.has-logo.has-title-and-tagline .menu-button-container { position: relative; padding-top: 0; - margin-top: calc(0px - var(--button--padding-vertical) + (0.25 * var(--global--spacing-unit))); + margin-top: calc(0px - var(--button--padding-vertical) + 0.25 * var(--global--spacing-unit)); } body:not(.primary-navigation-open) .site-header.has-logo.has-title-and-tagline .menu-button-container #primary-mobile-menu { @@ -3995,6 +3995,7 @@ table.wp-calendar-table caption { font-size: var(--branding--title--font-size); } +.site-footer > .site-info .privacy-policy, .site-footer > .site-info .powered-by { margin-top: calc(0.5 * var(--global--spacing-vertical)); } @@ -4005,10 +4006,19 @@ table.wp-calendar-table caption { align-items: center; } + .site-footer > .site-info .site-name { + margin-right: calc(0.5 * var(--global--spacing-vertical)); + } + + .site-footer > .site-info .privacy-policy, .site-footer > .site-info .powered-by { margin-top: initial; margin-left: auto; } + + .site-footer > .site-info .privacy-policy + .powered-by { + margin-left: calc(0.5 * var(--global--spacing-vertical)); + } } .site-footer > .site-info a { @@ -4591,7 +4601,7 @@ h1.page-title { .comment-form > p textarea { display: block; font-size: var(--global--font-size-sm); - margin-bottom: calc(.5 * var(--global--spacing-unit)); + margin-bottom: calc(0.5 * var(--global--spacing-unit)); width: 100%; font-weight: var(--form--label-weight); } @@ -4629,7 +4639,7 @@ h1.page-title { .menu-button-container #primary-mobile-menu { display: flex; margin-left: auto; - padding: calc(var(--button--padding-vertical) - (0.25 * var(--global--spacing-unit))) calc(0.5 * var(--button--padding-horizontal)); + padding: calc(var(--button--padding-vertical) - 0.25 * var(--global--spacing-unit)) calc(0.5 * var(--button--padding-horizontal)); font-size: var(--primary-nav--font-size-button); font-weight: var(--primary-nav--font-weight-button); background-color: transparent; @@ -5221,7 +5231,7 @@ h1.page-title { flex: 0 1 auto; margin-bottom: inherit; margin-top: inherit; - max-width: calc(50% - (0.5 * var(--global--spacing-unit))); + max-width: calc(50% - 0.5 * var(--global--spacing-unit)); } .navigation .nav-links .nav-next { @@ -5273,7 +5283,7 @@ h1.page-title { @media only screen and (min-width: 822px) { .post-navigation .post-title { - margin: 5px calc(24px + (0.25 * var(--global--spacing-unit))) 0; + margin: 5px calc(24px + 0.25 * var(--global--spacing-unit)) 0; } } @media only screen and (min-width: 482px) { @@ -5453,42 +5463,6 @@ h1.page-title { } } -.widget-area ul { - list-style-type: none; - padding: 0; -} - -.widget-area ul li { - line-height: var(--widget--line-height-list); -} - -.widget-area ul.sub-menu, -.widget-area ul.children { - margin-left: var(--widget--spacing-menu); -} - -.widget-area ul .sub-menu-toggle { - display: none; -} - -.widget-area a { - color: var(--footer--color-link); - text-decoration: underline; - text-decoration-style: solid; - text-decoration-color: currentColor; -} - -.widget-area a:link, -.widget-area a:visited, -.widget-area a:active { - color: var(--footer--color-link); -} - -.widget-area a:hover { - color: var(--footer--color-link-hover); - text-decoration-style: dotted; -} - .widget-area .wp-block-social-links.alignright { margin-top: var(--global--spacing-vertical); justify-content: flex-end; @@ -5538,6 +5512,42 @@ h1.page-title { font-size: var(--global--font-size-xs); } +.widget ul { + list-style-type: none; + padding: 0; +} + +.widget ul li { + line-height: var(--widget--line-height-list); +} + +.widget ul.sub-menu, +.widget ul.children { + margin-left: var(--widget--spacing-menu); +} + +.widget ul .sub-menu-toggle { + display: none; +} + +.widget a { + color: var(--footer--color-link); + text-decoration: underline; + text-decoration-style: solid; + text-decoration-color: currentColor; +} + +.widget a:link, +.widget a:visited, +.widget a:active { + color: var(--footer--color-link); +} + +.widget a:hover { + color: var(--footer--color-link-hover); + text-decoration-style: dotted; +} + .search-form { display: flex; flex-wrap: wrap; diff --git a/src/wp-content/themes/twentytwentyone/style.css.map b/src/wp-content/themes/twentytwentyone/style.css.map index c95bf3b77d..e5c24fd062 100644 --- a/src/wp-content/themes/twentytwentyone/style.css.map +++ b/src/wp-content/themes/twentytwentyone/style.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["assets/sass/01-settings/file-header.scss","assets/sass/style.scss","assets/sass/01-settings/global.scss","assets/sass/03-generic/normalize.scss","assets/sass/03-generic/breakpoints.scss","assets/sass/03-generic/vertical-margins.scss","assets/sass/03-generic/reset.scss","assets/sass/03-generic/clearings.scss","assets/sass/04-elements/blockquote.scss","assets/sass/04-elements/forms.scss","assets/sass/04-elements/media.scss","assets/sass/04-elements/misc.scss","assets/sass/04-elements/links.scss","assets/sass/05-blocks/audio/_style.scss","assets/sass/05-blocks/button/_style.scss","assets/sass/02-tools/mixins.scss","assets/sass/05-blocks/code/_style.scss","assets/sass/05-blocks/columns/_style.scss","assets/sass/05-blocks/cover/_style.scss","assets/sass/05-blocks/file/_style.scss","assets/sass/05-blocks/gallery/_style.scss","assets/sass/05-blocks/group/_style.scss","assets/sass/05-blocks/heading/_style.scss","assets/sass/05-blocks/image/_style.scss","assets/sass/05-blocks/latest-comments/_style.scss","assets/sass/05-blocks/latest-posts/_style.scss","assets/sass/05-blocks/legacy/_style.scss","assets/sass/05-blocks/list/_style.scss","assets/sass/05-blocks/media-text/_style.scss","assets/sass/05-blocks/navigation/_style.scss","assets/sass/05-blocks/paragraph/_style.scss","assets/sass/05-blocks/preformatted/_style.scss","assets/sass/05-blocks/pullquote/_style.scss","assets/sass/05-blocks/query-loop/_style.scss","assets/sass/05-blocks/quote/_style.scss","assets/sass/05-blocks/rss/_style.scss","assets/sass/05-blocks/search/_style.scss","assets/sass/05-blocks/separator/_style.scss","assets/sass/05-blocks/social-icons/_style.scss","assets/sass/05-blocks/spacer/_style.scss","assets/sass/05-blocks/table/_style.scss","assets/sass/05-blocks/tag-clould/_style.scss","assets/sass/05-blocks/verse/_style.scss","assets/sass/05-blocks/video/_style.scss","assets/sass/05-blocks/utilities/_font-sizes.scss","assets/sass/05-blocks/utilities/_style.scss","assets/sass/06-components/header.scss","assets/sass/06-components/footer.scss","assets/sass/06-components/single.scss","assets/sass/06-components/posts-and-pages.scss","assets/sass/06-components/entry.scss","assets/sass/06-components/archives.scss","assets/sass/06-components/404.scss","assets/sass/06-components/search.scss","assets/sass/06-components/comments.scss","assets/sass/06-components/navigation.scss","assets/sass/06-components/footer-navigation.scss","assets/sass/06-components/pagination.scss","assets/sass/06-components/widgets.scss","assets/sass/07-utilities/a11y.scss","assets/sass/07-utilities/color-palette.scss","assets/sass/07-utilities/measure.scss","assets/sass/07-utilities/ie.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA;ACEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AA6EA;AC/EA;AAKA;AAEC;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;AAEA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;AAAyD;EACzD;AAAsD;EACtD;EACA;AAAwD;EACxD;AAAsD;AAEtD;EACA;EACA;EACA;EACA;AAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;AAEA;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAC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AA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAeC;EACA;EACA;EACA;EACA;EAEA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;EACA;EACA;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;;AAOD;EACC;;AAEA;EACC;;;AAKH;EACC;EACA;;;AAGD;AAAA;AAGC;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAGD;EACC;EACA;;;AAIF;EACC;;;AAGD;EACC;EACA;EACA;;;AAGD;AAAA;AAAA;AAAA;AAAA;AAKA;EAEC;AAAA;IAEC;IACA;IACA;IACA;IACA;IACA;IACA;;EAEA;AAAA;IACC;;EAGD;AAAA;IACC;;;EAMD;IACC;IACA;;EAGD;IACC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAGD;IACC;;EAEA;IACC;;;EAKH;IACC;;EAEA;IACC;IACA;;EAGD;IACC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAGD;IACC;;EAEA;IACC;;EAID;IACC;IACA;;;AAMJ;AAAA;EAEC;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;AAGA;EAEC;IACC;AAA0B;IAC1B;AAAa;IACb;IACA;IACA;IACA;;EAEA;IACC;;;EAIF;IACC;IACA;IACA;IACA;IACA;IACA;IACA;;;EAGD;IACC;IACA;IACA;IACA;IACA;IACA;IACA;;;AAIF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;;;AAGD;EACC;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;;AAGD;EACC;EA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EAEC;;AAKF;AAAA;EAEC;EACA;EACA;EACA;;AAID;EACC;EACA;;AAEA;EAEC;EACA;;AAKF;EACC;EACA;;AAEA;AAAA;EAEC;EACA;EACA;EACA;;AAEA;AAAA;EACC;EACA;;AAIF;EAEC;EACA;;AAEA;EACC;EACA;EACA;;AAEA;EACC;;AAMF;EAEE;IACC;;EADD;IACC;;EADD;IACC;;EADD;IACC;;EADD;IACC;;;AASJ;EACC;EACA;;AAEA;EACC;;AAIF;EACC;EACA;;;AC/KH;EACC;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;;AAIF;EACC;;;AAID;EACC;;;ACrDD;AAAA;EAEC;EACA;EACA;;AAGA;AAAA;EACC;EACA;;AAGD;AAAA;EACC;EACA;EACA;;;AAIF;EACC;;AAEA;EACC;;;AAIF;EACC;;AAEA;EACC;;;AAIF;EACC;EACA;;;AAGD;EACC;EACA;;;AC1CD;AAqCC;AAAA;AAAA;;AAnCA;EACC;EACA;;AAGD;EACC;;AAGD;EACC;;AxB0BA;EwB3BD;IAIE;;;AAGD;EACC;EACA;;AxBMD;EwBRA;IAKE;IACA;;;AAGD;EACC;;AAGD;EACC;;AxBNF;EwBeD;IAEE;IACA;;;AAKF;EACC;;;AChDD;EACC;;AAEA;EACC;;AAGD;EACC;EACA;EACA;;AAIF;EACC;;AAQC;EACC;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIC;EACC;EACA;;AAIF;EACC;;AAOD;EACC;EACA;EACA;;AAOF;EACC;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;EACA;;AAQH;EACC;;AAEA;EACC;;AAWA;EAEC;;AAGD;EACC;EACA;;AAKH;EACC;;;AC5HH;EAEC;;AAGA;EACC;;AAID;EACC;;;ACXF;EACC;EACA;;;ACFD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAqCA;AAAA;AAAA;;AAnCA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;EACA;EACA;;AAMD;EACC;;AAKA;AAAA;EAEC;;AAIF;EAEC;;AAGD;EAEC;;AAGD;EACC;EACA;EACA;EACA;EACA;;AAEA;EAPD;IAQE;;;AAGD;EACC;;AAGD;EACC;EACA;;AAEA;EACC;;AAIF;AAAA;AAAA;EAGC;;AAGD;EAEC;;AAEA;EACC;;;ACvGH;EACC;;A7BuBA;E6BxBD;IAIE;;;;ACNH;EACC;AAqBA;AAAA;AAAA;;AAnBA;EACC;EACA;EACA;EACA;;AAOA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAIC;;AAOF;EACC;EACA;EACA;;AAGA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;;AAIF;EACC;;AAEA;EACC;;AAIF;EAEC;EACA;AAEA;EACA;EACA;;AAEA;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAMA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;;AAIF;AAAA;AAAA;AAAA;AAAA;EAGC;EACA;;A9B3ED;E8BiCD;IA8CE;;EAEA;IACC;;EAGD;IACC;IACA;;EAEA;IACC;;EAIF;IACC;IACA;;;A9BhGF;E8BuGA;IACC;IACA;;EAEA;IACC;;EAIF;IACC;IACA;;;;ACtIH;EACC;;AAEA;EACC;;AAID;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAMD;EACC;;AAEA;EACC;;AAKF;EAUC;;AAIF;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAKF;EACC;EACA;EACA;EACA;EACA;EACA;;AAID;EACC;EACA;EACA;;AAID;EACC;EACA;EACA;;AAEA;EAEC;;AAKF;AAAA;EAEC;EACA;EACA;EACA;;AAID;EACC;EACA;;AAEA;EAEC;EACA;;;ACzGH;EACC;;AAIC;EACC;;AAIF;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAGD;EACC;;AAIF;EACC;EACA;;AAEA;EACC;;AAEA;EACC;EACA;EACA;;AAOD;EACC;EACA;;AAGD;EACC;;AAOF;EACC;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;EACA;EACA;;AAGA;EACC;EACA;EACA;;AAIF;EACC;;AAGA;EACC;;AAGD;EACC;;AAEA;EACC;EACA;;AAIF;EACC;;;AAOL;EACC;;;AClHD;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;AAiBA;AAAA;AAAA;;AAfA;EACC;;AAKA;EACC;;AAGD;EACC;;AAOF;EACC;;AAKA;EAEC;;AAEA;EACC;;AAIF;EACC;EACA;EACA;EACA;;AAIF;EAIC;;;ACtDF;EACC;;AAKA;EACC;;AAGD;EAEC;;;ACdH;EACC;EAEA;EACA;;AnCgBC;EmCZA;IACC;;;;ACTH;AAAA;EAEC;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;EAEC;;AAGD;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;EAEC;EACA;;AAGD;AAAA;EACC;EACA;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;EAKC;;AAGD;AAAA;EACC;;AAEA;AAAA;AAAA;AAAA;EAEC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;;AAOF;AAAA;EAEC;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;AAAA;EAEC;EACA;;AAGD;EACC;EACA;EACA;EACA;;;AAIF;EACC;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAIF;EACC;;;AC9FD;EACC;EACA;;;ACJF;EACC;;;ACCA;EACC;EACA;EACA;EACA;EACA;;;AAIF;EACC;EACA;EACA;;;ACXA;AAAA;EAEC;;AAGD;AAAA;EAEC;;AAGD;AAAA;AAAA;AAAA;AAAA;EAKC;;AAGD;AAAA;EAEC;EACA;;AAGD;AAAA;AAAA;AAAA;EAIC;EACA;;AAGD;AAAA;EAEC;EACA;EAGA;;AAGD;AAAA;EAEC;EACA;EAGA;;;AClDF;AAEA;AAAA;AAAA;AAQA;AAAA;AAAA;AAGA;AAEC;EACA;EAEA;;;AAKD;EACC;;;AzCEC;EyCID;AAEC;IACA;AAEA;IACA;IACA;;;EAGD;IACC;;;AAIF;AAAA;AAAA;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;AAGA;EAEC;EACA;;;AAKD;EACC;;;AzC3CC;EyCiDD;AAEC;IACA;AAEA;IACA;;;EAGD;IACC;;;AAKF;AAAA;EAEC;;;AAGD;AAAA;AAAA;AAGA;EACC;;;AAQD;AAAA;AAAA;AAGA;EACC;;;AAUD;EACC;;;AAGD;EACC;;;AAID;EACC;;;AAID;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;EACA;EACA;;;AAGD;EACC;;AzChIC;EyC+HF;IAIE;;;;A5CvDF;A6CrGA;EAEC;EACA;EACA;EACA;;AAEA;EACC;;A1CiBA;E0CzBF;IAYE;;;A1CiDA;E0C7DF;IAgBE;;;;AAKF;EACC;EACA;;AAEA;EACC;EACA;EACA;;A1CHA;E0CJF;IAWE;IACA;;;;AAKF;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EAGC;;AAGD;EAEC;;A1CnCD;E0CaF;IA4BE;;;;AAKF;EACC;EACA;EACA;EACA;;;AAGD;EACC;;;AAID;EAEC;;AAEA;EACC;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;A1C5EA;E0CiFA;IACC;IACA;IACA;IACA;;;;A1C3FD;E0C0GG;IACC;IACA;IACA;IACA;;EAEA;IACC;;EAGD;IACC;;EAMJ;IACC;;EAEA;IACC;;EAEA;IACC;;EAIF;IACC;;EAKA;IACC;;EAGD;IACC;IACA;;EAGD;IACC;IACA;IACA;;EAEA;IAGC;IACA;IACA;;EAWH;IACC;IACA;;EAKH;IACC;;;ACrMH;EACC;EACA;;AAIA;EACC;;A3CYA;E2CPA;IACC;;;;AAMH;EACC;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAGD;EACC;;A3C4BA;E2C1CF;IAkBE;IACA;;EAEA;IACC;IACA;;;AAIF;EACC;;AAEA;EAGC;;AAGD;EACC;;AAGD;EACC;;AAEA;EACC;;AAID;EACC;;;ACrEJ;EACC;EACA;EACA;;;AAGD;EACC;EACA;EACA;;;AAGD;EACC;EACA;EACA;;;ACXD;EACC;;;AAID;EACC;;AAEA;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;;;ACpBH;EAEC;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAGD;EACC;;;AAKH;EACC;;;AAGD;EACC;EACA;;;AAGD;AAAA;AAAA;AAIA;AAAA;EAEC;;;AAKA;EACC;;AAID;EAEC;EACA;;AASF;EAEC;EACA;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;;AAEA;EAEC;;AAGD;EACC;;;AAMH;EACC;EACA;EACA;EACA;;;AAGD;EACC;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;EAEC;EACA;;AAGD;EACC;;AAGD;AAAA;AAAA;AAAA;EAIC;;A9C1GA;E8CiFF;IA6BE;;EAEA;IACC;;EAGD;AAAA;IAEC;;;;AAKH;AAAA;AAAA;AAIA;EAEC;;AAOA;EACC;EACA;EACA;EACA;EACA;EACA;;;AAIF;AAAA;AAAA;AAIA;EACC;EACA;EACA;;AAEA;EACC;;AAMA;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAMD;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;;;AC9MH;EACC;;;AAGD;AAAA;EAEC;;;AAGD;EACC;;;AAGD;EACC;EACA;;;AAaE;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAUF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAMD;AAAA;AAAA;AAAA;AAAA;AAAA;EAEC;;AAQA;AAAA;AAAA;EACC;;;AAMJ;EACC;EACA;EACA;;;AClED;EACC;EACA;;;ACFD;EACC;;;ACDD;AAAA;AAAA;AAKC;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAMD;EACC;EACA;EACA;;AAGD;EACC;EACA;;AAGD;EACC;;;AAMH;AAAA;AAAA;AAIA;AAAA;EAEC;EACA;;;AAGD;EACC;EACA;;AAIC;EACC;EACA;EACA;EACA;EACA;;;AAKH;AACA;EACC;;;AAGD;AAAA;AAAA;AAGA;EACC;EACA;;AAEA;EACC;EACA;;;AAKF;EACC;EACA;;AAEA;EACC;EACA;;;AlD/DA;EkDoEF;AAAA;IAGE;;;;AAIF;AAAA;AAAA;AAKC;EACC;EACA;;AlDlFA;EkDgFD;IAKE;IACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;AAKF;EACC;EACA;EACA;;AAEA;EACC;;AlD1GD;EkD8EF;IAkCE;;EAEA;IACC;;;;AAKH;EACC;EACA;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;AAAA;EAEC;;;AAID;EACC;EACA;;AAEA;EACC;EACA;;AAGD;EACC;;;AAIF;EACC;;;AAID;AAAA;EAEC;EACA;;;AAGD;EACC;;;AAGD;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAEA;EACC;;;AAKH;EACC;;AAEA;EACC;;;AAIF;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAGD;AAAA;EAEC;;AAGD;AAAA;EAEC;EACA;;AlD3NA;EkDwND;AAAA;IAME;;;AAIF;AAAA;EAEC;EACA;;;AAIF;EACC;;AAEA;EACC;;AAGD;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;EAKC;EACA;EACA;EACA;EACA;;AAGD;EACC;;AlD3PA;EkDgQA;IACC;;EAGD;IAEC;;;;AC5RH;EACC;EACA;EACA;EACA;EACA;EACA;;AnDUC;EmDhBF;IASE;;;AAID;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAID;EACC;EACA;;AAGD;EACC;;AAQA;EACC;;AAGD;EACC;;AAEA;EACC;EACA;;AAQL;EACC;EACA;EACA;;AAEA;EACC;;;AAKH;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;;AnDpFA;EmDqED;IAkBE;IACA;IACA;IACA;IACA;;EAEA;IACC;IACA;;EAGD;IACC;;EAGD;IACC;;EAGD;IACC;;;AnD3GF;EmDiHD;IAGE;IACA;IACA;;;AAGD;EACC;EACA;EACA;EACA;;AnD7HD;EmDoIC;IACC;;;AnD/HF;EmDoDF;IAiFE;IACA;;EAGA;IACC;IACA;IACA;IACA;IACA;IACA;IACA;;EAID;IACC;;EAID;IACC;;EAID;IACC;;EAEA;IACC;;;AAMH;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AnDtLA;EmD8KD;IAWE;;EAEA;IACC;;;AAIF;EACC;EACA;EACA;;AnD7LD;EmD0LA;IAME;IACA;;EAEA;IACC;;;AAMH;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;;AnD5NF;EmDgNA;IAgBE;;;AAGD;AAAA;EAEC;EACA;EACA;;AAEA;AAAA;EACC;;AAIF;EACC;;AAMA;EACC;;AAGD;EACC;;AAMH;EAEC;;AnD5PD;EmD0PA;IAKE;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAEA;IAEC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAGD;IACC;IACA;;EAGD;IACC;;EAGD;AAEC;IACA;AAEA;IACA;;EAEA;AAGC;IACA;AAEA;IACA;;EAIF;AAEC;IACA;AAEA;IACA;;EAEA;AAGC;IACA;AAEA;IACA;;;AAQL;EACC;;AnDzUA;EmD4UD;IAGE;IACA;;EAGA;IACC;;EAEA;IACC;IACA;;EAEA;IACC;;;AAQL;EACC;EACA;EACA;EACA;EACA;EACA;;AnDzWA;EmDmWD;IASE;IACA;IACA;IACA;;;AAGD;EACC;;AAGD;EAGC;;AAGD;EACC;EACA;;AAGD;EACC;EACA;EACA;EACA;;AAIF;AAAA;EAEC;EACA;;AAEA;AAAA;EACC;EACA;;AAKF;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;;AnD7ZD;EmDoaC;IACC;;;AnD3aF;EmDmbE;IACC;;;AAKF;EACC;EACA;EACA;EACA;;AnDvbF;EmDmbC;IAOE;IACA;;;AASH;EACC;;AnDrcD;EmD0cC;IACC;IACA;;EAGD;IACC;;;AAMH;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;;;AnDpeD;EmD4eD;IACC;IACA;IACA;;;AAKF;EAEC;IACC;;EAGD;IACC;;;AC9gBF;EACC;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;EAEA;;AAEA;EACC;EACA;EACA;;AAEA;EAGC;;AAGD;EACC;EACA;EACA;EACA;;AAOC;EACC;;AAOD;EACC;;AAMJ;EACC;EACA;;AAEA;EACC;;AAKH;AAAA;EAEC;;;ACtEF;AAGA;EACC;;AAEA;EACC;EACA;;AAEA;EACC;EACA;EACA;;AAGD;EACC;;AAGD;EACC;;AAMD;EACC;EACA;;AAGD;AAAA;EAEC;EACA;;AAGD;EACC;;ArDDD;EqDbD;IAkBE;IACA;IACA;;EAEA;AAAA;IAEC;IACA;IACA;IACA;;EAGD;IACC;;;AAKH;EACC;EACA;EACA;EACA;;AAGD;AAAA;EAEC;EACA;;AAGD;AAAA;EAEC;EACA;;;AAKF;EAEC;;ArDtBC;EqDoBF;IAKE;;;AAKD;EACC;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;;ArDxCA;EqDmCD;IAOE;;;ArD9ED;EqDkFD;IAEE;;;AAIF;AAAA;EAEC;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;;AAMH;AAAA;EAGC;EACA;EACA;;ArDzEC;EqDoEF;AAAA;IAQE;;;AAMD;AAAA;EACC;;AAEA;AAAA;EACC;;AAKA;AAAA;AAAA;AAAA;AAAA;AAAA;EAGC;;AAMD;AAAA;AAAA;AAAA;AAAA;AAAA;EAGC;;AAKH;AAAA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;ArDhJD;EqDsJA;AAAA;IACC;IACA;;EAGD;AAAA;IACC;;EAEA;AAAA;AAAA;IAEC;IACA;;;ArDrMF;EqD4MA;AAAA;IACC;;;;AAMH;EACC;EACA;;ArD3KC;EqDyKF;IAKE;;;AAGD;EACC;;;AChPF;EAEC;EACA;EACA;EACA;EACA;;AtD4CC;EsDlDF;IASE;IACA;IACA;;;AtD+DA;EsD1EF;IAeE;;;AtDKA;EsDpBF;IAmBE;;;AAGD;EACC;EACA;;AAEA;EACC;;AAGD;EAEC;;AAGD;EACC;;AAIF;EACC;EACA;EACA;EACA;;AAEA;EAGC;;AAGD;EACC;EACA;;AAMD;EACC;EACA;;AAGD;EACC;;AAIF;EACC;EACA;EACA;;;AAMD;AAAA;AAAA;AAAA;AAAA;AAAA;EAMC;EACA;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;;AAKF;EACC;EACA;EACA;EACA;;AAEA;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;;AAGD;EACC;EACA;;;AAMD;EACC;EACA;EACA;;AAGD;EACC;EACA;;;AAIF;EACC;;;AzDtCD;A0DrHA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;AACA;EACC;;;AAGD;EAEC;IACC;IACA;;;AC3CF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAQD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAQC;;;AAIF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAOD;EAGG;;AAGF;EACC;EAKA;;AAHA;EACC;;AAMH;EAOG;;AAGF;EACC;EAKA;;AAHA;EACC;;;AAQJ;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AChRD;AAAA;AAAA;EAGC;;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAWC;;;AClBA;EACC;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAWC;;AAGD;AAAA;AAAA;AAAA;EAIC;;AAGD;EACC;;A1DPD;E0DaE;AAAA;IAEC;;;AAKH;EACC;;AAIF;EACC;;AAGD;EACC","file":"style.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["assets/sass/01-settings/file-header.scss","assets/sass/style.scss","assets/sass/01-settings/global.scss","assets/sass/03-generic/normalize.scss","assets/sass/03-generic/breakpoints.scss","assets/sass/03-generic/vertical-margins.scss","assets/sass/03-generic/reset.scss","assets/sass/03-generic/clearings.scss","assets/sass/04-elements/blockquote.scss","assets/sass/04-elements/forms.scss","assets/sass/04-elements/media.scss","assets/sass/04-elements/misc.scss","assets/sass/04-elements/links.scss","assets/sass/05-blocks/audio/_style.scss","assets/sass/05-blocks/button/_style.scss","assets/sass/02-tools/mixins.scss","assets/sass/05-blocks/code/_style.scss","assets/sass/05-blocks/columns/_style.scss","assets/sass/05-blocks/cover/_style.scss","assets/sass/05-blocks/file/_style.scss","assets/sass/05-blocks/gallery/_style.scss","assets/sass/05-blocks/group/_style.scss","assets/sass/05-blocks/heading/_style.scss","assets/sass/05-blocks/image/_style.scss","assets/sass/05-blocks/latest-comments/_style.scss","assets/sass/05-blocks/latest-posts/_style.scss","assets/sass/05-blocks/legacy/_style.scss","assets/sass/05-blocks/list/_style.scss","assets/sass/05-blocks/media-text/_style.scss","assets/sass/05-blocks/navigation/_style.scss","assets/sass/05-blocks/paragraph/_style.scss","assets/sass/05-blocks/preformatted/_style.scss","assets/sass/05-blocks/pullquote/_style.scss","assets/sass/05-blocks/query-loop/_style.scss","assets/sass/05-blocks/quote/_style.scss","assets/sass/05-blocks/rss/_style.scss","assets/sass/05-blocks/search/_style.scss","assets/sass/05-blocks/separator/_style.scss","assets/sass/05-blocks/social-icons/_style.scss","assets/sass/05-blocks/spacer/_style.scss","assets/sass/05-blocks/table/_style.scss","assets/sass/05-blocks/tag-clould/_style.scss","assets/sass/05-blocks/verse/_style.scss","assets/sass/05-blocks/video/_style.scss","assets/sass/05-blocks/utilities/_font-sizes.scss","assets/sass/05-blocks/utilities/_style.scss","assets/sass/06-components/header.scss","assets/sass/06-components/footer.scss","assets/sass/06-components/single.scss","assets/sass/06-components/posts-and-pages.scss","assets/sass/06-components/entry.scss","assets/sass/06-components/archives.scss","assets/sass/06-components/404.scss","assets/sass/06-components/search.scss","assets/sass/06-components/comments.scss","assets/sass/06-components/navigation.scss","assets/sass/06-components/footer-navigation.scss","assets/sass/06-components/pagination.scss","assets/sass/06-components/widgets.scss","assets/sass/07-utilities/a11y.scss","assets/sass/07-utilities/color-palette.scss","assets/sass/07-utilities/measure.scss","assets/sass/07-utilities/ie.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA;ACEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AA6EA;AC/EA;AAKA;AAEC;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;AAEA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;AAAyD;EACzD;AAAsD;EACtD;EACA;AAAwD;EACxD;AAAsD;AAEtD;EACA;EACA;EACA;EACA;AAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;AAEA;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAC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AA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAeC;EACA;EACA;EACA;EACA;EAEA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;EACA;EACA;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;;AAOD;EACC;;AAEA;EACC;;;AAKH;EACC;EACA;;;AAGD;AAAA;AAGC;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAGD;EACC;EACA;;;AAIF;EACC;;;AAGD;EACC;EACA;EACA;;;AAGD;AAAA;AAAA;AAAA;AAAA;AAKA;EAEC;AAAA;IAEC;IACA;IACA;IACA;IACA;IACA;IACA;;EAEA;AAAA;IACC;;EAGD;AAAA;IACC;;;EAMD;IACC;IACA;;EAGD;IACC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAGD;IACC;;EAEA;IACC;;;EAKH;IACC;;EAEA;IACC;IACA;;EAGD;IACC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAGD;IACC;;EAEA;IACC;;EAID;IACC;IACA;;;AAMJ;AAAA;EAEC;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;AAGA;EAEC;IACC;AAA0B;IAC1B;AAAa;IACb;IACA;IACA;IACA;;EAEA;IACC;;;EAIF;IACC;IACA;IACA;IACA;IACA;IACA;IACA;;;EAGD;IACC;IACA;IACA;IACA;IACA;IACA;IACA;;;AAIF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;;;AAGD;EACC;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;;AAGD;EACC;EA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EAEC;;AAKF;AAAA;EAEC;EACA;EACA;EACA;;AAID;EACC;EACA;;AAEA;EAEC;EACA;;AAKF;EACC;EACA;;AAEA;AAAA;EAEC;EACA;EACA;EACA;;AAEA;AAAA;EACC;EACA;;AAIF;EAEC;EACA;;AAEA;EACC;EACA;EACA;;AAEA;EACC;;AAMF;EAEE;IACC;;EADD;IACC;;EADD;IACC;;EADD;IACC;;EADD;IACC;;;AASJ;EACC;EACA;;AAEA;EACC;;AAIF;EACC;EACA;;;AC/KH;EACC;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;;AAIF;EACC;;;AAID;EACC;;;ACrDD;AAAA;EAEC;EACA;EACA;;AAGA;AAAA;EACC;EACA;;AAGD;AAAA;EACC;EACA;EACA;;;AAIF;EACC;;AAEA;EACC;;;AAIF;EACC;;AAEA;EACC;;;AAIF;EACC;EACA;;;AAGD;EACC;EACA;;;AC1CD;AAqCC;AAAA;AAAA;;AAnCA;EACC;EACA;;AAGD;EACC;;AAGD;EACC;;AxB0BA;EwB3BD;IAIE;;;AAGD;EACC;EACA;;AxBMD;EwBRA;IAKE;IACA;;;AAGD;EACC;;AAGD;EACC;;AxBNF;EwBeD;IAEE;IACA;;;AAKF;EACC;;;AChDD;EACC;;AAEA;EACC;;AAGD;EACC;EACA;EACA;;AAIF;EACC;;AAQC;EACC;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIC;EACC;EACA;;AAIF;EACC;;AAOD;EACC;EACA;EACA;;AAOF;EACC;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;EACA;;AAQH;EACC;;AAEA;EACC;;AAWA;EAEC;;AAGD;EACC;EACA;;AAKH;EACC;;;AC5HH;EAEC;;AAGA;EACC;;AAID;EACC;;;ACXF;EACC;EACA;;;ACFD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAqCA;AAAA;AAAA;;AAnCA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;EACA;EACA;;AAMD;EACC;;AAKA;AAAA;EAEC;;AAIF;EAEC;;AAGD;EAEC;;AAGD;EACC;EACA;EACA;EACA;EACA;;AAEA;EAPD;IAQE;;;AAGD;EACC;;AAGD;EACC;EACA;;AAEA;EACC;;AAIF;AAAA;AAAA;EAGC;;AAGD;EAEC;;AAEA;EACC;;;ACvGH;EACC;;A7BuBA;E6BxBD;IAIE;;;;ACNH;EACC;AAqBA;AAAA;AAAA;;AAnBA;EACC;EACA;EACA;EACA;;AAOA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAIC;;AAOF;EACC;EACA;EACA;;AAGA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;;AAIF;EACC;;AAEA;EACC;;AAIF;EAEC;EACA;AAEA;EACA;EACA;;AAEA;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAMA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;;AAIF;AAAA;AAAA;AAAA;AAAA;EAGC;EACA;;A9B3ED;E8BiCD;IA8CE;;EAEA;IACC;;EAGD;IACC;IACA;;EAEA;IACC;;EAIF;IACC;IACA;;;A9BhGF;E8BuGA;IACC;IACA;;EAEA;IACC;;EAIF;IACC;IACA;;;;ACtIH;EACC;;AAEA;EACC;;AAID;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAMD;EACC;;AAEA;EACC;;AAKF;EAUC;;AAIF;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAKF;EACC;EACA;EACA;EACA;EACA;EACA;;AAID;EACC;EACA;EACA;;AAID;EACC;EACA;EACA;;AAEA;EAEC;;AAKF;AAAA;EAEC;EACA;EACA;EACA;;AAID;EACC;EACA;;AAEA;EAEC;EACA;;;ACzGH;EACC;;AAIC;EACC;;AAIF;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAGD;EACC;;AAIF;EACC;EACA;;AAEA;EACC;;AAEA;EACC;EACA;EACA;;AAOD;EACC;EACA;;AAGD;EACC;;AAOF;EACC;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;EACA;EACA;;AAGA;EACC;EACA;EACA;;AAIF;EACC;;AAGA;EACC;;AAGD;EACC;;AAEA;EACC;EACA;;AAIF;EACC;;;AAOL;EACC;;;AClHD;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;AAiBA;AAAA;AAAA;;AAfA;EACC;;AAKA;EACC;;AAGD;EACC;;AAOF;EACC;;AAKA;EAEC;;AAEA;EACC;;AAIF;EACC;EACA;EACA;EACA;;AAIF;EAIC;;;ACtDF;EACC;;AAKA;EACC;;AAGD;EAEC;;;ACdH;EACC;EAEA;EACA;;AnCgBC;EmCZA;IACC;;;;ACTH;AAAA;EAEC;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;EAEC;;AAGD;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;EAEC;EACA;;AAGD;AAAA;EACC;EACA;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;EAKC;;AAGD;AAAA;EACC;;AAEA;AAAA;AAAA;AAAA;EAEC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;;AAOF;AAAA;EAEC;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;AAAA;EAEC;EACA;;AAGD;EACC;EACA;EACA;EACA;;;AAIF;EACC;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAIF;EACC;;;AC9FD;EACC;EACA;;;ACJF;EACC;;;ACCA;EACC;EACA;EACA;EACA;EACA;;;AAIF;EACC;EACA;EACA;;;ACXA;AAAA;EAEC;;AAGD;AAAA;EAEC;;AAGD;AAAA;AAAA;AAAA;AAAA;EAKC;;AAGD;AAAA;EAEC;EACA;;AAGD;AAAA;AAAA;AAAA;EAIC;EACA;;AAGD;AAAA;EAEC;EACA;EAGA;;AAGD;AAAA;EAEC;EACA;EAGA;;;AClDF;AAEA;AAAA;AAAA;AAQA;AAAA;AAAA;AAGA;AAEC;EACA;EAEA;;;AAKD;EACC;;;AzCEC;EyCID;AAEC;IACA;AAEA;IACA;IACA;;;EAGD;IACC;;;AAIF;AAAA;AAAA;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;AAGA;EAEC;EACA;;;AAKD;EACC;;;AzC3CC;EyCiDD;AAEC;IACA;AAEA;IACA;;;EAGD;IACC;;;AAKF;AAAA;EAEC;;;AAGD;AAAA;AAAA;AAGA;EACC;;;AAQD;AAAA;AAAA;AAGA;EACC;;;AAUD;EACC;;;AAGD;EACC;;;AAID;EACC;;;AAID;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;EACA;EACA;;;AAGD;EACC;;AzChIC;EyC+HF;IAIE;;;;A5CvDF;A6CrGA;EAEC;EACA;EACA;EACA;;AAEA;EACC;;A1CiBA;E0CzBF;IAYE;;;A1CiDA;E0C7DF;IAgBE;;;;AAKF;EACC;EACA;;AAEA;EACC;EACA;EACA;;A1CHA;E0CJF;IAWE;IACA;;;;AAKF;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EAGC;;AAGD;EAEC;;A1CnCD;E0CaF;IA4BE;;;;AAKF;EACC;EACA;EACA;EACA;;;AAGD;EACC;;;AAID;EAEC;;AAEA;EACC;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;A1C5EA;E0CiFA;IACC;IACA;IACA;IACA;;;;A1C3FD;E0C0GG;IACC;IACA;IACA;IACA;;EAEA;IACC;;EAGD;IACC;;EAMJ;IACC;;EAEA;IACC;;EAEA;IACC;;EAIF;IACC;;EAKA;IACC;;EAGD;IACC;IACA;;EAGD;IACC;IACA;IACA;;EAEA;IAGC;IACA;IACA;;EAWH;IACC;IACA;;EAKH;IACC;;;ACrMH;EACC;EACA;;AAIA;EACC;;A3CYA;E2CPA;IACC;;;;AAMH;EACC;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAGD;AAAA;EAEC;;A3C2BA;E2C1CF;IAmBE;IACA;;EAEA;IACC;;EAGD;AAAA;IAEC;IACA;;EAGD;IACC;;;AAIF;EACC;;AAEA;EAGC;;AAGD;EACC;;AAGD;EACC;;AAEA;EACC;;AAID;EACC;;;AC/EJ;EACC;EACA;EACA;;;AAGD;EACC;EACA;EACA;;;AAGD;EACC;EACA;EACA;;;ACXD;EACC;;;AAID;EACC;;AAEA;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;;;ACpBH;EAEC;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAGD;EACC;;;AAKH;EACC;;;AAGD;EACC;EACA;;;AAGD;AAAA;AAAA;AAIA;AAAA;EAEC;;;AAKA;EACC;;AAID;EAEC;EACA;;AASF;EAEC;EACA;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;;AAEA;EAEC;;AAGD;EACC;;;AAMH;EACC;EACA;EACA;EACA;;;AAGD;EACC;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;EAEC;EACA;;AAGD;EACC;;AAGD;AAAA;AAAA;AAAA;EAIC;;A9C1GA;E8CiFF;IA6BE;;EAEA;IACC;;EAGD;AAAA;IAEC;;;;AAKH;AAAA;AAAA;AAIA;EAEC;;AAOA;EACC;EACA;EACA;EACA;EACA;EACA;;;AAIF;AAAA;AAAA;AAIA;EACC;EACA;EACA;;AAEA;EACC;;AAMA;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAMD;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;;;AC9MH;EACC;;;AAGD;AAAA;EAEC;;;AAGD;EACC;;;AAGD;EACC;EACA;;;AAaE;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAUF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAMD;AAAA;AAAA;AAAA;AAAA;AAAA;EAEC;;AAQA;AAAA;AAAA;EACC;;;AAMJ;EACC;EACA;EACA;;;AClED;EACC;EACA;;;ACFD;EACC;;;ACDD;AAAA;AAAA;AAKC;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAMD;EACC;EACA;EACA;;AAGD;EACC;EACA;;AAGD;EACC;;;AAMH;AAAA;AAAA;AAIA;AAAA;EAEC;EACA;;;AAGD;EACC;EACA;;AAIC;EACC;EACA;EACA;EACA;EACA;;;AAKH;AACA;EACC;;;AAGD;AAAA;AAAA;AAGA;EACC;EACA;;AAEA;EACC;EACA;;;AAKF;EACC;EACA;;AAEA;EACC;EACA;;;AlD/DA;EkDoEF;AAAA;IAGE;;;;AAIF;AAAA;AAAA;AAKC;EACC;EACA;;AlDlFA;EkDgFD;IAKE;IACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;AAKF;EACC;EACA;EACA;;AAEA;EACC;;AlD1GD;EkD8EF;IAkCE;;EAEA;IACC;;;;AAKH;EACC;EACA;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;AAAA;EAEC;;;AAID;EACC;EACA;;AAEA;EACC;EACA;;AAGD;EACC;;;AAIF;EACC;;;AAID;AAAA;EAEC;EACA;;;AAGD;EACC;;;AAGD;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAEA;EACC;;;AAKH;EACC;;AAEA;EACC;;;AAIF;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAGD;AAAA;EAEC;;AAGD;AAAA;EAEC;EACA;;AlD3NA;EkDwND;AAAA;IAME;;;AAIF;AAAA;EAEC;EACA;;;AAIF;EACC;;AAEA;EACC;;AAGD;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;EAKC;EACA;EACA;EACA;EACA;;AAGD;EACC;;AlD3PA;EkDgQA;IACC;;EAGD;IAEC;;;;AC5RH;EACC;EACA;EACA;EACA;EACA;EACA;;AnDUC;EmDhBF;IASE;;;AAID;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAID;EACC;EACA;;AAGD;EACC;;AAQA;EACC;;AAGD;EACC;;AAEA;EACC;EACA;;AAQL;EACC;EACA;EACA;;AAEA;EACC;;;AAKH;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;;AnDpFA;EmDqED;IAkBE;IACA;IACA;IACA;IACA;;EAEA;IACC;IACA;;EAGD;IACC;;EAGD;IACC;;EAGD;IACC;;;AnD3GF;EmDiHD;IAGE;IACA;IACA;;;AAGD;EACC;EACA;EACA;EACA;;AnD7HD;EmDoIC;IACC;;;AnD/HF;EmDoDF;IAiFE;IACA;;EAGA;IACC;IACA;IACA;IACA;IACA;IACA;IACA;;EAID;IACC;;EAID;IACC;;EAID;IACC;;EAEA;IACC;;;AAMH;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AnDtLA;EmD8KD;IAWE;;EAEA;IACC;;;AAIF;EACC;EACA;EACA;;AnD7LD;EmD0LA;IAME;IACA;;EAEA;IACC;;;AAMH;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;;AnD5NF;EmDgNA;IAgBE;;;AAGD;AAAA;EAEC;EACA;EACA;;AAEA;AAAA;EACC;;AAIF;EACC;;AAMA;EACC;;AAGD;EACC;;AAMH;EAEC;;AnD5PD;EmD0PA;IAKE;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAEA;IAEC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAGD;IACC;IACA;;EAGD;IACC;;EAGD;AAEC;IACA;AAEA;IACA;;EAEA;AAGC;IACA;AAEA;IACA;;EAIF;AAEC;IACA;AAEA;IACA;;EAEA;AAGC;IACA;AAEA;IACA;;;AAQL;EACC;;AnDzUA;EmD4UD;IAGE;IACA;;EAGA;IACC;;EAEA;IACC;IACA;;EAEA;IACC;;;AAQL;EACC;EACA;EACA;EACA;EACA;EACA;;AnDzWA;EmDmWD;IASE;IACA;IACA;IACA;;;AAGD;EACC;;AAGD;EAGC;;AAGD;EACC;EACA;;AAGD;EACC;EACA;EACA;EACA;;AAIF;AAAA;EAEC;EACA;;AAEA;AAAA;EACC;EACA;;AAKF;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;;AnD7ZD;EmDoaC;IACC;;;AnD3aF;EmDmbE;IACC;;;AAKF;EACC;EACA;EACA;EACA;;AnDvbF;EmDmbC;IAOE;IACA;;;AASH;EACC;;AnDrcD;EmD0cC;IACC;IACA;;EAGD;IACC;;;AAMH;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;;;AnDpeD;EmD4eD;IACC;IACA;IACA;;;AAKF;EAEC;IACC;;EAGD;IACC;;;AC9gBF;EACC;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;EAEA;;AAEA;EACC;EACA;EACA;;AAEA;EAGC;;AAGD;EACC;EACA;EACA;EACA;;AAOC;EACC;;AAOD;EACC;;AAMJ;EACC;EACA;;AAEA;EACC;;AAKH;AAAA;EAEC;;;ACtEF;AAGA;EACC;;AAEA;EACC;EACA;;AAEA;EACC;EACA;EACA;;AAGD;EACC;;AAGD;EACC;;AAMD;EACC;EACA;;AAGD;AAAA;EAEC;EACA;;AAGD;EACC;;ArDDD;EqDbD;IAkBE;IACA;IACA;;EAEA;AAAA;IAEC;IACA;IACA;IACA;;EAGD;IACC;;;AAKH;EACC;EACA;EACA;EACA;;AAGD;AAAA;EAEC;EACA;;AAGD;AAAA;EAEC;EACA;;;AAKF;EAEC;;ArDtBC;EqDoBF;IAKE;;;AAKD;EACC;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;;ArDxCA;EqDmCD;IAOE;;;ArD9ED;EqDkFD;IAEE;;;AAIF;AAAA;EAEC;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;;AAMH;AAAA;EAGC;EACA;EACA;;ArDzEC;EqDoEF;AAAA;IAQE;;;AAMD;AAAA;EACC;;AAEA;AAAA;EACC;;AAKA;AAAA;AAAA;AAAA;AAAA;AAAA;EAGC;;AAMD;AAAA;AAAA;AAAA;AAAA;AAAA;EAGC;;AAKH;AAAA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;ArDhJD;EqDsJA;AAAA;IACC;IACA;;EAGD;AAAA;IACC;;EAEA;AAAA;AAAA;IAEC;IACA;;;ArDrMF;EqD4MA;AAAA;IACC;;;;AAMH;EACC;EACA;;ArD3KC;EqDyKF;IAKE;;;AAGD;EACC;;;AChPF;EAEC;EACA;EACA;EACA;EACA;;AtD4CC;EsDlDF;IASE;IACA;IACA;;;AtD+DA;EsD1EF;IAeE;;;AtDKA;EsDpBF;IAmBE;;;AAKA;EACC;EACA;;AAGD;EACC;;AAIF;EACC;EACA;EACA;;;AAMD;AAAA;AAAA;AAAA;AAAA;AAAA;EAMC;EACA;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;EACA;;AAEA;EACC;;AAGD;EAEC;;AAGD;EACC;;AAIF;EACC;EACA;EACA;EACA;;AAEA;EAGC;;AAGD;EACC;EACA;;;AAMH;EACC;EACA;EACA;EACA;;AAEA;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;;AAGD;EACC;EACA;;;AAMD;EACC;EACA;EACA;;AAGD;EACC;EACA;;;AAIF;EACC;;;AzDtCD;A0DrHA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;AACA;EACC;;;AAGD;EAEC;IACC;IACA;;;AC3CF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAQD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAQC;;;AAIF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAOD;EAGG;;AAGF;EACC;EAKA;;AAHA;EACC;;AAMH;EAOG;;AAGF;EACC;EAKA;;AAHA;EACC;;;AAQJ;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AChRD;AAAA;AAAA;EAGC;;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAWC;;;AClBA;EACC;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAWC;;AAGD;AAAA;AAAA;AAAA;EAIC;;AAGD;EACC;;A1DPD;E0DaE;AAAA;IAEC;;;AAKH;EACC;;AAIF;EACC;;AAGD;EACC","file":"style.css"} \ No newline at end of file diff --git a/src/wp-content/themes/twentytwentytwo/assets/fonts/LICENSE.md b/src/wp-content/themes/twentytwentytwo/assets/fonts/LICENSE.md new file mode 100644 index 0000000000..7cd3e749de --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/assets/fonts/LICENSE.md @@ -0,0 +1,93 @@ +Copyright 2014 - 2021 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. + +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, + in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, + redistributed and/or sold with any software, provided that each copy + contains the above copyright notice and this license. These can be + included either as stand-alone text files, human-readable headers or + in the appropriate machine-readable metadata fields within text or + binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font + Name(s) unless explicit written permission is granted by the corresponding + Copyright Holder. This restriction only applies to the primary font name as + presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font + Software shall not be used to promote, endorse or advertise any + Modified Version, except to acknowledge the contribution(s) of the + Copyright Holder(s) and the Author(s) or with their explicit written + permission. + +5) The Font Software, modified or unmodified, in part or in whole, + must be distributed entirely under this license, and must not be + distributed under any other license. The requirement for fonts to + remain under this license does not apply to any document created + using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/src/wp-content/themes/twentytwentytwo/assets/fonts/SourceSerif4Variable-Italic.otf.woff2 b/src/wp-content/themes/twentytwentytwo/assets/fonts/SourceSerif4Variable-Italic.otf.woff2 new file mode 100644 index 0000000000..2387849154 Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/fonts/SourceSerif4Variable-Italic.otf.woff2 differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/fonts/SourceSerif4Variable-Italic.ttf.woff2 b/src/wp-content/themes/twentytwentytwo/assets/fonts/SourceSerif4Variable-Italic.ttf.woff2 new file mode 100644 index 0000000000..4cbd4c351f Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/fonts/SourceSerif4Variable-Italic.ttf.woff2 differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/fonts/SourceSerif4Variable-Roman.otf.woff2 b/src/wp-content/themes/twentytwentytwo/assets/fonts/SourceSerif4Variable-Roman.otf.woff2 new file mode 100644 index 0000000000..28701e6842 Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/fonts/SourceSerif4Variable-Roman.otf.woff2 differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/fonts/SourceSerif4Variable-Roman.ttf.woff2 b/src/wp-content/themes/twentytwentytwo/assets/fonts/SourceSerif4Variable-Roman.ttf.woff2 new file mode 100644 index 0000000000..3b74d300ad Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/fonts/SourceSerif4Variable-Roman.ttf.woff2 differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/bird-on-black.jpg b/src/wp-content/themes/twentytwentytwo/assets/images/bird-on-black.jpg new file mode 100644 index 0000000000..684affb490 Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/bird-on-black.jpg differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/bird-on-gray.jpg b/src/wp-content/themes/twentytwentytwo/assets/images/bird-on-gray.jpg new file mode 100644 index 0000000000..4fde7652c3 Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/bird-on-gray.jpg differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/bird-on-green.jpg b/src/wp-content/themes/twentytwentytwo/assets/images/bird-on-green.jpg new file mode 100644 index 0000000000..f1b5505478 Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/bird-on-green.jpg differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/bird-on-salmon.jpg b/src/wp-content/themes/twentytwentytwo/assets/images/bird-on-salmon.jpg new file mode 100644 index 0000000000..727c70ea6b Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/bird-on-salmon.jpg differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/divider-black.png b/src/wp-content/themes/twentytwentytwo/assets/images/divider-black.png new file mode 100644 index 0000000000..bfaafd737d Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/divider-black.png differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/divider-white.png b/src/wp-content/themes/twentytwentytwo/assets/images/divider-white.png new file mode 100644 index 0000000000..0c045e5db2 Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/divider-white.png differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/ducks.jpg b/src/wp-content/themes/twentytwentytwo/assets/images/ducks.jpg new file mode 100644 index 0000000000..6c65eb4313 Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/ducks.jpg differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-a.jpg b/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-a.jpg new file mode 100644 index 0000000000..b533d0f140 Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-a.jpg differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-b.jpg b/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-b.jpg new file mode 100644 index 0000000000..9314e9fa2f Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-b.jpg differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-c.jpg b/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-c.jpg new file mode 100644 index 0000000000..3797692068 Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-gray-c.jpg differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-salmon.jpg b/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-salmon.jpg new file mode 100644 index 0000000000..86731b9037 Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-salmon.jpg differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-transparent-a.png b/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-transparent-a.png new file mode 100644 index 0000000000..e89c08688f Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-transparent-a.png differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-transparent-b.png b/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-transparent-b.png new file mode 100644 index 0000000000..417fed1d13 Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-transparent-b.png differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-transparent-c.png b/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-transparent-c.png new file mode 100644 index 0000000000..4f6c2e36d3 Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-transparent-c.png differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-transparent-d.png b/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-transparent-d.png new file mode 100644 index 0000000000..88892ea7c5 Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/flight-path-on-transparent-d.png differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/icon-binoculars.png b/src/wp-content/themes/twentytwentytwo/assets/images/icon-binoculars.png new file mode 100644 index 0000000000..283c38c925 Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/icon-binoculars.png differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/images/icon-bird.jpg b/src/wp-content/themes/twentytwentytwo/assets/images/icon-bird.jpg new file mode 100644 index 0000000000..dbfa90e40a Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/images/icon-bird.jpg differ diff --git a/src/wp-content/themes/twentytwentytwo/assets/videos/birds.mp4 b/src/wp-content/themes/twentytwentytwo/assets/videos/birds.mp4 new file mode 100644 index 0000000000..2872b527bd Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/assets/videos/birds.mp4 differ diff --git a/src/wp-content/themes/twentytwentytwo/functions.php b/src/wp-content/themes/twentytwentytwo/functions.php new file mode 100644 index 0000000000..f15e42d2d9 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/functions.php @@ -0,0 +1,151 @@ +get( 'Version' ); + + $version_string = is_string( $theme_version ) ? $theme_version : false; + wp_register_style( + 'twentytwentytwo-style', + get_template_directory_uri() . '/style.css', + array(), + $version_string + ); + + // Add styles inline. + wp_add_inline_style( 'twentytwentytwo-style', twentytwentytwo_get_font_face_styles() ); + + // Enqueue theme stylesheet. + wp_enqueue_style( 'twentytwentytwo-style' ); + + } + +endif; + +add_action( 'wp_enqueue_scripts', 'twentytwentytwo_styles' ); + +if ( ! function_exists( 'twentytwentytwo_editor_styles' ) ) : + + /** + * Enqueue editor styles. + * + * @since Twenty Twenty-Two 1.0 + * + * @return void + */ + function twentytwentytwo_editor_styles() { + + // Add styles inline. + wp_add_inline_style( 'wp-block-library', twentytwentytwo_get_font_face_styles() ); + + } + +endif; + +add_action( 'admin_init', 'twentytwentytwo_editor_styles' ); + + +if ( ! function_exists( 'twentytwentytwo_get_font_face_styles' ) ) : + + /** + * Get font face styles. + * Called by functions twentytwentytwo_styles() and twentytwentytwo_editor_styles() above. + * + * @since Twenty Twenty-Two 1.0 + * + * @return string + */ + function twentytwentytwo_get_font_face_styles() { + + return " + @font-face{ + font-family: 'Source Serif Pro'; + font-weight: 200 900; + font-style: normal; + font-stretch: normal; + font-display: swap; + src: url('" . get_theme_file_uri( 'assets/fonts/SourceSerif4Variable-Roman.ttf.woff2' ) . "') format('woff2'); + } + + @font-face{ + font-family: 'Source Serif Pro'; + font-weight: 200 900; + font-style: italic; + font-stretch: normal; + font-display: swap; + src: url('" . get_theme_file_uri( 'assets/fonts/SourceSerif4Variable-Italic.ttf.woff2' ) . "') format('woff2'); + } + "; + + } + +endif; + +if ( ! function_exists( 'twentytwentytwo_preload_webfonts' ) ) : + + /** + * Preloads the main web font to improve performance. + * + * Only the main web font (font-style: normal) is preloaded here since that font is always relevant (it is used + * on every heading, for example). The other font is only needed if there is any applicable content in italic style, + * and therefore preloading it would in most cases regress performance when that font would otherwise not be loaded + * at all. + * + * @since Twenty Twenty-Two 1.0 + * + * @return void + */ + function twentytwentytwo_preload_webfonts() { + ?> + + array( 'label' => __( 'Featured', 'twentytwentytwo' ) ), + 'footer' => array( 'label' => __( 'Footers', 'twentytwentytwo' ) ), + 'header' => array( 'label' => __( 'Headers', 'twentytwentytwo' ) ), + 'query' => array( 'label' => __( 'Query', 'twentytwentytwo' ) ), + 'pages' => array( 'label' => __( 'Pages', 'twentytwentytwo' ) ), + ); + + /** + * Filters the theme block pattern categories. + * + * @since Twenty Twenty-Two 1.0 + * + * @param array[] $block_pattern_categories { + * An associative array of block pattern categories, keyed by category name. + * + * @type array[] $properties { + * An array of block category properties. + * + * @type string $label A human-readable label for the pattern category. + * } + * } + */ + $block_pattern_categories = apply_filters( 'twentytwentytwo_block_pattern_categories', $block_pattern_categories ); + + foreach ( $block_pattern_categories as $name => $properties ) { + if ( ! WP_Block_Pattern_Categories_Registry::get_instance()->is_registered( $name ) ) { + register_block_pattern_category( $name, $properties ); + } + } + + $block_patterns = array( + 'footer-default', + 'footer-dark', + 'footer-logo', + 'footer-navigation', + 'footer-title-tagline-social', + 'footer-social-copyright', + 'footer-navigation-copyright', + 'footer-about-title-logo', + 'footer-query-title-citation', + 'footer-query-images-title-citation', + 'footer-blog', + 'general-subscribe', + 'general-featured-posts', + 'general-layered-images-with-duotone', + 'general-wide-image-intro-buttons', + 'general-large-list-names', + 'general-video-header-details', + 'general-list-events', + 'general-two-images-text', + 'general-image-with-caption', + 'general-video-trailer', + 'general-pricing-table', + 'general-divider-light', + 'general-divider-dark', + 'header-default', + 'header-large-dark', + 'header-small-dark', + 'header-image-background', + 'header-image-background-overlay', + 'header-with-tagline', + 'header-text-only-green-background', + 'header-text-only-salmon-background', + 'header-title-and-button', + 'header-text-only-with-tagline-black-background', + 'header-logo-navigation-gray-background', + 'header-logo-navigation-social-black-background', + 'header-title-navigation-social', + 'header-logo-navigation-offset-tagline', + 'header-stacked', + 'header-centered-logo', + 'header-centered-logo-black-background', + 'header-centered-title-navigation-social', + 'header-title-and-button', + 'hidden-404', + 'hidden-bird', + 'hidden-heading-and-bird', + 'page-about-media-left', + 'page-about-simple-dark', + 'page-about-media-right', + 'page-about-solid-color', + 'page-about-links', + 'page-about-links-dark', + 'page-about-large-image-and-buttons', + 'page-layout-image-and-text', + 'page-layout-image-text-and-video', + 'page-layout-two-columns', + 'page-sidebar-poster', + 'page-sidebar-grid-posts', + 'page-sidebar-blog-posts', + 'page-sidebar-blog-posts-right', + 'query-default', + 'query-simple-blog', + 'query-grid', + 'query-text-grid', + 'query-image-grid', + 'query-large-titles', + 'query-irregular-grid', + ); + + /** + * Filters the theme block patterns. + * + * @since Twenty Twenty-Two 1.0 + * + * @param array $block_patterns List of block patterns by name. + */ + $block_patterns = apply_filters( 'twentytwentytwo_block_patterns', $block_patterns ); + + foreach ( $block_patterns as $block_pattern ) { + $pattern_file = get_theme_file_path( '/inc/patterns/' . $block_pattern . '.php' ); + + register_block_pattern( + 'twentytwentytwo/' . $block_pattern, + require $pattern_file + ); + } +} +add_action( 'init', 'twentytwentytwo_register_block_patterns', 9 ); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-about-title-logo.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-about-title-logo.php new file mode 100644 index 0000000000..dab9b04a86 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-about-title-logo.php @@ -0,0 +1,32 @@ + __( 'Footer with text, title, and logo', 'twentytwentytwo' ), + 'categories' => array( 'footer' ), + 'blockTypes' => array( 'core/template-part/footer' ), + 'content' => ' +
+
+
+

' . esc_html__( 'About us', 'twentytwentytwo' ) . '

+ + + +

' . esc_html__( 'We are a rogue collective of bird watchers. We’ve been known to sneak through fences, climb perimeter walls, and generally trespass in order to observe the rarest of birds.', 'twentytwentytwo' ) . '

+ + + + + + +
+ + + +
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-blog.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-blog.php new file mode 100644 index 0000000000..c1306cbb83 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-blog.php @@ -0,0 +1,55 @@ + __( 'Blog footer', 'twentytwentytwo' ), + 'categories' => array( 'footer' ), + 'blockTypes' => array( 'core/template-part/footer' ), + 'content' => ' +
+
+
+

' . esc_html__( 'About us', 'twentytwentytwo' ) . '

+ + + +

' . esc_html__( 'We are a rogue collective of bird watchers. We’ve been known to sneak through fences, climb perimeter walls, and generally trespass in order to observe the rarest of birds.', 'twentytwentytwo' ) . '

+
+ + + +
+

' . esc_html__( 'Latest posts', 'twentytwentytwo' ) . '

+ + +
+ + + +
+

' . esc_html__( 'Categories', 'twentytwentytwo' ) . '

+ + +
+
+ + + + + + + +
+ + +

' . + sprintf( + /* Translators: WordPress link. */ + esc_html__( 'Proudly powered by %s', 'twentytwentytwo' ), + 'WordPress' + ) . '

+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-dark.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-dark.php new file mode 100644 index 0000000000..50259ebe3f --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-dark.php @@ -0,0 +1,23 @@ + __( 'Dark footer with title and citation', 'twentytwentytwo' ), + 'categories' => array( 'footer' ), + 'blockTypes' => array( 'core/template-part/footer' ), + 'content' => ' +
+
+ + +

' . + sprintf( + /* Translators: WordPress link. */ + esc_html__( 'Proudly powered by %s', 'twentytwentytwo' ), + 'WordPress' + ) . '

+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-default.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-default.php new file mode 100644 index 0000000000..3682643084 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-default.php @@ -0,0 +1,23 @@ + __( 'Default footer', 'twentytwentytwo' ), + 'categories' => array( 'footer' ), + 'blockTypes' => array( 'core/template-part/footer' ), + 'content' => ' +
+
+ + +

' . + sprintf( + /* Translators: WordPress link. */ + esc_html__( 'Proudly powered by %s', 'twentytwentytwo' ), + 'WordPress' + ) . '

+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-logo.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-logo.php new file mode 100644 index 0000000000..caa44e8c34 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-logo.php @@ -0,0 +1,23 @@ + __( 'Footer with logo and citation', 'twentytwentytwo' ), + 'categories' => array( 'footer' ), + 'blockTypes' => array( 'core/template-part/footer' ), + 'content' => ' +
+
+ + +

' . + sprintf( + /* Translators: WordPress link. */ + esc_html__( 'Proudly powered by %s', 'twentytwentytwo' ), + 'WordPress' + ) . '

+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-navigation-copyright.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-navigation-copyright.php new file mode 100644 index 0000000000..d0b554249d --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-navigation-copyright.php @@ -0,0 +1,24 @@ + __( 'Footer with navigation and copyright', 'twentytwentytwo' ), + 'categories' => array( 'footer' ), + 'blockTypes' => array( 'core/template-part/footer' ), + 'content' => ' +
+
+ + + + + + + + +

' . esc_html__( '© Site Title', 'twentytwentytwo' ) . '

+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-navigation.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-navigation.php new file mode 100644 index 0000000000..79792c730d --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-navigation.php @@ -0,0 +1,25 @@ + __( 'Footer with navigation and citation', 'twentytwentytwo' ), + 'categories' => array( 'footer' ), + 'blockTypes' => array( 'core/template-part/footer' ), + 'content' => ' +
+
+ + + + +

' . + sprintf( + /* Translators: WordPress link. */ + esc_html__( 'Proudly powered by %s', 'twentytwentytwo' ), + 'WordPress' + ) . '

+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-query-images-title-citation.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-query-images-title-citation.php new file mode 100644 index 0000000000..a79c1d44cd --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-query-images-title-citation.php @@ -0,0 +1,41 @@ + __( 'Footer with query, featured images, title, and citation', 'twentytwentytwo' ), + 'categories' => array( 'footer' ), + 'blockTypes' => array( 'core/template-part/footer' ), + 'content' => ' +
+
+ + + + + + + +
+ + + + + + + +
+ +
+ +

' . + sprintf( + /* Translators: WordPress link. */ + esc_html__( 'Proudly powered by %s', 'twentytwentytwo' ), + 'WordPress' + ) . '

+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-query-title-citation.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-query-title-citation.php new file mode 100644 index 0000000000..13bb43df5c --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-query-title-citation.php @@ -0,0 +1,39 @@ + __( 'Footer with query, title, and citation', 'twentytwentytwo' ), + 'categories' => array( 'footer' ), + 'blockTypes' => array( 'core/template-part/footer' ), + 'content' => ' +
+
+ + + + + +
+ + + + + + + +
+ +
+ +

' . + sprintf( + /* Translators: WordPress link. */ + esc_html__( 'Proudly powered by %s', 'twentytwentytwo' ), + 'WordPress' + ) . '

+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-social-copyright.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-social-copyright.php new file mode 100644 index 0000000000..0c7e4ae517 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-social-copyright.php @@ -0,0 +1,28 @@ + __( 'Footer with social links and copyright', 'twentytwentytwo' ), + 'categories' => array( 'footer' ), + 'blockTypes' => array( 'core/template-part/footer' ), + 'content' => ' +
+
+
    + + + +
+ + + + + + + +

' . esc_html__( '© Site Title', 'twentytwentytwo' ) . '

+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-title-tagline-social.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-title-tagline-social.php new file mode 100644 index 0000000000..84d888b22d --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/footer-title-tagline-social.php @@ -0,0 +1,26 @@ + __( 'Footer with title, tagline, and social links on a dark background', 'twentytwentytwo' ), + 'categories' => array( 'footer' ), + 'blockTypes' => array( 'core/template-part/footer' ), + 'content' => ' +
+
+
+ +
+ + + +
    + + + +
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/general-divider-dark.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-divider-dark.php new file mode 100644 index 0000000000..e13422c865 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-divider-dark.php @@ -0,0 +1,13 @@ + __( 'Divider with image and color (dark)', 'twentytwentytwo' ), + 'categories' => array( 'featured' ), + 'content' => ' +
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/general-divider-light.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-divider-light.php new file mode 100644 index 0000000000..5df910ea8e --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-divider-light.php @@ -0,0 +1,13 @@ + __( 'Divider with image and color (light)', 'twentytwentytwo' ), + 'categories' => array( 'featured' ), + 'content' => ' +
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/general-featured-posts.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-featured-posts.php new file mode 100644 index 0000000000..55cbdfd92d --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-featured-posts.php @@ -0,0 +1,25 @@ + __( 'Featured posts', 'twentytwentytwo' ), + 'categories' => array( 'featured', 'query' ), + 'content' => ' +
+

' . esc_html__( 'Latest posts', 'twentytwentytwo' ) . '

+ + + +
+ + + + + + + +
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/general-image-with-caption.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-image-with-caption.php new file mode 100644 index 0000000000..0870da3951 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-image-with-caption.php @@ -0,0 +1,19 @@ + __( 'Image with caption', 'twentytwentytwo' ), + 'categories' => array( 'featured', 'columns', 'gallery' ), + 'content' => ' +
+
' . esc_attr__( 'Hummingbird illustration', 'twentytwentytwo' ) . '
+

' . esc_html__( 'Hummingbird', 'twentytwentytwo' ) . '

+ + + +

' . esc_html__( 'A beautiful bird featuring a surprising set of color feathers.', 'twentytwentytwo' ) . '

+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/general-large-list-names.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-large-list-names.php new file mode 100644 index 0000000000..d7bd8168fa --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-large-list-names.php @@ -0,0 +1,35 @@ + __( 'Large list of names', 'twentytwentytwo' ), + 'categories' => array( 'featured', 'text' ), + 'content' => ' +
+
+
' . esc_attr__( 'An icon representing binoculars.', 'twentytwentytwo' ) . '
+
+ + + +
+ + + + +

' . esc_html__( 'Jesús Rodriguez, Doug Stilton, Emery Driscoll, Megan Perry, Rowan Price, Angelo Tso, Edward Stilton, Amy Jensen, Boston Bell, Shay Ford, Lee Cunningham, Evelynn Ray, Landen Reese, Ewan Hart, Jenna Chan, Phoenix Murray, Mel Saunders, Aldo Davidson, Zain Hall.', 'twentytwentytwo' ) . '

+ + + + + + + +
+
' . esc_html__( 'Read more', 'twentytwentytwo' ) . '
+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/general-layered-images-with-duotone.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-layered-images-with-duotone.php new file mode 100644 index 0000000000..629a0a2a12 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-layered-images-with-duotone.php @@ -0,0 +1,13 @@ + __( 'Layered images with duotone', 'twentytwentytwo' ), + 'categories' => array( 'featured', 'gallery' ), + 'content' => ' +
' . esc_attr__( 'Painting of ducks in the water.', 'twentytwentytwo' ) . '
+
' . esc_attr__( 'Illustration of a flying bird.', 'twentytwentytwo' ) . '
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/general-list-events.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-list-events.php new file mode 100644 index 0000000000..af680dc2cd --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-list-events.php @@ -0,0 +1,133 @@ + __( 'List of events', 'twentytwentytwo' ), + 'categories' => array( 'featured', 'text' ), + 'content' => ' +
+
+

' . esc_html__( 'Speaker Series', 'twentytwentytwo' ) . '

+ + + + + + + +
+ + + +
+
+

' . esc_html__( 'May 14th, 2022, 6 PM', 'twentytwentytwo' ) . '

+
+ + + +
+

' . esc_html__( 'Jesús Rodriguez', 'twentytwentytwo' ) . '

+
+ + + +
+

' . wp_kses_post( __( 'The Vintagé Theater
245 Arden Rd.
Gardenville, NH', 'twentytwentytwo' ) ) . '

+
+
+ + + +
+ + + +
+
+

' . esc_html__( 'May 16th, 2022, 6 PM', 'twentytwentytwo' ) . '

+
+ + + +
+

' . esc_html__( 'Doug Stilton', 'twentytwentytwo' ) . '

+
+ + + +
+

' . wp_kses_post( __( 'The Swell Theater
120 River Rd.
Rainfall, NH', 'twentytwentytwo' ) ) . '

+
+
+ + + +
+ + + +
+
+

' . esc_html__( 'May 18th, 2022, 7 PM', 'twentytwentytwo' ) . '

+
+ + + +
+

' . esc_html__( 'Amy Jensen', 'twentytwentytwo' ) . '

+
+ + + +
+

' . wp_kses_post( __( 'The Vintagé Theater
245 Arden Rd.
Gardenville, NH', 'twentytwentytwo' ) ) . '

+
+
+ + + +
+ + + +
+
+

' . esc_html__( 'May 20th, 2022, 6 PM', 'twentytwentytwo' ) . '

+
+ + + +
+

' . esc_html__( 'Emery Driscoll', 'twentytwentytwo' ) . '

+
+ + + +
+

' . wp_kses_post( __( 'The Swell Theater
120 River Rd.
Rainfall, NH', 'twentytwentytwo' ) ) . '

+
+
+ + + +
+ + + + + + + +
+
    + + + +
+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/general-pricing-table.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-pricing-table.php new file mode 100644 index 0000000000..b385eddf25 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-pricing-table.php @@ -0,0 +1,93 @@ + __( 'Pricing table', 'twentytwentytwo' ), + 'categories' => array( 'featured', 'columns', 'buttons' ), + 'content' => ' +
+
+
+ + + +

' . esc_html( _x( '1', 'First item in a numbered list.', 'twentytwentytwo' ) ) . '

+ + + +

' . esc_html__( 'Pigeon', 'twentytwentytwo' ) . '

+ + + +

' . esc_html__( 'Help support our growing community by joining at the Pigeon level. Your support will help pay our writers, and you’ll get access to our exclusive newsletter.', 'twentytwentytwo' ) . '

+ + + +
+
' . esc_html__( '$25', 'twentytwentytwo' ) . '
+
+ + + + +
+ + + +
+
+ + + +

' . esc_html( _x( '2', 'Second item in a numbered list.', 'twentytwentytwo' ) ) . '

+ + + +

' . esc_html__( 'Sparrow', 'twentytwentytwo' ) . '

+ + + +

' . esc_html__( 'Join at the Sparrow level and become a member of our flock! You’ll receive our newsletter, plus a bird pin that you can wear with pride when you’re out in nature.', 'twentytwentytwo' ) . '

+ + + +
+
' . esc_html__( '$75', 'twentytwentytwo' ) . '
+
+ + + + +
+ + + +
+
+ + + +

' . esc_html( _x( '3', 'Third item in a numbered list.', 'twentytwentytwo' ) ) . '

+ + + +

' . esc_html__( 'Falcon', 'twentytwentytwo' ) . '

+ + + +

' . esc_html__( 'Play a leading role for our community by joining at the Falcon level. This level earns you a seat on our board, where you can help plan future birdwatching expeditions.', 'twentytwentytwo' ) . '

+ + + +
+
' . esc_html__( '$150', 'twentytwentytwo' ) . '
+
+ + + + +
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/general-subscribe.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-subscribe.php new file mode 100644 index 0000000000..34137cd20a --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-subscribe.php @@ -0,0 +1,27 @@ + __( 'Subscribe callout', 'twentytwentytwo' ), + 'categories' => array( 'featured', 'buttons' ), + 'content' => ' +
+
+

' . wp_kses_post( __( 'Watch birds
from your inbox', 'twentytwentytwo' ) ) . '

+ + + +
+
' . esc_html__( 'Join our mailing list', 'twentytwentytwo' ) . '
+
+
+ + + +
+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/general-two-images-text.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-two-images-text.php new file mode 100644 index 0000000000..593d2b93bb --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-two-images-text.php @@ -0,0 +1,47 @@ + __( 'Two images with text', 'twentytwentytwo' ), + 'categories' => array( 'featured', 'columns', 'gallery' ), + 'content' => ' +
+
+
' . esc_attr__( 'Illustration of a bird sitting on a branch.', 'twentytwentytwo' ) . '
+
+ + + +
+
' . esc_attr__( 'Illustration of a bird flying.', 'twentytwentytwo' ) . '
+ + + + + + + +

' . esc_html__( 'SCREENING', 'twentytwentytwo' ) . '

+ + + +

' . wp_kses_post( __( 'May 14th, 2022 @ 7:00PM
The Vintagé Theater,
245 Arden Rd.
Gardenville, NH', 'twentytwentytwo' ) ) . '

+ + + + + + + + + + + +
+
' . esc_html__( 'Buy Tickets', 'twentytwentytwo' ) . '
+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/general-video-header-details.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-video-header-details.php new file mode 100644 index 0000000000..3b15a52066 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-video-header-details.php @@ -0,0 +1,47 @@ + __( 'Video with header and details', 'twentytwentytwo' ), + 'categories' => array( 'featured', 'columns' ), + 'content' => ' +
+
+

' . wp_kses_post( __( 'Warble, a film about
hobbyist bird watchers.', 'twentytwentytwo' ) ) . '

+ + + + + + + +
+ + + + + + + +
+
+

' . esc_html__( 'Featuring', 'twentytwentytwo' ) . '

+
+ + + +
+

' . wp_kses_post( __( 'Jesús Rodriguez
Doug Stilton
Emery Driscoll
Megan Perry
Rowan Price', 'twentytwentytwo' ) ) . '

+
+ + + +
+

' . wp_kses_post( __( 'Angelo Tso
Edward Stilton
Amy Jensen
Boston Bell
Shay Ford', 'twentytwentytwo' ) ) . '

+
+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/general-video-trailer.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-video-trailer.php new file mode 100644 index 0000000000..22ed24860b --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-video-trailer.php @@ -0,0 +1,27 @@ + __( 'Video trailer', 'twentytwentytwo' ), + 'categories' => array( 'featured', 'columns' ), + 'content' => ' +
+
+
+

' . esc_html__( 'Extended Trailer', 'twentytwentytwo' ) . '

+ + + +

' . esc_html__( 'A film about hobbyist bird watchers, a catalog of different birds, paired with the noises they make. Each bird is listed by their scientific name so things seem more official.', 'twentytwentytwo' ) . '

+
+ + + +
+
+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/general-wide-image-intro-buttons.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-wide-image-intro-buttons.php new file mode 100644 index 0000000000..ea9ecf2911 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/general-wide-image-intro-buttons.php @@ -0,0 +1,41 @@ + __( 'Wide image with introduction and buttons', 'twentytwentytwo' ), + 'categories' => array( 'featured', 'columns' ), + 'content' => ' +
+
' . esc_attr__( 'Illustration of a bird flying.', 'twentytwentytwo' ) . '
+ + + +
+
+

' . wp_kses_post( __( 'Welcome to
the Aviary', 'twentytwentytwo' ) ) . '

+
+ + + +
+

' . esc_html__( 'A film about hobbyist bird watchers, a catalog of different birds, paired with the noises they make. Each bird is listed by their scientific name so things seem more official.', 'twentytwentytwo' ) . '

+ + + + + + + +
+
' . esc_html__( 'Learn More', 'twentytwentytwo' ) . '
+ + + +
' . esc_html__( 'Buy Tickets', 'twentytwentytwo' ) . '
+
+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-logo-black-background.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-logo-black-background.php new file mode 100644 index 0000000000..c2cac8dcef --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-logo-black-background.php @@ -0,0 +1,22 @@ + __( 'Header with centered logo and black background', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+ + + + + + + + + +
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-logo.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-logo.php new file mode 100644 index 0000000000..a116c39086 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-logo.php @@ -0,0 +1,26 @@ + __( 'Header with centered logo', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
+
+ + + +
+ + + +
+ +
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-title-navigation-social.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-title-navigation-social.php new file mode 100644 index 0000000000..2e4dc451d1 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-title-navigation-social.php @@ -0,0 +1,30 @@ + __( 'Centered header with navigation, social links, and salmon background', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
+
+ +
+ + + +
+ + + +
+
    + +
+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-default.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-default.php new file mode 100644 index 0000000000..ff25793275 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-default.php @@ -0,0 +1,23 @@ + __( 'Default header', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
+
+ + +
+ + + + +
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-image-background-overlay.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-image-background-overlay.php new file mode 100644 index 0000000000..55422aa41b --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-image-background-overlay.php @@ -0,0 +1,20 @@ + __( 'Header with image background and overlay', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
' . esc_attr__( 'Painting of ducks in the water.', 'twentytwentytwo' ) . '
+
+ + + +
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-image-background.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-image-background.php new file mode 100644 index 0000000000..4afd36c551 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-image-background.php @@ -0,0 +1,24 @@ + __( 'Header with image background', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
' . esc_attr__( 'Illustration of a flying bird', 'twentytwentytwo' ) . '
+
+ + + +
+ + + + +
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-large-dark.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-large-dark.php new file mode 100644 index 0000000000..dfb8c6f371 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-large-dark.php @@ -0,0 +1,34 @@ + __( 'Large header with dark background', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
+
+
+ +
+ + + + +
+ + + +

' . wp_kses_post( __( 'The Hatchery: a blog about my adventures in bird watching', 'twentytwentytwo' ) ) . '

+
+ + + +
' . esc_attr__( 'Illustration of a bird flying.', 'twentytwentytwo' ) . '
+
+ + + ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-gray-background.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-gray-background.php new file mode 100644 index 0000000000..dbe8de9fe4 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-gray-background.php @@ -0,0 +1,18 @@ + __( 'Logo and navigation header with gray background', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
+ + + +
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-offset-tagline.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-offset-tagline.php new file mode 100644 index 0000000000..299586f0ec --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-offset-tagline.php @@ -0,0 +1,30 @@ + __( 'Logo, navigation, and offset tagline Header', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
+
+ + + +
+ + + +
+
+ + + +
+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-social-black-background.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-social-black-background.php new file mode 100644 index 0000000000..f881b41d81 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-social-black-background.php @@ -0,0 +1,24 @@ + __( 'Logo, navigation, and social links header with black background', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
+ + + + + +
    + +
+ +
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-small-dark.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-small-dark.php new file mode 100644 index 0000000000..7c26516fe6 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-small-dark.php @@ -0,0 +1,31 @@ + __( 'Small header with dark background', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
+
+
+ +
+ + + + +
+
+ + + +
' . esc_attr__( 'Illustration of a bird flying.', 'twentytwentytwo' ) . '
+
+ + + + ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-stacked.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-stacked.php new file mode 100644 index 0000000000..bd36bbf4b9 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-stacked.php @@ -0,0 +1,28 @@ + __( 'Logo and navigation header', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
+ + + + + + + + + + + + + +
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-green-background.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-green-background.php new file mode 100644 index 0000000000..0e11c13607 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-green-background.php @@ -0,0 +1,22 @@ + __( 'Text-only header with green background', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
+
+ +
+ + + + +
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-salmon-background.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-salmon-background.php new file mode 100644 index 0000000000..b03e528a48 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-salmon-background.php @@ -0,0 +1,18 @@ + __( 'Text-only header with salmon background', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
+ + + +
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-with-tagline-black-background.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-with-tagline-black-background.php new file mode 100644 index 0000000000..4c2a4864f0 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-with-tagline-black-background.php @@ -0,0 +1,22 @@ + __( 'Text-only header with tagline and black background', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
+
+ +
+ + + + +
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-title-and-button.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-title-and-button.php new file mode 100644 index 0000000000..5c780697da --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-title-and-button.php @@ -0,0 +1,18 @@ + __( 'Title and button header', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
+ + + +
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-title-navigation-social.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-title-navigation-social.php new file mode 100644 index 0000000000..384cda5368 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-title-navigation-social.php @@ -0,0 +1,24 @@ + __( 'Title, navigation, and social links header', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
+ + + + + +
    + +
+ +
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-with-tagline.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-with-tagline.php new file mode 100644 index 0000000000..40e633a268 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-with-tagline.php @@ -0,0 +1,26 @@ + __( 'Header with tagline', 'twentytwentytwo' ), + 'categories' => array( 'header' ), + 'blockTypes' => array( 'core/template-part/header' ), + 'content' => ' +
+
+
+ + +
+ +
+
+ + + + +
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/hidden-404.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/hidden-404.php new file mode 100644 index 0000000000..9cfd50d56e --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/hidden-404.php @@ -0,0 +1,15 @@ + __( '404 content', 'twentytwentytwo' ), + 'inserter' => false, + 'content' => ' +

' . esc_html( _x( '404', 'Error code for a webpage that is not found.', 'twentytwentytwo' ) ) . '

+ + +

' . esc_html__( 'This page could not be found. Maybe try a search?', 'twentytwentytwo' ) . '

+ + ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/hidden-bird.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/hidden-bird.php new file mode 100644 index 0000000000..c29d3d440a --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/hidden-bird.php @@ -0,0 +1,14 @@ + __( 'Heading and bird image', 'twentytwentytwo' ), + 'inserter' => false, + 'content' => ' +
' . esc_attr__( 'Illustration of a bird flying.', 'twentytwentytwo' ) . '
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/hidden-heading-and-bird.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/hidden-heading-and-bird.php new file mode 100644 index 0000000000..28f3d6c5de --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/hidden-heading-and-bird.php @@ -0,0 +1,21 @@ + __( 'Heading and bird image', 'twentytwentytwo' ), + 'inserter' => false, + 'content' => ' +
+

' . wp_kses_post( __( 'The Hatchery: a blog about my adventures in bird watching', 'twentytwentytwo' ) ) . '

+
+ + + +
' . esc_attr__( 'Illustration of a bird flying.', 'twentytwentytwo' ) . '
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-large-image-and-buttons.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-large-image-and-buttons.php new file mode 100644 index 0000000000..7e03ed41e2 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-large-image-and-buttons.php @@ -0,0 +1,79 @@ + __( 'About page with large image and buttons', 'twentytwentytwo' ), + 'categories' => array( 'pages', 'buttons' ), + 'content' => ' +
+
+ + + +
+
+
+
' . esc_html__( 'Purchase my work', 'twentytwentytwo' ) . '
+
+
+ + + +
+
+
' . esc_html__( 'Support my studio', 'twentytwentytwo' ) . '
+
+
+ + + +
+
+
' . esc_html__( 'Take a class', 'twentytwentytwo' ) . '
+
+
+
+ + + +
+
+
+
' . esc_html__( 'Read about me', 'twentytwentytwo' ) . '
+
+
+ + + +
+
+
' . esc_html__( 'Learn about my process', 'twentytwentytwo' ) . '
+
+
+ + + +
+
+
' . esc_html__( 'Join my mailing list', 'twentytwentytwo' ) . '
+
+
+
+ + + + + + + +
    + + + + + +
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-links-dark.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-links-dark.php new file mode 100644 index 0000000000..ccb0ec2005 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-links-dark.php @@ -0,0 +1,47 @@ + __( 'About page links (dark)', 'twentytwentytwo' ), + 'categories' => array( 'pages', 'buttons' ), + 'content' => ' +
+
+ + +
' . esc_attr__( 'Logo featuring a flying bird', 'twentytwentytwo' ) . '
+ + + +

' . esc_html__( 'A trouble of hummingbirds', 'twentytwentytwo' ) . '

+ + + + + + + +
+
' . esc_html__( 'Watch our videos', 'twentytwentytwo' ) . '
+ + + +
' . esc_html__( 'Listen on iTunes Podcasts', 'twentytwentytwo' ) . '
+ + + +
' . esc_html__( 'Listen on Spotify', 'twentytwentytwo' ) . '
+ + + +
' . esc_html__( 'Support the show', 'twentytwentytwo' ) . '
+ + + +
' . esc_html__( 'About the hosts', 'twentytwentytwo' ) . '
+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-links.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-links.php new file mode 100644 index 0000000000..997cf03869 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-links.php @@ -0,0 +1,65 @@ + __( 'About page links', 'twentytwentytwo' ), + 'categories' => array( 'pages', 'buttons' ), + 'content' => ' +
+
' . esc_attr__( 'Logo featuring a flying bird', 'twentytwentytwo' ) . '
+ + + +
+ + +

' . esc_html__( 'Swoop', 'twentytwentytwo' ) . '

+ + + +

' . esc_html__( 'A podcast about birds', 'twentytwentytwo' ) . '

+ + + + + + + +
+
' . esc_html__( 'Watch our videos', 'twentytwentytwo' ) . '
+ + + +
' . esc_html__( 'Listen on iTunes Podcasts', 'twentytwentytwo' ) . '
+ + + +
' . esc_html__( 'Listen on Spotify', 'twentytwentytwo' ) . '
+ + + +
' . esc_html__( 'Support the show', 'twentytwentytwo' ) . '
+ + + +
' . esc_html__( 'About the hosts', 'twentytwentytwo' ) . '
+
+
+ + + + + + + +
    + + + + + +
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-media-left.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-media-left.php new file mode 100644 index 0000000000..ea805944db --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-media-left.php @@ -0,0 +1,41 @@ + __( 'About page with media on the left', 'twentytwentytwo' ), + 'categories' => array( 'pages' ), + 'content' => ' +
' . esc_attr__( 'Image of a bird on a branch', 'twentytwentytwo' ) . '
+ + + + + + +
+

' . esc_html__( 'Doug', 'twentytwentytwo' ) . '
' . esc_html__( 'Stilton', 'twentytwentytwo' ) . '

+ + + +

' . esc_html__( 'Oh hello. My name’s Doug, and you’ve found your way to my website. I’m an avid bird watcher, and I also broadcast my own radio show on Tuesday evenings at 11PM EDT.', 'twentytwentytwo' ) . '

+ + + + + + + +
    + + + +
+
+ + + + +
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-media-right.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-media-right.php new file mode 100644 index 0000000000..2493d5d4aa --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-media-right.php @@ -0,0 +1,40 @@ + __( 'About page with media on the right', 'twentytwentytwo' ), + 'categories' => array( 'pages' ), + 'content' => ' +
' . esc_attr__( 'An image of a bird flying', 'twentytwentytwo' ) . '
+ + + + + +
+

' . wp_kses_post( __( 'Emery
Driscoll', 'twentytwentytwo' ) ) . '

+ + + +

' . esc_html__( 'Oh hello. My name’s Emery, and you’ve found your way to my website. I’m an avid bird watcher, and I also broadcast my own radio show on Tuesday evenings at 11PM EDT.', 'twentytwentytwo' ) . '

+ + + + + + + +
    + + + +
+
+
+ + + +
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-simple-dark.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-simple-dark.php new file mode 100644 index 0000000000..131a48b45c --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-simple-dark.php @@ -0,0 +1,45 @@ + __( 'Simple dark about page', 'twentytwentytwo' ), + 'categories' => array( 'pages' ), + 'content' => ' +
+ + + + +
+
+ + +

' . wp_kses_post( __( 'Jesús
Rodriguez', 'twentytwentytwo' ) ) . '

+ + + +

' . esc_html__( 'Oh hello. My name’s Jesús, and you’ve found your way to my website. I’m an avid bird watcher, and I also broadcast my own radio show on Tuesday evenings at 11PM EDT.', 'twentytwentytwo' ) . '

+ + + + + + + +
    + + + +
+
+ + + +
+
+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-solid-color.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-solid-color.php new file mode 100644 index 0000000000..df8903d9ad --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-about-solid-color.php @@ -0,0 +1,41 @@ + __( 'About page on solid color background', 'twentytwentytwo' ), + 'categories' => array( 'pages' ), + 'content' => ' +
+
+
+ + +

' . wp_kses_post( __( 'Edvard
Smith', 'twentytwentytwo' ) ) . '

+ + + + + + + +

' . esc_html__( 'Oh hello. My name’s Edvard, and you’ve found your way to my website. I’m an avid bird watcher, and I also broadcast my own radio show every Tuesday evening at 11PM EDT. Listen in sometime!', 'twentytwentytwo' ) . '

+ + + + + + + +
    + + + +
+ + +
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-image-and-text.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-image-and-text.php new file mode 100644 index 0000000000..7b6fa3ad81 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-image-and-text.php @@ -0,0 +1,32 @@ + __( 'Page layout with image and text', 'twentytwentytwo' ), + 'categories' => array( 'pages' ), + 'content' => ' +
+

' . wp_kses_post( __( 'Watching Birds
in the Garden', 'twentytwentytwo' ) ) . '

+
+ + + +
' . esc_attr_x( 'TBD', 'Short for to be determined', 'twentytwentytwo' ) . '
+ + + +
+ +
+
+ + + +
+

' . wp_kses_post( __( 'Oh hello. My name’s Angelo, and I operate this blog. I was born in Portland, but I currently live in upstate New York. You may recognize me from publications with names like Eagle Beagle and Mourning Dive. I write for a living.

I usually use this blog to catalog extensive lists of birds and other things that I find interesting. If you find an error with one of my lists, please keep it to yourself.

If that’s not your cup of tea, I definitely recommend this tea. It’s my favorite.', 'twentytwentytwo' ) ) . '

+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-image-text-and-video.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-image-text-and-video.php new file mode 100644 index 0000000000..7a7a6b79d3 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-image-text-and-video.php @@ -0,0 +1,65 @@ + __( 'Page layout with image, text and video', 'twentytwentytwo' ), + 'categories' => array( 'pages' ), + 'content' => ' +
+
+

' . wp_kses_post( __( 'Warble, a film about
hobbyist bird watchers.', 'twentytwentytwo' ) ) . '

+ + + + + + + +
+
+

' . esc_html__( 'Screening', 'twentytwentytwo' ) . '

+ + + +

' . wp_kses_post( __( 'May 14th, 2022 @ 7:00PM
The Vintagé Theater,
245 Arden Rd.
Gardenville, NH', 'twentytwentytwo' ) ) . '

+ + + +
+
' . esc_html__( 'Buy Tickets', 'twentytwentytwo' ) . '
+
+
+ + + +
+
+
+ + + +
' . esc_attr__( 'An illustration of a bird in flight', 'twentytwentytwo' ) . '
+ + + +
+
+
+

' . esc_html__( 'Extended Trailer', 'twentytwentytwo' ) . '

+ + + +

' . esc_html__( 'Oh hello. My name’s Angelo, and you’ve found your way to my blog. I write about a range of topics, but lately I’ve been sharing my hopes for next year.', 'twentytwentytwo' ) . '

+
+ + + +
+
+
+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-two-columns.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-two-columns.php new file mode 100644 index 0000000000..2a27dfe824 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-layout-two-columns.php @@ -0,0 +1,73 @@ + __( 'Page layout with two columns', 'twentytwentytwo' ), + 'categories' => array( 'pages' ), + 'content' => ' +
+

' . wp_kses_post( __( 'Goldfinch
& Sparrow', 'twentytwentytwo' ) ) . '

+ + + + + + + +
+
+
+

' . esc_html__( 'WELCOME', 'twentytwentytwo' ) . '

+
+ + + +
+
+
+
+
+ + + +
+
+

' . wp_kses_post( __( 'Oh hello. My name’s Angelo, and I operate this blog. I was born in Portland, but I currently live in upstate New York. You may recognize me from publications with names like Eagle Beagle and Mourning Dive. I write for a living.

I usually use this blog to catalog extensive lists of birds and other things that I find interesting. If you find an error with one of my lists, please keep it to yourself.

If that’s not your cup of tea, I definitely recommend this tea. It’s my favorite.', 'twentytwentytwo' ) ) . '

+
+ + + +
+
+ + + + + + + +
+
+
+
+ + + +
+

' . esc_html__( 'POSTS', 'twentytwentytwo' ) . '

+
+
+ + + +
+
+ + + +
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-blog-posts-right.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-blog-posts-right.php new file mode 100644 index 0000000000..84e3b081c6 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-blog-posts-right.php @@ -0,0 +1,87 @@ + __( 'Blog posts with right sidebar', 'twentytwentytwo' ), + 'categories' => array( 'pages' ), + 'content' => ' +
+
+
+ + + + +
+ + + + + + + +
+
+
+ + + + + + + +
+ + + +
+ + + + + + + + + + + + + +
+
+ + + +
+
' . esc_attr__( 'Illustration of a flying bird.', 'twentytwentytwo' ) . '
+ + + + + + + + + + + + + + + +

' . esc_html__( 'Categories', 'twentytwentytwo' ) . '

+ + + + + +

' . esc_html__( 'Tags', 'twentytwentytwo' ) . '

+ + +
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-blog-posts.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-blog-posts.php new file mode 100644 index 0000000000..c40b207360 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-blog-posts.php @@ -0,0 +1,79 @@ + __( 'Blog posts with left sidebar', 'twentytwentytwo' ), + 'categories' => array( 'pages' ), + 'content' => ' +
+
+
+
+ + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+
+ + + +
+
+ + + + + + + +
+ + + +
+ + + + + + + + + + + + + +
+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-grid-posts.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-grid-posts.php new file mode 100644 index 0000000000..3a4f037eed --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-grid-posts.php @@ -0,0 +1,77 @@ + __( 'Grid of posts with left sidebar', 'twentytwentytwo' ), + 'categories' => array( 'pages' ), + 'content' => ' +
+
+
+ + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + +
+
+ + + +
+ +
+ + + + +
+ + + + + + + + +
+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-poster.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-poster.php new file mode 100644 index 0000000000..62df8059ec --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/page-sidebar-poster.php @@ -0,0 +1,65 @@ + __( 'Poster with right sidebar', 'twentytwentytwo' ), + 'categories' => array( 'pages' ), + 'content' => ' +
+
+
+ + +

' . wp_kses_post( __( 'Flutter, a collection of bird-related ephemera', 'twentytwentytwo' ) ) . '

+
+ + + +
+
+ + + +
+
+
' . esc_attr__( 'Image of a bird on a branch', 'twentytwentytwo' ) . '
+
+ + + +
+
' . esc_attr__( 'An icon representing binoculars.', 'twentytwentytwo' ) . '
+ + + + + + + +

' . esc_html__( 'Date', 'twentytwentytwo' ) . '

+ + + +

' . esc_html__( 'February, 12 2021', 'twentytwentytwo' ) . '

+ + + + + + + +

' . esc_html__( 'Location', 'twentytwentytwo' ) . '

+ + + +

' . wp_kses_post( __( 'The Grand Theater
154 Eastern Avenue
Maryland NY, 12345', 'twentytwentytwo' ) ) . '

+ + + + +
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/query-default.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/query-default.php new file mode 100644 index 0000000000..7cebaccf75 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/query-default.php @@ -0,0 +1,50 @@ + __( 'Default posts', 'twentytwentytwo' ), + 'categories' => array( 'query' ), + 'blockTypes' => array( 'core/query' ), + 'content' => ' +
+ +
+ + + + +
+
+ +
+ + + +
+
+ + + + + + + +
+ + + + +
+ + + + + + + + + +
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/query-grid.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/query-grid.php new file mode 100644 index 0000000000..f695eba354 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/query-grid.php @@ -0,0 +1,32 @@ + __( 'Grid of posts', 'twentytwentytwo' ), + 'categories' => array( 'query' ), + 'blockTypes' => array( 'core/query' ), + 'content' => ' +
+ + + + + + + + + + +
+ + + + + + + + +
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/query-image-grid.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/query-image-grid.php new file mode 100644 index 0000000000..e5672e3c1c --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/query-image-grid.php @@ -0,0 +1,36 @@ + __( 'Grid of image posts', 'twentytwentytwo' ), + 'categories' => array( 'query' ), + 'blockTypes' => array( 'core/query' ), + 'content' => ' +
+ + + +
+
+ + + +
+
+ + + + +
+ + + + + + + + +
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/query-irregular-grid.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/query-irregular-grid.php new file mode 100644 index 0000000000..c5da08ab74 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/query-irregular-grid.php @@ -0,0 +1,170 @@ + __( 'Irregular grid of posts', 'twentytwentytwo' ), + 'categories' => array( 'query' ), + 'blockTypes' => array( 'core/query' ), + 'content' => ' +
+
+
+
+ + + + + + + +
+
+ + + +
+
+ + + + + + + + + + + +
+
+ + + +
+
+ + + + + + + + + + + +
+
+
+ + + +
+
+
+ + + + + + + +
+
+ + + +
+
+ + + + + + + + + + + +
+
+ + + +
+
+ + + + + + + + + + + +
+
+
+ + + +
+
+
+ + + + + + + + + + + +
+
+ + + +
+
+ + + + + + + + + + + +
+
+ + + +
+
+ + + + + + + + + + + +
+
+
+
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/query-large-titles.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/query-large-titles.php new file mode 100644 index 0000000000..6ff8afadfe --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/query-large-titles.php @@ -0,0 +1,26 @@ + __( 'Large post titles', 'twentytwentytwo' ), + 'categories' => array( 'query' ), + 'blockTypes' => array( 'core/query' ), + 'content' => ' +
+ +
+
+ + + +
+
+ + + +
+ +
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/query-simple-blog.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/query-simple-blog.php new file mode 100644 index 0000000000..4b089846dd --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/query-simple-blog.php @@ -0,0 +1,38 @@ + __( 'Simple blog posts', 'twentytwentytwo' ), + 'categories' => array( 'query' ), + 'blockTypes' => array( 'core/query' ), + 'content' => ' +
+ + + + + + + +
+ + + +
+ + + + + + + + + + + + + +
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/query-text-grid.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/query-text-grid.php new file mode 100644 index 0000000000..a8f84d3cf2 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/query-text-grid.php @@ -0,0 +1,31 @@ + __( 'Text-based grid of posts', 'twentytwentytwo' ), + 'categories' => array( 'query' ), + 'blockTypes' => array( 'core/query' ), + 'content' => ' +
+ + + + + + + + + +
+ + + + + + + + +
+ ', +); diff --git a/src/wp-content/themes/twentytwentytwo/index.php b/src/wp-content/themes/twentytwentytwo/index.php new file mode 100644 index 0000000000..27dc7057dc --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/index.php @@ -0,0 +1,5 @@ + +
+ +
+ diff --git a/src/wp-content/themes/twentytwentytwo/parts/header-large-dark.html b/src/wp-content/themes/twentytwentytwo/parts/header-large-dark.html new file mode 100644 index 0000000000..a63b2d660f --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/parts/header-large-dark.html @@ -0,0 +1,7 @@ + +
+ +
+ + + diff --git a/src/wp-content/themes/twentytwentytwo/parts/header-small-dark.html b/src/wp-content/themes/twentytwentytwo/parts/header-small-dark.html new file mode 100644 index 0000000000..58708579f5 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/parts/header-small-dark.html @@ -0,0 +1,7 @@ + +
+ +
+ + + diff --git a/src/wp-content/themes/twentytwentytwo/parts/header.html b/src/wp-content/themes/twentytwentytwo/parts/header.html new file mode 100644 index 0000000000..31edd6d501 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/parts/header.html @@ -0,0 +1,13 @@ + +
+
+
+ +
+ + + + +
+
+ \ No newline at end of file diff --git a/src/wp-content/themes/twentytwentytwo/readme.txt b/src/wp-content/themes/twentytwentytwo/readme.txt new file mode 100644 index 0000000000..d99cb3a1da --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/readme.txt @@ -0,0 +1,69 @@ +=== Twenty Twenty-Two === +Contributors: wordpressdotorg +Requires at least: 5.9 +Tested up to: 5.9 +Requires PHP: 5.6 +Stable tag: 1.0 +License: GPLv2 or later +License URI: http://www.gnu.org/licenses/gpl-2.0.html + +== Description == + +Built on a solidly designed foundation, Twenty Twenty-Two embraces the idea that everyone deserves a truly unique website. The theme’s subtle styles are inspired by the diversity and versatility of birds: its typography is lightweight yet strong, its color palette is drawn from nature, and its layout elements sit gently on the page. + +The true richness of Twenty Twenty-Two lies in its opportunity for customization. The theme is built to take advantage of the Full Site Editing features introduced in WordPress 5.9, which means that colors, typography, and the layout of every single page on your site can be customized to suit your vision. It also includes dozens of block patterns, opening the door to a wide range of professionally designed layouts in just a few clicks. + +Whether you’re building a single-page website, a blog, a business website, or a portfolio, Twenty Twenty-Two will help you create a site that is uniquely yours. + +== Changelog == + += 1.0 = +* Released: January 25, 2022 + +https://wordpress.org/support/article/twenty-twenty-two-changelog#Version_1.0 + +== Copyright == + +Twenty Twenty-Two WordPress Theme, 2021-2022 WordPress.org +Twenty Twenty-Two is distributed under the terms of the GNU GPL. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +This theme bundles the following third-party resources: + +Source Serif Font +Copyright 2014-2021 Adobe (http://www.adobe.com/) +License: SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1 +Source: https://github.com/adobe-fonts/source-serif + +Block Pattern Images: + +"White Bellied Flycatcher" illustrated by Elizabeth Gould. Public Domain. +https://www.rawpixel.com/image/321474/free-illustration-image-bird-vintage-birds +Includes modified versions created specifically for Twenty Twenty-Two. + +Colorful vintage hummingbird illustrations. CC0. +https://www.rawpixel.com/image/2281674/free-illustration-image-bird-hummingbird-flying +https://www.rawpixel.com/image/2281671/free-illustration-image-bird-hummingbird-flying +https://www.rawpixel.com/image/2281679/free-illustration-image-bird-hummingbird-animals +https://www.rawpixel.com/image/2281665/free-illustration-image-hummingbird-ernst-haeckel-birds + +"Green-tailed Jacamar" by Jacques Barraband. CC0. +https://www.rawpixel.com/image/328508/free-illustration-image-jacques-barraband-paradise + +"Ducks" by Goyō Hashiguchi. CC0 +https://www.rawpixel.com/image/3813787/illustration-image-flower-art-floral + +"Colombes et lis, étoffe imprimée" illustrated by Maurice Pillard Verneuil. +https://www.rawpixel.com/image/2053817/illustration-from-lanimal-dans-decoration +Included as a short video clip. + +Modified versions of the above images, as well as additional "flight path" illustrations were created specifically for Twenty Twenty-Two. CC0. diff --git a/src/wp-content/themes/twentytwentytwo/screenshot.png b/src/wp-content/themes/twentytwentytwo/screenshot.png new file mode 100644 index 0000000000..9e8710cde3 Binary files /dev/null and b/src/wp-content/themes/twentytwentytwo/screenshot.png differ diff --git a/src/wp-content/themes/twentytwentytwo/style.css b/src/wp-content/themes/twentytwentytwo/style.css new file mode 100644 index 0000000000..b9f6a19367 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/style.css @@ -0,0 +1,148 @@ +/* +Theme Name: Twenty Twenty-Two +Theme URI: https://wordpress.org/themes/twentytwentytwo/ +Author: the WordPress team +Author URI: https://wordpress.org/ +Description: Built on a solidly designed foundation, Twenty Twenty-Two embraces the idea that everyone deserves a truly unique website. The theme’s subtle styles are inspired by the diversity and versatility of birds: its typography is lightweight yet strong, its color palette is drawn from nature, and its layout elements sit gently on the page. The true richness of Twenty Twenty-Two lies in its opportunity for customization. The theme is built to take advantage of the Full Site Editing features introduced in WordPress 5.9, which means that colors, typography, and the layout of every single page on your site can be customized to suit your vision. It also includes dozens of block patterns, opening the door to a wide range of professionally designed layouts in just a few clicks. Whether you’re building a single-page website, a blog, a business website, or a portfolio, Twenty Twenty-Two will help you create a site that is uniquely yours. +Requires at least: 5.9 +Tested up to: 5.9 +Requires PHP: 5.6 +Version: 1.0 +License: GNU General Public License v2 or later +License URI: http://www.gnu.org/licenses/gpl-2.0.html +Text Domain: twentytwentytwo +Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, sticky-post, threaded-comments + +Twenty Twenty-Two WordPress Theme, (C) 2021 WordPress.org +Twenty Twenty-Two is distributed under the terms of the GNU GPL. +*/ + +/* + * Font smoothing. + * This is a niche setting that will not be available via Global Styles. + * https://github.com/WordPress/gutenberg/issues/35934 + */ + +body { + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; +} + +/* + * Text and navigation link styles. + * Necessary until the following issue is resolved in Gutenberg: + * https://github.com/WordPress/gutenberg/issues/27075 + */ + +a { + text-decoration-thickness: 1px; + text-underline-offset: 0.25ch; +} + +a:hover, +a:focus { + text-decoration-style: dashed; +} + +a:active { + text-decoration: none; +} + +.wp-block-navigation .wp-block-navigation-item a:hover, +.wp-block-navigation .wp-block-navigation-item a:focus { + text-decoration: underline; + text-decoration-style: solid; +} + +/* + * Search and File Block button styles. + * Necessary until the following issues are resolved in Gutenberg: + * https://github.com/WordPress/gutenberg/issues/36444 + * https://github.com/WordPress/gutenberg/issues/27760 + */ + +.wp-block-search__button, +.wp-block-file .wp-block-file__button { + background-color: var(--wp--preset--color--primary); + border-radius: 0; + border: none; + color: var(--wp--preset--color--background); + font-size: var(--wp--preset--font-size--medium); + padding: calc(.667em + 2px) calc(1.333em + 2px); +} + +/* + * Button hover styles. + * Necessary until the following issue is resolved in Gutenberg: + * https://github.com/WordPress/gutenberg/issues/27075 + */ + +.wp-block-search__button:hover, +.wp-block-file .wp-block-file__button:hover, +.wp-block-button__link:hover { + opacity: 0.90; +} + +/* + * Alignment styles. + * These rules are temporary, and should not be relied on or + * modified too heavily by themes or plugins that build on + * Twenty Twenty-Two. These are meant to be a precursor to + * a global solution provided by the Block Editor. + * + * Relevant issues: + * https://github.com/WordPress/gutenberg/issues/35607 + * https://github.com/WordPress/gutenberg/issues/35884 + */ + +.wp-site-blocks, +body > .is-root-container, +.edit-post-visual-editor__post-title-wrapper, +.wp-block-group.alignfull, +.wp-block-group.has-background, +.wp-block-cover.alignfull, +.is-root-container .wp-block[data-align="full"] > .wp-block-group, +.is-root-container .wp-block[data-align="full"] > .wp-block-cover { + padding-left: var(--wp--custom--spacing--outer); + padding-right: var(--wp--custom--spacing--outer); +} + +.wp-site-blocks .alignfull, +.wp-site-blocks > .wp-block-group.has-background, +.wp-site-blocks > .wp-block-cover, +.wp-site-blocks > .wp-block-template-part > .wp-block-group.has-background, +.wp-site-blocks > .wp-block-template-part > .wp-block-cover, +body > .is-root-container > .wp-block-cover, +body > .is-root-container > .wp-block-template-part > .wp-block-group.has-background, +body > .is-root-container > .wp-block-template-part > .wp-block-cover, +.is-root-container .wp-block[data-align="full"] { + margin-left: calc(-1 * var(--wp--custom--spacing--outer)) !important; + margin-right: calc(-1 * var(--wp--custom--spacing--outer)) !important; + width: unset; +} + +/* Blocks inside columns don't have negative margins. */ +.wp-site-blocks .wp-block-columns .wp-block-column .alignfull, +.is-root-container .wp-block-columns .wp-block-column .wp-block[data-align="full"], +/* We also want to avoid stacking negative margins. */ +.wp-site-blocks .alignfull:not(.wp-block-group) .alignfull, +.is-root-container .wp-block[data-align="full"] > *:not(.wp-block-group) .wp-block[data-align="full"] { + margin-left: auto !important; + margin-right: auto !important; + width: inherit; +} + +/* + * Responsive menu container padding. + * This ensures the responsive container inherits the same + * spacing defined above. This behavior may be built into + * the Block Editor in the future. + */ + +.wp-block-navigation__responsive-container.is-menu-open { + padding-top: var(--wp--custom--spacing--outer); + padding-bottom: var(--wp--custom--spacing--large); + padding-right: var(--wp--custom--spacing--outer); + padding-left: var(--wp--custom--spacing--outer); +} + diff --git a/src/wp-content/themes/twentytwentytwo/templates/404.html b/src/wp-content/themes/twentytwentytwo/templates/404.html new file mode 100644 index 0000000000..5789a3d7d7 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/templates/404.html @@ -0,0 +1,11 @@ + + + +
+
+ +
+
+ + + diff --git a/src/wp-content/themes/twentytwentytwo/templates/archive.html b/src/wp-content/themes/twentytwentytwo/templates/archive.html new file mode 100644 index 0000000000..abc02186be --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/templates/archive.html @@ -0,0 +1,39 @@ + + + +
+ + +
+ + + + + +
+
+ +
+ + + +
+
+ + + + + + + + + + + + + +
+
+ + + diff --git a/src/wp-content/themes/twentytwentytwo/templates/blank.html b/src/wp-content/themes/twentytwentytwo/templates/blank.html new file mode 100644 index 0000000000..3fed9dcdf1 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/templates/blank.html @@ -0,0 +1 @@ + diff --git a/src/wp-content/themes/twentytwentytwo/templates/home.html b/src/wp-content/themes/twentytwentytwo/templates/home.html new file mode 100644 index 0000000000..fea167e692 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/templates/home.html @@ -0,0 +1,37 @@ + + + +
+ +
+ + + + +
+
+ +
+ + + +
+
+ + + + +
+ + + + + + + + + +
+ + + diff --git a/src/wp-content/themes/twentytwentytwo/templates/index.html b/src/wp-content/themes/twentytwentytwo/templates/index.html new file mode 100644 index 0000000000..d1d53f37e9 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/templates/index.html @@ -0,0 +1,37 @@ + + + +
+ +
+ + + + +
+
+ +
+ + + +
+
+ + + + +
+ + + + + + + + + +
+ + + diff --git a/src/wp-content/themes/twentytwentytwo/templates/page-large-header.html b/src/wp-content/themes/twentytwentytwo/templates/page-large-header.html new file mode 100644 index 0000000000..c5218f8739 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/templates/page-large-header.html @@ -0,0 +1,9 @@ + + + +
+ +
+ + + diff --git a/src/wp-content/themes/twentytwentytwo/templates/page-no-separators.html b/src/wp-content/themes/twentytwentytwo/templates/page-no-separators.html new file mode 100644 index 0000000000..ef1b65e847 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/templates/page-no-separators.html @@ -0,0 +1,18 @@ + + + +
+
+ +
+ + + + + +
+
+
+ + + diff --git a/src/wp-content/themes/twentytwentytwo/templates/page.html b/src/wp-content/themes/twentytwentytwo/templates/page.html new file mode 100644 index 0000000000..faf34e665c --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/templates/page.html @@ -0,0 +1,26 @@ + + + +
+
+ + + + +
+
+ + + + + + + + + +
+
+
+ + + diff --git a/src/wp-content/themes/twentytwentytwo/templates/search.html b/src/wp-content/themes/twentytwentytwo/templates/search.html new file mode 100644 index 0000000000..12a5c29633 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/templates/search.html @@ -0,0 +1,41 @@ + + + +
+ + + +
+ +
+ + + + +
+
+ +
+ + + +
+
+ + + + +
+ + + + + + + + + +
+ + + diff --git a/src/wp-content/themes/twentytwentytwo/templates/single-no-separators.html b/src/wp-content/themes/twentytwentytwo/templates/single-no-separators.html new file mode 100644 index 0000000000..221fc1f528 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/templates/single-no-separators.html @@ -0,0 +1,35 @@ + + + +
+
+ +
+ + + + + + + + + +
+
+ + + + + +
+ + + + + + +
+
+ + + diff --git a/src/wp-content/themes/twentytwentytwo/templates/single.html b/src/wp-content/themes/twentytwentytwo/templates/single.html new file mode 100644 index 0000000000..3b102d2615 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/templates/single.html @@ -0,0 +1,47 @@ + + + +
+
+ + + + +
+
+ + + + + + + + + + + + + +
+
+ + + + + +
+ + + + + + + +
+ + +
+
+ + + diff --git a/src/wp-content/themes/twentytwentytwo/theme.json b/src/wp-content/themes/twentytwentytwo/theme.json new file mode 100644 index 0000000000..fc2ce3f8e3 --- /dev/null +++ b/src/wp-content/themes/twentytwentytwo/theme.json @@ -0,0 +1,356 @@ +{ + "version": 2, + "customTemplates": [ + { + "name": "blank", + "title": "Blank", + "postTypes": [ + "page", + "post" + ] + }, + { + "name": "page-large-header", + "title": "Page (Large Header)", + "postTypes": [ + "page" + ] + }, + { + "name": "single-no-separators", + "title": "Single Post (No Separators)", + "postTypes": [ + "post" + ] + }, + { + "name": "page-no-separators", + "title": "Page (No Separators)", + "postTypes": [ + "page" + ] + } + ], + "settings": { + "appearanceTools": true, + "color": { + "duotone": [ + { + "colors": [ "#000000", "#ffffff" ], + "slug": "foreground-and-background", + "name": "Foreground and background" + }, + { + "colors": [ "#000000", "#ffe2c7" ], + "slug": "foreground-and-secondary", + "name": "Foreground and secondary" + }, + { + "colors": [ "#000000", "#f6f6f6" ], + "slug": "foreground-and-tertiary", + "name": "Foreground and tertiary" + }, + { + "colors": [ "#1a4548", "#ffffff" ], + "slug": "primary-and-background", + "name": "Primary and background" + }, + { + "colors": [ "#1a4548", "#ffe2c7" ], + "slug": "primary-and-secondary", + "name": "Primary and secondary" + }, + { + "colors": [ "#1a4548", "#f6f6f6" ], + "slug": "primary-and-tertiary", + "name": "Primary and tertiary" + } + ], + "gradients": [ + { + "slug": "vertical-secondary-to-tertiary", + "gradient": "linear-gradient(to bottom,var(--wp--preset--color--secondary) 0%,var(--wp--preset--color--tertiary) 100%)", + "name": "Vertical secondary to tertiary" + }, + { + "slug": "vertical-secondary-to-background", + "gradient": "linear-gradient(to bottom,var(--wp--preset--color--secondary) 0%,var(--wp--preset--color--background) 100%)", + "name": "Vertical secondary to background" + }, + { + "slug": "vertical-tertiary-to-background", + "gradient": "linear-gradient(to bottom,var(--wp--preset--color--tertiary) 0%,var(--wp--preset--color--background) 100%)", + "name": "Vertical tertiary to background" + }, + { + "slug": "diagonal-primary-to-foreground", + "gradient": "linear-gradient(to bottom right,var(--wp--preset--color--primary) 0%,var(--wp--preset--color--foreground) 100%)", + "name": "Diagonal primary to foreground" + }, + { + "slug": "diagonal-secondary-to-background", + "gradient": "linear-gradient(to bottom right,var(--wp--preset--color--secondary) 50%,var(--wp--preset--color--background) 50%)", + "name": "Diagonal secondary to background" + }, + { + "slug": "diagonal-background-to-secondary", + "gradient": "linear-gradient(to bottom right,var(--wp--preset--color--background) 50%,var(--wp--preset--color--secondary) 50%)", + "name": "Diagonal background to secondary" + }, + { + "slug": "diagonal-tertiary-to-background", + "gradient": "linear-gradient(to bottom right,var(--wp--preset--color--tertiary) 50%,var(--wp--preset--color--background) 50%)", + "name": "Diagonal tertiary to background" + }, + { + "slug": "diagonal-background-to-tertiary", + "gradient": "linear-gradient(to bottom right,var(--wp--preset--color--background) 50%,var(--wp--preset--color--tertiary) 50%)", + "name": "Diagonal background to tertiary" + } + ], + "palette": [ + { + "slug": "foreground", + "color": "#000000", + "name": "Foreground" + }, + { + "slug": "background", + "color": "#ffffff", + "name": "Background" + }, + { + "slug": "primary", + "color": "#1a4548", + "name": "Primary" + }, + { + "slug": "secondary", + "color": "#ffe2c7", + "name": "Secondary" + }, + { + "slug": "tertiary", + "color": "#F6F6F6", + "name": "Tertiary" + } + ] + }, + "custom": { + "spacing": { + "small": "max(1.25rem, 5vw)", + "medium": "clamp(2rem, 8vw, calc(4 * var(--wp--style--block-gap)))", + "large": "clamp(4rem, 10vw, 8rem)", + "outer": "var(--wp--custom--spacing--small, 1.25rem)" + }, + "typography": { + "font-size": { + "huge": "clamp(2.25rem, 4vw, 2.75rem)", + "gigantic": "clamp(2.75rem, 6vw, 3.25rem)", + "colossal": "clamp(3.25rem, 8vw, 6.25rem)" + }, + "line-height": { + "tiny": 1.15, + "small": 1.2, + "medium": 1.4, + "normal": 1.6 + } + } + }, + "spacing": { + "units": [ + "%", + "px", + "em", + "rem", + "vh", + "vw" + ] + }, + "typography": { + "dropCap": false, + "fontFamilies": [ + { + "fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif", + "name": "System Font", + "slug": "system-font" + }, + { + "fontFamily": "\"Source Serif Pro\", serif", + "name": "Source Serif Pro", + "slug": "source-serif-pro" + } + ], + "fontSizes": [ + { + "size": "1rem", + "slug": "small" + }, + { + "size": "1.125rem", + "slug": "medium" + }, + { + "size": "1.75rem", + "slug": "large" + }, + { + "size": "clamp(1.75rem, 3vw, 2.25rem)", + "slug": "x-large" + } + ] + }, + "layout": { + "contentSize": "650px", + "wideSize": "1000px" + } + }, + "styles": { + "blocks": { + "core/button": { + "border": { + "radius": "0" + }, + "color": { + "background": "var(--wp--preset--color--primary)", + "text": "var(--wp--preset--color--background)" + }, + "typography": { + "fontSize": "var(--wp--preset--font-size--medium)" + } + }, + "core/post-title": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--source-serif-pro)", + "fontWeight": "300", + "lineHeight": "var(--wp--custom--typography--line-height--tiny)", + "fontSize": "var(--wp--custom--typography--font-size--gigantic)" + } + }, + "core/post-comments": { + "spacing": { + "padding": { + "top": "var(--wp--custom--spacing--small)" + } + } + }, + "core/pullquote": { + "border": { + "width": "1px 0" + } + }, + "core/query-title": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--source-serif-pro)", + "fontWeight": "300", + "lineHeight": "var(--wp--custom--typography--line-height--small)", + "fontSize": "var(--wp--custom--typography--font-size--gigantic)" + } + }, + "core/quote": { + "border": { + "width": "1px" + } + }, + "core/site-title": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--system-font)", + "lineHeight": "var(--wp--custom--typography--line-height--normal)", + "fontSize": "var(--wp--preset--font-size--medium)", + "fontWeight": "normal" + } + } + }, + "color": { + "background": "var(--wp--preset--color--background)", + "text": "var(--wp--preset--color--foreground)" + }, + "elements": { + "h1": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--source-serif-pro)", + "fontWeight": "300", + "lineHeight": "var(--wp--custom--typography--line-height--tiny)", + "fontSize": "var(--wp--custom--typography--font-size--colossal)" + } + }, + "h2": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--source-serif-pro)", + "fontWeight": "300", + "lineHeight": "var(--wp--custom--typography--line-height--small)", + "fontSize": "var(--wp--custom--typography--font-size--gigantic)" + } + }, + "h3": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--source-serif-pro)", + "fontWeight": "300", + "lineHeight": "var(--wp--custom--typography--line-height--tiny)", + "fontSize": "var(--wp--custom--typography--font-size--huge)" + } + }, + "h4": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--source-serif-pro)", + "fontWeight": "300", + "lineHeight": "var(--wp--custom--typography--line-height--tiny)", + "fontSize": "var(--wp--preset--font-size--x-large)" + } + }, + "h5": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--system-font)", + "fontWeight": "700", + "textTransform": "uppercase", + "lineHeight": "var(--wp--custom--typography--line-height--normal)", + "fontSize": "var(--wp--preset--font-size--medium)" + } + }, + "h6": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--system-font)", + "fontWeight": "400", + "textTransform": "uppercase", + "lineHeight": "var(--wp--custom--typography--line-height--normal)", + "fontSize": "var(--wp--preset--font-size--medium)" + } + }, + "link": { + "color": { + "text": "var(--wp--preset--color--foreground)" + } + } + }, + "spacing": { + "blockGap": "1.5rem" + }, + "typography": { + "fontFamily": "var(--wp--preset--font-family--system-font)", + "lineHeight": "var(--wp--custom--typography--line-height--normal)", + "fontSize": "var(--wp--preset--font-size--medium)" + } + }, + "templateParts": [ + { + "name": "header", + "title": "Header", + "area": "header" + }, + { + "name": "header-large-dark", + "title": "Header (Dark, large)", + "area": "header" + }, + { + "name": "header-small-dark", + "title": "Header (Dark, small)", + "area": "header" + }, + { + "name": "footer", + "title": "Footer", + "area": "footer" + } + ] +} diff --git a/src/wp-includes/ID3/getid3.lib.php b/src/wp-includes/ID3/getid3.lib.php index 8514e9781f..46a39ee3b2 100644 --- a/src/wp-includes/ID3/getid3.lib.php +++ b/src/wp-includes/ID3/getid3.lib.php @@ -242,7 +242,7 @@ class getid3_lib /** * ANSI/IEEE Standard 754-1985, Standard for Binary Floating Point Arithmetic * - * @link http://www.psc.edu/general/software/packages/ieee/ieee.html + * @link https://web.archive.org/web/20120325162206/http://www.psc.edu/general/software/packages/ieee/ieee.php * @link http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee.html * * @param string $byteword @@ -294,12 +294,12 @@ class getid3_lib if (($exponent == (pow(2, $exponentbits) - 1)) && ($fraction != 0)) { // Not a Number - $floatvalue = false; + $floatvalue = NAN; } elseif (($exponent == (pow(2, $exponentbits) - 1)) && ($fraction == 0)) { if ($signbit == '1') { - $floatvalue = '-infinity'; + $floatvalue = -INF; } else { - $floatvalue = '+infinity'; + $floatvalue = INF; } } elseif (($exponent == 0) && ($fraction == 0)) { if ($signbit == '1') { @@ -427,14 +427,20 @@ class getid3_lib * @return string */ public static function Dec2Bin($number) { + if (!is_numeric($number)) { + // https://github.com/JamesHeinrich/getID3/issues/299 + trigger_error('TypeError: Dec2Bin(): Argument #1 ($number) must be numeric, '.gettype($number).' given', E_USER_WARNING); + return ''; + } + $bytes = array(); while ($number >= 256) { - $bytes[] = (($number / 256) - (floor($number / 256))) * 256; + $bytes[] = (int) (($number / 256) - (floor($number / 256))) * 256; $number = floor($number / 256); } - $bytes[] = $number; + $bytes[] = (int) $number; $binstring = ''; - for ($i = 0; $i < count($bytes); $i++) { - $binstring = (($i == count($bytes) - 1) ? decbin($bytes[$i]) : str_pad(decbin($bytes[$i]), 8, '0', STR_PAD_LEFT)).$binstring; + foreach ($bytes as $i => $byte) { + $binstring = (($i == count($bytes) - 1) ? decbin($byte) : str_pad(decbin($byte), 8, '0', STR_PAD_LEFT)).$binstring; } return $binstring; } @@ -665,6 +671,7 @@ class getid3_lib // or // $foo['path']['to']['my'] = 'file.txt'; $ArrayPath = ltrim($ArrayPath, $Separator); + $ReturnedArray = array(); if (($pos = strpos($ArrayPath, $Separator)) !== false) { $ReturnedArray[substr($ArrayPath, 0, $pos)] = self::CreateDeepArray(substr($ArrayPath, $pos + 1), $Separator, $Value); } else { @@ -1538,12 +1545,21 @@ class getid3_lib public static function CopyTagsToComments(&$ThisFileInfo, $option_tags_html=true) { // Copy all entries from ['tags'] into common ['comments'] if (!empty($ThisFileInfo['tags'])) { - if (isset($ThisFileInfo['tags']['id3v1'])) { - // bubble ID3v1 to the end, if present to aid in detecting bad ID3v1 encodings - $ID3v1 = $ThisFileInfo['tags']['id3v1']; - unset($ThisFileInfo['tags']['id3v1']); - $ThisFileInfo['tags']['id3v1'] = $ID3v1; - unset($ID3v1); + + // Some tag types can only support limited character sets and may contain data in non-standard encoding (usually ID3v1) + // and/or poorly-transliterated tag values that are also in tag formats that do support full-range character sets + // To make the output more user-friendly, process the potentially-problematic tag formats last to enhance the chance that + // the first entries in [comments] are the most correct and the "bad" ones (if any) come later. + // https://github.com/JamesHeinrich/getID3/issues/338 + $processLastTagTypes = array('id3v1','riff'); + foreach ($processLastTagTypes as $processLastTagType) { + if (isset($ThisFileInfo['tags'][$processLastTagType])) { + // bubble ID3v1 to the end, if present to aid in detecting bad ID3v1 encodings + $temp = $ThisFileInfo['tags'][$processLastTagType]; + unset($ThisFileInfo['tags'][$processLastTagType]); + $ThisFileInfo['tags'][$processLastTagType] = $temp; + unset($temp); + } } foreach ($ThisFileInfo['tags'] as $tagtype => $tagarray) { foreach ($tagarray as $tagname => $tagdata) { @@ -1562,20 +1578,30 @@ class getid3_lib // new value is identical but shorter-than (or equal-length to) one already in comments - skip break 2; } - } - if (function_exists('mb_convert_encoding')) { - if (trim($value) == trim(substr(mb_convert_encoding($existingvalue, $ThisFileInfo['id3v1']['encoding'], $ThisFileInfo['encoding']), 0, 30))) { - // value stored in ID3v1 appears to be probably the multibyte value transliterated (badly) into ISO-8859-1 in ID3v1. - // As an example, Foobar2000 will do this if you tag a file with Chinese or Arabic or Cyrillic or something that doesn't fit into ISO-8859-1 the ID3v1 will consist of mostly "?" characters, one per multibyte unrepresentable character - break 2; + + if (function_exists('mb_convert_encoding')) { + if (trim($value) == trim(substr(mb_convert_encoding($existingvalue, $ThisFileInfo['id3v1']['encoding'], $ThisFileInfo['encoding']), 0, 30))) { + // value stored in ID3v1 appears to be probably the multibyte value transliterated (badly) into ISO-8859-1 in ID3v1. + // As an example, Foobar2000 will do this if you tag a file with Chinese or Arabic or Cyrillic or something that doesn't fit into ISO-8859-1 the ID3v1 will consist of mostly "?" characters, one per multibyte unrepresentable character + break 2; + } } } } elseif (!is_array($value)) { - $newvaluelength = strlen(trim($value)); + $newvaluelength = strlen(trim($value)); + $newvaluelengthMB = mb_strlen(trim($value)); foreach ($ThisFileInfo['comments'][$tagname] as $existingkey => $existingvalue) { - $oldvaluelength = strlen(trim($existingvalue)); + $oldvaluelength = strlen(trim($existingvalue)); + $oldvaluelengthMB = mb_strlen(trim($existingvalue)); + if (($newvaluelengthMB == $oldvaluelengthMB) && ($existingvalue == getid3_lib::iconv_fallback('UTF-8', 'ASCII', $value))) { + // https://github.com/JamesHeinrich/getID3/issues/338 + // check for tags containing extended characters that may have been forced into limited-character storage (e.g. UTF8 values into ASCII) + // which will usually display unrepresentable characters as "?" + $ThisFileInfo['comments'][$tagname][$existingkey] = trim($value); + break; + } if ((strlen($existingvalue) > 10) && ($newvaluelength > $oldvaluelength) && (substr(trim($value), 0, strlen($existingvalue)) == $existingvalue)) { $ThisFileInfo['comments'][$tagname][$existingkey] = trim($value); break; @@ -1601,14 +1627,16 @@ class getid3_lib } // attempt to standardize spelling of returned keys - $StandardizeFieldNames = array( - 'tracknumber' => 'track_number', - 'track' => 'track_number', - ); - foreach ($StandardizeFieldNames as $badkey => $goodkey) { - if (array_key_exists($badkey, $ThisFileInfo['comments']) && !array_key_exists($goodkey, $ThisFileInfo['comments'])) { - $ThisFileInfo['comments'][$goodkey] = $ThisFileInfo['comments'][$badkey]; - unset($ThisFileInfo['comments'][$badkey]); + if (!empty($ThisFileInfo['comments'])) { + $StandardizeFieldNames = array( + 'tracknumber' => 'track_number', + 'track' => 'track_number', + ); + foreach ($StandardizeFieldNames as $badkey => $goodkey) { + if (array_key_exists($badkey, $ThisFileInfo['comments']) && !array_key_exists($goodkey, $ThisFileInfo['comments'])) { + $ThisFileInfo['comments'][$goodkey] = $ThisFileInfo['comments'][$badkey]; + unset($ThisFileInfo['comments'][$badkey]); + } } } @@ -1734,6 +1762,7 @@ class getid3_lib * @return float|bool */ public static function getFileSizeSyscall($path) { + $commandline = null; $filesize = false; if (GETID3_OS_ISWINDOWS) { @@ -1795,7 +1824,7 @@ class getid3_lib * * @return string */ - public static function mb_basename($path, $suffix = null) { + public static function mb_basename($path, $suffix = '') { $splited = preg_split('#/#', rtrim($path, '/ ')); return substr(basename('X'.$splited[count($splited) - 1], $suffix), 1); } diff --git a/src/wp-includes/ID3/getid3.php b/src/wp-includes/ID3/getid3.php index 5cb3c036c0..2008025b85 100644 --- a/src/wp-includes/ID3/getid3.php +++ b/src/wp-includes/ID3/getid3.php @@ -17,10 +17,6 @@ if (!defined('GETID3_OS_ISWINDOWS')) { if (!defined('GETID3_INCLUDEPATH')) { define('GETID3_INCLUDEPATH', dirname(__FILE__).DIRECTORY_SEPARATOR); } -// Workaround Bug #39923 (https://bugs.php.net/bug.php?id=39923) -if (!defined('IMG_JPG') && defined('IMAGETYPE_JPEG')) { - define('IMG_JPG', IMAGETYPE_JPEG); -} if (!defined('ENT_SUBSTITUTE')) { // PHP5.3 adds ENT_IGNORE, PHP5.4 adds ENT_SUBSTITUTE define('ENT_SUBSTITUTE', (defined('ENT_IGNORE') ? ENT_IGNORE : 8)); } @@ -57,7 +53,7 @@ if ($open_basedir) { if (substr($basedir, -1, 1) != DIRECTORY_SEPARATOR) { $basedir .= DIRECTORY_SEPARATOR; } - if (preg_match('#^'.preg_quote($basedir).'#', $temp_dir)) { + if (strpos($temp_dir, $basedir) === 0) { $found_valid_tempdir = true; break; } @@ -214,6 +210,140 @@ class getID3 */ public $option_fread_buffer_size = 32768; + + + // module-specific options + + /** archive.rar + * if true use PHP RarArchive extension, if false (non-extension parsing not yet written in getID3) + * + * @var bool + */ + public $options_archive_rar_use_php_rar_extension = true; + + /** archive.gzip + * Optional file list - disable for speed. + * Decode gzipped files, if possible, and parse recursively (.tar.gz for example). + * + * @var bool + */ + public $options_archive_gzip_parse_contents = false; + + /** audio.midi + * if false only parse most basic information, much faster for some files but may be inaccurate + * + * @var bool + */ + public $options_audio_midi_scanwholefile = true; + + /** audio.mp3 + * Forces getID3() to scan the file byte-by-byte and log all the valid audio frame headers - extremely slow, + * unrecommended, but may provide data from otherwise-unusable files. + * + * @var bool + */ + public $options_audio_mp3_allow_bruteforce = false; + + /** audio.mp3 + * number of frames to scan to determine if MPEG-audio sequence is valid + * Lower this number to 5-20 for faster scanning + * Increase this number to 50+ for most accurate detection of valid VBR/CBR mpeg-audio streams + * + * @var int + */ + public $options_audio_mp3_mp3_valid_check_frames = 50; + + /** audio.wavpack + * Avoid scanning all frames (break after finding ID_RIFF_HEADER and ID_CONFIG_BLOCK, + * significantly faster for very large files but other data may be missed + * + * @var bool + */ + public $options_audio_wavpack_quick_parsing = false; + + /** audio-video.flv + * Break out of the loop if too many frames have been scanned; only scan this + * many if meta frame does not contain useful duration. + * + * @var int + */ + public $options_audiovideo_flv_max_frames = 100000; + + /** audio-video.matroska + * If true, do not return information about CLUSTER chunks, since there's a lot of them + * and they're not usually useful [default: TRUE]. + * + * @var bool + */ + public $options_audiovideo_matroska_hide_clusters = true; + + /** audio-video.matroska + * True to parse the whole file, not only header [default: FALSE]. + * + * @var bool + */ + public $options_audiovideo_matroska_parse_whole_file = false; + + /** audio-video.quicktime + * return all parsed data from all atoms if true, otherwise just returned parsed metadata + * + * @var bool + */ + public $options_audiovideo_quicktime_ReturnAtomData = false; + + /** audio-video.quicktime + * return all parsed data from all atoms if true, otherwise just returned parsed metadata + * + * @var bool + */ + public $options_audiovideo_quicktime_ParseAllPossibleAtoms = false; + + /** audio-video.swf + * return all parsed tags if true, otherwise do not return tags not parsed by getID3 + * + * @var bool + */ + public $options_audiovideo_swf_ReturnAllTagData = false; + + /** graphic.bmp + * return BMP palette + * + * @var bool + */ + public $options_graphic_bmp_ExtractPalette = false; + + /** graphic.bmp + * return image data + * + * @var bool + */ + public $options_graphic_bmp_ExtractData = false; + + /** graphic.png + * If data chunk is larger than this do not read it completely (getID3 only needs the first + * few dozen bytes for parsing). + * + * @var int + */ + public $options_graphic_png_max_data_bytes = 10000000; + + /** misc.pdf + * return full details of PDF Cross-Reference Table (XREF) + * + * @var bool + */ + public $options_misc_pdf_returnXREF = false; + + /** misc.torrent + * Assume all .torrent files are less than 1MB and just read entire thing into memory for easy processing. + * Override this value if you need to process files larger than 1MB + * + * @var int + */ + public $options_misc_torrent_max_torrent_filesize = 1048576; + + + // Public variables /** @@ -257,7 +387,7 @@ class getID3 */ protected $startup_warning = ''; - const VERSION = '1.9.20-202006061653'; + const VERSION = '1.9.21-202109171300'; const FREAD_BUFFER_SIZE = 32768; const ATTACHMENTS_NONE = false; @@ -637,6 +767,18 @@ class getID3 return $this->error('Format not supported, module "'.$determined_format['include'].'" is corrupt.'); } $class = new $class_name($this); + + // set module-specific options + foreach (get_object_vars($this) as $getid3_object_vars_key => $getid3_object_vars_value) { + if (preg_match('#^options_([^_]+)_([^_]+)_(.+)$#i', $getid3_object_vars_key, $matches)) { + list($dummy, $GOVgroup, $GOVmodule, $GOVsetting) = $matches; + $GOVgroup = (($GOVgroup == 'audiovideo') ? 'audio-video' : $GOVgroup); // variable names can only contain 0-9a-z_ so standardize here + if (($GOVgroup == $determined_format['group']) && ($GOVmodule == $determined_format['module'])) { + $class->$GOVsetting = $getid3_object_vars_value; + } + } + } + $class->Analyze(); unset($class); @@ -1355,6 +1497,16 @@ class getID3 'fail_ape' => 'ERROR', ), + // TORRENT - .torrent + 'torrent' => array( + 'pattern' => '^(d8\\:announce|d7\\:comment)', + 'group' => 'misc', + 'module' => 'torrent', + 'mime_type' => 'application/x-bittorrent', + 'fail_id3' => 'ERROR', + 'fail_ape' => 'ERROR', + ), + // CUE - data - CUEsheet (index to single-file disc images) 'cue' => array( 'pattern' => '', // empty pattern means cannot be automatically detected, will fall through all other formats and match based on filename and very basic file contents @@ -1489,7 +1641,7 @@ class getID3 if (is_string($value)) { $value = trim($value, " \r\n\t"); // do not trim nulls from $value!! Unicode characters will get mangled if trailing nulls are removed! } - if ($value) { + if (isset($value) && $value !== "") { if (!is_numeric($key)) { $this->info['tags'][trim($tag_name)][trim($tag_key)][$key] = $value; } else { @@ -2096,19 +2248,25 @@ abstract class getid3_handler $this->data_string_position = $this->data_string_length + $bytes; break; } - return 0; - } else { - $pos = $bytes; - if ($whence == SEEK_CUR) { - $pos = $this->ftell() + $bytes; - } elseif ($whence == SEEK_END) { - $pos = $this->getid3->info['filesize'] + $bytes; - } - if (!getid3_lib::intValueSupported($pos)) { - throw new getid3_exception('cannot fseek('.$pos.') because beyond PHP filesystem limit', 10); - } + return 0; // fseek returns 0 on success + } + + $pos = $bytes; + if ($whence == SEEK_CUR) { + $pos = $this->ftell() + $bytes; + } elseif ($whence == SEEK_END) { + $pos = $this->getid3->info['filesize'] + $bytes; + } + if (!getid3_lib::intValueSupported($pos)) { + throw new getid3_exception('cannot fseek('.$pos.') because beyond PHP filesystem limit', 10); + } + + // https://github.com/JamesHeinrich/getID3/issues/327 + $result = fseek($this->getid3->fp, $bytes, $whence); + if ($result !== 0) { // fseek returns 0 on success + throw new getid3_exception('cannot fseek('.$pos.'). resource/stream does not appear to support seeking', 10); } - return fseek($this->getid3->fp, $bytes, $whence); + return $result; } /** @@ -2224,6 +2382,8 @@ abstract class getid3_handler * @throws getid3_exception */ public function saveAttachment($name, $offset, $length, $image_mime=null) { + $fp_dest = null; + $dest = null; try { // do not extract at all diff --git a/src/wp-includes/ID3/module.audio-video.asf.php b/src/wp-includes/ID3/module.audio-video.asf.php index fce923c027..85edb7d755 100644 --- a/src/wp-includes/ID3/module.audio-video.asf.php +++ b/src/wp-includes/ID3/module.audio-video.asf.php @@ -93,6 +93,7 @@ class getid3_asf extends getid3_handler $offset = 0; $thisfile_asf_streambitratepropertiesobject = array(); $thisfile_asf_codeclistobject = array(); + $StreamPropertiesObjectData = array(); for ($HeaderObjectsCounter = 0; $HeaderObjectsCounter < $thisfile_asf_headerobject['headerobjects']; $HeaderObjectsCounter++) { $NextObjectGUID = substr($ASFHeaderData, $offset, 16); @@ -283,7 +284,7 @@ class getid3_asf extends getid3_handler $thisfile_asf_headerextensionobject['reserved_2'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2)); $offset += 2; if ($thisfile_asf_headerextensionobject['reserved_2'] != 6) { - $this->warning('header_extension_object.reserved_2 ('.getid3_lib::PrintHexBytes($thisfile_asf_headerextensionobject['reserved_2']).') does not match expected value of "6"'); + $this->warning('header_extension_object.reserved_2 ('.$thisfile_asf_headerextensionobject['reserved_2'].') does not match expected value of "6"'); //return false; break; } @@ -535,7 +536,7 @@ class getid3_asf extends getid3_handler $thisfile_asf_markerobject['reserved_2'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2)); $offset += 2; if ($thisfile_asf_markerobject['reserved_2'] != 0) { - $this->warning('marker_object.reserved_2 ('.getid3_lib::PrintHexBytes($thisfile_asf_markerobject['reserved_2']).') does not match expected value of "0"'); + $this->warning('marker_object.reserved_2 ('.$thisfile_asf_markerobject['reserved_2'].') does not match expected value of "0"'); break; } $thisfile_asf_markerobject['name_length'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2)); @@ -1193,7 +1194,7 @@ class getid3_asf extends getid3_handler $thisfile_asf_dataobject['reserved'] = getid3_lib::LittleEndian2Int(substr($DataObjectData, $offset, 2)); $offset += 2; if ($thisfile_asf_dataobject['reserved'] != 0x0101) { - $this->warning('data_object.reserved ('.getid3_lib::PrintHexBytes($thisfile_asf_dataobject['reserved']).') does not match expected value of "0x0101"'); + $this->warning('data_object.reserved (0x'.sprintf('%04X', $thisfile_asf_dataobject['reserved']).') does not match expected value of "0x0101"'); //return false; break; } diff --git a/src/wp-includes/ID3/module.audio-video.flv.php b/src/wp-includes/ID3/module.audio-video.flv.php index 7e684072e3..3b59e596e3 100644 --- a/src/wp-includes/ID3/module.audio-video.flv.php +++ b/src/wp-includes/ID3/module.audio-video.flv.php @@ -161,6 +161,7 @@ class getid3_flv extends getid3_handler $info['flv']['video']['videoCodec'] = $LastHeaderByte & 0x07; $FLVvideoHeader = $this->fread(11); + $PictureSizeEnc = array(); if ($info['flv']['video']['videoCodec'] == GETID3_FLV_VIDEO_H264) { // this code block contributed by: moysevichØgmail*com diff --git a/src/wp-includes/ID3/module.audio-video.matroska.php b/src/wp-includes/ID3/module.audio-video.matroska.php index a285108590..128e614e2c 100644 --- a/src/wp-includes/ID3/module.audio-video.matroska.php +++ b/src/wp-includes/ID3/module.audio-video.matroska.php @@ -224,14 +224,14 @@ class getid3_matroska extends getid3_handler * * @var bool */ - public static $hide_clusters = true; + public $hide_clusters = true; /** * True to parse the whole file, not only header [default: FALSE]. * * @var bool */ - public static $parse_whole_file = false; + public $parse_whole_file = false; /* * Private parser settings/placeholders. @@ -586,7 +586,7 @@ class getid3_matroska extends getid3_handler $info['matroska']['segment'][0]['length'] = $top_element['length']; while ($this->getEBMLelement($element_data, $top_element['end'])) { - if ($element_data['id'] != EBML_ID_CLUSTER || !self::$hide_clusters) { // collect clusters only if required + if ($element_data['id'] != EBML_ID_CLUSTER || !$this->hide_clusters) { // collect clusters only if required $info['matroska']['segments'][] = $element_data; } switch ($element_data['id']) { @@ -618,7 +618,7 @@ class getid3_matroska extends getid3_handler $this->warning('seek_entry[target_id] unexpectedly not set at '.$seek_entry['offset']); break; } - if (($seek_entry['target_id'] != EBML_ID_CLUSTER) || !self::$hide_clusters) { // collect clusters only if required + if (($seek_entry['target_id'] != EBML_ID_CLUSTER) || !$this->hide_clusters) { // collect clusters only if required $info['matroska']['seek'][] = $seek_entry; } break; @@ -905,7 +905,7 @@ class getid3_matroska extends getid3_handler break; case EBML_ID_CUES: // A top-level element to speed seeking access. All entries are local to the segment. Should be mandatory for non "live" streams. - if (self::$hide_clusters) { // do not parse cues if hide clusters is "ON" till they point to clusters anyway + if ($this->hide_clusters) { // do not parse cues if hide clusters is "ON" till they point to clusters anyway $this->current_offset = $element_data['end']; break; } @@ -1246,12 +1246,12 @@ class getid3_matroska extends getid3_handler } $this->current_offset = $subelement['end']; } - if (!self::$hide_clusters) { + if (!$this->hide_clusters) { $info['matroska']['cluster'][] = $cluster_entry; } // check to see if all the data we need exists already, if so, break out of the loop - if (!self::$parse_whole_file) { + if (!$this->parse_whole_file) { if (isset($info['matroska']['info']) && is_array($info['matroska']['info'])) { if (isset($info['matroska']['tracks']['tracks']) && is_array($info['matroska']['tracks']['tracks'])) { if (count($info['matroska']['track_data_offsets']) == count($info['matroska']['tracks']['tracks'])) { diff --git a/src/wp-includes/ID3/module.audio-video.quicktime.php b/src/wp-includes/ID3/module.audio-video.quicktime.php index 1cf1c0590b..c3bccfd086 100644 --- a/src/wp-includes/ID3/module.audio-video.quicktime.php +++ b/src/wp-includes/ID3/module.audio-video.quicktime.php @@ -24,7 +24,18 @@ getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE_ class getid3_quicktime extends getid3_handler { - public $ReturnAtomData = true; + /** audio-video.quicktime + * return all parsed data from all atoms if true, otherwise just returned parsed metadata + * + * @var bool + */ + public $ReturnAtomData = false; + + /** audio-video.quicktime + * return all parsed data from all atoms if true, otherwise just returned parsed metadata + * + * @var bool + */ public $ParseAllPossibleAtoms = false; /** @@ -170,7 +181,7 @@ class getid3_quicktime extends getid3_handler } } - if (!isset($info['bitrate']) && isset($info['playtime_seconds'])) { + if (!isset($info['bitrate']) && !empty($info['playtime_seconds'])) { $info['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds']; } if (isset($info['bitrate']) && !isset($info['audio']['bitrate']) && !isset($info['quicktime']['video'])) { @@ -560,15 +571,28 @@ class getid3_quicktime extends getid3_handler default: $atom_structure['data'] = substr($boxdata, 8); if ($atomname == 'covr') { - // not a foolproof check, but better than nothing - if (preg_match('#^\\xFF\\xD8\\xFF#', $atom_structure['data'])) { - $atom_structure['image_mime'] = 'image/jpeg'; - } elseif (preg_match('#^\\x89\\x50\\x4E\\x47\\x0D\\x0A\\x1A\\x0A#', $atom_structure['data'])) { - $atom_structure['image_mime'] = 'image/png'; - } elseif (preg_match('#^GIF#', $atom_structure['data'])) { - $atom_structure['image_mime'] = 'image/gif'; + if (!empty($atom_structure['data'])) { + $atom_structure['image_mime'] = 'image/unknown'; // provide default MIME type to ensure array keys exist + if (function_exists('getimagesizefromstring') && ($getimagesize = getimagesizefromstring($atom_structure['data'])) && !empty($getimagesize['mime'])) { + $atom_structure['image_mime'] = $getimagesize['mime']; + } else { + // if getimagesizefromstring is not available, or fails for some reason, fall back to simple detection of common image formats + $ImageFormatSignatures = array( + 'image/jpeg' => "\xFF\xD8\xFF", + 'image/png' => "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A", + 'image/gif' => 'GIF', + ); + foreach ($ImageFormatSignatures as $mime => $image_format_signature) { + if (substr($atom_structure['data'], 0, strlen($image_format_signature)) == $image_format_signature) { + $atom_structure['image_mime'] = $mime; + break; + } + } + } + $info['quicktime']['comments']['picture'][] = array('image_mime'=>$atom_structure['image_mime'], 'data'=>$atom_structure['data'], 'description'=>'cover'); + } else { + $this->warning('Unknown empty "covr" image at offset '.$baseoffset); } - $info['quicktime']['comments']['picture'][] = array('image_mime'=>$atom_structure['image_mime'], 'data'=>$atom_structure['data'], 'description'=>'cover'); } break; @@ -728,11 +752,13 @@ class getid3_quicktime extends getid3_handler $atom_structure['flags']['play_on_open'] = (bool) $atom_structure['play_on_open_flag']; $atom_structure['flags']['slide_show'] = (bool) $atom_structure['slide_show_flag']; - $ptv_lookup[0] = 'normal'; - $ptv_lookup[1] = 'double'; - $ptv_lookup[2] = 'half'; - $ptv_lookup[3] = 'full'; - $ptv_lookup[4] = 'current'; + $ptv_lookup = array( + 0 => 'normal', + 1 => 'double', + 2 => 'half', + 3 => 'full', + 4 => 'current' + ); if (isset($ptv_lookup[$atom_structure['display_size_raw']])) { $atom_structure['display_size'] = $ptv_lookup[$atom_structure['display_size_raw']]; } else { @@ -908,13 +934,13 @@ $this->warning('incomplete/incorrect handling of "stsd" with Parrot metadata in $atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 66, 2)); $atom_structure['sample_description_table'][$i]['video_color_table_id'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 68, 2)); - $atom_structure['sample_description_table'][$i]['video_pixel_color_type'] = (($atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] > 32) ? 'grayscale' : 'color'); + $atom_structure['sample_description_table'][$i]['video_pixel_color_type'] = (((int) $atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] > 32) ? 'grayscale' : 'color'); $atom_structure['sample_description_table'][$i]['video_pixel_color_name'] = $this->QuicktimeColorNameLookup($atom_structure['sample_description_table'][$i]['video_pixel_color_depth']); if ($atom_structure['sample_description_table'][$i]['video_pixel_color_name'] != 'invalid') { $info['quicktime']['video']['codec_fourcc'] = $atom_structure['sample_description_table'][$i]['data_format']; $info['quicktime']['video']['codec_fourcc_lookup'] = $this->QuicktimeVideoCodecLookup($atom_structure['sample_description_table'][$i]['data_format']); - $info['quicktime']['video']['codec'] = (($atom_structure['sample_description_table'][$i]['video_encoder_name_len'] > 0) ? $atom_structure['sample_description_table'][$i]['video_encoder_name'] : $atom_structure['sample_description_table'][$i]['data_format']); + $info['quicktime']['video']['codec'] = (((int) $atom_structure['sample_description_table'][$i]['video_encoder_name_len'] > 0) ? $atom_structure['sample_description_table'][$i]['video_encoder_name'] : $atom_structure['sample_description_table'][$i]['data_format']); $info['quicktime']['video']['color_depth'] = $atom_structure['sample_description_table'][$i]['video_pixel_color_depth']; $info['quicktime']['video']['color_depth_name'] = $atom_structure['sample_description_table'][$i]['video_pixel_color_name']; @@ -1598,33 +1624,61 @@ $this->warning('incomplete/incorrect handling of "stsd" with Parrot metadata in break; case 'NCDT': - // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html + // https://exiftool.org/TagNames/Nikon.html // Nikon-specific QuickTime tags found in the NCDT atom of MOV videos from some Nikon cameras such as the Coolpix S8000 and D5100 $atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 4, $atomHierarchy, $ParseAllPossibleAtoms); break; case 'NCTH': // Nikon Camera THumbnail image case 'NCVW': // Nikon Camera preVieW image - // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html + case 'NCM1': // Nikon Camera preview iMage 1 + case 'NCM2': // Nikon Camera preview iMage 2 + // https://exiftool.org/TagNames/Nikon.html if (preg_match('/^\xFF\xD8\xFF/', $atom_data)) { + $descriptions = array( + 'NCTH' => 'Nikon Camera Thumbnail Image', + 'NCVW' => 'Nikon Camera Preview Image', + 'NCM1' => 'Nikon Camera Preview Image 1', + 'NCM2' => 'Nikon Camera Preview Image 2', + ); $atom_structure['data'] = $atom_data; $atom_structure['image_mime'] = 'image/jpeg'; - $atom_structure['description'] = (($atomname == 'NCTH') ? 'Nikon Camera Thumbnail Image' : (($atomname == 'NCVW') ? 'Nikon Camera Preview Image' : 'Nikon preview image')); - $info['quicktime']['comments']['picture'][] = array('image_mime'=>$atom_structure['image_mime'], 'data'=>$atom_data, 'description'=>$atom_structure['description']); + $atom_structure['description'] = isset($descriptions[$atomname]) ? $descriptions[$atomname] : 'Nikon preview image'; + $info['quicktime']['comments']['picture'][] = array( + 'image_mime' => $atom_structure['image_mime'], + 'data' => $atom_data, + 'description' => $atom_structure['description'] + ); } break; - case 'NCTG': // Nikon - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#NCTG - $atom_structure['data'] = $this->QuicktimeParseNikonNCTG($atom_data); + case 'NCTG': // Nikon - https://exiftool.org/TagNames/Nikon.html#NCTG + getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.nikon-nctg.php', __FILE__, true); + $nikonNCTG = new getid3_tag_nikon_nctg($this->getid3); + + $atom_structure['data'] = $nikonNCTG->parse($atom_data); + break; + case 'NCHD': // Nikon:MakerNoteVersion - https://exiftool.org/TagNames/Nikon.html + $makerNoteVersion = ''; + for ($i = 0, $iMax = strlen($atom_data); $i < $iMax; ++$i) { + if (ord($atom_data[$i]) >= 0x00 && ord($atom_data[$i]) <= 0x1F) { + $makerNoteVersion .= ' '.ord($atom_data[$i]); + } else { + $makerNoteVersion .= $atom_data[$i]; + } + } + $makerNoteVersion = rtrim($makerNoteVersion, "\x00"); + $atom_structure['data'] = array( + 'MakerNoteVersion' => $makerNoteVersion + ); break; - case 'NCHD': // Nikon:MakerNoteVersion - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html - case 'NCDB': // Nikon - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html - case 'CNCV': // Canon:CompressorVersion - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Canon.html + case 'NCDB': // Nikon - https://exiftool.org/TagNames/Nikon.html + case 'CNCV': // Canon:CompressorVersion - https://exiftool.org/TagNames/Canon.html $atom_structure['data'] = $atom_data; break; case "\x00\x00\x00\x00": // some kind of metacontainer, may contain a big data dump such as: // mdta keys \005 mdtacom.apple.quicktime.make (mdtacom.apple.quicktime.creationdate ,mdtacom.apple.quicktime.location.ISO6709 $mdtacom.apple.quicktime.software !mdtacom.apple.quicktime.model ilst \01D \001 \015data \001DE\010Apple 0 \002 (data \001DE\0102011-05-11T17:54:04+0200 2 \003 *data \001DE\010+52.4936+013.3897+040.247/ \01D \004 \015data \001DE\0104.3.1 \005 \018data \001DE\010iPhone 4 - // http://www.geocities.com/xhelmboyx/quicktime/formats/qti-layout.txt + // https://xhelmboyx.tripod.com/formats/qti-layout.txt $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1)); $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); @@ -1721,6 +1775,7 @@ $this->warning('incomplete/incorrect handling of "stsd" with Parrot metadata in 'unknown_data' => array(), 'debug_list' => '', // Used to debug variables stored as comma delimited strings ); + $debug_structure = array(); $debug_structure['debug_items'] = array(); // Can start loop here to decode all sensor data in 32 Byte chunks: foreach (str_split($atom_SENSOR_data, 32) as $sensor_key => $sensor_data) { @@ -2039,7 +2094,7 @@ $this->warning('incomplete/incorrect handling of "stsd" with Parrot metadata in * @return array|false */ public function QuicktimeParseContainerAtom($atom_data, $baseoffset, &$atomHierarchy, $ParseAllPossibleAtoms) { - $atom_structure = false; + $atom_structure = array(); $subatomoffset = 0; $subatomcounter = 0; if ((strlen($atom_data) == 4) && (getid3_lib::BigEndian2Int($atom_data) == 0x00000000)) { @@ -2057,17 +2112,22 @@ $this->warning('incomplete/incorrect handling of "stsd" with Parrot metadata in $subatomoffset += 4; continue; } - return $atom_structure; + break; } if (strlen($subatomdata) < ($subatomsize - 8)) { // we don't have enough data to decode the subatom. // this may be because we are refusing to parse large subatoms, or it may be because this atom had its size set too large // so we passed in the start of a following atom incorrectly? - return $atom_structure; + break; } $atom_structure[$subatomcounter++] = $this->QuicktimeParseAtom($subatomname, $subatomsize, $subatomdata, $baseoffset + $subatomoffset, $atomHierarchy, $ParseAllPossibleAtoms); $subatomoffset += $subatomsize; } + + if (empty($atom_structure)) { + return false; + } + return $atom_structure; } @@ -2552,8 +2612,9 @@ $this->warning('incomplete/incorrect handling of "stsd" with Parrot metadata in static $QuicktimeContentRatingLookup = array(); if (empty($QuicktimeContentRatingLookup)) { $QuicktimeContentRatingLookup[0] = 'None'; + $QuicktimeContentRatingLookup[1] = 'Explicit'; $QuicktimeContentRatingLookup[2] = 'Clean'; - $QuicktimeContentRatingLookup[4] = 'Explicit'; + $QuicktimeContentRatingLookup[4] = 'Explicit (old)'; } return (isset($QuicktimeContentRatingLookup[$rtng]) ? $QuicktimeContentRatingLookup[$rtng] : 'invalid'); } @@ -2606,189 +2667,6 @@ $this->warning('incomplete/incorrect handling of "stsd" with Parrot metadata in return (isset($QuicktimeStoreFrontCodeLookup[$sfid]) ? $QuicktimeStoreFrontCodeLookup[$sfid] : 'invalid'); } - /** - * @param string $atom_data - * - * @return array - */ - public function QuicktimeParseNikonNCTG($atom_data) { - // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#NCTG - // Nikon-specific QuickTime tags found in the NCDT atom of MOV videos from some Nikon cameras such as the Coolpix S8000 and D5100 - // Data is stored as records of: - // * 4 bytes record type - // * 2 bytes size of data field type: - // 0x0001 = flag (size field *= 1-byte) - // 0x0002 = char (size field *= 1-byte) - // 0x0003 = DWORD+ (size field *= 2-byte), values are stored CDAB - // 0x0004 = QWORD+ (size field *= 4-byte), values are stored EFGHABCD - // 0x0005 = float (size field *= 8-byte), values are stored aaaabbbb where value is aaaa/bbbb; possibly multiple sets of values appended together - // 0x0007 = bytes (size field *= 1-byte), values are stored as ?????? - // 0x0008 = ????? (size field *= 2-byte), values are stored as ?????? - // * 2 bytes data size field - // * ? bytes data (string data may be null-padded; datestamp fields are in the format "2011:05:25 20:24:15") - // all integers are stored BigEndian - - $NCTGtagName = array( - 0x00000001 => 'Make', - 0x00000002 => 'Model', - 0x00000003 => 'Software', - 0x00000011 => 'CreateDate', - 0x00000012 => 'DateTimeOriginal', - 0x00000013 => 'FrameCount', - 0x00000016 => 'FrameRate', - 0x00000022 => 'FrameWidth', - 0x00000023 => 'FrameHeight', - 0x00000032 => 'AudioChannels', - 0x00000033 => 'AudioBitsPerSample', - 0x00000034 => 'AudioSampleRate', - 0x02000001 => 'MakerNoteVersion', - 0x02000005 => 'WhiteBalance', - 0x0200000b => 'WhiteBalanceFineTune', - 0x0200001e => 'ColorSpace', - 0x02000023 => 'PictureControlData', - 0x02000024 => 'WorldTime', - 0x02000032 => 'UnknownInfo', - 0x02000083 => 'LensType', - 0x02000084 => 'Lens', - ); - - $offset = 0; - $data = null; - $datalength = strlen($atom_data); - $parsed = array(); - while ($offset < $datalength) { - $record_type = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 4)); $offset += 4; - $data_size_type = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2)); $offset += 2; - $data_size = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2)); $offset += 2; - switch ($data_size_type) { - case 0x0001: // 0x0001 = flag (size field *= 1-byte) - $data = getid3_lib::BigEndian2Int(substr($atom_data, $offset, $data_size * 1)); - $offset += ($data_size * 1); - break; - case 0x0002: // 0x0002 = char (size field *= 1-byte) - $data = substr($atom_data, $offset, $data_size * 1); - $offset += ($data_size * 1); - $data = rtrim($data, "\x00"); - break; - case 0x0003: // 0x0003 = DWORD+ (size field *= 2-byte), values are stored CDAB - $data = ''; - for ($i = $data_size - 1; $i >= 0; $i--) { - $data .= substr($atom_data, $offset + ($i * 2), 2); - } - $data = getid3_lib::BigEndian2Int($data); - $offset += ($data_size * 2); - break; - case 0x0004: // 0x0004 = QWORD+ (size field *= 4-byte), values are stored EFGHABCD - $data = ''; - for ($i = $data_size - 1; $i >= 0; $i--) { - $data .= substr($atom_data, $offset + ($i * 4), 4); - } - $data = getid3_lib::BigEndian2Int($data); - $offset += ($data_size * 4); - break; - case 0x0005: // 0x0005 = float (size field *= 8-byte), values are stored aaaabbbb where value is aaaa/bbbb; possibly multiple sets of values appended together - $data = array(); - for ($i = 0; $i < $data_size; $i++) { - $numerator = getid3_lib::BigEndian2Int(substr($atom_data, $offset + ($i * 8) + 0, 4)); - $denomninator = getid3_lib::BigEndian2Int(substr($atom_data, $offset + ($i * 8) + 4, 4)); - if ($denomninator == 0) { - $data[$i] = false; - } else { - $data[$i] = (double) $numerator / $denomninator; - } - } - $offset += (8 * $data_size); - if (count($data) == 1) { - $data = $data[0]; - } - break; - case 0x0007: // 0x0007 = bytes (size field *= 1-byte), values are stored as ?????? - $data = substr($atom_data, $offset, $data_size * 1); - $offset += ($data_size * 1); - break; - case 0x0008: // 0x0008 = ????? (size field *= 2-byte), values are stored as ?????? - $data = substr($atom_data, $offset, $data_size * 2); - $offset += ($data_size * 2); - break; - default: - echo 'QuicktimeParseNikonNCTG()::unknown $data_size_type: '.$data_size_type.'
'; - break 2; - } - - switch ($record_type) { - case 0x00000011: // CreateDate - case 0x00000012: // DateTimeOriginal - $data = strtotime($data); - break; - case 0x0200001e: // ColorSpace - switch ($data) { - case 1: - $data = 'sRGB'; - break; - case 2: - $data = 'Adobe RGB'; - break; - } - break; - case 0x02000023: // PictureControlData - $PictureControlAdjust = array(0=>'default', 1=>'quick', 2=>'full'); - $FilterEffect = array(0x80=>'off', 0x81=>'yellow', 0x82=>'orange', 0x83=>'red', 0x84=>'green', 0xff=>'n/a'); - $ToningEffect = array(0x80=>'b&w', 0x81=>'sepia', 0x82=>'cyanotype', 0x83=>'red', 0x84=>'yellow', 0x85=>'green', 0x86=>'blue-green', 0x87=>'blue', 0x88=>'purple-blue', 0x89=>'red-purple', 0xff=>'n/a'); - $data = array( - 'PictureControlVersion' => substr($data, 0, 4), - 'PictureControlName' => rtrim(substr($data, 4, 20), "\x00"), - 'PictureControlBase' => rtrim(substr($data, 24, 20), "\x00"), - //'?' => substr($data, 44, 4), - 'PictureControlAdjust' => $PictureControlAdjust[ord(substr($data, 48, 1))], - 'PictureControlQuickAdjust' => ord(substr($data, 49, 1)), - 'Sharpness' => ord(substr($data, 50, 1)), - 'Contrast' => ord(substr($data, 51, 1)), - 'Brightness' => ord(substr($data, 52, 1)), - 'Saturation' => ord(substr($data, 53, 1)), - 'HueAdjustment' => ord(substr($data, 54, 1)), - 'FilterEffect' => $FilterEffect[ord(substr($data, 55, 1))], - 'ToningEffect' => $ToningEffect[ord(substr($data, 56, 1))], - 'ToningSaturation' => ord(substr($data, 57, 1)), - ); - break; - case 0x02000024: // WorldTime - // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#WorldTime - // timezone is stored as offset from GMT in minutes - $timezone = getid3_lib::BigEndian2Int(substr($data, 0, 2)); - if ($timezone & 0x8000) { - $timezone = 0 - (0x10000 - $timezone); - } - $timezone /= 60; - - $dst = (bool) getid3_lib::BigEndian2Int(substr($data, 2, 1)); - switch (getid3_lib::BigEndian2Int(substr($data, 3, 1))) { - case 2: - $datedisplayformat = 'D/M/Y'; break; - case 1: - $datedisplayformat = 'M/D/Y'; break; - case 0: - default: - $datedisplayformat = 'Y/M/D'; break; - } - - $data = array('timezone'=>floatval($timezone), 'dst'=>$dst, 'display'=>$datedisplayformat); - break; - case 0x02000083: // LensType - $data = array( - //'_' => $data, - 'mf' => (bool) ($data & 0x01), - 'd' => (bool) ($data & 0x02), - 'g' => (bool) ($data & 0x04), - 'vr' => (bool) ($data & 0x08), - ); - break; - } - $tag_name = (isset($NCTGtagName[$record_type]) ? $NCTGtagName[$record_type] : '0x'.str_pad(dechex($record_type), 8, '0', STR_PAD_LEFT)); - $parsed[$tag_name] = $data; - } - return $parsed; - } - /** * @param string $keyname * @param string|array $data diff --git a/src/wp-includes/ID3/module.audio-video.riff.php b/src/wp-includes/ID3/module.audio-video.riff.php index cdf553386b..6ef1116ad1 100644 --- a/src/wp-includes/ID3/module.audio-video.riff.php +++ b/src/wp-includes/ID3/module.audio-video.riff.php @@ -56,6 +56,7 @@ class getid3_riff extends getid3_handler $thisfile_riff_video = &$thisfile_riff['video']; $thisfile_riff_WAVE = array(); + $Original = array(); $Original['avdataoffset'] = $info['avdataoffset']; $Original['avdataend'] = $info['avdataend']; @@ -296,9 +297,18 @@ class getid3_riff extends getid3_handler // shortcut $thisfile_riff_WAVE_bext_0 = &$thisfile_riff_WAVE['bext'][0]; - $thisfile_riff_WAVE_bext_0['title'] = trim(substr($thisfile_riff_WAVE_bext_0['data'], 0, 256)); - $thisfile_riff_WAVE_bext_0['author'] = trim(substr($thisfile_riff_WAVE_bext_0['data'], 256, 32)); - $thisfile_riff_WAVE_bext_0['reference'] = trim(substr($thisfile_riff_WAVE_bext_0['data'], 288, 32)); + $thisfile_riff_WAVE_bext_0['title'] = substr($thisfile_riff_WAVE_bext_0['data'], 0, 256); + $thisfile_riff_WAVE_bext_0['author'] = substr($thisfile_riff_WAVE_bext_0['data'], 256, 32); + $thisfile_riff_WAVE_bext_0['reference'] = substr($thisfile_riff_WAVE_bext_0['data'], 288, 32); + foreach (array('title','author','reference') as $bext_key) { + // Some software (notably Logic Pro) may not blank existing data before writing a null-terminated string to the offsets + // assigned for text fields, resulting in a null-terminated string (or possibly just a single null) followed by garbage + // Keep only string as far as first null byte, discard rest of fixed-width data + // https://github.com/JamesHeinrich/getID3/issues/263 + $null_terminator_offset = strpos($thisfile_riff_WAVE_bext_0[$bext_key], "\x00"); + $thisfile_riff_WAVE_bext_0[$bext_key] = substr($thisfile_riff_WAVE_bext_0[$bext_key], 0, $null_terminator_offset); + } + $thisfile_riff_WAVE_bext_0['origin_date'] = substr($thisfile_riff_WAVE_bext_0['data'], 320, 10); $thisfile_riff_WAVE_bext_0['origin_time'] = substr($thisfile_riff_WAVE_bext_0['data'], 330, 8); $thisfile_riff_WAVE_bext_0['time_reference'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_bext_0['data'], 338, 8)); @@ -307,6 +317,7 @@ class getid3_riff extends getid3_handler $thisfile_riff_WAVE_bext_0['coding_history'] = explode("\r\n", trim(substr($thisfile_riff_WAVE_bext_0['data'], 601))); if (preg_match('#^([0-9]{4}).([0-9]{2}).([0-9]{2})$#', $thisfile_riff_WAVE_bext_0['origin_date'], $matches_bext_date)) { if (preg_match('#^([0-9]{2}).([0-9]{2}).([0-9]{2})$#', $thisfile_riff_WAVE_bext_0['origin_time'], $matches_bext_time)) { + $bext_timestamp = array(); list($dummy, $bext_timestamp['year'], $bext_timestamp['month'], $bext_timestamp['day']) = $matches_bext_date; list($dummy, $bext_timestamp['hour'], $bext_timestamp['minute'], $bext_timestamp['second']) = $matches_bext_time; $thisfile_riff_WAVE_bext_0['origin_date_unix'] = gmmktime($bext_timestamp['hour'], $bext_timestamp['minute'], $bext_timestamp['second'], $bext_timestamp['month'], $bext_timestamp['day'], $bext_timestamp['year']); @@ -451,7 +462,62 @@ class getid3_riff extends getid3_handler } } + if (isset($thisfile_riff_WAVE['guan'][0]['data'])) { + // shortcut + $thisfile_riff_WAVE_guan_0 = &$thisfile_riff_WAVE['guan'][0]; + if (!empty($thisfile_riff_WAVE_guan_0['data']) && (substr($thisfile_riff_WAVE_guan_0['data'], 0, 14) == 'GUANO|Version:')) { + $thisfile_riff['guano'] = array(); + foreach (explode("\n", $thisfile_riff_WAVE_guan_0['data']) as $line) { + if ($line) { + @list($key, $value) = explode(':', $line, 2); + if (substr($value, 0, 3) == '[{"') { + if ($decoded = @json_decode($value, true)) { + if (!empty($decoded) && (count($decoded) == 1)) { + $value = $decoded[0]; + } else { + $value = $decoded; + } + } + } + $thisfile_riff['guano'] = array_merge_recursive($thisfile_riff['guano'], getid3_lib::CreateDeepArray($key, '|', $value)); + } + } + + // https://www.wildlifeacoustics.com/SCHEMA/GUANO.html + foreach ($thisfile_riff['guano'] as $key => $value) { + switch ($key) { + case 'Loc Position': + if (preg_match('#^([\\+\\-]?[0-9]+\\.[0-9]+) ([\\+\\-]?[0-9]+\\.[0-9]+)$#', $value, $matches)) { + list($dummy, $latitude, $longitude) = $matches; + $thisfile_riff['comments']['gps_latitude'][0] = floatval($latitude); + $thisfile_riff['comments']['gps_longitude'][0] = floatval($longitude); + $thisfile_riff['guano'][$key] = floatval($latitude).' '.floatval($longitude); + } + break; + case 'Loc Elevation': // Elevation/altitude above mean sea level in meters + $thisfile_riff['comments']['gps_altitude'][0] = floatval($value); + $thisfile_riff['guano'][$key] = (float) $value; + break; + case 'Filter HP': // High-pass filter frequency in kHz + case 'Filter LP': // Low-pass filter frequency in kHz + case 'Humidity': // Relative humidity as a percentage + case 'Length': // Recording length in seconds + case 'Loc Accuracy': // Estimated Position Error in meters + case 'Temperature Ext': // External temperature in degrees Celsius outside the recorder's housing + case 'Temperature Int': // Internal temperature in degrees Celsius inside the recorder's housing + $thisfile_riff['guano'][$key] = (float) $value; + break; + case 'Samplerate': // Recording sample rate, Hz + case 'TE': // Time-expansion factor. If not specified, then 1 (no time-expansion a.k.a. direct-recording) is assumed. + $thisfile_riff['guano'][$key] = (int) $value; + break; + } + } + } else { + $this->warning('RIFF.guan data not in expected format'); + } + } if (!isset($thisfile_audio['bitrate']) && isset($thisfile_riff_audio[$streamindex]['bitrate'])) { $thisfile_audio['bitrate'] = $thisfile_riff_audio[$streamindex]['bitrate']; @@ -733,6 +799,7 @@ class getid3_riff extends getid3_handler } if (isset($thisfile_riff['AVI ']['hdrl']['strl']['strh'][0]['data'])) { if (is_array($thisfile_riff['AVI ']['hdrl']['strl']['strh'])) { + $thisfile_riff_raw_strf_strhfccType_streamindex = null; for ($i = 0; $i < count($thisfile_riff['AVI ']['hdrl']['strl']['strh']); $i++) { if (isset($thisfile_riff['AVI ']['hdrl']['strl']['strh'][$i]['data'])) { $strhData = $thisfile_riff['AVI ']['hdrl']['strl']['strh'][$i]['data']; @@ -1069,7 +1136,7 @@ class getid3_riff extends getid3_handler if (isset($thisfile_riff[$RIFFsubtype]['ID3 '])) { getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true); $getid3_temp = new getID3(); - $getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp); + $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp); $getid3_id3v2 = new getid3_id3v2($getid3_temp); $getid3_id3v2->StartingOffset = $thisfile_riff[$RIFFsubtype]['ID3 '][0]['offset'] + 8; if ($thisfile_riff[$RIFFsubtype]['ID3 '][0]['valid'] = $getid3_id3v2->Analyze()) { @@ -1172,7 +1239,7 @@ class getid3_riff extends getid3_handler getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.mpeg.php', __FILE__, true); $getid3_temp = new getID3(); - $getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp); + $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp); $getid3_mpeg = new getid3_mpeg($getid3_temp); $getid3_mpeg->Analyze(); if (empty($getid3_temp->info['error'])) { @@ -1258,7 +1325,7 @@ class getid3_riff extends getid3_handler getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true); $getid3_temp = new getID3(); - $getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp); + $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp); $getid3_id3v2 = new getid3_id3v2($getid3_temp); $getid3_id3v2->StartingOffset = $thisfile_riff[$RIFFsubtype]['id3 '][0]['offset'] + 8; if ($thisfile_riff[$RIFFsubtype]['id3 '][0]['valid'] = $getid3_id3v2->Analyze()) { @@ -1514,6 +1581,9 @@ class getid3_riff extends getid3_handler $RIFFchunk = false; $FoundAllChunksWeNeed = false; + $LISTchunkParent = null; + $LISTchunkMaxOffset = null; + $AC3syncwordBytes = pack('n', getid3_ac3::syncword); // 0x0B77 -> "\x0B\x77" try { $this->fseek($startoffset); @@ -1557,7 +1627,7 @@ class getid3_riff extends getid3_handler // MP3 if (getid3_mp3::MPEGaudioHeaderBytesValid($FirstFourBytes)) { $getid3_temp = new getID3(); - $getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp); + $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp); $getid3_temp->info['avdataoffset'] = $this->ftell() - 4; $getid3_temp->info['avdataend'] = $this->ftell() + $AudioChunkSize; $getid3_mp3 = new getid3_mp3($getid3_temp, __CLASS__); @@ -1575,11 +1645,10 @@ class getid3_riff extends getid3_handler unset($getid3_temp, $getid3_mp3); } - } elseif (strpos($FirstFourBytes, getid3_ac3::syncword) === 0) { - + } elseif (strpos($FirstFourBytes, $AC3syncwordBytes) === 0) { // AC3 $getid3_temp = new getID3(); - $getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp); + $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp); $getid3_temp->info['avdataoffset'] = $this->ftell() - 4; $getid3_temp->info['avdataend'] = $this->ftell() + $AudioChunkSize; $getid3_ac3 = new getid3_ac3($getid3_temp); @@ -1640,7 +1709,7 @@ class getid3_riff extends getid3_handler // Probably is MP3 data if (getid3_mp3::MPEGaudioHeaderBytesValid(substr($testData, 0, 4))) { $getid3_temp = new getID3(); - $getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp); + $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp); $getid3_temp->info['avdataoffset'] = $info['avdataoffset']; $getid3_temp->info['avdataend'] = $info['avdataend']; $getid3_mp3 = new getid3_mp3($getid3_temp, __CLASS__); @@ -1652,12 +1721,12 @@ class getid3_riff extends getid3_handler unset($getid3_temp, $getid3_mp3); } - } elseif (($isRegularAC3 = (substr($testData, 0, 2) == getid3_ac3::syncword)) || substr($testData, 8, 2) == strrev(getid3_ac3::syncword)) { + } elseif (($isRegularAC3 = (substr($testData, 0, 2) == $AC3syncwordBytes)) || substr($testData, 8, 2) == strrev($AC3syncwordBytes)) { // This is probably AC-3 data $getid3_temp = new getID3(); if ($isRegularAC3) { - $getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp); + $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp); $getid3_temp->info['avdataoffset'] = $info['avdataoffset']; $getid3_temp->info['avdataend'] = $info['avdataend']; } @@ -1673,6 +1742,8 @@ class getid3_riff extends getid3_handler $ac3_data .= substr($testData, 8 + $i + 1, 1); $ac3_data .= substr($testData, 8 + $i + 0, 1); } + $getid3_ac3->getid3->info['avdataoffset'] = 0; + $getid3_ac3->getid3->info['avdataend'] = strlen($ac3_data); $getid3_ac3->AnalyzeString($ac3_data); } @@ -1691,7 +1762,7 @@ class getid3_riff extends getid3_handler // This is probably DTS data $getid3_temp = new getID3(); - $getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp); + $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp); $getid3_temp->info['avdataoffset'] = $info['avdataoffset']; $getid3_dts = new getid3_dts($getid3_temp); $getid3_dts->Analyze(); @@ -1732,6 +1803,8 @@ class getid3_riff extends getid3_handler case 'indx': case 'MEXT': case 'DISP': + case 'wamd': + case 'guan': // always read data in case 'JUNK': // should be: never read data in @@ -2076,6 +2149,7 @@ class getid3_riff extends getid3_handler */ public static function ParseBITMAPINFOHEADER($BITMAPINFOHEADER, $littleEndian=true) { + $parsed = array(); $parsed['biSize'] = substr($BITMAPINFOHEADER, 0, 4); // number of bytes required by the BITMAPINFOHEADER structure $parsed['biWidth'] = substr($BITMAPINFOHEADER, 4, 4); // width of the bitmap in pixels $parsed['biHeight'] = substr($BITMAPINFOHEADER, 8, 4); // height of the bitmap in pixels. If biHeight is positive, the bitmap is a 'bottom-up' DIB and its origin is the lower left corner. If biHeight is negative, the bitmap is a 'top-down' DIB and its origin is the upper left corner diff --git a/src/wp-includes/ID3/module.audio.flac.php b/src/wp-includes/ID3/module.audio.flac.php index 1cea4364c2..014061da94 100644 --- a/src/wp-includes/ID3/module.audio.flac.php +++ b/src/wp-includes/ID3/module.audio.flac.php @@ -402,6 +402,7 @@ class getid3_flac extends getid3_handler public function parsePICTURE() { $info = &$this->getid3->info; + $picture = array(); $picture['typeid'] = getid3_lib::BigEndian2Int($this->fread(4)); $picture['picturetype'] = self::pictureTypeLookup($picture['typeid']); $picture['image_mime'] = $this->fread(getid3_lib::BigEndian2Int($this->fread(4))); diff --git a/src/wp-includes/ID3/module.audio.mp3.php b/src/wp-includes/ID3/module.audio.mp3.php index 26b28068f8..1f5a566b83 100644 --- a/src/wp-includes/ID3/module.audio.mp3.php +++ b/src/wp-includes/ID3/module.audio.mp3.php @@ -18,12 +18,6 @@ if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that acce exit; } -// number of frames to scan to determine if MPEG-audio sequence is valid -// Lower this number to 5-20 for faster scanning -// Increase this number to 50+ for most accurate detection of valid VBR/CBR -// mpeg-audio streams -define('GETID3_MP3_VALID_CHECK_FRAMES', 35); - class getid3_mp3 extends getid3_handler { @@ -35,6 +29,15 @@ class getid3_mp3 extends getid3_handler */ public $allow_bruteforce = false; + /** + * number of frames to scan to determine if MPEG-audio sequence is valid + * Lower this number to 5-20 for faster scanning + * Increase this number to 50+ for most accurate detection of valid VBR/CBR mpeg-audio streams + * + * @var int + */ + public $mp3_valid_check_frames = 50; + /** * @return bool */ @@ -55,6 +58,7 @@ class getid3_mp3 extends getid3_handler $info['audio']['bitrate_mode'] = strtolower($info['mpeg']['audio']['bitrate_mode']); } + $CurrentDataLAMEversionString = null; if (((isset($info['id3v2']['headerlength']) && ($info['avdataoffset'] > $info['id3v2']['headerlength'])) || (!isset($info['id3v2']) && ($info['avdataoffset'] > 0) && ($info['avdataoffset'] != $initialOffset)))) { $synchoffsetwarning = 'Unknown data before synch '; @@ -121,6 +125,12 @@ class getid3_mp3 extends getid3_handler if (substr($PossiblyLongerLAMEversion_String, 0, strlen($CurrentDataLAMEversionString)) == $CurrentDataLAMEversionString) { $PossiblyLongerLAMEversion_NewString = substr($PossiblyLongerLAMEversion_String, 0, strspn($PossiblyLongerLAMEversion_String, 'LAME0123456789., (abcdefghijklmnopqrstuvwxyzJFSOND)')); //"LAME3.90.3" "LAME3.87 (beta 1, Sep 27 2000)" "LAME3.88 (beta)" if (empty($info['audio']['encoder']) || (strlen($PossiblyLongerLAMEversion_NewString) > strlen($info['audio']['encoder']))) { + if (!empty($info['audio']['encoder']) && !empty($info['mpeg']['audio']['LAME']['short_version']) && ($info['audio']['encoder'] == $info['mpeg']['audio']['LAME']['short_version'])) { + if (preg_match('#^LAME[0-9\\.]+#', $PossiblyLongerLAMEversion_NewString, $matches)) { + // "LAME3.100" -> "LAME3.100.1", but avoid including "(alpha)" and similar + $info['mpeg']['audio']['LAME']['short_version'] = $matches[0]; + } + } $info['audio']['encoder'] = $PossiblyLongerLAMEversion_NewString; } } @@ -295,7 +305,7 @@ class getid3_mp3 extends getid3_handler } elseif (!empty($info['audio']['bitrate'])) { if ($info['audio']['bitrate_mode'] == 'cbr') { - $encoder_options = strtoupper($info['audio']['bitrate_mode']).ceil($info['audio']['bitrate'] / 1000); + $encoder_options = strtoupper($info['audio']['bitrate_mode']).round($info['audio']['bitrate'] / 1000); } else { $encoder_options = strtoupper($info['audio']['bitrate_mode']); } @@ -488,7 +498,7 @@ class getid3_mp3 extends getid3_handler if ($MPEGaudioHeaderValidCache[$head4_key]) { $thisfile_mpeg_audio['raw'] = $MPEGheaderRawArray; } else { - $this->error('Invalid MPEG audio header ('.getid3_lib::PrintHexBytes($head4).') at offset '.$offset); + $this->warning('Invalid MPEG audio header ('.getid3_lib::PrintHexBytes($head4).') at offset '.$offset); return false; } @@ -722,197 +732,200 @@ class getid3_mp3 extends getid3_handler $thisfile_mpeg_audio_lame['long_version'] = substr($headerstring, $VBRidOffset + 120, 20); $thisfile_mpeg_audio_lame['short_version'] = substr($thisfile_mpeg_audio_lame['long_version'], 0, 9); - $thisfile_mpeg_audio_lame['numeric_version'] = str_replace('LAME', '', $thisfile_mpeg_audio_lame['short_version']); - if (preg_match('#^LAME([0-9\\.a-z]+)#', $thisfile_mpeg_audio_lame['long_version'], $matches)) { + + //$thisfile_mpeg_audio_lame['numeric_version'] = str_replace('LAME', '', $thisfile_mpeg_audio_lame['short_version']); + $thisfile_mpeg_audio_lame['numeric_version'] = ''; + if (preg_match('#^LAME([0-9\\.a-z]*)#', $thisfile_mpeg_audio_lame['long_version'], $matches)) { $thisfile_mpeg_audio_lame['short_version'] = $matches[0]; $thisfile_mpeg_audio_lame['numeric_version'] = $matches[1]; } - foreach (explode('.', $thisfile_mpeg_audio_lame['numeric_version']) as $key => $number) { - $thisfile_mpeg_audio_lame['integer_version'][$key] = intval($number); - } - - //if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.90') { - if ((($thisfile_mpeg_audio_lame['integer_version'][0] * 1000) + $thisfile_mpeg_audio_lame['integer_version'][1]) >= 3090) { // cannot use string version compare, may have "LAME3.90" or "LAME3.100" -- see https://github.com/JamesHeinrich/getID3/issues/207 - - // extra 11 chars are not part of version string when LAMEtag present - unset($thisfile_mpeg_audio_lame['long_version']); - - // It the LAME tag was only introduced in LAME v3.90 - // http://www.hydrogenaudio.org/?act=ST&f=15&t=9933 - - // Offsets of various bytes in http://gabriel.mp3-tech.org/mp3infotag.html - // are assuming a 'Xing' identifier offset of 0x24, which is the case for - // MPEG-1 non-mono, but not for other combinations - $LAMEtagOffsetContant = $VBRidOffset - 0x24; - - // shortcuts - $thisfile_mpeg_audio_lame['RGAD'] = array('track'=>array(), 'album'=>array()); - $thisfile_mpeg_audio_lame_RGAD = &$thisfile_mpeg_audio_lame['RGAD']; - $thisfile_mpeg_audio_lame_RGAD_track = &$thisfile_mpeg_audio_lame_RGAD['track']; - $thisfile_mpeg_audio_lame_RGAD_album = &$thisfile_mpeg_audio_lame_RGAD['album']; - $thisfile_mpeg_audio_lame['raw'] = array(); - $thisfile_mpeg_audio_lame_raw = &$thisfile_mpeg_audio_lame['raw']; - - // byte $9B VBR Quality - // This field is there to indicate a quality level, although the scale was not precised in the original Xing specifications. - // Actually overwrites original Xing bytes - unset($thisfile_mpeg_audio['VBR_scale']); - $thisfile_mpeg_audio_lame['vbr_quality'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0x9B, 1)); - - // bytes $9C-$A4 Encoder short VersionString - $thisfile_mpeg_audio_lame['short_version'] = substr($headerstring, $LAMEtagOffsetContant + 0x9C, 9); - - // byte $A5 Info Tag revision + VBR method - $LAMEtagRevisionVBRmethod = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA5, 1)); - - $thisfile_mpeg_audio_lame['tag_revision'] = ($LAMEtagRevisionVBRmethod & 0xF0) >> 4; - $thisfile_mpeg_audio_lame_raw['vbr_method'] = $LAMEtagRevisionVBRmethod & 0x0F; - $thisfile_mpeg_audio_lame['vbr_method'] = self::LAMEvbrMethodLookup($thisfile_mpeg_audio_lame_raw['vbr_method']); - $thisfile_mpeg_audio['bitrate_mode'] = substr($thisfile_mpeg_audio_lame['vbr_method'], 0, 3); // usually either 'cbr' or 'vbr', but truncates 'vbr-old / vbr-rh' to 'vbr' - - // byte $A6 Lowpass filter value - $thisfile_mpeg_audio_lame['lowpass_frequency'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA6, 1)) * 100; - - // bytes $A7-$AE Replay Gain - // http://privatewww.essex.ac.uk/~djmrob/replaygain/rg_data_format.html - // bytes $A7-$AA : 32 bit floating point "Peak signal amplitude" - if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.94b') { - // LAME 3.94a16 and later - 9.23 fixed point - // ie 0x0059E2EE / (2^23) = 5890798 / 8388608 = 0.7022378444671630859375 - $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] = (float) ((getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA7, 4))) / 8388608); - } else { - // LAME 3.94a15 and earlier - 32-bit floating point - // Actually 3.94a16 will fall in here too and be WRONG, but is hard to detect 3.94a16 vs 3.94a15 - $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] = getid3_lib::LittleEndian2Float(substr($headerstring, $LAMEtagOffsetContant + 0xA7, 4)); - } - if ($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] == 0) { - unset($thisfile_mpeg_audio_lame_RGAD['peak_amplitude']); - } else { - $thisfile_mpeg_audio_lame_RGAD['peak_db'] = getid3_lib::RGADamplitude2dB($thisfile_mpeg_audio_lame_RGAD['peak_amplitude']); + if (strlen($thisfile_mpeg_audio_lame['numeric_version']) > 0) { + foreach (explode('.', $thisfile_mpeg_audio_lame['numeric_version']) as $key => $number) { + $thisfile_mpeg_audio_lame['integer_version'][$key] = intval($number); } + //if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.90') { + if ((($thisfile_mpeg_audio_lame['integer_version'][0] * 1000) + $thisfile_mpeg_audio_lame['integer_version'][1]) >= 3090) { // cannot use string version compare, may have "LAME3.90" or "LAME3.100" -- see https://github.com/JamesHeinrich/getID3/issues/207 + + // extra 11 chars are not part of version string when LAMEtag present + unset($thisfile_mpeg_audio_lame['long_version']); + + // It the LAME tag was only introduced in LAME v3.90 + // http://www.hydrogenaudio.org/?act=ST&f=15&t=9933 + + // Offsets of various bytes in http://gabriel.mp3-tech.org/mp3infotag.html + // are assuming a 'Xing' identifier offset of 0x24, which is the case for + // MPEG-1 non-mono, but not for other combinations + $LAMEtagOffsetContant = $VBRidOffset - 0x24; + + // shortcuts + $thisfile_mpeg_audio_lame['RGAD'] = array('track'=>array(), 'album'=>array()); + $thisfile_mpeg_audio_lame_RGAD = &$thisfile_mpeg_audio_lame['RGAD']; + $thisfile_mpeg_audio_lame_RGAD_track = &$thisfile_mpeg_audio_lame_RGAD['track']; + $thisfile_mpeg_audio_lame_RGAD_album = &$thisfile_mpeg_audio_lame_RGAD['album']; + $thisfile_mpeg_audio_lame['raw'] = array(); + $thisfile_mpeg_audio_lame_raw = &$thisfile_mpeg_audio_lame['raw']; + + // byte $9B VBR Quality + // This field is there to indicate a quality level, although the scale was not precised in the original Xing specifications. + // Actually overwrites original Xing bytes + unset($thisfile_mpeg_audio['VBR_scale']); + $thisfile_mpeg_audio_lame['vbr_quality'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0x9B, 1)); + + // bytes $9C-$A4 Encoder short VersionString + $thisfile_mpeg_audio_lame['short_version'] = substr($headerstring, $LAMEtagOffsetContant + 0x9C, 9); + + // byte $A5 Info Tag revision + VBR method + $LAMEtagRevisionVBRmethod = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA5, 1)); + + $thisfile_mpeg_audio_lame['tag_revision'] = ($LAMEtagRevisionVBRmethod & 0xF0) >> 4; + $thisfile_mpeg_audio_lame_raw['vbr_method'] = $LAMEtagRevisionVBRmethod & 0x0F; + $thisfile_mpeg_audio_lame['vbr_method'] = self::LAMEvbrMethodLookup($thisfile_mpeg_audio_lame_raw['vbr_method']); + $thisfile_mpeg_audio['bitrate_mode'] = substr($thisfile_mpeg_audio_lame['vbr_method'], 0, 3); // usually either 'cbr' or 'vbr', but truncates 'vbr-old / vbr-rh' to 'vbr' + + // byte $A6 Lowpass filter value + $thisfile_mpeg_audio_lame['lowpass_frequency'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA6, 1)) * 100; + + // bytes $A7-$AE Replay Gain + // http://privatewww.essex.ac.uk/~djmrob/replaygain/rg_data_format.html + // bytes $A7-$AA : 32 bit floating point "Peak signal amplitude" + if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.94b') { + // LAME 3.94a16 and later - 9.23 fixed point + // ie 0x0059E2EE / (2^23) = 5890798 / 8388608 = 0.7022378444671630859375 + $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] = (float) ((getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA7, 4))) / 8388608); + } else { + // LAME 3.94a15 and earlier - 32-bit floating point + // Actually 3.94a16 will fall in here too and be WRONG, but is hard to detect 3.94a16 vs 3.94a15 + $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] = getid3_lib::LittleEndian2Float(substr($headerstring, $LAMEtagOffsetContant + 0xA7, 4)); + } + if ($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] == 0) { + unset($thisfile_mpeg_audio_lame_RGAD['peak_amplitude']); + } else { + $thisfile_mpeg_audio_lame_RGAD['peak_db'] = getid3_lib::RGADamplitude2dB($thisfile_mpeg_audio_lame_RGAD['peak_amplitude']); + } - $thisfile_mpeg_audio_lame_raw['RGAD_track'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAB, 2)); - $thisfile_mpeg_audio_lame_raw['RGAD_album'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAD, 2)); + $thisfile_mpeg_audio_lame_raw['RGAD_track'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAB, 2)); + $thisfile_mpeg_audio_lame_raw['RGAD_album'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAD, 2)); - if ($thisfile_mpeg_audio_lame_raw['RGAD_track'] != 0) { + if ($thisfile_mpeg_audio_lame_raw['RGAD_track'] != 0) { - $thisfile_mpeg_audio_lame_RGAD_track['raw']['name'] = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0xE000) >> 13; - $thisfile_mpeg_audio_lame_RGAD_track['raw']['originator'] = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x1C00) >> 10; - $thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit'] = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x0200) >> 9; - $thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'] = $thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x01FF; - $thisfile_mpeg_audio_lame_RGAD_track['name'] = getid3_lib::RGADnameLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['name']); - $thisfile_mpeg_audio_lame_RGAD_track['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['originator']); - $thisfile_mpeg_audio_lame_RGAD_track['gain_db'] = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit']); + $thisfile_mpeg_audio_lame_RGAD_track['raw']['name'] = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0xE000) >> 13; + $thisfile_mpeg_audio_lame_RGAD_track['raw']['originator'] = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x1C00) >> 10; + $thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit'] = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x0200) >> 9; + $thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'] = $thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x01FF; + $thisfile_mpeg_audio_lame_RGAD_track['name'] = getid3_lib::RGADnameLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['name']); + $thisfile_mpeg_audio_lame_RGAD_track['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['originator']); + $thisfile_mpeg_audio_lame_RGAD_track['gain_db'] = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit']); - if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) { - $info['replay_gain']['track']['peak'] = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude']; + if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) { + $info['replay_gain']['track']['peak'] = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude']; + } + $info['replay_gain']['track']['originator'] = $thisfile_mpeg_audio_lame_RGAD_track['originator']; + $info['replay_gain']['track']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_track['gain_db']; + } else { + unset($thisfile_mpeg_audio_lame_RGAD['track']); } - $info['replay_gain']['track']['originator'] = $thisfile_mpeg_audio_lame_RGAD_track['originator']; - $info['replay_gain']['track']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_track['gain_db']; - } else { - unset($thisfile_mpeg_audio_lame_RGAD['track']); - } - if ($thisfile_mpeg_audio_lame_raw['RGAD_album'] != 0) { - - $thisfile_mpeg_audio_lame_RGAD_album['raw']['name'] = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0xE000) >> 13; - $thisfile_mpeg_audio_lame_RGAD_album['raw']['originator'] = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x1C00) >> 10; - $thisfile_mpeg_audio_lame_RGAD_album['raw']['sign_bit'] = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x0200) >> 9; - $thisfile_mpeg_audio_lame_RGAD_album['raw']['gain_adjust'] = $thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x01FF; - $thisfile_mpeg_audio_lame_RGAD_album['name'] = getid3_lib::RGADnameLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['name']); - $thisfile_mpeg_audio_lame_RGAD_album['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['originator']); - $thisfile_mpeg_audio_lame_RGAD_album['gain_db'] = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_album['raw']['sign_bit']); - - if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) { - $info['replay_gain']['album']['peak'] = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude']; + if ($thisfile_mpeg_audio_lame_raw['RGAD_album'] != 0) { + + $thisfile_mpeg_audio_lame_RGAD_album['raw']['name'] = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0xE000) >> 13; + $thisfile_mpeg_audio_lame_RGAD_album['raw']['originator'] = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x1C00) >> 10; + $thisfile_mpeg_audio_lame_RGAD_album['raw']['sign_bit'] = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x0200) >> 9; + $thisfile_mpeg_audio_lame_RGAD_album['raw']['gain_adjust'] = $thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x01FF; + $thisfile_mpeg_audio_lame_RGAD_album['name'] = getid3_lib::RGADnameLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['name']); + $thisfile_mpeg_audio_lame_RGAD_album['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['originator']); + $thisfile_mpeg_audio_lame_RGAD_album['gain_db'] = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_album['raw']['sign_bit']); + + if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) { + $info['replay_gain']['album']['peak'] = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude']; + } + $info['replay_gain']['album']['originator'] = $thisfile_mpeg_audio_lame_RGAD_album['originator']; + $info['replay_gain']['album']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_album['gain_db']; + } else { + unset($thisfile_mpeg_audio_lame_RGAD['album']); + } + if (empty($thisfile_mpeg_audio_lame_RGAD)) { + unset($thisfile_mpeg_audio_lame['RGAD']); } - $info['replay_gain']['album']['originator'] = $thisfile_mpeg_audio_lame_RGAD_album['originator']; - $info['replay_gain']['album']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_album['gain_db']; - } else { - unset($thisfile_mpeg_audio_lame_RGAD['album']); - } - if (empty($thisfile_mpeg_audio_lame_RGAD)) { - unset($thisfile_mpeg_audio_lame['RGAD']); - } - // byte $AF Encoding flags + ATH Type - $EncodingFlagsATHtype = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAF, 1)); - $thisfile_mpeg_audio_lame['encoding_flags']['nspsytune'] = (bool) ($EncodingFlagsATHtype & 0x10); - $thisfile_mpeg_audio_lame['encoding_flags']['nssafejoint'] = (bool) ($EncodingFlagsATHtype & 0x20); - $thisfile_mpeg_audio_lame['encoding_flags']['nogap_next'] = (bool) ($EncodingFlagsATHtype & 0x40); - $thisfile_mpeg_audio_lame['encoding_flags']['nogap_prev'] = (bool) ($EncodingFlagsATHtype & 0x80); - $thisfile_mpeg_audio_lame['ath_type'] = $EncodingFlagsATHtype & 0x0F; - - // byte $B0 if ABR {specified bitrate} else {minimal bitrate} - $thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB0, 1)); - if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 2) { // Average BitRate (ABR) - $thisfile_mpeg_audio_lame['bitrate_abr'] = $thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate']; - } elseif ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) { // Constant BitRate (CBR) - // ignore - } elseif ($thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'] > 0) { // Variable BitRate (VBR) - minimum bitrate - $thisfile_mpeg_audio_lame['bitrate_min'] = $thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate']; - } + // byte $AF Encoding flags + ATH Type + $EncodingFlagsATHtype = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAF, 1)); + $thisfile_mpeg_audio_lame['encoding_flags']['nspsytune'] = (bool) ($EncodingFlagsATHtype & 0x10); + $thisfile_mpeg_audio_lame['encoding_flags']['nssafejoint'] = (bool) ($EncodingFlagsATHtype & 0x20); + $thisfile_mpeg_audio_lame['encoding_flags']['nogap_next'] = (bool) ($EncodingFlagsATHtype & 0x40); + $thisfile_mpeg_audio_lame['encoding_flags']['nogap_prev'] = (bool) ($EncodingFlagsATHtype & 0x80); + $thisfile_mpeg_audio_lame['ath_type'] = $EncodingFlagsATHtype & 0x0F; + + // byte $B0 if ABR {specified bitrate} else {minimal bitrate} + $thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB0, 1)); + if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 2) { // Average BitRate (ABR) + $thisfile_mpeg_audio_lame['bitrate_abr'] = $thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate']; + } elseif ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) { // Constant BitRate (CBR) + // ignore + } elseif ($thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'] > 0) { // Variable BitRate (VBR) - minimum bitrate + $thisfile_mpeg_audio_lame['bitrate_min'] = $thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate']; + } - // bytes $B1-$B3 Encoder delays - $EncoderDelays = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB1, 3)); - $thisfile_mpeg_audio_lame['encoder_delay'] = ($EncoderDelays & 0xFFF000) >> 12; - $thisfile_mpeg_audio_lame['end_padding'] = $EncoderDelays & 0x000FFF; - - // byte $B4 Misc - $MiscByte = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB4, 1)); - $thisfile_mpeg_audio_lame_raw['noise_shaping'] = ($MiscByte & 0x03); - $thisfile_mpeg_audio_lame_raw['stereo_mode'] = ($MiscByte & 0x1C) >> 2; - $thisfile_mpeg_audio_lame_raw['not_optimal_quality'] = ($MiscByte & 0x20) >> 5; - $thisfile_mpeg_audio_lame_raw['source_sample_freq'] = ($MiscByte & 0xC0) >> 6; - $thisfile_mpeg_audio_lame['noise_shaping'] = $thisfile_mpeg_audio_lame_raw['noise_shaping']; - $thisfile_mpeg_audio_lame['stereo_mode'] = self::LAMEmiscStereoModeLookup($thisfile_mpeg_audio_lame_raw['stereo_mode']); - $thisfile_mpeg_audio_lame['not_optimal_quality'] = (bool) $thisfile_mpeg_audio_lame_raw['not_optimal_quality']; - $thisfile_mpeg_audio_lame['source_sample_freq'] = self::LAMEmiscSourceSampleFrequencyLookup($thisfile_mpeg_audio_lame_raw['source_sample_freq']); - - // byte $B5 MP3 Gain - $thisfile_mpeg_audio_lame_raw['mp3_gain'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB5, 1), false, true); - $thisfile_mpeg_audio_lame['mp3_gain_db'] = (getid3_lib::RGADamplitude2dB(2) / 4) * $thisfile_mpeg_audio_lame_raw['mp3_gain']; - $thisfile_mpeg_audio_lame['mp3_gain_factor'] = pow(2, ($thisfile_mpeg_audio_lame['mp3_gain_db'] / 6)); - - // bytes $B6-$B7 Preset and surround info - $PresetSurroundBytes = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB6, 2)); - // Reserved = ($PresetSurroundBytes & 0xC000); - $thisfile_mpeg_audio_lame_raw['surround_info'] = ($PresetSurroundBytes & 0x3800); - $thisfile_mpeg_audio_lame['surround_info'] = self::LAMEsurroundInfoLookup($thisfile_mpeg_audio_lame_raw['surround_info']); - $thisfile_mpeg_audio_lame['preset_used_id'] = ($PresetSurroundBytes & 0x07FF); - $thisfile_mpeg_audio_lame['preset_used'] = self::LAMEpresetUsedLookup($thisfile_mpeg_audio_lame); - if (!empty($thisfile_mpeg_audio_lame['preset_used_id']) && empty($thisfile_mpeg_audio_lame['preset_used'])) { - $this->warning('Unknown LAME preset used ('.$thisfile_mpeg_audio_lame['preset_used_id'].') - please report to info@getid3.org'); - } - if (($thisfile_mpeg_audio_lame['short_version'] == 'LAME3.90.') && !empty($thisfile_mpeg_audio_lame['preset_used_id'])) { - // this may change if 3.90.4 ever comes out - $thisfile_mpeg_audio_lame['short_version'] = 'LAME3.90.3'; - } + // bytes $B1-$B3 Encoder delays + $EncoderDelays = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB1, 3)); + $thisfile_mpeg_audio_lame['encoder_delay'] = ($EncoderDelays & 0xFFF000) >> 12; + $thisfile_mpeg_audio_lame['end_padding'] = $EncoderDelays & 0x000FFF; + + // byte $B4 Misc + $MiscByte = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB4, 1)); + $thisfile_mpeg_audio_lame_raw['noise_shaping'] = ($MiscByte & 0x03); + $thisfile_mpeg_audio_lame_raw['stereo_mode'] = ($MiscByte & 0x1C) >> 2; + $thisfile_mpeg_audio_lame_raw['not_optimal_quality'] = ($MiscByte & 0x20) >> 5; + $thisfile_mpeg_audio_lame_raw['source_sample_freq'] = ($MiscByte & 0xC0) >> 6; + $thisfile_mpeg_audio_lame['noise_shaping'] = $thisfile_mpeg_audio_lame_raw['noise_shaping']; + $thisfile_mpeg_audio_lame['stereo_mode'] = self::LAMEmiscStereoModeLookup($thisfile_mpeg_audio_lame_raw['stereo_mode']); + $thisfile_mpeg_audio_lame['not_optimal_quality'] = (bool) $thisfile_mpeg_audio_lame_raw['not_optimal_quality']; + $thisfile_mpeg_audio_lame['source_sample_freq'] = self::LAMEmiscSourceSampleFrequencyLookup($thisfile_mpeg_audio_lame_raw['source_sample_freq']); + + // byte $B5 MP3 Gain + $thisfile_mpeg_audio_lame_raw['mp3_gain'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB5, 1), false, true); + $thisfile_mpeg_audio_lame['mp3_gain_db'] = (getid3_lib::RGADamplitude2dB(2) / 4) * $thisfile_mpeg_audio_lame_raw['mp3_gain']; + $thisfile_mpeg_audio_lame['mp3_gain_factor'] = pow(2, ($thisfile_mpeg_audio_lame['mp3_gain_db'] / 6)); + + // bytes $B6-$B7 Preset and surround info + $PresetSurroundBytes = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB6, 2)); + // Reserved = ($PresetSurroundBytes & 0xC000); + $thisfile_mpeg_audio_lame_raw['surround_info'] = ($PresetSurroundBytes & 0x3800); + $thisfile_mpeg_audio_lame['surround_info'] = self::LAMEsurroundInfoLookup($thisfile_mpeg_audio_lame_raw['surround_info']); + $thisfile_mpeg_audio_lame['preset_used_id'] = ($PresetSurroundBytes & 0x07FF); + $thisfile_mpeg_audio_lame['preset_used'] = self::LAMEpresetUsedLookup($thisfile_mpeg_audio_lame); + if (!empty($thisfile_mpeg_audio_lame['preset_used_id']) && empty($thisfile_mpeg_audio_lame['preset_used'])) { + $this->warning('Unknown LAME preset used ('.$thisfile_mpeg_audio_lame['preset_used_id'].') - please report to info@getid3.org'); + } + if (($thisfile_mpeg_audio_lame['short_version'] == 'LAME3.90.') && !empty($thisfile_mpeg_audio_lame['preset_used_id'])) { + // this may change if 3.90.4 ever comes out + $thisfile_mpeg_audio_lame['short_version'] = 'LAME3.90.3'; + } - // bytes $B8-$BB MusicLength - $thisfile_mpeg_audio_lame['audio_bytes'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB8, 4)); - $ExpectedNumberOfAudioBytes = (($thisfile_mpeg_audio_lame['audio_bytes'] > 0) ? $thisfile_mpeg_audio_lame['audio_bytes'] : $thisfile_mpeg_audio['VBR_bytes']); + // bytes $B8-$BB MusicLength + $thisfile_mpeg_audio_lame['audio_bytes'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB8, 4)); + $ExpectedNumberOfAudioBytes = (($thisfile_mpeg_audio_lame['audio_bytes'] > 0) ? $thisfile_mpeg_audio_lame['audio_bytes'] : $thisfile_mpeg_audio['VBR_bytes']); - // bytes $BC-$BD MusicCRC - $thisfile_mpeg_audio_lame['music_crc'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xBC, 2)); + // bytes $BC-$BD MusicCRC + $thisfile_mpeg_audio_lame['music_crc'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xBC, 2)); - // bytes $BE-$BF CRC-16 of Info Tag - $thisfile_mpeg_audio_lame['lame_tag_crc'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xBE, 2)); + // bytes $BE-$BF CRC-16 of Info Tag + $thisfile_mpeg_audio_lame['lame_tag_crc'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xBE, 2)); - // LAME CBR - if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) { + // LAME CBR + if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) { - $thisfile_mpeg_audio['bitrate_mode'] = 'cbr'; - $thisfile_mpeg_audio['bitrate'] = self::ClosestStandardMP3Bitrate($thisfile_mpeg_audio['bitrate']); - $info['audio']['bitrate'] = $thisfile_mpeg_audio['bitrate']; - //if (empty($thisfile_mpeg_audio['bitrate']) || (!empty($thisfile_mpeg_audio_lame['bitrate_min']) && ($thisfile_mpeg_audio_lame['bitrate_min'] != 255))) { - // $thisfile_mpeg_audio['bitrate'] = $thisfile_mpeg_audio_lame['bitrate_min']; - //} + $thisfile_mpeg_audio['bitrate_mode'] = 'cbr'; + $thisfile_mpeg_audio['bitrate'] = self::ClosestStandardMP3Bitrate($thisfile_mpeg_audio['bitrate']); + $info['audio']['bitrate'] = $thisfile_mpeg_audio['bitrate']; + //if (empty($thisfile_mpeg_audio['bitrate']) || (!empty($thisfile_mpeg_audio_lame['bitrate_min']) && ($thisfile_mpeg_audio_lame['bitrate_min'] != 255))) { + // $thisfile_mpeg_audio['bitrate'] = $thisfile_mpeg_audio_lame['bitrate_min']; + //} - } + } + } } } @@ -1009,6 +1022,22 @@ class getid3_mp3 extends getid3_handler if (!$this->RecursiveFrameScanning($offset, $nextframetestoffset, $ScanAsCBR)) { return false; } + if (!empty($this->getid3->info['mp3_validity_check_bitrates']) && !empty($thisfile_mpeg_audio['bitrate_mode']) && ($thisfile_mpeg_audio['bitrate_mode'] == 'vbr') && !empty($thisfile_mpeg_audio['VBR_bitrate'])) { + // https://github.com/JamesHeinrich/getID3/issues/287 + if (count(array_keys($this->getid3->info['mp3_validity_check_bitrates'])) == 1) { + list($cbr_bitrate_in_short_scan) = array_keys($this->getid3->info['mp3_validity_check_bitrates']); + $deviation_cbr_from_header_bitrate = abs($thisfile_mpeg_audio['VBR_bitrate'] - $cbr_bitrate_in_short_scan) / $cbr_bitrate_in_short_scan; + if ($deviation_cbr_from_header_bitrate < 0.01) { + // VBR header bitrate may differ slightly from true bitrate of frames, perhaps accounting for overhead of VBR header frame itself? + // If measured CBR bitrate is within 1% of specified bitrate in VBR header then assume that file is truly CBR + $thisfile_mpeg_audio['bitrate_mode'] = 'cbr'; + //$this->warning('VBR header ignored, assuming CBR '.round($cbr_bitrate_in_short_scan / 1000).'kbps based on scan of '.$this->mp3_valid_check_frames.' frames'); + } + } + } + if (isset($this->getid3->info['mp3_validity_check_bitrates'])) { + unset($this->getid3->info['mp3_validity_check_bitrates']); + } } @@ -1130,8 +1159,9 @@ class getid3_mp3 extends getid3_handler $firstframetestarray = array('error' => array(), 'warning'=> array(), 'avdataend' => $info['avdataend'], 'avdataoffset' => $info['avdataoffset']); $this->decodeMPEGaudioHeader($offset, $firstframetestarray, false); - for ($i = 0; $i < GETID3_MP3_VALID_CHECK_FRAMES; $i++) { - // check next GETID3_MP3_VALID_CHECK_FRAMES frames for validity, to make sure we haven't run across a false synch + $info['mp3_validity_check_bitrates'] = array(); + for ($i = 0; $i < $this->mp3_valid_check_frames; $i++) { + // check next (default: 50) frames for validity, to make sure we haven't run across a false synch if (($nextframetestoffset + 4) >= $info['avdataend']) { // end of file return true; @@ -1139,6 +1169,7 @@ class getid3_mp3 extends getid3_handler $nextframetestarray = array('error' => array(), 'warning' => array(), 'avdataend' => $info['avdataend'], 'avdataoffset'=>$info['avdataoffset']); if ($this->decodeMPEGaudioHeader($nextframetestoffset, $nextframetestarray, false)) { + getid3_lib::safe_inc($info['mp3_validity_check_bitrates'][$nextframetestarray['mpeg']['audio']['bitrate']]); if ($ScanAsCBR) { // force CBR mode, used for trying to pick out invalid audio streams with valid(?) VBR headers, or VBR streams with no VBR header if (!isset($nextframetestarray['mpeg']['audio']['bitrate']) || !isset($firstframetestarray['mpeg']['audio']['bitrate']) || ($nextframetestarray['mpeg']['audio']['bitrate'] != $firstframetestarray['mpeg']['audio']['bitrate'])) { @@ -1273,6 +1304,7 @@ class getid3_mp3 extends getid3_handler $LongMPEGbitrateLookup = array(); $LongMPEGpaddingLookup = array(); $LongMPEGfrequencyLookup = array(); + $Distribution = array(); $Distribution['bitrate'] = array(); $Distribution['frequency'] = array(); $Distribution['layer'] = array(); @@ -1433,6 +1465,9 @@ class getid3_mp3 extends getid3_handler $header = $this->fread($sync_seek_buffer_size); $sync_seek_buffer_size = strlen($header); $SynchSeekOffset = 0; + $SyncSeekAttempts = 0; + $SyncSeekAttemptsMax = 1000; + $FirstFrameThisfileInfo = null; while ($SynchSeekOffset < $sync_seek_buffer_size) { if ((($avdataoffset + $SynchSeekOffset) < $info['avdataend']) && !feof($this->getid3->fp)) { @@ -1471,7 +1506,24 @@ class getid3_mp3 extends getid3_handler return false; } - if (($header[$SynchSeekOffset] == "\xFF") && ($header[($SynchSeekOffset + 1)] > "\xE0")) { // synch detected + if (($header[$SynchSeekOffset] == "\xFF") && ($header[($SynchSeekOffset + 1)] > "\xE0")) { // possible synch detected + if (++$SyncSeekAttempts >= $SyncSeekAttemptsMax) { + // https://github.com/JamesHeinrich/getID3/issues/286 + // corrupt files claiming to be MP3, with a large number of 0xFF bytes near the beginning, can cause this loop to take a very long time + // should have escape condition to avoid spending too much time scanning a corrupt file + // if a synch's not found within the first 128k bytes, then give up + $this->error('Could not find valid MPEG audio synch after scanning '.$SyncSeekAttempts.' candidate offsets'); + if (isset($info['audio']['bitrate'])) { + unset($info['audio']['bitrate']); + } + if (isset($info['mpeg']['audio'])) { + unset($info['mpeg']['audio']); + } + if (empty($info['mpeg'])) { + unset($info['mpeg']); + } + return false; + } $FirstFrameAVDataOffset = null; if (!isset($FirstFrameThisfileInfo) && !isset($info['mpeg']['audio'])) { $FirstFrameThisfileInfo = $info; @@ -1511,9 +1563,9 @@ class getid3_mp3 extends getid3_handler if ($this->decodeMPEGaudioHeader($GarbageOffsetEnd, $dummy, true, true)) { $info = $dummy; $info['avdataoffset'] = $GarbageOffsetEnd; - $this->warning('apparently-valid VBR header not used because could not find '.GETID3_MP3_VALID_CHECK_FRAMES.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.'), but did find valid CBR stream starting at '.$GarbageOffsetEnd); + $this->warning('apparently-valid VBR header not used because could not find '.$this->mp3_valid_check_frames.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.'), but did find valid CBR stream starting at '.$GarbageOffsetEnd); } else { - $this->warning('using data from VBR header even though could not find '.GETID3_MP3_VALID_CHECK_FRAMES.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.')'); + $this->warning('using data from VBR header even though could not find '.$this->mp3_valid_check_frames.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.')'); } } } @@ -1558,6 +1610,7 @@ class getid3_mp3 extends getid3_handler $pct_data_scanned = 0; for ($current_segment = 0; $current_segment < $max_scan_segments; $current_segment++) { $frames_scanned_this_segment = 0; + $scan_start_offset = array(); if ($this->ftell() >= $info['avdataend']) { break; } @@ -1887,6 +1940,7 @@ class getid3_mp3 extends getid3_handler return false; } + $MPEGrawHeader = array(); $MPEGrawHeader['synch'] = (getid3_lib::BigEndian2Int(substr($Header4Bytes, 0, 2)) & 0xFFE0) >> 4; $MPEGrawHeader['version'] = (ord($Header4Bytes[1]) & 0x18) >> 3; // BB $MPEGrawHeader['layer'] = (ord($Header4Bytes[1]) & 0x06) >> 1; // CC diff --git a/src/wp-includes/ID3/module.audio.ogg.php b/src/wp-includes/ID3/module.audio.ogg.php index fe092d9d94..5786fd0d59 100644 --- a/src/wp-includes/ID3/module.audio.ogg.php +++ b/src/wp-includes/ID3/module.audio.ogg.php @@ -529,6 +529,7 @@ class getid3_ogg extends getid3_handler */ public function ParseOggPageHeader() { // http://xiph.org/ogg/vorbis/doc/framing.html + $oggheader = array(); $oggheader['page_start_offset'] = $this->ftell(); // where we started from in the file $filedata = $this->fread($this->getid3->fread_buffer_size()); @@ -680,35 +681,39 @@ class getid3_ogg extends getid3_handler $VorbisCommentPage++; - $oggpageinfo = $this->ParseOggPageHeader(); - $info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo; + if ($oggpageinfo = $this->ParseOggPageHeader()) { + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo; - // First, save what we haven't read yet - $AsYetUnusedData = substr($commentdata, $commentdataoffset); + // First, save what we haven't read yet + $AsYetUnusedData = substr($commentdata, $commentdataoffset); - // Then take that data off the end - $commentdata = substr($commentdata, 0, $commentdataoffset); + // Then take that data off the end + $commentdata = substr($commentdata, 0, $commentdataoffset); + + // Add [headerlength] bytes of dummy data for the Ogg Page Header, just to keep absolute offsets correct + $commentdata .= str_repeat("\x00", 27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']); + $commentdataoffset += (27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']); - // Add [headerlength] bytes of dummy data for the Ogg Page Header, just to keep absolute offsets correct - $commentdata .= str_repeat("\x00", 27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']); - $commentdataoffset += (27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']); + // Finally, stick the unused data back on the end + $commentdata .= $AsYetUnusedData; - // Finally, stick the unused data back on the end - $commentdata .= $AsYetUnusedData; + //$commentdata .= $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']); + if (!isset($info['ogg']['pageheader'][$VorbisCommentPage])) { + $this->warning('undefined Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell()); + break; + } + $readlength = self::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1); + if ($readlength <= 0) { + $this->warning('invalid length Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell()); + break; + } + $commentdata .= $this->fread($readlength); - //$commentdata .= $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']); - if (!isset($info['ogg']['pageheader'][$VorbisCommentPage])) { - $this->warning('undefined Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell()); - break; - } - $readlength = self::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1); - if ($readlength <= 0) { - $this->warning('invalid length Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell()); + //$filebaseoffset += $oggpageinfo['header_end_offset'] - $oggpageinfo['page_start_offset']; + } else { + $this->warning('failed to ParseOggPageHeader() at offset '.$this->ftell()); break; } - $commentdata .= $this->fread($readlength); - - //$filebaseoffset += $oggpageinfo['header_end_offset'] - $oggpageinfo['page_start_offset']; } $ThisFileInfo_ogg_comments_raw[$i]['offset'] = $commentdataoffset; $commentstring = substr($commentdata, $commentdataoffset, $ThisFileInfo_ogg_comments_raw[$i]['size']); diff --git a/src/wp-includes/ID3/module.tag.apetag.php b/src/wp-includes/ID3/module.tag.apetag.php index 26be982c73..c5502133fc 100644 --- a/src/wp-includes/ID3/module.tag.apetag.php +++ b/src/wp-includes/ID3/module.tag.apetag.php @@ -360,6 +360,7 @@ class getid3_apetag extends getid3_handler // http://www.uni-jena.de/~pfk/mpp/sv8/apeheader.html // shortcut + $headerfooterinfo = array(); $headerfooterinfo['raw'] = array(); $headerfooterinfo_raw = &$headerfooterinfo['raw']; @@ -389,6 +390,7 @@ class getid3_apetag extends getid3_handler // "Note: APE Tags 1.0 do not use any of the APE Tag flags. // All are set to zero on creation and ignored on reading." // http://wiki.hydrogenaud.io/index.php?title=Ape_Tags_Flags + $flags = array(); $flags['header'] = (bool) ($rawflagint & 0x80000000); $flags['footer'] = (bool) ($rawflagint & 0x40000000); $flags['this_is_header'] = (bool) ($rawflagint & 0x20000000); diff --git a/src/wp-includes/ID3/module.tag.id3v1.php b/src/wp-includes/ID3/module.tag.id3v1.php index 16dcf253b6..b1de25784b 100644 --- a/src/wp-includes/ID3/module.tag.id3v1.php +++ b/src/wp-includes/ID3/module.tag.id3v1.php @@ -31,14 +31,22 @@ class getid3_id3v1 extends getid3_handler return false; } - $this->fseek(-256, SEEK_END); - $preid3v1 = $this->fread(128); - $id3v1tag = $this->fread(128); + if($info['filesize'] < 256) { + $this->fseek(-128, SEEK_END); + $preid3v1 = ''; + $id3v1tag = $this->fread(128); + } else { + $this->fseek(-256, SEEK_END); + $preid3v1 = $this->fread(128); + $id3v1tag = $this->fread(128); + } + if (substr($id3v1tag, 0, 3) == 'TAG') { $info['avdataend'] = $info['filesize'] - 128; + $ParsedID3v1 = array(); $ParsedID3v1['title'] = $this->cutfield(substr($id3v1tag, 3, 30)); $ParsedID3v1['artist'] = $this->cutfield(substr($id3v1tag, 33, 30)); $ParsedID3v1['album'] = $this->cutfield(substr($id3v1tag, 63, 30)); @@ -297,6 +305,50 @@ class getid3_id3v1 extends getid3_handler 145 => 'Anime', 146 => 'JPop', 147 => 'Synthpop', + 148 => 'Abstract', + 149 => 'Art Rock', + 150 => 'Baroque', + 151 => 'Bhangra', + 152 => 'Big Beat', + 153 => 'Breakbeat', + 154 => 'Chillout', + 155 => 'Downtempo', + 156 => 'Dub', + 157 => 'EBM', + 158 => 'Eclectic', + 159 => 'Electro', + 160 => 'Electroclash', + 161 => 'Emo', + 162 => 'Experimental', + 163 => 'Garage', + 164 => 'Global', + 165 => 'IDM', + 166 => 'Illbient', + 167 => 'Industro-Goth', + 168 => 'Jam Band', + 169 => 'Krautrock', + 170 => 'Leftfield', + 171 => 'Lounge', + 172 => 'Math Rock', + 173 => 'New Romantic', + 174 => 'Nu-Breakz', + 175 => 'Post-Punk', + 176 => 'Post-Rock', + 177 => 'Psytrance', + 178 => 'Shoegaze', + 179 => 'Space Rock', + 180 => 'Trop Rock', + 181 => 'World Music', + 182 => 'Neoclassical', + 183 => 'Audiobook', + 184 => 'Audio Theatre', + 185 => 'Neue Deutsche Welle', + 186 => 'Podcast', + 187 => 'Indie-Rock', + 188 => 'G-Funk', + 189 => 'Dubstep', + 190 => 'Garage Rock', + 191 => 'Psybient', 255 => 'Unknown', diff --git a/src/wp-includes/ID3/module.tag.id3v2.php b/src/wp-includes/ID3/module.tag.id3v2.php index 85dd7a147a..99e56a5fdb 100644 --- a/src/wp-includes/ID3/module.tag.id3v2.php +++ b/src/wp-includes/ID3/module.tag.id3v2.php @@ -345,7 +345,7 @@ class getid3_id3v2 extends getid3_handler } if (($frame_size <= strlen($framedata)) && ($this->IsValidID3v2FrameName($frame_name, $id3v2_majorversion))) { - unset($parsedFrame); + $parsedFrame = array(); $parsedFrame['frame_name'] = $frame_name; $parsedFrame['frame_flags_raw'] = $frame_flags; $parsedFrame['data'] = substr($framedata, 0, $frame_size); @@ -978,7 +978,7 @@ class getid3_id3v2 extends getid3_handler } elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'USLT')) || // 4.8 USLT Unsynchronised lyric/text transcription - (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'ULT'))) { // 4.9 ULT Unsynchronised lyric/text transcription + (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'ULT'))) { // 4.9 ULT Unsynchronised lyric/text transcription // There may be more than one 'Unsynchronised lyrics/text transcription' frame // in each tag, but only one with the same language and content descriptor. //
@@ -994,24 +994,28 @@ class getid3_id3v2 extends getid3_handler $this->warning('Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding'); $frame_textencoding_terminator = "\x00"; } - $frame_language = substr($parsedFrame['data'], $frame_offset, 3); - $frame_offset += 3; - $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset); - if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) { - $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00 - } - $parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset); - $parsedFrame['description'] = $this->MakeUTF16emptyStringEmpty($parsedFrame['description']); - $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator)); - $parsedFrame['data'] = $this->RemoveStringTerminator($parsedFrame['data'], $frame_textencoding_terminator); + if (strlen($parsedFrame['data']) >= (4 + strlen($frame_textencoding_terminator))) { // shouldn't be an issue but badly-written files have been spotted in the wild with not only no contents but also missing the required language field, see https://github.com/JamesHeinrich/getID3/issues/315 + $frame_language = substr($parsedFrame['data'], $frame_offset, 3); + $frame_offset += 3; + $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset); + if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) { + $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00 + } + $parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset); + $parsedFrame['description'] = $this->MakeUTF16emptyStringEmpty($parsedFrame['description']); + $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator)); + $parsedFrame['data'] = $this->RemoveStringTerminator($parsedFrame['data'], $frame_textencoding_terminator); - $parsedFrame['encodingid'] = $frame_textencoding; - $parsedFrame['encoding'] = $this->TextEncodingNameLookup($frame_textencoding); + $parsedFrame['encodingid'] = $frame_textencoding; + $parsedFrame['encoding'] = $this->TextEncodingNameLookup($frame_textencoding); - $parsedFrame['language'] = $frame_language; - $parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false); - if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) { - $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']); + $parsedFrame['language'] = $frame_language; + $parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false); + if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) { + $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']); + } + } else { + $this->warning('Invalid data in frame "'.$parsedFrame['frame_name'].'" at offset '.$parsedFrame['dataoffset']); } unset($parsedFrame['data']); @@ -1370,6 +1374,8 @@ class getid3_id3v2 extends getid3_handler $frame_textencoding_terminator = "\x00"; } + $frame_imagetype = null; + $frame_mimetype = null; if ($id3v2_majorversion == 2 && strlen($parsedFrame['data']) > $frame_offset) { $frame_imagetype = substr($parsedFrame['data'], $frame_offset, 3); if (strtolower($frame_imagetype) == 'ima') { @@ -1956,18 +1962,14 @@ class getid3_id3v2 extends getid3_handler $frame_offset = 0; $parsedFrame['peakamplitude'] = getid3_lib::BigEndian2Float(substr($parsedFrame['data'], $frame_offset, 4)); $frame_offset += 4; - $rg_track_adjustment = getid3_lib::Dec2Bin(substr($parsedFrame['data'], $frame_offset, 2)); - $frame_offset += 2; - $rg_album_adjustment = getid3_lib::Dec2Bin(substr($parsedFrame['data'], $frame_offset, 2)); - $frame_offset += 2; - $parsedFrame['raw']['track']['name'] = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 0, 3)); - $parsedFrame['raw']['track']['originator'] = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 3, 3)); - $parsedFrame['raw']['track']['signbit'] = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 6, 1)); - $parsedFrame['raw']['track']['adjustment'] = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 7, 9)); - $parsedFrame['raw']['album']['name'] = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 0, 3)); - $parsedFrame['raw']['album']['originator'] = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 3, 3)); - $parsedFrame['raw']['album']['signbit'] = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 6, 1)); - $parsedFrame['raw']['album']['adjustment'] = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 7, 9)); + foreach (array('track','album') as $rgad_entry_type) { + $rg_adjustment_word = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 2)); + $frame_offset += 2; + $parsedFrame['raw'][$rgad_entry_type]['name'] = ($rg_adjustment_word & 0xE000) >> 13; + $parsedFrame['raw'][$rgad_entry_type]['originator'] = ($rg_adjustment_word & 0x1C00) >> 10; + $parsedFrame['raw'][$rgad_entry_type]['signbit'] = ($rg_adjustment_word & 0x0200) >> 9; + $parsedFrame['raw'][$rgad_entry_type]['adjustment'] = ($rg_adjustment_word & 0x0100); + } $parsedFrame['track']['name'] = getid3_lib::RGADnameLookup($parsedFrame['raw']['track']['name']); $parsedFrame['track']['originator'] = getid3_lib::RGADoriginatorLookup($parsedFrame['raw']['track']['originator']); $parsedFrame['track']['adjustment'] = getid3_lib::RGADadjustmentLookup($parsedFrame['raw']['track']['adjustment'], $parsedFrame['raw']['track']['signbit']); @@ -2444,7 +2446,8 @@ class getid3_id3v2 extends getid3_handler TMM Manats TND Dinars TOP Pa'anga - TRL Liras + TRL Liras (old) + TRY Liras TTD Dollars TVD Tuvalu Dollars TWD New Dollars @@ -2645,6 +2648,7 @@ class getid3_id3v2 extends getid3_handler TND Tunisia TOP Tonga TRL Turkey + TRY Turkey TTD Trinidad and Tobago TVD Tuvalu TWD Taiwan diff --git a/src/wp-includes/ID3/module.tag.lyrics3.php b/src/wp-includes/ID3/module.tag.lyrics3.php index b2375057e7..c8b2cf6305 100644 --- a/src/wp-includes/ID3/module.tag.lyrics3.php +++ b/src/wp-includes/ID3/module.tag.lyrics3.php @@ -33,6 +33,9 @@ class getid3_lyrics3 extends getid3_handler } $this->fseek((0 - 128 - 9 - 6), SEEK_END); // end - ID3v1 - "LYRICSEND" - [Lyrics3size] + $lyrics3offset = null; + $lyrics3version = null; + $lyrics3size = null; $lyrics3_id3v1 = $this->fread(128 + 9 + 6); $lyrics3lsz = (int) substr($lyrics3_id3v1, 0, 6); // Lyrics3size $lyrics3end = substr($lyrics3_id3v1, 6, 9); // LYRICSEND or LYRICS200 diff --git a/src/wp-includes/ID3/readme.txt b/src/wp-includes/ID3/readme.txt index e48bcef917..0888bc4de2 100644 --- a/src/wp-includes/ID3/readme.txt +++ b/src/wp-includes/ID3/readme.txt @@ -625,3 +625,4 @@ Reference material: * http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html * http://www.codeproject.com/Articles/8295/MPEG-Audio-Frame-Header * http://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf +* https://fileformats.fandom.com/wiki/Torrent_file \ No newline at end of file diff --git a/src/wp-includes/PHPMailer/PHPMailer.php b/src/wp-includes/PHPMailer/PHPMailer.php index 5228ef0159..7457f88488 100644 --- a/src/wp-includes/PHPMailer/PHPMailer.php +++ b/src/wp-includes/PHPMailer/PHPMailer.php @@ -750,7 +750,7 @@ class PHPMailer * * @var string */ - const VERSION = '6.5.1'; + const VERSION = '6.5.3'; /** * Error severity: message only, continue processing. @@ -1451,7 +1451,12 @@ class PHPMailer $errorcode = 0; if (defined('INTL_IDNA_VARIANT_UTS46')) { //Use the current punycode standard (appeared in PHP 7.2) - $punycode = idn_to_ascii($domain, $errorcode, \INTL_IDNA_VARIANT_UTS46); + $punycode = idn_to_ascii( + $domain, + \IDNA_DEFAULT | \IDNA_USE_STD3_RULES | \IDNA_CHECK_BIDI | + \IDNA_CHECK_CONTEXTJ | \IDNA_NONTRANSITIONAL_TO_ASCII, + \INTL_IDNA_VARIANT_UTS46 + ); } elseif (defined('INTL_IDNA_VARIANT_2003')) { //Fall back to this old, deprecated/removed encoding // phpcs:ignore PHPCompatibility.Constants.RemovedConstants.intl_idna_variant_2003Deprecated @@ -1699,7 +1704,10 @@ class PHPMailer //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html //Example problem: https://www.drupal.org/node/1057954 - if (empty($this->Sender) && !empty(ini_get('sendmail_from'))) { + + //PHP 5.6 workaround + $sendmail_from_value = ini_get('sendmail_from'); + if (empty($this->Sender) && !empty($sendmail_from_value)) { //PHP config has a sender address we can use $this->Sender = ini_get('sendmail_from'); } @@ -1881,7 +1889,10 @@ class PHPMailer //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html //Example problem: https://www.drupal.org/node/1057954 //CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped. - if (empty($this->Sender) && !empty(ini_get('sendmail_from'))) { + + //PHP 5.6 workaround + $sendmail_from_value = ini_get('sendmail_from'); + if (empty($this->Sender) && !empty($sendmail_from_value)) { //PHP config has a sender address we can use $this->Sender = ini_get('sendmail_from'); } @@ -2198,7 +2209,7 @@ class PHPMailer * @param string $langcode ISO 639-1 2-character language code (e.g. French is "fr") * Optionally, the language code can be enhanced with a 4-character * script annotation and/or a 2-character country annotation. - * @param string $lang_path Path to the language file directory, with trailing separator (slash).D + * @param string $lang_path Path to the language file directory, with trailing separator (slash) * Do not set this from user input! * * @return bool Returns true if the requested language was loaded, false otherwise. diff --git a/src/wp-includes/PHPMailer/SMTP.php b/src/wp-includes/PHPMailer/SMTP.php index 0cea1e8640..676dba2923 100644 --- a/src/wp-includes/PHPMailer/SMTP.php +++ b/src/wp-includes/PHPMailer/SMTP.php @@ -35,7 +35,7 @@ class SMTP * * @var string */ - const VERSION = '6.5.1'; + const VERSION = '6.5.3'; /** * SMTP line break constant. @@ -392,7 +392,6 @@ class SMTP STREAM_CLIENT_CONNECT, $socket_context ); - restore_error_handler(); } else { //Fall back to fsockopen which should work in more places, but is missing some features $this->edebug( @@ -407,8 +406,8 @@ class SMTP $errstr, $timeout ); - restore_error_handler(); } + restore_error_handler(); //Verify we connected properly if (!is_resource($connection)) { @@ -696,7 +695,7 @@ class SMTP /** * Send an SMTP DATA command. * Issues a data command and sends the msg_data to the server, - * finializing the mail transaction. $msg_data is the message + * finalizing the mail transaction. $msg_data is the message * that is to be send with the headers. Each header needs to be * on a single line followed by a with the message headers * and the message body being separated by an additional . @@ -1170,7 +1169,7 @@ class SMTP if (!$this->server_caps) { $this->setError('No HELO/EHLO was sent'); - return; + return null; } if (!array_key_exists($name, $this->server_caps)) { @@ -1182,7 +1181,7 @@ class SMTP } $this->setError('HELO handshake was used; No information about server extensions available'); - return; + return null; } return $this->server_caps[$name]; diff --git a/src/wp-includes/SimplePie/Cache/Redis.php b/src/wp-includes/SimplePie/Cache/Redis.php index dbc88e829a..a5925bec2f 100644 --- a/src/wp-includes/SimplePie/Cache/Redis.php +++ b/src/wp-includes/SimplePie/Cache/Redis.php @@ -152,7 +152,7 @@ class SimplePie_Cache_Redis implements SimplePie_Cache_Base { if ($data !== false) { $return = $this->cache->set($this->name, $data); if ($this->options['expire']) { - return $this->cache->expire($this->name, $this->ttl); + return $this->cache->expire($this->name, $this->options['expire']); } return $return; } diff --git a/src/wp-includes/SimplePie/Enclosure.php b/src/wp-includes/SimplePie/Enclosure.php index 32216d848c..8a4cffa30e 100644 --- a/src/wp-includes/SimplePie/Enclosure.php +++ b/src/wp-includes/SimplePie/Enclosure.php @@ -1152,7 +1152,12 @@ class SimplePie_Enclosure // If we encounter an unsupported mime-type, check the file extension and guess intelligently. if (!in_array($type, array_merge($types_flash, $types_fmedia, $types_quicktime, $types_wmedia, $types_mp3))) { - switch (strtolower($this->get_extension())) + $extension = $this->get_extension(); + if ($extension === null) { + return null; + } + + switch (strtolower($extension)) { // Audio mime-types case 'aac': diff --git a/src/wp-includes/SimplePie/File.php b/src/wp-includes/SimplePie/File.php index 90ad8196a6..c2d368b3b8 100644 --- a/src/wp-includes/SimplePie/File.php +++ b/src/wp-includes/SimplePie/File.php @@ -106,7 +106,7 @@ class SimplePie_File curl_setopt($fp, CURLOPT_FAILONERROR, 1); curl_setopt($fp, CURLOPT_TIMEOUT, $timeout); curl_setopt($fp, CURLOPT_CONNECTTIMEOUT, $timeout); - curl_setopt($fp, CURLOPT_REFERER, $url); + curl_setopt($fp, CURLOPT_REFERER, SimplePie_Misc::url_remove_credentials($url)); curl_setopt($fp, CURLOPT_USERAGENT, $useragent); curl_setopt($fp, CURLOPT_HTTPHEADER, $headers2); foreach ($curl_options as $curl_param => $curl_value) { @@ -119,6 +119,7 @@ class SimplePie_File curl_setopt($fp, CURLOPT_ENCODING, 'none'); $this->headers = curl_exec($fp); } + $this->status_code = curl_getinfo($fp, CURLINFO_HTTP_CODE); if (curl_errno($fp)) { $this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp); diff --git a/src/wp-includes/SimplePie/HTTP/Parser.php b/src/wp-includes/SimplePie/HTTP/Parser.php index 1dbe06c3e3..a4c48ddb71 100644 --- a/src/wp-includes/SimplePie/HTTP/Parser.php +++ b/src/wp-includes/SimplePie/HTTP/Parser.php @@ -507,11 +507,13 @@ class SimplePie_HTTP_Parser { $data = explode("\r\n\r\n", $headers, $count); $data = array_pop($data); - if (false !== stripos($data, "HTTP/1.0 200 Connection established\r\n\r\n")) { - $data = str_ireplace("HTTP/1.0 200 Connection established\r\n\r\n", '', $data); + if (false !== stripos($data, "HTTP/1.0 200 Connection established\r\n")) { + $exploded = explode("\r\n\r\n", $data, 2); + $data = end($exploded); } - if (false !== stripos($data, "HTTP/1.1 200 Connection established\r\n\r\n")) { - $data = str_ireplace("HTTP/1.1 200 Connection established\r\n\r\n", '', $data); + if (false !== stripos($data, "HTTP/1.1 200 Connection established\r\n")) { + $exploded = explode("\r\n\r\n", $data, 2); + $data = end($exploded); } return $data; } diff --git a/src/wp-includes/SimplePie/Item.php b/src/wp-includes/SimplePie/Item.php index 5be6b19940..3ac4fa882b 100644 --- a/src/wp-includes/SimplePie/Item.php +++ b/src/wp-includes/SimplePie/Item.php @@ -1803,7 +1803,7 @@ class SimplePie_Item } if (isset($content['attribs']['']['fileSize'])) { - $length = ceil($content['attribs']['']['fileSize']); + $length = intval($content['attribs']['']['fileSize']); } if (isset($content['attribs']['']['medium'])) { @@ -2425,7 +2425,7 @@ class SimplePie_Item } if (isset($content['attribs']['']['fileSize'])) { - $length = ceil($content['attribs']['']['fileSize']); + $length = intval($content['attribs']['']['fileSize']); } if (isset($content['attribs']['']['medium'])) { @@ -2790,7 +2790,7 @@ class SimplePie_Item } if (isset($link['attribs']['']['length'])) { - $length = ceil($link['attribs']['']['length']); + $length = intval($link['attribs']['']['length']); } if (isset($link['attribs']['']['title'])) { @@ -2833,7 +2833,7 @@ class SimplePie_Item } if (isset($link['attribs']['']['length'])) { - $length = ceil($link['attribs']['']['length']); + $length = intval($link['attribs']['']['length']); } // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor @@ -2862,13 +2862,14 @@ class SimplePie_Item $width = null; $url = $this->sanitize($enclosure[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($enclosure[0])); + $url = $this->feed->sanitize->https_url($url); if (isset($enclosure[0]['attribs']['']['type'])) { $type = $this->sanitize($enclosure[0]['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); } if (isset($enclosure[0]['attribs']['']['length'])) { - $length = ceil($enclosure[0]['attribs']['']['length']); + $length = intval($enclosure[0]['attribs']['']['length']); } // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor diff --git a/src/wp-includes/SimplePie/Locator.php b/src/wp-includes/SimplePie/Locator.php index a207df6fee..c5fae05791 100644 --- a/src/wp-includes/SimplePie/Locator.php +++ b/src/wp-includes/SimplePie/Locator.php @@ -64,6 +64,7 @@ class SimplePie_Locator var $max_checked_feeds = 10; var $force_fsockopen = false; var $curl_options = array(); + var $dom; protected $registry; public function __construct(SimplePie_File $file, $timeout = 10, $useragent = null, $max_checked_feeds = 10, $force_fsockopen = false, $curl_options = array()) @@ -75,12 +76,19 @@ class SimplePie_Locator $this->force_fsockopen = $force_fsockopen; $this->curl_options = $curl_options; - if (class_exists('DOMDocument')) + if (class_exists('DOMDocument') && $this->file->body != '') { $this->dom = new DOMDocument(); set_error_handler(array('SimplePie_Misc', 'silence_errors')); - $this->dom->loadHTML($this->file->body); + try + { + $this->dom->loadHTML($this->file->body); + } + catch (Throwable $ex) + { + $this->dom = null; + } restore_error_handler(); } else diff --git a/src/wp-includes/SimplePie/Misc.php b/src/wp-includes/SimplePie/Misc.php index a52498ac76..ce3cf0f546 100644 --- a/src/wp-includes/SimplePie/Misc.php +++ b/src/wp-includes/SimplePie/Misc.php @@ -2260,4 +2260,14 @@ function embed_wmedia(width, height, link) { { // No-op } + + /** + * Sanitize a URL by removing HTTP credentials. + * @param string $url the URL to sanitize. + * @return string the same URL without HTTP credentials. + */ + public static function url_remove_credentials($url) + { + return preg_replace('#^(https?://)[^/:@]+:[^/:@]+@#i', '$1', $url); + } } diff --git a/src/wp-includes/SimplePie/Parser.php b/src/wp-includes/SimplePie/Parser.php index 4efdf41a71..3813b74b27 100644 --- a/src/wp-includes/SimplePie/Parser.php +++ b/src/wp-includes/SimplePie/Parser.php @@ -164,12 +164,30 @@ class SimplePie_Parser xml_set_element_handler($xml, 'tag_open', 'tag_close'); // Parse! - if (!xml_parse($xml, $data, true)) + $wrapper = @is_writable(sys_get_temp_dir()) ? 'php://temp' : 'php://memory'; + if (($stream = fopen($wrapper, 'r+')) && + fwrite($stream, $data) && + rewind($stream)) + { + //Parse by chunks not to use too much memory + do + { + $stream_data = fread($stream, 1048576); + if (!xml_parse($xml, $stream_data === false ? '' : $stream_data, feof($stream))) + { + $this->error_code = xml_get_error_code($xml); + $this->error_string = xml_error_string($this->error_code); + $return = false; + break; + } + } while (!feof($stream)); + fclose($stream); + } + else { - $this->error_code = xml_get_error_code($xml); - $this->error_string = xml_error_string($this->error_code); $return = false; } + $this->current_line = xml_get_current_line_number($xml); $this->current_column = xml_get_current_column_number($xml); $this->current_byte = xml_get_current_byte_index($xml); diff --git a/src/wp-includes/SimplePie/Registry.php b/src/wp-includes/SimplePie/Registry.php index bf3baf1793..1aac51d07a 100644 --- a/src/wp-includes/SimplePie/Registry.php +++ b/src/wp-includes/SimplePie/Registry.php @@ -208,7 +208,8 @@ class SimplePie_Registry { case 'Cache': // For backwards compatibility with old non-static - // Cache::create() methods + // Cache::create() methods in PHP < 8.0. + // No longer supported as of PHP 8.0. if ($method === 'get_handler') { $result = @call_user_func_array(array($class, 'create'), $parameters); diff --git a/src/wp-includes/SimplePie/Sanitize.php b/src/wp-includes/SimplePie/Sanitize.php index 35838032fc..d421c83072 100644 --- a/src/wp-includes/SimplePie/Sanitize.php +++ b/src/wp-includes/SimplePie/Sanitize.php @@ -71,6 +71,15 @@ class SimplePie_Sanitize var $useragent = ''; var $force_fsockopen = false; var $replace_url_attributes = null; + var $registry; + + /** + * List of domains for which to force HTTPS. + * @see SimplePie_Sanitize::set_https_domains() + * Array is a tree split at DNS levels. Example: + * array('biz' => true, 'com' => array('example' => true), 'net' => array('example' => array('www' => true))) + */ + var $https_domains = array(); public function __construct() { @@ -241,6 +250,68 @@ class SimplePie_Sanitize $this->replace_url_attributes = (array) $element_attribute; } + /** + * Set the list of domains for which to force HTTPS. + * @see SimplePie_Misc::https_url() + * Example array('biz', 'example.com', 'example.org', 'www.example.net'); + */ + public function set_https_domains($domains) + { + $this->https_domains = array(); + foreach ($domains as $domain) + { + $domain = trim($domain, ". \t\n\r\0\x0B"); + $segments = array_reverse(explode('.', $domain)); + $node =& $this->https_domains; + foreach ($segments as $segment) + {//Build a tree + if ($node === true) + { + break; + } + if (!isset($node[$segment])) + { + $node[$segment] = array(); + } + $node =& $node[$segment]; + } + $node = true; + } + } + + /** + * Check if the domain is in the list of forced HTTPS. + */ + protected function is_https_domain($domain) + { + $domain = trim($domain, '. '); + $segments = array_reverse(explode('.', $domain)); + $node =& $this->https_domains; + foreach ($segments as $segment) + {//Explore the tree + if (isset($node[$segment])) + { + $node =& $node[$segment]; + } + else + { + break; + } + } + return $node === true; + } + + /** + * Force HTTPS for selected Web sites. + */ + public function https_url($url) + { + return (strtolower(substr($url, 0, 7)) === 'http://') && + $this->is_https_domain(parse_url($url, PHP_URL_HOST)) ? + substr_replace($url, 's', 4, 0) : //Add the 's' to HTTPS + $url; + } + public function sanitize($data, $type, $base = '') { $data = trim($data); @@ -443,6 +514,7 @@ class SimplePie_Sanitize $value = $this->registry->call('Misc', 'absolutize_url', array($element->getAttribute($attribute), $this->base)); if ($value !== false) { + $value = $this->https_url($value); $element->setAttribute($attribute, $value); } } diff --git a/src/wp-includes/admin-bar.php b/src/wp-includes/admin-bar.php index ba85e1f1ae..18ca17b5fa 100644 --- a/src/wp-includes/admin-bar.php +++ b/src/wp-includes/admin-bar.php @@ -408,6 +408,33 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) { } } +/** + * Adds the "Edit site" link to the Toolbar. + * + * @since 5.9.0 + * + * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance. + */ +function wp_admin_bar_edit_site_menu( $wp_admin_bar ) { + // Don't show if a block theme is not activated. + if ( ! wp_is_block_theme() ) { + return; + } + + // Don't show for users who can't edit theme options or when in the admin. + if ( ! current_user_can( 'edit_theme_options' ) || is_admin() ) { + return; + } + + $wp_admin_bar->add_node( + array( + 'id' => 'site-editor', + 'title' => __( 'Edit site' ), + 'href' => admin_url( 'site-editor.php' ), + ) + ); +} + /** * Adds the "Customize" link to the Toolbar. * @@ -419,6 +446,11 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) { function wp_admin_bar_customize_menu( $wp_admin_bar ) { global $wp_customize; + // Don't show if a block theme is activated and no plugins use the customizer. + if ( wp_is_block_theme() && ! has_action( 'customize_register' ) ) { + return; + } + // Don't show for users who can't access the customizer or when in the admin. if ( ! current_user_can( 'customize' ) || is_admin() ) { return; diff --git a/src/wp-includes/assets/script-loader-packages.php b/src/wp-includes/assets/script-loader-packages.php index b4c86f09ef..94a0f500f7 100644 --- a/src/wp-includes/assets/script-loader-packages.php +++ b/src/wp-includes/assets/script-loader-packages.php @@ -1 +1 @@ - array('dependencies' => array('wp-dom-ready', 'wp-i18n', 'wp-polyfill'), 'version' => '3243bf46da298d46850bacd71bcc111e'), 'annotations.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => '4556c7bbdf2d9d6a81c1ca770cf73893'), 'api-fetch.js' => array('dependencies' => array('wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '293ce6ecd6439249249485d369385617'), 'autop.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'bed28c77ea305cd8e02b0529011189f9'), 'blob.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'b8855b04f6a52a7bca89f8d945d46866'), 'block-directory.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives'), 'version' => 'de3c45fbc5977806e2091ee4f6f59b13'), 'block-editor.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-blob', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-shortcode', 'wp-token-list', 'wp-url', 'wp-wordcount'), 'version' => 'd94e63317f1c2e9373815c1ae03f911b'), 'block-library.js' => array('dependencies' => array('lodash', 'moment', 'react', 'wp-api-fetch', 'wp-autop', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport'), 'version' => '175a701e1aae933281f8553f0ea7c8f5'), 'block-serialization-default-parser.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'cc8e5d0e23cf68bb9944bf2a7a016e52'), 'blocks.js' => array('dependencies' => array('lodash', 'wp-autop', 'wp-blob', 'wp-block-serialization-default-parser', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-primitives', 'wp-shortcode'), 'version' => '751c2504a888adf0398a0c604da94753'), 'components.js' => array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-a11y', 'wp-compose', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-warning'), 'version' => '4d174b4215adfc2b5b76752aad04e5e7'), 'compose.js' => array('dependencies' => array('lodash', 'react', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-priority-queue'), 'version' => '0f215b3868e125c7f29468d3cbb4a759'), 'core-data.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-data', 'wp-data-controls', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-url'), 'version' => 'b077dccf93658b45b01de1f28d38f04c'), 'customize-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-polyfill', 'wp-primitives', 'wp-widgets'), 'version' => '09aff80d8b1c180d502f354b5d4ba91f'), 'data.js' => array('dependencies' => array('lodash', 'react', 'wp-compose', 'wp-deprecated', 'wp-element', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-priority-queue', 'wp-redux-routine'), 'version' => 'c15e612c9f374c80bc488bce207feb1f'), 'data-controls.js' => array('dependencies' => array('wp-api-fetch', 'wp-data', 'wp-deprecated', 'wp-polyfill'), 'version' => 'ceef9ce8c9c058d69ebf44db39353687'), 'date.js' => array('dependencies' => array('moment', 'wp-polyfill'), 'version' => '2abad43cdd2da929e01f7d7648e392ab'), 'deprecated.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '13724e4923d40e224e7c99fdc350a6a1'), 'dom.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '25489fd13f6cba04738b00752f79a668'), 'dom-ready.js' => array('dependencies' => array('wp-polyfill'), 'version' => '1e1b9c1535c1c32d3236d41aa27c7bf9'), 'edit-post.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url', 'wp-viewport', 'wp-warning'), 'version' => '01ede5cc8087545dfed018f2b0b9dba0'), 'edit-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => 'ef2446963dc78b4208f8f4f0cf70b483'), 'editor.js' => array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-date', 'wp-deprecated', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-wordcount'), 'version' => '60592ad74e11e6bf6d5f155bd5fe286c'), 'element.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-escape-html', 'wp-polyfill'), 'version' => '669f5c11ca4fe7c44d64157347343913'), 'escape-html.js' => array('dependencies' => array('wp-polyfill'), 'version' => '4f03d9c45a01df8191f6833373fe1cfa'), 'format-library.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-url'), 'version' => '23c734677604301357e154aef27733a3'), 'hooks.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'f7ecf196f38940ae0673c46c6c30cd86'), 'html-entities.js' => array('dependencies' => array('wp-polyfill'), 'version' => '140ecb91be91e7eec34220584d085033'), 'i18n.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => 'd897c43bea0c2753dd7368eb2d990898'), 'is-shallow-equal.js' => array('dependencies' => array('wp-polyfill'), 'version' => '798b660598677b39413fdb5f68624aa8'), 'keyboard-shortcuts.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-keycodes', 'wp-polyfill'), 'version' => '53d021916e259972fbc68f68892323ac'), 'keycodes.js' => array('dependencies' => array('lodash', 'wp-i18n', 'wp-polyfill'), 'version' => 'cf38e80b47baf72f4822ddb8847f4f24'), 'list-reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '80af68069161321e8e131bad6a00d5dc'), 'media-utils.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blob', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'df373dcd13d7abc3f8b042f369b88557'), 'notices.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-polyfill'), 'version' => 'b08e53c1e070954fa0884cad9a164683'), 'nux.js' => array('dependencies' => array('lodash', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => 'c0c1a368ca9ade95dbf55485e8d59b68'), 'plugins.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-polyfill', 'wp-primitives'), 'version' => 'a843ba54a81c99735da976cf43fac526'), 'primitives.js' => array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => 'dc0962ac2885a26f8c2abdbe0cf0e333'), 'priority-queue.js' => array('dependencies' => array('wp-polyfill'), 'version' => '18c93919f04bb681234310b314675b17'), 'redux-routine.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '3c50c6bd1563bc7fb88433198400a74c'), 'reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'bec2012396758ad7603274e338191a42'), 'rich-text.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-keycodes', 'wp-polyfill'), 'version' => 'f0498feae49f87cd9a121f3e1bae242d'), 'server-side-render.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '7c732c1add9f9667bdf8dd66fbf74759'), 'shortcode.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '15757929bc8d52a3b184c3fcaeb38c64'), 'token-list.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '7bcd3684420783ef1f6ebb7680fe958e'), 'url.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'e9868cffba8a348b31011f87dd53b3c4'), 'viewport.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-polyfill'), 'version' => '0a54bbdc44c5f135018c568a887b8279'), 'warning.js' => array('dependencies' => array('wp-polyfill'), 'version' => '202ac16e99afe7c33c257b248625a947'), 'widgets.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '0f11251901b3f83a3373551071d06740'), 'wordcount.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '02339c8ad03da1e7a03f9212da004007')); \ No newline at end of file + array('dependencies' => array('wp-dom-ready', 'wp-i18n', 'wp-polyfill'), 'version' => 'fa03f246887237d01c383e85ff6f107c'), 'annotations.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => 'acd6ed75d460d0d3781e1ef6c12cf2aa'), 'api-fetch.js' => array('dependencies' => array('wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '59f6dbf5a1d9a141515c25411bc4f01e'), 'autop.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'e65166da67ee5d5ff66d36ab14532b3b'), 'blob.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'b8855b04f6a52a7bca89f8d945d46866'), 'block-directory.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives'), 'version' => 'a8ff26eaaddf949aee8669d14277aec3'), 'block-editor.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-shortcode', 'wp-token-list', 'wp-url', 'wp-warning', 'wp-wordcount'), 'version' => '85aa1b380c2c41a1ab8a56731690f7a1'), 'block-library.js' => array('dependencies' => array('lodash', 'moment', 'wp-a11y', 'wp-api-fetch', 'wp-autop', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport'), 'version' => '9121ba79f9f6bd15c1b4cd17907c86b3'), 'block-serialization-default-parser.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'cc8e5d0e23cf68bb9944bf2a7a016e52'), 'blocks.js' => array('dependencies' => array('lodash', 'wp-autop', 'wp-blob', 'wp-block-serialization-default-parser', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-shortcode'), 'version' => 'a32036d432544d670dbd252aafb343aa'), 'components.js' => array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-a11y', 'wp-compose', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-warning'), 'version' => '8bc601986111961e36a4626e9187202b'), 'compose.js' => array('dependencies' => array('lodash', 'react', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-priority-queue'), 'version' => '1491dea52ef44b12c4130dc7fe00ea20'), 'core-data.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-url'), 'version' => '15ee57b1f0ac2f25cdee181ee369950a'), 'customize-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-viewport', 'wp-widgets'), 'version' => 'a4ae79ff9d722a302a31b7af5478e6b7'), 'data.js' => array('dependencies' => array('lodash', 'react', 'wp-compose', 'wp-deprecated', 'wp-element', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-priority-queue', 'wp-redux-routine'), 'version' => '93e547cee9fc74070215d5c1ce324bf6'), 'data-controls.js' => array('dependencies' => array('wp-api-fetch', 'wp-data', 'wp-deprecated', 'wp-polyfill'), 'version' => 'a6b5897d9fe0799f7c5167a4a9fb3fc2'), 'date.js' => array('dependencies' => array('moment', 'wp-polyfill'), 'version' => 'be8358e0f87d66f2bec405069f113602'), 'deprecated.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '64e8de35a014ff611a39da7042d361dd'), 'dom.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '7d156934b7b48d00965baf08e162ab91'), 'dom-ready.js' => array('dependencies' => array('wp-polyfill'), 'version' => '7ad174e925c73007ee5b17358242e7d9'), 'edit-post.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url', 'wp-viewport', 'wp-warning'), 'version' => '1a6df337153da0478216f4b1f58bb3ec'), 'edit-site.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport'), 'version' => 'dde8b7509907e7be17e474892a0acf90'), 'edit-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => '66e504d030a7022e8ff7b58a56042f3a'), 'editor.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-date', 'wp-deprecated', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-wordcount'), 'version' => 'ef2feccbd53a82ba328a9f678e261049'), 'element.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-escape-html', 'wp-polyfill'), 'version' => '32e0abe121ab85a88acb6472274ad136'), 'escape-html.js' => array('dependencies' => array('wp-polyfill'), 'version' => '4f03d9c45a01df8191f6833373fe1cfa'), 'format-library.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-url'), 'version' => '638b31b2e32bdc443afa62d9aa251d8a'), 'hooks.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'fee9af3abfeb76b497fd074608dca647'), 'html-entities.js' => array('dependencies' => array('wp-polyfill'), 'version' => '140ecb91be91e7eec34220584d085033'), 'i18n.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '9ddfa7e364f034c04939567c6c6079d5'), 'is-shallow-equal.js' => array('dependencies' => array('wp-polyfill'), 'version' => '798b660598677b39413fdb5f68624aa8'), 'keyboard-shortcuts.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-element', 'wp-keycodes', 'wp-polyfill'), 'version' => '78a4020b31c5ae28f7e97405b83d5027'), 'keycodes.js' => array('dependencies' => array('lodash', 'wp-i18n', 'wp-polyfill'), 'version' => '57a448b50bb24e264205e448e0b19ea2'), 'list-reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '411699046747b4d90f82c5b2547ff43c'), 'media-utils.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blob', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'ab2c70450229febbbb0a87e88074db07'), 'notices.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-polyfill'), 'version' => 'b9e78ffafe025c455d9ccf2c1a78d1de'), 'nux.js' => array('dependencies' => array('lodash', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => 'feee5fbb3df2a20c6dc4653f33d12e13'), 'plugins.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-polyfill', 'wp-primitives'), 'version' => '76d0e1ad216a273ab1359db9aaab1809'), 'primitives.js' => array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => 'ec5aecfc61b399ed5c8fa2de6b175942'), 'priority-queue.js' => array('dependencies' => array('wp-polyfill'), 'version' => '18c93919f04bb681234310b314675b17'), 'redux-routine.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'f4483156a9bae90512f894dbd867b929'), 'reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '436b8be211e4f30893de92b1faad8984'), 'rich-text.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-keycodes', 'wp-polyfill'), 'version' => '855cfaa16e1e86346cdf24239800bcaf'), 'server-side-render.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => 'c8b79b06e8a76272ee868b17b6a9d37b'), 'shortcode.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '0e7a194ec8387c92e8d2c2b3755c3c9b'), 'token-list.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'a50777df914543c1a77067959d6b3fbf'), 'url.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'd99eea3ea07b8acf242f75a06a2c49ff'), 'viewport.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-polyfill'), 'version' => '67406a236d2370eedc90db2dfdcb46bd'), 'warning.js' => array('dependencies' => array('wp-polyfill'), 'version' => '5ebe2df53cf3c74ebffc7e2d3e76184c'), 'widgets.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives'), 'version' => '3dd8fa0fcd8381649603b755437d9be1'), 'wordcount.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '02339c8ad03da1e7a03f9212da004007')); \ No newline at end of file diff --git a/src/wp-includes/author-template.php b/src/wp-includes/author-template.php index 2911366f03..e129e6f701 100644 --- a/src/wp-includes/author-template.php +++ b/src/wp-includes/author-template.php @@ -343,12 +343,13 @@ function the_author_posts_link( $deprecated = '' ) { */ function get_author_posts_url( $author_id, $author_nicename = '' ) { global $wp_rewrite; - $auth_ID = (int) $author_id; - $link = $wp_rewrite->get_author_permastruct(); + + $author_id = (int) $author_id; + $link = $wp_rewrite->get_author_permastruct(); if ( empty( $link ) ) { $file = home_url( '/' ); - $link = $file . '?author=' . $auth_ID; + $link = $file . '?author=' . $author_id; } else { if ( '' === $author_nicename ) { $user = get_userdata( $author_id ); diff --git a/src/wp-includes/block-editor.php b/src/wp-includes/block-editor.php index 1e3f40672a..672518757c 100644 --- a/src/wp-includes/block-editor.php +++ b/src/wp-includes/block-editor.php @@ -83,6 +83,7 @@ function get_block_categories( $post_or_block_editor_context ) { * @param WP_Block_Editor_Context $block_editor_context The current block editor context. */ $block_categories = apply_filters( 'block_categories_all', $block_categories, $block_editor_context ); + if ( ! empty( $block_editor_context->post ) ) { $post = $block_editor_context->post; @@ -123,6 +124,7 @@ function get_allowed_block_types( $block_editor_context ) { * @param WP_Block_Editor_Context $block_editor_context The current block editor context. */ $allowed_block_types = apply_filters( 'allowed_block_types_all', $allowed_block_types, $block_editor_context ); + if ( ! empty( $block_editor_context->post ) ) { $post = $block_editor_context->post; @@ -187,23 +189,37 @@ function get_default_block_editor_settings() { } } + // These styles are used if the "no theme styles" options is triggered or on + // themes without their own editor styles. + $default_editor_styles_file = ABSPATH . WPINC . '/css/dist/block-editor/default-editor-styles.css'; + if ( file_exists( $default_editor_styles_file ) ) { + $default_editor_styles = array( + array( 'css' => file_get_contents( $default_editor_styles_file ) ), + ); + } else { + $default_editor_styles = array(); + } + $editor_settings = array( - 'alignWide' => get_theme_support( 'align-wide' ), - 'allowedBlockTypes' => true, - 'allowedMimeTypes' => get_allowed_mime_types(), - 'blockCategories' => get_default_block_categories(), - 'disableCustomColors' => get_theme_support( 'disable-custom-colors' ), - 'disableCustomFontSizes' => get_theme_support( 'disable-custom-font-sizes' ), - 'disableCustomGradients' => get_theme_support( 'disable-custom-gradients' ), - 'enableCustomLineHeight' => get_theme_support( 'custom-line-height' ), - 'enableCustomSpacing' => get_theme_support( 'custom-spacing' ), - 'enableCustomUnits' => get_theme_support( 'custom-units' ), - 'isRTL' => is_rtl(), - 'imageDefaultSize' => $image_default_size, - 'imageDimensions' => $image_dimensions, - 'imageEditing' => true, - 'imageSizes' => $available_image_sizes, - 'maxUploadFileSize' => $max_upload_size, + 'alignWide' => get_theme_support( 'align-wide' ), + 'allowedBlockTypes' => true, + 'allowedMimeTypes' => get_allowed_mime_types(), + 'defaultEditorStyles' => $default_editor_styles, + 'blockCategories' => get_default_block_categories(), + 'disableCustomColors' => get_theme_support( 'disable-custom-colors' ), + 'disableCustomFontSizes' => get_theme_support( 'disable-custom-font-sizes' ), + 'disableCustomGradients' => get_theme_support( 'disable-custom-gradients' ), + 'enableCustomLineHeight' => get_theme_support( 'custom-line-height' ), + 'enableCustomSpacing' => get_theme_support( 'custom-spacing' ), + 'enableCustomUnits' => get_theme_support( 'custom-units' ), + 'isRTL' => is_rtl(), + 'imageDefaultSize' => $image_default_size, + 'imageDimensions' => $image_dimensions, + 'imageEditing' => true, + 'imageSizes' => $available_image_sizes, + 'maxUploadFileSize' => $max_upload_size, + // The following flag is required to enable the new Gallery block format on the mobile apps in 5.9. + '__unstableGalleryWithImageBlocks' => true, ); // Theme settings. @@ -291,47 +307,63 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex $custom_settings ); - $theme_json = WP_Theme_JSON_Resolver::get_merged_data( $editor_settings ); + $presets = array( + array( + 'css' => 'variables', + '__unstableType' => 'presets', + ), + array( + 'css' => 'presets', + '__unstableType' => 'presets', + ), + ); + foreach ( $presets as $preset_style ) { + $actual_css = wp_get_global_stylesheet( array( $preset_style['css'] ) ); + if ( '' !== $actual_css ) { + $preset_style['css'] = $actual_css; + $editor_settings['styles'][] = $preset_style; + } + } if ( WP_Theme_JSON_Resolver::theme_has_support() ) { - $editor_settings['styles'][] = array( - 'css' => $theme_json->get_stylesheet( 'block_styles' ), - '__unstableType' => 'globalStyles', - ); - $editor_settings['styles'][] = array( - 'css' => $theme_json->get_stylesheet( 'css_variables' ), - '__experimentalNoWrapper' => true, - '__unstableType' => 'globalStyles', + $block_classes = array( + 'css' => 'styles', + '__unstableType' => 'theme', ); + $actual_css = wp_get_global_stylesheet( array( $block_classes['css'] ) ); + if ( '' !== $actual_css ) { + $block_classes['css'] = $actual_css; + $editor_settings['styles'][] = $block_classes; + } } - $editor_settings['__experimentalFeatures'] = $theme_json->get_settings(); + $editor_settings['__experimentalFeatures'] = wp_get_global_settings(); // These settings may need to be updated based on data coming from theme.json sources. if ( isset( $editor_settings['__experimentalFeatures']['color']['palette'] ) ) { $colors_by_origin = $editor_settings['__experimentalFeatures']['color']['palette']; - $editor_settings['colors'] = isset( $colors_by_origin['user'] ) ? - $colors_by_origin['user'] : ( + $editor_settings['colors'] = isset( $colors_by_origin['custom'] ) ? + $colors_by_origin['custom'] : ( isset( $colors_by_origin['theme'] ) ? $colors_by_origin['theme'] : - $colors_by_origin['core'] + $colors_by_origin['default'] ); } if ( isset( $editor_settings['__experimentalFeatures']['color']['gradients'] ) ) { $gradients_by_origin = $editor_settings['__experimentalFeatures']['color']['gradients']; - $editor_settings['gradients'] = isset( $gradients_by_origin['user'] ) ? - $gradients_by_origin['user'] : ( + $editor_settings['gradients'] = isset( $gradients_by_origin['custom'] ) ? + $gradients_by_origin['custom'] : ( isset( $gradients_by_origin['theme'] ) ? $gradients_by_origin['theme'] : - $gradients_by_origin['core'] + $gradients_by_origin['default'] ); } if ( isset( $editor_settings['__experimentalFeatures']['typography']['fontSizes'] ) ) { $font_sizes_by_origin = $editor_settings['__experimentalFeatures']['typography']['fontSizes']; - $editor_settings['fontSizes'] = isset( $font_sizes_by_origin['user'] ) ? - $font_sizes_by_origin['user'] : ( + $editor_settings['fontSizes'] = isset( $font_sizes_by_origin['custom'] ) ? + $font_sizes_by_origin['custom'] : ( isset( $font_sizes_by_origin['theme'] ) ? $font_sizes_by_origin['theme'] : - $font_sizes_by_origin['core'] + $font_sizes_by_origin['default'] ); } if ( isset( $editor_settings['__experimentalFeatures']['color']['custom'] ) ) { @@ -346,17 +378,17 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex $editor_settings['disableCustomFontSizes'] = ! $editor_settings['__experimentalFeatures']['typography']['customFontSize']; unset( $editor_settings['__experimentalFeatures']['typography']['customFontSize'] ); } - if ( isset( $editor_settings['__experimentalFeatures']['typography']['customLineHeight'] ) ) { - $editor_settings['enableCustomLineHeight'] = $editor_settings['__experimentalFeatures']['typography']['customLineHeight']; - unset( $editor_settings['__experimentalFeatures']['typography']['customLineHeight'] ); + if ( isset( $editor_settings['__experimentalFeatures']['typography']['lineHeight'] ) ) { + $editor_settings['enableCustomLineHeight'] = $editor_settings['__experimentalFeatures']['typography']['lineHeight']; + unset( $editor_settings['__experimentalFeatures']['typography']['lineHeight'] ); } if ( isset( $editor_settings['__experimentalFeatures']['spacing']['units'] ) ) { $editor_settings['enableCustomUnits'] = $editor_settings['__experimentalFeatures']['spacing']['units']; unset( $editor_settings['__experimentalFeatures']['spacing']['units'] ); } - if ( isset( $editor_settings['__experimentalFeatures']['spacing']['customPadding'] ) ) { - $editor_settings['enableCustomSpacing'] = $editor_settings['__experimentalFeatures']['spacing']['customPadding']; - unset( $editor_settings['__experimentalFeatures']['spacing']['customPadding'] ); + if ( isset( $editor_settings['__experimentalFeatures']['spacing']['padding'] ) ) { + $editor_settings['enableCustomSpacing'] = $editor_settings['__experimentalFeatures']['spacing']['padding']; + unset( $editor_settings['__experimentalFeatures']['spacing']['padding'] ); } /** @@ -368,6 +400,7 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex * @param WP_Block_Editor_Context $block_editor_context The current block editor context. */ $editor_settings = apply_filters( 'block_editor_settings_all', $editor_settings, $block_editor_context ); + if ( ! empty( $block_editor_context->post ) ) { $post = $block_editor_context->post; @@ -407,9 +440,11 @@ function block_editor_rest_api_preload( array $preload_paths, $block_editor_cont * * @since 5.8.0 * - * @param string[] $preload_paths Array of paths to preload. + * @param string[] $preload_paths Array of paths to preload. + * @param WP_Block_Editor_Context $block_editor_context The current block editor context. */ $preload_paths = apply_filters( 'block_editor_rest_api_preload_paths', $preload_paths, $block_editor_context ); + if ( ! empty( $block_editor_context->post ) ) { $selected_post = $block_editor_context->post; @@ -438,6 +473,19 @@ function block_editor_rest_api_preload( array $preload_paths, $block_editor_cont */ $backup_global_post = ! empty( $post ) ? clone $post : $post; + foreach ( $preload_paths as &$path ) { + if ( is_string( $path ) && ! str_starts_with( $path, '/' ) ) { + $path = '/' . $path; + continue; + } + + if ( is_array( $path ) && is_string( $path[0] ) && ! str_starts_with( $path[0], '/' ) ) { + $path[0] = '/' . $path[0]; + } + } + + unset( $path ); + $preload_data = array_reduce( $preload_paths, 'rest_preload_api_request', @@ -464,22 +512,12 @@ function block_editor_rest_api_preload( array $preload_paths, $block_editor_cont * * @global array $editor_styles * - * @return array An array of theme styles for the block editor. Includes default font family - * style and theme stylesheets. + * @return array An array of theme styles for the block editor. */ function get_block_editor_theme_styles() { global $editor_styles; - if ( ! WP_Theme_JSON_Resolver::theme_has_support() ) { - $styles = array( - array( - 'css' => 'body { font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif }', - '__unstableType' => 'core', - ), - ); - } else { - $styles = array(); - } + $styles = array(); if ( $editor_styles && current_theme_supports( 'editor-styles' ) ) { foreach ( $editor_styles as $style ) { diff --git a/src/wp-includes/block-patterns.php b/src/wp-includes/block-patterns.php index b01869f8b6..0d4eacd1a3 100644 --- a/src/wp-includes/block-patterns.php +++ b/src/wp-includes/block-patterns.php @@ -48,12 +48,17 @@ function _register_core_block_patterns_and_categories() { * Register Core's official patterns from wordpress.org/patterns. * * @since 5.8.0 + * @since 5.9.0 The $current_screen argument was removed. * - * @param WP_Screen $current_screen The screen that the current request was triggered from. + * @param WP_Screen $deprecated Unused. Formerly the screen that the current request was triggered from. */ -function _load_remote_block_patterns( $current_screen ) { - if ( ! $current_screen->is_block_editor ) { - return; +function _load_remote_block_patterns( $deprecated = null ) { + if ( ! empty( $deprecated ) ) { + _deprecated_argument( __FUNCTION__, '5.9.0' ); + $current_screen = $deprecated; + if ( ! $current_screen->is_block_editor ) { + return; + } } $supports_core_patterns = get_theme_support( 'core-block-patterns' ); @@ -83,3 +88,42 @@ function _load_remote_block_patterns( $current_screen ) { } } } + +/** + * Register `Featured` (category) patterns from wordpress.org/patterns. + * + * @since 5.9.0 + */ +function _load_remote_featured_patterns() { + $supports_core_patterns = get_theme_support( 'core-block-patterns' ); + + /** This filter is documented in wp-includes/block-patterns.php */ + $should_load_remote = apply_filters( 'should_load_remote_block_patterns', true ); + + if ( ! $should_load_remote || ! $supports_core_patterns ) { + return; + } + + if ( ! WP_Block_Pattern_Categories_Registry::get_instance()->is_registered( 'featured' ) ) { + register_block_pattern_category( 'featured', array( 'label' => __( 'Featured' ) ) ); + } + + $request = new WP_REST_Request( 'GET', '/wp/v2/pattern-directory/patterns' ); + $featured_cat_id = 26; // This is the `Featured` category id from pattern directory. + $request->set_param( 'category', $featured_cat_id ); + $response = rest_do_request( $request ); + if ( $response->is_error() ) { + return; + } + $patterns = $response->get_data(); + + foreach ( $patterns as $pattern ) { + $pattern_name = sanitize_title( $pattern['title'] ); + $registry = WP_Block_Patterns_Registry::get_instance(); + // Some patterns might be already registered as core patterns with the `core` prefix. + $is_registered = $registry->is_registered( $pattern_name ) || $registry->is_registered( "core/$pattern_name" ); + if ( ! $is_registered ) { + register_block_pattern( $pattern_name, (array) $pattern ); + } + } +} diff --git a/src/wp-includes/block-patterns/query-medium-posts.php b/src/wp-includes/block-patterns/query-medium-posts.php index fdcbce323a..bd564ebe43 100644 --- a/src/wp-includes/block-patterns/query-medium-posts.php +++ b/src/wp-includes/block-patterns/query-medium-posts.php @@ -9,7 +9,7 @@ return array( 'title' => _x( 'Image at left', 'Block pattern title' ), 'blockTypes' => array( 'core/query' ), 'categories' => array( 'query' ), - 'content' => ' + 'content' => '
diff --git a/src/wp-includes/block-patterns/query-small-posts.php b/src/wp-includes/block-patterns/query-small-posts.php index c858f19813..2f165c1b8b 100644 --- a/src/wp-includes/block-patterns/query-small-posts.php +++ b/src/wp-includes/block-patterns/query-small-posts.php @@ -9,7 +9,7 @@ return array( 'title' => _x( 'Small image and title', 'Block pattern title' ), 'blockTypes' => array( 'core/query' ), 'categories' => array( 'query' ), - 'content' => ' + 'content' => '
diff --git a/src/wp-includes/block-patterns/query-standard-posts.php b/src/wp-includes/block-patterns/query-standard-posts.php index 50fa37d637..c05ace98db 100644 --- a/src/wp-includes/block-patterns/query-standard-posts.php +++ b/src/wp-includes/block-patterns/query-standard-posts.php @@ -9,7 +9,7 @@ return array( 'title' => _x( 'Standard', 'Block pattern title' ), 'blockTypes' => array( 'core/query' ), 'categories' => array( 'query' ), - 'content' => ' + 'content' => '
diff --git a/src/wp-includes/block-supports/align.php b/src/wp-includes/block-supports/align.php index ae0c2a4256..5a1e3a7e58 100644 --- a/src/wp-includes/block-supports/align.php +++ b/src/wp-includes/block-supports/align.php @@ -31,7 +31,7 @@ function wp_register_alignment_support( $block_type ) { } /** - * Add CSS classes for block alignment to the incoming attributes array. + * Adds CSS classes for block alignment to the incoming attributes array. * This will be applied to the block markup in the front-end. * * @since 5.6.0 @@ -39,7 +39,6 @@ function wp_register_alignment_support( $block_type ) { * * @param WP_Block_Type $block_type Block Type. * @param array $block_attributes Block attributes. - * * @return array Block alignment CSS classes and inline styles. */ function wp_apply_alignment_support( $block_type, $block_attributes ) { diff --git a/src/wp-includes/block-supports/border.php b/src/wp-includes/block-supports/border.php index 08f3781ba6..15fd36bbdc 100644 --- a/src/wp-includes/block-supports/border.php +++ b/src/wp-includes/block-supports/border.php @@ -47,7 +47,6 @@ function wp_register_border_support( $block_type ) { * * @param WP_Block_Type $block_type Block type. * @param array $block_attributes Block attributes. - * * @return array Border CSS classes and inline styles. */ function wp_apply_border_support( $block_type, $block_attributes ) { @@ -63,8 +62,23 @@ function wp_apply_border_support( $block_type, $block_attributes ) { wp_has_border_feature_support( $block_type, 'radius' ) && isset( $block_attributes['style']['border']['radius'] ) ) { - $border_radius = (int) $block_attributes['style']['border']['radius']; - $styles[] = sprintf( 'border-radius: %dpx;', $border_radius ); + $border_radius = $block_attributes['style']['border']['radius']; + + if ( is_array( $border_radius ) ) { + // We have individual border radius corner values. + foreach ( $border_radius as $key => $radius ) { + // Convert CamelCase corner name to kebab-case. + $corner = strtolower( preg_replace( '/(?supports, array( '__experimentalBorder' ), false ); diff --git a/src/wp-includes/block-supports/colors.php b/src/wp-includes/block-supports/colors.php index cd7ecf1cac..7db9a4ad7a 100644 --- a/src/wp-includes/block-supports/colors.php +++ b/src/wp-includes/block-supports/colors.php @@ -99,7 +99,7 @@ function wp_apply_colors_support( $block_type, $block_attributes ) { } // Apply color class or inline style. if ( $has_named_text_color ) { - $classes[] = sprintf( 'has-%s-color', $block_attributes['textColor'] ); + $classes[] = sprintf( 'has-%s-color', _wp_to_kebab_case( $block_attributes['textColor'] ) ); } elseif ( $has_custom_text_color ) { $styles[] = sprintf( 'color: %s;', $block_attributes['style']['color']['text'] ); } @@ -116,7 +116,7 @@ function wp_apply_colors_support( $block_type, $block_attributes ) { } // Apply background color classes or styles. if ( $has_named_background_color ) { - $classes[] = sprintf( 'has-%s-background-color', $block_attributes['backgroundColor'] ); + $classes[] = sprintf( 'has-%s-background-color', _wp_to_kebab_case( $block_attributes['backgroundColor'] ) ); } elseif ( $has_custom_background_color ) { $styles[] = sprintf( 'background-color: %s;', $block_attributes['style']['color']['background'] ); } @@ -132,7 +132,7 @@ function wp_apply_colors_support( $block_type, $block_attributes ) { } // Apply required background class. if ( $has_named_gradient ) { - $classes[] = sprintf( 'has-%s-gradient-background', $block_attributes['gradient'] ); + $classes[] = sprintf( 'has-%s-gradient-background', _wp_to_kebab_case( $block_attributes['gradient'] ) ); } elseif ( $has_custom_gradient ) { $styles[] = sprintf( 'background: %s;', $block_attributes['style']['color']['gradient'] ); } diff --git a/src/wp-includes/block-supports/dimensions.php b/src/wp-includes/block-supports/dimensions.php new file mode 100644 index 0000000000..7e56c011e7 --- /dev/null +++ b/src/wp-includes/block-supports/dimensions.php @@ -0,0 +1,90 @@ +attributes ) { + $block_type->attributes = array(); + } + + // Check for existing style attribute definition e.g. from block.json. + if ( array_key_exists( 'style', $block_type->attributes ) ) { + return; + } + + $has_dimensions_support = block_has_support( $block_type, array( '__experimentalDimensions' ), false ); + // Future block supports such as height & width will be added here. + + if ( $has_dimensions_support ) { + $block_type->attributes['style'] = array( + 'type' => 'object', + ); + } +} + +/** + * Adds CSS classes for block dimensions to the incoming attributes array. + * This will be applied to the block markup in the front-end. + * + * @since 5.9.0 + * @access private + * + * @param WP_Block_Type $block_type Block Type. + * @param array $block_attributes Block attributes. + * @return array Block dimensions CSS classes and inline styles. + */ +function wp_apply_dimensions_support( $block_type, $block_attributes ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable + if ( wp_skip_dimensions_serialization( $block_type ) ) { + return array(); + } + + $styles = array(); + + // Height support to be added in near future. + // Width support to be added in near future. + + return empty( $styles ) ? array() : array( 'style' => implode( ' ', $styles ) ); +} + +/** + * Checks whether serialization of the current block's dimensions properties + * should occur. + * + * @since 5.9.0 + * @access private + * + * @param WP_Block_type $block_type Block type. + * @return bool Whether to serialize spacing support styles & classes. + */ +function wp_skip_dimensions_serialization( $block_type ) { + $dimensions_support = _wp_array_get( $block_type->supports, array( '__experimentalDimensions' ), false ); + return is_array( $dimensions_support ) && + array_key_exists( '__experimentalSkipSerialization', $dimensions_support ) && + $dimensions_support['__experimentalSkipSerialization']; +} + +// Register the block support. +WP_Block_Supports::get_instance()->register( + 'dimensions', + array( + 'register_attribute' => 'wp_register_dimensions_support', + 'apply' => 'wp_apply_dimensions_support', + ) +); diff --git a/src/wp-includes/block-supports/duotone.php b/src/wp-includes/block-supports/duotone.php index 04aac0ef1e..f73988e332 100644 --- a/src/wp-includes/block-supports/duotone.php +++ b/src/wp-includes/block-supports/duotone.php @@ -45,7 +45,6 @@ * * @param mixed $n Number of unknown type. * @param int $max Upper value of the range to bound to. - * * @return float Value in the range [0, 1]. */ function wp_tinycolor_bound01( $n, $max ) { @@ -70,7 +69,29 @@ function wp_tinycolor_bound01( $n, $max ) { } /** - * Round and convert values of an RGB object. + * Direct port of tinycolor's boundAlpha function to maintain consistency with + * how tinycolor works. + * + * @see https://github.com/bgrins/TinyColor + * + * @since 5.9.0 + * @access private + * + * @param mixed $n Number of unknown type. + * @return float Value in the range [0,1]. + */ +function _wp_tinycolor_bound_alpha( $n ) { + if ( is_numeric( $n ) ) { + $n = (float) $n; + if ( $n >= 0 && $n <= 1 ) { + return $n; + } + } + return 1; +} + +/** + * Rounds and converts values of an RGB object. * * Direct port of TinyColor's function, lightly simplified to maintain * consistency with TinyColor. @@ -81,7 +102,6 @@ function wp_tinycolor_bound01( $n, $max ) { * @access private * * @param array $rgb_color RGB object. - * * @return array Rounded and converted RGB object. */ function wp_tinycolor_rgb_to_rgb( $rgb_color ) { @@ -106,7 +126,6 @@ function wp_tinycolor_rgb_to_rgb( $rgb_color ) { * @param float $p first component. * @param float $q second component. * @param float $t third component. - * * @return float R, G, or B component. */ function wp_tinycolor_hue_to_rgb( $p, $q, $t ) { @@ -129,7 +148,7 @@ function wp_tinycolor_hue_to_rgb( $p, $q, $t ) { } /** - * Convert an HSL object to an RGB object with converted and rounded values. + * Converts an HSL object to an RGB object with converted and rounded values. * * Direct port of TinyColor's function, lightly simplified to maintain * consistency with TinyColor. @@ -140,7 +159,6 @@ function wp_tinycolor_hue_to_rgb( $p, $q, $t ) { * @access private * * @param array $hsl_color HSL object. - * * @return array Rounded and converted RGB object. */ function wp_tinycolor_hsl_to_rgb( $hsl_color ) { @@ -170,8 +188,7 @@ function wp_tinycolor_hsl_to_rgb( $hsl_color ) { /** * Parses hex, hsl, and rgb CSS strings using the same regex as TinyColor v1.4.2 - * used in the JavaScript. Only colors output from react-color are implemented - * and the alpha value is ignored as it is not used in duotone. + * used in the JavaScript. Only colors output from react-color are implemented. * * Direct port of TinyColor's function, lightly simplified to maintain * consistency with TinyColor. @@ -180,10 +197,10 @@ function wp_tinycolor_hsl_to_rgb( $hsl_color ) { * @see https://github.com/casesandberg/react-color/ * * @since 5.8.0 + * @since 5.9.0 Added alpha processing. * @access private * * @param string $color_str CSS color string. - * * @return array RGB object. */ function wp_tinycolor_string_to_rgb( $color_str ) { @@ -199,90 +216,139 @@ function wp_tinycolor_string_to_rgb( $color_str ) { $rgb_regexp = '/^rgb' . $permissive_match3 . '$/'; if ( preg_match( $rgb_regexp, $color_str, $match ) ) { - return wp_tinycolor_rgb_to_rgb( + $rgb = wp_tinycolor_rgb_to_rgb( array( 'r' => $match[1], 'g' => $match[2], 'b' => $match[3], ) ); + + $rgb['a'] = 1; + + return $rgb; } $rgba_regexp = '/^rgba' . $permissive_match4 . '$/'; if ( preg_match( $rgba_regexp, $color_str, $match ) ) { - return wp_tinycolor_rgb_to_rgb( + $rgb = wp_tinycolor_rgb_to_rgb( array( 'r' => $match[1], 'g' => $match[2], 'b' => $match[3], ) ); + + $rgb['a'] = _wp_tinycolor_bound_alpha( $match[4] ); + + return $rgb; } $hsl_regexp = '/^hsl' . $permissive_match3 . '$/'; if ( preg_match( $hsl_regexp, $color_str, $match ) ) { - return wp_tinycolor_hsl_to_rgb( + $rgb = wp_tinycolor_hsl_to_rgb( array( 'h' => $match[1], 's' => $match[2], 'l' => $match[3], ) ); + + $rgb['a'] = 1; + + return $rgb; } $hsla_regexp = '/^hsla' . $permissive_match4 . '$/'; if ( preg_match( $hsla_regexp, $color_str, $match ) ) { - return wp_tinycolor_hsl_to_rgb( + $rgb = wp_tinycolor_hsl_to_rgb( array( 'h' => $match[1], 's' => $match[2], 'l' => $match[3], ) ); + + $rgb['a'] = _wp_tinycolor_bound_alpha( $match[4] ); + + return $rgb; } $hex8_regexp = '/^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/'; if ( preg_match( $hex8_regexp, $color_str, $match ) ) { - return wp_tinycolor_rgb_to_rgb( + $rgb = wp_tinycolor_rgb_to_rgb( array( 'r' => base_convert( $match[1], 16, 10 ), 'g' => base_convert( $match[2], 16, 10 ), 'b' => base_convert( $match[3], 16, 10 ), ) ); + + $rgb['a'] = _wp_tinycolor_bound_alpha( + base_convert( $match[4], 16, 10 ) / 255 + ); + + return $rgb; } $hex6_regexp = '/^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/'; if ( preg_match( $hex6_regexp, $color_str, $match ) ) { - return wp_tinycolor_rgb_to_rgb( + $rgb = wp_tinycolor_rgb_to_rgb( array( 'r' => base_convert( $match[1], 16, 10 ), 'g' => base_convert( $match[2], 16, 10 ), 'b' => base_convert( $match[3], 16, 10 ), ) ); + + $rgb['a'] = 1; + + return $rgb; } $hex4_regexp = '/^#?([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/'; if ( preg_match( $hex4_regexp, $color_str, $match ) ) { - return wp_tinycolor_rgb_to_rgb( + $rgb = wp_tinycolor_rgb_to_rgb( array( 'r' => base_convert( $match[1] . $match[1], 16, 10 ), 'g' => base_convert( $match[2] . $match[2], 16, 10 ), 'b' => base_convert( $match[3] . $match[3], 16, 10 ), ) ); + + $rgb['a'] = _wp_tinycolor_bound_alpha( + base_convert( $match[4] . $match[4], 16, 10 ) / 255 + ); + + return $rgb; } $hex3_regexp = '/^#?([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/'; if ( preg_match( $hex3_regexp, $color_str, $match ) ) { - return wp_tinycolor_rgb_to_rgb( + $rgb = wp_tinycolor_rgb_to_rgb( array( 'r' => base_convert( $match[1] . $match[1], 16, 10 ), 'g' => base_convert( $match[2] . $match[2], 16, 10 ), 'b' => base_convert( $match[3] . $match[3], 16, 10 ), ) ); + + $rgb['a'] = 1; + + return $rgb; + } + + /* + * The JS color picker considers the string "transparent" to be a hex value, + * so we need to handle it here as a special case. + */ + if ( 'transparent' === $color_str ) { + return array( + 'r' => 0, + 'g' => 0, + 'b' => 0, + 'a' => 0, + ); } } @@ -315,39 +381,24 @@ function wp_register_duotone_support( $block_type ) { } /** - * Render out the duotone stylesheet and SVG. + * Renders the duotone filter SVG and returns the CSS filter property to + * reference the rendered SVG. * - * @since 5.8.0 + * @since 5.9.0 * @access private - * - * @param string $block_content Rendered block content. - * @param array $block Block object. - * - * @return string Filtered block content. - */ -function wp_render_duotone_support( $block_content, $block ) { - $block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] ); - - $duotone_support = false; - if ( $block_type && property_exists( $block_type, 'supports' ) ) { - $duotone_support = _wp_array_get( $block_type->supports, array( 'color', '__experimentalDuotone' ), false ); - } - - $has_duotone_attribute = isset( $block['attrs']['style']['color']['duotone'] ); - - if ( - ! $duotone_support || - ! $has_duotone_attribute - ) { - return $block_content; - } - - $duotone_colors = $block['attrs']['style']['color']['duotone']; + * @param array $preset Duotone preset value as seen in theme.json. + * @return string Duotone CSS filter property. + */ +function wp_render_duotone_filter_preset( $preset ) { + $duotone_id = $preset['slug']; + $duotone_colors = $preset['colors']; + $filter_id = 'wp-duotone-' . $duotone_id; $duotone_values = array( 'r' => array(), 'g' => array(), 'b' => array(), + 'a' => array(), ); foreach ( $duotone_colors as $color_str ) { $color = wp_tinycolor_string_to_rgb( $color_str ); @@ -355,31 +406,15 @@ function wp_render_duotone_support( $block_content, $block ) { $duotone_values['r'][] = $color['r'] / 255; $duotone_values['g'][] = $color['g'] / 255; $duotone_values['b'][] = $color['b'] / 255; + $duotone_values['a'][] = $color['a']; } - $duotone_id = 'wp-duotone-filter-' . uniqid(); - - $selectors = explode( ',', $duotone_support ); - $selectors_scoped = array_map( - static function ( $selector ) use ( $duotone_id ) { - return '.' . $duotone_id . ' ' . trim( $selector ); - }, - $selectors - ); - $selectors_group = implode( ', ', $selectors_scoped ); - ob_start(); ?> - - - + - values=".299 .587 .114 0 0 - .299 .587 .114 0 0 - .299 .587 .114 0 0 - 0 0 0 1 0" - + values=" + .299 .587 .114 0 0 + .299 .587 .114 0 0 + .299 .587 .114 0 0 + .299 .587 .114 0 0 + " /> + + <', $svg ); + $svg = trim( $svg ); + } + + add_action( + // Safari doesn't render SVG filters defined in data URIs, + // and SVG filters won't render in the head of a document, + // so the next best place to put the SVG is in the footer. + is_admin() ? 'admin_footer' : 'wp_footer', + function () use ( $svg ) { + echo $svg; + } + ); + + return "url('#" . $filter_id . "')"; +} + +/** + * Render out the duotone stylesheet and SVG. + * + * @since 5.8.0 + * @access private + * + * @param string $block_content Rendered block content. + * @param array $block Block object. + * @return string Filtered block content. + */ +function wp_render_duotone_support( $block_content, $block ) { + $block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] ); + + $duotone_support = false; + if ( $block_type && property_exists( $block_type, 'supports' ) ) { + $duotone_support = _wp_array_get( $block_type->supports, array( 'color', '__experimentalDuotone' ), false ); + } + + $has_duotone_attribute = isset( $block['attrs']['style']['color']['duotone'] ); + + if ( + ! $duotone_support || + ! $has_duotone_attribute + ) { + return $block_content; + } + + $filter_preset = array( + 'slug' => uniqid(), + 'colors' => $block['attrs']['style']['color']['duotone'], + ); + $filter_property = wp_render_duotone_filter_preset( $filter_preset ); + $filter_id = 'wp-duotone-' . $filter_preset['slug']; + + $scope = '.' . $filter_id; + $selectors = explode( ',', $duotone_support ); + $scoped = array(); + foreach ( $selectors as $sel ) { + $scoped[] = $scope . ' ' . trim( $sel ); + } + $selector = implode( ', ', $scoped ); + + // !important is needed because these styles render before global styles, + // and they should be overriding the duotone filters set by global styles. + $filter_style = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG + ? $selector . " {\n\tfilter: " . $filter_property . " !important;\n}\n" + : $selector . '{filter:' . $filter_property . ' !important;}'; + + wp_register_style( $filter_id, false, array(), true, true ); + wp_add_inline_style( $filter_id, $filter_style ); + wp_enqueue_style( $filter_id ); // Like the layout hook, this assumes the hook only applies to blocks with a single wrapper. - $content = preg_replace( + return preg_replace( '/' . preg_quote( 'class="', '/' ) . '/', - 'class="' . $duotone_id . ' ', + 'class="' . $filter_id . ' ', $block_content, 1 ); - - return $content . $duotone; } // Register the block support. diff --git a/src/wp-includes/block-supports/elements.php b/src/wp-includes/block-supports/elements.php index 4e43dda375..ceb8841ac1 100644 --- a/src/wp-includes/block-supports/elements.php +++ b/src/wp-includes/block-supports/elements.php @@ -17,6 +17,10 @@ * @return string Filtered block content. */ function wp_render_elements_support( $block_content, $block ) { + if ( ! $block_content ) { + return $block_content; + } + $link_color = null; if ( ! empty( $block['attrs'] ) ) { $link_color = _wp_array_get( $block['attrs'], array( 'style', 'elements', 'link', 'color', 'text' ), null ); @@ -42,7 +46,7 @@ function wp_render_elements_support( $block_content, $block ) { } $link_color_declaration = esc_html( safecss_filter_attr( "color: $link_color" ) ); - $style = "\n"; + $style = "\n"; // Like the layout hook this assumes the hook only applies to blocks with a single wrapper. // Retrieve the opening tag of the first HTML element. @@ -64,8 +68,19 @@ function wp_render_elements_support( $block_content, $block ) { $content = substr_replace( $block_content, ' class="' . $class_name . '"', $first_element_offset + strlen( $first_element ) - 1, 0 ); } - return $content . $style; + /* + * Ideally styles should be loaded in the head, but blocks may be parsed + * after that, so loading in the footer for now. + * See https://core.trac.wordpress.org/ticket/53494. + */ + add_action( + 'wp_footer', + static function () use ( $style ) { + echo $style; + } + ); + return $content; } add_filter( 'render_block', 'wp_render_elements_support', 10, 2 ); diff --git a/src/wp-includes/block-supports/layout.php b/src/wp-includes/block-supports/layout.php index be1da09899..529a775a92 100644 --- a/src/wp-includes/block-supports/layout.php +++ b/src/wp-includes/block-supports/layout.php @@ -29,6 +29,106 @@ function wp_register_layout_support( $block_type ) { } } +/** + * Generates the CSS corresponding to the provided layout. + * + * @since 5.9.0 + * @access private + * + * @param string $selector CSS selector. + * @param array $layout Layout object. The one that is passed has already checked + * the existence of default block layout. + * @param bool $has_block_gap_support Whether the theme has support for the block gap. + * @param string $gap_value The block gap value to apply. + * @return string CSS style. + */ +function wp_get_layout_style( $selector, $layout, $has_block_gap_support = false, $gap_value = null ) { + $layout_type = isset( $layout['type'] ) ? $layout['type'] : 'default'; + + $style = ''; + if ( 'default' === $layout_type ) { + $content_size = isset( $layout['contentSize'] ) ? $layout['contentSize'] : ''; + $wide_size = isset( $layout['wideSize'] ) ? $layout['wideSize'] : ''; + + $all_max_width_value = $content_size ? $content_size : $wide_size; + $wide_max_width_value = $wide_size ? $wide_size : $content_size; + + // Make sure there is a single CSS rule, and all tags are stripped for security. + // TODO: Use `safecss_filter_attr` instead - once https://core.trac.wordpress.org/ticket/46197 is patched. + $all_max_width_value = wp_strip_all_tags( explode( ';', $all_max_width_value )[0] ); + $wide_max_width_value = wp_strip_all_tags( explode( ';', $wide_max_width_value )[0] ); + + $style = ''; + if ( $content_size || $wide_size ) { + $style = "$selector > * {"; + $style .= 'max-width: ' . esc_html( $all_max_width_value ) . ';'; + $style .= 'margin-left: auto !important;'; + $style .= 'margin-right: auto !important;'; + $style .= '}'; + + $style .= "$selector > .alignwide { max-width: " . esc_html( $wide_max_width_value ) . ';}'; + $style .= "$selector .alignfull { max-width: none; }"; + } + + $style .= "$selector .alignleft { float: left; margin-right: 2em; }"; + $style .= "$selector .alignright { float: right; margin-left: 2em; }"; + if ( $has_block_gap_support ) { + $gap_style = $gap_value ? $gap_value : 'var( --wp--style--block-gap )'; + $style .= "$selector > * { margin-top: 0; margin-bottom: 0; }"; + $style .= "$selector > * + * { margin-top: $gap_style; margin-bottom: 0; }"; + } + } elseif ( 'flex' === $layout_type ) { + $layout_orientation = isset( $layout['orientation'] ) ? $layout['orientation'] : 'horizontal'; + + $justify_content_options = array( + 'left' => 'flex-start', + 'right' => 'flex-end', + 'center' => 'center', + ); + + if ( 'horizontal' === $layout_orientation ) { + $justify_content_options += array( 'space-between' => 'space-between' ); + } + + $flex_wrap_options = array( 'wrap', 'nowrap' ); + $flex_wrap = ! empty( $layout['flexWrap'] ) && in_array( $layout['flexWrap'], $flex_wrap_options, true ) ? + $layout['flexWrap'] : + 'wrap'; + + $style = "$selector {"; + $style .= 'display: flex;'; + if ( $has_block_gap_support ) { + $gap_style = $gap_value ? $gap_value : 'var( --wp--style--block-gap, 0.5em )'; + $style .= "gap: $gap_style;"; + } else { + $style .= 'gap: 0.5em;'; + } + $style .= "flex-wrap: $flex_wrap;"; + $style .= 'align-items: center;'; + if ( 'horizontal' === $layout_orientation ) { + $style .= 'align-items: center;'; + /** + * Add this style only if is not empty for backwards compatibility, + * since we intend to convert blocks that had flex layout implemented + * by custom css. + */ + if ( ! empty( $layout['justifyContent'] ) && array_key_exists( $layout['justifyContent'], $justify_content_options ) ) { + $style .= "justify-content: {$justify_content_options[ $layout['justifyContent'] ]};"; + } + } else { + $style .= 'flex-direction: column;'; + if ( ! empty( $layout['justifyContent'] ) && array_key_exists( $layout['justifyContent'], $justify_content_options ) ) { + $style .= "align-items: {$justify_content_options[ $layout['justifyContent'] ]};"; + } + } + $style .= '}'; + + $style .= "$selector > * { margin: 0; }"; + } + + return $style; +} + /** * Renders the layout config to the block wrapper. * @@ -42,47 +142,30 @@ function wp_register_layout_support( $block_type ) { function wp_render_layout_support_flag( $block_content, $block ) { $block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] ); $support_layout = block_has_support( $block_type, array( '__experimentalLayout' ), false ); - if ( ! $support_layout || ! isset( $block['attrs']['layout'] ) ) { + + if ( ! $support_layout ) { return $block_content; } - $used_layout = $block['attrs']['layout']; + $block_gap = wp_get_global_settings( array( 'spacing', 'blockGap' ) ); + $default_layout = wp_get_global_settings( array( 'layout' ) ); + $has_block_gap_support = isset( $block_gap ) ? null !== $block_gap : false; + $default_block_layout = _wp_array_get( $block_type->supports, array( '__experimentalLayout', 'default' ), array() ); + $used_layout = isset( $block['attrs']['layout'] ) ? $block['attrs']['layout'] : $default_block_layout; if ( isset( $used_layout['inherit'] ) && $used_layout['inherit'] ) { - $tree = WP_Theme_JSON_Resolver::get_merged_data(); - $default_layout = _wp_array_get( $tree->get_settings(), array( 'layout' ) ); if ( ! $default_layout ) { return $block_content; } $used_layout = $default_layout; } - $id = uniqid(); - $content_size = isset( $used_layout['contentSize'] ) ? $used_layout['contentSize'] : null; - $wide_size = isset( $used_layout['wideSize'] ) ? $used_layout['wideSize'] : null; - - $all_max_width_value = $content_size ? $content_size : $wide_size; - $wide_max_width_value = $wide_size ? $wide_size : $content_size; - - // Make sure there is a single CSS rule, and all tags are stripped for security. - $all_max_width_value = safecss_filter_attr( explode( ';', $all_max_width_value )[0] ); - $wide_max_width_value = safecss_filter_attr( explode( ';', $wide_max_width_value )[0] ); - - $style = ''; - if ( $content_size || $wide_size ) { - $style = ".wp-container-$id > * {"; - $style .= 'max-width: ' . esc_html( $all_max_width_value ) . ';'; - $style .= 'margin-left: auto !important;'; - $style .= 'margin-right: auto !important;'; - $style .= '}'; - - $style .= ".wp-container-$id > .alignwide { max-width: " . esc_html( $wide_max_width_value ) . ';}'; - - $style .= ".wp-container-$id .alignfull { max-width: none; }"; - } - - $style .= ".wp-container-$id .alignleft { float: left; margin-right: 2em; }"; - $style .= ".wp-container-$id .alignright { float: right; margin-left: 2em; }"; - + $id = uniqid(); + $gap_value = _wp_array_get( $block, array( 'attrs', 'style', 'spacing', 'blockGap' ) ); + // Skip if gap value contains unsupported characters. + // Regex for CSS value borrowed from `safecss_filter_attr`, and used here + // because we only want to match against the value, not the CSS attribute. + $gap_value = preg_match( '%[\\\(&=}]|/\*%', $gap_value ) ? null : $gap_value; + $style = wp_get_layout_style( ".wp-container-$id", $used_layout, $has_block_gap_support, $gap_value ); // This assumes the hook only applies to blocks with a single wrapper. // I think this is a reasonable limitation for that particular hook. $content = preg_replace( @@ -92,7 +175,19 @@ function wp_render_layout_support_flag( $block_content, $block ) { 1 ); - return $content . ''; + /* + * Ideally styles should be loaded in the head, but blocks may be parsed + * after that, so loading in the footer for now. + * See https://core.trac.wordpress.org/ticket/53494. + */ + add_action( + 'wp_footer', + static function () use ( $style ) { + echo ''; + } + ); + + return $content; } // Register the block support. @@ -114,21 +209,28 @@ add_filter( 'render_block', 'wp_render_layout_support_flag', 10, 2 ); * * @param string $block_content Rendered block content. * @param array $block Block object. - * * @return string Filtered block content. */ function wp_restore_group_inner_container( $block_content, $block ) { - $group_with_inner_container_regex = '/(^\s*]*wp-block-group(\s|")[^>]*>)(\s*]*wp-block-group__inner-container(\s|")[^>]*>)((.|\S|\s)*)/'; + $tag_name = isset( $block['attrs']['tagName'] ) ? $block['attrs']['tagName'] : 'div'; + $group_with_inner_container_regex = sprintf( + '/(^\s*<%1$s\b[^>]*wp-block-group(\s|")[^>]*>)(\s*]*wp-block-group__inner-container(\s|")[^>]*>)((.|\S|\s)*)/U', + preg_quote( $tag_name, '/' ) + ); if ( 'core/group' !== $block['blockName'] || WP_Theme_JSON_Resolver::theme_has_support() || - 1 === preg_match( $group_with_inner_container_regex, $block_content ) + 1 === preg_match( $group_with_inner_container_regex, $block_content ) || + ( isset( $block['attrs']['layout']['type'] ) && 'default' !== $block['attrs']['layout']['type'] ) ) { return $block_content; } - $replace_regex = '/(^\s*]*wp-block-group[^>]*>)(.*)(<\/div>\s*$)/ms'; + $replace_regex = sprintf( + '/(^\s*<%1$s\b[^>]*wp-block-group[^>]*>)(.*)(<\/%1$s>\s*$)/ms', + preg_quote( $tag_name, '/' ) + ); $updated_content = preg_replace_callback( $replace_regex, static function( $matches ) { diff --git a/src/wp-includes/block-supports/spacing.php b/src/wp-includes/block-supports/spacing.php index 69c1b77f20..a65bae2f08 100644 --- a/src/wp-includes/block-supports/spacing.php +++ b/src/wp-includes/block-supports/spacing.php @@ -1,6 +1,9 @@ $value ) { $styles[] = sprintf( 'padding-%s: %s;', $key, $value ); } + } elseif ( null !== $padding_value ) { + $styles[] = sprintf( 'padding: %s;', $padding_value ); } } if ( $has_margin_support ) { $margin_value = _wp_array_get( $block_attributes, array( 'style', 'spacing', 'margin' ), null ); - if ( null !== $margin_value ) { + if ( is_array( $margin_value ) ) { foreach ( $margin_value as $key => $value ) { $styles[] = sprintf( 'margin-%s: %s;', $key, $value ); } + } elseif ( null !== $margin_value ) { + $styles[] = sprintf( 'margin: %s;', $margin_value ); } } @@ -68,20 +78,21 @@ function wp_apply_spacing_support( $block_type, $block_attributes ) { } /** - * Checks whether the current block type supports the spacing feature requested. + * Checks whether serialization of the current block's spacing properties should + * occur. * - * @since 5.8.0 + * @since 5.9.0 * @access private * - * @param WP_Block_Type $block_type Block type to check for support. - * @param string $feature Name of the feature to check support for. - * @param mixed $default Fallback value for feature support. Default false. - * @return bool Whether the feature is supported. + * @param WP_Block_Type $block_type Block type. + * @return bool Whether to serialize spacing support styles & classes. */ -function wp_has_spacing_feature_support( $block_type, $feature, $default = false ) { - // Check if the specific feature has been opted into individually - // via nested flag under `spacing`. - return block_has_support( $block_type, array( 'spacing', $feature ), $default ); +function wp_skip_spacing_serialization( $block_type ) { + $spacing_support = _wp_array_get( $block_type->supports, array( 'spacing' ), false ); + + return is_array( $spacing_support ) && + array_key_exists( '__experimentalSkipSerialization', $spacing_support ) && + $spacing_support['__experimentalSkipSerialization']; } // Register the block support. diff --git a/src/wp-includes/block-supports/typography.php b/src/wp-includes/block-supports/typography.php index 2d9f69e773..cf219dc493 100644 --- a/src/wp-includes/block-supports/typography.php +++ b/src/wp-includes/block-supports/typography.php @@ -28,6 +28,7 @@ function wp_register_typography_support( $block_type ) { $has_font_size_support = _wp_array_get( $typography_supports, array( 'fontSize' ), false ); $has_font_style_support = _wp_array_get( $typography_supports, array( '__experimentalFontStyle' ), false ); $has_font_weight_support = _wp_array_get( $typography_supports, array( '__experimentalFontWeight' ), false ); + $has_letter_spacing_support = _wp_array_get( $typography_supports, array( '__experimentalLetterSpacing' ), false ); $has_line_height_support = _wp_array_get( $typography_supports, array( 'lineHeight' ), false ); $has_text_decoration_support = _wp_array_get( $typography_supports, array( '__experimentalTextDecoration' ), false ); $has_text_transform_support = _wp_array_get( $typography_supports, array( '__experimentalTextTransform' ), false ); @@ -36,6 +37,7 @@ function wp_register_typography_support( $block_type ) { || $has_font_size_support || $has_font_style_support || $has_font_weight_support + || $has_letter_spacing_support || $has_line_height_support || $has_text_decoration_support || $has_text_transform_support; @@ -58,16 +60,15 @@ function wp_register_typography_support( $block_type ) { } /** - * Add CSS classes and inline styles for typography features such as font sizes + * Adds CSS classes and inline styles for typography features such as font sizes * to the incoming attributes array. This will be applied to the block markup in * the front-end. * * @since 5.6.0 * @access private * - * @param WP_Block_Type $block_type Block type. - * @param array $block_attributes Block attributes. - * + * @param WP_Block_Type $block_type Block type. + * @param array $block_attributes Block attributes. * @return array Typography CSS classes and inline styles. */ function wp_apply_typography_support( $block_type, $block_attributes ) { @@ -93,6 +94,7 @@ function wp_apply_typography_support( $block_type, $block_attributes ) { $has_font_size_support = _wp_array_get( $typography_supports, array( 'fontSize' ), false ); $has_font_style_support = _wp_array_get( $typography_supports, array( '__experimentalFontStyle' ), false ); $has_font_weight_support = _wp_array_get( $typography_supports, array( '__experimentalFontWeight' ), false ); + $has_letter_spacing_support = _wp_array_get( $typography_supports, array( '__experimentalLetterSpacing' ), false ); $has_line_height_support = _wp_array_get( $typography_supports, array( 'lineHeight' ), false ); $has_text_decoration_support = _wp_array_get( $typography_supports, array( '__experimentalTextDecoration' ), false ); $has_text_transform_support = _wp_array_get( $typography_supports, array( '__experimentalTextTransform' ), false ); @@ -102,24 +104,28 @@ function wp_apply_typography_support( $block_type, $block_attributes ) { $has_custom_font_size = isset( $block_attributes['style']['typography']['fontSize'] ); if ( $has_named_font_size ) { - $classes[] = sprintf( 'has-%s-font-size', $block_attributes['fontSize'] ); + $classes[] = sprintf( 'has-%s-font-size', _wp_to_kebab_case( $block_attributes['fontSize'] ) ); } elseif ( $has_custom_font_size ) { $styles[] = sprintf( 'font-size: %s;', $block_attributes['style']['typography']['fontSize'] ); } } if ( $has_font_family_support ) { - $has_font_family = isset( $block_attributes['style']['typography']['fontFamily'] ); - if ( $has_font_family ) { - $font_family = $block_attributes['style']['typography']['fontFamily']; - if ( strpos( $font_family, 'var:preset|font-family' ) !== false ) { - // Get the name from the string and add proper styles. - $index_to_splice = strrpos( $font_family, '|' ) + 1; - $font_family_name = substr( $font_family, $index_to_splice ); - $styles[] = sprintf( 'font-family: var(--wp--preset--font-family--%s);', $font_family_name ); - } else { - $styles[] = sprintf( 'font-family: %s;', $block_attributes['style']['typography']['fontFamily'] ); + $has_named_font_family = array_key_exists( 'fontFamily', $block_attributes ); + $has_custom_font_family = isset( $block_attributes['style']['typography']['fontFamily'] ); + + if ( $has_named_font_family ) { + $classes[] = sprintf( 'has-%s-font-family', _wp_to_kebab_case( $block_attributes['fontFamily'] ) ); + } elseif ( $has_custom_font_family ) { + // Before using classes, the value was serialized as a CSS Custom Property. + // We don't need this code path when it lands in core. + $font_family_custom = $block_attributes['style']['typography']['fontFamily']; + if ( strpos( $font_family_custom, 'var:preset|font-family' ) !== false ) { + $index_to_splice = strrpos( $font_family_custom, '|' ) + 1; + $font_family_slug = _wp_to_kebab_case( substr( $font_family_custom, $index_to_splice ) ); + $font_family_custom = sprintf( 'var(--wp--preset--font-family--%s)', $font_family_slug ); } + $styles[] = sprintf( 'font-family: %s;', $font_family_custom ); } } @@ -158,6 +164,13 @@ function wp_apply_typography_support( $block_type, $block_attributes ) { } } + if ( $has_letter_spacing_support ) { + $letter_spacing_style = wp_typography_get_css_variable_inline_style( $block_attributes, 'letterSpacing', 'letter-spacing' ); + if ( $letter_spacing_style ) { + $styles[] = $letter_spacing_style; + } + } + if ( ! empty( $classes ) ) { $attributes['class'] = implode( ' ', $classes ); } @@ -178,8 +191,7 @@ function wp_apply_typography_support( $block_type, $block_attributes ) { * @param array $attributes Block's attributes. * @param string $feature Key for the feature within the typography styles. * @param string $css_property Slug for the CSS property the inline style sets. - * - * @return string CSS inline style. + * @return string CSS inline style. */ function wp_typography_get_css_variable_inline_style( $attributes, $feature, $css_property ) { // Retrieve current attribute value or skip if not found. diff --git a/src/wp-includes/block-template-utils.php b/src/wp-includes/block-template-utils.php index 2c5b68707b..f471e374b9 100644 --- a/src/wp-includes/block-template-utils.php +++ b/src/wp-includes/block-template-utils.php @@ -1,23 +1,555 @@ 'block-templates', + 'wp_template_part' => 'block-template-parts', + ); + } + + return array( + 'wp_template' => 'templates', + 'wp_template_part' => 'parts', + ); +} + +/** + * Returns a filtered list of allowed area values for template parts. + * + * @since 5.9.0 + * + * @return array The supported template part area values. + */ +function get_allowed_block_template_part_areas() { + $default_area_definitions = array( + array( + 'area' => WP_TEMPLATE_PART_AREA_UNCATEGORIZED, + 'label' => __( 'General' ), + 'description' => __( + 'General templates often perform a specific role like displaying post content, and are not tied to any particular area.' + ), + 'icon' => 'layout', + 'area_tag' => 'div', + ), + array( + 'area' => WP_TEMPLATE_PART_AREA_HEADER, + 'label' => __( 'Header' ), + 'description' => __( + 'The Header template defines a page area that typically contains a title, logo, and main navigation.' + ), + 'icon' => 'header', + 'area_tag' => 'header', + ), + array( + 'area' => WP_TEMPLATE_PART_AREA_FOOTER, + 'label' => __( 'Footer' ), + 'description' => __( + 'The Footer template defines a page area that typically contains site credits, social links, or any other combination of blocks.' + ), + 'icon' => 'footer', + 'area_tag' => 'footer', + ), + ); + + /** + * Filters the list of allowed template part area values. + * + * @since 5.9.0 + * + * @param array $default_area_definitions An array of supported area objects. + */ + return apply_filters( 'default_wp_template_part_areas', $default_area_definitions ); +} + + +/** + * Returns a filtered list of default template types, containing their + * localized titles and descriptions. + * + * @since 5.9.0 + * + * @return array The default template types. + */ +function get_default_block_template_types() { + $default_template_types = array( + 'index' => array( + 'title' => _x( 'Index', 'Template name' ), + 'description' => __( 'Displays posts.' ), + ), + 'home' => array( + 'title' => _x( 'Home', 'Template name' ), + 'description' => __( 'Displays as the site\'s home page, or as the Posts page when a static home page isn\'t set.' ), + ), + 'front-page' => array( + 'title' => _x( 'Front Page', 'Template name' ), + 'description' => __( 'Displays as the site\'s home page.' ), + ), + 'singular' => array( + 'title' => _x( 'Singular', 'Template name' ), + 'description' => __( 'Displays a single post or page.' ), + ), + 'single' => array( + 'title' => _x( 'Single Post', 'Template name' ), + 'description' => __( 'Displays a single post.' ), + ), + 'page' => array( + 'title' => _x( 'Page', 'Template name' ), + 'description' => __( 'Displays a single page.' ), + ), + 'archive' => array( + 'title' => _x( 'Archive', 'Template name' ), + 'description' => __( 'Displays post categories, tags, and other archives.' ), + ), + 'author' => array( + 'title' => _x( 'Author', 'Template name' ), + 'description' => __( 'Displays latest posts written by a single author.' ), + ), + 'category' => array( + 'title' => _x( 'Category', 'Template name' ), + 'description' => __( 'Displays latest posts in single post category.' ), + ), + 'taxonomy' => array( + 'title' => _x( 'Taxonomy', 'Template name' ), + 'description' => __( 'Displays latest posts from a single post taxonomy.' ), + ), + 'date' => array( + 'title' => _x( 'Date', 'Template name' ), + 'description' => __( 'Displays posts from a specific date.' ), + ), + 'tag' => array( + 'title' => _x( 'Tag', 'Template name' ), + 'description' => __( 'Displays latest posts with single post tag.' ), + ), + 'attachment' => array( + 'title' => __( 'Media' ), + 'description' => __( 'Displays individual media items or attachments.' ), + ), + 'search' => array( + 'title' => _x( 'Search', 'Template name' ), + 'description' => __( 'Template used to display search results.' ), + ), + 'privacy-policy' => array( + 'title' => __( 'Privacy Policy' ), + 'description' => __( 'Displays the privacy policy page.' ), + ), + '404' => array( + 'title' => _x( '404', 'Template name' ), + 'description' => __( 'Displays when no content is found.' ), + ), + ); + + /** + * Filters the list of template types. + * + * @since 5.9.0 + * + * @param array $default_template_types An array of template types, formatted as [ slug => [ title, description ] ]. + */ + return apply_filters( 'default_template_types', $default_template_types ); +} + +/** + * Checks whether the input 'area' is a supported value. + * Returns the input if supported, otherwise returns the 'uncategorized' value. + * + * @since 5.9.0 + * @access private + * + * @param string $type Template part area name. + * + * @return string Input if supported, else the uncategorized value. + */ +function _filter_block_template_part_area( $type ) { + $allowed_areas = array_map( + static function ( $item ) { + return $item['area']; + }, + get_allowed_block_template_part_areas() + ); + if ( in_array( $type, $allowed_areas, true ) ) { + return $type; + } + + $warning_message = sprintf( + /* translators: %1$s: Template area type, %2$s: the uncategorized template area value. */ + __( '"%1$s" is not a supported wp_template_part area value and has been added as "%2$s".' ), + $type, + WP_TEMPLATE_PART_AREA_UNCATEGORIZED + ); + trigger_error( $warning_message, E_USER_NOTICE ); + return WP_TEMPLATE_PART_AREA_UNCATEGORIZED; +} + +/** + * Finds all nested template part file paths in a theme's directory. + * + * @since 5.9.0 + * @access private + * + * @param string $base_directory The theme's file path. + * @return array A list of paths to all template part files. + */ +function _get_block_templates_paths( $base_directory ) { + $path_list = array(); + if ( file_exists( $base_directory ) ) { + $nested_files = new RecursiveIteratorIterator( new RecursiveDirectoryIterator( $base_directory ) ); + $nested_html_files = new RegexIterator( $nested_files, '/^.+\.html$/i', RecursiveRegexIterator::GET_MATCH ); + foreach ( $nested_html_files as $path => $file ) { + $path_list[] = $path; + } + } + return $path_list; +} + +/** + * Retrieves the template file from the theme for a given slug. + * + * @since 5.9.0 + * @access private + * + * @param string $template_type 'wp_template' or 'wp_template_part'. + * @param string $slug Template slug. + * + * @return array|null Template. + */ +function _get_block_template_file( $template_type, $slug ) { + if ( 'wp_template' !== $template_type && 'wp_template_part' !== $template_type ) { + return null; + } + + $themes = array( + get_stylesheet() => get_stylesheet_directory(), + get_template() => get_template_directory(), + ); + foreach ( $themes as $theme_slug => $theme_dir ) { + $template_base_paths = get_block_theme_folders( $theme_slug ); + $file_path = $theme_dir . '/' . $template_base_paths[ $template_type ] . '/' . $slug . '.html'; + if ( file_exists( $file_path ) ) { + $new_template_item = array( + 'slug' => $slug, + 'path' => $file_path, + 'theme' => $theme_slug, + 'type' => $template_type, + ); + + if ( 'wp_template_part' === $template_type ) { + return _add_block_template_part_area_info( $new_template_item ); + } + + if ( 'wp_template' === $template_type ) { + return _add_block_template_info( $new_template_item ); + } + + return $new_template_item; + } + } + + return null; +} + +/** + * Retrieves the template files from the theme. + * + * @since 5.9.0 + * @access private + * + * @param string $template_type 'wp_template' or 'wp_template_part'. + * + * @return array Template. + */ +function _get_block_templates_files( $template_type ) { + if ( 'wp_template' !== $template_type && 'wp_template_part' !== $template_type ) { + return null; + } + + $themes = array( + get_stylesheet() => get_stylesheet_directory(), + get_template() => get_template_directory(), + ); + $template_files = array(); + foreach ( $themes as $theme_slug => $theme_dir ) { + $template_base_paths = get_block_theme_folders( $theme_slug ); + $theme_template_files = _get_block_templates_paths( $theme_dir . '/' . $template_base_paths[ $template_type ] ); + foreach ( $theme_template_files as $template_file ) { + $template_base_path = $template_base_paths[ $template_type ]; + $template_slug = substr( + $template_file, + // Starting position of slug. + strpos( $template_file, $template_base_path . DIRECTORY_SEPARATOR ) + 1 + strlen( $template_base_path ), + // Subtract ending '.html'. + -5 + ); + $new_template_item = array( + 'slug' => $template_slug, + 'path' => $template_file, + 'theme' => $theme_slug, + 'type' => $template_type, + ); + + if ( 'wp_template_part' === $template_type ) { + $template_files[] = _add_block_template_part_area_info( $new_template_item ); + } + + if ( 'wp_template' === $template_type ) { + $template_files[] = _add_block_template_info( $new_template_item ); + } + } + } + + return $template_files; +} + +/** + * Attempts to add custom template information to the template item. + * + * @since 5.9.0 + * @access private + * + * @param array $template_item Template to add information to (requires 'slug' field). + * @return array Template item. + */ +function _add_block_template_info( $template_item ) { + if ( ! WP_Theme_JSON_Resolver::theme_has_support() ) { + return $template_item; + } + + $theme_data = WP_Theme_JSON_Resolver::get_theme_data()->get_custom_templates(); + if ( isset( $theme_data[ $template_item['slug'] ] ) ) { + $template_item['title'] = $theme_data[ $template_item['slug'] ]['title']; + $template_item['postTypes'] = $theme_data[ $template_item['slug'] ]['postTypes']; + } + + return $template_item; +} + +/** + * Attempts to add the template part's area information to the input template. + * + * @since 5.9.0 + * @access private + * + * @param array $template_info Template to add information to (requires 'type' and 'slug' fields). + * + * @return array Template info. + */ +function _add_block_template_part_area_info( $template_info ) { + if ( WP_Theme_JSON_Resolver::theme_has_support() ) { + $theme_data = WP_Theme_JSON_Resolver::get_theme_data()->get_template_parts(); + } + + if ( isset( $theme_data[ $template_info['slug'] ]['area'] ) ) { + $template_info['title'] = $theme_data[ $template_info['slug'] ]['title']; + $template_info['area'] = _filter_block_template_part_area( $theme_data[ $template_info['slug'] ]['area'] ); + } else { + $template_info['area'] = WP_TEMPLATE_PART_AREA_UNCATEGORIZED; + } + + return $template_info; +} + +/** + * Returns an array containing the references of + * the passed blocks and their inner blocks. + * + * @since 5.9.0 + * @access private + * + * @param array $blocks array of blocks. + * + * @return array block references to the passed blocks and their inner blocks. + */ +function _flatten_blocks( &$blocks ) { + $all_blocks = array(); + $queue = array(); + foreach ( $blocks as &$block ) { + $queue[] = &$block; + } + + while ( count( $queue ) > 0 ) { + $block = &$queue[0]; + array_shift( $queue ); + $all_blocks[] = &$block; + + if ( ! empty( $block['innerBlocks'] ) ) { + foreach ( $block['innerBlocks'] as &$inner_block ) { + $queue[] = &$inner_block; + } + } + } + + return $all_blocks; +} + +/** + * Parses wp_template content and injects the active theme's + * stylesheet as a theme attribute into each wp_template_part + * + * @since 5.9.0 + * @access private + * + * @param string $template_content serialized wp_template content. + * + * @return string Updated 'wp_template' content. + */ +function _inject_theme_attribute_in_block_template_content( $template_content ) { + $has_updated_content = false; + $new_content = ''; + $template_blocks = parse_blocks( $template_content ); + + $blocks = _flatten_blocks( $template_blocks ); + foreach ( $blocks as &$block ) { + if ( + 'core/template-part' === $block['blockName'] && + ! isset( $block['attrs']['theme'] ) + ) { + $block['attrs']['theme'] = wp_get_theme()->get_stylesheet(); + $has_updated_content = true; + } + } + + if ( $has_updated_content ) { + foreach ( $template_blocks as &$block ) { + $new_content .= serialize_block( $block ); + } + + return $new_content; + } + + return $template_content; +} + +/** + * Parses a block template and removes the theme attribute from each template part. + * + * @since 5.9.0 + * @access private + * + * @param string $template_content Serialized block template content. + * @return string Updated block template content. + */ +function _remove_theme_attribute_in_block_template_content( $template_content ) { + $has_updated_content = false; + $new_content = ''; + $template_blocks = parse_blocks( $template_content ); + + $blocks = _flatten_blocks( $template_blocks ); + foreach ( $blocks as $key => $block ) { + if ( 'core/template-part' === $block['blockName'] && isset( $block['attrs']['theme'] ) ) { + unset( $blocks[ $key ]['attrs']['theme'] ); + $has_updated_content = true; + } + } + + if ( ! $has_updated_content ) { + return $template_content; + } + + foreach ( $template_blocks as $block ) { + $new_content .= serialize_block( $block ); + } + + return $new_content; +} + +/** + * Build a unified template object based on a theme file. + * + * @since 5.9.0 + * @access private + * + * @param array $template_file Theme file. + * @param string $template_type 'wp_template' or 'wp_template_part'. + * + * @return WP_Block_Template Template. + */ +function _build_block_template_result_from_file( $template_file, $template_type ) { + $default_template_types = get_default_block_template_types(); + $template_content = file_get_contents( $template_file['path'] ); + $theme = wp_get_theme()->get_stylesheet(); + + $template = new WP_Block_Template(); + $template->id = $theme . '//' . $template_file['slug']; + $template->theme = $theme; + $template->content = _inject_theme_attribute_in_block_template_content( $template_content ); + $template->slug = $template_file['slug']; + $template->source = 'theme'; + $template->type = $template_type; + $template->title = ! empty( $template_file['title'] ) ? $template_file['title'] : $template_file['slug']; + $template->status = 'publish'; + $template->has_theme_file = true; + $template->is_custom = true; + + if ( 'wp_template' === $template_type && isset( $default_template_types[ $template_file['slug'] ] ) ) { + $template->description = $default_template_types[ $template_file['slug'] ]['description']; + $template->title = $default_template_types[ $template_file['slug'] ]['title']; + $template->is_custom = false; + } + + if ( 'wp_template' === $template_type && isset( $template_file['postTypes'] ) ) { + $template->post_types = $template_file['postTypes']; + } + + if ( 'wp_template_part' === $template_type && isset( $template_file['area'] ) ) { + $template->area = $template_file['area']; + } + + return $template; +} + /** * Build a unified template object based a post Object. * + * @since 5.9.0 * @access private - * @since 5.8.0 * * @param WP_Post $post Template post. * * @return WP_Block_Template|WP_Error Template. */ -function _build_template_result_from_post( $post ) { - $terms = get_the_terms( $post, 'wp_theme' ); +function _build_block_template_result_from_post( $post ) { + $default_template_types = get_default_block_template_types(); + $terms = get_the_terms( $post, 'wp_theme' ); if ( is_wp_error( $terms ) ) { return $terms; @@ -27,7 +559,11 @@ function _build_template_result_from_post( $post ) { return new WP_Error( 'template_missing_theme', __( 'No theme is defined for this template.' ) ); } - $theme = $terms[0]->name; + $theme = $terms[0]->name; + $has_theme_file = wp_get_theme()->get_stylesheet() === $theme && + null !== _get_block_template_file( $post->post_type, $post->post_name ); + + $origin = get_post_meta( $post->ID, 'origin', true ); $template = new WP_Block_Template(); $template->wp_id = $post->ID; @@ -36,11 +572,25 @@ function _build_template_result_from_post( $post ) { $template->content = $post->post_content; $template->slug = $post->post_name; $template->source = 'custom'; + $template->origin = ! empty( $origin ) ? $origin : null; $template->type = $post->post_type; $template->description = $post->post_excerpt; $template->title = $post->post_title; $template->status = $post->post_status; - $template->has_theme_file = false; + $template->has_theme_file = $has_theme_file; + $template->is_custom = true; + $template->author = $post->post_author; + + if ( 'wp_template' === $post->post_type && isset( $default_template_types[ $template->slug ] ) ) { + $template->is_custom = false; + } + + if ( 'wp_template_part' === $post->post_type ) { + $type_terms = get_the_terms( $post, 'wp_template_part_area' ); + if ( ! is_wp_error( $type_terms ) && false !== $type_terms ) { + $template->area = $type_terms[0]->name; + } + } return $template; } @@ -50,16 +600,43 @@ function _build_template_result_from_post( $post ) { * * @since 5.8.0 * - * @param array $query { + * @param array $query { * Optional. Arguments to retrieve templates. * - * @type array $slug__in List of slugs to include. - * @type int $wp_id Post ID of customized template. + * @type array $slug__in List of slugs to include. + * @type int $wp_id Post ID of customized template. + * @type string $area A 'wp_template_part_area' taxonomy value to filter by (for wp_template_part template type only). + * @type string $post_type Post type to get the templates for. * } - * @param string $template_type Optional. The template type (post type). Default 'wp_template'. - * @return WP_Block_Template[] Block template objects. + * @param string $template_type 'wp_template' or 'wp_template_part'. + * + * @return array Templates. */ function get_block_templates( $query = array(), $template_type = 'wp_template' ) { + /** + * Filters the block templates array before the query takes place. + * + * Return a non-null value to bypass the WordPress queries. + * + * @since 5.9.0 + * + * @param WP_Block_Template[]|null $block_templates Return an array of block templates to short-circuit the default query, + * or null to allow WP to run it's normal queries. + * @param array $query { + * Optional. Arguments to retrieve templates. + * + * @type array $slug__in List of slugs to include. + * @type int $wp_id Post ID of customized template. + * @type string $post_type Post type to get the templates for. + * } + * @param string $template_type wp_template or wp_template_part. + */ + $templates = apply_filters( 'pre_get_block_templates', null, $query, $template_type ); + if ( ! is_null( $templates ) ) { + return $templates; + } + + $post_type = isset( $query['post_type'] ) ? $query['post_type'] : ''; $wp_query_args = array( 'post_status' => array( 'auto-draft', 'draft', 'publish' ), 'post_type' => $template_type, @@ -74,11 +651,20 @@ function get_block_templates( $query = array(), $template_type = 'wp_template' ) ), ); + if ( 'wp_template_part' === $template_type && isset( $query['area'] ) ) { + $wp_query_args['tax_query'][] = array( + 'taxonomy' => 'wp_template_part_area', + 'field' => 'name', + 'terms' => $query['area'], + ); + $wp_query_args['tax_query']['relation'] = 'AND'; + } + if ( isset( $query['slug__in'] ) ) { $wp_query_args['post_name__in'] = $query['slug__in']; } - // This is only needed for the regular templates CPT listing and editor. + // This is only needed for the regular templates/template parts post type listing and editor. if ( isset( $query['wp_id'] ) ) { $wp_query_args['p'] = $query['wp_id']; } else { @@ -88,14 +674,66 @@ function get_block_templates( $query = array(), $template_type = 'wp_template' ) $template_query = new WP_Query( $wp_query_args ); $query_result = array(); foreach ( $template_query->posts as $post ) { - $template = _build_template_result_from_post( $post ); + $template = _build_block_template_result_from_post( $post ); - if ( ! is_wp_error( $template ) ) { - $query_result[] = $template; + if ( is_wp_error( $template ) ) { + continue; + } + + if ( $post_type && ! $template->is_custom ) { + continue; + } + + $query_result[] = $template; + } + + if ( ! isset( $query['wp_id'] ) ) { + $template_files = _get_block_templates_files( $template_type ); + foreach ( $template_files as $template_file ) { + $template = _build_block_template_result_from_file( $template_file, $template_type ); + + if ( $post_type && ! $template->is_custom ) { + continue; + } + + if ( $post_type && + isset( $template->post_types ) && + ! in_array( $post_type, $template->post_types, true ) + ) { + continue; + } + + $is_not_custom = false === array_search( + wp_get_theme()->get_stylesheet() . '//' . $template_file['slug'], + array_column( $query_result, 'id' ), + true + ); + $fits_slug_query = + ! isset( $query['slug__in'] ) || in_array( $template_file['slug'], $query['slug__in'], true ); + $fits_area_query = + ! isset( $query['area'] ) || $template_file['area'] === $query['area']; + $should_include = $is_not_custom && $fits_slug_query && $fits_area_query; + if ( $should_include ) { + $query_result[] = $template; + } } } - return $query_result; + /** + * Filters the array of queried block templates array after they've been fetched. + * + * @since 5.9.0 + * + * @param WP_Block_Template[] $query_result Array of found block templates. + * @param array $query { + * Optional. Arguments to retrieve templates. + * + * @type array $slug__in List of slugs to include. + * @type int $wp_id Post ID of customized template. + * } + * @param string $template_type wp_template or wp_template_part. + */ + return apply_filters( 'get_block_templates', $query_result, $query, $template_type ); } /** @@ -104,10 +742,29 @@ function get_block_templates( $query = array(), $template_type = 'wp_template' ) * @since 5.8.0 * * @param string $id Template unique identifier (example: theme_slug//template_slug). - * @param string $template_type Optional. The template type (post type). Default 'wp_template'. + * @param string $template_type Optional. Template type: `'wp_template'` or '`wp_template_part'`. + * Default `'wp_template'`. + * * @return WP_Block_Template|null Template. */ function get_block_template( $id, $template_type = 'wp_template' ) { + /** + *Filters the block template object before the query takes place. + * + * Return a non-null value to bypass the WordPress queries. + * + * @since 5.9.0 + * + * @param WP_Block_Template|null $block_template Return block template object to short-circuit the default query, + * or null to allow WP to run its normal queries. + * @param string $id Template unique identifier (example: theme_slug//template_slug). + * @param string $template_type Template type: `'wp_template'` or '`wp_template_part'`. + */ + $block_template = apply_filters( 'pre_get_block_template', null, $id, $template_type ); + if ( ! is_null( $block_template ) ) { + return $block_template; + } + $parts = explode( '//', $id, 2 ); if ( count( $parts ) < 2 ) { return null; @@ -131,12 +788,168 @@ function get_block_template( $id, $template_type = 'wp_template' ) { $posts = $template_query->posts; if ( count( $posts ) > 0 ) { - $template = _build_template_result_from_post( $posts[0] ); + $template = _build_block_template_result_from_post( $posts[0] ); if ( ! is_wp_error( $template ) ) { return $template; } } - return null; + $block_template = get_block_file_template( $id, $template_type ); + + /** + * Filters the queried block template object after it's been fetched. + * + * @since 5.9.0 + * + * @param WP_Block_Template|null $block_template The found block template, or null if there isn't one. + * @param string $id Template unique identifier (example: theme_slug//template_slug). + * @param array $template_type Template type: `'wp_template'` or '`wp_template_part'`. + */ + return apply_filters( 'get_block_template', $block_template, $id, $template_type ); +} + +/** + * Retrieves a single unified template object using its id. + * + * @since 5.9.0 + * + * @param string $id Template unique identifier (example: theme_slug//template_slug). + * @param string $template_type Optional. Template type: `'wp_template'` or '`wp_template_part'`. + * Default `'wp_template'`. + * @return WP_Block_Template|null The found block template, or null if there isn't one. + */ +function get_block_file_template( $id, $template_type = 'wp_template' ) { + /** + * Filters the block templates array before the query takes place. + * + * Return a non-null value to bypass the WordPress queries. + * + * @since 5.9.0 + * + * @param WP_Block_Template|null $block_template Return block template object to short-circuit the default query, + * or null to allow WP to run its normal queries. + * @param string $id Template unique identifier (example: theme_slug//template_slug). + * @param string $template_type Template type: `'wp_template'` or '`wp_template_part'`. + */ + $block_template = apply_filters( 'pre_get_block_file_template', null, $id, $template_type ); + if ( ! is_null( $block_template ) ) { + return $block_template; + } + + $parts = explode( '//', $id, 2 ); + if ( count( $parts ) < 2 ) { + /** This filter is documented in wp-includes/block-template-utils.php */ + return apply_filters( 'get_block_file_template', null, $id, $template_type ); + } + list( $theme, $slug ) = $parts; + + if ( wp_get_theme()->get_stylesheet() !== $theme ) { + /** This filter is documented in wp-includes/block-template-utils.php */ + return apply_filters( 'get_block_file_template', null, $id, $template_type ); + } + + $template_file = _get_block_template_file( $template_type, $slug ); + if ( null === $template_file ) { + /** This filter is documented in wp-includes/block-template-utils.php */ + return apply_filters( 'get_block_file_template', null, $id, $template_type ); + } + + $block_template = _build_block_template_result_from_file( $template_file, $template_type ); + + /** + * Filters the array of queried block templates array after they've been fetched. + * + * @since 5.9.0 + * + * @param WP_Block_Template|null $block_template The found block template, or null if there is none. + * @param string $id Template unique identifier (example: theme_slug//template_slug). + * @param string $template_type Template type: `'wp_template'` or '`wp_template_part'`. + */ + return apply_filters( 'get_block_file_template', $block_template, $id, $template_type ); +} + +/** + * Print a template-part. + * + * @since 5.9.0 + * + * @param string $part The template-part to print. Use "header" or "footer". + */ +function block_template_part( $part ) { + $template_part = get_block_template( get_stylesheet() . '//' . $part, 'wp_template_part' ); + if ( ! $template_part || empty( $template_part->content ) ) { + return; + } + echo do_blocks( $template_part->content ); +} + +/** + * Print the header template-part. + * + * @since 5.9.0 + */ +function block_header_area() { + block_template_part( 'header' ); +} + +/** + * Print the footer template-part. + * + * @since 5.9.0 + */ +function block_footer_area() { + block_template_part( 'footer' ); +} + +/** + * Creates an export of the current templates and + * template parts from the site editor at the + * specified path in a ZIP file. + * + * @since 5.9.0 + * + * @return WP_Error|string Path of the ZIP file or error on failure. + */ +function wp_generate_block_templates_export_file() { + if ( ! class_exists( 'ZipArchive' ) ) { + return new WP_Error( 'missing_zip_package', __( 'Zip Export not supported.' ) ); + } + + $obscura = wp_generate_password( 12, false, false ); + $filename = get_temp_dir() . 'edit-site-export-' . $obscura . '.zip'; + + $zip = new ZipArchive(); + if ( true !== $zip->open( $filename, ZipArchive::CREATE ) ) { + return new WP_Error( 'unable_to_create_zip', __( 'Unable to open export file (archive) for writing.' ) ); + } + + $zip->addEmptyDir( 'theme' ); + $zip->addEmptyDir( 'theme/templates' ); + $zip->addEmptyDir( 'theme/parts' ); + + // Load templates into the zip file. + $templates = get_block_templates(); + foreach ( $templates as $template ) { + $template->content = _remove_theme_attribute_in_block_template_content( $template->content ); + + $zip->addFromString( + 'theme/templates/' . $template->slug . '.html', + $template->content + ); + } + + // Load template parts into the zip file. + $template_parts = get_block_templates( array(), 'wp_template_part' ); + foreach ( $template_parts as $template_part ) { + $zip->addFromString( + 'theme/parts/' . $template_part->slug . '.html', + $template_part->content + ); + } + + // Save changes to the zip file. + $zip->close(); + + return $filename; } diff --git a/src/wp-includes/block-template.php b/src/wp-includes/block-template.php index 945b96b027..7bea75dca4 100644 --- a/src/wp-includes/block-template.php +++ b/src/wp-includes/block-template.php @@ -5,6 +5,32 @@ * @package WordPress */ +/** + * Adds necessary filters to use 'wp_template' posts instead of theme template files. + * + * @access private + * @since 5.9.0 + */ +function _add_template_loader_filters() { + if ( ! current_theme_supports( 'block-templates' ) ) { + return; + } + + $template_types = array_keys( get_default_block_template_types() ); + foreach ( $template_types as $template_type ) { + // Skip 'embed' for now because it is not a regular template type. + if ( 'embed' === $template_type ) { + continue; + } + add_filter( str_replace( '-', '', $template_type ) . '_template', 'locate_block_template', 20, 3 ); + } + + // Request to resolve a template. + if ( isset( $_GET['_wp-find-template'] ) ) { + add_filter( 'pre_get_posts', '_resolve_template_for_new_post' ); + } +} + /** * Find a block template with equal or higher specificity than a given PHP template file. * @@ -22,6 +48,10 @@ function locate_block_template( $template, $type, array $templates ) { global $_wp_current_template_content; + if ( ! current_theme_supports( 'block-templates' ) ) { + return $template; + } + if ( $template ) { /* * locate_template() has found a PHP template at the path specified by $template. @@ -40,12 +70,12 @@ function locate_block_template( $template, $type, array $templates ) { ); $index = array_search( $relative_template_path, $templates, true ); - // If the template hiearchy algorithm has successfully located a PHP template file, + // If the template hierarchy algorithm has successfully located a PHP template file, // we will only consider block templates with higher or equal specificity. $templates = array_slice( $templates, 0, $index + 1 ); } - $block_template = resolve_block_template( $type, $templates ); + $block_template = resolve_block_template( $type, $templates, $template ); if ( $block_template ) { if ( empty( $block_template->content ) && is_user_logged_in() ) { @@ -92,12 +122,14 @@ function locate_block_template( $template, $type, array $templates ) { * * @access private * @since 5.8.0 + * @since 5.9.0 Added the `$fallback_template` parameter. * * @param string $template_type The current template type. * @param string[] $template_hierarchy The current template hierarchy, ordered by priority. + * @param string $fallback_template A PHP fallback template to use if no matching block template is found. * @return WP_Block_Template|null template A template object, or null if none could be found. */ -function resolve_block_template( $template_type, $template_hierarchy ) { +function resolve_block_template( $template_type, $template_hierarchy, $fallback_template ) { if ( ! $template_type ) { return null; } @@ -129,6 +161,43 @@ function resolve_block_template( $template_type, $template_hierarchy ) { } ); + $theme_base_path = get_stylesheet_directory() . DIRECTORY_SEPARATOR; + $parent_theme_base_path = get_template_directory() . DIRECTORY_SEPARATOR; + + // Is the active theme a child theme, and is the PHP fallback template part of it? + if ( + strpos( $fallback_template, $theme_base_path ) === 0 && + strpos( $fallback_template, $parent_theme_base_path ) === false + ) { + $fallback_template_slug = substr( + $fallback_template, + // Starting position of slug. + strpos( $fallback_template, $theme_base_path ) + strlen( $theme_base_path ), + // Remove '.php' suffix. + -4 + ); + + // Is our candidate block template's slug identical to our PHP fallback template's? + if ( + count( $templates ) && + $fallback_template_slug === $templates[0]->slug && + 'theme' === $templates[0]->source + ) { + // Unfortunately, we cannot trust $templates[0]->theme, since it will always + // be set to the active theme's slug by _build_block_template_result_from_file(), + // even if the block template is really coming from the active theme's parent. + // (The reason for this is that we want it to be associated with the active theme + // -- not its parent -- once we edit it and store it to the DB as a wp_template CPT.) + // Instead, we use _get_block_template_file() to locate the block template file. + $template_file = _get_block_template_file( 'wp_template', $fallback_template_slug ); + if ( $template_file && get_template() === $template_file['theme'] ) { + // The block template is part of the parent theme, so we + // have to give precedence to the child theme's PHP template. + array_shift( $templates ); + } + } + } + return count( $templates ) ? $templates[0] : null; } @@ -170,7 +239,10 @@ function get_the_block_template_html() { $content = $wp_embed->autoembed( $content ); $content = do_blocks( $content ); $content = wptexturize( $content ); + $content = convert_smilies( $content ); + $content = shortcode_unautop( $content ); $content = wp_filter_content_tags( $content ); + $content = do_shortcode( $content ); $content = str_replace( ']]>', ']]>', $content ); // Wrap block template in .wp-site-blocks to allow for specific descendant styles @@ -227,3 +299,35 @@ function _block_template_render_without_post_block_context( $context ) { return $context; } + +/** + * Sets the current WP_Query to return auto-draft posts. + * + * The auto-draft status indicates a new post, so allow the the WP_Query instance to + * return an auto-draft post for template resolution when editing a new post. + * + * @access private + * @since 5.9.0 + * + * @param WP_Query $wp_query Current WP_Query instance, passed by reference. + */ +function _resolve_template_for_new_post( $wp_query ) { + remove_filter( 'pre_get_posts', '_resolve_template_for_new_post' ); + + // Pages. + $page_id = isset( $wp_query->query['page_id'] ) ? $wp_query->query['page_id'] : null; + + // Posts, including custom post types. + $p = isset( $wp_query->query['p'] ) ? $wp_query->query['p'] : null; + + $post_id = $page_id ? $page_id : $p; + $post = get_post( $post_id ); + + if ( + $post && + 'auto-draft' === $post->post_status && + current_user_can( 'edit_post', $post->ID ) + ) { + $wp_query->set( 'post_status', 'auto-draft' ); + } +} diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php index 97c292d875..28e269c1d9 100644 --- a/src/wp-includes/blocks.php +++ b/src/wp-includes/blocks.php @@ -83,9 +83,11 @@ function register_block_script_handle( $metadata, $field_name ) { } $script_handle = generate_block_asset_handle( $metadata['name'], $field_name ); - $script_asset_path = realpath( - dirname( $metadata['file'] ) . '/' . - substr_replace( $script_path, '.asset.php', - strlen( '.js' ) ) + $script_asset_path = wp_normalize_path( + realpath( + dirname( $metadata['file'] ) . '/' . + substr_replace( $script_path, '.asset.php', - strlen( '.js' ) ) + ) ); if ( ! file_exists( $script_asset_path ) ) { _doing_it_wrong( @@ -100,9 +102,13 @@ function register_block_script_handle( $metadata, $field_name ) { ); return false; } - $is_core_block = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], ABSPATH . WPINC ); + // Path needs to be normalized to work in Windows env. + $wpinc_path_norm = wp_normalize_path( ABSPATH . WPINC ); + $script_path_norm = wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $script_path ) ); + $is_core_block = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], $wpinc_path_norm ); + $script_uri = $is_core_block ? - includes_url( str_replace( ABSPATH . WPINC, '', realpath( dirname( $metadata['file'] ) . '/' . $script_path ) ) ) : + includes_url( str_replace( $wpinc_path_norm, '', $script_path_norm ) ) : plugins_url( $script_path, $metadata['file'] ); $script_asset = require $script_asset_path; $script_dependencies = isset( $script_asset['dependencies'] ) ? $script_asset['dependencies'] : array(); @@ -139,7 +145,8 @@ function register_block_style_handle( $metadata, $field_name ) { if ( empty( $metadata[ $field_name ] ) ) { return false; } - $is_core_block = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], ABSPATH . WPINC ); + $wpinc_path_norm = wp_normalize_path( ABSPATH . WPINC ); + $is_core_block = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], $wpinc_path_norm ); if ( $is_core_block && ! wp_should_load_separate_core_block_assets() ) { return false; } @@ -232,7 +239,7 @@ function register_block_type_from_metadata( $file_or_folder, $args = array() ) { if ( ! is_array( $metadata ) || empty( $metadata['name'] ) ) { return false; } - $metadata['file'] = $metadata_file; + $metadata['file'] = wp_normalize_path( $metadata_file ); /** * Filters the metadata provided for registering a block type. @@ -1146,3 +1153,178 @@ function build_query_vars_from_query_block( $block, $page ) { } return $query; } + +/** + * Helper function that returns the proper pagination arrow html for + * `QueryPaginationNext` and `QueryPaginationPrevious` blocks based + * on the provided `paginationArrow` from `QueryPagination` context. + * + * It's used in QueryPaginationNext and QueryPaginationPrevious blocks. + * + * @since 5.9.0 + * + * @param WP_Block $block Block instance. + * @param boolean $is_next Flag for handling `next/previous` blocks. + * + * @return string|null Returns the constructed WP_Query arguments. + */ +function get_query_pagination_arrow( $block, $is_next ) { + $arrow_map = array( + 'none' => '', + 'arrow' => array( + 'next' => '→', + 'previous' => '←', + ), + 'chevron' => array( + 'next' => '»', + 'previous' => '«', + ), + ); + if ( ! empty( $block->context['paginationArrow'] ) && array_key_exists( $block->context['paginationArrow'], $arrow_map ) && ! empty( $arrow_map[ $block->context['paginationArrow'] ] ) ) { + $pagination_type = $is_next ? 'next' : 'previous'; + $arrow_attribute = $block->context['paginationArrow']; + $arrow = $arrow_map[ $block->context['paginationArrow'] ][ $pagination_type ]; + $arrow_classes = "wp-block-query-pagination-$pagination_type-arrow is-arrow-$arrow_attribute"; + return "$arrow"; + } + return null; +} + +/** + * Enqueues a stylesheet for a specific block. + * + * If the theme has opted-in to separate-styles loading, + * then the stylesheet will be enqueued on-render, + * otherwise when the block inits. + * + * @since 5.9.0 + * + * @param string $block_name The block-name, including namespace. + * @param array $args An array of arguments [handle,src,deps,ver,media]. + * @return void + */ +function wp_enqueue_block_style( $block_name, $args ) { + $args = wp_parse_args( + $args, + array( + 'handle' => '', + 'src' => '', + 'deps' => array(), + 'ver' => false, + 'media' => 'all', + ) + ); + + /** + * Callback function to register and enqueue styles. + * + * @param string $content When the callback is used for the render_block filter, + * the content needs to be returned so the function parameter + * is to ensure the content exists. + * @return string Block content. + */ + $callback = static function( $content ) use ( $args ) { + // Register the stylesheet. + if ( ! empty( $args['src'] ) ) { + wp_register_style( $args['handle'], $args['src'], $args['deps'], $args['ver'], $args['media'] ); + } + + // Add `path` data if provided. + if ( isset( $args['path'] ) ) { + wp_style_add_data( $args['handle'], 'path', $args['path'] ); + + // Get the RTL file path. + $rtl_file_path = str_replace( '.css', '-rtl.css', $args['path'] ); + + // Add RTL stylesheet. + if ( file_exists( $rtl_file_path ) ) { + wp_style_add_data( $args['handle'], 'rtl', 'replace' ); + + if ( is_rtl() ) { + wp_style_add_data( $args['handle'], 'path', $rtl_file_path ); + } + } + } + + // Enqueue the stylesheet. + wp_enqueue_style( $args['handle'] ); + + return $content; + }; + + $hook = did_action( 'wp_enqueue_scripts' ) ? 'wp_footer' : 'wp_enqueue_scripts'; + if ( wp_should_load_separate_core_block_assets() ) { + /** + * Callback function to register and enqueue styles. + * + * @param string $content The block content. + * @param array $block The full block, including name and attributes. + * @return string Block content. + */ + $callback_separate = static function( $content, $block ) use ( $block_name, $callback ) { + if ( ! empty( $block['blockName'] ) && $block_name === $block['blockName'] ) { + return $callback( $content ); + } + return $content; + }; + + /* + * The filter's callback here is an anonymous function because + * using a named function in this case is not possible. + * + * The function cannot be unhooked, however, users are still able + * to dequeue the stylesheets registered/enqueued by the callback + * which is why in this case, using an anonymous function + * was deemed acceptable. + */ + add_filter( 'render_block', $callback_separate, 10, 2 ); + return; + } + + /* + * The filter's callback here is an anonymous function because + * using a named function in this case is not possible. + * + * The function cannot be unhooked, however, users are still able + * to dequeue the stylesheets registered/enqueued by the callback + * which is why in this case, using an anonymous function + * was deemed acceptable. + */ + add_filter( $hook, $callback ); + + // Enqueue assets in the editor. + add_action( 'enqueue_block_assets', $callback ); +} + +/** + * Allow multiple block styles. + * + * @since 5.9.0 + * + * @param array $metadata Metadata for registering a block type. + * @return array Metadata for registering a block type. + */ +function _wp_multiple_block_styles( $metadata ) { + foreach ( array( 'style', 'editorStyle' ) as $key ) { + if ( ! empty( $metadata[ $key ] ) && is_array( $metadata[ $key ] ) ) { + $default_style = array_shift( $metadata[ $key ] ); + foreach ( $metadata[ $key ] as $handle ) { + $args = array( 'handle' => $handle ); + if ( 0 === strpos( $handle, 'file:' ) && isset( $metadata['file'] ) ) { + $style_path = remove_block_asset_path_prefix( $handle ); + $args = array( + 'handle' => sanitize_key( "{$metadata['name']}-{$style_path}" ), + 'src' => plugins_url( $style_path, $metadata['file'] ), + ); + } + + wp_enqueue_block_style( $metadata['name'], $args ); + } + + // Only return the 1st item in the array. + $metadata[ $key ] = $default_style; + } + } + return $metadata; +} +add_filter( 'block_type_metadata', '_wp_multiple_block_styles' ); diff --git a/src/wp-includes/blocks/archives.php b/src/wp-includes/blocks/archives.php index 7b51169e21..2f4ad1045a 100644 --- a/src/wp-includes/blocks/archives.php +++ b/src/wp-includes/blocks/archives.php @@ -40,6 +40,10 @@ function render_block_core_archives( $attributes ) { $archives = wp_get_archives( $dropdown_args ); + $classnames = esc_attr( $class ); + + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) ); + switch ( $dropdown_args['type'] ) { case 'yearly': $label = __( 'Select Year' ); @@ -60,13 +64,13 @@ function render_block_core_archives( $attributes ) { $label = esc_html( $label ); - $block_content = ' + $block_content = ' '; return sprintf( - '
%2$s
', - esc_attr( $class ), + '
%2$s
', + $wrapper_attributes, $block_content ); } diff --git a/src/wp-includes/blocks/button/block.json b/src/wp-includes/blocks/button/block.json index f2e4a52deb..99119b6d1d 100644 --- a/src/wp-includes/blocks/button/block.json +++ b/src/wp-includes/blocks/button/block.json @@ -63,9 +63,19 @@ }, "typography": { "fontSize": true, - "__experimentalFontFamily": true + "__experimentalFontFamily": true, + "__experimentalDefaultControls": { + "fontSize": true + } }, "reusable": false, + "spacing": { + "__experimentalSkipSerialization": true, + "padding": [ "horizontal", "vertical" ], + "__experimentalDefaultControls": { + "padding": true + } + }, "__experimentalBorder": { "radius": true, "__experimentalSkipSerialization": true diff --git a/src/wp-includes/blocks/buttons/block.json b/src/wp-includes/blocks/buttons/block.json index 74eed0a4a0..818d4d20e9 100644 --- a/src/wp-includes/blocks/buttons/block.json +++ b/src/wp-includes/blocks/buttons/block.json @@ -6,18 +6,24 @@ "description": "Prompt visitors to take action with a group of button-style links.", "keywords": [ "link" ], "textdomain": "default", - "attributes": { - "contentJustification": { - "type": "string" - }, - "orientation": { - "type": "string", - "default": "horizontal" - } - }, "supports": { "anchor": true, - "align": [ "wide", "full" ] + "align": [ "wide", "full" ], + "__experimentalExposeControlsToChildren": true, + "spacing": { + "blockGap": true, + "margin": ["top", "bottom" ], + "__experimentalDefaultControls": { + "blockGap": true + } + }, + "__experimentalLayout": { + "allowSwitching": false, + "allowInheriting": false, + "default": { + "type": "flex" + } + } }, "editorStyle": "wp-block-buttons-editor", "style": "wp-block-buttons" diff --git a/src/wp-includes/blocks/calendar.php b/src/wp-includes/blocks/calendar.php index 6e0c52886a..3e0e48c65b 100644 --- a/src/wp-includes/blocks/calendar.php +++ b/src/wp-includes/blocks/calendar.php @@ -15,6 +15,15 @@ function render_block_core_calendar( $attributes ) { global $monthnum, $year; + // Calendar shouldn't be rendered + // when there are no published posts on the site. + if ( ! block_core_calendar_has_published_posts() ) { + if ( is_user_logged_in() ) { + return '
' . __( 'The calendar block is hidden because there are no published posts.' ) . '
'; + } + return ''; + } + $previous_monthnum = $monthnum; $previous_year = $year; @@ -59,3 +68,90 @@ function register_block_core_calendar() { } add_action( 'init', 'register_block_core_calendar' ); + +/** + * Returns whether or not there are any published posts. + * + * Used to hide the calendar block when there are no published posts. + * This compensates for a known Core bug: https://core.trac.wordpress.org/ticket/12016 + * + * @return bool Has any published posts or not. + */ +function block_core_calendar_has_published_posts() { + // Multisite already has an option that stores the count of the published posts. + // Let's use that for multisites. + if ( is_multisite() ) { + return 0 < (int) get_option( 'post_count' ); + } + + // On single sites we try our own cached option first. + $has_published_posts = get_option( 'wp_calendar_block_has_published_posts', null ); + if ( null !== $has_published_posts ) { + return (bool) $has_published_posts; + } + + // No cache hit, let's update the cache and return the cached value. + return block_core_calendar_update_has_published_posts(); +} + +/** + * Queries the database for any published post and saves + * a flag whether any published post exists or not. + * + * @return bool Has any published posts or not. + */ +function block_core_calendar_update_has_published_posts() { + global $wpdb; + $has_published_posts = (bool) $wpdb->get_var( "SELECT 1 as test FROM {$wpdb->posts} WHERE post_type = 'post' AND post_status = 'publish' LIMIT 1" ); + update_option( 'wp_calendar_block_has_published_posts', $has_published_posts ); + return $has_published_posts; +} + +/** + * Handler for updating the has published posts flag when a post is deleted. + * + * @param int $post_id Deleted post ID. + */ +function block_core_calendar_update_has_published_post_on_delete( $post_id ) { + if ( is_multisite() ) { + return; + } + + $post = get_post( $post_id ); + + if ( ! $post || 'publish' !== $post->post_status || 'post' !== $post->post_type ) { + return; + } + + block_core_calendar_update_has_published_posts(); +} + +/** + * Handler for updating the has published posts flag when a post status changes. + * + * @param string $new_status The status the post is changing to. + * @param string $old_status The status the post is changing from. + * @param WP_Post $post Post object. + */ +function block_core_calendar_update_has_published_post_on_transition_post_status( $new_status, $old_status, $post ) { + if ( is_multisite() ) { + return; + } + + if ( $new_status === $old_status ) { + return; + } + + if ( 'post' !== get_post_type( $post ) ) { + return; + } + + if ( 'publish' !== $new_status && 'publish' !== $old_status ) { + return; + } + + block_core_calendar_update_has_published_posts(); +} + +add_action( 'delete_post', 'block_core_calendar_update_has_published_post_on_delete' ); +add_action( 'transition_post_status', 'block_core_calendar_update_has_published_post_on_transition_post_status', 10, 3 ); diff --git a/src/wp-includes/blocks/categories.php b/src/wp-includes/blocks/categories.php index 3cffff9551..5492712d51 100644 --- a/src/wp-includes/blocks/categories.php +++ b/src/wp-includes/blocks/categories.php @@ -23,6 +23,9 @@ function render_block_core_categories( $attributes ) { 'show_count' => ! empty( $attributes['showPostCounts'] ), 'title_li' => '', ); + if ( ! empty( $attributes['showOnlyTopLevel'] ) && $attributes['showOnlyTopLevel'] ) { + $args['parent'] = 0; + } if ( ! empty( $attributes['displayAsDropdown'] ) ) { $id = 'wp-block-categories-' . $block_id; diff --git a/src/wp-includes/blocks/categories/block.json b/src/wp-includes/blocks/categories/block.json index b238df4203..448b27c9cc 100644 --- a/src/wp-includes/blocks/categories/block.json +++ b/src/wp-includes/blocks/categories/block.json @@ -17,6 +17,10 @@ "showPostCounts": { "type": "boolean", "default": false + }, + "showOnlyTopLevel": { + "type": "boolean", + "default": false } }, "supports": { diff --git a/src/wp-includes/blocks/code/block.json b/src/wp-includes/blocks/code/block.json index 8ea75ed6da..992058d12f 100644 --- a/src/wp-includes/blocks/code/block.json +++ b/src/wp-includes/blocks/code/block.json @@ -14,8 +14,32 @@ }, "supports": { "anchor": true, + "__experimentalSelector": ".wp-block-code > code", "typography": { - "fontSize": true + "fontSize": true, + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true + } + }, + "spacing": { + "margin": [ "top", "bottom" ], + "padding": true + }, + "__experimentalBorder": { + "radius": true, + "color": true, + "width": true, + "style": true + }, + "color": { + "text": true, + "background": true, + "gradients": true } }, "style": "wp-block-code" diff --git a/src/wp-includes/blocks/column/block.json b/src/wp-includes/blocks/column/block.json index 00e443b0ec..44ef3438b2 100644 --- a/src/wp-includes/blocks/column/block.json +++ b/src/wp-includes/blocks/column/block.json @@ -13,7 +13,11 @@ "width": { "type": "string" }, + "allowedBlocks": { + "type": "array" + }, "templateLock": { + "type": [ "string", "boolean" ], "enum": [ "all", "insert", false ] } }, @@ -26,7 +30,10 @@ "link": true }, "spacing": { - "padding": true + "padding": true, + "__experimentalDefaultControls": { + "padding": true + } } } } diff --git a/src/wp-includes/blocks/columns/block.json b/src/wp-includes/blocks/columns/block.json index f3bc49d3d2..38dc5db74e 100644 --- a/src/wp-includes/blocks/columns/block.json +++ b/src/wp-includes/blocks/columns/block.json @@ -3,11 +3,15 @@ "name": "core/columns", "title": "Columns", "category": "design", - "description": "Add a block that displays content in multiple columns, then add whatever content blocks you’d like.", + "description": "Display content in multiple columns, with blocks added to each column.", "textdomain": "default", "attributes": { "verticalAlignment": { "type": "string" + }, + "isStackedOnMobile": { + "type": "boolean", + "default": true } }, "supports": { @@ -17,6 +21,13 @@ "color": { "gradients": true, "link": true + }, + "spacing": { + "margin": [ "top", "bottom" ], + "padding": true, + "__experimentalDefaultControls": { + "padding": true + } } }, "editorStyle": "wp-block-columns-editor", diff --git a/src/wp-includes/blocks/cover/block.json b/src/wp-includes/blocks/cover/block.json index 3b3ad5d804..aa00d40341 100644 --- a/src/wp-includes/blocks/cover/block.json +++ b/src/wp-includes/blocks/cover/block.json @@ -12,6 +12,13 @@ "id": { "type": "number" }, + "alt": { + "type": "string", + "source": "attribute", + "selector": "img", + "attribute": "alt", + "default": "" + }, "hasParallax": { "type": "boolean", "default": false @@ -22,7 +29,7 @@ }, "dimRatio": { "type": "number", - "default": 50 + "default": 100 }, "overlayColor": { "type": "string" @@ -51,6 +58,17 @@ }, "contentPosition": { "type": "string" + }, + "isDark": { + "type": "boolean", + "default": true + }, + "allowedBlocks": { + "type": "array" + }, + "templateLock": { + "type": [ "string", "boolean" ], + "enum": [ "all", "insert", false ] } }, "supports": { @@ -58,7 +76,10 @@ "align": true, "html": false, "spacing": { - "padding": true + "padding": true, + "__experimentalDefaultControls": { + "padding": true + } }, "color": { "__experimentalDuotone": "> .wp-block-cover__image-background, > .wp-block-cover__video-background", diff --git a/src/wp-includes/blocks/embed/block.json b/src/wp-includes/blocks/embed/block.json index cc0cb64c03..ae46421963 100644 --- a/src/wp-includes/blocks/embed/block.json +++ b/src/wp-includes/blocks/embed/block.json @@ -3,7 +3,7 @@ "name": "core/embed", "title": "Embed", "category": "embed", - "description": "Add a block that displays content pulled from other sites, like Twitter, Instagram or YouTube.", + "description": "Add a block that displays content pulled from other sites, like Twitter or YouTube.", "textdomain": "default", "attributes": { "url": { diff --git a/src/wp-includes/blocks/file/block.json b/src/wp-includes/blocks/file/block.json index b7cfe76507..2d01180d82 100644 --- a/src/wp-includes/blocks/file/block.json +++ b/src/wp-includes/blocks/file/block.json @@ -13,6 +13,12 @@ "href": { "type": "string" }, + "fileId": { + "type": "string", + "source": "attribute", + "selector": "a:not([download])", + "attribute": "id" + }, "fileName": { "type": "string", "source": "html", diff --git a/src/wp-includes/blocks/gallery.php b/src/wp-includes/blocks/gallery.php new file mode 100644 index 0000000000..ac30d58e22 --- /dev/null +++ b/src/wp-includes/blocks/gallery.php @@ -0,0 +1,51 @@ + $inner_block ) { + if ( 'core/image' === $inner_block['blockName'] ) { + if ( ! isset( $parsed_block['innerBlocks'][ $key ]['attrs']['data-id'] ) && isset( $inner_block['attrs']['id'] ) ) { + $parsed_block['innerBlocks'][ $key ]['attrs']['data-id'] = esc_attr( $inner_block['attrs']['id'] ); + } + } + } + } + + return $parsed_block; +} + +add_filter( 'render_block_data', 'block_core_gallery_data_id_backcompatibility' ); + +/** + * Registers the `core/gallery` block on server. + * This render callback needs to be here + * so that the gallery styles are loaded in block-based themes. + */ +function register_block_core_gallery() { + register_block_type_from_metadata( + __DIR__ . '/gallery', + array( + 'render_callback' => function ( $attributes, $content ) { + return $content; + }, + ) + ); +} + +add_action( 'init', 'register_block_core_gallery' ); diff --git a/src/wp-includes/blocks/gallery/block.json b/src/wp-includes/blocks/gallery/block.json index a87edb1eda..f5b3d317ec 100644 --- a/src/wp-includes/blocks/gallery/block.json +++ b/src/wp-includes/blocks/gallery/block.json @@ -58,6 +58,13 @@ }, "default": [] }, + "shortCodeTransforms": { + "type": "array", + "default": [], + "items": { + "type": "object" + } + }, "columns": { "type": "number", "minimum": 1, @@ -72,14 +79,30 @@ "type": "boolean", "default": true }, + "fixedHeight": { + "type": "boolean", + "default": true + }, + "linkTarget": { + "type": "string" + }, "linkTo": { "type": "string" }, "sizeSlug": { "type": "string", "default": "large" + }, + "allowResize": { + "type": "boolean", + "default": false } }, + "providesContext": { + "allowResize": "allowResize", + "imageCrop": "imageCrop", + "fixedHeight": "fixedHeight" + }, "supports": { "anchor": true, "align": true diff --git a/src/wp-includes/blocks/group/block.json b/src/wp-includes/blocks/group/block.json index b12fb40043..7921b74ffd 100644 --- a/src/wp-includes/blocks/group/block.json +++ b/src/wp-includes/blocks/group/block.json @@ -12,6 +12,7 @@ "default": "div" }, "templateLock": { + "type": [ "string", "boolean" ], "enum": [ "all", "insert", false ] } }, @@ -24,7 +25,12 @@ "link": true }, "spacing": { - "padding": true + "padding": true, + "blockGap": true, + "__experimentalDefaultControls": { + "padding": true, + "blockGap": true + } }, "__experimentalBorder": { "color": true, diff --git a/src/wp-includes/blocks/heading/block.json b/src/wp-includes/blocks/heading/block.json index 69ec1ba374..b09baa78d4 100644 --- a/src/wp-includes/blocks/heading/block.json +++ b/src/wp-includes/blocks/heading/block.json @@ -32,13 +32,25 @@ "color": { "link": true }, + "spacing": { + "margin": true + }, "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontWeight": true + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true, + "fontAppearance": true, + "textTransform": true + } }, "__experimentalSelector": "h1,h2,h3,h4,h5,h6", - "__unstablePasteTextInline": true + "__unstablePasteTextInline": true, + "__experimentalSlashInserter": true }, "editorStyle": "wp-block-heading-editor", "style": "wp-block-heading" diff --git a/src/wp-includes/blocks/image.php b/src/wp-includes/blocks/image.php new file mode 100644 index 0000000000..f8f7066a97 --- /dev/null +++ b/src/wp-includes/blocks/image.php @@ -0,0 +1,42 @@ + 'render_block_core_image', + ) + ); +} +add_action( 'init', 'register_block_core_image' ); diff --git a/src/wp-includes/blocks/image/block.json b/src/wp-includes/blocks/image/block.json index 9cb1901028..b603b41a8c 100644 --- a/src/wp-includes/blocks/image/block.json +++ b/src/wp-includes/blocks/image/block.json @@ -3,6 +3,7 @@ "name": "core/image", "title": "Image", "category": "media", + "usesContext": [ "allowResize", "imageCrop", "fixedHeight" ], "description": "Insert an image to make a visual statement.", "keywords": [ "img", "photo", "picture" ], "textdomain": "default", diff --git a/src/wp-includes/blocks/index.php b/src/wp-includes/blocks/index.php index b702cdf03c..f7382b1e9a 100644 --- a/src/wp-includes/blocks/index.php +++ b/src/wp-includes/blocks/index.php @@ -11,32 +11,43 @@ require ABSPATH . WPINC . '/blocks/block.php'; require ABSPATH . WPINC . '/blocks/calendar.php'; require ABSPATH . WPINC . '/blocks/categories.php'; require ABSPATH . WPINC . '/blocks/file.php'; +require ABSPATH . WPINC . '/blocks/gallery.php'; +require ABSPATH . WPINC . '/blocks/image.php'; require ABSPATH . WPINC . '/blocks/latest-comments.php'; require ABSPATH . WPINC . '/blocks/latest-posts.php'; require ABSPATH . WPINC . '/blocks/legacy-widget.php'; require ABSPATH . WPINC . '/blocks/loginout.php'; +require ABSPATH . WPINC . '/blocks/navigation-link.php'; +require ABSPATH . WPINC . '/blocks/navigation-submenu.php'; +require ABSPATH . WPINC . '/blocks/navigation.php'; require ABSPATH . WPINC . '/blocks/page-list.php'; +require ABSPATH . WPINC . '/blocks/pattern.php'; +require ABSPATH . WPINC . '/blocks/post-author.php'; +require ABSPATH . WPINC . '/blocks/post-comments.php'; require ABSPATH . WPINC . '/blocks/post-content.php'; require ABSPATH . WPINC . '/blocks/post-date.php'; require ABSPATH . WPINC . '/blocks/post-excerpt.php'; require ABSPATH . WPINC . '/blocks/post-featured-image.php'; +require ABSPATH . WPINC . '/blocks/post-navigation-link.php'; +require ABSPATH . WPINC . '/blocks/post-template.php'; require ABSPATH . WPINC . '/blocks/post-terms.php'; require ABSPATH . WPINC . '/blocks/post-title.php'; -require ABSPATH . WPINC . '/blocks/post-template.php'; -require ABSPATH . WPINC . '/blocks/query.php'; -require ABSPATH . WPINC . '/blocks/query-pagination.php'; require ABSPATH . WPINC . '/blocks/query-pagination-next.php'; require ABSPATH . WPINC . '/blocks/query-pagination-numbers.php'; require ABSPATH . WPINC . '/blocks/query-pagination-previous.php'; +require ABSPATH . WPINC . '/blocks/query-pagination.php'; require ABSPATH . WPINC . '/blocks/query-title.php'; +require ABSPATH . WPINC . '/blocks/query.php'; require ABSPATH . WPINC . '/blocks/rss.php'; require ABSPATH . WPINC . '/blocks/search.php'; require ABSPATH . WPINC . '/blocks/shortcode.php'; -require ABSPATH . WPINC . '/blocks/site-tagline.php'; require ABSPATH . WPINC . '/blocks/site-logo.php'; +require ABSPATH . WPINC . '/blocks/site-tagline.php'; require ABSPATH . WPINC . '/blocks/site-title.php'; require ABSPATH . WPINC . '/blocks/social-link.php'; require ABSPATH . WPINC . '/blocks/tag-cloud.php'; +require ABSPATH . WPINC . '/blocks/template-part.php'; +require ABSPATH . WPINC . '/blocks/term-description.php'; /** * Registers core block types using metadata files. @@ -55,11 +66,9 @@ function register_core_block_types_from_metadata() { 'cover', 'embed', 'freeform', - 'gallery', 'group', 'heading', 'html', - 'image', 'list', 'media-text', 'missing', diff --git a/src/wp-includes/blocks/latest-comments.php b/src/wp-includes/blocks/latest-comments.php index 6343a46d0b..3e649bbf5f 100644 --- a/src/wp-includes/blocks/latest-comments.php +++ b/src/wp-includes/blocks/latest-comments.php @@ -42,14 +42,15 @@ function wp_latest_comments_draft_or_post_title( $post = 0 ) { */ function render_block_core_latest_comments( $attributes = array() ) { $comments = get_comments( - // This filter is documented in wp-includes/widgets/class-wp-widget-recent-comments.php. + /** This filter is documented in wp-includes/widgets/class-wp-widget-recent-comments.php */ apply_filters( 'widget_comments_args', array( 'number' => $attributes['commentsToShow'], 'status' => 'approve', 'post_status' => 'publish', - ) + ), + array() ) ); diff --git a/src/wp-includes/blocks/legacy-widget.php b/src/wp-includes/blocks/legacy-widget.php index e827f8f7c5..0d4e733d4c 100644 --- a/src/wp-includes/blocks/legacy-widget.php +++ b/src/wp-includes/blocks/legacy-widget.php @@ -108,6 +108,33 @@ function handle_legacy_widget_preview_iframe() { padding: 0 !important; margin: 0 !important; } + + /* Hide root level text nodes */ + body { + font-size: 0 !important; + } + + /* Hide non-widget elements */ + body *:not(#page):not(#content):not(.widget):not(.widget *) { + display: none !important; + font-size: 0 !important; + height: 0 !important; + left: -9999px !important; + max-height: 0 !important; + max-width: 0 !important; + opacity: 0 !important; + pointer-events: none !important; + position: absolute !important; + top: -9999px !important; + transform: translate(-9999px, -9999px) !important; + visibility: hidden !important; + z-index: -999 !important; + } + + /* Restore widget font-size */ + .widget { + font-size: var(--global--font-size-base); + } > diff --git a/src/wp-includes/blocks/list/block.json b/src/wp-includes/blocks/list/block.json index 278dbad0d0..c82710f08d 100644 --- a/src/wp-includes/blocks/list/block.json +++ b/src/wp-includes/blocks/list/block.json @@ -39,13 +39,23 @@ "className": false, "typography": { "fontSize": true, - "__experimentalFontFamily": true + "__experimentalFontFamily": true, + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true + } }, "color": { - "gradients": true + "gradients": true, + "link": true }, "__unstablePasteTextInline": true, - "__experimentalSelector": "ol,ul" + "__experimentalSelector": "ol,ul", + "__experimentalSlashInserter": true }, "editorStyle": "wp-block-list-editor", "style": "wp-block-list" diff --git a/src/wp-includes/blocks/loginout.php b/src/wp-includes/blocks/loginout.php index c9c23cf90b..ac10ced20f 100644 --- a/src/wp-includes/blocks/loginout.php +++ b/src/wp-includes/blocks/loginout.php @@ -38,7 +38,7 @@ function render_block_core_loginout( $attributes ) { } /** - * Registers the `core/latest-posts` block on server. + * Registers the `core/loginout` block on server. */ function register_block_core_loginout() { register_block_type_from_metadata( diff --git a/src/wp-includes/blocks/navigation-link.php b/src/wp-includes/blocks/navigation-link.php new file mode 100644 index 0000000000..aa6a5d57e1 --- /dev/null +++ b/src/wp-includes/blocks/navigation-link.php @@ -0,0 +1,350 @@ + array(), + 'inline_styles' => '', + ); + + $is_sub_menu = isset( $attributes['isTopLevelLink'] ) ? ( ! $attributes['isTopLevelLink'] ) : false; + + // Text color. + $named_text_color = null; + $custom_text_color = null; + + if ( $is_sub_menu && array_key_exists( 'customOverlayTextColor', $context ) ) { + $custom_text_color = $context['customOverlayTextColor']; + } elseif ( $is_sub_menu && array_key_exists( 'overlayTextColor', $context ) ) { + $named_text_color = $context['overlayTextColor']; + } elseif ( array_key_exists( 'customTextColor', $context ) ) { + $custom_text_color = $context['customTextColor']; + } elseif ( array_key_exists( 'textColor', $context ) ) { + $named_text_color = $context['textColor']; + } elseif ( isset( $context['style']['color']['text'] ) ) { + $custom_text_color = $context['style']['color']['text']; + } + + // If has text color. + if ( ! is_null( $named_text_color ) ) { + // Add the color class. + array_push( $colors['css_classes'], 'has-text-color', sprintf( 'has-%s-color', $named_text_color ) ); + } elseif ( ! is_null( $custom_text_color ) ) { + // Add the custom color inline style. + $colors['css_classes'][] = 'has-text-color'; + $colors['inline_styles'] .= sprintf( 'color: %s;', $custom_text_color ); + } + + // Background color. + $named_background_color = null; + $custom_background_color = null; + + if ( $is_sub_menu && array_key_exists( 'customOverlayBackgroundColor', $context ) ) { + $custom_background_color = $context['customOverlayBackgroundColor']; + } elseif ( $is_sub_menu && array_key_exists( 'overlayBackgroundColor', $context ) ) { + $named_background_color = $context['overlayBackgroundColor']; + } elseif ( array_key_exists( 'customBackgroundColor', $context ) ) { + $custom_background_color = $context['customBackgroundColor']; + } elseif ( array_key_exists( 'backgroundColor', $context ) ) { + $named_background_color = $context['backgroundColor']; + } elseif ( isset( $context['style']['color']['background'] ) ) { + $custom_background_color = $context['style']['color']['background']; + } + + // If has background color. + if ( ! is_null( $named_background_color ) ) { + // Add the background-color class. + array_push( $colors['css_classes'], 'has-background', sprintf( 'has-%s-background-color', $named_background_color ) ); + } elseif ( ! is_null( $custom_background_color ) ) { + // Add the custom background-color inline style. + $colors['css_classes'][] = 'has-background'; + $colors['inline_styles'] .= sprintf( 'background-color: %s;', $custom_background_color ); + } + + return $colors; +} + +/** + * Build an array with CSS classes and inline styles defining the font sizes + * which will be applied to the navigation markup in the front-end. + * + * @param array $context Navigation block context. + * @return array Font size CSS classes and inline styles. + */ +function block_core_navigation_link_build_css_font_sizes( $context ) { + // CSS classes. + $font_sizes = array( + 'css_classes' => array(), + 'inline_styles' => '', + ); + + $has_named_font_size = array_key_exists( 'fontSize', $context ); + $has_custom_font_size = isset( $context['style']['typography']['fontSize'] ); + + if ( $has_named_font_size ) { + // Add the font size class. + $font_sizes['css_classes'][] = sprintf( 'has-%s-font-size', $context['fontSize'] ); + } elseif ( $has_custom_font_size ) { + // Add the custom font size inline style. + $font_sizes['inline_styles'] = sprintf( 'font-size: %s;', $context['style']['typography']['fontSize'] ); + } + + return $font_sizes; +} + +/** + * Returns the top-level submenu SVG chevron icon. + * + * @return string + */ +function block_core_navigation_link_render_submenu_icon() { + return ''; +} + +/** + * Renders the `core/navigation-link` block. + * + * @param array $attributes The block attributes. + * @param array $content The saved content. + * @param array $block The parsed block. + * + * @return string Returns the post content with the legacy widget added. + */ +function render_block_core_navigation_link( $attributes, $content, $block ) { + $navigation_link_has_id = isset( $attributes['id'] ) && is_numeric( $attributes['id'] ); + $is_post_type = isset( $attributes['kind'] ) && 'post-type' === $attributes['kind']; + $is_post_type = $is_post_type || isset( $attributes['type'] ) && ( 'post' === $attributes['type'] || 'page' === $attributes['type'] ); + + // Don't render the block's subtree if it is a draft or if the ID does not exist. + if ( $is_post_type && $navigation_link_has_id ) { + $post = get_post( $attributes['id'] ); + if ( ! $post || 'publish' !== $post->post_status ) { + return ''; + } + } + + // Don't render the block's subtree if it has no label. + if ( empty( $attributes['label'] ) ) { + return ''; + } + + $colors = block_core_navigation_link_build_css_colors( $block->context, $attributes ); + $font_sizes = block_core_navigation_link_build_css_font_sizes( $block->context ); + $classes = array_merge( + $colors['css_classes'], + $font_sizes['css_classes'] + ); + $style_attribute = ( $colors['inline_styles'] . $font_sizes['inline_styles'] ); + + $css_classes = trim( implode( ' ', $classes ) ); + $has_submenu = count( $block->inner_blocks ) > 0; + $is_active = ! empty( $attributes['id'] ) && ( get_the_ID() === $attributes['id'] ); + + $wrapper_attributes = get_block_wrapper_attributes( + array( + 'class' => $css_classes . ' wp-block-navigation-item' . ( $has_submenu ? ' has-child' : '' ) . + ( $is_active ? ' current-menu-item' : '' ), + 'style' => $style_attribute, + ) + ); + $html = '
  • ' . + ''; + + if ( isset( $attributes['label'] ) ) { + $html .= wp_kses( + $attributes['label'], + array( + 'code' => array(), + 'em' => array(), + 'img' => array( + 'scale' => array(), + 'class' => array(), + 'style' => array(), + 'src' => array(), + 'alt' => array(), + ), + 's' => array(), + 'span' => array( + 'style' => array(), + ), + 'strong' => array(), + ) + ); + } + + $html .= ''; + + if ( isset( $block->context['showSubmenuIcon'] ) && $block->context['showSubmenuIcon'] && $has_submenu ) { + // The submenu icon can be hidden by a CSS rule on the Navigation Block. + $html .= '' . block_core_navigation_link_render_submenu_icon() . ''; + } + + $html .= ''; + // End anchor tag content. + + if ( $has_submenu ) { + $inner_blocks_html = ''; + foreach ( $block->inner_blocks as $inner_block ) { + $inner_blocks_html .= $inner_block->render(); + } + + $html .= sprintf( + '
      %s
    ', + $inner_blocks_html + ); + } + + $html .= '
    • '; + + return $html; +} + +/** + * Returns a navigation link variation + * + * @param WP_Taxonomy|WP_Post_Type $entity post type or taxonomy entity. + * @param string $kind string of value 'taxonomy' or 'post-type'. + * + * @return array + */ +function build_variation_for_navigation_link( $entity, $kind ) { + $title = ''; + $description = ''; + + if ( property_exists( $entity->labels, 'item_link' ) ) { + $title = $entity->labels->item_link; + } + if ( property_exists( $entity->labels, 'item_link_description' ) ) { + $description = $entity->labels->item_link_description; + } + + $variation = array( + 'name' => $entity->name, + 'title' => $title, + 'description' => $description, + 'attributes' => array( + 'type' => $entity->name, + 'kind' => $kind, + ), + ); + + // Tweak some value for the variations. + $variation_overrides = array( + 'post_tag' => array( + 'name' => 'tag', + 'attributes' => array( + 'type' => 'tag', + 'kind' => $kind, + ), + ), + 'post_format' => array( + // The item_link and item_link_description for post formats is the + // same as for tags, so need to be overridden. + 'title' => __( 'Post Format Link' ), + 'description' => __( 'A link to a post format' ), + 'attributes' => array( + 'type' => 'post_format', + 'kind' => $kind, + ), + ), + ); + + if ( array_key_exists( $entity->name, $variation_overrides ) ) { + $variation = array_merge( + $variation, + $variation_overrides[ $entity->name ] + ); + } + + return $variation; +} + +/** + * Register the navigation link block. + * + * @uses render_block_core_navigation() + * @throws WP_Error An WP_Error exception parsing the block definition. + */ +function register_block_core_navigation_link() { + $post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' ); + $taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'objects' ); + + // Use two separate arrays as a way to order the variations in the UI. + // Known variations (like Post Link and Page Link) are added to the + // `built_ins` array. Variations for custom post types and taxonomies are + // added to the `variations` array and will always appear after `built-ins. + $built_ins = array(); + $variations = array(); + + if ( $post_types ) { + foreach ( $post_types as $post_type ) { + $variation = build_variation_for_navigation_link( $post_type, 'post-type' ); + if ( $post_type->_builtin ) { + $built_ins[] = $variation; + } else { + $variations[] = $variation; + } + } + } + if ( $taxonomies ) { + foreach ( $taxonomies as $taxonomy ) { + $variation = build_variation_for_navigation_link( $taxonomy, 'taxonomy' ); + if ( $taxonomy->_builtin ) { + $built_ins[] = $variation; + } else { + $variations[] = $variation; + } + } + } + + register_block_type_from_metadata( + __DIR__ . '/navigation-link', + array( + 'render_callback' => 'render_block_core_navigation_link', + 'variations' => array_merge( $built_ins, $variations ), + ) + ); +} +add_action( 'init', 'register_block_core_navigation_link' ); diff --git a/src/wp-includes/blocks/navigation-link/block.json b/src/wp-includes/blocks/navigation-link/block.json new file mode 100644 index 0000000000..eac8af0cde --- /dev/null +++ b/src/wp-includes/blocks/navigation-link/block.json @@ -0,0 +1,65 @@ +{ + "apiVersion": 2, + "name": "core/navigation-link", + "title": "Custom Link", + "category": "design", + "parent": [ + "core/navigation" + ], + "description": "Add a page, link, or another item to your navigation.", + "textdomain": "default", + "attributes": { + "label": { + "type": "string" + }, + "type": { + "type": "string" + }, + "description": { + "type": "string" + }, + "rel": { + "type": "string" + }, + "id": { + "type": "number" + }, + "opensInNewTab": { + "type": "boolean", + "default": false + }, + "url": { + "type": "string" + }, + "title": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "isTopLevelLink": { + "type": "boolean" + } + }, + "usesContext": [ + "textColor", + "customTextColor", + "backgroundColor", + "customBackgroundColor", + "overlayTextColor", + "customOverlayTextColor", + "overlayBackgroundColor", + "customOverlayBackgroundColor", + "fontSize", + "customFontSize", + "showSubmenuIcon", + "style" + ], + "supports": { + "reusable": false, + "html": false, + "__experimentalSlashInserter": true + }, + "editorStyle": "wp-block-navigation-link-editor", + "style": "wp-block-navigation-link" +} diff --git a/src/wp-includes/blocks/navigation-submenu.php b/src/wp-includes/blocks/navigation-submenu.php new file mode 100644 index 0000000000..0d58bc0f6f --- /dev/null +++ b/src/wp-includes/blocks/navigation-submenu.php @@ -0,0 +1,285 @@ + array(), + 'inline_styles' => '', + ); + + $is_sub_menu = isset( $attributes['isTopLevelItem'] ) ? ( ! $attributes['isTopLevelItem'] ) : false; + + // Text color. + $named_text_color = null; + $custom_text_color = null; + + if ( $is_sub_menu && array_key_exists( 'customOverlayTextColor', $context ) ) { + $custom_text_color = $context['customOverlayTextColor']; + } elseif ( $is_sub_menu && array_key_exists( 'overlayTextColor', $context ) ) { + $named_text_color = $context['overlayTextColor']; + } elseif ( array_key_exists( 'customTextColor', $context ) ) { + $custom_text_color = $context['customTextColor']; + } elseif ( array_key_exists( 'textColor', $context ) ) { + $named_text_color = $context['textColor']; + } elseif ( isset( $context['style']['color']['text'] ) ) { + $custom_text_color = $context['style']['color']['text']; + } + + // If has text color. + if ( ! is_null( $named_text_color ) ) { + // Add the color class. + array_push( $colors['css_classes'], 'has-text-color', sprintf( 'has-%s-color', $named_text_color ) ); + } elseif ( ! is_null( $custom_text_color ) ) { + // Add the custom color inline style. + $colors['css_classes'][] = 'has-text-color'; + $colors['inline_styles'] .= sprintf( 'color: %s;', $custom_text_color ); + } + + // Background color. + $named_background_color = null; + $custom_background_color = null; + + if ( $is_sub_menu && array_key_exists( 'customOverlayBackgroundColor', $context ) ) { + $custom_background_color = $context['customOverlayBackgroundColor']; + } elseif ( $is_sub_menu && array_key_exists( 'overlayBackgroundColor', $context ) ) { + $named_background_color = $context['overlayBackgroundColor']; + } elseif ( array_key_exists( 'customBackgroundColor', $context ) ) { + $custom_background_color = $context['customBackgroundColor']; + } elseif ( array_key_exists( 'backgroundColor', $context ) ) { + $named_background_color = $context['backgroundColor']; + } elseif ( isset( $context['style']['color']['background'] ) ) { + $custom_background_color = $context['style']['color']['background']; + } + + // If has background color. + if ( ! is_null( $named_background_color ) ) { + // Add the background-color class. + array_push( $colors['css_classes'], 'has-background', sprintf( 'has-%s-background-color', $named_background_color ) ); + } elseif ( ! is_null( $custom_background_color ) ) { + // Add the custom background-color inline style. + $colors['css_classes'][] = 'has-background'; + $colors['inline_styles'] .= sprintf( 'background-color: %s;', $custom_background_color ); + } + + return $colors; +} + +/** + * Build an array with CSS classes and inline styles defining the font sizes + * which will be applied to the navigation markup in the front-end. + * + * @param array $context Navigation block context. + * @return array Font size CSS classes and inline styles. + */ +function block_core_navigation_submenu_build_css_font_sizes( $context ) { + // CSS classes. + $font_sizes = array( + 'css_classes' => array(), + 'inline_styles' => '', + ); + + $has_named_font_size = array_key_exists( 'fontSize', $context ); + $has_custom_font_size = isset( $context['style']['typography']['fontSize'] ); + + if ( $has_named_font_size ) { + // Add the font size class. + $font_sizes['css_classes'][] = sprintf( 'has-%s-font-size', $context['fontSize'] ); + } elseif ( $has_custom_font_size ) { + // Add the custom font size inline style. + $font_sizes['inline_styles'] = sprintf( 'font-size: %s;', $context['style']['typography']['fontSize'] ); + } + + return $font_sizes; +} + +/** + * Returns the top-level submenu SVG chevron icon. + * + * @return string + */ +function block_core_navigation_submenu_render_submenu_icon() { + return ''; +} + +/** + * Renders the `core/navigation-submenu` block. + * + * @param array $attributes The block attributes. + * @param string $content The saved content. + * @param object $block The parsed block. + * + * @return string Returns the post content with the legacy widget added. + */ +function render_block_core_navigation_submenu( $attributes, $content, $block ) { + + $navigation_link_has_id = isset( $attributes['id'] ) && is_numeric( $attributes['id'] ); + $is_post_type = isset( $attributes['kind'] ) && 'post-type' === $attributes['kind']; + $is_post_type = $is_post_type || isset( $attributes['type'] ) && ( 'post' === $attributes['type'] || 'page' === $attributes['type'] ); + + // Don't render the block's subtree if it is a draft. + if ( $is_post_type && $navigation_link_has_id && 'publish' !== get_post_status( $attributes['id'] ) ) { + return ''; + } + + // Don't render the block's subtree if it has no label. + if ( empty( $attributes['label'] ) ) { + return ''; + } + + $colors = block_core_navigation_submenu_build_css_colors( $block->context, $attributes ); + $font_sizes = block_core_navigation_submenu_build_css_font_sizes( $block->context ); + $classes = array_merge( + $colors['css_classes'], + $font_sizes['css_classes'] + ); + $style_attribute = ( $colors['inline_styles'] . $font_sizes['inline_styles'] ); + + $css_classes = trim( implode( ' ', $classes ) ); + $has_submenu = count( $block->inner_blocks ) > 0; + $is_active = ! empty( $attributes['id'] ) && ( get_the_ID() === $attributes['id'] ); + + $show_submenu_indicators = isset( $block->context['showSubmenuIcon'] ) && $block->context['showSubmenuIcon']; + $open_on_click = isset( $block->context['openSubmenusOnClick'] ) && $block->context['openSubmenusOnClick']; + $open_on_hover_and_click = isset( $block->context['openSubmenusOnClick'] ) && ! $block->context['openSubmenusOnClick'] && + $show_submenu_indicators; + + $wrapper_attributes = get_block_wrapper_attributes( + array( + 'class' => $css_classes . ' wp-block-navigation-item' . ( $has_submenu ? ' has-child' : '' ) . + ( $open_on_click ? ' open-on-click' : '' ) . ( $open_on_hover_and_click ? ' open-on-hover-click' : '' ) . + ( $is_active ? ' current-menu-item' : '' ), + 'style' => $style_attribute, + ) + ); + + $label = ''; + + if ( isset( $attributes['label'] ) ) { + $label .= wp_kses( + $attributes['label'], + array( + 'code' => array(), + 'em' => array(), + 'img' => array( + 'scale' => array(), + 'class' => array(), + 'style' => array(), + 'src' => array(), + 'alt' => array(), + ), + 's' => array(), + 'span' => array( + 'style' => array(), + ), + 'strong' => array(), + ) + ); + } + + $aria_label = sprintf( + /* translators: Accessibility text. %s: Parent page title. */ + __( '%s submenu' ), + wp_strip_all_tags( $label ) + ); + + $html = '
  • '; + + // If Submenus open on hover, we render an anchor tag with attributes. + // If submenu icons are set to show, we also render a submenu button, so the submenu can be opened on click. + if ( ! $open_on_click ) { + $item_url = isset( $attributes['url'] ) ? esc_url( $attributes['url'] ) : ''; + // Start appending HTML attributes to anchor tag. + $html .= '
  • ' . wp_kses( - $page['title'], - wp_kses_allowed_html( 'post' ) - ) . ''; + + if ( $is_navigation_child ) { + $css_class .= ' wp-block-navigation-item'; + + if ( $open_submenus_on_click ) { + $css_class .= ' open-on-click'; + } elseif ( $show_submenu_icons ) { + $css_class .= ' open-on-hover-click'; + } + } + + $navigation_child_content_class = $is_navigation_child ? ' wp-block-navigation-item__content' : ''; + + // If this is the first level of submenus, include the overlay colors. + if ( 1 === $depth && isset( $colors['overlay_css_classes'], $colors['overlay_inline_styles'] ) ) { + $css_class .= ' ' . trim( implode( ' ', $colors['overlay_css_classes'] ) ); + if ( '' !== $colors['overlay_inline_styles'] ) { + $style_attribute = sprintf( ' style="%s"', esc_attr( $colors['overlay_inline_styles'] ) ); + } + } + + $title = wp_kses( $page['title'], wp_kses_allowed_html( 'post' ) ); + $aria_label = sprintf( + /* translators: Accessibility text. %s: Parent page title. */ + __( '%s submenu' ), + wp_strip_all_tags( $title ) + ); + + $markup .= '
  • '; + + if ( isset( $page['children'] ) && $is_navigation_child && $open_submenus_on_click ) { + $markup .= ''; + } else { + $markup .= '' . $title . ''; + } + if ( isset( $page['children'] ) ) { - $markup .= ''; - $markup .= '
      ' . block_core_page_list_render_nested_page_list( $page['children'] ) . '
    '; + if ( $is_navigation_child && $show_submenu_icons && ! $open_submenus_on_click ) { + $markup .= ''; + } + $markup .= '
      ' . block_core_page_list_render_nested_page_list( $open_submenus_on_click, $show_submenu_icons, $is_navigation_child, $page['children'], $active_page_ancestor_ids, $colors, $depth + 1 ) . '
    '; } $markup .= '
    • '; } @@ -149,44 +240,50 @@ function render_block_core_page_list( $attributes, $content, $block ) { static $block_id = 0; $block_id++; - // TODO: When https://core.trac.wordpress.org/ticket/39037 REST API support for multiple orderby values is resolved, - // update 'sort_column' to 'menu_order, post_title'. Sorting by both menu_order and post_title ensures a stable sort. - // Otherwise with pages that have the same menu_order value, we can see different ordering depending on how DB - // queries are constructed internally. For example we might see a different order when a limit is set to <499 - // versus >= 500. $all_pages = get_pages( array( - 'sort_column' => 'menu_order', + 'sort_column' => 'menu_order,post_title', 'order' => 'asc', ) ); + // If thare are no pages, there is nothing to show. + if ( empty( $all_pages ) ) { + return; + } + $top_level_pages = array(); $pages_with_children = array(); + $active_page_ancestor_ids = array(); + foreach ( (array) $all_pages as $page ) { + $is_active = ! empty( $page->ID ) && ( get_the_ID() === $page->ID ); + + if ( $is_active ) { + $active_page_ancestor_ids = get_post_ancestors( $page->ID ); + } + if ( $page->post_parent ) { $pages_with_children[ $page->post_parent ][ $page->ID ] = array( - 'title' => $page->post_title, - 'link' => get_permalink( $page->ID ), + 'page_id' => $page->ID, + 'title' => $page->post_title, + 'link' => get_permalink( $page->ID ), + 'is_active' => $is_active, ); } else { $top_level_pages[ $page->ID ] = array( - 'title' => $page->post_title, - 'link' => get_permalink( $page->ID ), + 'page_id' => $page->ID, + 'title' => $page->post_title, + 'link' => get_permalink( $page->ID ), + 'is_active' => $is_active, ); } } - $nested_pages = block_core_page_list_nest_pages( $top_level_pages, $pages_with_children ); - - $wrapper_markup = '
      %2$s
    '; - - $items_markup = block_core_page_list_render_nested_page_list( $nested_pages ); - - $colors = block_core_page_list_build_css_colors( $block->context ); + $colors = block_core_page_list_build_css_colors( $attributes, $block->context ); $font_sizes = block_core_page_list_build_css_font_sizes( $block->context ); $classes = array_merge( $colors['css_classes'], @@ -195,10 +292,23 @@ function render_block_core_page_list( $attributes, $content, $block ) { $style_attribute = ( $colors['inline_styles'] . $font_sizes['inline_styles'] ); $css_classes = trim( implode( ' ', $classes ) ); - if ( $block->context && $block->context['showSubmenuIcon'] ) { - $css_classes .= ' show-submenu-icons'; + $nested_pages = block_core_page_list_nest_pages( $top_level_pages, $pages_with_children ); + + // Limit the number of items to be visually displayed. + if ( ! empty( $attributes['__unstableMaxPages'] ) ) { + $nested_pages = array_slice( $nested_pages, 0, $attributes['__unstableMaxPages'] ); } + $is_navigation_child = array_key_exists( 'showSubmenuIcon', $block->context ); + + $open_submenus_on_click = array_key_exists( 'openSubmenusOnClick', $block->context ) ? $block->context['openSubmenusOnClick'] : false; + + $show_submenu_icons = array_key_exists( 'showSubmenuIcon', $block->context ) ? $block->context['showSubmenuIcon'] : false; + + $wrapper_markup = '
      %2$s
    '; + + $items_markup = block_core_page_list_render_nested_page_list( $open_submenus_on_click, $show_submenu_icons, $is_navigation_child, $nested_pages, $active_page_ancestor_ids, $colors ); + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $css_classes, diff --git a/src/wp-includes/blocks/page-list/block.json b/src/wp-includes/blocks/page-list/block.json index 25118d2dbe..146f236fca 100644 --- a/src/wp-includes/blocks/page-list/block.json +++ b/src/wp-includes/blocks/page-list/block.json @@ -6,15 +6,22 @@ "description": "Display a list of all pages.", "keywords": [ "menu", "navigation" ], "textdomain": "default", + "attributes": { + }, "usesContext": [ "textColor", "customTextColor", "backgroundColor", "customBackgroundColor", + "overlayTextColor", + "customOverlayTextColor", + "overlayBackgroundColor", + "customOverlayBackgroundColor", "fontSize", "customFontSize", "showSubmenuIcon", - "style" + "style", + "openSubmenusOnClick" ], "supports": { "reusable": false, diff --git a/src/wp-includes/blocks/paragraph/block.json b/src/wp-includes/blocks/paragraph/block.json index d05e48a7be..80bc900ff4 100644 --- a/src/wp-includes/blocks/paragraph/block.json +++ b/src/wp-includes/blocks/paragraph/block.json @@ -37,7 +37,14 @@ }, "typography": { "fontSize": true, - "lineHeight": true + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true + } }, "__experimentalSelector": "p", "__unstablePasteTextInline": true diff --git a/src/wp-includes/blocks/pattern.php b/src/wp-includes/blocks/pattern.php new file mode 100644 index 0000000000..32a08601ca --- /dev/null +++ b/src/wp-includes/blocks/pattern.php @@ -0,0 +1,44 @@ + 'render_block_core_pattern', + ) + ); +} + +/** + * Renders the `core/pattern` block on the server. + * + * @param array $attributes Block attributes. + * + * @return string Returns the output of the pattern. + */ +function render_block_core_pattern( $attributes ) { + if ( empty( $attributes['slug'] ) ) { + return ''; + } + + $slug = $attributes['slug']; + $registry = WP_Block_Patterns_Registry::get_instance(); + if ( ! $registry->is_registered( $slug ) ) { + return ''; + } + + $pattern = $registry->get_registered( $slug ); + return do_blocks( $pattern['content'] ); +} + +add_action( 'init', 'register_block_core_pattern' ); diff --git a/src/wp-includes/blocks/pattern/block.json b/src/wp-includes/blocks/pattern/block.json new file mode 100644 index 0000000000..c0c27cd821 --- /dev/null +++ b/src/wp-includes/blocks/pattern/block.json @@ -0,0 +1,17 @@ +{ + "apiVersion": 2, + "name": "core/pattern", + "title": "Pattern", + "category": "theme", + "description": "Show a block pattern.", + "supports": { + "html": false, + "inserter": false + }, + "textdomain": "default", + "attributes": { + "slug": { + "type": "string" + } + } +} diff --git a/src/wp-includes/blocks/post-author.php b/src/wp-includes/blocks/post-author.php new file mode 100644 index 0000000000..e31be65f70 --- /dev/null +++ b/src/wp-includes/blocks/post-author.php @@ -0,0 +1,61 @@ +context['postId'] ) ) { + return ''; + } + + $author_id = get_post_field( 'post_author', $block->context['postId'] ); + if ( empty( $author_id ) ) { + return ''; + } + + $avatar = ! empty( $attributes['avatarSize'] ) ? get_avatar( + $author_id, + $attributes['avatarSize'] + ) : null; + + $byline = ! empty( $attributes['byline'] ) ? $attributes['byline'] : false; + $classes = array_merge( + isset( $attributes['className'] ) ? array( $attributes['className'] ) : array(), + isset( $attributes['itemsJustification'] ) ? array( 'items-justified-' . $attributes['itemsJustification'] ) : array(), + isset( $attributes['textAlign'] ) ? array( 'has-text-align-' . $attributes['textAlign'] ) : array() + ); + + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) ); + + return sprintf( '
    ', $wrapper_attributes ) . + ( ! empty( $attributes['showAvatar'] ) ? '
    ' . $avatar . '
    ' : '' ) . + '
    ' . + ( ! empty( $byline ) ? '

    ' . $byline . '

    ' : '' ) . + '

    ' . get_the_author_meta( 'display_name', $author_id ) . '

    ' . + ( ! empty( $attributes['showBio'] ) ? '

    ' . get_the_author_meta( 'user_description', $author_id ) . '

    ' : '' ) . + '
    ' . + '
    '; +} + +/** + * Registers the `core/post-author` block on the server. + */ +function register_block_core_post_author() { + register_block_type_from_metadata( + __DIR__ . '/post-author', + array( + 'render_callback' => 'render_block_core_post_author', + ) + ); +} +add_action( 'init', 'register_block_core_post_author' ); diff --git a/src/wp-includes/blocks/post-author/block.json b/src/wp-includes/blocks/post-author/block.json new file mode 100644 index 0000000000..d46c8df69d --- /dev/null +++ b/src/wp-includes/blocks/post-author/block.json @@ -0,0 +1,53 @@ +{ + "apiVersion": 2, + "name": "core/post-author", + "title": "Post Author", + "category": "theme", + "description": "Add the author of this post.", + "textdomain": "default", + "attributes": { + "textAlign": { + "type": "string" + }, + "avatarSize": { + "type": "number", + "default": 48 + }, + "showAvatar": { + "type": "boolean", + "default": true + }, + "showBio": { + "type": "boolean" + }, + "byline": { + "type": "string" + } + }, + "usesContext": [ "postType", "postId", "queryId" ], + "supports": { + "html": false, + "spacing": { + "margin": true, + "padding": true + }, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true + } + }, + "color": { + "gradients": true, + "link": true, + "__experimentalDuotone": ".wp-block-post-author__avatar img" + } + }, + "editorStyle": "wp-block-post-author-editor", + "style": "wp-block-post-author" +} diff --git a/src/wp-includes/blocks/post-comments.php b/src/wp-includes/blocks/post-comments.php new file mode 100644 index 0000000000..8ddb0e6f74 --- /dev/null +++ b/src/wp-includes/blocks/post-comments.php @@ -0,0 +1,85 @@ +context['postId']; + if ( ! isset( $post_id ) ) { + return ''; + } + + $comment_args = array( + 'post_id' => $post_id, + 'count' => true, + ); + // Return early if there are no comments and comments are closed. + if ( ! comments_open( $post_id ) && get_comments( $comment_args ) === 0 ) { + return ''; + } + + $post_before = $post; + $post = get_post( $post_id ); + setup_postdata( $post ); + + ob_start(); + // There's a deprecation warning generated by WP Core. + // Ideally this deprecation is removed from Core. + // In the meantime, this removes it from the output. + add_filter( 'deprecated_file_trigger_error', '__return_false' ); + comments_template(); + remove_filter( 'deprecated_file_trigger_error', '__return_false' ); + $post = $post_before; + + $classes = ''; + if ( isset( $attributes['textAlign'] ) ) { + $classes .= 'has-text-align-' . $attributes['textAlign']; + } + + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) ); + $output = ob_get_clean(); + + return sprintf( '
    %2$s
    ', $wrapper_attributes, $output ); +} + +/** + * Registers the `core/post-comments` block on the server. + */ +function register_block_core_post_comments() { + register_block_type_from_metadata( + __DIR__ . '/post-comments', + array( + 'render_callback' => 'render_block_core_post_comments', + ) + ); +} +add_action( 'init', 'register_block_core_post_comments' ); + +/** + * Use the button block classes for the form-submit button. + * + * @param array $fields The default comment form arguments. + * + * @return array Returns the modified fields. + */ +function post_comments_block_form_defaults( $fields ) { + if ( wp_is_block_theme() ) { + $fields['submit_button'] = ''; + $fields['submit_field'] = '

    %1$s %2$s

    '; + } + + return $fields; +} +add_filter( 'comment_form_defaults', 'post_comments_block_form_defaults' ); diff --git a/src/wp-includes/blocks/post-comments/block.json b/src/wp-includes/blocks/post-comments/block.json new file mode 100644 index 0000000000..2c797f5115 --- /dev/null +++ b/src/wp-includes/blocks/post-comments/block.json @@ -0,0 +1,38 @@ +{ + "apiVersion": 2, + "name": "core/post-comments", + "title": "Post Comments", + "category": "theme", + "description": "Display a post's comments.", + "textdomain": "default", + "attributes": { + "textAlign": { + "type": "string" + } + }, + "usesContext": [ "postId", "postType" ], + "supports": { + "html": false, + "align": [ "wide", "full" ], + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true + } + }, + "color": { + "gradients": true, + "link": true + } + }, + "style": [ + "wp-block-post-comments", + "wp-block-buttons", + "wp-block-button" + ] +} diff --git a/src/wp-includes/blocks/post-content.php b/src/wp-includes/blocks/post-content.php index 400e3068df..b1ed1b4542 100644 --- a/src/wp-includes/blocks/post-content.php +++ b/src/wp-includes/blocks/post-content.php @@ -36,11 +36,21 @@ function render_block_core_post_content( $attributes, $content, $block ) { $seen_ids[ $post_id ] = true; + // Check is needed for backward compatibility with third-party plugins + // that might rely on the `in_the_loop` check; calling `the_post` sets it to true. if ( ! in_the_loop() && have_posts() ) { the_post(); } - $content = get_the_content( null, false, $post_id ); + // When inside the main loop, we want to use queried object + // so that `the_preview` for the current post can apply. + // We force this behavior by omitting the third argument (post ID) from the `get_the_content`. + $content = get_the_content( null, false ); + // Check for nextpage to display page links for paginated posts. + if ( has_block( 'core/nextpage' ) ) { + $content .= wp_link_pages( array( 'echo' => 0 ) ); + } + /** This filter is documented in wp-includes/post-template.php */ $content = apply_filters( 'the_content', str_replace( ']]>', ']]>', $content ) ); unset( $seen_ids[ $post_id ] ); diff --git a/src/wp-includes/blocks/post-date/block.json b/src/wp-includes/blocks/post-date/block.json index 260e5f1c2a..4698801f06 100644 --- a/src/wp-includes/blocks/post-date/block.json +++ b/src/wp-includes/blocks/post-date/block.json @@ -26,7 +26,15 @@ }, "typography": { "fontSize": true, - "lineHeight": true + "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontWeight": true, + "__experimentalFontStyle": true, + "__experimentalTextTransform": true, + "__experimentalLetterSpacing": true, + "__experimentalDefaultControls": { + "fontSize": true + } } } } diff --git a/src/wp-includes/blocks/post-excerpt.php b/src/wp-includes/blocks/post-excerpt.php index 03e0acf4fe..d650cc3cf0 100644 --- a/src/wp-includes/blocks/post-excerpt.php +++ b/src/wp-includes/blocks/post-excerpt.php @@ -18,6 +18,12 @@ function render_block_core_post_excerpt( $attributes, $content, $block ) { return ''; } + $excerpt = get_the_excerpt(); + + if ( empty( $excerpt ) ) { + return ''; + } + $more_text = ! empty( $attributes['moreText'] ) ? '' . $attributes['moreText'] . '' : ''; $filter_excerpt_more = function( $more ) use ( $more_text ) { return empty( $more_text ) ? $more : ''; @@ -38,7 +44,7 @@ function render_block_core_post_excerpt( $attributes, $content, $block ) { } $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) ); - $content = '

    ' . get_the_excerpt( $block->context['postId'] ); + $content = '

    ' . $excerpt; $show_more_on_new_line = ! isset( $attributes['showMoreOnNewLine'] ) || $attributes['showMoreOnNewLine']; if ( $show_more_on_new_line && ! empty( $more_text ) ) { $content .= '

    ' . $more_text . '

    '; diff --git a/src/wp-includes/blocks/post-excerpt/block.json b/src/wp-includes/blocks/post-excerpt/block.json index a066c4250a..c3b15ad5ec 100644 --- a/src/wp-includes/blocks/post-excerpt/block.json +++ b/src/wp-includes/blocks/post-excerpt/block.json @@ -24,9 +24,20 @@ "gradients": true, "link": true }, + "spacing": { + "margin": true, + "padding": true + }, "typography": { "fontSize": true, - "lineHeight": true + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true + } } }, "editorStyle": "wp-block-post-excerpt-editor", diff --git a/src/wp-includes/blocks/post-featured-image.php b/src/wp-includes/blocks/post-featured-image.php index 8497a0569a..21e6aca445 100644 --- a/src/wp-includes/blocks/post-featured-image.php +++ b/src/wp-includes/blocks/post-featured-image.php @@ -23,14 +23,30 @@ function render_block_core_post_featured_image( $attributes, $content, $block ) if ( ! $featured_image ) { return ''; } - + $wrapper_attributes = get_block_wrapper_attributes(); if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) { $featured_image = sprintf( '%2s', get_the_permalink( $post_ID ), $featured_image ); } - $wrapper_attributes = get_block_wrapper_attributes(); + $has_width = ! empty( $attributes['width'] ); + $has_height = ! empty( $attributes['height'] ); + if ( ! $has_height && ! $has_width ) { + return "
    $featured_image
    "; + } + + if ( $has_width ) { + $wrapper_attributes = get_block_wrapper_attributes( array( 'style' => "width:{$attributes['width']};" ) ); + } + + if ( $has_height ) { + $image_styles = "height:{$attributes['height']};"; + if ( ! empty( $attributes['scale'] ) ) { + $image_styles .= "object-fit:{$attributes['scale']};"; + } + $featured_image = str_replace( 'src=', "style='$image_styles' src=", $featured_image ); + } - return '
    ' . $featured_image . '
    '; + return "
    $featured_image
    "; } /** diff --git a/src/wp-includes/blocks/post-featured-image/block.json b/src/wp-includes/blocks/post-featured-image/block.json index a5ab8d6cfd..49116ef908 100644 --- a/src/wp-includes/blocks/post-featured-image/block.json +++ b/src/wp-includes/blocks/post-featured-image/block.json @@ -9,12 +9,31 @@ "isLink": { "type": "boolean", "default": false + }, + "width": { + "type": "string" + }, + "height": { + "type": "string" + }, + "scale": { + "type": "string", + "default": "cover" } }, "usesContext": [ "postId", "postType", "queryId" ], "supports": { "align": [ "left", "right", "center", "wide", "full" ], - "html": false + "color": { + "__experimentalDuotone": "img", + "text": false, + "background": false + }, + "html": false, + "spacing": { + "margin": true, + "padding": true + } }, "editorStyle": "wp-block-post-featured-image-editor", "style": "wp-block-post-featured-image" diff --git a/src/wp-includes/blocks/post-navigation-link.php b/src/wp-includes/blocks/post-navigation-link.php new file mode 100644 index 0000000000..9fedf38d6f --- /dev/null +++ b/src/wp-includes/blocks/post-navigation-link.php @@ -0,0 +1,96 @@ + $classes ) ); + // Set default values. + $format = '%link'; + $link = 'next' === $navigation_type ? _x( 'Next', 'label for next post link' ) : _x( 'Previous', 'label for previous post link' ); + $label = ''; + + // If a custom label is provided, make this a link. + // `$label` is used to prepend the provided label, if we want to show the page title as well. + if ( isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ) { + $label = "{$attributes['label']}"; + $link = $label; + } + + // If we want to also show the page title, make the page title a link and prepend the label. + if ( isset( $attributes['showTitle'] ) && $attributes['showTitle'] ) { + /* + * If the label link option is not enabled but there is a custom label, + * display the custom label as text before the linked title. + */ + if ( ! $attributes['linkLabel'] ) { + if ( $label ) { + $format = '' . $label . ' %link'; + } + $link = '%title'; + } elseif ( isset( $attributes['linkLabel'] ) && $attributes['linkLabel'] ) { + // If the label link option is enabled and there is a custom label, display it before the title. + if ( $label ) { + $link = '' . $label . ' %title'; + } else { + /* + * If the label link option is enabled and there is no custom label, + * add a colon between the label and the post title. + */ + $label = 'next' === $navigation_type ? _x( 'Next:', 'label before the title of the next post' ) : _x( 'Previous:', 'label before the title of the previous post' ); + $link = sprintf( + '%1$s %2$s', + $label, + '%title' + ); + } + } + } + + // The dynamic portion of the function name, `$navigation_type`, + // refers to the type of adjacency, 'next' or 'previous'. + $get_link_function = "get_{$navigation_type}_post_link"; + $content = $get_link_function( $format, $link ); + return sprintf( + '
    %2$s
    ', + $wrapper_attributes, + $content + ); +} + +/** + * Registers the `core/post-navigation-link` block on the server. + */ +function register_block_core_post_navigation_link() { + register_block_type_from_metadata( + __DIR__ . '/post-navigation-link', + array( + 'render_callback' => 'render_block_core_post_navigation_link', + ) + ); +} +add_action( 'init', 'register_block_core_post_navigation_link' ); diff --git a/src/wp-includes/blocks/post-navigation-link/block.json b/src/wp-includes/blocks/post-navigation-link/block.json new file mode 100644 index 0000000000..ec983b6b57 --- /dev/null +++ b/src/wp-includes/blocks/post-navigation-link/block.json @@ -0,0 +1,43 @@ +{ + "apiVersion": 2, + "name": "core/post-navigation-link", + "title": "Post Navigation Link", + "category": "theme", + "description": "Displays the next or previous post link that is adjacent to the current post.", + "textdomain": "default", + "attributes": { + "textAlign": { + "type": "string" + }, + "type": { + "type": "string", + "default": "next" + }, + "label": { + "type": "string" + }, + "showTitle": { + "type": "boolean", + "default": false + }, + "linkLabel": { + "type": "boolean", + "default": false + } + }, + "supports": { + "reusable": false, + "html": false, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true + } + } + } +} diff --git a/src/wp-includes/blocks/post-template.php b/src/wp-includes/blocks/post-template.php index 3daacbad7f..45bf3c4c64 100644 --- a/src/wp-includes/blocks/post-template.php +++ b/src/wp-includes/blocks/post-template.php @@ -61,7 +61,8 @@ function render_block_core_post_template( $attributes, $content, $block ) { ) ) )->render( array( 'dynamic' => false ) ); - $content .= "
  • {$block_content}
    • "; + $post_classes = esc_attr( implode( ' ', get_post_class( 'wp-block-post' ) ) ); + $content .= '
  • ' . $block_content . '
    • '; } wp_reset_postdata(); diff --git a/src/wp-includes/blocks/post-template/block.json b/src/wp-includes/blocks/post-template/block.json index 7ac5910941..2e0959d04b 100644 --- a/src/wp-includes/blocks/post-template/block.json +++ b/src/wp-includes/blocks/post-template/block.json @@ -16,7 +16,10 @@ "supports": { "reusable": false, "html": false, - "align": true + "align": true, + "__experimentalLayout": { + "allowEditing": false + } }, "style": "wp-block-post-template", "editorStyle": "wp-block-post-template-editor" diff --git a/src/wp-includes/blocks/post-terms.php b/src/wp-includes/blocks/post-terms.php index d82395b549..2573c4f0fb 100644 --- a/src/wp-includes/blocks/post-terms.php +++ b/src/wp-includes/blocks/post-terms.php @@ -23,30 +23,25 @@ function render_block_core_post_terms( $attributes, $content, $block ) { } $post_terms = get_the_terms( $block->context['postId'], $attributes['term'] ); - if ( is_wp_error( $post_terms ) ) { + if ( is_wp_error( $post_terms ) || empty( $post_terms ) ) { return ''; } - if ( empty( $post_terms ) ) { - return ''; + + $classes = 'taxonomy-' . $attributes['term']; + if ( isset( $attributes['textAlign'] ) ) { + $classes .= ' has-text-align-' . $attributes['textAlign']; } - $align_class_name = empty( $attributes['textAlign'] ) ? '' : ' ' . "has-text-align-{$attributes['textAlign']}"; + $separator = empty( $attributes['separator'] ) ? ' ' : $attributes['separator']; - $terms_links = ''; - foreach ( $post_terms as $term ) { - $terms_links .= sprintf( - '%2$s | ', - get_term_link( $term->term_id ), - esc_html( $term->name ) - ); - } - $terms_links = trim( $terms_links, ' | ' ); - $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) ); + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) ); - return sprintf( - '
    %2$s
    ', - $wrapper_attributes, - $terms_links + return get_the_term_list( + $block->context['postId'], + $attributes['term'], + "
    ", + '' . $separator . '', + '
    ' ); } diff --git a/src/wp-includes/blocks/post-terms/block.json b/src/wp-includes/blocks/post-terms/block.json index 1f9f61738e..04a46942f4 100644 --- a/src/wp-includes/blocks/post-terms/block.json +++ b/src/wp-includes/blocks/post-terms/block.json @@ -2,7 +2,7 @@ "apiVersion": 2, "name": "core/post-terms", "title": "Post Terms", - "category": "design", + "category": "theme", "description": "Post terms.", "textdomain": "default", "attributes": { @@ -11,6 +11,10 @@ }, "textAlign": { "type": "string" + }, + "separator": { + "type": "string", + "default": ", " } }, "usesContext": [ "postId", "postType" ], @@ -22,7 +26,15 @@ }, "typography": { "lineHeight": true, - "fontSize": true + "fontSize": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true + } } - } + }, + "style": "wp-block-post-terms" } diff --git a/src/wp-includes/blocks/post-title.php b/src/wp-includes/blocks/post-title.php index 798278b556..5630286426 100644 --- a/src/wp-includes/blocks/post-title.php +++ b/src/wp-includes/blocks/post-title.php @@ -19,7 +19,13 @@ function render_block_core_post_title( $attributes, $content, $block ) { return ''; } - $post_ID = $block->context['postId']; + $post_ID = $block->context['postId']; + $title = get_the_title(); + + if ( ! $title ) { + return ''; + } + $tag_name = 'h2'; $align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}"; @@ -27,9 +33,8 @@ function render_block_core_post_title( $attributes, $content, $block ) { $tag_name = 0 === $attributes['level'] ? 'p' : 'h' . $attributes['level']; } - $title = get_the_title( $post_ID ); if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) { - $title = sprintf( '%4s', get_the_permalink( $post_ID ), $attributes['linkTarget'], $attributes['rel'], $title ); + $title = sprintf( '%4$s', get_the_permalink( $post_ID ), $attributes['linkTarget'], $attributes['rel'], $title ); } $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) ); diff --git a/src/wp-includes/blocks/post-title/block.json b/src/wp-includes/blocks/post-title/block.json index b20985442e..ce0b04384b 100644 --- a/src/wp-includes/blocks/post-title/block.json +++ b/src/wp-includes/blocks/post-title/block.json @@ -35,10 +35,22 @@ "gradients": true, "link": true }, + "spacing": { + "margin": true + }, "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true + "__experimentalFontFamily": true, + "__experimentalFontWeight": true, + "__experimentalFontStyle": true, + "__experimentalTextTransform": true, + "__experimentalLetterSpacing": true, + "__experimentalDefaultControls": { + "fontSize": true, + "fontAppearance": true, + "textTransform": true + } } }, "style": "wp-block-post-title" diff --git a/src/wp-includes/blocks/preformatted/block.json b/src/wp-includes/blocks/preformatted/block.json index 6deb40540b..53e32bdf5d 100644 --- a/src/wp-includes/blocks/preformatted/block.json +++ b/src/wp-includes/blocks/preformatted/block.json @@ -21,7 +21,15 @@ "gradients": true }, "typography": { - "fontSize": true + "fontSize": true, + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true + } } }, "style": "wp-block-preformatted" diff --git a/src/wp-includes/blocks/pullquote/block.json b/src/wp-includes/blocks/pullquote/block.json index 1237a506ad..3411ce072e 100644 --- a/src/wp-includes/blocks/pullquote/block.json +++ b/src/wp-includes/blocks/pullquote/block.json @@ -20,31 +20,37 @@ "default": "", "__experimentalRole": "content" }, - "mainColor": { - "type": "string" - }, - "customMainColor": { - "type": "string" - }, - "textColor": { - "type": "string" - }, - "customTextColor": { + "textAlign": { "type": "string" } }, "supports": { "anchor": true, - "align": [ "left", "right", "wide", "full" ] - }, - "styles": [ - { - "name": "default", - "label": "Default", - "isDefault": true + "align": [ "left", "right", "wide", "full" ], + "color": { + "gradients": true, + "background": true, + "link": true + }, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true, + "fontAppearance": true + } }, - { "name": "solid-color", "label": "Solid color" } - ], + "__experimentalBorder": { + "color": true, + "radius": true, + "style": true, + "width": true + } + }, "editorStyle": "wp-block-pullquote-editor", "style": "wp-block-pullquote" } diff --git a/src/wp-includes/blocks/query-pagination-next.php b/src/wp-includes/blocks/query-pagination-next.php index f22a4810f9..ea581e705f 100644 --- a/src/wp-includes/blocks/query-pagination-next.php +++ b/src/wp-includes/blocks/query-pagination-next.php @@ -20,9 +20,13 @@ function render_block_core_query_pagination_next( $attributes, $content, $block $max_page = isset( $block->context['query']['pages'] ) ? (int) $block->context['query']['pages'] : 0; $wrapper_attributes = get_block_wrapper_attributes(); - $default_label = __( 'Next Page »' ); + $default_label = __( 'Next Page' ); $label = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? $attributes['label'] : $default_label; - $content = ''; + $pagination_arrow = get_query_pagination_arrow( $block, true ); + if ( $pagination_arrow ) { + $label .= $pagination_arrow; + } + $content = ''; // Check if the pagination is for Query that inherits the global context. if ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] ) { @@ -39,8 +43,9 @@ function render_block_core_query_pagination_next( $attributes, $content, $block $content = get_next_posts_link( $label, $max_page ); remove_filter( 'next_posts_link_attributes', $filter_link_attributes ); } elseif ( ! $max_page || $max_page > $page ) { - $custom_query = new WP_Query( build_query_vars_from_query_block( $block, $page ) ); - if ( (int) $custom_query->max_num_pages !== $page ) { + $custom_query = new WP_Query( build_query_vars_from_query_block( $block, $page ) ); + $custom_query_max_pages = (int) $custom_query->max_num_pages; + if ( $custom_query_max_pages && $custom_query_max_pages !== $page ) { $content = sprintf( '%3$s', esc_url( add_query_arg( $page_key, $page + 1 ) ), diff --git a/src/wp-includes/blocks/query-pagination-next/block.json b/src/wp-includes/blocks/query-pagination-next/block.json index afc69d6e14..e98f99ae7e 100644 --- a/src/wp-includes/blocks/query-pagination-next/block.json +++ b/src/wp-includes/blocks/query-pagination-next/block.json @@ -1,7 +1,7 @@ { "apiVersion": 2, "name": "core/query-pagination-next", - "title": "Query Pagination Next", + "title": "Next Page", "category": "design", "parent": [ "core/query-pagination" ], "description": "Displays the next posts page link.", @@ -11,17 +11,24 @@ "type": "string" } }, - "usesContext": [ "queryId", "query" ], + "usesContext": [ "queryId", "query", "paginationArrow" ], "supports": { "reusable": false, "html": false, "color": { "gradients": true, - "link": true + "text": false }, "typography": { "fontSize": true, - "lineHeight": true + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true + } } } } diff --git a/src/wp-includes/blocks/query-pagination-numbers.php b/src/wp-includes/blocks/query-pagination-numbers.php index 9d27e88519..60fe85efa1 100644 --- a/src/wp-includes/blocks/query-pagination-numbers.php +++ b/src/wp-includes/blocks/query-pagination-numbers.php @@ -45,6 +45,28 @@ function render_block_core_query_pagination_numbers( $attributes, $content, $blo 'total' => $total, 'prev_next' => false, ); + if ( 1 !== $page ) { + /** + * `paginate_links` doesn't use the provided `format` when the page is `1`. + * This is great for the main query as it removes the extra query params + * making the URL shorter, but in the case of multiple custom queries is + * problematic. It results in returning an empty link which ends up with + * a link to the current page. + * + * A way to address this is to add a `fake` query arg with no value that + * is the same for all custom queries. This way the link is not empty and + * preserves all the other existent query args. + * + * @see https://developer.wordpress.org/reference/functions/paginate_links/ + * + * The proper fix of this should be in core. Track Ticket: + * @see https://core.trac.wordpress.org/ticket/53868 + * + * TODO: After two WP versions (starting from the WP version the core patch landed), + * we should remove this and call `paginate_links` with the proper new arg. + */ + $paginate_args['add_args'] = array( 'cst' => '' ); + } // We still need to preserve `paged` query param if exists, as is used // for Queries that inherit from global context. $paged = empty( $_GET['paged'] ) ? null : (int) $_GET['paged']; diff --git a/src/wp-includes/blocks/query-pagination-numbers/block.json b/src/wp-includes/blocks/query-pagination-numbers/block.json index d9142de147..6e8609102c 100644 --- a/src/wp-includes/blocks/query-pagination-numbers/block.json +++ b/src/wp-includes/blocks/query-pagination-numbers/block.json @@ -1,7 +1,7 @@ { "apiVersion": 2, "name": "core/query-pagination-numbers", - "title": "Query Pagination Numbers", + "title": "Page Numbers", "category": "design", "parent": [ "core/query-pagination" ], "description": "Displays a list of page numbers for pagination", diff --git a/src/wp-includes/blocks/query-pagination-previous.php b/src/wp-includes/blocks/query-pagination-previous.php index 676347de8e..4750649672 100644 --- a/src/wp-includes/blocks/query-pagination-previous.php +++ b/src/wp-includes/blocks/query-pagination-previous.php @@ -19,9 +19,13 @@ function render_block_core_query_pagination_previous( $attributes, $content, $bl $page = empty( $_GET[ $page_key ] ) ? 1 : (int) $_GET[ $page_key ]; $wrapper_attributes = get_block_wrapper_attributes(); - $default_label = __( '« Previous Page' ); + $default_label = __( 'Previous Page' ); $label = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? $attributes['label'] : $default_label; - $content = ''; + $pagination_arrow = get_query_pagination_arrow( $block, false ); + if ( $pagination_arrow ) { + $label = $pagination_arrow . $label; + } + $content = ''; // Check if the pagination is for Query that inherits the global context // and handle appropriately. if ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] ) { diff --git a/src/wp-includes/blocks/query-pagination-previous/block.json b/src/wp-includes/blocks/query-pagination-previous/block.json index 78a53867d0..c73b924c3f 100644 --- a/src/wp-includes/blocks/query-pagination-previous/block.json +++ b/src/wp-includes/blocks/query-pagination-previous/block.json @@ -1,7 +1,7 @@ { "apiVersion": 2, "name": "core/query-pagination-previous", - "title": "Query Pagination Previous", + "title": "Previous Page", "category": "design", "parent": [ "core/query-pagination" ], "description": "Displays the previous posts page link.", @@ -11,17 +11,24 @@ "type": "string" } }, - "usesContext": [ "queryId", "query" ], + "usesContext": [ "queryId", "query", "paginationArrow" ], "supports": { "reusable": false, "html": false, "color": { "gradients": true, - "link": true + "text": false }, "typography": { "fontSize": true, - "lineHeight": true + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true + } } } } diff --git a/src/wp-includes/blocks/query-pagination.php b/src/wp-includes/blocks/query-pagination.php index a9f31bf78f..ae32242bc9 100644 --- a/src/wp-includes/blocks/query-pagination.php +++ b/src/wp-includes/blocks/query-pagination.php @@ -5,12 +5,35 @@ * @package WordPress */ +/** + * Renders the `core/query-pagination` block on the server. + * + * @param array $attributes Block attributes. + * @param string $content Block default content. + * + * @return string Returns the wrapper for the Query pagination. + */ +function render_block_core_query_pagination( $attributes, $content ) { + if ( empty( trim( $content ) ) ) { + return ''; + } + + return sprintf( + '
    %2$s
    ', + get_block_wrapper_attributes(), + $content + ); +} + /** * Registers the `core/query-pagination` block on the server. */ function register_block_core_query_pagination() { register_block_type_from_metadata( - __DIR__ . '/query-pagination' + __DIR__ . '/query-pagination', + array( + 'render_callback' => 'render_block_core_query_pagination', + ) ); } add_action( 'init', 'register_block_core_query_pagination' ); diff --git a/src/wp-includes/blocks/query-pagination/block.json b/src/wp-includes/blocks/query-pagination/block.json index c1de24977f..6732e425f3 100644 --- a/src/wp-includes/blocks/query-pagination/block.json +++ b/src/wp-includes/blocks/query-pagination/block.json @@ -1,12 +1,21 @@ { "apiVersion": 2, "name": "core/query-pagination", - "title": "Query Pagination", + "title": "Pagination", "category": "design", "parent": [ "core/query" ], "description": "Displays a paginated navigation to next/previous set of posts, when applicable.", "textdomain": "default", + "attributes": { + "paginationArrow": { + "type": "string", + "default": "none" + } + }, "usesContext": [ "queryId", "query" ], + "providesContext": { + "paginationArrow": "paginationArrow" + }, "supports": { "align": true, "reusable": false, @@ -14,6 +23,13 @@ "color": { "gradients": true, "link": true + }, + "__experimentalLayout": { + "allowSwitching": false, + "allowInheriting": false, + "default": { + "type": "flex" + } } }, "editorStyle": "wp-block-query-pagination-editor", diff --git a/src/wp-includes/blocks/query-title/block.json b/src/wp-includes/blocks/query-title/block.json index 3e5d43fc50..5f737d5749 100644 --- a/src/wp-includes/blocks/query-title/block.json +++ b/src/wp-includes/blocks/query-title/block.json @@ -2,7 +2,7 @@ "apiVersion": 2, "name": "core/query-title", "title": "Query Title", - "category": "design", + "category": "theme", "description": "Display the query title.", "textdomain": "default", "attributes": { @@ -23,10 +23,22 @@ "color": { "gradients": true }, + "spacing": { + "margin": true + }, "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true, + "fontAppearance": true, + "textTransform": true + } } }, "editorStyle": "wp-block-query-title-editor" diff --git a/src/wp-includes/blocks/quote/block.json b/src/wp-includes/blocks/quote/block.json index 9bae4dff96..ad3f199e0f 100644 --- a/src/wp-includes/blocks/quote/block.json +++ b/src/wp-includes/blocks/quote/block.json @@ -27,7 +27,20 @@ } }, "supports": { - "anchor": true + "anchor": true, + "__experimentalSlashInserter": true, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true, + "fontAppearance": true + } + } }, "styles": [ { @@ -35,6 +48,7 @@ "label": "Default", "isDefault": true }, + { "name": "plain", "label": "Plain" }, { "name": "large", "label": "Large" } ], "editorStyle": "wp-block-quote-editor", diff --git a/src/wp-includes/blocks/search.php b/src/wp-includes/blocks/search.php index eba67deeec..991e2fa1f8 100644 --- a/src/wp-includes/blocks/search.php +++ b/src/wp-includes/blocks/search.php @@ -27,53 +27,60 @@ function render_block_core_search( $attributes ) { ) ); - $input_id = 'wp-block-search__input-' . ++$instance_id; - $classnames = classnames_for_block_core_search( $attributes ); - $show_label = ( ! empty( $attributes['showLabel'] ) ) ? true : false; - $use_icon_button = ( ! empty( $attributes['buttonUseIcon'] ) ) ? true : false; - $show_input = ( ! empty( $attributes['buttonPosition'] ) && 'button-only' === $attributes['buttonPosition'] ) ? false : true; - $show_button = ( ! empty( $attributes['buttonPosition'] ) && 'no-button' === $attributes['buttonPosition'] ) ? false : true; - $label_markup = ''; - $input_markup = ''; - $button_markup = ''; - $inline_styles = styles_for_block_core_search( $attributes ); - - if ( $show_label ) { - if ( ! empty( $attributes['label'] ) ) { - $label_markup = sprintf( - '', - $input_id, - $attributes['label'] - ); - } else { - $label_markup = sprintf( - '', - $input_id, - __( 'Search' ) - ); - } + $input_id = 'wp-block-search__input-' . ++$instance_id; + $classnames = classnames_for_block_core_search( $attributes ); + $show_label = ( ! empty( $attributes['showLabel'] ) ) ? true : false; + $use_icon_button = ( ! empty( $attributes['buttonUseIcon'] ) ) ? true : false; + $show_input = ( ! empty( $attributes['buttonPosition'] ) && 'button-only' === $attributes['buttonPosition'] ) ? false : true; + $show_button = ( ! empty( $attributes['buttonPosition'] ) && 'no-button' === $attributes['buttonPosition'] ) ? false : true; + $label_markup = ''; + $input_markup = ''; + $button_markup = ''; + $inline_styles = styles_for_block_core_search( $attributes ); + $color_classes = get_color_classes_for_block_core_search( $attributes ); + $is_button_inside = ! empty( $attributes['buttonPosition'] ) && + 'button-inside' === $attributes['buttonPosition']; + // Border color classes need to be applied to the elements that have a border color. + $border_color_classes = get_border_color_classes_for_block_core_search( $attributes ); + + $label_markup = sprintf( + '', + $input_id, + empty( $attributes['label'] ) ? __( 'Search' ) : esc_html( $attributes['label'] ) + ); + if ( $show_label && ! empty( $attributes['label'] ) ) { + $label_markup = sprintf( + '', + $input_id, + esc_html( $attributes['label'] ) + ); } if ( $show_input ) { - $input_markup = sprintf( - '', + $input_classes = ! $is_button_inside ? $border_color_classes : ''; + $input_markup = sprintf( + '', $input_id, + esc_attr( $input_classes ), esc_attr( get_search_query() ), esc_attr( $attributes['placeholder'] ), - $inline_styles['shared'] + $inline_styles['input'] ); } if ( $show_button ) { $button_internal_markup = ''; - $button_classes = ''; + $button_classes = $color_classes; + if ( ! $is_button_inside ) { + $button_classes .= ' ' . $border_color_classes; + } if ( ! $use_icon_button ) { if ( ! empty( $attributes['buttonText'] ) ) { - $button_internal_markup = $attributes['buttonText']; + $button_internal_markup = esc_html( $attributes['buttonText'] ); } } else { - $button_classes .= 'has-icon'; + $button_classes .= ' has-icon'; $button_internal_markup = ' @@ -81,19 +88,21 @@ function render_block_core_search( $attributes ) { } $button_markup = sprintf( - '', - $button_classes, - $inline_styles['shared'], + '', + esc_attr( $button_classes ), + $inline_styles['button'], $button_internal_markup ); } - $field_markup = sprintf( - '
    %s
    ', + $field_markup_classes = $is_button_inside ? $border_color_classes : ''; + $field_markup = sprintf( + '
    %s
    ', + esc_attr( $field_markup_classes ), $inline_styles['wrapper'], $input_markup . $button_markup ); - $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) ); + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) ); return sprintf( '
    %s
    ', @@ -169,8 +178,9 @@ function classnames_for_block_core_search( $attributes ) { * @return array Style HTML attribute. */ function styles_for_block_core_search( $attributes ) { - $shared_styles = array(); $wrapper_styles = array(); + $button_styles = array(); + $input_styles = array(); // Add width styles. $has_width = ! empty( $attributes['width'] ) && ! empty( $attributes['widthUnit'] ); @@ -188,26 +198,155 @@ function styles_for_block_core_search( $attributes ) { $has_border_radius = ! empty( $attributes['style']['border']['radius'] ); if ( $has_border_radius ) { - // Shared style for button and input radius values. + $default_padding = '4px'; $border_radius = $attributes['style']['border']['radius']; - $shared_styles[] = sprintf( 'border-radius: %spx;', esc_attr( $border_radius ) ); - // Apply wrapper border radius if button placed inside. - $button_inside = ! empty( $attributes['buttonPosition'] ) && + $is_button_inside = ! empty( $attributes['buttonPosition'] ) && + 'button-inside' === $attributes['buttonPosition']; + + if ( is_array( $border_radius ) ) { + // Apply styles for individual corner border radii. + foreach ( $border_radius as $key => $value ) { + if ( null !== $value ) { + // Convert camelCase key to kebab-case. + $name = strtolower( preg_replace( '/(? ! empty( $shared_styles ) ? sprintf( ' style="%s"', implode( ' ', $shared_styles ) ) : '', - 'wrapper' => ! empty( $wrapper_styles ) ? sprintf( ' style="%s"', implode( ' ', $wrapper_styles ) ) : '', + 'input' => ! empty( $input_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $input_styles ) ) ) : '', + 'button' => ! empty( $button_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $button_styles ) ) ) : '', + 'wrapper' => ! empty( $wrapper_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $wrapper_styles ) ) ) : '', ); } + +/** + * Returns border color classnames depending on whether there are named or custom border colors. + * + * @param array $attributes The block attributes. + * + * @return string The border color classnames to be applied to the block elements. + */ +function get_border_color_classes_for_block_core_search( $attributes ) { + $has_custom_border_color = ! empty( $attributes['style']['border']['color'] ); + $border_color_classes = ! empty( $attributes['borderColor'] ) ? sprintf( 'has-border-color has-%s-border-color', $attributes['borderColor'] ) : ''; + // If there's a border color style and no `borderColor` text string, we still want to add the generic `has-border-color` class name to the element. + if ( $has_custom_border_color && empty( $attributes['borderColor'] ) ) { + $border_color_classes = 'has-border-color'; + } + return $border_color_classes; +} + +/** + * Returns color classnames depending on whether there are named or custom text and background colors. + * + * @param array $attributes The block attributes. + * + * @return string The color classnames to be applied to the block elements. + */ +function get_color_classes_for_block_core_search( $attributes ) { + $classnames = array(); + + // Text color. + $has_named_text_color = ! empty( $attributes['textColor'] ); + $has_custom_text_color = ! empty( $attributes['style']['color']['text'] ); + if ( $has_named_text_color ) { + $classnames[] = sprintf( 'has-text-color has-%s-color', $attributes['textColor'] ); + } elseif ( $has_custom_text_color ) { + // If a custom 'textColor' was selected instead of a preset, still add the generic `has-text-color` class. + $classnames[] = 'has-text-color'; + } + + // Background color. + $has_named_background_color = ! empty( $attributes['backgroundColor'] ); + $has_custom_background_color = ! empty( $attributes['style']['color']['background'] ); + $has_named_gradient = ! empty( $attributes['gradient'] ); + $has_custom_gradient = ! empty( $attributes['style']['color']['gradient'] ); + if ( + $has_named_background_color || + $has_custom_background_color || + $has_named_gradient || + $has_custom_gradient + ) { + $classnames[] = 'has-background'; + } + if ( $has_named_background_color ) { + $classnames[] = sprintf( 'has-%s-background-color', $attributes['backgroundColor'] ); + } + if ( $has_named_gradient ) { + $classnames[] = sprintf( 'has-%s-gradient-background', $attributes['gradient'] ); + } + + return implode( ' ', $classnames ); +} diff --git a/src/wp-includes/blocks/search/block.json b/src/wp-includes/blocks/search/block.json index b96f14f53c..d2b3e08e94 100644 --- a/src/wp-includes/blocks/search/block.json +++ b/src/wp-includes/blocks/search/block.json @@ -41,7 +41,12 @@ }, "supports": { "align": [ "left", "center", "right" ], + "color": { + "gradients": true, + "__experimentalSkipSerialization": true + }, "__experimentalBorder": { + "color": true, "radius": true, "__experimentalSkipSerialization": true }, diff --git a/src/wp-includes/blocks/site-logo.php b/src/wp-includes/blocks/site-logo.php index ef24e73e1e..37a8417ea0 100644 --- a/src/wp-includes/blocks/site-logo.php +++ b/src/wp-includes/blocks/site-logo.php @@ -48,10 +48,6 @@ function render_block_core_site_logo( $attributes ) { $classnames[] = $attributes['className']; } - if ( ! empty( $attributes['align'] ) && in_array( $attributes['align'], array( 'center', 'left', 'right' ), true ) ) { - $classnames[] = "align{$attributes['align']}"; - } - if ( empty( $attributes['width'] ) ) { $classnames[] = 'is-default-size'; } @@ -80,6 +76,23 @@ function register_block_core_site_logo_setting() { add_action( 'rest_api_init', 'register_block_core_site_logo_setting', 10 ); +/** + * Register a core site setting for a site icon + */ +function register_block_core_site_icon_setting() { + register_setting( + 'general', + 'site_icon', + array( + 'show_in_rest' => true, + 'type' => 'integer', + 'description' => __( 'Site icon.' ), + ) + ); +} + +add_action( 'rest_api_init', 'register_block_core_site_icon_setting', 10 ); + /** * Registers the `core/site-logo` block on the server. */ @@ -133,6 +146,12 @@ add_filter( 'pre_set_theme_mod_custom_logo', '_sync_custom_logo_to_site_logo' ); * @param array $value Updated theme mod settings. */ function _delete_site_logo_on_remove_custom_logo( $old_value, $value ) { + global $_ignore_site_logo_changes; + + if ( $_ignore_site_logo_changes ) { + return; + } + // If the custom_logo is being unset, it's being removed from theme mods. if ( isset( $old_value['custom_logo'] ) && ! isset( $value['custom_logo'] ) ) { delete_option( 'site_logo' ); @@ -143,6 +162,12 @@ function _delete_site_logo_on_remove_custom_logo( $old_value, $value ) { * Deletes the site logo when all theme mods are being removed. */ function _delete_site_logo_on_remove_theme_mods() { + global $_ignore_site_logo_changes; + + if ( $_ignore_site_logo_changes ) { + return; + } + if ( false !== get_theme_support( 'custom-logo' ) ) { delete_option( 'site_logo' ); } @@ -160,3 +185,21 @@ function _delete_site_logo_on_remove_custom_logo_on_setup_theme() { add_action( "delete_option_theme_mods_$theme", '_delete_site_logo_on_remove_theme_mods' ); } add_action( 'setup_theme', '_delete_site_logo_on_remove_custom_logo_on_setup_theme', 11 ); + +/** + * Removes the custom_logo theme-mod when the site_logo option gets deleted. + */ +function _delete_custom_logo_on_remove_site_logo() { + global $_ignore_site_logo_changes; + + // Prevent _delete_site_logo_on_remove_custom_logo and + // _delete_site_logo_on_remove_theme_mods from firing and causing an + // infinite loop. + $_ignore_site_logo_changes = true; + + // Remove the custom logo. + remove_theme_mod( 'custom_logo' ); + + $_ignore_site_logo_changes = false; +} +add_action( 'delete_option_site_logo', '_delete_custom_logo_on_remove_site_logo' ); diff --git a/src/wp-includes/blocks/site-logo/block.json b/src/wp-includes/blocks/site-logo/block.json index c40cfcdd2b..60ac8b5bea 100644 --- a/src/wp-includes/blocks/site-logo/block.json +++ b/src/wp-includes/blocks/site-logo/block.json @@ -2,13 +2,10 @@ "apiVersion": 2, "name": "core/site-logo", "title": "Site Logo", - "category": "layout", - "description": "Useful for displaying a graphic mark, design, or symbol to represent the site. Once a site logo is set, it can be reused in different places and templates. It should not be confused with the site icon, which is the small image used in the dashboard, browser tabs, public search results, etc, to help recognize a site.", + "category": "theme", + "description": "Display a graphic to represent this site. Update the block, and the changes apply everywhere it’s used. This is different than the site icon, which is the smaller image visible in your dashboard, browser tabs, etc used to help others recognize this site.", "textdomain": "default", "attributes": { - "align": { - "type": "string" - }, "width": { "type": "number" }, @@ -19,12 +16,27 @@ "linkTarget": { "type": "string", "default": "_self" + }, + "shouldSyncIcon": { + "type": "boolean" + } + }, + "example": { + "viewportWidth": 500, + "attributes": { + "width": 350, + "className": "block-editor-block-types-list__site-logo-example" } }, "supports": { "html": false, "align": true, - "alignWide": false + "alignWide": false, + "color": { + "__experimentalDuotone": "img", + "text": false, + "background": false + } }, "styles": [ { diff --git a/src/wp-includes/blocks/site-logo/editor-rtl.css b/src/wp-includes/blocks/site-logo/editor-rtl.css index 0c8910804f..5046b5ca0f 100644 --- a/src/wp-includes/blocks/site-logo/editor-rtl.css +++ b/src/wp-includes/blocks/site-logo/editor-rtl.css @@ -40,6 +40,12 @@ * React Native specific. * These variables do not appear to be used anywhere else. */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ /** * Breakpoint mixins */ @@ -69,23 +75,14 @@ * Reset the WP Admin page styles for Gutenberg-like pages. */ .wp-block[data-align=center] > .wp-block-site-logo { + display: table; margin-right: auto; margin-left: auto; - text-align: center; } .wp-block-site-logo a { pointer-events: none; } -.wp-block-site-logo:not(.is-default-size) { - display: table; -} -.wp-block-site-logo.is-default-size { - width: 120px; -} -.wp-block-site-logo.is-default-size img { - width: 100%; -} .wp-block-site-logo .custom-logo-link { cursor: inherit; } @@ -97,26 +94,34 @@ } .wp-block-site-logo img { display: block; + height: auto; max-width: 100%; } -.wp-block-site-logo .components-placeholder { - justify-content: flex-start; - min-height: auto; - height: 120px; - padding: 12px; + +.wp-block-site-logo.wp-block-site-logo .components-placeholder, +.wp-block-site-logo.wp-block-site-logo .components-resizable-box__container { + border-radius: inherit; } -.wp-block-site-logo .components-placeholder .components-placeholder__label { - margin-top: 12px; - white-space: nowrap; +.wp-block-site-logo.wp-block-site-logo.is-default-size .components-placeholder { + height: 120px; + width: 120px; } -.wp-block-site-logo .components-placeholder .components-placeholder__label .block-editor-block-icon, -.wp-block-site-logo .components-placeholder .components-placeholder__label > svg { - margin-left: 4px; +.wp-block-site-logo.wp-block-site-logo .components-placeholder { + justify-content: center; + align-items: center; + box-shadow: none; + padding: 0; + min-height: 48px; + min-width: 48px; + height: 100%; + width: 100%; + color: currentColor; + background: transparent; } -.wp-block-site-logo .components-placeholder .components-form-file-upload { +.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-form-file-upload { display: none; } -.wp-block-site-logo .components-placeholder .components-placeholder__preview { +.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__preview { position: absolute; top: 4px; left: 4px; @@ -127,6 +132,65 @@ align-items: center; justify-content: center; } -.wp-block-site-logo .components-placeholder .components-drop-zone__content-text { +.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-drop-zone__content-text { display: none; +} +.wp-block-site-logo.wp-block-site-logo .components-placeholder::before { + content: ""; + display: block; + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + border: 1px dashed currentColor; + opacity: 0.4; + pointer-events: none; + border-radius: inherit; +} +.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__fieldset { + width: auto; +} +.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button { + color: inherit; + padding: 0; + display: flex; + justify-content: center; + align-items: center; + width: 48px; + height: 48px; + border-radius: 50%; + position: relative; + visibility: hidden; + background: transparent; + transition: all 0.1s linear; +} +@media (prefers-reduced-motion: reduce) { + .wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button { + transition-duration: 0s; + transition-delay: 0s; + } +} +.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button > svg { + color: #fff; +} +.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__illustration { + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + width: 100%; + height: 100%; + stroke: currentColor; + stroke-dasharray: 3; + opacity: 0.4; +} +.wp-block-site-logo.wp-block-site-logo.is-selected .components-button.components-button { + background: var(--wp-admin-theme-color); + border-color: var(--wp-admin-theme-color); + border-style: solid; + color: #fff; + opacity: 1; + visibility: visible; } \ No newline at end of file diff --git a/src/wp-includes/blocks/site-logo/editor-rtl.min.css b/src/wp-includes/blocks/site-logo/editor-rtl.min.css index 9e9df73b74..6911b907ac 100644 --- a/src/wp-includes/blocks/site-logo/editor-rtl.min.css +++ b/src/wp-includes/blocks/site-logo/editor-rtl.min.css @@ -1 +1 @@ -.wp-block[data-align=center]>.wp-block-site-logo{margin-right:auto;margin-left:auto;text-align:center}.wp-block-site-logo a{pointer-events:none}.wp-block-site-logo:not(.is-default-size){display:table}.wp-block-site-logo.is-default-size{width:120px}.wp-block-site-logo.is-default-size img{width:100%}.wp-block-site-logo .custom-logo-link{cursor:inherit}.wp-block-site-logo .custom-logo-link:focus{box-shadow:none}.wp-block-site-logo .custom-logo-link.is-transient img{opacity:.3}.wp-block-site-logo img{display:block;max-width:100%}.wp-block-site-logo .components-placeholder{justify-content:flex-start;min-height:auto;height:120px;padding:12px}.wp-block-site-logo .components-placeholder .components-placeholder__label{margin-top:12px;white-space:nowrap}.wp-block-site-logo .components-placeholder .components-placeholder__label .block-editor-block-icon,.wp-block-site-logo .components-placeholder .components-placeholder__label>svg{margin-left:4px}.wp-block-site-logo .components-placeholder .components-form-file-upload{display:none}.wp-block-site-logo .components-placeholder .components-placeholder__preview{position:absolute;top:4px;left:4px;bottom:4px;right:4px;background:hsla(0,0%,100%,.8);display:flex;align-items:center;justify-content:center}.wp-block-site-logo .components-placeholder .components-drop-zone__content-text{display:none} \ No newline at end of file +.wp-block[data-align=center]>.wp-block-site-logo{display:table;margin-right:auto;margin-left:auto}.wp-block-site-logo a{pointer-events:none}.wp-block-site-logo .custom-logo-link{cursor:inherit}.wp-block-site-logo .custom-logo-link:focus{box-shadow:none}.wp-block-site-logo .custom-logo-link.is-transient img{opacity:.3}.wp-block-site-logo img{display:block;height:auto;max-width:100%}.wp-block-site-logo.wp-block-site-logo .components-placeholder,.wp-block-site-logo.wp-block-site-logo .components-resizable-box__container{border-radius:inherit}.wp-block-site-logo.wp-block-site-logo.is-default-size .components-placeholder{height:120px;width:120px}.wp-block-site-logo.wp-block-site-logo .components-placeholder{justify-content:center;align-items:center;box-shadow:none;padding:0;min-height:48px;min-width:48px;height:100%;width:100%;color:currentColor;background:transparent}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-form-file-upload{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__preview{position:absolute;top:4px;left:4px;bottom:4px;right:4px;background:hsla(0,0%,100%,.8);display:flex;align-items:center;justify-content:center}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-drop-zone__content-text{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder:before{content:"";display:block;position:absolute;top:0;left:0;bottom:0;right:0;border:1px dashed;opacity:.4;pointer-events:none;border-radius:inherit}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__fieldset{width:auto}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{color:inherit;padding:0;display:flex;justify-content:center;align-items:center;width:48px;height:48px;border-radius:50%;position:relative;visibility:hidden;background:transparent;transition:all .1s linear}@media (prefers-reduced-motion:reduce){.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{transition-duration:0s;transition-delay:0s}}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button>svg{color:#fff}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__illustration{position:absolute;top:0;left:0;bottom:0;right:0;width:100%;height:100%;stroke:currentColor;stroke-dasharray:3;opacity:.4}.wp-block-site-logo.wp-block-site-logo.is-selected .components-button.components-button{background:var(--wp-admin-theme-color);border-color:var(--wp-admin-theme-color);border-style:solid;color:#fff;opacity:1;visibility:visible} \ No newline at end of file diff --git a/src/wp-includes/blocks/site-logo/editor.css b/src/wp-includes/blocks/site-logo/editor.css index ec977aa055..395e7e09dc 100644 --- a/src/wp-includes/blocks/site-logo/editor.css +++ b/src/wp-includes/blocks/site-logo/editor.css @@ -40,6 +40,12 @@ * React Native specific. * These variables do not appear to be used anywhere else. */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ /** * Breakpoint mixins */ @@ -69,23 +75,14 @@ * Reset the WP Admin page styles for Gutenberg-like pages. */ .wp-block[data-align=center] > .wp-block-site-logo { + display: table; margin-left: auto; margin-right: auto; - text-align: center; } .wp-block-site-logo a { pointer-events: none; } -.wp-block-site-logo:not(.is-default-size) { - display: table; -} -.wp-block-site-logo.is-default-size { - width: 120px; -} -.wp-block-site-logo.is-default-size img { - width: 100%; -} .wp-block-site-logo .custom-logo-link { cursor: inherit; } @@ -97,26 +94,34 @@ } .wp-block-site-logo img { display: block; + height: auto; max-width: 100%; } -.wp-block-site-logo .components-placeholder { - justify-content: flex-start; - min-height: auto; - height: 120px; - padding: 12px; + +.wp-block-site-logo.wp-block-site-logo .components-placeholder, +.wp-block-site-logo.wp-block-site-logo .components-resizable-box__container { + border-radius: inherit; } -.wp-block-site-logo .components-placeholder .components-placeholder__label { - margin-top: 12px; - white-space: nowrap; +.wp-block-site-logo.wp-block-site-logo.is-default-size .components-placeholder { + height: 120px; + width: 120px; } -.wp-block-site-logo .components-placeholder .components-placeholder__label .block-editor-block-icon, -.wp-block-site-logo .components-placeholder .components-placeholder__label > svg { - margin-right: 4px; +.wp-block-site-logo.wp-block-site-logo .components-placeholder { + justify-content: center; + align-items: center; + box-shadow: none; + padding: 0; + min-height: 48px; + min-width: 48px; + height: 100%; + width: 100%; + color: currentColor; + background: transparent; } -.wp-block-site-logo .components-placeholder .components-form-file-upload { +.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-form-file-upload { display: none; } -.wp-block-site-logo .components-placeholder .components-placeholder__preview { +.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__preview { position: absolute; top: 4px; right: 4px; @@ -127,6 +132,65 @@ align-items: center; justify-content: center; } -.wp-block-site-logo .components-placeholder .components-drop-zone__content-text { +.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-drop-zone__content-text { display: none; +} +.wp-block-site-logo.wp-block-site-logo .components-placeholder::before { + content: ""; + display: block; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + border: 1px dashed currentColor; + opacity: 0.4; + pointer-events: none; + border-radius: inherit; +} +.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__fieldset { + width: auto; +} +.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button { + color: inherit; + padding: 0; + display: flex; + justify-content: center; + align-items: center; + width: 48px; + height: 48px; + border-radius: 50%; + position: relative; + visibility: hidden; + background: transparent; + transition: all 0.1s linear; +} +@media (prefers-reduced-motion: reduce) { + .wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button { + transition-duration: 0s; + transition-delay: 0s; + } +} +.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button > svg { + color: #fff; +} +.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__illustration { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: 100%; + height: 100%; + stroke: currentColor; + stroke-dasharray: 3; + opacity: 0.4; +} +.wp-block-site-logo.wp-block-site-logo.is-selected .components-button.components-button { + background: var(--wp-admin-theme-color); + border-color: var(--wp-admin-theme-color); + border-style: solid; + color: #fff; + opacity: 1; + visibility: visible; } \ No newline at end of file diff --git a/src/wp-includes/blocks/site-logo/editor.min.css b/src/wp-includes/blocks/site-logo/editor.min.css index 0b48ccd28a..e99bcc60e1 100644 --- a/src/wp-includes/blocks/site-logo/editor.min.css +++ b/src/wp-includes/blocks/site-logo/editor.min.css @@ -1 +1 @@ -.wp-block[data-align=center]>.wp-block-site-logo{margin-left:auto;margin-right:auto;text-align:center}.wp-block-site-logo a{pointer-events:none}.wp-block-site-logo:not(.is-default-size){display:table}.wp-block-site-logo.is-default-size{width:120px}.wp-block-site-logo.is-default-size img{width:100%}.wp-block-site-logo .custom-logo-link{cursor:inherit}.wp-block-site-logo .custom-logo-link:focus{box-shadow:none}.wp-block-site-logo .custom-logo-link.is-transient img{opacity:.3}.wp-block-site-logo img{display:block;max-width:100%}.wp-block-site-logo .components-placeholder{justify-content:flex-start;min-height:auto;height:120px;padding:12px}.wp-block-site-logo .components-placeholder .components-placeholder__label{margin-top:12px;white-space:nowrap}.wp-block-site-logo .components-placeholder .components-placeholder__label .block-editor-block-icon,.wp-block-site-logo .components-placeholder .components-placeholder__label>svg{margin-right:4px}.wp-block-site-logo .components-placeholder .components-form-file-upload{display:none}.wp-block-site-logo .components-placeholder .components-placeholder__preview{position:absolute;top:4px;right:4px;bottom:4px;left:4px;background:hsla(0,0%,100%,.8);display:flex;align-items:center;justify-content:center}.wp-block-site-logo .components-placeholder .components-drop-zone__content-text{display:none} \ No newline at end of file +.wp-block[data-align=center]>.wp-block-site-logo{display:table;margin-left:auto;margin-right:auto}.wp-block-site-logo a{pointer-events:none}.wp-block-site-logo .custom-logo-link{cursor:inherit}.wp-block-site-logo .custom-logo-link:focus{box-shadow:none}.wp-block-site-logo .custom-logo-link.is-transient img{opacity:.3}.wp-block-site-logo img{display:block;height:auto;max-width:100%}.wp-block-site-logo.wp-block-site-logo .components-placeholder,.wp-block-site-logo.wp-block-site-logo .components-resizable-box__container{border-radius:inherit}.wp-block-site-logo.wp-block-site-logo.is-default-size .components-placeholder{height:120px;width:120px}.wp-block-site-logo.wp-block-site-logo .components-placeholder{justify-content:center;align-items:center;box-shadow:none;padding:0;min-height:48px;min-width:48px;height:100%;width:100%;color:currentColor;background:transparent}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-form-file-upload{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__preview{position:absolute;top:4px;right:4px;bottom:4px;left:4px;background:hsla(0,0%,100%,.8);display:flex;align-items:center;justify-content:center}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-drop-zone__content-text{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder:before{content:"";display:block;position:absolute;top:0;right:0;bottom:0;left:0;border:1px dashed;opacity:.4;pointer-events:none;border-radius:inherit}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__fieldset{width:auto}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{color:inherit;padding:0;display:flex;justify-content:center;align-items:center;width:48px;height:48px;border-radius:50%;position:relative;visibility:hidden;background:transparent;transition:all .1s linear}@media (prefers-reduced-motion:reduce){.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{transition-duration:0s;transition-delay:0s}}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button>svg{color:#fff}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__illustration{position:absolute;top:0;right:0;bottom:0;left:0;width:100%;height:100%;stroke:currentColor;stroke-dasharray:3;opacity:.4}.wp-block-site-logo.wp-block-site-logo.is-selected .components-button.components-button{background:var(--wp-admin-theme-color);border-color:var(--wp-admin-theme-color);border-style:solid;color:#fff;opacity:1;visibility:visible} \ No newline at end of file diff --git a/src/wp-includes/blocks/site-logo/style-rtl.css b/src/wp-includes/blocks/site-logo/style-rtl.css index a9f9fdd63c..9062fc1144 100644 --- a/src/wp-includes/blocks/site-logo/style-rtl.css +++ b/src/wp-includes/blocks/site-logo/style-rtl.css @@ -40,6 +40,12 @@ * React Native specific. * These variables do not appear to be used anywhere else. */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ /** * Breakpoint mixins */ @@ -78,9 +84,15 @@ width: 120px; height: auto; } -.wp-block-site-logo .aligncenter { - display: table; +.wp-block-site-logo a, +.wp-block-site-logo img { + border-radius: inherit; +} +.wp-block-site-logo.aligncenter { + margin-right: auto; + margin-left: auto; + text-align: center; } -.wp-block-site-logo.is-style-rounded img { +.wp-block-site-logo.is-style-rounded { border-radius: 9999px; } \ No newline at end of file diff --git a/src/wp-includes/blocks/site-logo/style-rtl.min.css b/src/wp-includes/blocks/site-logo/style-rtl.min.css index 79b08e68b0..b77c9a0046 100644 --- a/src/wp-includes/blocks/site-logo/style-rtl.min.css +++ b/src/wp-includes/blocks/site-logo/style-rtl.min.css @@ -1 +1 @@ -.wp-block-site-logo{line-height:0}.wp-block-site-logo a{display:inline-block}.wp-block-site-logo.is-default-size img{width:120px;height:auto}.wp-block-site-logo .aligncenter{display:table}.wp-block-site-logo.is-style-rounded img{border-radius:9999px} \ No newline at end of file +.wp-block-site-logo{line-height:0}.wp-block-site-logo a{display:inline-block}.wp-block-site-logo.is-default-size img{width:120px;height:auto}.wp-block-site-logo a,.wp-block-site-logo img{border-radius:inherit}.wp-block-site-logo.aligncenter{margin-right:auto;margin-left:auto;text-align:center}.wp-block-site-logo.is-style-rounded{border-radius:9999px} \ No newline at end of file diff --git a/src/wp-includes/blocks/site-logo/style.css b/src/wp-includes/blocks/site-logo/style.css index a9f9fdd63c..27ca9707b5 100644 --- a/src/wp-includes/blocks/site-logo/style.css +++ b/src/wp-includes/blocks/site-logo/style.css @@ -40,6 +40,12 @@ * React Native specific. * These variables do not appear to be used anywhere else. */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ /** * Breakpoint mixins */ @@ -78,9 +84,15 @@ width: 120px; height: auto; } -.wp-block-site-logo .aligncenter { - display: table; +.wp-block-site-logo a, +.wp-block-site-logo img { + border-radius: inherit; +} +.wp-block-site-logo.aligncenter { + margin-left: auto; + margin-right: auto; + text-align: center; } -.wp-block-site-logo.is-style-rounded img { +.wp-block-site-logo.is-style-rounded { border-radius: 9999px; } \ No newline at end of file diff --git a/src/wp-includes/blocks/site-logo/style.min.css b/src/wp-includes/blocks/site-logo/style.min.css index 79b08e68b0..2f58ac8399 100644 --- a/src/wp-includes/blocks/site-logo/style.min.css +++ b/src/wp-includes/blocks/site-logo/style.min.css @@ -1 +1 @@ -.wp-block-site-logo{line-height:0}.wp-block-site-logo a{display:inline-block}.wp-block-site-logo.is-default-size img{width:120px;height:auto}.wp-block-site-logo .aligncenter{display:table}.wp-block-site-logo.is-style-rounded img{border-radius:9999px} \ No newline at end of file +.wp-block-site-logo{line-height:0}.wp-block-site-logo a{display:inline-block}.wp-block-site-logo.is-default-size img{width:120px;height:auto}.wp-block-site-logo a,.wp-block-site-logo img{border-radius:inherit}.wp-block-site-logo.aligncenter{margin-left:auto;margin-right:auto;text-align:center}.wp-block-site-logo.is-style-rounded{border-radius:9999px} \ No newline at end of file diff --git a/src/wp-includes/blocks/site-tagline/block.json b/src/wp-includes/blocks/site-tagline/block.json index 13ba84c968..61428975ed 100644 --- a/src/wp-includes/blocks/site-tagline/block.json +++ b/src/wp-includes/blocks/site-tagline/block.json @@ -2,7 +2,7 @@ "apiVersion": 2, "name": "core/site-tagline", "title": "Site Tagline", - "category": "design", + "category": "theme", "description": "Describe in a few words what the website is about. The tagline can be used in search results or when sharing on social networks even if it's not displayed in the theme design.", "keywords": [ "description" ], "textdomain": "default", @@ -12,6 +12,7 @@ } }, "supports": { + "align": [ "wide", "full" ], "html": false, "color": { "gradients": true @@ -24,7 +25,13 @@ "fontSize": true, "lineHeight": true, "__experimentalFontFamily": true, - "__experimentalTextTransform": true + "__experimentalTextTransform": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalDefaultControls": { + "fontSize": true + } } }, "editorStyle": "wp-block-site-tagline-editor" diff --git a/src/wp-includes/blocks/site-title.php b/src/wp-includes/blocks/site-title.php index 079187f500..a7de6feffa 100644 --- a/src/wp-includes/blocks/site-title.php +++ b/src/wp-includes/blocks/site-title.php @@ -21,18 +21,31 @@ function render_block_core_site_title( $attributes ) { $tag_name = 'h1'; $align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}"; + $aria_current = is_home() || ( is_front_page() && 'page' === get_option( 'show_on_front' ) ) ? ' aria-current="page"' : ''; + if ( isset( $attributes['level'] ) ) { $tag_name = 0 === $attributes['level'] ? 'p' : 'h' . $attributes['level']; } - $link = sprintf( '%2$s', get_bloginfo( 'url' ), $site_title ); + if ( $attributes['isLink'] ) { + $link_attrs = array( + 'href="' . get_bloginfo( 'url' ) . '"', + 'rel="home"', + $aria_current, + ); + if ( '_blank' === $attributes['linkTarget'] ) { + $link_attrs[] = 'target="_blank"'; + $link_attrs[] = 'aria-label="' . esc_attr__( '(opens in a new tab)' ) . '"'; + } + $site_title = sprintf( '%2$s', implode( ' ', $link_attrs ), $site_title ); + } $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) ); return sprintf( '<%1$s %2$s>%3$s', $tag_name, $wrapper_attributes, - $link + $site_title ); } diff --git a/src/wp-includes/blocks/site-title/block.json b/src/wp-includes/blocks/site-title/block.json index c43f078dac..7030ed68cf 100644 --- a/src/wp-includes/blocks/site-title/block.json +++ b/src/wp-includes/blocks/site-title/block.json @@ -2,8 +2,8 @@ "apiVersion": 2, "name": "core/site-title", "title": "Site Title", - "category": "design", - "description": "Displays and allows editing the name of the site. The site title usually appears in the browser title bar, in search results, and more. Also available in Settings > General.", + "category": "theme", + "description": "Displays the name of this site. Update the block, and the changes apply everywhere it’s used. This will also appear in the browser title bar and in search results.", "textdomain": "default", "attributes": { "level": { @@ -12,14 +12,24 @@ }, "textAlign": { "type": "string" + }, + "isLink": { + "type": "boolean", + "default": true + }, + "linkTarget": { + "type": "string", + "default": "_self" } }, + "example": { + "viewportWidth": 500 + }, "supports": { "align": [ "wide", "full" ], "html": false, "color": { "gradients": true, - "text": false, "link": true }, "spacing": { @@ -32,7 +42,15 @@ "__experimentalFontFamily": true, "__experimentalTextTransform": true, "__experimentalFontStyle": true, - "__experimentalFontWeight": true + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalDefaultControls": { + "fontSize": true, + "lineHeight": true, + "fontAppearance": true, + "letterSpacing": true, + "textTransform": true + } } }, "editorStyle": "wp-block-site-title-editor" diff --git a/src/wp-includes/blocks/social-links/block.json b/src/wp-includes/blocks/social-links/block.json index b559ae04fa..091b7ba614 100644 --- a/src/wp-includes/blocks/social-links/block.json +++ b/src/wp-includes/blocks/social-links/block.json @@ -40,7 +40,29 @@ }, "supports": { "align": [ "left", "center", "right" ], - "anchor": true + "anchor": true, + "__experimentalExposeControlsToChildren": true, + "__experimentalLayout": { + "allowSwitching": false, + "allowInheriting": false, + "default": { + "type": "flex" + } + }, + "spacing": { + "blockGap": true, + "margin": [ "top", "bottom" ], + "units": [ + "px", + "em", + "rem", + "vh", + "vw" + ], + "__experimentalDefaultControls": { + "blockGap": true + } + } }, "styles": [ { "name": "default", "label": "Default", "isDefault": true }, diff --git a/src/wp-includes/blocks/table/block.json b/src/wp-includes/blocks/table/block.json index 01e5c58520..2890d09545 100644 --- a/src/wp-includes/blocks/table/block.json +++ b/src/wp-includes/blocks/table/block.json @@ -3,7 +3,7 @@ "name": "core/table", "title": "Table", "category": "text", - "description": "Insert a table — perfect for sharing charts and data.", + "description": "Create structured content in rows and columns to display information.", "textdomain": "default", "attributes": { "hasFixedLayout": { @@ -129,6 +129,17 @@ "__experimentalSkipSerialization": true, "gradients": true }, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true + } + }, "__experimentalBorder": { "__experimentalSkipSerialization": true, "color": true, diff --git a/src/wp-includes/blocks/tag-cloud.php b/src/wp-includes/blocks/tag-cloud.php index cdebc92271..0658998d4e 100644 --- a/src/wp-includes/blocks/tag-cloud.php +++ b/src/wp-includes/blocks/tag-cloud.php @@ -17,6 +17,7 @@ function render_block_core_tag_cloud( $attributes ) { 'echo' => false, 'taxonomy' => $attributes['taxonomy'], 'show_count' => $attributes['showTagCounts'], + 'number' => $attributes['numberOfTags'], ); $tag_cloud = wp_tag_cloud( $args ); diff --git a/src/wp-includes/blocks/tag-cloud/block.json b/src/wp-includes/blocks/tag-cloud/block.json index e394a53223..dad4dfdd40 100644 --- a/src/wp-includes/blocks/tag-cloud/block.json +++ b/src/wp-includes/blocks/tag-cloud/block.json @@ -6,6 +6,12 @@ "description": "A cloud of your most used tags.", "textdomain": "default", "attributes": { + "numberOfTags": { + "type": "number", + "default": 45, + "minimum": 1, + "maximum": 100 + }, "taxonomy": { "type": "string", "default": "post_tag" diff --git a/src/wp-includes/blocks/template-part.php b/src/wp-includes/blocks/template-part.php new file mode 100644 index 0000000000..20bc6900f8 --- /dev/null +++ b/src/wp-includes/blocks/template-part.php @@ -0,0 +1,198 @@ +get_stylesheet() === $attributes['theme'] + ) { + $template_part_id = $attributes['theme'] . '//' . $attributes['slug']; + $template_part_query = new WP_Query( + array( + 'post_type' => 'wp_template_part', + 'post_status' => 'publish', + 'post_name__in' => array( $attributes['slug'] ), + 'tax_query' => array( + array( + 'taxonomy' => 'wp_theme', + 'field' => 'slug', + 'terms' => $attributes['theme'], + ), + ), + 'posts_per_page' => 1, + 'no_found_rows' => true, + ) + ); + $template_part_post = $template_part_query->have_posts() ? $template_part_query->next_post() : null; + if ( $template_part_post ) { + // A published post might already exist if this template part was customized elsewhere + // or if it's part of a customized template. + $content = $template_part_post->post_content; + $area_terms = get_the_terms( $template_part_post, 'wp_template_part_area' ); + if ( ! is_wp_error( $area_terms ) && false !== $area_terms ) { + $area = $area_terms[0]->name; + } + /** + * Fires when a block template part is loaded from a template post stored in the database. + * + * @since 5.9.0 + * + * @param string $template_part_id The requested template part namespaced to the theme. + * @param array $attributes The block attributes. + * @param WP_Post $template_part_post The template part post object. + * @param string $content The template part content. + */ + do_action( 'render_block_core_template_part_post', $template_part_id, $attributes, $template_part_post, $content ); + } else { + // Else, if the template part was provided by the active theme, + // render the corresponding file content. + $parent_theme_folders = get_block_theme_folders( get_template() ); + $child_theme_folders = get_block_theme_folders( get_stylesheet() ); + $child_theme_part_file_path = get_theme_file_path( '/' . $child_theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' ); + $parent_theme_part_file_path = get_theme_file_path( '/' . $parent_theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' ); + $template_part_file_path = 0 === validate_file( $attributes['slug'] ) && file_exists( $child_theme_part_file_path ) ? $child_theme_part_file_path : $parent_theme_part_file_path; + if ( 0 === validate_file( $attributes['slug'] ) && file_exists( $template_part_file_path ) ) { + $content = file_get_contents( $template_part_file_path ); + $content = is_string( $content ) && '' !== $content + ? _inject_theme_attribute_in_block_template_content( $content ) + : ''; + } + + if ( '' !== $content && null !== $content ) { + /** + * Fires when a block template part is loaded from a template part in the theme. + * + * @since 5.9.0 + * + * @param string $template_part_id The requested template part namespaced to the theme. + * @param array $attributes The block attributes. + * @param string $template_part_file_path Absolute path to the template path. + * @param string $content The template part content. + */ + do_action( 'render_block_core_template_part_file', $template_part_id, $attributes, $template_part_file_path, $content ); + } else { + /** + * Fires when a requested block template part does not exist in the database nor in the theme. + * + * @since 5.9.0 + * + * @param string $template_part_id The requested template part namespaced to the theme. + * @param array $attributes The block attributes. + * @param string $template_part_file_path Absolute path to the not found template path. + */ + do_action( 'render_block_core_template_part_none', $template_part_id, $attributes, $template_part_file_path ); + } + } + } + + if ( is_null( $content ) && is_user_logged_in() ) { + if ( ! isset( $attributes['slug'] ) ) { + // If there is no slug this is a placeholder and we dont want to return any message. + return; + } + return sprintf( + /* translators: %s: Template part slug. */ + __( 'Template part has been deleted or is unavailable: %s' ), + $attributes['slug'] + ); + } + + if ( isset( $seen_ids[ $template_part_id ] ) ) { + // WP_DEBUG_DISPLAY must only be honored when WP_DEBUG. This precedent + // is set in `wp_debug_mode()`. + $is_debug = defined( 'WP_DEBUG' ) && WP_DEBUG && + defined( 'WP_DEBUG_DISPLAY' ) && WP_DEBUG_DISPLAY; + + return $is_debug ? + // translators: Visible only in the front end, this warning takes the place of a faulty block. + __( '[block rendering halted]' ) : + ''; + } + + // Run through the actions that are typically taken on the_content. + $seen_ids[ $template_part_id ] = true; + $content = do_blocks( $content ); + unset( $seen_ids[ $template_part_id ] ); + $content = wptexturize( $content ); + $content = convert_smilies( $content ); + $content = shortcode_unautop( $content ); + $content = wp_filter_content_tags( $content ); + $content = do_shortcode( $content ); + + // Handle embeds for block template parts. + global $wp_embed; + $content = $wp_embed->autoembed( $content ); + + if ( empty( $attributes['tagName'] ) ) { + $defined_areas = get_allowed_block_template_part_areas(); + $area_tag = 'div'; + foreach ( $defined_areas as $defined_area ) { + if ( $defined_area['area'] === $area && isset( $defined_area['area_tag'] ) ) { + $area_tag = $defined_area['area_tag']; + } + } + $html_tag = $area_tag; + } else { + $html_tag = esc_attr( $attributes['tagName'] ); + } + $wrapper_attributes = get_block_wrapper_attributes(); + + return "<$html_tag $wrapper_attributes>" . str_replace( ']]>', ']]>', $content ) . ""; +} + +/** + * Returns an array of variation objects for the template part block. + * + * @return array Array containing the block variation objects. + */ +function build_template_part_block_variations() { + $variations = array(); + $defined_areas = get_allowed_block_template_part_areas(); + foreach ( $defined_areas as $area ) { + if ( 'uncategorized' !== $area['area'] ) { + $variations[] = array( + 'name' => $area['area'], + 'title' => $area['label'], + 'description' => $area['description'], + 'attributes' => array( + 'area' => $area['area'], + ), + 'scope' => array( 'inserter' ), + 'icon' => $area['icon'], + ); + } + } + return $variations; +} + +/** + * Registers the `core/template-part` block on the server. + */ +function register_block_core_template_part() { + register_block_type_from_metadata( + __DIR__ . '/template-part', + array( + 'render_callback' => 'render_block_core_template_part', + 'variations' => build_template_part_block_variations(), + ) + ); +} +add_action( 'init', 'register_block_core_template_part' ); diff --git a/src/wp-includes/blocks/template-part/block.json b/src/wp-includes/blocks/template-part/block.json new file mode 100644 index 0000000000..1f78e8febd --- /dev/null +++ b/src/wp-includes/blocks/template-part/block.json @@ -0,0 +1,28 @@ +{ + "apiVersion": 2, + "name": "core/template-part", + "title": "Template Part", + "category": "theme", + "description": "Edit the different global regions of your site, like the header, footer, sidebar, or create your own.", + "textdomain": "default", + "attributes": { + "slug": { + "type": "string" + }, + "theme": { + "type": "string" + }, + "tagName": { + "type": "string" + }, + "area": { + "type": "string" + } + }, + "supports": { + "align": true, + "html": false, + "reusable": false + }, + "editorStyle": "wp-block-template-part-editor" +} diff --git a/src/wp-includes/blocks/term-description.php b/src/wp-includes/blocks/term-description.php new file mode 100644 index 0000000000..4f1cd7e518 --- /dev/null +++ b/src/wp-includes/blocks/term-description.php @@ -0,0 +1,45 @@ + 'has-text-align-' . $attributes['textAlign'] ) + : array(); + $wrapper_attributes = get_block_wrapper_attributes( $extra_attributes ); + + return '
    ' . $term_description . '
    '; +} + +/** + * Registers the `core/term-description` block on the server. + */ +function register_block_core_term_description() { + register_block_type_from_metadata( + __DIR__ . '/term-description', + array( + 'render_callback' => 'render_block_core_term_description', + ) + ); +} +add_action( 'init', 'register_block_core_term_description' ); diff --git a/src/wp-includes/blocks/term-description/block.json b/src/wp-includes/blocks/term-description/block.json new file mode 100644 index 0000000000..608ae1a242 --- /dev/null +++ b/src/wp-includes/blocks/term-description/block.json @@ -0,0 +1,28 @@ +{ + "apiVersion": 2, + "name": "core/term-description", + "title": "Term Description", + "category": "theme", + "description": "Display the description of categories, tags and custom taxonomies when viewing an archive.", + "textdomain": "default", + "attributes": { + "textAlign": { + "type": "string" + } + }, + "supports": { + "align": [ "wide", "full" ], + "html": false, + "color": { + "link": true + }, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalDefaultControls": { + "fontSize": true + } + } + }, + "editorStyle": "wp-block-term-description-editor" +} diff --git a/src/wp-includes/blocks/verse/block.json b/src/wp-includes/blocks/verse/block.json index ec080e7c1e..4260fb8e77 100644 --- a/src/wp-includes/blocks/verse/block.json +++ b/src/wp-includes/blocks/verse/block.json @@ -27,7 +27,16 @@ }, "typography": { "fontSize": true, - "__experimentalFontFamily": true + "__experimentalFontFamily": true, + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true, + "fontAppearance": true + } }, "spacing": { "padding": true diff --git a/src/wp-includes/blocks/widget-group.php b/src/wp-includes/blocks/widget-group.php new file mode 100644 index 0000000000..6cf6442346 --- /dev/null +++ b/src/wp-includes/blocks/widget-group.php @@ -0,0 +1,78 @@ +'; + $after_title = ''; + } + + $html = ''; + + if ( ! empty( $attributes['title'] ) ) { + $html .= $before_title . $attributes['title'] . $after_title; + } + + $html .= '
    '; + foreach ( $block->inner_blocks as $inner_block ) { + $html .= $inner_block->render(); + } + $html .= '
    '; + + return $html; +} + +/** + * Registers the 'core/widget-group' block. + */ +function register_block_core_widget_group() { + register_block_type_from_metadata( + __DIR__ . '/widget-group', + array( + 'render_callback' => 'render_block_core_widget_group', + ) + ); +} + +add_action( 'init', 'register_block_core_widget_group' ); + +/** + * Make a note of the sidebar being rendered before WordPress starts rendering + * it. This lets us get to the current sidebar in + * render_block_core_widget_group(). + * + * @param int|string $index Index, name, or ID of the dynamic sidebar. + */ +function note_sidebar_being_rendered( $index ) { + global $_sidebar_being_rendered; + $_sidebar_being_rendered = $index; +} +add_action( 'dynamic_sidebar_before', 'note_sidebar_being_rendered' ); + +/** + * Clear whatever we set in note_sidebar_being_rendered() after WordPress + * finishes rendering a sidebar. + */ +function discard_sidebar_being_rendered() { + global $_sidebar_being_rendered; + unset( $_sidebar_being_rendered ); +} +add_action( 'dynamic_sidebar_after', 'discard_sidebar_being_rendered' ); diff --git a/src/wp-includes/blocks/widget-group/block.json b/src/wp-includes/blocks/widget-group/block.json new file mode 100644 index 0000000000..ec48d90eda --- /dev/null +++ b/src/wp-includes/blocks/widget-group/block.json @@ -0,0 +1,18 @@ +{ + "apiVersion": 2, + "name": "core/widget-group", + "category": "widgets", + "attributes": { + "title": { + "type": "string" + } + }, + "supports": { + "html": false, + "inserter": true, + "customClassName": true, + "reusable": false + }, + "editorStyle": "wp-block-widget-group-editor", + "style": "wp-block-widget-group" +} diff --git a/src/wp-includes/bookmark-template.php b/src/wp-includes/bookmark-template.php index 4a156a76cf..cd07204ad9 100644 --- a/src/wp-includes/bookmark-template.php +++ b/src/wp-includes/bookmark-template.php @@ -102,13 +102,24 @@ function _walk_bookmarks( $bookmarks, $args = '' ) { $title = ' title="' . $title . '"'; } $rel = $bookmark->link_rel; - if ( '' !== $rel ) { - $rel = ' rel="' . esc_attr( $rel ) . '"'; - } + $target = $bookmark->link_target; if ( '' !== $target ) { + if ( is_string( $rel ) && '' !== $rel ) { + if ( ! str_contains( $rel, 'noopener' ) ) { + $rel = trim( $rel ) . ' noopener'; + } + } else { + $rel = 'noopener'; + } + $target = ' target="' . $target . '"'; } + + if ( '' !== $rel ) { + $rel = ' rel="' . esc_attr( $rel ) . '"'; + } + $output .= ''; $output .= $parsed_args['link_before']; diff --git a/src/wp-includes/capabilities.php b/src/wp-includes/capabilities.php index 3ff0481fd4..5ee344b390 100644 --- a/src/wp-includes/capabilities.php +++ b/src/wp-includes/capabilities.php @@ -888,7 +888,7 @@ function get_super_admins() { * @return bool Whether the user is a site admin. */ function is_super_admin( $user_id = false ) { - if ( ! $user_id || get_current_user_id() == $user_id ) { + if ( ! $user_id ) { $user = wp_get_current_user(); } else { $user = get_userdata( $user_id ); diff --git a/src/wp-includes/category-template.php b/src/wp-includes/category-template.php index 38c52a79a9..76ed7ea04f 100644 --- a/src/wp-includes/category-template.php +++ b/src/wp-includes/category-template.php @@ -661,9 +661,9 @@ function wp_list_categories( $args = '' ) { * * @since 2.1.0 * - * @param string $output HTML output. - * @param array $args An array of taxonomy-listing arguments. See wp_list_categories() - * for information on accepted arguments. + * @param string $output HTML output. + * @param array|string $args An array or query string of taxonomy-listing arguments. See + * wp_list_categories() for information on accepted arguments. */ $html = apply_filters( 'wp_list_categories', $output, $args ); @@ -737,9 +737,9 @@ function wp_tag_cloud( $args = '' ) { foreach ( $tags as $key => $tag ) { if ( 'edit' === $args['link'] ) { - $link = get_edit_term_link( $tag->term_id, $tag->taxonomy, $args['post_type'] ); + $link = get_edit_term_link( $tag, $tag->taxonomy, $args['post_type'] ); } else { - $link = get_term_link( (int) $tag->term_id, $tag->taxonomy ); + $link = get_term_link( $tag, $tag->taxonomy ); } if ( is_wp_error( $link ) ) { diff --git a/src/wp-includes/class-simplepie.php b/src/wp-includes/class-simplepie.php index ff55274509..a392e54cd9 100644 --- a/src/wp-includes/class-simplepie.php +++ b/src/wp-includes/class-simplepie.php @@ -68,7 +68,7 @@ spl_autoload_register( 'wp_simplepie_autoload' ); * POSSIBILITY OF SUCH DAMAGE. * * @package SimplePie - * @version 1.5.6 + * @version 1.5.8 * @copyright 2004-2017 Ryan Parman, Sam Sneddon, Ryan McCue * @author Ryan Parman * @author Sam Sneddon @@ -85,7 +85,7 @@ define('SIMPLEPIE_NAME', 'SimplePie'); /** * SimplePie Version */ -define('SIMPLEPIE_VERSION', '1.5.6'); +define('SIMPLEPIE_VERSION', '1.5.8'); /** * SimplePie Build @@ -459,6 +459,13 @@ class SimplePie */ public $error; + /** + * @var int HTTP status code + * @see SimplePie::status_code() + * @access private + */ + public $status_code; + /** * @var object Instance of SimplePie_Sanitize (or other class) * @see SimplePie::set_sanitize_class() @@ -943,6 +950,39 @@ class SimplePie $this->cache_location = (string) $location; } + /** + * Return the filename (i.e. hash, without path and without extension) of the file to cache a given URL. + * @param string $url The URL of the feed to be cached. + * @return string A filename (i.e. hash, without path and without extension). + */ + public function get_cache_filename($url) + { + // Append custom parameters to the URL to avoid cache pollution in case of multiple calls with different parameters. + $url .= $this->force_feed ? '#force_feed' : ''; + $options = array(); + if ($this->timeout != 10) + { + $options[CURLOPT_TIMEOUT] = $this->timeout; + } + if ($this->useragent !== SIMPLEPIE_USERAGENT) + { + $options[CURLOPT_USERAGENT] = $this->useragent; + } + if (!empty($this->curl_options)) + { + foreach ($this->curl_options as $k => $v) + { + $options[$k] = $v; + } + } + if (!empty($options)) + { + ksort($options); + $url .= '#' . urlencode(var_export($options, true)); + } + return call_user_func($this->cache_name_function, $url); + } + /** * Set whether feed items should be sorted into reverse chronological order * @@ -1181,6 +1221,7 @@ class SimplePie $this->strip_attributes(false); $this->add_attributes(false); $this->set_image_handler(false); + $this->set_https_domains(array()); } } @@ -1283,6 +1324,19 @@ class SimplePie $this->sanitize->set_url_replacements($element_attribute); } + /** + * Set the list of domains for which to force HTTPS. + * @see SimplePie_Sanitize::set_https_domains() + * @param array List of HTTPS domains. Example array('biz', 'example.com', 'example.org', 'www.example.net'). + */ + public function set_https_domains($domains = array()) + { + if (is_array($domains)) + { + $this->sanitize->set_https_domains($domains); + } + } + /** * Set the handler to enable the display of cached images. * @@ -1408,8 +1462,8 @@ class SimplePie // Decide whether to enable caching if ($this->cache && $parsed_feed_url['scheme'] !== '') { - $url = $this->feed_url . ($this->force_feed ? '#force_feed' : ''); - $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $url), 'spc')); + $filename = $this->get_cache_filename($this->feed_url); + $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, $filename, 'spc')); } // Fetch the data via SimplePie_File into $this->raw_data @@ -1549,7 +1603,7 @@ class SimplePie * Fetch the data via SimplePie_File * * If the data is already cached, attempt to fetch it from there instead - * @param SimplePie_Cache|false $cache Cache handler, or false to not load from the cache + * @param SimplePie_Cache_Base|false $cache Cache handler, or false to not load from the cache * @return array|true Returns true if the data was loaded from the cache, or an array of HTTP headers and sniffed type */ protected function fetch_data(&$cache) @@ -1612,6 +1666,7 @@ class SimplePie } $file = $this->registry->create('File', array($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options)); + $this->status_code = $file->status_code; if ($file->success) { @@ -1666,6 +1721,8 @@ class SimplePie $file = $this->registry->create('File', array($this->feed_url, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options)); } } + $this->status_code = $file->status_code; + // If the file connection has an error, set SimplePie::error to that and quit if (!$file->success && !($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300))) { @@ -1763,7 +1820,7 @@ class SimplePie } /** - * Get the error message for the occured error + * Get the error message for the occurred error * * @return string|array Error message, or array of messages for multifeeds */ @@ -1772,6 +1829,16 @@ class SimplePie return $this->error; } + /** + * Get the last HTTP status code + * + * @return int Status code + */ + public function status_code() + { + return $this->status_code; + } + /** * Get the raw XML * @@ -2615,13 +2682,19 @@ class SimplePie } } - if (isset($this->data['headers']['link']) && - preg_match('/<([^>]+)>; rel='.preg_quote($rel).'/', - $this->data['headers']['link'], $match)) + if (isset($this->data['headers']['link'])) { - return array($match[1]); + $link_headers = $this->data['headers']['link']; + if (is_string($link_headers)) { + $link_headers = array($link_headers); + } + $matches = preg_filter('/<([^>]+)>; rel='.preg_quote($rel).'/', '$1', $link_headers); + if (!empty($matches)) { + return $matches; + } } - else if (isset($this->data['links'][$rel])) + + if (isset($this->data['links'][$rel])) { return $this->data['links'][$rel]; } diff --git a/src/wp-includes/class-walker-category-dropdown.php b/src/wp-includes/class-walker-category-dropdown.php index 82b4fedbc5..74849101f8 100644 --- a/src/wp-includes/class-walker-category-dropdown.php +++ b/src/wp-includes/class-walker-category-dropdown.php @@ -31,7 +31,7 @@ class Walker_CategoryDropdown extends Walker { * * @since 2.1.0 * @todo Decouple this - * @var array + * @var string[] * * @see Walker::$db_fields */ diff --git a/src/wp-includes/class-walker-category.php b/src/wp-includes/class-walker-category.php index fcf54a333f..dd7252cffe 100644 --- a/src/wp-includes/class-walker-category.php +++ b/src/wp-includes/class-walker-category.php @@ -30,7 +30,7 @@ class Walker_Category extends Walker { * Database fields to use. * * @since 2.1.0 - * @var array + * @var string[] * * @see Walker::$db_fields * @todo Decouple this @@ -164,7 +164,7 @@ class Walker_Category extends Walker { $link .= '('; } - $link .= 'taxonomy, $args['feed_type'] ) ) . '"'; if ( empty( $args['feed'] ) ) { /* translators: %s: Category name. */ diff --git a/src/wp-includes/class-walker-comment.php b/src/wp-includes/class-walker-comment.php index 1a81a0b5d1..dfc8ccd39d 100644 --- a/src/wp-includes/class-walker-comment.php +++ b/src/wp-includes/class-walker-comment.php @@ -30,7 +30,7 @@ class Walker_Comment extends Walker { * Database fields to use. * * @since 2.7.0 - * @var array + * @var string[] * * @see Walker::$db_fields * @todo Decouple this diff --git a/src/wp-includes/class-walker-nav-menu.php b/src/wp-includes/class-walker-nav-menu.php index fad796005c..36be60f9d6 100644 --- a/src/wp-includes/class-walker-nav-menu.php +++ b/src/wp-includes/class-walker-nav-menu.php @@ -30,7 +30,7 @@ class Walker_Nav_Menu extends Walker { * * @since 3.0.0 * @todo Decouple this. - * @var array + * @var string[] * * @see Walker::$db_fields */ diff --git a/src/wp-includes/class-walker-page-dropdown.php b/src/wp-includes/class-walker-page-dropdown.php index e27ea813bf..efd821f018 100644 --- a/src/wp-includes/class-walker-page-dropdown.php +++ b/src/wp-includes/class-walker-page-dropdown.php @@ -30,7 +30,7 @@ class Walker_PageDropdown extends Walker { * Database fields to use. * * @since 2.1.0 - * @var array + * @var string[] * * @see Walker::$db_fields * @todo Decouple this diff --git a/src/wp-includes/class-walker-page.php b/src/wp-includes/class-walker-page.php index ad443dc2a6..bec195ed43 100644 --- a/src/wp-includes/class-walker-page.php +++ b/src/wp-includes/class-walker-page.php @@ -30,7 +30,7 @@ class Walker_Page extends Walker { * Database fields to use. * * @since 2.1.0 - * @var array + * @var string[] * * @see Walker::$db_fields * @todo Decouple this. diff --git a/src/wp-includes/class-wp-admin-bar.php b/src/wp-includes/class-wp-admin-bar.php index 2d8814e590..6eab9c3fdb 100644 --- a/src/wp-includes/class-wp-admin-bar.php +++ b/src/wp-includes/class-wp-admin-bar.php @@ -642,6 +642,7 @@ class WP_Admin_Bar { add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 ); add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 ); add_action( 'admin_bar_menu', 'wp_admin_bar_site_menu', 30 ); + add_action( 'admin_bar_menu', 'wp_admin_bar_edit_site_menu', 40 ); add_action( 'admin_bar_menu', 'wp_admin_bar_customize_menu', 40 ); add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 50 ); diff --git a/src/wp-includes/class-wp-block-pattern-categories-registry.php b/src/wp-includes/class-wp-block-pattern-categories-registry.php index 82cb80ce28..9891214d3d 100644 --- a/src/wp-includes/class-wp-block-pattern-categories-registry.php +++ b/src/wp-includes/class-wp-block-pattern-categories-registry.php @@ -33,7 +33,11 @@ final class WP_Block_Pattern_Categories_Registry { * @since 5.5.0 * * @param string $category_name Pattern category name including namespace. - * @param array $category_properties Array containing the properties of the category: label. + * @param array $category_properties { + * List of properties for the block pattern category. + * + * @type string $label Required. A human-readable label for the pattern category. + * } * @return bool True if the pattern was registered with success and false otherwise. */ public function register( $category_name, $category_properties ) { @@ -141,7 +145,9 @@ final class WP_Block_Pattern_Categories_Registry { * @since 5.5.0 * * @param string $category_name Pattern category name including namespace. - * @param array $category_properties Array containing the properties of the category. + * @param array $category_properties List of properties for the block pattern. + * See WP_Block_Pattern_Categories_Registry::register() for + * accepted arguments. * @return bool True if the pattern category was registered with success and false otherwise. */ function register_block_pattern_category( $category_name, $category_properties ) { diff --git a/src/wp-includes/class-wp-block-patterns-registry.php b/src/wp-includes/class-wp-block-patterns-registry.php index 7496b445c2..7066cb08d1 100644 --- a/src/wp-includes/class-wp-block-patterns-registry.php +++ b/src/wp-includes/class-wp-block-patterns-registry.php @@ -8,13 +8,13 @@ */ /** - * Class used for interacting with patterns. + * Class used for interacting with block patterns. * * @since 5.5.0 */ final class WP_Block_Patterns_Registry { /** - * Registered patterns array. + * Registered block patterns array. * * @since 5.5.0 * @var array @@ -30,13 +30,30 @@ final class WP_Block_Patterns_Registry { private static $instance = null; /** - * Registers a pattern. + * Registers a block pattern. * * @since 5.5.0 * - * @param string $pattern_name Pattern name including namespace. - * @param array $pattern_properties Array containing the properties of the pattern: title, - * content, description, viewportWidth, categories, keywords. + * @param string $pattern_name Block pattern name including namespace. + * @param array $pattern_properties { + * List of properties for the block pattern. + * + * @type string $title Required. A human-readable title for the pattern. + * @type string $content Required. Block HTML markup for the pattern. + * @type string $description Optional. Visually hidden text used to describe the pattern in the + * inserter. A description is optional, but is strongly + * encouraged when the title does not fully describe what the + * pattern does. The description will help users discover the + * pattern while searching. + * @type int $viewportWidth Optional. The intended width of the pattern to allow for a scaled + * preview within the pattern inserter. + * @type array $categories Optional. A list of registered pattern categories used to group block + * patterns. Block patterns can be shown on multiple categories. + * A category must be registered separately in order to be used + * here. + * @type array $keywords Optional. A list of aliases or keywords that help users discover the + * pattern while searching. + * } * @return bool True if the pattern was registered with success and false otherwise. */ public function register( $pattern_name, $pattern_properties ) { @@ -76,11 +93,11 @@ final class WP_Block_Patterns_Registry { } /** - * Unregisters a pattern. + * Unregisters a block pattern. * * @since 5.5.0 * - * @param string $pattern_name Pattern name including namespace. + * @param string $pattern_name Block pattern name including namespace. * @return bool True if the pattern was unregistered with success and false otherwise. */ public function unregister( $pattern_name ) { @@ -100,11 +117,11 @@ final class WP_Block_Patterns_Registry { } /** - * Retrieves an array containing the properties of a registered pattern. + * Retrieves an array containing the properties of a registered block pattern. * * @since 5.5.0 * - * @param string $pattern_name Pattern name including namespace. + * @param string $pattern_name Block pattern name including namespace. * @return array Registered pattern properties. */ public function get_registered( $pattern_name ) { @@ -116,11 +133,11 @@ final class WP_Block_Patterns_Registry { } /** - * Retrieves all registered patterns. + * Retrieves all registered block patterns. * * @since 5.5.0 * - * @return array Array of arrays containing the registered patterns properties, + * @return array Array of arrays containing the registered block patterns properties, * and per style. */ public function get_all_registered() { @@ -128,11 +145,11 @@ final class WP_Block_Patterns_Registry { } /** - * Checks if a pattern is registered. + * Checks if a block pattern is registered. * * @since 5.5.0 * - * @param string $pattern_name Pattern name including namespace. + * @param string $pattern_name Block pattern name including namespace. * @return bool True if the pattern is registered, false otherwise. */ public function is_registered( $pattern_name ) { @@ -158,12 +175,13 @@ final class WP_Block_Patterns_Registry { } /** - * Registers a new pattern. + * Registers a new block pattern. * * @since 5.5.0 * - * @param string $pattern_name Pattern name including namespace. - * @param array $pattern_properties Array containing the properties of the pattern. + * @param string $pattern_name Block pattern name including namespace. + * @param array $pattern_properties List of properties for the block pattern. + * See WP_Block_Patterns_Registry::register() for accepted arguments. * @return bool True if the pattern was registered with success and false otherwise. */ function register_block_pattern( $pattern_name, $pattern_properties ) { @@ -171,11 +189,11 @@ function register_block_pattern( $pattern_name, $pattern_properties ) { } /** - * Unregisters a pattern. + * Unregisters a block pattern. * * @since 5.5.0 * - * @param string $pattern_name Pattern name including namespace. + * @param string $pattern_name Block pattern name including namespace. * @return bool True if the pattern was unregistered with success and false otherwise. */ function unregister_block_pattern( $pattern_name ) { diff --git a/src/wp-includes/class-wp-block-styles-registry.php b/src/wp-includes/class-wp-block-styles-registry.php index 0d419da12e..272e400f8c 100644 --- a/src/wp-includes/class-wp-block-styles-registry.php +++ b/src/wp-includes/class-wp-block-styles-registry.php @@ -17,7 +17,8 @@ final class WP_Block_Styles_Registry { * Registered block styles, as `$block_name => $block_style_name => $block_style_properties` multidimensional arrays. * * @since 5.3.0 - * @var array + * + * @var array[] */ private $registered_block_styles = array(); @@ -25,12 +26,13 @@ final class WP_Block_Styles_Registry { * Container for the main instance of the class. * * @since 5.3.0 + * * @var WP_Block_Styles_Registry|null */ private static $instance = null; /** - * Registers a block style. + * Registers a block style for the given block type. * * @since 5.3.0 * @@ -60,6 +62,15 @@ final class WP_Block_Styles_Registry { return false; } + if ( str_contains( $style_properties['name'], ' ' ) ) { + _doing_it_wrong( + __METHOD__, + __( 'Block style name must not contain any spaces.' ), + '5.9.0' + ); + return false; + } + $block_style_name = $style_properties['name']; if ( ! isset( $this->registered_block_styles[ $block_name ] ) ) { @@ -71,7 +82,9 @@ final class WP_Block_Styles_Registry { } /** - * Unregisters a block style. + * Unregisters a block style of the given block type. + * + * @since 5.3.0 * * @param string $block_name Block type name including namespace. * @param string $block_style_name Block style name. @@ -94,7 +107,7 @@ final class WP_Block_Styles_Registry { } /** - * Retrieves an array containing the properties of a registered block style. + * Retrieves the properties of a registered block style for the given block type. * * @since 5.3.0 * @@ -115,20 +128,19 @@ final class WP_Block_Styles_Registry { * * @since 5.3.0 * - * @return array Array of arrays containing the registered block styles properties grouped per block, - * and per style. + * @return array[] Array of arrays containing the registered block styles properties grouped by block type. */ public function get_all_registered() { return $this->registered_block_styles; } /** - * Retrieves registered block styles for a specific block. + * Retrieves registered block styles for a specific block type. * * @since 5.3.0 * * @param string $block_name Block type name including namespace. - * @return array Array whose keys are block style names and whose value are block style properties. + * @return array[] Array whose keys are block style names and whose values are block style properties. */ public function get_registered_styles_for_block( $block_name ) { if ( isset( $this->registered_block_styles[ $block_name ] ) ) { @@ -138,7 +150,7 @@ final class WP_Block_Styles_Registry { } /** - * Checks if a block style is registered. + * Checks if a block style is registered for the given block type. * * @since 5.3.0 * diff --git a/src/wp-includes/class-wp-block-supports.php b/src/wp-includes/class-wp-block-supports.php index a14efa36bd..1cae5eb08c 100644 --- a/src/wp-includes/class-wp-block-supports.php +++ b/src/wp-includes/class-wp-block-supports.php @@ -58,7 +58,7 @@ class WP_Block_Supports { } /** - * Initializes the block supports. It registes the block supports block attributes. + * Initializes the block supports. It registers the block supports block attributes. * * @since 5.6.0 */ @@ -72,7 +72,7 @@ class WP_Block_Supports { * * @since 5.6.0 * - * @param string $block_support_name Block support name. + * @param string $block_support_name Block support name. * @param array $block_support_config Array containing the properties of the block support. */ public function register( $block_support_name, $block_support_config ) { @@ -88,7 +88,7 @@ class WP_Block_Supports { * * @since 5.6.0 * - * @return array Array of HTML attributes. + * @return string[] Array of HTML attributes. */ public function apply_block_supports() { $block_attributes = self::$block_to_render['attrs']; @@ -163,9 +163,8 @@ class WP_Block_Supports { * * @since 5.6.0 * - * @param array $extra_attributes Optional. Extra attributes to render on the block wrapper. - * - * @return string String of HTML classes. + * @param string[] $extra_attributes Optional. Array of extra attributes to render on the block wrapper. + * @return string String of HTML attributes. */ function get_block_wrapper_attributes( $extra_attributes = array() ) { $new_attributes = WP_Block_Supports::get_instance()->apply_block_supports(); diff --git a/src/wp-includes/class-wp-block-template.php b/src/wp-includes/class-wp-block-template.php index 704a2afc45..51dbdbfbc3 100644 --- a/src/wp-includes/class-wp-block-template.php +++ b/src/wp-includes/class-wp-block-template.php @@ -38,7 +38,7 @@ class WP_Block_Template { public $slug; /** - * Id. + * ID. * * @since 5.8.0 * @var string @@ -78,10 +78,20 @@ class WP_Block_Template { public $source = 'theme'; /** - * Post Id. + * Origin of the content when the content has been customized. + * When customized, origin takes on the value of source and source becomes + * 'custom'. + * + * @since 5.9.0 + * @var string + */ + public $origin; + + /** + * Post ID. * * @since 5.8.0 - * @var integer|null + * @var int|null */ public $wp_id; @@ -97,7 +107,42 @@ class WP_Block_Template { * Whether a template is, or is based upon, an existing template file. * * @since 5.8.0 - * @var boolean + * @var bool */ public $has_theme_file; + + /** + * Whether a template is a custom template. + * + * @since 5.9.0 + * + * @var bool + */ + public $is_custom = true; + + /** + * Author. + * + * A value of 0 means no author. + * + * @since 5.9.0 + * @var int + */ + public $author; + + /** + * Post types. + * + * @since 5.9.0 + * @var array + */ + public $post_types; + + /** + * Area. + * + * @since 5.9.0 + * @var string + */ + public $area; } diff --git a/src/wp-includes/class-wp-block-type.php b/src/wp-includes/class-wp-block-type.php index 10dbe42428..b3700e8d2e 100644 --- a/src/wp-includes/class-wp-block-type.php +++ b/src/wp-includes/class-wp-block-type.php @@ -79,7 +79,7 @@ class WP_Block_Type { * in search interfaces. * * @since 5.5.0 - * @var array + * @var string[] */ public $keywords = array(); @@ -223,7 +223,7 @@ class WP_Block_Type { * available when nested within the specified blocks. * @type string|null $icon Block type icon. * @type string $description A detailed block type description. - * @type array $keywords Additional keywords to produce block type as + * @type string[] $keywords Additional keywords to produce block type as * result in search interfaces. * @type string|null $textdomain The translation textdomain. * @type array $styles Alternative block styles. diff --git a/src/wp-includes/class-wp-block.php b/src/wp-includes/class-wp-block.php index ed5b0f0767..90148f7613 100644 --- a/src/wp-includes/class-wp-block.php +++ b/src/wp-includes/class-wp-block.php @@ -196,9 +196,9 @@ class WP_Block { * @since 5.5.0 * * @param array $options { - * Optional options object. + * Optional options object. * - * @type bool $dynamic Defaults to 'true'. Optionally set to false to avoid using the block's render_callback. + * @type bool $dynamic Defaults to 'true'. Optionally set to false to avoid using the block's render_callback. * } * @return string Rendered block output. */ diff --git a/src/wp-includes/class-wp-comment-query.php b/src/wp-includes/class-wp-comment-query.php index a592fdb687..902bf25714 100644 --- a/src/wp-includes/class-wp-comment-query.php +++ b/src/wp-includes/class-wp-comment-query.php @@ -141,114 +141,134 @@ class WP_Comment_Query { * @since 4.5.0 Introduced the `$author_url` argument. * @since 4.6.0 Introduced the `$cache_domain` argument. * @since 4.9.0 Introduced the `$paged` argument. + * @since 5.1.0 Introduced the `$meta_compare_key` argument. + * @since 5.3.0 Introduced the `$meta_type_key` argument. * * @param string|array $query { * Optional. Array or query string of comment query parameters. Default empty. * - * @type string $author_email Comment author email address. Default empty. - * @type string $author_url Comment author URL. Default empty. - * @type int[] $author__in Array of author IDs to include comments for. Default empty. - * @type int[] $author__not_in Array of author IDs to exclude comments for. Default empty. - * @type int[] $comment__in Array of comment IDs to include. Default empty. - * @type int[] $comment__not_in Array of comment IDs to exclude. Default empty. - * @type bool $count Whether to return a comment count (true) or array of - * comment objects (false). Default false. - * @type array $date_query Date query clauses to limit comments by. See WP_Date_Query. - * Default null. - * @type string $fields Comment fields to return. Accepts 'ids' for comment IDs - * only or empty for all fields. Default empty. - * @type int $ID Currently unused. - * @type array $include_unapproved Array of IDs or email addresses of users whose unapproved - * comments will be returned by the query regardless of - * `$status`. Default empty. - * @type int $karma Karma score to retrieve matching comments for. - * Default empty. - * @type string $meta_key Include comments with a matching comment meta key. - * Default empty. - * @type string $meta_value Include comments with a matching comment meta value. - * Requires `$meta_key` to be set. Default empty. - * @type array $meta_query Meta query clauses to limit retrieved comments by. - * See WP_Meta_Query. Default empty. - * @type int $number Maximum number of comments to retrieve. - * Default empty (no limit). - * @type int $paged When used with $number, defines the page of results to return. - * When used with $offset, $offset takes precedence. Default 1. - * @type int $offset Number of comments to offset the query. Used to build - * LIMIT clause. Default 0. - * @type bool $no_found_rows Whether to disable the `SQL_CALC_FOUND_ROWS` query. - * Default: true. - * @type string|array $orderby Comment status or array of statuses. To use 'meta_value' - * or 'meta_value_num', `$meta_key` must also be defined. - * To sort by a specific `$meta_query` clause, use that - * clause's array key. Accepts 'comment_agent', - * 'comment_approved', 'comment_author', - * 'comment_author_email', 'comment_author_IP', - * 'comment_author_url', 'comment_content', 'comment_date', - * 'comment_date_gmt', 'comment_ID', 'comment_karma', - * 'comment_parent', 'comment_post_ID', 'comment_type', - * 'user_id', 'comment__in', 'meta_value', 'meta_value_num', - * the value of $meta_key, and the array keys of - * `$meta_query`. Also accepts false, an empty array, or - * 'none' to disable `ORDER BY` clause. - * Default: 'comment_date_gmt'. - * @type string $order How to order retrieved comments. Accepts 'ASC', 'DESC'. - * Default: 'DESC'. - * @type int $parent Parent ID of comment to retrieve children of. - * Default empty. - * @type int[] $parent__in Array of parent IDs of comments to retrieve children for. - * Default empty. - * @type int[] $parent__not_in Array of parent IDs of comments *not* to retrieve - * children for. Default empty. - * @type int[] $post_author__in Array of author IDs to retrieve comments for. - * Default empty. - * @type int[] $post_author__not_in Array of author IDs *not* to retrieve comments for. - * Default empty. - * @type int $post_ID Currently unused. - * @type int $post_id Limit results to those affiliated with a given post ID. - * Default 0. - * @type int[] $post__in Array of post IDs to include affiliated comments for. - * Default empty. - * @type int[] $post__not_in Array of post IDs to exclude affiliated comments for. - * Default empty. - * @type int $post_author Post author ID to limit results by. Default empty. - * @type string|array $post_status Post status or array of post statuses to retrieve - * affiliated comments for. Pass 'any' to match any value. - * Default empty. - * @type string|array $post_type Post type or array of post types to retrieve affiliated - * comments for. Pass 'any' to match any value. Default empty. - * @type string $post_name Post name to retrieve affiliated comments for. - * Default empty. - * @type int $post_parent Post parent ID to retrieve affiliated comments for. - * Default empty. - * @type string $search Search term(s) to retrieve matching comments for. - * Default empty. - * @type string|array $status Comment statuses to limit results by. Accepts an array - * or space/comma-separated list of 'hold' (`comment_status=0`), - * 'approve' (`comment_status=1`), 'all', or a custom - * comment status. Default 'all'. - * @type string|array $type Include comments of a given type, or array of types. - * Accepts 'comment', 'pings' (includes 'pingback' and - * 'trackback'), or any custom type string. Default empty. - * @type string[] $type__in Include comments from a given array of comment types. - * Default empty. - * @type string[] $type__not_in Exclude comments from a given array of comment types. - * Default empty. - * @type int $user_id Include comments for a specific user ID. Default empty. - * @type bool|string $hierarchical Whether to include comment descendants in the results. - * - 'threaded' returns a tree, with each comment's children - * stored in a `children` property on the `WP_Comment` object. - * - 'flat' returns a flat array of found comments plus - * their children. - * - Boolean `false` leaves out descendants. - * The parameter is ignored (forced to `false`) when - * `$fields` is 'ids' or 'counts'. Accepts 'threaded', - * 'flat', or false. Default: false. - * @type string $cache_domain Unique cache key to be produced when this query is stored in - * an object cache. Default is 'core'. - * @type bool $update_comment_meta_cache Whether to prime the metadata cache for found comments. - * Default true. - * @type bool $update_comment_post_cache Whether to prime the cache for comment posts. - * Default false. + * @type string $author_email Comment author email address. Default empty. + * @type string $author_url Comment author URL. Default empty. + * @type int[] $author__in Array of author IDs to include comments for. Default empty. + * @type int[] $author__not_in Array of author IDs to exclude comments for. Default empty. + * @type int[] $comment__in Array of comment IDs to include. Default empty. + * @type int[] $comment__not_in Array of comment IDs to exclude. Default empty. + * @type bool $count Whether to return a comment count (true) or array of + * comment objects (false). Default false. + * @type array $date_query Date query clauses to limit comments by. See WP_Date_Query. + * Default null. + * @type string $fields Comment fields to return. Accepts 'ids' for comment IDs + * only or empty for all fields. Default empty. + * @type int $ID Currently unused. + * @type array $include_unapproved Array of IDs or email addresses of users whose unapproved + * comments will be returned by the query regardless of + * `$status`. Default empty. + * @type int $karma Karma score to retrieve matching comments for. + * Default empty. + * @type string|string[] $meta_key Meta key or keys to filter by. + * @type string|string[] $meta_value Meta value or values to filter by. + * @type string $meta_compare MySQL operator used for comparing the meta value. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type string $meta_compare_key MySQL operator used for comparing the meta key. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type string $meta_type MySQL data type that the meta_value column will be CAST to for comparisons. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type string $meta_type_key MySQL data type that the meta_key column will be CAST to for comparisons. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type array $meta_query An associative array of WP_Meta_Query arguments. + * See WP_Meta_Query::__construct for accepted values. + * @type int $number Maximum number of comments to retrieve. + * Default empty (no limit). + * @type int $paged When used with `$number`, defines the page of results to return. + * When used with `$offset`, `$offset` takes precedence. Default 1. + * @type int $offset Number of comments to offset the query. Used to build + * LIMIT clause. Default 0. + * @type bool $no_found_rows Whether to disable the `SQL_CALC_FOUND_ROWS` query. + * Default: true. + * @type string|array $orderby Comment status or array of statuses. To use 'meta_value' + * or 'meta_value_num', `$meta_key` must also be defined. + * To sort by a specific `$meta_query` clause, use that + * clause's array key. Accepts: + * - 'comment_agent' + * - 'comment_approved' + * - 'comment_author' + * - 'comment_author_email' + * - 'comment_author_IP' + * - 'comment_author_url' + * - 'comment_content' + * - 'comment_date' + * - 'comment_date_gmt' + * - 'comment_ID' + * - 'comment_karma' + * - 'comment_parent' + * - 'comment_post_ID' + * - 'comment_type' + * - 'user_id' + * - 'comment__in' + * - 'meta_value' + * - 'meta_value_num' + * - The value of `$meta_key` + * - The array keys of `$meta_query` + * - false, an empty array, or 'none' to disable `ORDER BY` clause. + * Default: 'comment_date_gmt'. + * @type string $order How to order retrieved comments. Accepts 'ASC', 'DESC'. + * Default: 'DESC'. + * @type int $parent Parent ID of comment to retrieve children of. + * Default empty. + * @type int[] $parent__in Array of parent IDs of comments to retrieve children for. + * Default empty. + * @type int[] $parent__not_in Array of parent IDs of comments *not* to retrieve + * children for. Default empty. + * @type int[] $post_author__in Array of author IDs to retrieve comments for. + * Default empty. + * @type int[] $post_author__not_in Array of author IDs *not* to retrieve comments for. + * Default empty. + * @type int $post_ID Currently unused. + * @type int $post_id Limit results to those affiliated with a given post ID. + * Default 0. + * @type int[] $post__in Array of post IDs to include affiliated comments for. + * Default empty. + * @type int[] $post__not_in Array of post IDs to exclude affiliated comments for. + * Default empty. + * @type int $post_author Post author ID to limit results by. Default empty. + * @type string|string[] $post_status Post status or array of post statuses to retrieve + * affiliated comments for. Pass 'any' to match any value. + * Default empty. + * @type string|string[] $post_type Post type or array of post types to retrieve affiliated + * comments for. Pass 'any' to match any value. Default empty. + * @type string $post_name Post name to retrieve affiliated comments for. + * Default empty. + * @type int $post_parent Post parent ID to retrieve affiliated comments for. + * Default empty. + * @type string $search Search term(s) to retrieve matching comments for. + * Default empty. + * @type string|array $status Comment statuses to limit results by. Accepts an array + * or space/comma-separated list of 'hold' (`comment_status=0`), + * 'approve' (`comment_status=1`), 'all', or a custom + * comment status. Default 'all'. + * @type string|string[] $type Include comments of a given type, or array of types. + * Accepts 'comment', 'pings' (includes 'pingback' and + * 'trackback'), or any custom type string. Default empty. + * @type string[] $type__in Include comments from a given array of comment types. + * Default empty. + * @type string[] $type__not_in Exclude comments from a given array of comment types. + * Default empty. + * @type int $user_id Include comments for a specific user ID. Default empty. + * @type bool|string $hierarchical Whether to include comment descendants in the results. + * - 'threaded' returns a tree, with each comment's children + * stored in a `children` property on the `WP_Comment` object. + * - 'flat' returns a flat array of found comments plus + * their children. + * - Boolean `false` leaves out descendants. + * The parameter is ignored (forced to `false`) when + * `$fields` is 'ids' or 'counts'. Accepts 'threaded', + * 'flat', or false. Default: false. + * @type string $cache_domain Unique cache key to be produced when this query is stored in + * an object cache. Default is 'core'. + * @type bool $update_comment_meta_cache Whether to prime the metadata cache for found comments. + * Default true. + * @type bool $update_comment_post_cache Whether to prime the cache for comment posts. + * Default false. * } */ public function __construct( $query = '' ) { diff --git a/src/wp-includes/class-wp-customize-manager.php b/src/wp-includes/class-wp-customize-manager.php index faa9487c30..b566ae6dff 100644 --- a/src/wp-includes/class-wp-customize-manager.php +++ b/src/wp-includes/class-wp-customize-manager.php @@ -161,7 +161,7 @@ final class WP_Customize_Manager { * Mapping of 'panel', 'section', 'control' to the ID which should be autofocused. * * @since 4.4.0 - * @var array + * @var string[] */ protected $autofocus = array(); @@ -346,7 +346,7 @@ final class WP_Customize_Manager { * @see WP_Customize_Manager::__construct() * * @param string[] $components Array of core components to load. - * @param WP_Customize_Manager $manager WP_Customize_Manager instance. + * @param WP_Customize_Manager $manager WP_Customize_Manager instance. */ $components = apply_filters( 'customize_loaded_components', $this->components, $this ); @@ -496,7 +496,7 @@ final class WP_Customize_Manager { /** * Start preview and customize theme. * - * Check if customize query variable exist. Init filters to filter the current theme. + * Check if customize query variable exist. Init filters to filter the active theme. * * @since 3.4.0 * @@ -699,7 +699,7 @@ final class WP_Customize_Manager { /** * Stop previewing the selected theme. * - * Removes filters to change the current theme. + * Removes filters to change the active theme. * * @since 3.4.0 */ @@ -1769,7 +1769,7 @@ final class WP_Customize_Manager { } if ( isset( $setting_params['type'] ) && 'theme_mod' === $setting_params['type'] ) { - // Ensure that theme mods values are only used if they were saved under the current theme. + // Ensure that theme mods values are only used if they were saved under the active theme. $namespace_pattern = '/^(?P.+?)::(?P.+)$/'; if ( preg_match( $namespace_pattern, $setting_id, $matches ) && $this->get_stylesheet() === $matches['stylesheet'] ) { $values[ $matches['setting_id'] ] = $setting_params['value']; @@ -2297,7 +2297,7 @@ final class WP_Customize_Manager { } /** - * Filters the current theme and return the name of the previewed theme. + * Filters the active theme and return the name of the previewed theme. * * @since 3.4.0 * @@ -4720,7 +4720,7 @@ final class WP_Customize_Manager { * * @since 4.4.0 * - * @return array { + * @return string[] { * Mapping of 'panel', 'section', 'control' to the ID which should be autofocused. * * @type string $control ID for control to be autofocused. @@ -5808,10 +5808,11 @@ final class WP_Customize_Manager { if ( 'installed' === $theme_action ) { // Load all installed themes from wp_prepare_themes_for_js(). - $themes = array( 'themes' => wp_prepare_themes_for_js() ); - foreach ( $themes['themes'] as &$theme ) { - $theme['type'] = 'installed'; - $theme['active'] = ( isset( $_POST['customized_theme'] ) && $_POST['customized_theme'] === $theme['id'] ); + $themes = array( 'themes' => array() ); + foreach ( wp_prepare_themes_for_js() as $theme ) { + $theme['type'] = 'installed'; + $theme['active'] = ( isset( $_POST['customized_theme'] ) && $_POST['customized_theme'] === $theme['id'] ); + $themes['themes'][] = $theme; } } elseif ( 'wporg' === $theme_action ) { @@ -5923,7 +5924,7 @@ final class WP_Customize_Manager { * @see themes_api() * @see WP_Customize_Manager::__construct() * - * @param array $themes Nested array of theme data. + * @param array|stdClass $themes Nested array or object of theme data. * @param array $args List of arguments, such as page, search term, and tags to query for. * @param WP_Customize_Manager $manager Instance of Customize manager. */ diff --git a/src/wp-includes/class-wp-customize-panel.php b/src/wp-includes/class-wp-customize-panel.php index 71d93ead97..6ec6cd55e0 100644 --- a/src/wp-includes/class-wp-customize-panel.php +++ b/src/wp-includes/class-wp-customize-panel.php @@ -56,7 +56,7 @@ class WP_Customize_Panel { * Priority of the panel, defining the display order of panels and sections. * * @since 4.0.0 - * @var integer + * @var int */ public $priority = 160; @@ -232,10 +232,11 @@ class WP_Customize_Panel { * feature support required by the panel. * * @since 4.0.0 + * @since 5.9.0 Method was marked non-final. * * @return bool False if theme doesn't support the panel or the user doesn't have the capability. */ - final public function check_capabilities() { + public function check_capabilities() { if ( $this->capability && ! current_user_can( $this->capability ) ) { return false; } diff --git a/src/wp-includes/class-wp-customize-section.php b/src/wp-includes/class-wp-customize-section.php index e7484d6f2f..97da8a9e35 100644 --- a/src/wp-includes/class-wp-customize-section.php +++ b/src/wp-includes/class-wp-customize-section.php @@ -56,7 +56,7 @@ class WP_Customize_Section { * Priority of the section which informs load order of sections. * * @since 3.4.0 - * @var integer + * @var int */ public $priority = 160; diff --git a/src/wp-includes/class-wp-customize-widgets.php b/src/wp-includes/class-wp-customize-widgets.php index c96773b139..8edcd6f1c9 100644 --- a/src/wp-includes/class-wp-customize-widgets.php +++ b/src/wp-includes/class-wp-customize-widgets.php @@ -420,6 +420,7 @@ final class WP_Customize_Widgets { 'priority' => 110, 'active_callback' => array( $this, 'is_panel_active' ), 'auto_expand_sole_section' => true, + 'theme_supports' => 'widgets', ) ); @@ -1421,9 +1422,8 @@ final class WP_Customize_Widgets { if ( ! empty( $widget_object->widget_options['show_instance_in_rest'] ) ) { if ( 'block' === $id_base && ! current_user_can( 'unfiltered_html' ) ) { /* - * The content of the 'block' widget is not filtered on the - * fly while editing. Filter the content here to prevent - * vulnerabilities. + * The content of the 'block' widget is not filtered on the fly while editing. + * Filter the content here to prevent vulnerabilities. */ $value['raw_instance']['content'] = wp_kses_post( $value['raw_instance']['content'] ); } diff --git a/src/wp-includes/class-wp-date-query.php b/src/wp-includes/class-wp-date-query.php index 55d3e3f01d..1978afe762 100644 --- a/src/wp-includes/class-wp-date-query.php +++ b/src/wp-includes/class-wp-date-query.php @@ -53,7 +53,7 @@ class WP_Date_Query { * Supported time-related parameter keys. * * @since 4.1.0 - * @var array + * @var string[] */ public $time_keys = array( 'after', 'before', 'year', 'month', 'monthnum', 'week', 'w', 'dayofyear', 'day', 'dayofweek', 'dayofweek_iso', 'hour', 'minute', 'second' ); @@ -569,7 +569,7 @@ class WP_Date_Query { * * @since 4.1.0 * - * @return array { + * @return string[] { * Array containing JOIN and WHERE SQL clauses to append to the main query. * * @type string $join SQL fragment to append to the main JOIN clause. @@ -679,7 +679,7 @@ class WP_Date_Query { * @since 3.7.0 * * @param array $query Date query arguments. - * @return array { + * @return string[] { * Array containing JOIN and WHERE SQL clauses to append to the main query. * * @type string $join SQL fragment to append to the main JOIN clause. @@ -697,7 +697,7 @@ class WP_Date_Query { * * @param array $query Date query clause. * @param array $parent_query Parent query of the current date query. - * @return array { + * @return string[] { * Array containing JOIN and WHERE SQL clauses to append to the main query. * * @type string $join SQL fragment to append to the main JOIN clause. diff --git a/src/wp-includes/class-wp-embed.php b/src/wp-includes/class-wp-embed.php index 1fa37be41b..d93ea7c01e 100644 --- a/src/wp-includes/class-wp-embed.php +++ b/src/wp-includes/class-wp-embed.php @@ -88,9 +88,9 @@ class WP_Embed { } ?> 0 ) { if ( $flg & 4 ) { - list($xlen) = unpack( 'v', substr( $gzData, $i, 2 ) ); + list($xlen) = unpack( 'v', substr( $gz_data, $i, 2 ) ); $i = $i + 2 + $xlen; } if ( $flg & 8 ) { - $i = strpos( $gzData, "\0", $i ) + 1; + $i = strpos( $gz_data, "\0", $i ) + 1; } if ( $flg & 16 ) { - $i = strpos( $gzData, "\0", $i ) + 1; + $i = strpos( $gz_data, "\0", $i ) + 1; } if ( $flg & 2 ) { $i = $i + 2; } } - $decompressed = @gzinflate( substr( $gzData, $i, -8 ) ); + $decompressed = @gzinflate( substr( $gz_data, $i, -8 ) ); if ( false !== $decompressed ) { return $decompressed; } } // Compressed data from java.util.zip.Deflater amongst others. - $decompressed = @gzinflate( substr( $gzData, 2 ) ); + $decompressed = @gzinflate( substr( $gz_data, 2 ) ); if ( false !== $decompressed ) { return $decompressed; } diff --git a/src/wp-includes/class-wp-http-proxy.php b/src/wp-includes/class-wp-http-proxy.php index 0f7d96fb8c..4408b9ba26 100644 --- a/src/wp-includes/class-wp-http-proxy.php +++ b/src/wp-includes/class-wp-http-proxy.php @@ -25,7 +25,7 @@ *
  • WP_PROXY_PASSWORD - Proxy password, if it requires authentication.
    • *
  • WP_PROXY_BYPASS_HOSTS - Will prevent the hosts in this list from going through the proxy. * You do not need to have localhost and the site host in this list, because they will not be passed - * through the proxy. The list should be presented in a comma separated list, wildcards using * are supported, eg. *.wordpress.org
    • + * through the proxy. The list should be presented in a comma separated list, wildcards using * are supported. Example: *.wordpress.org * * * An example can be as seen below. @@ -44,10 +44,12 @@ class WP_HTTP_Proxy { /** * Whether proxy connection should be used. * - * @since 2.8.0 + * Constants which control this behaviour: + * + * - `WP_PROXY_HOST` + * - `WP_PROXY_PORT` * - * @use WP_PROXY_HOST - * @use WP_PROXY_PORT + * @since 2.8.0 * * @return bool */ @@ -58,10 +60,12 @@ class WP_HTTP_Proxy { /** * Whether authentication should be used. * - * @since 2.8.0 + * Constants which control this behaviour: + * + * - `WP_PROXY_USERNAME` + * - `WP_PROXY_PASSWORD` * - * @use WP_PROXY_USERNAME - * @use WP_PROXY_PASSWORD + * @since 2.8.0 * * @return bool */ diff --git a/src/wp-includes/class-wp-http-streams.php b/src/wp-includes/class-wp-http-streams.php index 998dbde34e..afb94cdbf5 100644 --- a/src/wp-includes/class-wp-http-streams.php +++ b/src/wp-includes/class-wp-http-streams.php @@ -416,7 +416,7 @@ class WP_Http_Streams { * * @param resource $stream The PHP Stream which the SSL request is being made over * @param string $host The hostname being requested - * @return bool If the cerficiate presented in $stream is valid for $host + * @return bool If the certificate presented in $stream is valid for $host */ public static function verify_ssl_certificate( $stream, $host ) { $context_options = stream_context_get_options( $stream ); diff --git a/src/wp-includes/class-wp-http.php b/src/wp-includes/class-wp-http.php index 0cc9c8f78b..8146ef94c2 100644 --- a/src/wp-includes/class-wp-http.php +++ b/src/wp-includes/class-wp-http.php @@ -136,7 +136,7 @@ class WP_Http { * @type string $sslcertificates Absolute path to an SSL certificate .crt file. * Default ABSPATH . WPINC . '/certificates/ca-bundle.crt'. * @type bool $stream Whether to stream to a file. If set to true and no filename was - * given, it will be droped it in the WP temp dir and its name will + * given, it will be dropped it in the WP temp dir and its name will * be set using the basename of the URL. Default false. * @type string $filename Filename of the file to write to when streaming. $stream must be * set to true. Default null. @@ -435,7 +435,7 @@ class WP_Http { } /** - * Filters the HTTP API response immediately before the response is returned. + * Filters a successful HTTP API response immediately before the response is returned. * * @since 2.9.0 * diff --git a/src/wp-includes/class-wp-image-editor-gd.php b/src/wp-includes/class-wp-image-editor-gd.php index f175b90d20..f32e2b4202 100644 --- a/src/wp-includes/class-wp-image-editor-gd.php +++ b/src/wp-includes/class-wp-image-editor-gd.php @@ -70,7 +70,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor { case 'image/gif': return ( $image_types & IMG_GIF ) != 0; case 'image/webp': - return ( $image_types & IMG_WEBP ) != 0; // phpcs:ignore PHPCompatibility.Constants.NewConstants.img_webpFound + return ( $image_types & IMG_WEBP ) != 0; } return false; diff --git a/src/wp-includes/class-wp-image-editor-imagick.php b/src/wp-includes/class-wp-image-editor-imagick.php index b7336fe5ae..d898db553a 100644 --- a/src/wp-includes/class-wp-image-editor-imagick.php +++ b/src/wp-includes/class-wp-image-editor-imagick.php @@ -589,7 +589,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor { try { $this->image->rotateImage( new ImagickPixel( 'none' ), 360 - $angle ); - // Normalise EXIF orientation data so that display is consistent across devices. + // Normalize EXIF orientation data so that display is consistent across devices. if ( is_callable( array( $this->image, 'setImageOrientation' ) ) && defined( 'Imagick::ORIENTATION_TOPLEFT' ) ) { $this->image->setImageOrientation( Imagick::ORIENTATION_TOPLEFT ); } @@ -627,7 +627,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor { $this->image->flopImage(); } - // Normalise EXIF orientation data so that display is consistent across devices. + // Normalize EXIF orientation data so that display is consistent across devices. if ( is_callable( array( $this->image, 'setImageOrientation' ) ) && defined( 'Imagick::ORIENTATION_TOPLEFT' ) ) { $this->image->setImageOrientation( Imagick::ORIENTATION_TOPLEFT ); } diff --git a/src/wp-includes/class-wp-image-editor.php b/src/wp-includes/class-wp-image-editor.php index 67bb5d35db..823501eb46 100644 --- a/src/wp-includes/class-wp-image-editor.php +++ b/src/wp-includes/class-wp-image-editor.php @@ -175,7 +175,7 @@ abstract class WP_Image_Editor { * * @since 3.5.0 * - * @return array { + * @return int[] { * Dimensions of the image. * * @type int $width The image width. @@ -485,7 +485,7 @@ abstract class WP_Image_Editor { } /** - * Filters the `$orientation` value to correct it before rotating or to prevemnt rotating the image. + * Filters the `$orientation` value to correct it before rotating or to prevent rotating the image. * * @since 5.3.0 * diff --git a/src/wp-includes/class-wp-list-util.php b/src/wp-includes/class-wp-list-util.php index dfd44172b4..49fd3a00af 100644 --- a/src/wp-includes/class-wp-list-util.php +++ b/src/wp-includes/class-wp-list-util.php @@ -9,7 +9,7 @@ /** * List utility. * - * Utility class to handle operations on an array of objects. + * Utility class to handle operations on an array of objects or arrays. * * @since 4.7.0 */ @@ -34,7 +34,7 @@ class WP_List_Util { * Temporary arguments for sorting. * * @since 4.7.0 - * @var array + * @var string[] */ private $orderby = array(); @@ -102,7 +102,8 @@ class WP_List_Util { $operator = strtoupper( $operator ); if ( ! in_array( $operator, array( 'AND', 'OR', 'NOT' ), true ) ) { - return array(); + $this->output = array(); + return $this->output; } $count = count( $args ); @@ -139,15 +140,15 @@ class WP_List_Util { } /** - * Plucks a certain field out of each object in the list. + * Plucks a certain field out of each element in the input array. * * This has the same functionality and prototype of * array_column() (PHP 5.5) but also supports objects. * * @since 4.7.0 * - * @param int|string $field Field from the object to place instead of the entire object - * @param int|string $index_key Optional. Field from the object to use as keys for the new array. + * @param int|string $field Field to fetch from the object or array. + * @param int|string $index_key Optional. Field from the element to use as keys for the new array. * Default null. * @return array Array of found values. If `$index_key` is set, an array of found values with keys * corresponding to `$index_key`. If `$index_key` is null, array keys from the original @@ -200,7 +201,7 @@ class WP_List_Util { } /** - * Sorts the list, based on one or more orderby arguments. + * Sorts the input array based on one or more orderby arguments. * * @since 4.7.0 * @@ -238,7 +239,7 @@ class WP_List_Util { } /** - * Callback to sort the list by specific fields. + * Callback to sort an array by specific fields. * * @since 4.7.0 * diff --git a/src/wp-includes/class-wp-locale.php b/src/wp-includes/class-wp-locale.php index 50dd44847e..291848e974 100644 --- a/src/wp-includes/class-wp-locale.php +++ b/src/wp-includes/class-wp-locale.php @@ -18,7 +18,7 @@ class WP_Locale { * Stores the translated strings for the full weekday names. * * @since 2.1.0 - * @var array + * @var string[] */ public $weekday; @@ -31,7 +31,7 @@ class WP_Locale { * @see WP_Locale::init() for how to handle the hack. * * @since 2.1.0 - * @var array + * @var string[] */ public $weekday_initial; @@ -39,7 +39,7 @@ class WP_Locale { * Stores the translated strings for the abbreviated weekday names. * * @since 2.1.0 - * @var array + * @var string[] */ public $weekday_abbrev; @@ -47,7 +47,7 @@ class WP_Locale { * Stores the translated strings for the full month names. * * @since 2.1.0 - * @var array + * @var string[] */ public $month; @@ -55,7 +55,7 @@ class WP_Locale { * Stores the translated strings for the month names in genitive case, if the locale specifies. * * @since 4.4.0 - * @var array + * @var string[] */ public $month_genitive; @@ -63,7 +63,7 @@ class WP_Locale { * Stores the translated strings for the abbreviated month names. * * @since 2.1.0 - * @var array + * @var string[] */ public $month_abbrev; @@ -73,7 +73,7 @@ class WP_Locale { * Also the capitalized versions. * * @since 2.1.0 - * @var array + * @var string[] */ public $meridiem; @@ -138,7 +138,7 @@ class WP_Locale { // Abbreviations for each day. $this->weekday_abbrev[ __( 'Sunday' ) ] = /* translators: Three-letter abbreviation of the weekday. */ __( 'Sun' ); - $this->weekday_abbrev[ __( 'Monday' ) ] = /* translators: Ttree-letter abbreviation of the weekday. */ __( 'Mon' ); + $this->weekday_abbrev[ __( 'Monday' ) ] = /* translators: Three-letter abbreviation of the weekday. */ __( 'Mon' ); $this->weekday_abbrev[ __( 'Tuesday' ) ] = /* translators: Three-letter abbreviation of the weekday. */ __( 'Tue' ); $this->weekday_abbrev[ __( 'Wednesday' ) ] = /* translators: Three-letter abbreviation of the weekday. */ __( 'Wed' ); $this->weekday_abbrev[ __( 'Thursday' ) ] = /* translators: Three-letter abbreviation of the weekday. */ __( 'Thu' ); diff --git a/src/wp-includes/class-wp-meta-query.php b/src/wp-includes/class-wp-meta-query.php index 0b3ffab033..ac1da7d1f6 100644 --- a/src/wp-includes/class-wp-meta-query.php +++ b/src/wp-includes/class-wp-meta-query.php @@ -99,37 +99,68 @@ class WP_Meta_Query { * * @since 3.2.0 * @since 4.2.0 Introduced support for naming query clauses by associative array keys. - * @since 5.1.0 Introduced $compare_key clause parameter, which enables LIKE key matches. - * @since 5.3.0 Increased the number of operators available to $compare_key. Introduced $type_key, - * which enables the $key to be cast to a new data type for comparisons. + * @since 5.1.0 Introduced `$compare_key` clause parameter, which enables LIKE key matches. + * @since 5.3.0 Increased the number of operators available to `$compare_key`. Introduced `$type_key`, + * which enables the `$key` to be cast to a new data type for comparisons. * * @param array $meta_query { * Array of meta query clauses. When first-order clauses or sub-clauses use strings as * their array keys, they may be referenced in the 'orderby' parameter of the parent query. * - * @type string $relation Optional. The MySQL keyword used to join - * the clauses of the query. Accepts 'AND', or 'OR'. Default 'AND'. + * @type string $relation Optional. The MySQL keyword used to join the clauses of the query. + * Accepts 'AND' or 'OR'. Default 'AND'. * @type array ...$0 { * Optional. An array of first-order clause parameters, or another fully-formed meta query. * - * @type string $key Meta key to filter by. - * @type string $compare_key MySQL operator used for comparing the $key. Accepts '=', '!=' - * 'LIKE', 'NOT LIKE', 'IN', 'NOT IN', 'REGEXP', 'NOT REGEXP', 'RLIKE', - * 'EXISTS' (alias of '=') or 'NOT EXISTS' (alias of '!='). - * Default is 'IN' when `$key` is an array, '=' otherwise. - * @type string $type_key MySQL data type that the meta_key column will be CAST to for - * comparisons. Accepts 'BINARY' for case-sensitive regular expression - * comparisons. Default is ''. - * @type string $value Meta value to filter by. - * @type string $compare MySQL operator used for comparing the $value. Accepts '=', - * '!=', '>', '>=', '<', '<=', 'LIKE', 'NOT LIKE', - * 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN', 'REGEXP', - * 'NOT REGEXP', 'RLIKE', 'EXISTS' or 'NOT EXISTS'. - * Default is 'IN' when `$value` is an array, '=' otherwise. - * @type string $type MySQL data type that the meta_value column will be CAST to for - * comparisons. Accepts 'NUMERIC', 'BINARY', 'CHAR', 'DATE', - * 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', or 'UNSIGNED'. - * Default is 'CHAR'. + * @type string|string[] $key Meta key or keys to filter by. + * @type string $compare_key MySQL operator used for comparing the $key. Accepts: + * - '=' + * - '!=' + * - 'LIKE' + * - 'NOT LIKE' + * - 'IN' + * - 'NOT IN' + * - 'REGEXP' + * - 'NOT REGEXP' + * - 'RLIKE', + * - 'EXISTS' (alias of '=') + * - 'NOT EXISTS' (alias of '!=') + * Default is 'IN' when `$key` is an array, '=' otherwise. + * @type string $type_key MySQL data type that the meta_key column will be CAST to for + * comparisons. Accepts 'BINARY' for case-sensitive regular expression + * comparisons. Default is ''. + * @type string|string[] $value Meta value or values to filter by. + * @type string $compare MySQL operator used for comparing the $value. Accepts: + * - '=', + * - '!=' + * - '>' + * - '>=' + * - '<' + * - '<=' + * - 'LIKE' + * - 'NOT LIKE' + * - 'IN' + * - 'NOT IN' + * - 'BETWEEN' + * - 'NOT BETWEEN' + * - 'REGEXP' + * - 'NOT REGEXP' + * - 'RLIKE' + * - 'EXISTS' + * - 'NOT EXISTS' + * Default is 'IN' when `$value` is an array, '=' otherwise. + * @type string $type MySQL data type that the meta_value column will be CAST to for + * comparisons. Accepts: + * - 'NUMERIC' + * - 'BINARY' + * - 'CHAR' + * - 'DATE' + * - 'DATETIME' + * - 'DECIMAL' + * - 'SIGNED' + * - 'TIME' + * - 'UNSIGNED' + * Default is 'CHAR'. * } * } */ @@ -307,12 +338,15 @@ class WP_Meta_Query { * * @since 3.2.0 * - * @param string $type Type of meta, eg 'user', 'post'. + * @param string $type Type of meta. Possible values include but are not limited + * to 'post', 'comment', 'blog', 'term', and 'user'. * @param string $primary_table Database table where the object being filtered is stored (eg wp_users). * @param string $primary_id_column ID column for the filtered object in $primary_table. - * @param object $context Optional. The main query object. - * @return array|false { - * Array containing JOIN and WHERE SQL clauses to append to the main query. + * @param object $context Optional. The main query object that corresponds to the type, for + * example a `WP_Query`, `WP_User_Query`, or `WP_Site_Query`. + * @return string[]|false { + * Array containing JOIN and WHERE SQL clauses to append to the main query, + * or false if no table exists for the requested meta type. * * @type string $join SQL fragment to append to the main JOIN clause. * @type string $where SQL fragment to append to the main WHERE clause. @@ -347,12 +381,14 @@ class WP_Meta_Query { * * @since 3.1.0 * - * @param array $sql Array containing the query's JOIN and WHERE clauses. - * @param array $queries Array of meta queries. - * @param string $type Type of meta. - * @param string $primary_table Primary table. - * @param string $primary_id_column Primary column ID. - * @param object $context The main query object. + * @param string[] $sql Array containing the query's JOIN and WHERE clauses. + * @param array $queries Array of meta queries. + * @param string $type Type of meta. Possible values include but are not limited + * to 'post', 'comment', 'blog', 'term', and 'user'. + * @param string $primary_table Primary table. + * @param string $primary_id_column Primary column ID. + * @param object $context The main query object that corresponds to the type, for + * example a `WP_Query`, `WP_User_Query`, or `WP_Site_Query`. */ return apply_filters_ref_array( 'get_meta_sql', array( $sql, $this->queries, $type, $primary_table, $primary_id_column, $context ) ); } @@ -365,7 +401,7 @@ class WP_Meta_Query { * * @since 4.1.0 * - * @return array { + * @return string[] { * Array containing JOIN and WHERE SQL clauses to append to the main query. * * @type string $join SQL fragment to append to the main JOIN clause. @@ -398,7 +434,7 @@ class WP_Meta_Query { * @param array $query Query to parse (passed by reference). * @param int $depth Optional. Number of tree levels deep we currently are. * Used to calculate indentation. Default 0. - * @return array { + * @return string[] { * Array containing JOIN and WHERE SQL clauses to append to a single query array. * * @type string $join SQL fragment to append to the main JOIN clause. @@ -484,7 +520,7 @@ class WP_Meta_Query { * @param array $parent_query Parent query array. * @param string $clause_key Optional. The array key used to name the clause in the original `$meta_query` * parameters. If not provided, a key will be generated automatically. - * @return array { + * @return string[] { * Array containing JOIN and WHERE SQL clauses to append to a first-order query. * * @type string $join SQL fragment to append to the main JOIN clause. @@ -812,7 +848,7 @@ class WP_Meta_Query { $clause_compare = strtoupper( $clause['compare'] ); $sibling_compare = strtoupper( $sibling['compare'] ); if ( in_array( $clause_compare, $compatible_compares, true ) && in_array( $sibling_compare, $compatible_compares, true ) ) { - $alias = $sibling['alias']; + $alias = preg_replace( '/\W/', '_', $sibling['alias'] ); break; } } diff --git a/src/wp-includes/class-wp-post-type.php b/src/wp-includes/class-wp-post-type.php index 029bd26fe7..ef40f4ec90 100644 --- a/src/wp-includes/class-wp-post-type.php +++ b/src/wp-includes/class-wp-post-type.php @@ -92,6 +92,7 @@ final class WP_Post_Type { * Whether queries can be performed on the front end for the post type as part of `parse_request()`. * * Endpoints would include: + * * - `?post_type={post_type_key}` * - `?{post_type_key}={single_post_slug}` * - `?{post_type_query_var}={single_post_slug}` @@ -117,8 +118,8 @@ final class WP_Post_Type { * Where to show the post type in the admin menu. * * To work, $show_ui must be true. If true, the post type is shown in its own top level menu. If false, no menu is - * shown. If a string of an existing top level menu (eg. 'tools.php' or 'edit.php?post_type=page'), the post type - * will be placed as a sub-menu of that. + * shown. If a string of an existing top level menu ('tools.php' or 'edit.php?post_type=page', for example), the + * post type will be placed as a sub-menu of that. * * Default is the value of $show_ui. * diff --git a/src/wp-includes/class-wp-query.php b/src/wp-includes/class-wp-query.php index 1f9516eec4..975d1318a5 100644 --- a/src/wp-includes/class-wp-query.php +++ b/src/wp-includes/class-wp-query.php @@ -630,118 +630,137 @@ class WP_Query { * @param string|array $query { * Optional. Array or string of Query parameters. * - * @type int $attachment_id Attachment post ID. Used for 'attachment' post_type. - * @type int|string $author Author ID, or comma-separated list of IDs. - * @type string $author_name User 'user_nicename'. - * @type int[] $author__in An array of author IDs to query from. - * @type int[] $author__not_in An array of author IDs not to query from. - * @type bool $cache_results Whether to cache post information. Default true. - * @type int|string $cat Category ID or comma-separated list of IDs (this or any children). - * @type int[] $category__and An array of category IDs (AND in). - * @type int[] $category__in An array of category IDs (OR in, no children). - * @type int[] $category__not_in An array of category IDs (NOT in). - * @type string $category_name Use category slug (not name, this or any children). - * @type array|int $comment_count Filter results by comment count. Provide an integer to match - * comment count exactly. Provide an array with integer 'value' - * and 'compare' operator ('=', '!=', '>', '>=', '<', '<=' ) to - * compare against comment_count in a specific way. - * @type string $comment_status Comment status. - * @type int $comments_per_page The number of comments to return per page. - * Default 'comments_per_page' option. - * @type array $date_query An associative array of WP_Date_Query arguments. - * See WP_Date_Query::__construct(). - * @type int $day Day of the month. Default empty. Accepts numbers 1-31. - * @type bool $exact Whether to search by exact keyword. Default false. - * @type string $fields Post fields to query for. Accepts: - * - '' Returns an array of complete post objects (`WP_Post[]`). - * - 'ids' Returns an array of post IDs (`int[]`). - * - 'id=>parent' Returns an associative array of parent post IDs, - * keyed by post ID (`int[]`). - * Default ''. - * @type int $hour Hour of the day. Default empty. Accepts numbers 0-23. - * @type int|bool $ignore_sticky_posts Whether to ignore sticky posts or not. Setting this to false - * excludes stickies from 'post__in'. Accepts 1|true, 0|false. - * Default false. - * @type int $m Combination YearMonth. Accepts any four-digit year and month - * numbers 1-12. Default empty. - * @type string $meta_compare Comparison operator to test the 'meta_value'. - * @type string $meta_compare_key Comparison operator to test the 'meta_key'. - * @type string $meta_key Custom field key. - * @type array $meta_query An associative array of WP_Meta_Query arguments. See WP_Meta_Query. - * @type string $meta_value Custom field value. - * @type int $meta_value_num Custom field value number. - * @type string $meta_type_key Cast for 'meta_key'. See WP_Meta_Query::construct(). - * @type int $menu_order The menu order of the posts. - * @type int $minute Minute of the hour. Default empty. Accepts numbers 0-59. - * @type int $monthnum The two-digit month. Default empty. Accepts numbers 1-12. - * @type string $name Post slug. - * @type bool $nopaging Show all posts (true) or paginate (false). Default false. - * @type bool $no_found_rows Whether to skip counting the total rows found. Enabling can improve - * performance. Default false. - * @type int $offset The number of posts to offset before retrieval. - * @type string $order Designates ascending or descending order of posts. Default 'DESC'. - * Accepts 'ASC', 'DESC'. - * @type string|array $orderby Sort retrieved posts by parameter. One or more options may be - * passed. To use 'meta_value', or 'meta_value_num', - * 'meta_key=keyname' must be also be defined. To sort by a - * specific `$meta_query` clause, use that clause's array key. - * Accepts 'none', 'name', 'author', 'date', 'title', - * 'modified', 'menu_order', 'parent', 'ID', 'rand', - * 'relevance', 'RAND(x)' (where 'x' is an integer seed value), - * 'comment_count', 'meta_value', 'meta_value_num', 'post__in', - * 'post_name__in', 'post_parent__in', and the array keys - * of `$meta_query`. Default is 'date', except when a search - * is being performed, when the default is 'relevance'. - * @type int $p Post ID. - * @type int $page Show the number of posts that would show up on page X of a - * static front page. - * @type int $paged The number of the current page. - * @type int $page_id Page ID. - * @type string $pagename Page slug. - * @type string $perm Show posts if user has the appropriate capability. - * @type string $ping_status Ping status. - * @type int[] $post__in An array of post IDs to retrieve, sticky posts will be included. - * @type int[] $post__not_in An array of post IDs not to retrieve. Note: a string of comma- - * separated IDs will NOT work. - * @type string $post_mime_type The mime type of the post. Used for 'attachment' post_type. - * @type string[] $post_name__in An array of post slugs that results must match. - * @type int $post_parent Page ID to retrieve child pages for. Use 0 to only retrieve - * top-level pages. - * @type int[] $post_parent__in An array containing parent page IDs to query child pages from. - * @type int[] $post_parent__not_in An array containing parent page IDs not to query child pages from. - * @type string|array $post_type A post type slug (string) or array of post type slugs. - * Default 'any' if using 'tax_query'. - * @type string|array $post_status A post status (string) or array of post statuses. - * @type int $posts_per_page The number of posts to query for. Use -1 to request all posts. - * @type int $posts_per_archive_page The number of posts to query for by archive page. Overrides - * 'posts_per_page' when is_archive(), or is_search() are true. - * @type string $s Search keyword(s). Prepending a term with a hyphen will - * exclude posts matching that term. Eg, 'pillow -sofa' will - * return posts containing 'pillow' but not 'sofa'. The - * character used for exclusion can be modified using the - * the 'wp_query_search_exclusion_prefix' filter. - * @type int $second Second of the minute. Default empty. Accepts numbers 0-59. - * @type bool $sentence Whether to search by phrase. Default false. - * @type bool $suppress_filters Whether to suppress filters. Default false. - * @type string $tag Tag slug. Comma-separated (either), Plus-separated (all). - * @type int[] $tag__and An array of tag IDs (AND in). - * @type int[] $tag__in An array of tag IDs (OR in). - * @type int[] $tag__not_in An array of tag IDs (NOT in). - * @type int $tag_id Tag id or comma-separated list of IDs. - * @type string[] $tag_slug__and An array of tag slugs (AND in). - * @type string[] $tag_slug__in An array of tag slugs (OR in). unless 'ignore_sticky_posts' is - * true. Note: a string of comma-separated IDs will NOT work. - * @type array $tax_query An associative array of WP_Tax_Query arguments. - * See WP_Tax_Query->__construct(). - * @type string $title Post title. - * @type bool $update_post_meta_cache Whether to update the post meta cache. Default true. - * @type bool $update_post_term_cache Whether to update the post term cache. Default true. - * @type bool $lazy_load_term_meta Whether to lazy-load term meta. Setting to false will - * disable cache priming for term meta, so that each - * get_term_meta() call will hit the database. - * Defaults to the value of `$update_post_term_cache`. - * @type int $w The week number of the year. Default empty. Accepts numbers 0-53. - * @type int $year The four-digit year. Default empty. Accepts any four-digit year. + * @type int $attachment_id Attachment post ID. Used for 'attachment' post_type. + * @type int|string $author Author ID, or comma-separated list of IDs. + * @type string $author_name User 'user_nicename'. + * @type int[] $author__in An array of author IDs to query from. + * @type int[] $author__not_in An array of author IDs not to query from. + * @type bool $cache_results Whether to cache post information. Default true. + * @type int|string $cat Category ID or comma-separated list of IDs (this or any children). + * @type int[] $category__and An array of category IDs (AND in). + * @type int[] $category__in An array of category IDs (OR in, no children). + * @type int[] $category__not_in An array of category IDs (NOT in). + * @type string $category_name Use category slug (not name, this or any children). + * @type array|int $comment_count Filter results by comment count. Provide an integer to match + * comment count exactly. Provide an array with integer 'value' + * and 'compare' operator ('=', '!=', '>', '>=', '<', '<=' ) to + * compare against comment_count in a specific way. + * @type string $comment_status Comment status. + * @type int $comments_per_page The number of comments to return per page. + * Default 'comments_per_page' option. + * @type array $date_query An associative array of WP_Date_Query arguments. + * See WP_Date_Query::__construct(). + * @type int $day Day of the month. Default empty. Accepts numbers 1-31. + * @type bool $exact Whether to search by exact keyword. Default false. + * @type string $fields Post fields to query for. Accepts: + * - '' Returns an array of complete post objects (`WP_Post[]`). + * - 'ids' Returns an array of post IDs (`int[]`). + * - 'id=>parent' Returns an associative array of parent post IDs, + * keyed by post ID (`int[]`). + * Default ''. + * @type int $hour Hour of the day. Default empty. Accepts numbers 0-23. + * @type int|bool $ignore_sticky_posts Whether to ignore sticky posts or not. Setting this to false + * excludes stickies from 'post__in'. Accepts 1|true, 0|false. + * Default false. + * @type int $m Combination YearMonth. Accepts any four-digit year and month + * numbers 1-12. Default empty. + * @type string|string[] $meta_key Meta key or keys to filter by. + * @type string|string[] $meta_value Meta value or values to filter by. + * @type string $meta_compare MySQL operator used for comparing the meta value. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type string $meta_compare_key MySQL operator used for comparing the meta key. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type string $meta_type MySQL data type that the meta_value column will be CAST to for comparisons. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type string $meta_type_key MySQL data type that the meta_key column will be CAST to for comparisons. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type array $meta_query An associative array of WP_Meta_Query arguments. + * See WP_Meta_Query::__construct for accepted values. + * @type int $menu_order The menu order of the posts. + * @type int $minute Minute of the hour. Default empty. Accepts numbers 0-59. + * @type int $monthnum The two-digit month. Default empty. Accepts numbers 1-12. + * @type string $name Post slug. + * @type bool $nopaging Show all posts (true) or paginate (false). Default false. + * @type bool $no_found_rows Whether to skip counting the total rows found. Enabling can improve + * performance. Default false. + * @type int $offset The number of posts to offset before retrieval. + * @type string $order Designates ascending or descending order of posts. Default 'DESC'. + * Accepts 'ASC', 'DESC'. + * @type string|array $orderby Sort retrieved posts by parameter. One or more options may be passed. + * To use 'meta_value', or 'meta_value_num', 'meta_key=keyname' must be + * also be defined. To sort by a specific `$meta_query` clause, use that + * clause's array key. Accepts: + * - 'none' + * - 'name' + * - 'author' + * - 'date' + * - 'title' + * - 'modified' + * - 'menu_order' + * - 'parent' + * - 'ID' + * - 'rand' + * - 'relevance' + * - 'RAND(x)' (where 'x' is an integer seed value) + * - 'comment_count' + * - 'meta_value' + * - 'meta_value_num' + * - 'post__in' + * - 'post_name__in' + * - 'post_parent__in' + * - The array keys of `$meta_query`. + * Default is 'date', except when a search is being performed, when + * the default is 'relevance'. + * @type int $p Post ID. + * @type int $page Show the number of posts that would show up on page X of a + * static front page. + * @type int $paged The number of the current page. + * @type int $page_id Page ID. + * @type string $pagename Page slug. + * @type string $perm Show posts if user has the appropriate capability. + * @type string $ping_status Ping status. + * @type int[] $post__in An array of post IDs to retrieve, sticky posts will be included. + * @type int[] $post__not_in An array of post IDs not to retrieve. Note: a string of comma- + * separated IDs will NOT work. + * @type string $post_mime_type The mime type of the post. Used for 'attachment' post_type. + * @type string[] $post_name__in An array of post slugs that results must match. + * @type int $post_parent Page ID to retrieve child pages for. Use 0 to only retrieve + * top-level pages. + * @type int[] $post_parent__in An array containing parent page IDs to query child pages from. + * @type int[] $post_parent__not_in An array containing parent page IDs not to query child pages from. + * @type string|string[] $post_type A post type slug (string) or array of post type slugs. + * Default 'any' if using 'tax_query'. + * @type string|string[] $post_status A post status (string) or array of post statuses. + * @type int $posts_per_page The number of posts to query for. Use -1 to request all posts. + * @type int $posts_per_archive_page The number of posts to query for by archive page. Overrides + * 'posts_per_page' when is_archive(), or is_search() are true. + * @type string $s Search keyword(s). Prepending a term with a hyphen will + * exclude posts matching that term. Eg, 'pillow -sofa' will + * return posts containing 'pillow' but not 'sofa'. The + * character used for exclusion can be modified using the + * the 'wp_query_search_exclusion_prefix' filter. + * @type int $second Second of the minute. Default empty. Accepts numbers 0-59. + * @type bool $sentence Whether to search by phrase. Default false. + * @type bool $suppress_filters Whether to suppress filters. Default false. + * @type string $tag Tag slug. Comma-separated (either), Plus-separated (all). + * @type int[] $tag__and An array of tag IDs (AND in). + * @type int[] $tag__in An array of tag IDs (OR in). + * @type int[] $tag__not_in An array of tag IDs (NOT in). + * @type int $tag_id Tag id or comma-separated list of IDs. + * @type string[] $tag_slug__and An array of tag slugs (AND in). + * @type string[] $tag_slug__in An array of tag slugs (OR in). unless 'ignore_sticky_posts' is + * true. Note: a string of comma-separated IDs will NOT work. + * @type array $tax_query An associative array of WP_Tax_Query arguments. + * See WP_Tax_Query->__construct(). + * @type string $title Post title. + * @type bool $update_post_meta_cache Whether to update the post meta cache. Default true. + * @type bool $update_post_term_cache Whether to update the post term cache. Default true. + * @type bool $lazy_load_term_meta Whether to lazy-load term meta. Setting to false will + * disable cache priming for term meta, so that each + * get_term_meta() call will hit the database. + * Defaults to the value of `$update_post_term_cache`. + * @type int $w The week number of the year. Default empty. Accepts numbers 0-53. + * @type int $year The four-digit year. Default empty. Accepts any four-digit year. * } */ public function parse_query( $query = '' ) { @@ -2807,11 +2826,21 @@ class WP_Query { * Filters all query clauses at once, for convenience. * * Covers the WHERE, GROUP BY, JOIN, ORDER BY, DISTINCT, - * fields (SELECT), and LIMITS clauses. + * fields (SELECT), and LIMIT clauses. * * @since 3.1.0 * - * @param string[] $clauses Associative array of the clauses for the query. + * @param string[] $clauses { + * Associative array of the clauses for the query. + * + * @type string $where The WHERE clause of the query. + * @type string $groupby The GROUP BY clause of the query. + * @type string $join The JOIN clause of the query. + * @type string $orderby The ORDER BY clause of the query. + * @type string $distinct The DISTINCT clause of the query. + * @type string $fields The SELECT clause of the query. + * @type string $limits The LIMIT clause of the query. + * } * @param WP_Query $query The WP_Query instance (passed by reference). */ $clauses = (array) apply_filters_ref_array( 'posts_clauses', array( compact( $pieces ), &$this ) ); @@ -2931,11 +2960,21 @@ class WP_Query { * For use by caching plugins. * * Covers the WHERE, GROUP BY, JOIN, ORDER BY, DISTINCT, - * fields (SELECT), and LIMITS clauses. + * fields (SELECT), and LIMIT clauses. * * @since 3.1.0 * - * @param string[] $pieces Associative array of the pieces of the query. + * @param string[] $pieces { + * Associative array of the clauses for the query. + * + * @type string $where The WHERE clause of the query. + * @type string $groupby The GROUP BY clause of the query. + * @type string $join The JOIN clause of the query. + * @type string $orderby The ORDER BY clause of the query. + * @type string $distinct The DISTINCT clause of the query. + * @type string $fields The SELECT clause of the query. + * @type string $limits The LIMIT clause of the query. + * } * @param WP_Query $query The WP_Query instance (passed by reference). */ $clauses = (array) apply_filters_ref_array( 'posts_clauses_request', array( compact( $pieces ), &$this ) ); diff --git a/src/wp-includes/class-wp-recovery-mode-email-service.php b/src/wp-includes/class-wp-recovery-mode-email-service.php index 9c8dd6964a..574744b138 100644 --- a/src/wp-includes/class-wp-recovery-mode-email-service.php +++ b/src/wp-includes/class-wp-recovery-mode-email-service.php @@ -338,7 +338,7 @@ When seeking help with this issue, you may be asked for some of the following in ), 'theme' => sprintf( /* translators: 1: Current active theme name. 2: Current active theme version. */ - __( 'Current theme: %1$s (version %2$s)' ), + __( 'Active theme: %1$s (version %2$s)' ), $theme->get( 'Name' ), $theme->get( 'Version' ) ), diff --git a/src/wp-includes/class-wp-rewrite.php b/src/wp-includes/class-wp-rewrite.php index 531707884b..a1a262aa7b 100644 --- a/src/wp-includes/class-wp-rewrite.php +++ b/src/wp-includes/class-wp-rewrite.php @@ -275,7 +275,7 @@ class WP_Rewrite { * Additional tags can be added with add_rewrite_tag(). * * @since 1.5.0 - * @var array + * @var string[] */ public $rewritecode = array( '%year%', @@ -296,7 +296,7 @@ class WP_Rewrite { * of rewrite tags, see WP_Rewrite::$rewritecode. * * @since 1.5.0 - * @var array + * @var string[] */ public $rewritereplace = array( '([0-9]{4})', @@ -316,7 +316,7 @@ class WP_Rewrite { * Query variables that rewrite tags map to, see WP_Rewrite::$rewritecode. * * @since 1.5.0 - * @var array + * @var string[] */ public $queryreplace = array( 'year=', @@ -336,7 +336,7 @@ class WP_Rewrite { * Supported default feeds. * * @since 1.5.0 - * @var array + * @var string[] */ public $feeds = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' ); @@ -1173,7 +1173,7 @@ class WP_Rewrite { // Not matching a permalink so this is a lot simpler. } else { - // Close the match and finalise the query. + // Close the match and finalize the query. $match .= '?$'; $query = $index . '?' . $query; } diff --git a/src/wp-includes/class-wp-simplepie-sanitize-kses.php b/src/wp-includes/class-wp-simplepie-sanitize-kses.php index ae462bf1cb..183fe07ca7 100644 --- a/src/wp-includes/class-wp-simplepie-sanitize-kses.php +++ b/src/wp-includes/class-wp-simplepie-sanitize-kses.php @@ -8,7 +8,7 @@ */ /** - * Core class used to implement SimpliePie feed sanitization. + * Core class used to implement SimplePie feed sanitization. * * Extends the SimplePie_Sanitize class to use KSES, because * we cannot universally count on DOMDocument being available. diff --git a/src/wp-includes/class-wp-site-query.php b/src/wp-includes/class-wp-site-query.php index 4445f6880f..703c9580f1 100644 --- a/src/wp-includes/class-wp-site-query.php +++ b/src/wp-includes/class-wp-site-query.php @@ -109,62 +109,74 @@ class WP_Site_Query { * @since 4.6.0 * @since 4.8.0 Introduced the 'lang_id', 'lang__in', and 'lang__not_in' parameters. * @since 5.1.0 Introduced the 'update_site_meta_cache', 'meta_query', 'meta_key', - * 'meta_value', 'meta_type' and 'meta_compare' parameters. + * 'meta_compare_key', 'meta_value', 'meta_type', and 'meta_compare' parameters. + * @since 5.3.0 Introduced the 'meta_type_key' parameter. * * @param string|array $query { * Optional. Array or query string of site query parameters. Default empty. * - * @type int[] $site__in Array of site IDs to include. Default empty. - * @type int[] $site__not_in Array of site IDs to exclude. Default empty. - * @type bool $count Whether to return a site count (true) or array of site objects. - * Default false. - * @type array $date_query Date query clauses to limit sites by. See WP_Date_Query. - * Default null. - * @type string $fields Site fields to return. Accepts 'ids' (returns an array of site IDs) - * or empty (returns an array of complete site objects). Default empty. - * @type int $ID A site ID to only return that site. Default empty. - * @type int $number Maximum number of sites to retrieve. Default 100. - * @type int $offset Number of sites to offset the query. Used to build LIMIT clause. - * Default 0. - * @type bool $no_found_rows Whether to disable the `SQL_CALC_FOUND_ROWS` query. Default true. - * @type string|array $orderby Site status or array of statuses. Accepts 'id', 'domain', 'path', - * 'network_id', 'last_updated', 'registered', 'domain_length', - * 'path_length', 'site__in' and 'network__in'. Also accepts false, - * an empty array, or 'none' to disable `ORDER BY` clause. - * Default 'id'. - * @type string $order How to order retrieved sites. Accepts 'ASC', 'DESC'. Default 'ASC'. - * @type int $network_id Limit results to those affiliated with a given network ID. If 0, - * include all networks. Default 0. - * @type int[] $network__in Array of network IDs to include affiliated sites for. Default empty. - * @type int[] $network__not_in Array of network IDs to exclude affiliated sites for. Default empty. - * @type string $domain Limit results to those affiliated with a given domain. Default empty. - * @type string[] $domain__in Array of domains to include affiliated sites for. Default empty. - * @type string[] $domain__not_in Array of domains to exclude affiliated sites for. Default empty. - * @type string $path Limit results to those affiliated with a given path. Default empty. - * @type string[] $path__in Array of paths to include affiliated sites for. Default empty. - * @type string[] $path__not_in Array of paths to exclude affiliated sites for. Default empty. - * @type int $public Limit results to public sites. Accepts '1' or '0'. Default empty. - * @type int $archived Limit results to archived sites. Accepts '1' or '0'. Default empty. - * @type int $mature Limit results to mature sites. Accepts '1' or '0'. Default empty. - * @type int $spam Limit results to spam sites. Accepts '1' or '0'. Default empty. - * @type int $deleted Limit results to deleted sites. Accepts '1' or '0'. Default empty. - * @type int $lang_id Limit results to a language ID. Default empty. - * @type string[] $lang__in Array of language IDs to include affiliated sites for. Default empty. - * @type string[] $lang__not_in Array of language IDs to exclude affiliated sites for. Default empty. - * @type string $search Search term(s) to retrieve matching sites for. Default empty. - * @type string[] $search_columns Array of column names to be searched. Accepts 'domain' and 'path'. - * Default empty array. - * @type bool $update_site_cache Whether to prime the cache for found sites. Default true. - * @type bool $update_site_meta_cache Whether to prime the metadata cache for found sites. Default true. - * @type array $meta_query Meta query clauses to limit retrieved sites by. See `WP_Meta_Query`. - * Default empty. - * @type string $meta_key Limit sites to those matching a specific metadata key. - * Can be used in conjunction with `$meta_value`. Default empty. - * @type string $meta_value Limit sites to those matching a specific metadata value. - * Usually used in conjunction with `$meta_key`. Default empty. - * @type string $meta_type Data type that the `$meta_value` column will be CAST to for - * comparisons. Default empty. - * @type string $meta_compare Comparison operator to test the `$meta_value`. Default empty. + * @type int[] $site__in Array of site IDs to include. Default empty. + * @type int[] $site__not_in Array of site IDs to exclude. Default empty. + * @type bool $count Whether to return a site count (true) or array of site objects. + * Default false. + * @type array $date_query Date query clauses to limit sites by. See WP_Date_Query. + * Default null. + * @type string $fields Site fields to return. Accepts 'ids' (returns an array of site IDs) + * or empty (returns an array of complete site objects). Default empty. + * @type int $ID A site ID to only return that site. Default empty. + * @type int $number Maximum number of sites to retrieve. Default 100. + * @type int $offset Number of sites to offset the query. Used to build LIMIT clause. + * Default 0. + * @type bool $no_found_rows Whether to disable the `SQL_CALC_FOUND_ROWS` query. Default true. + * @type string|array $orderby Site status or array of statuses. Accepts: + * - 'id' + * - 'domain' + * - 'path' + * - 'network_id' + * - 'last_updated' + * - 'registered' + * - 'domain_length' + * - 'path_length' + * - 'site__in' + * - 'network__in' + * - false, an empty array, or 'none' to disable `ORDER BY` clause. + * Default 'id'. + * @type string $order How to order retrieved sites. Accepts 'ASC', 'DESC'. Default 'ASC'. + * @type int $network_id Limit results to those affiliated with a given network ID. If 0, + * include all networks. Default 0. + * @type int[] $network__in Array of network IDs to include affiliated sites for. Default empty. + * @type int[] $network__not_in Array of network IDs to exclude affiliated sites for. Default empty. + * @type string $domain Limit results to those affiliated with a given domain. Default empty. + * @type string[] $domain__in Array of domains to include affiliated sites for. Default empty. + * @type string[] $domain__not_in Array of domains to exclude affiliated sites for. Default empty. + * @type string $path Limit results to those affiliated with a given path. Default empty. + * @type string[] $path__in Array of paths to include affiliated sites for. Default empty. + * @type string[] $path__not_in Array of paths to exclude affiliated sites for. Default empty. + * @type int $public Limit results to public sites. Accepts '1' or '0'. Default empty. + * @type int $archived Limit results to archived sites. Accepts '1' or '0'. Default empty. + * @type int $mature Limit results to mature sites. Accepts '1' or '0'. Default empty. + * @type int $spam Limit results to spam sites. Accepts '1' or '0'. Default empty. + * @type int $deleted Limit results to deleted sites. Accepts '1' or '0'. Default empty. + * @type int $lang_id Limit results to a language ID. Default empty. + * @type string[] $lang__in Array of language IDs to include affiliated sites for. Default empty. + * @type string[] $lang__not_in Array of language IDs to exclude affiliated sites for. Default empty. + * @type string $search Search term(s) to retrieve matching sites for. Default empty. + * @type string[] $search_columns Array of column names to be searched. Accepts 'domain' and 'path'. + * Default empty array. + * @type bool $update_site_cache Whether to prime the cache for found sites. Default true. + * @type bool $update_site_meta_cache Whether to prime the metadata cache for found sites. Default true. + * @type string|string[] $meta_key Meta key or keys to filter by. + * @type string|string[] $meta_value Meta value or values to filter by. + * @type string $meta_compare MySQL operator used for comparing the meta value. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type string $meta_compare_key MySQL operator used for comparing the meta key. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type string $meta_type MySQL data type that the meta_value column will be CAST to for comparisons. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type string $meta_type_key MySQL data type that the meta_key column will be CAST to for comparisons. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type array $meta_query An associative array of WP_Meta_Query arguments. + * See WP_Meta_Query::__construct for accepted values. * } */ public function __construct( $query = '' ) { diff --git a/src/wp-includes/class-wp-tax-query.php b/src/wp-includes/class-wp-tax-query.php index 1432245cc0..eb4b7849e2 100644 --- a/src/wp-includes/class-wp-tax-query.php +++ b/src/wp-includes/class-wp-tax-query.php @@ -236,7 +236,7 @@ class WP_Tax_Query { * * @param string $primary_table Database table where the object being filtered is stored (eg wp_users). * @param string $primary_id_column ID column for the filtered object in $primary_table. - * @return array { + * @return string[] { * Array containing JOIN and WHERE SQL clauses to append to the main query. * * @type string $join SQL fragment to append to the main JOIN clause. @@ -258,7 +258,7 @@ class WP_Tax_Query { * * @since 4.1.0 * - * @return array { + * @return string[] { * Array containing JOIN and WHERE SQL clauses to append to the main query. * * @type string $join SQL fragment to append to the main JOIN clause. @@ -291,7 +291,7 @@ class WP_Tax_Query { * @param array $query Query to parse (passed by reference). * @param int $depth Optional. Number of tree levels deep we currently are. * Used to calculate indentation. Default 0. - * @return array { + * @return string[] { * Array containing JOIN and WHERE SQL clauses to append to a single query array. * * @type string $join SQL fragment to append to the main JOIN clause. @@ -373,7 +373,7 @@ class WP_Tax_Query { * * @param array $clause Query clause (passed by reference). * @param array $parent_query Parent query array. - * @return array { + * @return string[] { * Array containing JOIN and WHERE SQL clauses to append to a first-order query. * * @type string $join SQL fragment to append to the main JOIN clause. @@ -527,7 +527,7 @@ class WP_Tax_Query { // The sibling must both have compatible operator to share its alias. if ( in_array( strtoupper( $sibling['operator'] ), $compatible_operators, true ) ) { - $alias = $sibling['alias']; + $alias = preg_replace( '/\W/', '_', $sibling['alias'] ); break; } } @@ -556,7 +556,11 @@ class WP_Tax_Query { return; } - $query['terms'] = array_unique( (array) $query['terms'] ); + if ( 'slug' === $query['field'] || 'name' === $query['field'] ) { + $query['terms'] = array_unique( (array) $query['terms'] ); + } else { + $query['terms'] = wp_parse_id_list( $query['terms'] ); + } if ( is_taxonomy_hierarchical( $query['taxonomy'] ) && $query['include_children'] ) { $this->transform_query( $query, 'term_id' ); diff --git a/src/wp-includes/class-wp-taxonomy.php b/src/wp-includes/class-wp-taxonomy.php index 9ef1fdce4a..81dc0bd407 100644 --- a/src/wp-includes/class-wp-taxonomy.php +++ b/src/wp-includes/class-wp-taxonomy.php @@ -144,7 +144,7 @@ final class WP_Taxonomy { * An array of object types this taxonomy is registered for. * * @since 4.7.0 - * @var array + * @var string[] */ public $object_type = null; @@ -289,8 +289,8 @@ final class WP_Taxonomy { * * @since 4.7.0 * - * @param array|string $object_type Name of the object type for the taxonomy object. - * @param array|string $args Array or query string of arguments for registering a taxonomy. + * @param string|string[] $object_type Name or array of names of the object types for the taxonomy. + * @param array|string $args Array or query string of arguments for registering a taxonomy. */ public function set_props( $object_type, $args ) { $args = wp_parse_args( $args ); diff --git a/src/wp-includes/class-wp-term-query.php b/src/wp-includes/class-wp-term-query.php index f5388e6624..1583ed6ab6 100644 --- a/src/wp-includes/class-wp-term-query.php +++ b/src/wp-includes/class-wp-term-query.php @@ -88,103 +88,108 @@ class WP_Term_Query { * @since 4.6.0 Introduced 'term_taxonomy_id' parameter. * @since 4.7.0 Introduced 'object_ids' parameter. * @since 4.9.0 Added 'slug__in' support for 'orderby'. + * @since 5.1.0 Introduced the 'meta_compare_key' parameter. + * @since 5.3.0 Introduced the 'meta_type_key' parameter. * * @param string|array $query { * Optional. Array or query string of term query parameters. Default empty. * - * @type string|array $taxonomy Taxonomy name, or array of taxonomies, to which results should - * be limited. - * @type int|int[] $object_ids Object ID, or array of object IDs. Results will be - * limited to terms associated with these objects. - * @type string $orderby Field(s) to order terms by. Accepts: - * * Term fields ('name', 'slug', 'term_group', 'term_id', 'id', - * 'description', 'parent', 'term_order'). Unless `$object_ids` - * is not empty, 'term_order' is treated the same as 'term_id'. - * * 'count' to use the number of objects associated with the term. - * * 'include' to match the 'order' of the `$include` param. - * * 'slug__in' to match the 'order' of the `$slug` param. - * * 'meta_value' - * * 'meta_value_num'. - * * The value of `$meta_key`. - * * The array keys of `$meta_query`. - * * 'none' to omit the ORDER BY clause. - * Default 'name'. - * @type string $order Whether to order terms in ascending or descending order. - * Accepts 'ASC' (ascending) or 'DESC' (descending). - * Default 'ASC'. - * @type bool|int $hide_empty Whether to hide terms not assigned to any posts. Accepts - * 1|true or 0|false. Default 1|true. - * @type int[]|string $include Array or comma/space-separated string of term IDs to include. - * Default empty array. - * @type int[]|string $exclude Array or comma/space-separated string of term IDs to exclude. - * If `$include` is non-empty, `$exclude` is ignored. - * Default empty array. - * @type int[]|string $exclude_tree Array or comma/space-separated string of term IDs to exclude - * along with all of their descendant terms. If `$include` is - * non-empty, `$exclude_tree` is ignored. Default empty array. - * @type int|string $number Maximum number of terms to return. Accepts ''|0 (all) or any - * positive number. Default ''|0 (all). Note that $number may - * not return accurate results when coupled with `$object_ids`. - * See #41796 for details. - * @type int $offset The number by which to offset the terms query. Default empty. - * @type string $fields Term fields to query for. Accepts: - * * 'all' Returns an array of complete term objects (`WP_Term[]`). - * * 'all_with_object_id' Returns an array of term objects - * with the 'object_id' param (`WP_Term[]`). Works only - * when the `$object_ids` parameter is populated. - * * 'ids' Returns an array of term IDs (`int[]`). - * * 'tt_ids' Returns an array of term taxonomy IDs (`int[]`). - * * 'names' Returns an array of term names (`string[]`). - * * 'slugs' Returns an array of term slugs (`string[]`). - * * 'count' Returns the number of matching terms (`int`). - * * 'id=>parent' Returns an associative array of parent term IDs, - * keyed by term ID (`int[]`). - * * 'id=>name' Returns an associative array of term names, - * keyed by term ID (`string[]`). - * * 'id=>slug' Returns an associative array of term slugs, - * keyed by term ID (`string[]`). - * Default 'all'. - * @type bool $count Whether to return a term count. If true, will take precedence - * over `$fields`. Default false. - * @type string|array $name Name or array of names to return term(s) for. - * Default empty. - * @type string|array $slug Slug or array of slugs to return term(s) for. - * Default empty. - * @type int|int[] $term_taxonomy_id Term taxonomy ID, or array of term taxonomy IDs, - * to match when querying terms. - * @type bool $hierarchical Whether to include terms that have non-empty descendants - * (even if `$hide_empty` is set to true). Default true. - * @type string $search Search criteria to match terms. Will be SQL-formatted with - * wildcards before and after. Default empty. - * @type string $name__like Retrieve terms with criteria by which a term is LIKE - * `$name__like`. Default empty. - * @type string $description__like Retrieve terms where the description is LIKE - * `$description__like`. Default empty. - * @type bool $pad_counts Whether to pad the quantity of a term's children in the - * quantity of each term's "count" object variable. - * Default false. - * @type string $get Whether to return terms regardless of ancestry or whether the - * terms are empty. Accepts 'all' or '' (disabled). - * Default ''. - * @type int $child_of Term ID to retrieve child terms of. If multiple taxonomies - * are passed, `$child_of` is ignored. Default 0. - * @type int $parent Parent term ID to retrieve direct-child terms of. - * Default empty. - * @type bool $childless True to limit results to terms that have no children. - * This parameter has no effect on non-hierarchical taxonomies. - * Default false. - * @type string $cache_domain Unique cache key to be produced when this query is stored in - * an object cache. Default 'core'. - * @type bool $update_term_meta_cache Whether to prime meta caches for matched terms. Default true. - * @type array $meta_query Meta query clauses to limit retrieved terms by. - * See `WP_Meta_Query`. Default empty. - * @type string $meta_key Limit terms to those matching a specific metadata key. - * Can be used in conjunction with `$meta_value`. Default empty. - * @type string $meta_value Limit terms to those matching a specific metadata value. - * Usually used in conjunction with `$meta_key`. Default empty. - * @type string $meta_type MySQL data type that the `$meta_value` will be CAST to for - * comparisons. Default empty. - * @type string $meta_compare Comparison operator to test the 'meta_value'. Default empty. + * @type string|string[] $taxonomy Taxonomy name, or array of taxonomy names, to which results + * should be limited. + * @type int|int[] $object_ids Object ID, or array of object IDs. Results will be + * limited to terms associated with these objects. + * @type string $orderby Field(s) to order terms by. Accepts: + * - Term fields ('name', 'slug', 'term_group', 'term_id', 'id', + * 'description', 'parent', 'term_order'). Unless `$object_ids` + * is not empty, 'term_order' is treated the same as 'term_id'. + * - 'count' to use the number of objects associated with the term. + * - 'include' to match the 'order' of the `$include` param. + * - 'slug__in' to match the 'order' of the `$slug` param. + * - 'meta_value' + * - 'meta_value_num'. + * - The value of `$meta_key`. + * - The array keys of `$meta_query`. + * - 'none' to omit the ORDER BY clause. + * Default 'name'. + * @type string $order Whether to order terms in ascending or descending order. + * Accepts 'ASC' (ascending) or 'DESC' (descending). + * Default 'ASC'. + * @type bool|int $hide_empty Whether to hide terms not assigned to any posts. Accepts + * 1|true or 0|false. Default 1|true. + * @type int[]|string $include Array or comma/space-separated string of term IDs to include. + * Default empty array. + * @type int[]|string $exclude Array or comma/space-separated string of term IDs to exclude. + * If `$include` is non-empty, `$exclude` is ignored. + * Default empty array. + * @type int[]|string $exclude_tree Array or comma/space-separated string of term IDs to exclude + * along with all of their descendant terms. If `$include` is + * non-empty, `$exclude_tree` is ignored. Default empty array. + * @type int|string $number Maximum number of terms to return. Accepts ''|0 (all) or any + * positive number. Default ''|0 (all). Note that `$number` may + * not return accurate results when coupled with `$object_ids`. + * See #41796 for details. + * @type int $offset The number by which to offset the terms query. Default empty. + * @type string $fields Term fields to query for. Accepts: + * - 'all' Returns an array of complete term objects (`WP_Term[]`). + * - 'all_with_object_id' Returns an array of term objects + * with the 'object_id' param (`WP_Term[]`). Works only + * when the `$object_ids` parameter is populated. + * - 'ids' Returns an array of term IDs (`int[]`). + * - 'tt_ids' Returns an array of term taxonomy IDs (`int[]`). + * - 'names' Returns an array of term names (`string[]`). + * - 'slugs' Returns an array of term slugs (`string[]`). + * - 'count' Returns the number of matching terms (`int`). + * - 'id=>parent' Returns an associative array of parent term IDs, + * keyed by term ID (`int[]`). + * - 'id=>name' Returns an associative array of term names, + * keyed by term ID (`string[]`). + * - 'id=>slug' Returns an associative array of term slugs, + * keyed by term ID (`string[]`). + * Default 'all'. + * @type bool $count Whether to return a term count. If true, will take precedence + * over `$fields`. Default false. + * @type string|string[] $name Name or array of names to return term(s) for. + * Default empty. + * @type string|string[] $slug Slug or array of slugs to return term(s) for. + * Default empty. + * @type int|int[] $term_taxonomy_id Term taxonomy ID, or array of term taxonomy IDs, + * to match when querying terms. + * @type bool $hierarchical Whether to include terms that have non-empty descendants + * (even if `$hide_empty` is set to true). Default true. + * @type string $search Search criteria to match terms. Will be SQL-formatted with + * wildcards before and after. Default empty. + * @type string $name__like Retrieve terms with criteria by which a term is LIKE + * `$name__like`. Default empty. + * @type string $description__like Retrieve terms where the description is LIKE + * `$description__like`. Default empty. + * @type bool $pad_counts Whether to pad the quantity of a term's children in the + * quantity of each term's "count" object variable. + * Default false. + * @type string $get Whether to return terms regardless of ancestry or whether the + * terms are empty. Accepts 'all' or '' (disabled). + * Default ''. + * @type int $child_of Term ID to retrieve child terms of. If multiple taxonomies + * are passed, `$child_of` is ignored. Default 0. + * @type int $parent Parent term ID to retrieve direct-child terms of. + * Default empty. + * @type bool $childless True to limit results to terms that have no children. + * This parameter has no effect on non-hierarchical taxonomies. + * Default false. + * @type string $cache_domain Unique cache key to be produced when this query is stored in + * an object cache. Default 'core'. + * @type bool $update_term_meta_cache Whether to prime meta caches for matched terms. Default true. + * @type string|string[] $meta_key Meta key or keys to filter by. + * @type string|string[] $meta_value Meta value or values to filter by. + * @type string $meta_compare MySQL operator used for comparing the meta value. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type string $meta_compare_key MySQL operator used for comparing the meta key. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type string $meta_type MySQL data type that the meta_value column will be CAST to for comparisons. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type string $meta_type_key MySQL data type that the meta_key column will be CAST to for comparisons. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type array $meta_query An associative array of WP_Meta_Query arguments. + * See WP_Meta_Query::__construct for accepted values. * } */ public function __construct( $query = '' ) { @@ -770,7 +775,7 @@ class WP_Term_Query { } if ( empty( $terms ) ) { - wp_cache_add( $cache_key, array(), 'terms', DAY_IN_SECONDS ); + wp_cache_add( $cache_key, array(), 'terms' ); return array(); } @@ -875,7 +880,7 @@ class WP_Term_Query { } } - wp_cache_add( $cache_key, $terms, 'terms', DAY_IN_SECONDS ); + wp_cache_add( $cache_key, $terms, 'terms' ); if ( 'all' === $_fields || 'all_with_object_id' === $_fields ) { $terms = $this->populate_terms( $terms ); diff --git a/src/wp-includes/class-wp-text-diff-renderer-table.php b/src/wp-includes/class-wp-text-diff-renderer-table.php index 3db5a51d85..43c0d0e422 100644 --- a/src/wp-includes/class-wp-text-diff-renderer-table.php +++ b/src/wp-includes/class-wp-text-diff-renderer-table.php @@ -255,7 +255,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { * - match is numeric: an index in other column. * - match is 'X': no match. It is a new row. * *_rows are column vectors for the orig column and the final column. - * - row >= 0: an indix of the $orig or $final array. + * - row >= 0: an index of the $orig or $final array. * - row < 0: a blank row for that column. */ list($orig_matches, $final_matches, $orig_rows, $final_rows) = $this->interleave_changed_lines( $orig, $final ); diff --git a/src/wp-includes/class-wp-theme-json-resolver.php b/src/wp-includes/class-wp-theme-json-resolver.php index 47427c27e3..b9a3819d40 100644 --- a/src/wp-includes/class-wp-theme-json-resolver.php +++ b/src/wp-includes/class-wp-theme-json-resolver.php @@ -11,6 +11,10 @@ * Class that abstracts the processing of the different data sources * for site-level config and offers an API to work with them. * + * This class is for internal core usage and is not supposed to be used by extenders (plugins and/or themes). + * This is a low-level API that may need to do breaking changes. Please, + * use get_global_settings, get_global_styles, and get_global_stylesheet instead. + * * @access private */ class WP_Theme_JSON_Resolver { @@ -40,9 +44,27 @@ class WP_Theme_JSON_Resolver { private static $theme_has_support = null; /** - * Container to keep loaded i18n schema for `theme.json`. + * Container for data coming from the user. + * + * @since 5.9.0 + * @var WP_Theme_JSON + */ + private static $user = null; + + /** + * Stores the ID of the custom post type + * that holds the user data. * * @since 5.9.0 + * @var int + */ + private static $user_custom_post_type_id = null; + + /** + * Container to keep loaded i18n schema for `theme.json`. + * + * @since 5.8.0 As `$theme_json_i18n`. + * @since 5.9.0 Renamed from `$theme_json_i18n` to `$i18n_schema`. * @var array */ private static $i18n_schema = null; @@ -114,7 +136,7 @@ class WP_Theme_JSON_Resolver { $config = self::read_json_file( __DIR__ . '/theme.json' ); $config = self::translate( $config ); - self::$core = new WP_Theme_JSON( $config, 'core' ); + self::$core = new WP_Theme_JSON( $config, 'default' ); return self::$core; } @@ -122,34 +144,71 @@ class WP_Theme_JSON_Resolver { /** * Returns the theme's data. * - * Data from theme.json can be augmented via the $theme_support_data variable. - * This is useful, for example, to backfill the gaps in theme.json that a theme - * has declared via add_theme_supports. - * - * Note that if the same data is present in theme.json and in $theme_support_data, - * the theme.json's is not overwritten. + * Data from theme.json will be backfilled from existing + * theme supports, if any. Note that if the same data + * is present in theme.json and in theme supports, + * the theme.json takes precedence. * * @since 5.8.0 + * @since 5.9.0 Theme supports have been inlined and the `$theme_support_data` argument removed. * - * @param array $theme_support_data Optional. Theme support data in theme.json format. - * Default empty array. + * @param array $deprecated Deprecated. Not used. * @return WP_Theme_JSON Entity that holds theme data. */ - public static function get_theme_data( $theme_support_data = array() ) { + public static function get_theme_data( $deprecated = array() ) { + if ( ! empty( $deprecated ) ) { + _deprecated_argument( __METHOD__, '5.9.0' ); + } if ( null === self::$theme ) { $theme_json_data = self::read_json_file( self::get_file_path_from_theme( 'theme.json' ) ); $theme_json_data = self::translate( $theme_json_data, wp_get_theme()->get( 'TextDomain' ) ); self::$theme = new WP_Theme_JSON( $theme_json_data ); - } - if ( empty( $theme_support_data ) ) { - return self::$theme; + if ( wp_get_theme()->parent() ) { + // Get parent theme.json. + $parent_theme_json_data = self::read_json_file( self::get_file_path_from_theme( 'theme.json', true ) ); + $parent_theme_json_data = self::translate( $parent_theme_json_data, wp_get_theme()->parent()->get( 'TextDomain' ) ); + $parent_theme = new WP_Theme_JSON( $parent_theme_json_data ); + + // Merge the child theme.json into the parent theme.json. + // The child theme takes precedence over the parent. + $parent_theme->merge( self::$theme ); + self::$theme = $parent_theme; + } } /* * We want the presets and settings declared in theme.json - * to override the ones declared via add_theme_support. + * to override the ones declared via theme supports. + * So we take theme supports, transform it to theme.json shape + * and merge the self::$theme upon that. */ + $theme_support_data = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() ); + if ( ! self::theme_has_support() ) { + if ( ! isset( $theme_support_data['settings']['color'] ) ) { + $theme_support_data['settings']['color'] = array(); + } + + $default_palette = false; + if ( current_theme_supports( 'default-color-palette' ) ) { + $default_palette = true; + } + if ( ! isset( $theme_support_data['settings']['color']['palette'] ) ) { + // If the theme does not have any palette, we still want to show the core one. + $default_palette = true; + } + $theme_support_data['settings']['color']['defaultPalette'] = $default_palette; + + $default_gradients = false; + if ( current_theme_supports( 'default-gradient-presets' ) ) { + $default_gradients = true; + } + if ( ! isset( $theme_support_data['settings']['color']['gradients'] ) ) { + // If the theme does not have any gradients, we still want to show the core ones. + $default_gradients = true; + } + $theme_support_data['settings']['color']['defaultGradients'] = $default_gradients; + } $with_theme_supports = new WP_Theme_JSON( $theme_support_data ); $with_theme_supports->merge( self::$theme ); @@ -157,40 +216,199 @@ class WP_Theme_JSON_Resolver { } /** - * There are different sources of data for a site: core and theme. + * Returns the custom post type that contains the user's origin config + * for the active theme or a void array if none are found. * - * While the getters {@link get_core_data}, {@link get_theme_data} return the raw data - * from the respective origins, this method merges them all together. + * This can also create and return a new draft custom post type. * - * If the same piece of data is declared in different origins (core and theme), - * the last origin overrides the previous. For example, if core disables custom colors - * but a theme enables them, the theme config wins. + * @since 5.9.0 + * + * @param WP_Theme $theme The theme object. If empty, it + * defaults to the active theme. + * @param bool $create_post Optional. Whether a new custom post + * type should be created if none are + * found. Default false. + * @param array $post_status_filter Optional. Filter custom post type by + * post status. Default `array( 'publish' )`, + * so it only fetches published posts. + * @return array Custom Post Type for the user's origin config. + */ + public static function get_user_data_from_wp_global_styles( $theme, $create_post = false, $post_status_filter = array( 'publish' ) ) { + if ( ! $theme instanceof WP_Theme ) { + $theme = wp_get_theme(); + } + $user_cpt = array(); + $post_type_filter = 'wp_global_styles'; + $args = array( + 'numberposts' => 1, + 'orderby' => 'date', + 'order' => 'desc', + 'post_type' => $post_type_filter, + 'post_status' => $post_status_filter, + 'tax_query' => array( + array( + 'taxonomy' => 'wp_theme', + 'field' => 'name', + 'terms' => $theme->get_stylesheet(), + ), + ), + ); + + $cache_key = sprintf( 'wp_global_styles_%s', md5( serialize( $args ) ) ); + $post_id = wp_cache_get( $cache_key ); + + if ( (int) $post_id > 0 ) { + return get_post( $post_id, ARRAY_A ); + } + + // Special case: '-1' is a results not found. + if ( -1 === $post_id && ! $create_post ) { + return $user_cpt; + } + + $recent_posts = wp_get_recent_posts( $args ); + if ( is_array( $recent_posts ) && ( count( $recent_posts ) === 1 ) ) { + $user_cpt = $recent_posts[0]; + } elseif ( $create_post ) { + $cpt_post_id = wp_insert_post( + array( + 'post_content' => '{"version": ' . WP_Theme_JSON::LATEST_SCHEMA . ', "isGlobalStylesUserThemeJSON": true }', + 'post_status' => 'publish', + 'post_title' => 'Custom Styles', + 'post_type' => $post_type_filter, + 'post_name' => 'wp-global-styles-' . urlencode( wp_get_theme()->get_stylesheet() ), + 'tax_input' => array( + 'wp_theme' => array( wp_get_theme()->get_stylesheet() ), + ), + ), + true + ); + $user_cpt = get_post( $cpt_post_id, ARRAY_A ); + } + $cache_expiration = $user_cpt ? DAY_IN_SECONDS : HOUR_IN_SECONDS; + wp_cache_set( $cache_key, $user_cpt ? $user_cpt['ID'] : -1, '', $cache_expiration ); + + return $user_cpt; + } + + /** + * Returns the user's origin config. + * + * @since 5.9.0 + * + * @return WP_Theme_JSON Entity that holds styles for user data. + */ + public static function get_user_data() { + if ( null !== self::$user ) { + return self::$user; + } + + $config = array(); + $user_cpt = self::get_user_data_from_wp_global_styles( wp_get_theme() ); + + if ( array_key_exists( 'post_content', $user_cpt ) ) { + $decoded_data = json_decode( $user_cpt['post_content'], true ); + + $json_decoding_error = json_last_error(); + if ( JSON_ERROR_NONE !== $json_decoding_error ) { + trigger_error( 'Error when decoding a theme.json schema for user data. ' . json_last_error_msg() ); + return new WP_Theme_JSON( $config, 'custom' ); + } + + // Very important to verify that the flag isGlobalStylesUserThemeJSON is true. + // If it's not true then the content was not escaped and is not safe. + if ( + is_array( $decoded_data ) && + isset( $decoded_data['isGlobalStylesUserThemeJSON'] ) && + $decoded_data['isGlobalStylesUserThemeJSON'] + ) { + unset( $decoded_data['isGlobalStylesUserThemeJSON'] ); + $config = $decoded_data; + } + } + self::$user = new WP_Theme_JSON( $config, 'custom' ); + + return self::$user; + } + + /** + * Returns the data merged from multiple origins. + * + * There are three sources of data (origins) for a site: + * default, theme, and custom. The custom's has higher priority + * than the theme's, and the theme's higher than default's. + * + * Unlike the getters {@link get_core_data}, + * {@link get_theme_data}, and {@link get_user_data}, + * this method returns data after it has been merged + * with the previous origins. This means that if the same piece of data + * is declared in different origins (user, theme, and core), + * the last origin overrides the previous. + * + * For example, if the user has set a background color + * for the paragraph block, and the theme has done it as well, + * the user preference wins. * * @since 5.8.0 + * @since 5.9.0 Added user data, removed the `$settings` parameter, + * added the `$origin` parameter. * - * @param array $settings Optional. Existing block editor settings. Default empty array. + * @param string $origin Optional. To what level should we merge data. + * Valid values are 'theme' or 'custom'. Default 'custom'. * @return WP_Theme_JSON */ - public static function get_merged_data( $settings = array() ) { - $theme_support_data = WP_Theme_JSON::get_from_editor_settings( $settings ); + public static function get_merged_data( $origin = 'custom' ) { + if ( is_array( $origin ) ) { + _deprecated_argument( __FUNCTION__, '5.9.0' ); + } $result = new WP_Theme_JSON(); $result->merge( self::get_core_data() ); - $result->merge( self::get_theme_data( $theme_support_data ) ); + $result->merge( self::get_theme_data() ); + + if ( 'custom' === $origin ) { + $result->merge( self::get_user_data() ); + } return $result; } /** - * Whether the current theme has a theme.json file. + * Returns the ID of the custom post type + * that stores user data. + * + * @since 5.9.0 + * + * @return integer|null + */ + public static function get_user_global_styles_post_id() { + if ( null !== self::$user_custom_post_type_id ) { + return self::$user_custom_post_type_id; + } + + $user_cpt = self::get_user_data_from_wp_global_styles( wp_get_theme(), true ); + + if ( array_key_exists( 'ID', $user_cpt ) ) { + self::$user_custom_post_type_id = $user_cpt['ID']; + } + + return self::$user_custom_post_type_id; + } + + /** + * Whether the active theme has a theme.json file. * * @since 5.8.0 + * @since 5.9.0 Added a check in the parent theme. * * @return bool */ public static function theme_has_support() { if ( ! isset( self::$theme_has_support ) ) { - self::$theme_has_support = (bool) self::get_file_path_from_theme( 'theme.json' ); + self::$theme_has_support = ( + is_readable( self::get_file_path_from_theme( 'theme.json' ) ) || + is_readable( self::get_file_path_from_theme( 'theme.json', true ) ) + ); } return self::$theme_has_support; @@ -202,35 +420,33 @@ class WP_Theme_JSON_Resolver { * If it isn't, returns an empty string, otherwise returns the whole file path. * * @since 5.8.0 + * @since 5.9.0 Adapted to work with child themes, added the `$template` argument. * * @param string $file_name Name of the file. + * @param bool $template Optional. Use template theme directory. Default false. * @return string The whole file path or empty if the file doesn't exist. */ - private static function get_file_path_from_theme( $file_name ) { - /* - * This used to be a locate_template call. However, that method proved problematic - * due to its use of constants (STYLESHEETPATH) that threw errors in some scenarios. - * - * When the theme.json merge algorithm properly supports child themes, - * this should also fall back to the template path, as locate_template did. - */ - $located = ''; - $candidate = get_stylesheet_directory() . '/' . $file_name; - if ( is_readable( $candidate ) ) { - $located = $candidate; - } - return $located; + private static function get_file_path_from_theme( $file_name, $template = false ) { + $path = $template ? get_template_directory() : get_stylesheet_directory(); + $candidate = $path . '/' . $file_name; + + return is_readable( $candidate ) ? $candidate : ''; } /** * Cleans the cached data so it can be recalculated. * * @since 5.8.0 + * @since 5.9.0 Added the `$user`, `$user_custom_post_type_id`, + * and `$i18n_schema` variables to reset. */ public static function clean_cached_data() { - self::$core = null; - self::$theme = null; - self::$theme_has_support = null; + self::$core = null; + self::$theme = null; + self::$user = null; + self::$user_custom_post_type_id = null; + self::$theme_has_support = null; + self::$i18n_schema = null; } } diff --git a/src/wp-includes/class-wp-theme-json-schema.php b/src/wp-includes/class-wp-theme-json-schema.php new file mode 100644 index 0000000000..462af76376 --- /dev/null +++ b/src/wp-includes/class-wp-theme-json-schema.php @@ -0,0 +1,152 @@ + 'border.radius', + 'spacing.customMargin' => 'spacing.margin', + 'spacing.customPadding' => 'spacing.padding', + 'typography.customLineHeight' => 'typography.lineHeight', + ); + + /** + * Function that migrates a given theme.json structure to the last version. + * + * @since 5.9.0 + * + * @param array $theme_json The structure to migrate. + * + * @return array The structure in the last version. + */ + public static function migrate( $theme_json ) { + if ( ! isset( $theme_json['version'] ) ) { + $theme_json = array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + ); + } + + if ( 1 === $theme_json['version'] ) { + $theme_json = self::migrate_v1_to_v2( $theme_json ); + } + + return $theme_json; + } + + /** + * Removes the custom prefixes for a few properties + * that were part of v1: + * + * 'border.customRadius' => 'border.radius', + * 'spacing.customMargin' => 'spacing.margin', + * 'spacing.customPadding' => 'spacing.padding', + * 'typography.customLineHeight' => 'typography.lineHeight', + * + * @since 5.9.0 + * + * @param array $old Data to migrate. + * + * @return array Data without the custom prefixes. + */ + private static function migrate_v1_to_v2( $old ) { + // Copy everything. + $new = $old; + + // Overwrite the things that changed. + if ( isset( $old['settings'] ) ) { + $new['settings'] = self::rename_paths( $old['settings'], self::V1_TO_V2_RENAMED_PATHS ); + } + + // Set the new version. + $new['version'] = 2; + + return $new; + } + + /** + * Processes the settings subtree. + * + * @since 5.9.0 + * + * @param array $settings Array to process. + * @param array $paths_to_rename Paths to rename. + * + * @return array The settings in the new format. + */ + private static function rename_paths( $settings, $paths_to_rename ) { + $new_settings = $settings; + + // Process any renamed/moved paths within default settings. + self::rename_settings( $new_settings, $paths_to_rename ); + + // Process individual block settings. + if ( isset( $new_settings['blocks'] ) && is_array( $new_settings['blocks'] ) ) { + foreach ( $new_settings['blocks'] as &$block_settings ) { + self::rename_settings( $block_settings, $paths_to_rename ); + } + } + + return $new_settings; + } + + /** + * Processes a settings array, renaming or moving properties. + * + * @since 5.9.0 + * + * @param array $settings Reference to settings either defaults or an individual block's. + * @param array $paths_to_rename Paths to rename. + */ + private static function rename_settings( &$settings, $paths_to_rename ) { + foreach ( $paths_to_rename as $original => $renamed ) { + $original_path = explode( '.', $original ); + $renamed_path = explode( '.', $renamed ); + $current_value = _wp_array_get( $settings, $original_path, null ); + + if ( null !== $current_value ) { + _wp_array_set( $settings, $renamed_path, $current_value ); + self::unset_setting_by_path( $settings, $original_path ); + } + } + } + + /** + * Removes a property from within the provided settings by its path. + * + * @since 5.9.0 + * + * @param array $settings Reference to the current settings array. + * @param array $path Path to the property to be removed. + * + * @return void + */ + private static function unset_setting_by_path( &$settings, $path ) { + $tmp_settings = &$settings; // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable + $last_key = array_pop( $path ); + foreach ( $path as $key ) { + $tmp_settings = &$tmp_settings[ $key ]; + } + + unset( $tmp_settings[ $last_key ] ); + } +} diff --git a/src/wp-includes/class-wp-theme-json.php b/src/wp-includes/class-wp-theme-json.php index d394bd3301..6f7d4ee356 100644 --- a/src/wp-includes/class-wp-theme-json.php +++ b/src/wp-includes/class-wp-theme-json.php @@ -10,6 +10,10 @@ /** * Class that encapsulates the processing of structures that adhere to the theme.json spec. * + * This class is for internal core usage and is not supposed to be used by extenders (plugins and/or themes). + * This is a low-level API that may need to do breaking changes. Please, + * use get_global_settings, get_global_styles, and get_global_stylesheet instead. + * * @access private */ class WP_Theme_JSON { @@ -47,9 +51,9 @@ class WP_Theme_JSON { * @var string[] */ const VALID_ORIGINS = array( - 'core', + 'default', 'theme', - 'user', + 'custom', ); /** @@ -70,179 +74,266 @@ class WP_Theme_JSON { * * This contains the necessary metadata to process them: * - * - path => where to find the preset within the settings section - * - * - value_key => the key that represents the value - * - * - css_var_infix => infix to use in generating the CSS Custom Property. Example: - * --wp--preset----: - * - * - classes => array containing a structure with the classes to - * generate for the presets. Each class should have - * the class suffix and the property name. Example: - * - * .has-- { - * : - * } + * - path => where to find the preset within the settings section + * - override => whether a theme preset with the same slug as a default preset + * can override it + * - use_default_names => whether to use the default names + * - value_key => the key that represents the value + * - value_func => optionally, instead of value_key, a function to generate + * the value that takes a preset as an argument + * (either value_key or value_func should be present) + * - css_vars => template string to use in generating the CSS Custom Property. + * Example output: "--wp--preset--duotone--blue: " will generate + * as many CSS Custom Properties as presets defined + * substituting the $slug for the slug's value for each preset value. + * - classes => array containing a structure with the classes to + * generate for the presets, where for each array item + * the key is the class name and the value the property name. + * The "$slug" substring will be replaced by the slug of each preset. + * For example: + * 'classes' => array( + * '.has-$slug-color' => 'color', + * '.has-$slug-background-color' => 'background-color', + * '.has-$slug-border-color' => 'border-color', + * ) + * - properties => array of CSS properties to be used by kses to + * validate the content of each preset + * by means of the remove_insecure_properties method. * * @since 5.8.0 + * @since 5.9.0 Added the `color.duotone` and `typography.fontFamilies` presets, + * `use_default_names` preset key, and simplified the metadata structure. * @var array */ const PRESETS_METADATA = array( array( - 'path' => array( 'color', 'palette' ), - 'value_key' => 'color', - 'css_var_infix' => 'color', - 'classes' => array( - array( - 'class_suffix' => 'color', - 'property_name' => 'color', - ), - array( - 'class_suffix' => 'background-color', - 'property_name' => 'background-color', - ), + 'path' => array( 'color', 'palette' ), + 'override' => array( 'color', 'defaultPalette' ), + 'use_default_names' => false, + 'value_key' => 'color', + 'css_vars' => '--wp--preset--color--$slug', + 'classes' => array( + '.has-$slug-color' => 'color', + '.has-$slug-background-color' => 'background-color', + '.has-$slug-border-color' => 'border-color', ), + 'properties' => array( 'color', 'background-color', 'border-color' ), ), array( - 'path' => array( 'color', 'gradients' ), - 'value_key' => 'gradient', - 'css_var_infix' => 'gradient', - 'classes' => array( - array( - 'class_suffix' => 'gradient-background', - 'property_name' => 'background', - ), - ), + 'path' => array( 'color', 'gradients' ), + 'override' => array( 'color', 'defaultGradients' ), + 'use_default_names' => false, + 'value_key' => 'gradient', + 'css_vars' => '--wp--preset--gradient--$slug', + 'classes' => array( '.has-$slug-gradient-background' => 'background' ), + 'properties' => array( 'background' ), ), array( - 'path' => array( 'typography', 'fontSizes' ), - 'value_key' => 'size', - 'css_var_infix' => 'font-size', - 'classes' => array( - array( - 'class_suffix' => 'font-size', - 'property_name' => 'font-size', - ), - ), + 'path' => array( 'color', 'duotone' ), + 'override' => true, + 'use_default_names' => false, + 'value_func' => 'wp_render_duotone_filter_preset', + 'css_vars' => '--wp--preset--duotone--$slug', + 'classes' => array(), + 'properties' => array( 'filter' ), + ), + array( + 'path' => array( 'typography', 'fontSizes' ), + 'override' => true, + 'use_default_names' => true, + 'value_key' => 'size', + 'css_vars' => '--wp--preset--font-size--$slug', + 'classes' => array( '.has-$slug-font-size' => 'font-size' ), + 'properties' => array( 'font-size' ), + ), + array( + 'path' => array( 'typography', 'fontFamilies' ), + 'override' => true, + 'use_default_names' => false, + 'value_key' => 'fontFamily', + 'css_vars' => '--wp--preset--font-family--$slug', + 'classes' => array( '.has-$slug-font-family' => 'font-family' ), + 'properties' => array( 'font-family' ), ), ); /** * Metadata for style properties. * - * Each property declares: - * - * - 'value': path to the value in theme.json and block attributes. + * Each element is a direct mapping from the CSS property name to the + * path to the value in theme.json & block attributes. * * @since 5.8.0 + * @since 5.9.0 Added the `border-*`, `font-family`, `font-style`, `font-weight`, + * `letter-spacing`, `margin-*`, `padding-*`, `--wp--style--block-gap`, + * `text-decoration`, `text-transform`, and `filter` properties, + * simplified the metadata structure. * @var array */ const PROPERTIES_METADATA = array( - 'background' => array( - 'value' => array( 'color', 'gradient' ), - ), - 'background-color' => array( - 'value' => array( 'color', 'background' ), - ), - 'color' => array( - 'value' => array( 'color', 'text' ), - ), - 'font-size' => array( - 'value' => array( 'typography', 'fontSize' ), - ), - 'line-height' => array( - 'value' => array( 'typography', 'lineHeight' ), - ), - 'margin' => array( - 'value' => array( 'spacing', 'margin' ), - 'properties' => array( 'top', 'right', 'bottom', 'left' ), - ), - 'padding' => array( - 'value' => array( 'spacing', 'padding' ), - 'properties' => array( 'top', 'right', 'bottom', 'left' ), - ), + 'background' => array( 'color', 'gradient' ), + 'background-color' => array( 'color', 'background' ), + 'border-radius' => array( 'border', 'radius' ), + 'border-top-left-radius' => array( 'border', 'radius', 'topLeft' ), + 'border-top-right-radius' => array( 'border', 'radius', 'topRight' ), + 'border-bottom-left-radius' => array( 'border', 'radius', 'bottomLeft' ), + 'border-bottom-right-radius' => array( 'border', 'radius', 'bottomRight' ), + 'border-color' => array( 'border', 'color' ), + 'border-width' => array( 'border', 'width' ), + 'border-style' => array( 'border', 'style' ), + 'color' => array( 'color', 'text' ), + 'font-family' => array( 'typography', 'fontFamily' ), + 'font-size' => array( 'typography', 'fontSize' ), + 'font-style' => array( 'typography', 'fontStyle' ), + 'font-weight' => array( 'typography', 'fontWeight' ), + 'letter-spacing' => array( 'typography', 'letterSpacing' ), + 'line-height' => array( 'typography', 'lineHeight' ), + 'margin' => array( 'spacing', 'margin' ), + 'margin-top' => array( 'spacing', 'margin', 'top' ), + 'margin-right' => array( 'spacing', 'margin', 'right' ), + 'margin-bottom' => array( 'spacing', 'margin', 'bottom' ), + 'margin-left' => array( 'spacing', 'margin', 'left' ), + 'padding' => array( 'spacing', 'padding' ), + 'padding-top' => array( 'spacing', 'padding', 'top' ), + 'padding-right' => array( 'spacing', 'padding', 'right' ), + 'padding-bottom' => array( 'spacing', 'padding', 'bottom' ), + 'padding-left' => array( 'spacing', 'padding', 'left' ), + '--wp--style--block-gap' => array( 'spacing', 'blockGap' ), + 'text-decoration' => array( 'typography', 'textDecoration' ), + 'text-transform' => array( 'typography', 'textTransform' ), + 'filter' => array( 'filter', 'duotone' ), ); /** - * @since 5.8.0 + * Protected style properties. + * + * These style properties are only rendered if a setting enables it + * via a value other than `null`. + * + * Each element maps the style property to the corresponding theme.json + * setting key. + * + * @since 5.9.0 + */ + const PROTECTED_PROPERTIES = array( + 'spacing.blockGap' => array( 'spacing', 'blockGap' ), + ); + + /** + * The top-level keys a theme.json can have. + * + * @since 5.8.0 As `ALLOWED_TOP_LEVEL_KEYS`. + * @since 5.9.0 Renamed from `ALLOWED_TOP_LEVEL_KEYS` to `VALID_TOP_LEVEL_KEYS`, + * added the `customTemplates` and `templateParts` values. * @var string[] */ - const ALLOWED_TOP_LEVEL_KEYS = array( + const VALID_TOP_LEVEL_KEYS = array( + 'customTemplates', 'settings', 'styles', + 'templateParts', 'version', ); /** - * @since 5.8.0 + * The valid properties under the settings key. + * + * @since 5.8.0 As `ALLOWED_SETTINGS`. + * @since 5.9.0 Renamed from `ALLOWED_SETTINGS` to `VALID_SETTINGS`, + * added new properties for `border`, `color`, `spacing`, + * and `typography`, and renamed others according to the new schema. * @var array */ - const ALLOWED_SETTINGS = array( - 'border' => array( - 'customRadius' => null, + const VALID_SETTINGS = array( + 'appearanceTools' => null, + 'border' => array( + 'color' => null, + 'radius' => null, + 'style' => null, + 'width' => null, ), - 'color' => array( - 'custom' => null, - 'customDuotone' => null, - 'customGradient' => null, - 'duotone' => null, - 'gradients' => null, - 'link' => null, - 'palette' => null, + 'color' => array( + 'background' => null, + 'custom' => null, + 'customDuotone' => null, + 'customGradient' => null, + 'defaultGradients' => null, + 'defaultPalette' => null, + 'duotone' => null, + 'gradients' => null, + 'link' => null, + 'palette' => null, + 'text' => null, ), - 'custom' => null, - 'layout' => array( + 'custom' => null, + 'layout' => array( 'contentSize' => null, 'wideSize' => null, ), - 'spacing' => array( - 'customMargin' => null, - 'customPadding' => null, - 'units' => null, + 'spacing' => array( + 'blockGap' => null, + 'margin' => null, + 'padding' => null, + 'units' => null, ), - 'typography' => array( - 'customFontSize' => null, - 'customLineHeight' => null, - 'dropCap' => null, - 'fontSizes' => null, + 'typography' => array( + 'customFontSize' => null, + 'dropCap' => null, + 'fontFamilies' => null, + 'fontSizes' => null, + 'fontStyle' => null, + 'fontWeight' => null, + 'letterSpacing' => null, + 'lineHeight' => null, + 'textDecoration' => null, + 'textTransform' => null, ), ); /** - * @since 5.8.0 + * The valid properties under the styles key. + * + * @since 5.8.0 As `ALLOWED_STYLES`. + * @since 5.9.0 Renamed from `ALLOWED_STYLES` to `VALID_STYLES`, + * added new properties for `border`, `filter`, `spacing`, + * and `typography`. * @var array */ - const ALLOWED_STYLES = array( + const VALID_STYLES = array( 'border' => array( + 'color' => null, 'radius' => null, + 'style' => null, + 'width' => null, ), 'color' => array( 'background' => null, 'gradient' => null, 'text' => null, ), + 'filter' => array( + 'duotone' => null, + ), 'spacing' => array( - 'margin' => array( - 'top' => null, - 'right' => null, - 'bottom' => null, - 'left' => null, - ), - 'padding' => array( - 'bottom' => null, - 'left' => null, - 'right' => null, - 'top' => null, - ), + 'margin' => null, + 'padding' => null, + 'blockGap' => 'top', ), 'typography' => array( - 'fontSize' => null, - 'lineHeight' => null, + 'fontFamily' => null, + 'fontSize' => null, + 'fontStyle' => null, + 'fontWeight' => null, + 'letterSpacing' => null, + 'lineHeight' => null, + 'textDecoration' => null, + 'textTransform' => null, ), ); /** + * The valid elements that can be found under styles. + * * @since 5.8.0 * @var string[] */ @@ -257,85 +348,158 @@ class WP_Theme_JSON { ); /** + * The latest version of the schema in use. + * * @since 5.8.0 + * @since 5.9.0 Changed value from 1 to 2. * @var int */ - const LATEST_SCHEMA = 1; + const LATEST_SCHEMA = 2; /** * Constructor. * * @since 5.8.0 * - * @param array $theme_json A structure that follows the theme.json schema. - * @param string $origin Optional. What source of data this object represents. - * One of 'core', 'theme', or 'user'. Default 'theme'. + * @param array $theme_json A structure that follows the theme.json schema. + * @param string $origin Optional. What source of data this object represents. + * One of 'default', 'theme', or 'custom'. Default 'theme'. */ public function __construct( $theme_json = array(), $origin = 'theme' ) { if ( ! in_array( $origin, self::VALID_ORIGINS, true ) ) { $origin = 'theme'; } - if ( ! isset( $theme_json['version'] ) || self::LATEST_SCHEMA !== $theme_json['version'] ) { - $this->theme_json = array(); - return; - } - - $this->theme_json = self::sanitize( $theme_json ); + $this->theme_json = WP_Theme_JSON_Schema::migrate( $theme_json ); + $valid_block_names = array_keys( self::get_blocks_metadata() ); + $valid_element_names = array_keys( self::ELEMENTS ); + $theme_json = self::sanitize( $this->theme_json, $valid_block_names, $valid_element_names ); + $this->theme_json = self::maybe_opt_in_into_settings( $theme_json ); // Internally, presets are keyed by origin. $nodes = self::get_setting_nodes( $this->theme_json ); foreach ( $nodes as $node ) { - foreach ( self::PRESETS_METADATA as $preset ) { - $path = array_merge( $node['path'], $preset['path'] ); + foreach ( self::PRESETS_METADATA as $preset_metadata ) { + $path = array_merge( $node['path'], $preset_metadata['path'] ); $preset = _wp_array_get( $this->theme_json, $path, null ); if ( null !== $preset ) { - _wp_array_set( $this->theme_json, $path, array( $origin => $preset ) ); + // If the preset is not already keyed by origin. + if ( isset( $preset[0] ) || empty( $preset ) ) { + _wp_array_set( $this->theme_json, $path, array( $origin => $preset ) ); + } + } + } + } + } + + /** + * Enables some opt-in settings if theme declared support. + * + * @since 5.9.0 + * + * @param array $theme_json A theme.json structure to modify. + * @return array The modified theme.json structure. + */ + private static function maybe_opt_in_into_settings( $theme_json ) { + $new_theme_json = $theme_json; + + if ( + isset( $new_theme_json['settings']['appearanceTools'] ) && + true === $new_theme_json['settings']['appearanceTools'] + ) { + self::do_opt_in_into_settings( $new_theme_json['settings'] ); + } + + if ( isset( $new_theme_json['settings']['blocks'] ) && is_array( $new_theme_json['settings']['blocks'] ) ) { + foreach ( $new_theme_json['settings']['blocks'] as &$block ) { + if ( isset( $block['appearanceTools'] ) && ( true === $block['appearanceTools'] ) ) { + self::do_opt_in_into_settings( $block ); } } } + + return $new_theme_json; + } + + /** + * Enables some settings. + * + * @since 5.9.0 + * + * @param array $context The context to which the settings belong. + */ + private static function do_opt_in_into_settings( &$context ) { + $to_opt_in = array( + array( 'border', 'color' ), + array( 'border', 'radius' ), + array( 'border', 'style' ), + array( 'border', 'width' ), + array( 'color', 'link' ), + array( 'spacing', 'blockGap' ), + array( 'spacing', 'margin' ), + array( 'spacing', 'padding' ), + array( 'typography', 'lineHeight' ), + ); + + foreach ( $to_opt_in as $path ) { + // Use "unset prop" as a marker instead of "null" because + // "null" can be a valid value for some props (e.g. blockGap). + if ( 'unset prop' === _wp_array_get( $context, $path, 'unset prop' ) ) { + _wp_array_set( $context, $path, true ); + } + } + + unset( $context['appearanceTools'] ); } /** * Sanitizes the input according to the schemas. * * @since 5.8.0 + * @since 5.9.0 Added the `$valid_block_names` and `$valid_element_name` parameters. * - * @param array $input Structure to sanitize. + * @param array $input Structure to sanitize. + * @param array $valid_block_names List of valid block names. + * @param array $valid_element_names List of valid element names. * @return array The sanitized output. */ - private static function sanitize( $input ) { + private static function sanitize( $input, $valid_block_names, $valid_element_names ) { $output = array(); if ( ! is_array( $input ) ) { return $output; } - $allowed_top_level_keys = self::ALLOWED_TOP_LEVEL_KEYS; - $allowed_settings = self::ALLOWED_SETTINGS; - $allowed_styles = self::ALLOWED_STYLES; - $allowed_blocks = array_keys( self::get_blocks_metadata() ); - $allowed_elements = array_keys( self::ELEMENTS ); + $output = array_intersect_key( $input, array_flip( self::VALID_TOP_LEVEL_KEYS ) ); - $output = array_intersect_key( $input, array_flip( $allowed_top_level_keys ) ); + // Some styles are only meant to be available at the top-level (e.g.: blockGap), + // hence, the schema for blocks & elements should not have them. + $styles_non_top_level = self::VALID_STYLES; + foreach ( array_keys( $styles_non_top_level ) as $section ) { + foreach ( array_keys( $styles_non_top_level[ $section ] ) as $prop ) { + if ( 'top' === $styles_non_top_level[ $section ][ $prop ] ) { + unset( $styles_non_top_level[ $section ][ $prop ] ); + } + } + } - // Build the schema. + // Build the schema based on valid block & element names. $schema = array(); $schema_styles_elements = array(); - foreach ( $allowed_elements as $element ) { - $schema_styles_elements[ $element ] = $allowed_styles; + foreach ( $valid_element_names as $element ) { + $schema_styles_elements[ $element ] = $styles_non_top_level; } $schema_styles_blocks = array(); $schema_settings_blocks = array(); - foreach ( $allowed_blocks as $block ) { - $schema_settings_blocks[ $block ] = $allowed_settings; - $schema_styles_blocks[ $block ] = $allowed_styles; + foreach ( $valid_block_names as $block ) { + $schema_settings_blocks[ $block ] = self::VALID_SETTINGS; + $schema_styles_blocks[ $block ] = $styles_non_top_level; $schema_styles_blocks[ $block ]['elements'] = $schema_styles_elements; } - $schema['styles'] = $allowed_styles; + $schema['styles'] = self::VALID_STYLES; $schema['styles']['blocks'] = $schema_styles_blocks; $schema['styles']['elements'] = $schema_styles_elements; - $schema['settings'] = $allowed_settings; + $schema['settings'] = self::VALID_SETTINGS; $schema['settings']['blocks'] = $schema_settings_blocks; // Remove anything that's not present in the schema. @@ -377,14 +541,16 @@ class WP_Theme_JSON { * 'core/heading': { * 'selector': 'h1', * 'elements': {} - * } - * 'core/group': { - * 'selector': '.wp-block-group', + * }, + * 'core/image': { + * 'selector': '.wp-block-image', + * 'duotone': 'img', * 'elements': {} * } * } * * @since 5.8.0 + * @since 5.9.0 Added `duotone` key with CSS selector. * * @return array Block metadata. */ @@ -407,11 +573,16 @@ class WP_Theme_JSON { self::$blocks_metadata[ $block_name ]['selector'] = '.wp-block-' . str_replace( '/', '-', str_replace( 'core/', '', $block_name ) ); } - /* - * Assign defaults, then overwrite those that the block sets by itself. - * If the block selector is compounded, will append the element to each - * individual block selector. - */ + if ( + isset( $block_type->supports['color']['__experimentalDuotone'] ) && + is_string( $block_type->supports['color']['__experimentalDuotone'] ) + ) { + self::$blocks_metadata[ $block_name ]['duotone'] = $block_type->supports['color']['__experimentalDuotone']; + } + + // Assign defaults, then overwrite those that the block sets by itself. + // If the block selector is compounded, will append the element to each + // individual block selector. $block_selectors = explode( ',', self::$blocks_metadata[ $block_name ]['selector'] ); foreach ( self::ELEMENTS as $el_name => $el_selector ) { $element_selector = array(); @@ -493,25 +664,95 @@ class WP_Theme_JSON { * the theme.json structure this object represents. * * @since 5.8.0 + * @since 5.9.0 Removed the `$type` parameter`, added the `$types` and `$origins` parameters. * - * @param string $type Optional. Type of stylesheet we want. Accepts 'all', - * 'block_styles', and 'css_variables'. Default 'all'. + * @param array $types Types of styles to load. Will load all by default. It accepts: + * - `variables`: only the CSS Custom Properties for presets & custom ones. + * - `styles`: only the styles section in theme.json. + * - `presets`: only the classes for the presets. + * @param array $origins A list of origins to include. By default it includes `self::VALID_ORIGINS`. * @return string Stylesheet. */ - public function get_stylesheet( $type = 'all' ) { + public function get_stylesheet( $types = array( 'variables', 'styles', 'presets' ), $origins = self::VALID_ORIGINS ) { + if ( is_string( $types ) ) { + // Dispatch error and map old arguments to new ones. + _deprecated_argument( __FUNCTION__, '5.9.0' ); + if ( 'block_styles' === $types ) { + $types = array( 'styles', 'presets' ); + } elseif ( 'css_variables' === $types ) { + $types = array( 'variables' ); + } else { + $types = array( 'variables', 'styles', 'presets' ); + } + } + $blocks_metadata = self::get_blocks_metadata(); $style_nodes = self::get_style_nodes( $this->theme_json, $blocks_metadata ); $setting_nodes = self::get_setting_nodes( $this->theme_json, $blocks_metadata ); - switch ( $type ) { - case 'block_styles': - return $this->get_block_styles( $style_nodes, $setting_nodes ); - case 'css_variables': - return $this->get_css_variables( $setting_nodes ); - default: - return $this->get_css_variables( $setting_nodes ) . $this->get_block_styles( $style_nodes, $setting_nodes ); + $stylesheet = ''; + + if ( in_array( 'variables', $types, true ) ) { + $stylesheet .= $this->get_css_variables( $setting_nodes, $origins ); + } + + if ( in_array( 'styles', $types, true ) ) { + $stylesheet .= $this->get_block_classes( $style_nodes ); } + if ( in_array( 'presets', $types, true ) ) { + $stylesheet .= $this->get_preset_classes( $setting_nodes, $origins ); + } + + return $stylesheet; + } + + /** + * Returns the page templates of the active theme. + * + * @since 5.9.0 + * + * @return array + */ + public function get_custom_templates() { + $custom_templates = array(); + if ( ! isset( $this->theme_json['customTemplates'] ) || ! is_array( $this->theme_json['customTemplates'] ) ) { + return $custom_templates; + } + + foreach ( $this->theme_json['customTemplates'] as $item ) { + if ( isset( $item['name'] ) ) { + $custom_templates[ $item['name'] ] = array( + 'title' => isset( $item['title'] ) ? $item['title'] : '', + 'postTypes' => isset( $item['postTypes'] ) ? $item['postTypes'] : array( 'page' ), + ); + } + } + return $custom_templates; + } + + /** + * Returns the template part data of active theme. + * + * @since 5.9.0 + * + * @return array + */ + public function get_template_parts() { + $template_parts = array(); + if ( ! isset( $this->theme_json['templateParts'] ) || ! is_array( $this->theme_json['templateParts'] ) ) { + return $template_parts; + } + + foreach ( $this->theme_json['templateParts'] as $item ) { + if ( isset( $item['name'] ) ) { + $template_parts[ $item['name'] ] = array( + 'title' => isset( $item['title'] ) ? $item['title'] : '', + 'area' => isset( $item['area'] ) ? $item['area'] : '', + ); + } + } + return $template_parts; } /** @@ -526,37 +767,17 @@ class WP_Theme_JSON { * style-property-one: value; * } * - * Additionally, it'll also create new rulesets - * as classes for each preset value such as: - * - * .has-value-color { - * color: value; - * } - * - * .has-value-background-color { - * background-color: value; - * } - * - * .has-value-font-size { - * font-size: value; - * } - * - * .has-value-gradient-background { - * background: value; - * } - * - * p.has-value-gradient-background { - * background: value; - * } + * @since 5.8.0 As `get_block_styles()`. + * @since 5.9.0 Renamed from `get_block_styles()` to `get_block_classes()` + * and no longer returns preset classes. + * Removed the `$setting_nodes` parameter. * - * @since 5.8.0 - * - * @param array $style_nodes Nodes with styles. - * @param array $setting_nodes Nodes with settings. + * @param array $style_nodes Nodes with styles. * @return string The new stylesheet. */ - private function get_block_styles( $style_nodes, $setting_nodes ) { + private function get_block_classes( $style_nodes ) { $block_rules = ''; + foreach ( $style_nodes as $metadata ) { if ( null === $metadata['selector'] ) { continue; @@ -564,11 +785,88 @@ class WP_Theme_JSON { $node = _wp_array_get( $this->theme_json, $metadata['path'], array() ); $selector = $metadata['selector']; - $declarations = self::compute_style_properties( $node ); + $settings = _wp_array_get( $this->theme_json, array( 'settings' ) ); + $declarations = self::compute_style_properties( $node, $settings ); + + // 1. Separate the ones who use the general selector + // and the ones who use the duotone selector. + $declarations_duotone = array(); + foreach ( $declarations as $index => $declaration ) { + if ( 'filter' === $declaration['name'] ) { + unset( $declarations[ $index ] ); + $declarations_duotone[] = $declaration; + } + } + + /* + * Reset default browser margin on the root body element. + * This is set on the root selector **before** generating the ruleset + * from the `theme.json`. This is to ensure that if the `theme.json` declares + * `margin` in its `spacing` declaration for the `body` element then these + * user-generated values take precedence in the CSS cascade. + * @link https://github.com/WordPress/gutenberg/issues/36147. + */ + if ( self::ROOT_BLOCK_SELECTOR === $selector ) { + $block_rules .= 'body { margin: 0; }'; + } + + // 2. Generate the rules that use the general selector. $block_rules .= self::to_ruleset( $selector, $declarations ); + + // 3. Generate the rules that use the duotone selector. + if ( isset( $metadata['duotone'] ) && ! empty( $declarations_duotone ) ) { + $selector_duotone = self::scope_selector( $metadata['selector'], $metadata['duotone'] ); + $block_rules .= self::to_ruleset( $selector_duotone, $declarations_duotone ); + } + + if ( self::ROOT_BLOCK_SELECTOR === $selector ) { + $block_rules .= '.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }'; + $block_rules .= '.wp-site-blocks > .alignright { float: right; margin-left: 2em; }'; + $block_rules .= '.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }'; + + $has_block_gap_support = _wp_array_get( $this->theme_json, array( 'settings', 'spacing', 'blockGap' ) ) !== null; + if ( $has_block_gap_support ) { + $block_rules .= '.wp-site-blocks > * { margin-top: 0; margin-bottom: 0; }'; + $block_rules .= '.wp-site-blocks > * + * { margin-top: var( --wp--style--block-gap ); }'; + } + } } + return $block_rules; + } + + /** + * Creates new rulesets as classes for each preset value such as: + * + * .has-value-color { + * color: value; + * } + * + * .has-value-background-color { + * background-color: value; + * } + * + * .has-value-font-size { + * font-size: value; + * } + * + * .has-value-gradient-background { + * background: value; + * } + * + * p.has-value-gradient-background { + * background: value; + * } + * + * @since 5.9.0 + * + * @param array $setting_nodes Nodes with settings. + * @param array $origins List of origins to process presets from. + * @return string The new stylesheet. + */ + private function get_preset_classes( $setting_nodes, $origins ) { $preset_rules = ''; + foreach ( $setting_nodes as $metadata ) { if ( null === $metadata['selector'] ) { continue; @@ -576,10 +874,10 @@ class WP_Theme_JSON { $selector = $metadata['selector']; $node = _wp_array_get( $this->theme_json, $metadata['path'], array() ); - $preset_rules .= self::compute_preset_classes( $node, $selector ); + $preset_rules .= self::compute_preset_classes( $node, $selector, $origins ); } - return $block_rules . $preset_rules; + return $preset_rules; } /** @@ -597,11 +895,13 @@ class WP_Theme_JSON { * } * * @since 5.8.0 + * @since 5.9.0 Added the `$origins` parameter. * - * @param array $nodes Nodes with settings. + * @param array $nodes Nodes with settings. + * @param array $origins List of origins to process. * @return string The new stylesheet. */ - private function get_css_variables( $nodes ) { + private function get_css_variables( $nodes, $origins ) { $stylesheet = ''; foreach ( $nodes as $metadata ) { if ( null === $metadata['selector'] ) { @@ -611,7 +911,7 @@ class WP_Theme_JSON { $selector = $metadata['selector']; $node = _wp_array_get( $this->theme_json, $metadata['path'], array() ); - $declarations = array_merge( self::compute_preset_vars( $node ), self::compute_theme_vars( $node ) ); + $declarations = array_merge( self::compute_preset_vars( $node, $origins ), self::compute_theme_vars( $node ) ); $stylesheet .= self::to_ruleset( $selector, $declarations ); } @@ -667,46 +967,19 @@ class WP_Theme_JSON { return implode( ',', $new_selectors ); } - /** - * Given an array of presets keyed by origin and the value key of the preset, - * it returns an array where each key is the preset slug and each value the preset value. - * - * @since 5.8.0 - * - * @param array $preset_per_origin Array of presets keyed by origin. - * @param string $value_key The property of the preset that contains its value. - * @return array Array of presets where each key is a slug and each value is the preset value. - */ - private static function get_merged_preset_by_slug( $preset_per_origin, $value_key ) { - $result = array(); - foreach ( self::VALID_ORIGINS as $origin ) { - if ( ! isset( $preset_per_origin[ $origin ] ) ) { - continue; - } - foreach ( $preset_per_origin[ $origin ] as $preset ) { - /* - * We don't want to use kebabCase here, - * see https://github.com/WordPress/gutenberg/issues/32347 - * However, we need to make sure the generated class or CSS variable - * doesn't contain spaces. - */ - $result[ preg_replace( '/\s+/', '-', $preset['slug'] ) ] = $preset[ $value_key ]; - } - } - return $result; - } - /** * Given a settings array, it returns the generated rulesets * for the preset classes. * * @since 5.8.0 + * @since 5.9.0 Added the `$origins` parameter. * * @param array $settings Settings to process. * @param string $selector Selector wrapping the classes. + * @param array $origins List of origins to process. * @return string The result of processing the presets. */ - private static function compute_preset_classes( $settings, $selector ) { + private static function compute_preset_classes( $settings, $selector, $origins ) { if ( self::ROOT_BLOCK_SELECTOR === $selector ) { // Classes at the global level do not need any CSS prefixed, // and we don't want to increase its specificity. @@ -714,17 +987,18 @@ class WP_Theme_JSON { } $stylesheet = ''; - foreach ( self::PRESETS_METADATA as $preset ) { - $preset_per_origin = _wp_array_get( $settings, $preset['path'], array() ); - $preset_by_slug = self::get_merged_preset_by_slug( $preset_per_origin, $preset['value_key'] ); - foreach ( $preset['classes'] as $class ) { - foreach ( $preset_by_slug as $slug => $value ) { + foreach ( self::PRESETS_METADATA as $preset_metadata ) { + $slugs = self::get_settings_slugs( $settings, $preset_metadata, $origins ); + foreach ( $preset_metadata['classes'] as $class => $property ) { + foreach ( $slugs as $slug ) { + $css_var = self::replace_slug_in_string( $preset_metadata['css_vars'], $slug ); + $class_name = self::replace_slug_in_string( $class, $slug ); $stylesheet .= self::to_ruleset( - self::append_to_selector( $selector, '.has-' . _wp_to_kebab_case( $slug ) . '-' . $class['class_suffix'] ), + self::append_to_selector( $selector, $class_name ), array( array( - 'name' => $class['property_name'], - 'value' => 'var(--wp--preset--' . $preset['css_var_infix'] . '--' . _wp_to_kebab_case( $slug ) . ') !important', + 'name' => $property, + 'value' => 'var(' . $css_var . ') !important', ), ) ); @@ -735,6 +1009,146 @@ class WP_Theme_JSON { return $stylesheet; } + /** + * Function that scopes a selector with another one. This works a bit like + * SCSS nesting except the `&` operator isn't supported. + * + * + * $scope = '.a, .b .c'; + * $selector = '> .x, .y'; + * $merged = scope_selector( $scope, $selector ); + * // $merged is '.a > .x, .a .y, .b .c > .x, .b .c .y' + * + * + * @since 5.9.0 + * + * @param string $scope Selector to scope to. + * @param string $selector Original selector. + * @return string Scoped selector. + */ + private static function scope_selector( $scope, $selector ) { + $scopes = explode( ',', $scope ); + $selectors = explode( ',', $selector ); + + $selectors_scoped = array(); + foreach ( $scopes as $outer ) { + foreach ( $selectors as $inner ) { + $selectors_scoped[] = trim( $outer ) . ' ' . trim( $inner ); + } + } + + return implode( ', ', $selectors_scoped ); + } + + /** + * Gets preset values keyed by slugs based on settings and metadata. + * + * + * $settings = array( + * 'typography' => array( + * 'fontFamilies' => array( + * array( + * 'slug' => 'sansSerif', + * 'fontFamily' => '"Helvetica Neue", sans-serif', + * ), + * array( + * 'slug' => 'serif', + * 'colors' => 'Georgia, serif', + * ) + * ), + * ), + * ); + * $meta = array( + * 'path' => array( 'typography', 'fontFamilies' ), + * 'value_key' => 'fontFamily', + * ); + * $values_by_slug = get_settings_values_by_slug(); + * // $values_by_slug === array( + * // 'sans-serif' => '"Helvetica Neue", sans-serif', + * // 'serif' => 'Georgia, serif', + * // ); + * + * + * @since 5.9.0 + * + * @param array $settings Settings to process. + * @param array $preset_metadata One of the PRESETS_METADATA values. + * @param array $origins List of origins to process. + * @return array Array of presets where each key is a slug and each value is the preset value. + */ + private static function get_settings_values_by_slug( $settings, $preset_metadata, $origins ) { + $preset_per_origin = _wp_array_get( $settings, $preset_metadata['path'], array() ); + + $result = array(); + foreach ( $origins as $origin ) { + if ( ! isset( $preset_per_origin[ $origin ] ) ) { + continue; + } + foreach ( $preset_per_origin[ $origin ] as $preset ) { + $slug = _wp_to_kebab_case( $preset['slug'] ); + + $value = ''; + if ( isset( $preset_metadata['value_key'] ) ) { + $value_key = $preset_metadata['value_key']; + $value = $preset[ $value_key ]; + } elseif ( + isset( $preset_metadata['value_func'] ) && + is_callable( $preset_metadata['value_func'] ) + ) { + $value_func = $preset_metadata['value_func']; + $value = call_user_func( $value_func, $preset ); + } else { + // If we don't have a value, then don't add it to the result. + continue; + } + + $result[ $slug ] = $value; + } + } + return $result; + } + + /** + * Similar to get_settings_values_by_slug, but doesn't compute the value. + * + * @since 5.9.0 + * + * @param array $settings Settings to process. + * @param array $preset_metadata One of the PRESETS_METADATA values. + * @param array $origins List of origins to process. + * @return array Array of presets where the key and value are both the slug. + */ + private static function get_settings_slugs( $settings, $preset_metadata, $origins = self::VALID_ORIGINS ) { + $preset_per_origin = _wp_array_get( $settings, $preset_metadata['path'], array() ); + + $result = array(); + foreach ( $origins as $origin ) { + if ( ! isset( $preset_per_origin[ $origin ] ) ) { + continue; + } + foreach ( $preset_per_origin[ $origin ] as $preset ) { + $slug = _wp_to_kebab_case( $preset['slug'] ); + + // Use the array as a set so we don't get duplicates. + $result[ $slug ] = $slug; + } + } + return $result; + } + + /** + * Transform a slug into a CSS Custom Property. + * + * @since 5.9.0 + * + * @param string $input String to replace. + * @param string $slug The slug value to use to generate the custom property. + * @return string The CSS Custom Property. Something along the lines of `--wp--preset--color--black`. + */ + private static function replace_slug_in_string( $input, $slug ) { + return strtr( $input, array( '$slug' => $slug ) ); + } + /** * Given the block settings, it extracts the CSS Custom Properties * for the presets and adds them to the $declarations array @@ -746,18 +1160,19 @@ class WP_Theme_JSON { * ) * * @since 5.8.0 + * @since 5.9.0 Added the `$origins` parameter. * * @param array $settings Settings to process. + * @param array $origins List of origins to process. * @return array Returns the modified $declarations. */ - private static function compute_preset_vars( $settings ) { + private static function compute_preset_vars( $settings, $origins ) { $declarations = array(); - foreach ( self::PRESETS_METADATA as $preset ) { - $preset_per_origin = _wp_array_get( $settings, $preset['path'], array() ); - $preset_by_slug = self::get_merged_preset_by_slug( $preset_per_origin, $preset['value_key'] ); - foreach ( $preset_by_slug as $slug => $value ) { + foreach ( self::PRESETS_METADATA as $preset_metadata ) { + $values_by_slug = self::get_settings_values_by_slug( $settings, $preset_metadata, $origins ); + foreach ( $values_by_slug as $slug => $value ) { $declarations[] = array( - 'name' => '--wp--preset--' . $preset['css_var_infix'] . '--' . _wp_to_kebab_case( $slug ), + 'name' => self::replace_slug_in_string( $preset_metadata['css_vars'], $slug ), 'value' => $value, ); } @@ -838,7 +1253,7 @@ class WP_Theme_JSON { $new_key = $prefix . str_replace( '/', '-', - strtolower( preg_replace( '/(? $metadata ) { - /* - * Some properties can be shorthand properties, meaning that - * they contain multiple values instead of a single one. - * An example of this is the padding property. - */ - if ( self::has_properties( $metadata ) ) { - foreach ( $metadata['properties'] as $property ) { - $properties[] = array( - 'name' => $name . '-' . $property, - 'value' => array_merge( $metadata['value'], array( $property ) ), - ); + foreach ( $properties as $css_property => $value_path ) { + $value = self::get_property_value( $styles, $value_path ); + + // Look up protected properties, keyed by value path. + // Skip protected properties that are explicitly set to `null`. + if ( is_array( $value_path ) ) { + $path_string = implode( '.', $value_path ); + if ( + array_key_exists( $path_string, self::PROTECTED_PROPERTIES ) && + _wp_array_get( $settings, self::PROTECTED_PROPERTIES[ $path_string ], null ) === null + ) { + continue; } - } else { - $properties[] = array( - 'name' => $name, - 'value' => $metadata['value'], - ); } - } - foreach ( $properties as $prop ) { - $value = self::get_property_value( $styles, $prop['value'] ); - if ( empty( $value ) ) { + // Skip if empty and not "0" or value represents array of longhand values. + $has_missing_value = empty( $value ) && ! is_numeric( $value ); + if ( $has_missing_value || is_array( $value ) ) { continue; } $declarations[] = array( - 'name' => $prop['name'], + 'name' => $css_property, 'value' => $value, ); } @@ -911,22 +1322,6 @@ class WP_Theme_JSON { return $declarations; } - /** - * Whether the metadata contains a key named properties. - * - * @since 5.8.0 - * - * @param array $metadata Description of the style property. - * @return bool True if properties exists, false otherwise. - */ - private static function has_properties( $metadata ) { - if ( array_key_exists( 'properties', $metadata ) ) { - return true; - } - - return false; - } - /** * Returns the style property for the given path. * @@ -935,15 +1330,16 @@ class WP_Theme_JSON { * "--wp--preset--color--secondary". * * @since 5.8.0 + * @since 5.9.0 Added support for values of array type, which are returned as is. * * @param array $styles Styles subtree. * @param array $path Which property to process. - * @return string Style property value. + * @return string|array Style property value. */ private static function get_property_value( $styles, $path ) { $value = _wp_array_get( $styles, $path, '' ); - if ( '' === $value ) { + if ( '' === $value || is_array( $value ) ) { return $value; } @@ -1015,18 +1411,19 @@ class WP_Theme_JSON { return $nodes; } - /** * Builds metadata for the style nodes, which returns in the form of: * * [ * [ * 'path' => [ 'path', 'to', 'some', 'node' ], - * 'selector' => 'CSS selector for some node' + * 'selector' => 'CSS selector for some node', + * 'duotone' => 'CSS selector for duotone for some node' * ], * [ * 'path' => ['path', 'to', 'other', 'node' ], - * 'selector' => 'CSS selector for other node' + * 'selector' => 'CSS selector for other node', + * 'duotone' => null * ], * ] * @@ -1068,9 +1465,15 @@ class WP_Theme_JSON { $selector = $selectors[ $name ]['selector']; } + $duotone_selector = null; + if ( isset( $selectors[ $name ]['duotone'] ) ) { + $duotone_selector = $selectors[ $name ]['duotone']; + } + $nodes[] = array( 'path' => array( 'styles', 'blocks', $name ), 'selector' => $selector, + 'duotone' => $duotone_selector, ); if ( isset( $theme_json['styles']['blocks'][ $name ]['elements'] ) ) { @@ -1090,6 +1493,7 @@ class WP_Theme_JSON { * Merge new incoming data. * * @since 5.8.0 + * @since 5.9.0 Duotone preset also has origins. * * @param WP_Theme_JSON $incoming Data to merge. */ @@ -1098,30 +1502,367 @@ class WP_Theme_JSON { $this->theme_json = array_replace_recursive( $this->theme_json, $incoming_data ); /* - * The array_replace_recursive() algorithm merges at the leaf level. - * For leaf values that are arrays it will use the numeric indexes for replacement. - * In those cases, we want to replace the existing with the incoming value, if it exists. + * The array_replace_recursive algorithm merges at the leaf level, + * but we don't want leaf arrays to be merged, so we overwrite it. + * + * For leaf values that are sequential arrays it will use the numeric indexes for replacement. + * We rather replace the existing with the incoming value, if it exists. + * This is the case of spacing.units. + * + * For leaf values that are associative arrays it will merge them as expected. + * This is also not the behavior we want for the current associative arrays (presets). + * We rather replace the existing with the incoming value, if it exists. + * This happens, for example, when we merge data from theme.json upon existing + * theme supports or when we merge anything coming from the same source twice. + * This is the case of color.palette, color.gradients, color.duotone, + * typography.fontSizes, or typography.fontFamilies. + * + * Additionally, for some preset types, we also want to make sure the + * values they introduce don't conflict with default values. We do so + * by checking the incoming slugs for theme presets and compare them + * with the equivalent default presets: if a slug is present as a default + * we remove it from the theme presets. + */ + $nodes = self::get_setting_nodes( $incoming_data ); + $slugs_global = self::get_default_slugs( $this->theme_json, array( 'settings' ) ); + foreach ( $nodes as $node ) { + $slugs_node = self::get_default_slugs( $this->theme_json, $node['path'] ); + $slugs = array_merge_recursive( $slugs_global, $slugs_node ); + + // Replace the spacing.units. + $path = array_merge( $node['path'], array( 'spacing', 'units' ) ); + $content = _wp_array_get( $incoming_data, $path, null ); + if ( isset( $content ) ) { + _wp_array_set( $this->theme_json, $path, $content ); + } + + // Replace the presets. + foreach ( self::PRESETS_METADATA as $preset ) { + $override_preset = self::should_override_preset( $this->theme_json, $node['path'], $preset['override'] ); + + foreach ( self::VALID_ORIGINS as $origin ) { + $base_path = array_merge( $node['path'], $preset['path'] ); + $path = array_merge( $base_path, array( $origin ) ); + $content = _wp_array_get( $incoming_data, $path, null ); + if ( ! isset( $content ) ) { + continue; + } + + if ( 'theme' === $origin && $preset['use_default_names'] ) { + foreach ( $content as &$item ) { + if ( ! array_key_exists( 'name', $item ) ) { + $name = self::get_name_from_defaults( $item['slug'], $base_path ); + if ( null !== $name ) { + $item['name'] = $name; + } + } + } + } + + if ( + ( 'theme' !== $origin ) || + ( 'theme' === $origin && $override_preset ) + ) { + _wp_array_set( $this->theme_json, $path, $content ); + } else { + $slugs_for_preset = _wp_array_get( $slugs, $preset['path'], array() ); + $content = self::filter_slugs( $content, $slugs_for_preset ); + _wp_array_set( $this->theme_json, $path, $content ); + } + } + } + } + } + + /** + * Returns whether a presets should be overridden or not. + * + * @since 5.9.0 + * + * @param array $theme_json The theme.json like structure to inspect. + * @param array $path Path to inspect. + * @param bool|array $override Data to compute whether to override the preset. + * @return boolean + */ + private static function should_override_preset( $theme_json, $path, $override ) { + if ( is_bool( $override ) ) { + return $override; + } + + /* + * The relationship between whether to override the defaults + * and whether the defaults are enabled is inverse: + * + * - If defaults are enabled => theme presets should not be overridden + * - If defaults are disabled => theme presets should be overridden + * + * For example, a theme sets defaultPalette to false, + * making the default palette hidden from the user. + * In that case, we want all the theme presets to be present, + * so they should override the defaults. */ - $to_replace = array(); - $to_replace[] = array( 'spacing', 'units' ); - $to_replace[] = array( 'color', 'duotone' ); - foreach ( self::VALID_ORIGINS as $origin ) { - $to_replace[] = array( 'color', 'palette', $origin ); - $to_replace[] = array( 'color', 'gradients', $origin ); - $to_replace[] = array( 'typography', 'fontSizes', $origin ); - $to_replace[] = array( 'typography', 'fontFamilies', $origin ); + if ( is_array( $override ) ) { + $value = _wp_array_get( $theme_json, array_merge( $path, $override ) ); + if ( isset( $value ) ) { + return ! $value; + } + + // Search the top-level key if none was found for this node. + $value = _wp_array_get( $theme_json, array_merge( array( 'settings' ), $override ) ); + if ( isset( $value ) ) { + return ! $value; + } + + return true; } + } - $nodes = self::get_setting_nodes( $this->theme_json ); - foreach ( $nodes as $metadata ) { - foreach ( $to_replace as $property_path ) { - $path = array_merge( $metadata['path'], $property_path ); - $node = _wp_array_get( $incoming_data, $path, null ); - if ( isset( $node ) ) { - _wp_array_set( $this->theme_json, $path, $node ); + /** + * Returns the default slugs for all the presets in an associative array + * whose keys are the preset paths and the leafs is the list of slugs. + * + * For example: + * + * array( + * 'color' => array( + * 'palette' => array( 'slug-1', 'slug-2' ), + * 'gradients' => array( 'slug-3', 'slug-4' ), + * ), + * ) + * + * @since 5.9.0 + * + * @param array $data A theme.json like structure. + * @param array $node_path The path to inspect. It's 'settings' by default. + * @return array + */ + private static function get_default_slugs( $data, $node_path ) { + $slugs = array(); + + foreach ( self::PRESETS_METADATA as $metadata ) { + $path = array_merge( $node_path, $metadata['path'], array( 'default' ) ); + $preset = _wp_array_get( $data, $path, null ); + if ( ! isset( $preset ) ) { + continue; + } + + $slugs_for_preset = array(); + $slugs_for_preset = array_map( + static function( $value ) { + return isset( $value['slug'] ) ? $value['slug'] : null; + }, + $preset + ); + _wp_array_set( $slugs, $metadata['path'], $slugs_for_preset ); + } + + return $slugs; + } + + /** + * Get a `default`'s preset name by a provided slug. + * + * @since 5.9.0 + * + * @param string $slug The slug we want to find a match from default presets. + * @param array $base_path The path to inspect. It's 'settings' by default. + * @return string|null + */ + private function get_name_from_defaults( $slug, $base_path ) { + $path = array_merge( $base_path, array( 'default' ) ); + $default_content = _wp_array_get( $this->theme_json, $path, null ); + if ( ! $default_content ) { + return null; + } + foreach ( $default_content as $item ) { + if ( $slug === $item['slug'] ) { + return $item['name']; + } + } + return null; + } + + /** + * Removes the preset values whose slug is equal to any of given slugs. + * + * @since 5.9.0 + * + * @param array $node The node with the presets to validate. + * @param array $slugs The slugs that should not be overridden. + * @return array The new node. + */ + private static function filter_slugs( $node, $slugs ) { + if ( empty( $slugs ) ) { + return $node; + } + + $new_node = array(); + foreach ( $node as $value ) { + if ( isset( $value['slug'] ) && ! in_array( $value['slug'], $slugs, true ) ) { + $new_node[] = $value; + } + } + + return $new_node; + } + + /** + * Removes insecure data from theme.json. + * + * @since 5.9.0 + * + * @param array $theme_json Structure to sanitize. + * @return array Sanitized structure. + */ + public static function remove_insecure_properties( $theme_json ) { + $sanitized = array(); + + $theme_json = WP_Theme_JSON_Schema::migrate( $theme_json ); + + $valid_block_names = array_keys( self::get_blocks_metadata() ); + $valid_element_names = array_keys( self::ELEMENTS ); + $theme_json = self::sanitize( $theme_json, $valid_block_names, $valid_element_names ); + + $blocks_metadata = self::get_blocks_metadata(); + $style_nodes = self::get_style_nodes( $theme_json, $blocks_metadata ); + foreach ( $style_nodes as $metadata ) { + $input = _wp_array_get( $theme_json, $metadata['path'], array() ); + if ( empty( $input ) ) { + continue; + } + + $output = self::remove_insecure_styles( $input ); + if ( ! empty( $output ) ) { + _wp_array_set( $sanitized, $metadata['path'], $output ); + } + } + + $setting_nodes = self::get_setting_nodes( $theme_json ); + foreach ( $setting_nodes as $metadata ) { + $input = _wp_array_get( $theme_json, $metadata['path'], array() ); + if ( empty( $input ) ) { + continue; + } + + $output = self::remove_insecure_settings( $input ); + if ( ! empty( $output ) ) { + _wp_array_set( $sanitized, $metadata['path'], $output ); + } + } + + if ( empty( $sanitized['styles'] ) ) { + unset( $theme_json['styles'] ); + } else { + $theme_json['styles'] = $sanitized['styles']; + } + + if ( empty( $sanitized['settings'] ) ) { + unset( $theme_json['settings'] ); + } else { + $theme_json['settings'] = $sanitized['settings']; + } + + return $theme_json; + } + + /** + * Processes a setting node and returns the same node + * without the insecure settings. + * + * @since 5.9.0 + * + * @param array $input Node to process. + * @return array + */ + private static function remove_insecure_settings( $input ) { + $output = array(); + foreach ( self::PRESETS_METADATA as $preset_metadata ) { + foreach ( self::VALID_ORIGINS as $origin ) { + $path_with_origin = array_merge( $preset_metadata['path'], array( $origin ) ); + $presets = _wp_array_get( $input, $path_with_origin, null ); + if ( null === $presets ) { + continue; + } + + $escaped_preset = array(); + foreach ( $presets as $preset ) { + if ( + esc_attr( esc_html( $preset['name'] ) ) === $preset['name'] && + sanitize_html_class( $preset['slug'] ) === $preset['slug'] + ) { + $value = null; + if ( isset( $preset_metadata['value_key'] ) ) { + $value = $preset[ $preset_metadata['value_key'] ]; + } elseif ( + isset( $preset_metadata['value_func'] ) && + is_callable( $preset_metadata['value_func'] ) + ) { + $value = call_user_func( $preset_metadata['value_func'], $preset ); + } + + $preset_is_valid = true; + foreach ( $preset_metadata['properties'] as $property ) { + if ( ! self::is_safe_css_declaration( $property, $value ) ) { + $preset_is_valid = false; + break; + } + } + + if ( $preset_is_valid ) { + $escaped_preset[] = $preset; + } + } + } + + if ( ! empty( $escaped_preset ) ) { + _wp_array_set( $output, $path_with_origin, $escaped_preset ); + } + } + } + return $output; + } + + /** + * Processes a style node and returns the same node + * without the insecure styles. + * + * @since 5.9.0 + * + * @param array $input Node to process. + * @return array + */ + private static function remove_insecure_styles( $input ) { + $output = array(); + $declarations = self::compute_style_properties( $input ); + + foreach ( $declarations as $declaration ) { + if ( self::is_safe_css_declaration( $declaration['name'], $declaration['value'] ) ) { + $path = self::PROPERTIES_METADATA[ $declaration['name'] ]; + + // Check the value isn't an array before adding so as to not + // double up shorthand and longhand styles. + $value = _wp_array_get( $input, $path, array() ); + if ( ! is_array( $value ) ) { + _wp_array_set( $output, $path, $value ); } } } + return $output; + } + + /** + * Checks that a declaration provided by the user is safe. + * + * @since 5.9.0 + * + * @param string $property_name Property name in a CSS declaration, i.e. the `color` in `color: red`. + * @param string $property_value Value in a CSS declaration, i.e. the `red` in `color: red`. + * @return bool + */ + private static function is_safe_css_declaration( $property_name, $property_value ) { + $style_to_validate = $property_name . ': ' . $property_value; + $filtered = esc_html( safecss_filter_attr( $style_to_validate ) ); + return ! empty( trim( $filtered ) ); } /** @@ -1176,7 +1917,7 @@ class WP_Theme_JSON { if ( ! isset( $theme_settings['settings']['typography'] ) ) { $theme_settings['settings']['typography'] = array(); } - $theme_settings['settings']['typography']['customLineHeight'] = $settings['enableCustomLineHeight']; + $theme_settings['settings']['typography']['lineHeight'] = $settings['enableCustomLineHeight']; } if ( isset( $settings['enableCustomUnits'] ) ) { @@ -1220,7 +1961,7 @@ class WP_Theme_JSON { if ( ! isset( $theme_settings['settings']['spacing'] ) ) { $theme_settings['settings']['spacing'] = array(); } - $theme_settings['settings']['spacing']['customPadding'] = $settings['enableCustomSpacing']; + $theme_settings['settings']['spacing']['padding'] = $settings['enableCustomSpacing']; } return $theme_settings; diff --git a/src/wp-includes/class-wp-theme.php b/src/wp-includes/class-wp-theme.php index d0607528b5..2c4dcd7fc8 100644 --- a/src/wp-includes/class-wp-theme.php +++ b/src/wp-includes/class-wp-theme.php @@ -23,7 +23,7 @@ final class WP_Theme implements ArrayAccess { * * @since 3.4.0 * @since 5.4.0 Added `Requires at least` and `Requires PHP` headers. - * @var array + * @var string[] */ private static $file_headers = array( 'Name' => 'Theme Name', @@ -54,7 +54,7 @@ final class WP_Theme implements ArrayAccess { * @since 5.0.0 Added the Twenty Nineteen theme. * @since 5.3.0 Added the Twenty Twenty theme. * @since 5.6.0 Added the Twenty Twenty-One theme. - * @var array + * @var string[] */ private static $default_themes = array( 'classic' => 'WordPress Classic', @@ -70,13 +70,14 @@ final class WP_Theme implements ArrayAccess { 'twentynineteen' => 'Twenty Nineteen', 'twentytwenty' => 'Twenty Twenty', 'twentytwentyone' => 'Twenty Twenty-One', + 'twentytwentytwo' => 'Twenty Twenty-Two', ); /** * Renamed theme tags. * * @since 3.8.0 - * @var array + * @var string[] */ private static $tag_map = array( 'fixed-width' => 'fixed-layout', @@ -697,7 +698,7 @@ final class WP_Theme implements ArrayAccess { * * @since 3.4.0 * - * @return WP_Theme|false Parent theme, or false if the current theme is not a child theme. + * @return WP_Theme|false Parent theme, or false if the active theme is not a child theme. */ public function parent() { return isset( $this->parent ) ? $this->parent : false; @@ -980,8 +981,8 @@ final class WP_Theme implements ArrayAccess { 'tan' => __( 'Tan' ), 'white' => __( 'White' ), 'yellow' => __( 'Yellow' ), - 'dark' => __( 'Dark' ), - 'light' => __( 'Light' ), + 'dark' => _x( 'Dark', 'color scheme' ), + 'light' => _x( 'Light', 'color scheme' ), 'fixed-layout' => __( 'Fixed Layout' ), 'fluid-layout' => __( 'Fluid Layout' ), 'responsive-layout' => __( 'Responsive Layout' ), @@ -1212,11 +1213,11 @@ final class WP_Theme implements ArrayAccess { * @since 4.7.0 * @since 5.8.0 Include block templates. * - * @return string[] Array of page templates, keyed by filename and post type, - * with the value of the translated header name. + * @return array[] Array of page template arrays, keyed by post type and filename, + * with the value of the translated header name. */ public function get_post_templates() { - // If you screw up your current theme and we invalidate your parent, most things still work. Let it slide. + // If you screw up your active theme and we invalidate your parent, most things still work. Let it slide. if ( $this->errors() && $this->errors()->get_error_codes() !== array( 'theme_parent_invalid' ) ) { return array(); } @@ -1252,6 +1253,14 @@ final class WP_Theme implements ArrayAccess { $block_templates = get_block_templates( array(), 'wp_template' ); foreach ( get_post_types( array( 'public' => true ) ) as $type ) { foreach ( $block_templates as $block_template ) { + if ( ! $block_template->is_custom ) { + continue; + } + + if ( isset( $block_template->post_types ) && ! in_array( $type, $block_template->post_types, true ) ) { + continue; + } + $post_templates[ $type ][ $block_template->slug ] = $block_template->title; } } @@ -1459,6 +1468,57 @@ final class WP_Theme implements ArrayAccess { return false; } + /** + * Returns whether this theme is a block-based theme or not. + * + * @since 5.9.0 + * + * @return bool + */ + public function is_block_theme() { + $paths_to_index_block_template = array( + $this->get_file_path( '/block-templates/index.html' ), + $this->get_file_path( '/templates/index.html' ), + ); + + foreach ( $paths_to_index_block_template as $path_to_index_block_template ) { + if ( is_file( $path_to_index_block_template ) && is_readable( $path_to_index_block_template ) ) { + return true; + } + } + + return false; + } + + /** + * Retrieves the path of a file in the theme. + * + * Searches in the stylesheet directory before the template directory so themes + * which inherit from a parent theme can just override one file. + * + * @since 5.9.0 + * + * @param string $file Optional. File to search for in the stylesheet directory. + * @return string The path of the file. + */ + public function get_file_path( $file = '' ) { + $file = ltrim( $file, '/' ); + + $stylesheet_directory = $this->get_stylesheet_directory(); + $template_directory = $this->get_template_directory(); + + if ( empty( $file ) ) { + $path = $stylesheet_directory; + } elseif ( file_exists( $stylesheet_directory . '/' . $file ) ) { + $path = $stylesheet_directory . '/' . $file; + } else { + $path = $template_directory . '/' . $file; + } + + /** This filter is documented in wp-includes/link-template.php */ + return apply_filters( 'theme_file_path', $path, $file ); + } + /** * Determines the latest WordPress default theme that is installed. * diff --git a/src/wp-includes/class-wp-user-query.php b/src/wp-includes/class-wp-user-query.php index 936ffe89bf..ac6465c5f1 100644 --- a/src/wp-includes/class-wp-user-query.php +++ b/src/wp-includes/class-wp-user-query.php @@ -136,6 +136,8 @@ class WP_User_Query { * querying for all users with using -1. * @since 4.7.0 Added 'nicename', 'nicename__in', 'nicename__not_in', 'login', 'login__in', * and 'login__not_in' parameters. + * @since 5.1.0 Introduced the 'meta_compare_key' parameter. + * @since 5.3.0 Introduced the 'meta_type_key' parameter. * @since 5.9.0 Added 'capability', 'capability__in', and 'capability__not_in' parameters. * * @global wpdb $wpdb WordPress database abstraction object. @@ -144,85 +146,108 @@ class WP_User_Query { * @param string|array $query { * Optional. Array or string of Query parameters. * - * @type int $blog_id The site ID. Default is the current site. - * @type string|array $role An array or a comma-separated list of role names that users must match - * to be included in results. Note that this is an inclusive list: users - * must match *each* role. Default empty. - * @type string[] $role__in An array of role names. Matched users must have at least one of these - * roles. Default empty array. - * @type string[] $role__not_in An array of role names to exclude. Users matching one or more of these - * roles will not be included in results. Default empty array. - * @type string $capability An array or a comma-separated list of capability names that users must match - * to be included in results. Note that this is an inclusive list: users - * must match *each* capability. - * Does NOT work for capabilities not in the database or filtered via {@see 'map_meta_cap'}. - * Default empty. - * @type string[] $capability__in An array of capability names. Matched users must have at least one of these - * capabilities. - * Does NOT work for capabilities not in the database or filtered via {@see 'map_meta_cap'}. - * Default empty array. - * @type string[] $capability__not_in An array of capability names to exclude. Users matching one or more of these - * capabilities will not be included in results. - * Does NOT work for capabilities not in the database or filtered via {@see 'map_meta_cap'}. - * Default empty array. - * @type string $meta_key User meta key. Default empty. - * @type string $meta_value User meta value. Default empty. - * @type string $meta_compare Comparison operator to test the `$meta_value`. Accepts '=', '!=', - * '>', '>=', '<', '<=', 'LIKE', 'NOT LIKE', 'IN', 'NOT IN', - * 'BETWEEN', 'NOT BETWEEN', 'EXISTS', 'NOT EXISTS', 'REGEXP', - * 'NOT REGEXP', or 'RLIKE'. Default '='. - * @type int[] $include An array of user IDs to include. Default empty array. - * @type int[] $exclude An array of user IDs to exclude. Default empty array. - * @type string $search Search keyword. Searches for possible string matches on columns. - * When `$search_columns` is left empty, it tries to determine which - * column to search in based on search string. Default empty. - * @type string[] $search_columns Array of column names to be searched. Accepts 'ID', 'user_login', - * 'user_email', 'user_url', 'user_nicename', 'display_name'. - * Default empty array. - * @type string|array $orderby Field(s) to sort the retrieved users by. May be a single value, - * an array of values, or a multi-dimensional array with fields as - * keys and orders ('ASC' or 'DESC') as values. Accepted values are - * 'ID', 'display_name' (or 'name'), 'include', 'user_login' - * (or 'login'), 'login__in', 'user_nicename' (or 'nicename'), - * 'nicename__in', 'user_email (or 'email'), 'user_url' (or 'url'), - * 'user_registered' (or 'registered'), 'post_count', 'meta_value', - * 'meta_value_num', the value of `$meta_key`, or an array key of - * `$meta_query`. To use 'meta_value' or 'meta_value_num', `$meta_key` - * must be also be defined. Default 'user_login'. - * @type string $order Designates ascending or descending order of users. Order values - * passed as part of an `$orderby` array take precedence over this - * parameter. Accepts 'ASC', 'DESC'. Default 'ASC'. - * @type int $offset Number of users to offset in retrieved results. Can be used in - * conjunction with pagination. Default 0. - * @type int $number Number of users to limit the query for. Can be used in - * conjunction with pagination. Value -1 (all) is supported, but - * should be used with caution on larger sites. - * Default -1 (all users). - * @type int $paged When used with number, defines the page of results to return. - * Default 1. - * @type bool $count_total Whether to count the total number of users found. If pagination - * is not needed, setting this to false can improve performance. - * Default true. - * @type string|array $fields Which fields to return. Single or all fields (string), or array - * of fields. Accepts 'ID', 'display_name', 'user_login', - * 'user_nicename', 'user_email', 'user_url', 'user_registered'. - * Use 'all' for all fields and 'all_with_meta' to include - * meta fields. Default 'all'. - * @type string $who Type of users to query. Accepts 'authors'. - * Default empty (all users). - * @type bool|array $has_published_posts Pass an array of post types to filter results to users who have - * published posts in those post types. `true` is an alias for all - * public post types. - * @type string $nicename The user nicename. Default empty. - * @type string[] $nicename__in An array of nicenames to include. Users matching one of these - * nicenames will be included in results. Default empty array. - * @type string[] $nicename__not_in An array of nicenames to exclude. Users matching one of these - * nicenames will not be included in results. Default empty array. - * @type string $login The user login. Default empty. - * @type string[] $login__in An array of logins to include. Users matching one of these - * logins will be included in results. Default empty array. - * @type string[] $login__not_in An array of logins to exclude. Users matching one of these - * logins will not be included in results. Default empty array. + * @type int $blog_id The site ID. Default is the current site. + * @type string|string[] $role An array or a comma-separated list of role names that users must match + * to be included in results. Note that this is an inclusive list: users + * must match *each* role. Default empty. + * @type string[] $role__in An array of role names. Matched users must have at least one of these + * roles. Default empty array. + * @type string[] $role__not_in An array of role names to exclude. Users matching one or more of these + * roles will not be included in results. Default empty array. + * @type string|string[] $meta_key Meta key or keys to filter by. + * @type string|string[] $meta_value Meta value or values to filter by. + * @type string $meta_compare MySQL operator used for comparing the meta value. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type string $meta_compare_key MySQL operator used for comparing the meta key. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type string $meta_type MySQL data type that the meta_value column will be CAST to for comparisons. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type string $meta_type_key MySQL data type that the meta_key column will be CAST to for comparisons. + * See WP_Meta_Query::__construct for accepted values and default value. + * @type array $meta_query An associative array of WP_Meta_Query arguments. + * See WP_Meta_Query::__construct for accepted values. + * @type string|string[] $capability An array or a comma-separated list of capability names that users must match + * to be included in results. Note that this is an inclusive list: users + * must match *each* capability. + * Does NOT work for capabilities not in the database or filtered via {@see 'map_meta_cap'}. + * Default empty. + * @type string[] $capability__in An array of capability names. Matched users must have at least one of these + * capabilities. + * Does NOT work for capabilities not in the database or filtered via {@see 'map_meta_cap'}. + * Default empty array. + * @type string[] $capability__not_in An array of capability names to exclude. Users matching one or more of these + * capabilities will not be included in results. + * Does NOT work for capabilities not in the database or filtered via {@see 'map_meta_cap'}. + * Default empty array. + * @type int[] $include An array of user IDs to include. Default empty array. + * @type int[] $exclude An array of user IDs to exclude. Default empty array. + * @type string $search Search keyword. Searches for possible string matches on columns. + * When `$search_columns` is left empty, it tries to determine which + * column to search in based on search string. Default empty. + * @type string[] $search_columns Array of column names to be searched. Accepts 'ID', 'user_login', + * 'user_email', 'user_url', 'user_nicename', 'display_name'. + * Default empty array. + * @type string|array $orderby Field(s) to sort the retrieved users by. May be a single value, + * an array of values, or a multi-dimensional array with fields as + * keys and orders ('ASC' or 'DESC') as values. Accepted values are: + * - 'ID' + * - 'display_name' (or 'name') + * - 'include' + * - 'user_login' (or 'login') + * - 'login__in' + * - 'user_nicename' (or 'nicename'), + * - 'nicename__in' + * - 'user_email (or 'email') + * - 'user_url' (or 'url'), + * - 'user_registered' (or 'registered') + * - 'post_count' + * - 'meta_value', + * - 'meta_value_num' + * - The value of `$meta_key` + * - An array key of `$meta_query` + * To use 'meta_value' or 'meta_value_num', `$meta_key` + * must be also be defined. Default 'user_login'. + * @type string $order Designates ascending or descending order of users. Order values + * passed as part of an `$orderby` array take precedence over this + * parameter. Accepts 'ASC', 'DESC'. Default 'ASC'. + * @type int $offset Number of users to offset in retrieved results. Can be used in + * conjunction with pagination. Default 0. + * @type int $number Number of users to limit the query for. Can be used in + * conjunction with pagination. Value -1 (all) is supported, but + * should be used with caution on larger sites. + * Default -1 (all users). + * @type int $paged When used with number, defines the page of results to return. + * Default 1. + * @type bool $count_total Whether to count the total number of users found. If pagination + * is not needed, setting this to false can improve performance. + * Default true. + * @type string|string[] $fields Which fields to return. Single or all fields (string), or array + * of fields. Accepts: + * - 'ID' + * - 'display_name' + * - 'user_login' + * - 'user_nicename' + * - 'user_email' + * - 'user_url' + * - 'user_registered' + * - 'all' for all fields + * - 'all_with_meta' to include meta fields. + * Default 'all'. + * @type string $who Type of users to query. Accepts 'authors'. + * Default empty (all users). + * @type bool|string[] $has_published_posts Pass an array of post types to filter results to users who have + * published posts in those post types. `true` is an alias for all + * public post types. + * @type string $nicename The user nicename. Default empty. + * @type string[] $nicename__in An array of nicenames to include. Users matching one of these + * nicenames will be included in results. Default empty array. + * @type string[] $nicename__not_in An array of nicenames to exclude. Users matching one of these + * nicenames will not be included in results. Default empty array. + * @type string $login The user login. Default empty. + * @type string[] $login__in An array of logins to include. Users matching one of these + * logins will be included in results. Default empty array. + * @type string[] $login__not_in An array of logins to exclude. Users matching one of these + * logins will not be included in results. Default empty array. * } */ public function prepare_query( $query = array() ) { diff --git a/src/wp-includes/class-wp-walker.php b/src/wp-includes/class-wp-walker.php index b50c2d7505..1350730a30 100644 --- a/src/wp-includes/class-wp-walker.php +++ b/src/wp-includes/class-wp-walker.php @@ -24,7 +24,7 @@ class Walker { * DB fields to use. * * @since 2.1.0 - * @var array + * @var string[] */ public $db_fields; @@ -209,7 +209,7 @@ class Walker { /* * Need to display in hierarchical order. * Separate elements into two buckets: top level and children elements. - * Children_elements is two dimensional array, eg. + * Children_elements is two dimensional array. Example: * Children_elements[10][] contains all sub-elements whose parent is 10. */ $top_level_elements = array(); diff --git a/src/wp-includes/class-wp-widget.php b/src/wp-includes/class-wp-widget.php index fa206e7d35..e91f5cd9f9 100644 --- a/src/wp-includes/class-wp-widget.php +++ b/src/wp-includes/class-wp-widget.php @@ -365,7 +365,7 @@ class WP_Widget { $this->_set( $widget_args['number'] ); $instances = $this->get_settings(); - if ( array_key_exists( $this->number, $instances ) ) { + if ( isset( $instances[ $this->number ] ) ) { $instance = $instances[ $this->number ]; /** diff --git a/src/wp-includes/class-wp-xmlrpc-server.php b/src/wp-includes/class-wp-xmlrpc-server.php index 35d05357a0..58388dd3d4 100644 --- a/src/wp-includes/class-wp-xmlrpc-server.php +++ b/src/wp-includes/class-wp-xmlrpc-server.php @@ -2271,11 +2271,11 @@ class wp_xmlrpc_server extends IXR_Server { * @param array $args { * Method arguments. Note: arguments must be ordered as documented. * - * @type int $blog_id Blog ID (unused). - * @type string $username Username. - * @type string $password Password. - * @type string $taxnomy_name Taxonomy name. - * @type int $term_id Term ID. + * @type int $blog_id Blog ID (unused). + * @type string $username Username. + * @type string $password Password. + * @type string $taxonomy_name Taxonomy name. + * @type int $term_id Term ID. * } * @return true|IXR_Error True on success, IXR_Error instance on failure. */ @@ -2344,7 +2344,7 @@ class wp_xmlrpc_server extends IXR_Server { * @type int $blog_id Blog ID (unused). * @type string $username Username. * @type string $password Password. - * @type string $taxnomy Taxonomy name. + * @type string $taxonomy Taxonomy name. * @type string $term_id Term ID. * } * @return array|IXR_Error IXR_Error on failure, array on success, containing: @@ -2417,7 +2417,7 @@ class wp_xmlrpc_server extends IXR_Server { * @type int $blog_id Blog ID (unused). * @type string $username Username. * @type string $password Password. - * @type string $taxnomy Taxonomy name. + * @type string $taxonomy Taxonomy name. * @type array $filter Optional. Modifies the query used to retrieve posts. Accepts 'number', * 'offset', 'orderby', 'order', 'hide_empty', and 'search'. Default empty array. * } @@ -2509,7 +2509,7 @@ class wp_xmlrpc_server extends IXR_Server { * @type int $blog_id Blog ID (unused). * @type string $username Username. * @type string $password Password. - * @type string $taxnomy Taxonomy name. + * @type string $taxonomy Taxonomy name. * @type array $fields Optional. Array of taxonomy fields to limit to in the return. * Accepts 'labels', 'cap', 'menu', and 'object_type'. * Default empty array. @@ -6399,7 +6399,7 @@ class wp_xmlrpc_server extends IXR_Server { /** * Filters whether to preempt the XML-RPC media upload. * - * Passing a truthy value will effectively short-circuit the media upload, + * Returning a truthy value will effectively short-circuit the media upload, * returning that value as a 500 error instead. * * @since 2.1.0 diff --git a/src/wp-includes/class.wp-dependencies.php b/src/wp-includes/class.wp-dependencies.php index e9f701b727..2157871ea5 100644 --- a/src/wp-includes/class.wp-dependencies.php +++ b/src/wp-includes/class.wp-dependencies.php @@ -94,6 +94,15 @@ class WP_Dependencies { */ private $all_queued_deps; + /** + * List of assets enqueued before details were registered. + * + * @since 5.9.0 + * + * @var array + */ + private $queued_before_register = array(); + /** * Processes the items and dependencies. * @@ -248,6 +257,18 @@ class WP_Dependencies { return false; } $this->registered[ $handle ] = new _WP_Dependency( $handle, $src, $deps, $ver, $args ); + + // If the item was enqueued before the details were registered, enqueue it now. + if ( array_key_exists( $handle, $this->queued_before_register ) ) { + if ( ! is_null( $this->queued_before_register[ $handle ] ) ) { + $this->enqueue( $handle . '?' . $this->queued_before_register[ $handle ] ); + } else { + $this->enqueue( $handle ); + } + + unset( $this->queued_before_register[ $handle ] ); + } + return true; } @@ -334,6 +355,12 @@ class WP_Dependencies { if ( isset( $handle[1] ) ) { $this->args[ $handle[0] ] = $handle[1]; } + } elseif ( ! isset( $this->registered[ $handle[0] ] ) ) { + $this->queued_before_register[ $handle[0] ] = null; // $args + + if ( isset( $handle[1] ) ) { + $this->queued_before_register[ $handle[0] ] = $handle[1]; + } } } } @@ -360,6 +387,8 @@ class WP_Dependencies { unset( $this->queue[ $key ] ); unset( $this->args[ $handle[0] ] ); + } elseif ( array_key_exists( $handle[0], $this->queued_before_register ) ) { + unset( $this->queued_before_register[ $handle[0] ] ); } } } diff --git a/src/wp-includes/class.wp-scripts.php b/src/wp-includes/class.wp-scripts.php index 0f38a48618..10104d6dfa 100644 --- a/src/wp-includes/class.wp-scripts.php +++ b/src/wp-includes/class.wp-scripts.php @@ -125,7 +125,7 @@ class WP_Scripts extends WP_Dependencies { /** * Holds a string which contains the type attribute for script tag. * - * If the current theme does not declare HTML5 support for 'script', + * If the active theme does not declare HTML5 support for 'script', * then it initializes as `type='text/javascript'`. * * @since 5.3.0 diff --git a/src/wp-includes/class.wp-styles.php b/src/wp-includes/class.wp-styles.php index 62def4575c..91e14aeffc 100644 --- a/src/wp-includes/class.wp-styles.php +++ b/src/wp-includes/class.wp-styles.php @@ -103,7 +103,7 @@ class WP_Styles extends WP_Dependencies { /** * Holds a string which contains the type attribute for style tag. * - * If the current theme does not declare HTML5 support for 'style', + * If the active theme does not declare HTML5 support for 'style', * then it initializes as `type='text/css'`. * * @since 5.3.0 diff --git a/src/wp-includes/comment-template.php b/src/wp-includes/comment-template.php index 1415dd1e2f..5a1b2e22eb 100644 --- a/src/wp-includes/comment-template.php +++ b/src/wp-includes/comment-template.php @@ -42,7 +42,7 @@ function get_comment_author( $comment_ID = 0 ) { * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added. * * @param string $author The comment author's username. - * @param int $comment_ID The comment ID. + * @param string $comment_ID The comment ID as a numeric string. * @param WP_Comment $comment The comment object. */ return apply_filters( 'get_comment_author', $author, $comment->comment_ID, $comment ); @@ -68,7 +68,7 @@ function comment_author( $comment_ID = 0 ) { * @since 4.1.0 The `$comment_ID` parameter was added. * * @param string $author The comment author's username. - * @param int $comment_ID The comment ID. + * @param string $comment_ID The comment ID as a numeric string. */ echo apply_filters( 'comment_author', $author, $comment->comment_ID ); } @@ -93,7 +93,7 @@ function get_comment_author_email( $comment_ID = 0 ) { * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added. * * @param string $comment_author_email The comment author's email address. - * @param int $comment_ID The comment ID. + * @param string $comment_ID The comment ID as a numeric string. * @param WP_Comment $comment The comment object. */ return apply_filters( 'get_comment_author_email', $comment->comment_author_email, $comment->comment_ID, $comment ); @@ -125,7 +125,7 @@ function comment_author_email( $comment_ID = 0 ) { * @since 4.1.0 The `$comment_ID` parameter was added. * * @param string $author_email The comment author's email address. - * @param int $comment_ID The comment ID. + * @param string $comment_ID The comment ID as a numeric string. */ echo apply_filters( 'author_email', $author_email, $comment->comment_ID ); } @@ -236,7 +236,7 @@ function get_comment_author_link( $comment_ID = 0 ) { * @param string $return The HTML-formatted comment author link. * Empty for an invalid URL. * @param string $author The comment author's username. - * @param int $comment_ID The comment ID. + * @param string $comment_ID The comment ID as a numeric string. */ return apply_filters( 'get_comment_author_link', $return, $author, $comment->comment_ID ); } @@ -274,7 +274,7 @@ function get_comment_author_IP( $comment_ID = 0 ) { // phpcs:ignore WordPress.Na * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added. * * @param string $comment_author_IP The comment author's IP address, or an empty string if it's not available. - * @param int $comment_ID The comment ID. + * @param string $comment_ID The comment ID as a numeric string. * @param WP_Comment $comment The comment object. */ return apply_filters( 'get_comment_author_IP', $comment->comment_author_IP, $comment->comment_ID, $comment ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase @@ -320,9 +320,9 @@ function get_comment_author_url( $comment_ID = 0 ) { * @since 1.5.0 * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added. * - * @param string $url The comment author's URL. - * @param int $comment_ID The comment ID. - * @param WP_Comment $comment The comment object. + * @param string $url The comment author's URL, or an empty string. + * @param string|int $comment_ID The comment ID as a numeric string, or 0 if not found. + * @param WP_Comment|null $comment The comment object, or null if not found. */ return apply_filters( 'get_comment_author_url', $url, $id, $comment ); } @@ -347,7 +347,7 @@ function comment_author_url( $comment_ID = 0 ) { * @since 4.1.0 The `$comment_ID` parameter was added. * * @param string $author_url The comment author's URL. - * @param int $comment_ID The comment ID. + * @param string $comment_ID The comment ID as a numeric string. */ echo apply_filters( 'comment_url', $author_url, $comment->comment_ID ); } @@ -531,7 +531,7 @@ function get_comment_class( $class = '', $comment_id = null, $post_id = null ) { * * @param string[] $classes An array of comment classes. * @param string[] $class An array of additional classes added to the list. - * @param int $comment_id The comment ID. + * @param string $comment_id The comment ID as a numeric string. * @param WP_Comment $comment The comment object. * @param int|WP_Post $post_id The post ID or WP_Post object. */ @@ -624,7 +624,7 @@ function get_comment_excerpt( $comment_ID = 0 ) { * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added. * * @param string $excerpt The comment excerpt text. - * @param int $comment_ID The comment ID. + * @param string $comment_ID The comment ID as a numeric string. * @param WP_Comment $comment The comment object. */ return apply_filters( 'get_comment_excerpt', $excerpt, $comment->comment_ID, $comment ); @@ -650,7 +650,7 @@ function comment_excerpt( $comment_ID = 0 ) { * @since 4.1.0 The `$comment_ID` parameter was added. * * @param string $comment_excerpt The comment excerpt text. - * @param int $comment_ID The comment ID. + * @param string $comment_ID The comment ID as a numeric string. */ echo apply_filters( 'comment_excerpt', $comment_excerpt, $comment->comment_ID ); } @@ -660,7 +660,7 @@ function comment_excerpt( $comment_ID = 0 ) { * * @since 1.5.0 * - * @return int The comment ID. + * @return string The comment ID as a numeric string. */ function get_comment_ID() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid $comment = get_comment(); @@ -669,9 +669,9 @@ function get_comment_ID() { // phpcs:ignore WordPress.NamingConventions.ValidFun * Filters the returned comment ID. * * @since 1.5.0 - * @since 4.1.0 The `$comment_ID` parameter was added. + * @since 4.1.0 The `$comment` parameter was added. * - * @param int $comment_ID The current comment ID. + * @param string $comment_ID The current comment ID as a numeric string. * @param WP_Comment $comment The comment object. */ return apply_filters( 'get_comment_ID', $comment->comment_ID, $comment ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase @@ -1097,7 +1097,7 @@ function get_comment_type( $comment_ID = 0 ) { * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added. * * @param string $comment_type The type of comment, such as 'comment', 'pingback', or 'trackback'. - * @param int $comment_ID The comment ID. + * @param string $comment_ID The comment ID as a numeric string. * @param WP_Comment $comment The comment object. */ return apply_filters( 'get_comment_type', $comment->comment_type, $comment->comment_ID, $comment ); @@ -1241,7 +1241,7 @@ function comments_open( $post_id = null ) { $_post = get_post( $post_id ); $post_id = $_post ? $_post->ID : 0; - $open = ( 'open' === $_post->comment_status ); + $open = ( $_post && ( 'open' === $_post->comment_status ) ); /** * Filters whether the current post is open for comments. @@ -1271,7 +1271,7 @@ function pings_open( $post_id = null ) { $_post = get_post( $post_id ); $post_id = $_post ? $_post->ID : 0; - $open = ( 'open' === $_post->ping_status ); + $open = ( $_post && ( 'open' === $_post->ping_status ) ); /** * Filters whether the current post is open for pings. @@ -1736,7 +1736,7 @@ function get_comment_reply_link( $args = array(), $comment = null, $post = null 'postid' => $post->ID, 'belowelement' => $args['add_below'] . '-' . $comment->comment_ID, 'respondelement' => $args['respond_id'], - 'replyto' => sprintf( $args['reply_to_text'], $comment->comment_author ), + 'replyto' => sprintf( $args['reply_to_text'], get_comment_author( $comment ) ), ); $data_attribute_string = ''; @@ -1760,7 +1760,7 @@ function get_comment_reply_link( $args = array(), $comment = null, $post = null ) ) . '#' . $args['respond_id'], $data_attribute_string, - esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ), + esc_attr( sprintf( $args['reply_to_text'], get_comment_author( $comment ) ) ), $args['reply_text'] ); } @@ -2425,7 +2425,7 @@ function comment_form( $args = array(), $post_id = null ) { $required_text = sprintf( /* translators: %s: Asterisk symbol (*). */ - ' ', + ' ', trim( $required_indicator ) ); @@ -2538,11 +2538,13 @@ function comment_form( $args = array(), $post_id = null ) { comment_form_title( $args['title_reply'], $args['title_reply_to'] ); - echo $args['cancel_reply_before']; + if ( get_option( 'thread_comments' ) ) { + echo $args['cancel_reply_before']; - cancel_comment_reply_link( $args['cancel_reply_link'] ); + cancel_comment_reply_link( $args['cancel_reply_link'] ); - echo $args['cancel_reply_after']; + echo $args['cancel_reply_after']; + } echo $args['title_reply_after']; diff --git a/src/wp-includes/comment.php b/src/wp-includes/comment.php index c2892f16b1..be1fda4e7f 100644 --- a/src/wp-includes/comment.php +++ b/src/wp-includes/comment.php @@ -366,7 +366,7 @@ function get_lastcommentmodified( $timezone = 'server' ) { * * @param int $post_id Optional. Restrict the comment counts to the given post. Default 0, which indicates that * comment counts for the whole site will be retrieved. - * @return array() { + * @return int[] { * The number of comments keyed by their status. * * @type int $approved The number of approved comments. @@ -1488,7 +1488,7 @@ function wp_delete_comment( $comment_id, $force_delete = false ) { * @since 1.2.0 * @since 4.9.0 Added the `$comment` parameter. * - * @param int $comment_id The comment ID. + * @param string $comment_id The comment ID as a numeric string. * @param WP_Comment $comment The comment to be deleted. */ do_action( 'delete_comment', $comment->comment_ID, $comment ); @@ -1516,7 +1516,7 @@ function wp_delete_comment( $comment_id, $force_delete = false ) { * @since 2.9.0 * @since 4.9.0 Added the `$comment` parameter. * - * @param int $comment_id The comment ID. + * @param string $comment_id The comment ID as a numeric string. * @param WP_Comment $comment The deleted comment. */ do_action( 'deleted_comment', $comment->comment_ID, $comment ); @@ -1562,7 +1562,7 @@ function wp_trash_comment( $comment_id ) { * @since 2.9.0 * @since 4.9.0 Added the `$comment` parameter. * - * @param int $comment_id The comment ID. + * @param string $comment_id The comment ID as a numeric string. * @param WP_Comment $comment The comment to be trashed. */ do_action( 'trash_comment', $comment->comment_ID, $comment ); @@ -1579,7 +1579,7 @@ function wp_trash_comment( $comment_id ) { * @since 2.9.0 * @since 4.9.0 Added the `$comment` parameter. * - * @param int $comment_id The comment ID. + * @param string $comment_id The comment ID as a numeric string. * @param WP_Comment $comment The trashed comment. */ do_action( 'trashed_comment', $comment->comment_ID, $comment ); @@ -1610,7 +1610,7 @@ function wp_untrash_comment( $comment_id ) { * @since 2.9.0 * @since 4.9.0 Added the `$comment` parameter. * - * @param int $comment_id The comment ID. + * @param string $comment_id The comment ID as a numeric string. * @param WP_Comment $comment The comment to be untrashed. */ do_action( 'untrash_comment', $comment->comment_ID, $comment ); @@ -1630,7 +1630,7 @@ function wp_untrash_comment( $comment_id ) { * @since 2.9.0 * @since 4.9.0 Added the `$comment` parameter. * - * @param int $comment_id The comment ID. + * @param string $comment_id The comment ID as a numeric string. * @param WP_Comment $comment The untrashed comment. */ do_action( 'untrashed_comment', $comment->comment_ID, $comment ); @@ -1709,7 +1709,7 @@ function wp_unspam_comment( $comment_id ) { * @since 2.9.0 * @since 4.9.0 Added the `$comment` parameter. * - * @param int $comment_id The comment ID. + * @param string $comment_id The comment ID as a numeric string. * @param WP_Comment $comment The comment to be unmarked as spam. */ do_action( 'unspam_comment', $comment->comment_ID, $comment ); @@ -1729,7 +1729,7 @@ function wp_unspam_comment( $comment_id ) { * @since 2.9.0 * @since 4.9.0 Added the `$comment` parameter. * - * @param int $comment_id The comment ID. + * @param string $comment_id The comment ID as a numeric string. * @param WP_Comment $comment The comment unmarked as spam. */ do_action( 'unspammed_comment', $comment->comment_ID, $comment ); @@ -1863,7 +1863,7 @@ function wp_transition_comment_status( $new_status, $old_status, $comment ) { * * @since 2.7.0 * - * @param int $comment_ID The comment ID. + * @param string $comment_ID The comment ID as a numeric string. * @param WP_Comment $comment Comment object. */ do_action( "comment_{$new_status}_{$comment->comment_type}", $comment->comment_ID, $comment ); @@ -2433,7 +2433,7 @@ function wp_set_comment_status( $comment_id, $comment_status, $wp_error = false * * @since 1.5.0 * - * @param int $comment_id Comment ID. + * @param string $comment_id Comment ID as a numeric string. * @param string $comment_status Current comment status. Possible values include * 'hold', '0', 'approve', '1', 'spam', and 'trash'. */ diff --git a/src/wp-includes/compat.php b/src/wp-includes/compat.php index b95275455c..ac78f7f9a3 100644 --- a/src/wp-includes/compat.php +++ b/src/wp-includes/compat.php @@ -375,6 +375,109 @@ if ( ! function_exists( 'is_iterable' ) ) { } } +if ( ! function_exists( 'array_key_first' ) ) { + /** + * Polyfill for array_key_first() function added in PHP 7.3. + * + * Get the first key of the given array without affecting + * the internal array pointer. + * + * @since 5.9.0 + * + * @param array $arr An array. + * @return string|int|null The first key of array if the array + * is not empty; `null` otherwise. + */ + function array_key_first( array $arr ) { + foreach ( $arr as $key => $value ) { + return $key; + } + } +} + +if ( ! function_exists( 'array_key_last' ) ) { + /** + * Polyfill for `array_key_last()` function added in PHP 7.3. + * + * Get the last key of the given array without affecting the + * internal array pointer. + * + * @since 5.9.0 + * + * @param array $arr An array. + * @return string|int|null The last key of array if the array + *. is not empty; `null` otherwise. + */ + function array_key_last( array $arr ) { + if ( empty( $arr ) ) { + return null; + } + end( $arr ); + return key( $arr ); + } +} + +if ( ! function_exists( 'str_contains' ) ) { + /** + * Polyfill for `str_contains()` function added in PHP 8.0. + * + * Performs a case-sensitive check indicating if needle is + * contained in haystack. + * + * @since 5.9.0 + * + * @param string $haystack The string to search in. + * @param string $needle The substring to search for in the haystack. + * @return bool True if `$needle` is in `$haystack`, otherwise false. + */ + function str_contains( $haystack, $needle ) { + return ( '' === $needle || false !== strpos( $haystack, $needle ) ); + } +} + +if ( ! function_exists( 'str_starts_with' ) ) { + /** + * Polyfill for `str_starts_with()` function added in PHP 8.0. + * + * Performs a case-sensitive check indicating if + * the haystack begins with needle. + * + * @since 5.9.0 + * + * @param string $haystack The string to search in. + * @param string $needle The substring to search for in the `$haystack`. + * @return bool True if `$haystack` starts with `$needle`, otherwise false. + */ + function str_starts_with( $haystack, $needle ) { + if ( '' === $needle ) { + return true; + } + return 0 === strpos( $haystack, $needle ); + } +} + +if ( ! function_exists( 'str_ends_with' ) ) { + /** + * Polyfill for `str_ends_with()` function added in PHP 8.0. + * + * Performs a case-sensitive check indicating if + * the haystack ends with needle. + * + * @since 5.9.0 + * + * @param string $haystack The string to search in. + * @param string $needle The substring to search for in the `$haystack`. + * @return bool True if `$haystack` ends with `$needle`, otherwise false. + */ + function str_ends_with( $haystack, $needle ) { + if ( '' === $haystack && '' !== $needle ) { + return false; + } + $len = strlen( $needle ); + return 0 === substr_compare( $haystack, $needle, -$len, $len ); + } +} + // IMAGETYPE_WEBP constant is only defined in PHP 7.1 or later. if ( ! defined( 'IMAGETYPE_WEBP' ) ) { define( 'IMAGETYPE_WEBP', 18 ); @@ -382,5 +485,5 @@ if ( ! defined( 'IMAGETYPE_WEBP' ) ) { // IMG_WEBP constant is only defined in PHP 7.0.10 or later. if ( ! defined( 'IMG_WEBP' ) ) { - define( 'IMG_WEBP', IMAGETYPE_WEBP ); // phpcs:ignore PHPCompatibility.Constants.NewConstants.imagetype_webpFound + define( 'IMG_WEBP', IMAGETYPE_WEBP ); } diff --git a/src/wp-includes/cron.php b/src/wp-includes/cron.php index 8e50349f5d..83cbb8b9d0 100644 --- a/src/wp-includes/cron.php +++ b/src/wp-includes/cron.php @@ -1113,7 +1113,7 @@ function wp_get_schedule( $hook, $args = array() ) { * * @since 5.1.0 * - * @return array Cron jobs ready to be run. + * @return array[] Array of cron job arrays ready to be run. */ function wp_get_ready_cron_jobs() { /** @@ -1124,8 +1124,8 @@ function wp_get_ready_cron_jobs() { * * @since 5.1.0 * - * @param null|array $pre Array of ready cron tasks to return instead. Default null - * to continue using results from _get_cron_array(). + * @param null|array[] $pre Array of ready cron tasks to return instead. Default null + * to continue using results from _get_cron_array(). */ $pre = apply_filters( 'pre_get_ready_cron_jobs', null ); if ( null !== $pre ) { @@ -1164,7 +1164,7 @@ function wp_get_ready_cron_jobs() { * @since 2.1.0 * @access private * - * @return array|false Cron info array on success, false on failure. + * @return array[]|false Array of cron info arrays on success, false on failure. */ function _get_cron_array() { $cron = get_option( 'cron' ); @@ -1190,8 +1190,8 @@ function _get_cron_array() { * * @access private * - * @param array $cron Cron info array from _get_cron_array(). - * @param bool $wp_error Optional. Whether to return a WP_Error on failure. Default false. + * @param array[] $cron Array of cron info arrays from _get_cron_array(). + * @param bool $wp_error Optional. Whether to return a WP_Error on failure. Default false. * @return bool|WP_Error True if cron array updated. False or WP_Error on failure. */ function _set_cron_array( $cron, $wp_error = false ) { diff --git a/src/wp-includes/css/admin-bar.css b/src/wp-includes/css/admin-bar.css index 5720af7b41..32b952082a 100644 --- a/src/wp-includes/css/admin-bar.css +++ b/src/wp-includes/css/admin-bar.css @@ -1,5 +1,6 @@ html { --wp-admin--admin-bar--height: 32px; + scroll-padding-top: var(--wp-admin--admin-bar--height); } #wpadminbar * { @@ -548,12 +549,16 @@ html:lang(he-il) .rtl #wpadminbar * { top: 2px; } +#wpadminbar #wp-admin-bar-site-editor > .ab-item:before { + content: "\f100"; + top: 2px; +} + #wpadminbar #wp-admin-bar-customize > .ab-item:before { content: "\f540"; top: 2px; } - #wpadminbar #wp-admin-bar-edit > .ab-item:before { content: "\f464"; top: 2px; @@ -790,7 +795,17 @@ html:lang(he-il) .rtl #wpadminbar * { } #wpadminbar .ab-label { - display: none; + border: 0; + clip: rect(1px, 1px, 1px, 1px); + -webkit-clip-path: inset(50%); + clip-path: inset(50%); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; + word-wrap: normal !important; } #wpadminbar .menupop li:hover > .ab-sub-wrapper, @@ -842,6 +857,7 @@ html:lang(he-il) .rtl #wpadminbar * { /* My Sites and "Site Title" menu */ #wpadminbar #wp-admin-bar-my-sites > .ab-item, #wpadminbar #wp-admin-bar-site-name > .ab-item, + #wpadminbar #wp-admin-bar-site-editor > .ab-item, #wpadminbar #wp-admin-bar-customize > .ab-item, #wpadminbar #wp-admin-bar-edit > .ab-item, #wpadminbar #wp-admin-bar-my-account > .ab-item { @@ -864,6 +880,7 @@ html:lang(he-il) .rtl #wpadminbar * { #wpadminbar #wp-admin-bar-edit > .ab-item:before, #wpadminbar #wp-admin-bar-my-sites > .ab-item:before, #wpadminbar #wp-admin-bar-site-name > .ab-item:before, + #wpadminbar #wp-admin-bar-site-editor > .ab-item:before, #wpadminbar #wp-admin-bar-customize > .ab-item:before, #wpadminbar #wp-admin-bar-my-account > .ab-item:before { display: block; @@ -978,6 +995,7 @@ html:lang(he-il) .rtl #wpadminbar * { #wpadminbar li#wp-admin-bar-my-sites, #wpadminbar li#wp-admin-bar-updates, #wpadminbar li#wp-admin-bar-site-name, + #wpadminbar li#wp-admin-bar-site-editor, #wpadminbar li#wp-admin-bar-customize, #wpadminbar li#wp-admin-bar-new-content, #wpadminbar li#wp-admin-bar-edit, diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css index 02c32c4998..3bcfcd6bc0 100644 --- a/src/wp-includes/css/media-views.css +++ b/src/wp-includes/css/media-views.css @@ -1437,36 +1437,10 @@ } .media-uploader-status .upload-dismiss-errors { - position: absolute; - top: -3px; - right: -5px; - padding: 5px; - border-radius: 50%; transition: none; text-decoration: none; } -.uploader-inline .media-uploader-status .upload-dismiss-errors { - top: 2px; - right: 2px; -} - -.media-uploader-status .upload-dismiss-errors::before { - content: "\f153"; - display: block; - font: normal 16px/1 dashicons; - color: #787c82; -} - -.uploader-inline .errors.media-uploader-status .upload-dismiss-errors::before { - color: #646970; -} - -.errors.media-uploader-status .upload-dismiss-errors:hover::before, -.errors.media-uploader-status .upload-dismiss-errors:focus::before { - color: #d63638; -} - .upload-errors .upload-error { padding: 12px; margin-bottom: 12px; @@ -2140,7 +2114,7 @@ .embed-link-settings, .embed-media-settings { position: absolute; - top: 70px; + top: 82px; left: 0; right: 0; bottom: 0; @@ -2148,6 +2122,10 @@ overflow: auto; } +.media-embed .embed-link-settings .link-text { + margin-top: 0; +} + /* * Implementation of bottom padding in overflow content differs across browsers. * We need a different method. See https://github.com/w3c/csswg-drafts/issues/129 diff --git a/src/wp-includes/customize/class-wp-customize-date-time-control.php b/src/wp-includes/customize/class-wp-customize-date-time-control.php index 607799768c..55bf64dbe2 100644 --- a/src/wp-includes/customize/class-wp-customize-date-time-control.php +++ b/src/wp-includes/customize/class-wp-customize-date-time-control.php @@ -28,7 +28,7 @@ class WP_Customize_Date_Time_Control extends WP_Customize_Control { * Minimum Year. * * @since 4.9.0 - * @var integer + * @var int */ public $min_year = 1000; @@ -36,7 +36,7 @@ class WP_Customize_Date_Time_Control extends WP_Customize_Control { * Maximum Year. * * @since 4.9.0 - * @var integer + * @var int */ public $max_year = 9999; @@ -44,7 +44,7 @@ class WP_Customize_Date_Time_Control extends WP_Customize_Control { * Allow past date, if set to false user can only select future date. * * @since 4.9.0 - * @var boolean + * @var bool */ public $allow_past_date = true; @@ -52,7 +52,7 @@ class WP_Customize_Date_Time_Control extends WP_Customize_Control { * Whether hours, minutes, and meridian should be shown. * * @since 4.9.0 - * @var boolean + * @var bool */ public $include_time = true; @@ -61,7 +61,7 @@ class WP_Customize_Date_Time_Control extends WP_Customize_Control { * the value will still be saved in Y-m-d H:i:s format. * * @since 4.9.0 - * @var boolean + * @var bool */ public $twelve_hour_format = true; @@ -217,7 +217,7 @@ class WP_Customize_Date_Time_Control extends WP_Customize_Control { * @return array { * Timezone info. All properties are optional. * - * @type string $abbr Timezone abbreviation, eg. PST or CEST. + * @type string $abbr Timezone abbreviation. Examples: PST or CEST. * @type string $description Human-readable timezone description as HTML. * } */ diff --git a/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php b/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php index b842cab15d..d6cae27b95 100644 --- a/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php +++ b/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php @@ -130,7 +130,7 @@ class WP_Customize_Nav_Menu_Item_Control extends WP_Customize_Control {

    diff --git a/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php b/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php index c3dc1e9eb5..f01906c818 100644 --- a/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php +++ b/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php @@ -595,7 +595,7 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting { * @param array $nav_menu_options Array as returned by get_option( 'nav_menu_options' ). * @param int $menu_id The term ID for the given menu. * @param bool $auto_add Whether to auto-add or not. - * @return array (Maybe) modified nav_menu_otions array. + * @return array (Maybe) modified nav_menu_options array. */ protected function filter_nav_menu_options_value( $nav_menu_options, $menu_id, $auto_add ) { $nav_menu_options = (array) $nav_menu_options; diff --git a/src/wp-includes/customize/class-wp-customize-nav-menus-panel.php b/src/wp-includes/customize/class-wp-customize-nav-menus-panel.php index c0d098bc7d..18328e5d3f 100644 --- a/src/wp-includes/customize/class-wp-customize-nav-menus-panel.php +++ b/src/wp-includes/customize/class-wp-customize-nav-menus-panel.php @@ -98,4 +98,27 @@ class WP_Customize_Nav_Menus_Panel extends WP_Customize_Panel {

    • <# } else if ( 'installed' === data.theme.type ) { #> -
    -

    {{ data.theme.name }}

    -
    - <# if ( data.theme.compatibleWP && data.theme.compatiblePHP ) { #> - - <# } else { #> - - <# } #> + <# if ( data.theme.blockTheme ) { #> +
    +

    {{ data.theme.name }}

    +
    + <# if ( data.theme.actions.activate ) { #> + + + <# } #> +
    -
    -

    +

    + + <# if ( data.theme.actions.activate ) { #> + activate this theme, and use the Site Editor to customize it.' ), + '{{{ data.theme.actions.activate }}}' + ); + ?> + <# } #> +

    + <# } else { #> +
    +

    {{ data.theme.name }}

    +
    + <# if ( data.theme.compatibleWP && data.theme.compatiblePHP ) { #> + + <# } else { #> + + <# } #> +
    +
    +

    + <# } #> <# } else { #>

    {{ data.theme.name }}

    diff --git a/src/wp-includes/customize/class-wp-customize-themes-panel.php b/src/wp-includes/customize/class-wp-customize-themes-panel.php index ebc02401f4..054396e7f7 100644 --- a/src/wp-includes/customize/class-wp-customize-themes-panel.php +++ b/src/wp-includes/customize/class-wp-customize-themes-panel.php @@ -27,7 +27,7 @@ class WP_Customize_Themes_Panel extends WP_Customize_Panel { /** * An Underscore (JS) template for rendering this panel's container. * - * The themes panel renders a custom panel heading with the current theme and a switch themes button. + * The themes panel renders a custom panel heading with the active theme and a switch themes button. * * @see WP_Customize_Panel::print_template() * diff --git a/src/wp-includes/default-constants.php b/src/wp-includes/default-constants.php index 21a855ad25..64baf0d20c 100644 --- a/src/wp-includes/default-constants.php +++ b/src/wp-includes/default-constants.php @@ -402,14 +402,14 @@ function wp_templating_constants() { /** * Slug of the default theme for this installation. * Used as the default theme when installing new sites. - * It will be used as the fallback if the current theme doesn't exist. + * It will be used as the fallback if the active theme doesn't exist. * * @since 3.0.0 * * @see WP_Theme::get_core_default_theme() */ if ( ! defined( 'WP_DEFAULT_THEME' ) ) { - define( 'WP_DEFAULT_THEME', 'twentytwentyone' ); + define( 'WP_DEFAULT_THEME', 'twentytwentytwo' ); } } diff --git a/src/wp-includes/default-filters.php b/src/wp-includes/default-filters.php index a446eed1c2..20559dd179 100644 --- a/src/wp-includes/default-filters.php +++ b/src/wp-includes/default-filters.php @@ -332,10 +332,10 @@ add_action( 'wp_footer', 'wp_print_footer_scripts', 20 ); add_action( 'template_redirect', 'wp_shortlink_header', 11, 0 ); add_action( 'wp_print_footer_scripts', '_wp_footer_scripts' ); add_action( 'init', '_register_core_block_patterns_and_categories' ); -add_action( 'current_screen', '_load_remote_block_patterns' ); add_action( 'init', 'check_theme_switched', 99 ); add_action( 'init', array( 'WP_Block_Supports', 'init' ), 22 ); add_action( 'switch_theme', array( 'WP_Theme_JSON_Resolver', 'clean_cached_data' ) ); +add_action( 'start_previewing_theme', array( 'WP_Theme_JSON_Resolver', 'clean_cached_data' ) ); add_action( 'after_switch_theme', '_wp_menus_changed' ); add_action( 'after_switch_theme', '_wp_sidebars_changed' ); add_action( 'wp_print_styles', 'print_emoji_styles' ); @@ -513,6 +513,7 @@ add_action( 'init', 'wp_sitemaps_get_server' ); */ // Theme. add_action( 'setup_theme', 'create_initial_theme_features', 0 ); +add_action( 'setup_theme', '_add_default_theme_supports', 1 ); add_action( 'wp_loaded', '_custom_header_background_just_in_time' ); add_action( 'wp_head', '_custom_logo_header_styles' ); add_action( 'plugins_loaded', '_wp_customize_include' ); @@ -562,6 +563,7 @@ add_action( 'enqueue_block_editor_assets', 'wp_enqueue_registered_block_scripts_ add_action( 'enqueue_block_editor_assets', 'enqueue_editor_block_styles_assets' ); add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_block_directory_assets' ); add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_format_library_assets' ); +add_action( 'enqueue_block_editor_assets', 'wp_enqueue_global_styles_css_custom_properties' ); add_action( 'admin_print_scripts-index.php', 'wp_localize_community_events' ); add_filter( 'wp_print_scripts', 'wp_just_in_time_script_localization' ); add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' ); @@ -580,6 +582,19 @@ add_action( 'wp_footer', 'wp_maybe_inline_styles', 1 ); // Run for late-loaded s add_action( 'admin_footer-post.php', 'wp_add_iframed_editor_assets_html' ); add_action( 'admin_footer-post-new.php', 'wp_add_iframed_editor_assets_html' ); +add_action( 'admin_footer-widgets.php', 'wp_add_iframed_editor_assets_html' ); +add_action( 'admin_footer-site-editor.php', 'wp_add_iframed_editor_assets_html' ); + +add_action( 'use_block_editor_for_post_type', '_disable_block_editor_for_navigation_post_type', 10, 2 ); +add_action( 'edit_form_after_title', '_disable_content_editor_for_navigation_post_type' ); +add_action( 'edit_form_after_editor', '_enable_content_editor_for_navigation_post_type' ); + +/* + * Disable "Post Attributes" for wp_navigation post type. The attributes are + * also conditionally enabled when a site has custom templates. Block Theme + * templates can be available for every post type. + */ +add_filter( 'theme_wp_navigation_templates', '__return_empty_array' ); // Taxonomy. add_action( 'init', 'create_initial_taxonomies', 0 ); // Highest priority. @@ -625,7 +640,8 @@ add_action( 'rest_api_init', 'wp_oembed_register_route' ); add_filter( 'rest_pre_serve_request', '_oembed_rest_pre_serve_request', 10, 4 ); add_action( 'wp_head', 'wp_oembed_add_discovery_links' ); -add_action( 'wp_head', 'wp_oembed_add_host_js' ); +add_action( 'wp_head', 'wp_oembed_add_host_js' ); // Back-compat for sites disabling oEmbed host JS by removing action. +add_filter( 'embed_oembed_html', 'wp_maybe_enqueue_oembed_host_js' ); add_action( 'embed_head', 'enqueue_embed_scripts', 1 ); add_action( 'embed_head', 'print_emoji_detection_script' ); @@ -660,10 +676,12 @@ add_filter( 'user_has_cap', 'wp_maybe_grant_install_languages_cap', 1 ); add_filter( 'user_has_cap', 'wp_maybe_grant_resume_extensions_caps', 1 ); add_filter( 'user_has_cap', 'wp_maybe_grant_site_health_caps', 1, 4 ); -// Block Templates CPT and Rendering +// Block templates post type and rendering. add_filter( 'render_block_context', '_block_template_render_without_post_block_context' ); add_filter( 'pre_wp_unique_post_slug', 'wp_filter_wp_template_unique_post_slug', 10, 5 ); +add_action( 'save_post_wp_template_part', 'wp_set_unique_slug_on_create_template_part' ); add_action( 'wp_footer', 'the_block_template_skip_link' ); add_action( 'setup_theme', 'wp_enable_block_templates' ); +add_action( 'wp_loaded', '_add_template_loader_filters' ); unset( $filter, $action ); diff --git a/src/wp-includes/deprecated.php b/src/wp-includes/deprecated.php index dcce1c1cea..7f29f9dcb6 100644 --- a/src/wp-includes/deprecated.php +++ b/src/wp-includes/deprecated.php @@ -3325,7 +3325,7 @@ function gd_edit_image_support($mime_type) { case 'image/gif': return (imagetypes() & IMG_GIF) != 0; case 'image/webp': - return (imagetypes() & IMG_WEBP) != 0; // phpcs:ignore PHPCompatibility.Constants.NewConstants.img_webpFound + return (imagetypes() & IMG_WEBP) != 0; } } else { switch( $mime_type ) { diff --git a/src/wp-includes/embed.php b/src/wp-includes/embed.php index c30c7bcd2e..7efee7107d 100644 --- a/src/wp-includes/embed.php +++ b/src/wp-includes/embed.php @@ -57,7 +57,7 @@ function wp_embed_unregister_handler( $id, $priority = 10 ) { * @global int $content_width * * @param string $url Optional. The URL that should be embedded. Default empty. - * @return array { + * @return int[] { * Indexed array of the embed width and height in pixels. * * @type int $0 The embed width. @@ -356,10 +356,44 @@ function wp_oembed_add_discovery_links() { /** * Adds the necessary JavaScript to communicate with the embedded iframes. * + * This function is no longer used directly. For back-compat it exists exclusively as a way to indicate that the oEmbed + * host JS _should_ be added. In `default-filters.php` there remains this code: + * + * add_action( 'wp_head', 'wp_oembed_add_host_js' ) + * + * Historically a site has been able to disable adding the oEmbed host script by doing: + * + * remove_action( 'wp_head', 'wp_oembed_add_host_js' ) + * + * In order to ensure that such code still works as expected, this function remains. There is now a `has_action()` check + * in `wp_maybe_enqueue_oembed_host_js()` to see if `wp_oembed_add_host_js()` has not been unhooked from running at the + * `wp_head` action. + * * @since 4.4.0 + * @deprecated 5.9.0 Use {@see wp_maybe_enqueue_oembed_host_js()} instead. + */ +function wp_oembed_add_host_js() {} + +/** + * Enqueue the wp-embed script if the provided oEmbed HTML contains a post embed. + * + * In order to only enqueue the wp-embed script on pages that actually contain post embeds, this function checks if the + * provided HTML contains post embed markup and if so enqueues the script so that it will get printed in the footer. + * + * @since 5.9.0 + * + * @param string $html Embed markup. + * @return string Embed markup (without modifications). */ -function wp_oembed_add_host_js() { - wp_enqueue_script( 'wp-embed' ); +function wp_maybe_enqueue_oembed_host_js( $html ) { + if ( + has_action( 'wp_head', 'wp_oembed_add_host_js' ) + && + preg_match( '/]*?wp-embedded-content/', $html ) + ) { + wp_enqueue_script( 'wp-embed' ); + } + return $html; } /** @@ -450,32 +484,18 @@ function get_post_embed_html( $width, $height, $post = null ) { $embed_url = get_post_embed_url( $post ); - $output = '
    ' . get_the_title( $post ) . "
    \n"; + $secret = wp_generate_password( 10, false ); + $embed_url .= "#?secret={$secret}"; - $output .= ""; + $output = sprintf( + '
    %3$s
    ', + esc_attr( $secret ), + esc_url( get_permalink( $post ) ), + get_the_title( $post ) + ); $output .= sprintf( - '', + '', esc_url( $embed_url ), absint( $width ), absint( $height ), @@ -486,7 +506,17 @@ JS; get_the_title( $post ), get_bloginfo( 'name' ) ) - ) + ), + esc_attr( $secret ) + ); + + // Note that the script must be placed after the
    and '; + $img2 = get_image_tag( self::$large_id, '', '', '', 'medium' ); + $img3 = get_image_tag( self::$large_id, '', '', '', 'thumbnail' ); + $iframe2 = ''; + $lazy_img2 = wp_img_tag_add_loading_attr( $img2, 'the_content' ); + $lazy_img3 = wp_img_tag_add_loading_attr( $img3, 'the_content' ); + $lazy_iframe2 = wp_iframe_tag_add_loading_attr( $iframe2, 'the_content' ); + + // Use a threshold of 2. + add_filter( + 'wp_omit_loading_attr_threshold', + function() { + return 2; + } + ); + + // Following the threshold of 2, the first two content media elements should not be lazy-loaded. + $content_unfiltered = $img1 . $iframe1 . $img2 . $img3 . $iframe2; + $content_expected = $img1 . $iframe1 . $lazy_img2 . $lazy_img3 . $lazy_iframe2; + + $wp_query = new WP_Query( array( 'post__in' => array( self::$post_ids['publish'] ) ) ); + $wp_the_query = $wp_query; + $this->reset_content_media_count(); + $this->reset_omit_loading_attr_filter(); + + while ( have_posts() ) { + the_post(); + + add_filter( 'wp_img_tag_add_srcset_and_sizes_attr', '__return_false' ); + $content_filtered = wp_filter_content_tags( $content_unfiltered, 'the_content' ); + remove_filter( 'wp_img_tag_add_srcset_and_sizes_attr', '__return_false' ); + } + + // After filtering, the first image should not be lazy-loaded while the other ones should be. + $this->assertSame( $content_expected, $content_filtered ); + } + + /** + * @ticket 53675 + */ + public function test_wp_omit_loading_attr_threshold() { + $this->reset_omit_loading_attr_filter(); + + // Apply filter, ensure default value of 1. + $omit_threshold = wp_omit_loading_attr_threshold(); + $this->assertSame( 1, $omit_threshold ); + + // Add a filter that changes the value to 3. However, the filter is not applied a subsequent time in a single + // page load by default, so the value is still 1. + add_filter( + 'wp_omit_loading_attr_threshold', + function() { + return 3; + } + ); + $omit_threshold = wp_omit_loading_attr_threshold(); + $this->assertSame( 1, $omit_threshold ); + + // Only by enforcing a fresh check, the filter gets re-applied. + $omit_threshold = wp_omit_loading_attr_threshold( true ); + $this->assertSame( 3, $omit_threshold ); + } + + private function reset_content_media_count() { + // Get current value without increasing. + $content_media_count = wp_increase_content_media_count( 0 ); + + // Decrease it by its current value to "reset" it back to 0. + wp_increase_content_media_count( - $content_media_count ); + } + + private function reset_omit_loading_attr_filter() { + // Add filter to "reset" omit threshold back to null (unset). + add_filter( 'wp_omit_loading_attr_threshold', '__return_null', 100 ); + + // Force filter application to re-run. + wp_omit_loading_attr_threshold( true ); + + // Clean up the above filter. + remove_filter( 'wp_omit_loading_attr_threshold', '__return_null', 100 ); + } } /** diff --git a/tests/phpunit/tests/media/getPostGalleries.php b/tests/phpunit/tests/media/getPostGalleries.php new file mode 100644 index 0000000000..bd114b899f --- /dev/null +++ b/tests/phpunit/tests/media/getPostGalleries.php @@ -0,0 +1,969 @@ +img_meta = array( + 'width' => 100, + 'height' => 100, + 'sizes' => '', + ); + } + + /** + * Test that an empty array is returned for a post that does not exist. + * + * @ticket 43826 + */ + public function test_returns_empty_array_with_non_existent_post() { + $galleries = get_post_galleries( 99999, false ); + $this->assertEmpty( $galleries ); + } + + /** + * Test that an empty array is returned for a post that has no gallery. + * + * @ticket 43826 + */ + public function test_returns_empty_array_with_post_with_no_gallery() { + $post_id = $this->factory->post->create( + array( + 'post_content' => '

    A post with no gallery

    ', + ) + ); + + $galleries = get_post_galleries( $post_id, false ); + $this->assertEmpty( $galleries ); + } + + /** + * Test that no srcs are returned for a shortcode gallery + * in a post with no attached images. + * + * @ticket 39304 + * + * @group shortcode + */ + public function test_returns_no_srcs_with_shortcode_in_post_with_no_attached_images() { + // Set up an unattached image. + $this->factory->attachment->create_object( + array( + 'file' => 'test.jpg', + 'post_parent' => 0, + 'post_mime_type' => 'image/jpeg', + 'post_type' => 'attachment', + ) + ); + + $post_id = $this->factory->post->create( + array( + 'post_content' => '[gallery]', + ) + ); + + $galleries = get_post_galleries( $post_id, false ); + + // The method can return an empty array. + $this->assertNotEmpty( + $galleries, + 'The galleries array is empty.' + ); + + // This prevents future changes from causing + // backwards compatibility breaks. + $this->assertArrayHasKey( + 'src', + $galleries[0], + 'A src key does not exist.' + ); + + $this->assertEmpty( + $galleries[0]['src'], + 'The src key is not empty.' + ); + } + + /** + * Test that no srcs are returned for a gallery block + * in a post with no attached images. + * + * @ticket 43826 + * + * @group blocks + */ + public function test_returns_no_srcs_with_block_in_post_with_no_attached_images() { + // Set up an unattached image. + $this->factory->attachment->create_object( + array( + 'file' => 'test.jpg', + 'post_parent' => 0, + 'post_mime_type' => 'image/jpeg', + 'post_type' => 'attachment', + ) + ); + + $post_id = $this->factory->post->create( + array( + 'post_content' => '', + ) + ); + + $galleries = get_post_galleries( $post_id, false ); + + // The method can return an empty array. + $this->assertNotEmpty( + $galleries, + 'The galleries array is empty.' + ); + + // The method can return an array of strings + // instead of an array of arrays. + $this->assertIsArray( + $galleries[0], + 'The returned data does not contain an array.' + ); + + // This prevents future changes from causing + // backwards compatibility breaks. + $this->assertArrayHasKey( + 'src', + $galleries[0], + 'A src key does not exist.' + ); + + $this->assertEmpty( + $galleries[0]['src'], + 'The src key of the first gallery is not empty.' + ); + } + + /** + * Test that no srcs are returned for a gallery block v2 + * in a post with no attached images. + * + * @ticket 43826 + * + * @group blocks + */ + public function test_returns_no_srcs_with_block_v2_in_post_with_no_attached_images() { + // Set up an unattached image. + $image_id = $this->factory->attachment->create_object( + array( + 'file' => 'test.jpg', + 'post_parent' => 0, + 'post_mime_type' => 'image/jpeg', + 'post_type' => 'attachment', + ) + ); + + $image_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/test.jpg'; + + $blob = <<< BLOB + +
    + +
    + Image gallery image +
    + +
    + +BLOB; + + $post_id = $this->factory->post->create( + array( + 'post_content' => $blob, + ) + ); + + $expected_srcs = array( $image_url ); + $galleries = get_post_galleries( $post_id, false ); + + // The method can return an empty array. + $this->assertNotEmpty( + $galleries, + 'The galleries array is empty.' + ); + + // The method can return an array of strings + // instead of an array of arrays. + $this->assertIsArray( + $galleries[0], + 'The returned data does not contain an array.' + ); + + // This prevents future changes from causing + // backwards compatibility breaks. + $this->assertArrayHasKey( + 'src', + $galleries[0], + 'A src key does not exist.' + ); + + $this->assertSameSetsWithIndex( + $expected_srcs, + $galleries[0]['src'], + 'The expected and actual srcs are not the same.' + ); + } + + /** + * Test that HTML is returned for a shortcode gallery. + * + * @ticket 43826 + * + * @group shortcode + */ + public function test_returns_html_with_shortcode_gallery() { + $post_id = $this->factory->post->create( + array( + 'post_content' => 'I have no gallery', + ) + ); + + $post_id_two = $this->factory->post->create( + array( + 'post_content' => "[gallery id='$post_id']", + ) + ); + + $this->factory->attachment->create_object( + array( + 'file' => 'test.jpg', + 'post_parent' => $post_id, + 'post_mime_type' => 'image/jpeg', + 'post_type' => 'attachment', + ) + ); + + $expected = 'src="http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/test.jpg"'; + $galleries = get_post_galleries( $post_id_two ); + + // The method can return an empty array. + $this->assertNotEmpty( + $galleries, + 'The galleries array is empty.' + ); + + // The method can return an array of arrays + // instead of an array of strings. + $this->assertIsString( + $galleries[0], + 'Did not return the data as a string.' + ); + + $this->assertStringContainsString( + $expected, + $galleries[0], + 'The returned data did not contain a src attribute with the expected image URL.' + ); + } + + /** + * Test that HTML is returned for a block gallery. + * + * @ticket 43826 + * + * @group blocks + */ + public function test_returns_html_with_block_gallery() { + $post_id = $this->factory->post->create( + array( + 'post_content' => 'I have no gallery.', + ) + ); + + // Set up an unattached image. + $image_id = $this->factory->attachment->create( + array( + 'file' => 'test.jpg', + 'post_parent' => $post_id, + 'post_mime_type' => 'image/jpeg', + 'post_type' => 'attachment', + ) + ); + + $image_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/test.jpg'; + + $blob = <<< BLOB + +
    + +BLOB; + + $post_id_two = $this->factory->post->create( + array( + 'post_content' => $blob, + ) + ); + + $expected = 'src="http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/test.jpg"'; + $galleries = get_post_galleries( $post_id_two ); + + // The method can return an empty array. + $this->assertNotEmpty( + $galleries, + 'The galleries array is empty.' + ); + + // The method can return an array of arrays + // instead of an array of strings. + $this->assertIsString( + $galleries[0], + 'Did not return the data as a string.' + ); + + $this->assertStringContainsString( + $expected, + $galleries[0], + 'The returned data did not contain a src attribute with the expected image URL.' + ); + } + + /** + * Test that HTML is returned for a block gallery v2. + * + * @ticket 43826 + * + * @group blocks + */ + public function test_returns_html_with_block_gallery_v2() { + $image_id = $this->factory->attachment->create_object( + array( + 'file' => 'test.jpg', + 'post_parent' => 0, + 'post_mime_type' => 'image/jpeg', + 'post_type' => 'attachment', + ) + ); + + $image_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/test.jpg'; + + $blob = <<< BLOB + +
    + +
    + Image gallery image +
    + +
    + +BLOB; + + $post_id = $this->factory->post->create( + array( + 'post_content' => $blob, + ) + ); + + $expected = 'src="http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/test.jpg"'; + $galleries = get_post_galleries( $post_id ); + + // The method can return an empty array. + $this->assertNotEmpty( + $galleries, + 'The galleries array is empty.' + ); + + // The method can return an array of arrays + // instead of an array of strings. + $this->assertIsString( + $galleries[0], + 'Did not return the data as a string.' + ); + + $this->assertStringContainsString( + $expected, + $galleries[0], + 'The returned data did not contain a src attribute with the expected image URL.' + ); + } + + /** + * Test that the global post object does not override + * a provided post ID with a shortcode gallery. + * + * @ticket 39304 + * + * @group shortcode + */ + public function test_respects_post_id_with_shortcode_gallery() { + $global_post_id = $this->factory->post->create( + array( + 'post_content' => 'Global Post', + ) + ); + $post_id = $this->factory->post->create( + array( + 'post_content' => '[gallery]', + ) + ); + $this->factory->attachment->create_object( + array( + 'file' => 'test.jpg', + 'post_parent' => $post_id, + 'post_mime_type' => 'image/jpeg', + 'post_type' => 'attachment', + ) + ); + $expected_srcs = array( + 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/test.jpg', + ); + + // Set the global $post context to the other post. + $GLOBALS['post'] = get_post( $global_post_id ); + + $galleries = get_post_galleries( $post_id, false ); + + // The method can return an empty array. + $this->assertNotEmpty( + $galleries, + 'The galleries array is empty.' + ); + + // This prevents future changes from causing + // backwards compatibility breaks. + $this->assertArrayHasKey( + 'src', + $galleries[0], + 'A src key does not exist.' + ); + + $this->assertSameSetsWithIndex( + $expected_srcs, + $galleries[0]['src'], + 'The expected and actual srcs are not the same.' + ); + } + + /** + * Test that the global post object does not override + * a provided post ID with a block gallery. + * + * @ticket 43826 + * + * @group block + */ + public function test_respects_post_id_with_block_gallery() { + $ids = array(); + $imgs = array(); + $ids_srcs = array(); + foreach ( range( 1, 3 ) as $i ) { + $attachment_id = self::factory()->attachment->create_object( + "image$i.jpg", + 0, + array( + 'post_mime_type' => 'image/jpeg', + 'post_type' => 'attachment', + ) + ); + $metadata = array_merge( array( 'file' => "image$i.jpg" ), $this->img_meta ); + wp_update_attachment_metadata( $attachment_id, $metadata ); + $ids[] = $attachment_id; + $url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . "image$i.jpg"; + $ids_srcs[] = $url; + $imgs[] = '
    '; + + } + + $ids_joined = join( ',', $ids ); + + $global_post_id = $this->factory->post->create( + array( + 'post_content' => 'Global Post', + ) + ); + + $blob = <<< BLOB + + +BLOB; + + $post_id = $this->factory->post->create( + array( + 'post_content' => $blob, + ) + ); + $this->factory->attachment->create_object( + array( + 'file' => 'test.jpg', + 'post_parent' => $post_id, + 'post_mime_type' => 'image/jpeg', + 'post_type' => 'attachment', + ) + ); + $expected_srcs = array( + 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/test.jpg', + ); + + // Set the global $post context to the other post. + $GLOBALS['post'] = get_post( $global_post_id ); + + $galleries = get_post_galleries( $post_id, false ); + + // The method can return an empty array. + $this->assertNotEmpty( + $galleries, + 'The galleries array is empty.' + ); + + // This prevents future changes from causing + // backwards compatibility breaks. + $this->assertArrayHasKey( + 'src', + $galleries[0], + 'A src key does not exist.' + ); + + $this->assertSameSetsWithIndex( + array( + array( + 'ids' => $ids_joined, + 'src' => $ids_srcs, + ), + ), + $galleries, + 'The expected and actual srcs are not the same.' + ); + } + + /** + * Test that the global post object does not override + * a provided post ID with a block gallery v2. + * + * @ticket 43826 + * + * @group block + */ + public function test_respects_post_id_with_block_gallery_v2() { + $attachment_id = self::factory()->attachment->create_object( + 'image1.jpg', + 0, + array( + 'post_mime_type' => 'image/jpeg', + 'post_type' => 'attachment', + ) + ); + $metadata = array_merge( array( 'file' => 'image1.jpg' ), $this->img_meta ); + $url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . 'image1.jpg'; + $global_post_id = $this->factory->post->create( + array( + 'post_content' => 'Global Post', + ) + ); + + wp_update_attachment_metadata( $attachment_id, $metadata ); + + $blob = <<< BLOB + +
    + +
    + Image gallery image +
    + +
    + +BLOB; + + $post_id = $this->factory->post->create( + array( + 'post_content' => $blob, + ) + ); + $this->factory->attachment->create_object( + array( + 'file' => 'test.jpg', + 'post_parent' => $post_id, + 'post_mime_type' => 'image/jpeg', + 'post_type' => 'attachment', + ) + ); + $expected_srcs = array( + 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/test.jpg', + ); + + // Set the global $post context to the other post. + $GLOBALS['post'] = get_post( $global_post_id ); + + $galleries = get_post_galleries( $post_id, false ); + + // The method can return an empty array. + $this->assertNotEmpty( + $galleries, + 'The galleries array is empty.' + ); + + // This prevents future changes from causing + // backwards compatibility breaks. + $this->assertArrayHasKey( + 'src', + $galleries[0], + 'A src key does not exist.' + ); + + $this->assertSameSetsWithIndex( + array( + array( + 'ids' => (string) $attachment_id, + 'src' => array( $url ), + ), + ), + $galleries, + 'The expected and actual srcs are not the same.' + ); + } + + /** + * Test that the gallery only contains images specified in + * the shortcode's id attribute. + * + * @ticket 39304 + * + * @group shortcode + */ + public function test_respects_shortcode_id_attribute() { + $post_id = $this->factory->post->create( + array( + 'post_content' => 'No gallery defined', + ) + ); + $post_id_two = $this->factory->post->create( + array( + 'post_content' => "[gallery id='$post_id']", + ) + ); + $this->factory->attachment->create_object( + array( + 'file' => 'test.jpg', + 'post_parent' => $post_id, + 'post_mime_type' => 'image/jpeg', + 'post_type' => 'attachment', + ) + ); + $expected_srcs = array( + 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/test.jpg', + ); + + $galleries = get_post_galleries( $post_id_two, false ); + + // Set the global $post context. + $GLOBALS['post'] = get_post( $post_id_two ); + $galleries_with_global_context = get_post_galleries( $post_id_two, false ); + + // Check that the global post state doesn't affect the results. + $this->assertSameSetsWithIndex( + $galleries, + $galleries_with_global_context, + 'The global post state affected the results.' + ); + + // The method can return an empty array. + $this->assertNotEmpty( + $galleries, + 'The galleries array is empty.' + ); + + // The method can return an array of strings + // instead of an array of arrays. + $this->assertIsArray( + $galleries[0], + 'The returned data does not contain an array.' + ); + + // This prevents future changes from causing + // backwards compatibility breaks. + $this->assertArrayHasKey( + 'src', + $galleries[0], + 'A src key does not exist.' + ); + + $this->assertSameSetsWithIndex( + $expected_srcs, + $galleries[0]['src'], + 'The expected and actual srcs are not the same.' + ); + } + + /** + * Test that galleries only contain images specified in the + * id attribute of their respective shortcode and block. + * + * @ticket 43826 + * + * @group blocks + * @group shortcode + */ + public function test_respects_shortcode_and_block_id_attributes() { + // Test the get_post_galleries() function in $html=false mode, with both shortcode and block galleries + $ids = array(); + $imgs = array(); + $ids_srcs = array(); + foreach ( range( 1, 6 ) as $i ) { + $attachment_id = self::factory()->attachment->create_object( + "image$i.jpg", + 0, + array( + 'post_mime_type' => 'image/jpeg', + 'post_type' => 'attachment', + ) + ); + $metadata = array_merge( array( 'file' => "image$i.jpg" ), $this->img_meta ); + wp_update_attachment_metadata( $attachment_id, $metadata ); + $ids[] = $attachment_id; + $url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . "image$i.jpg"; + $ids_srcs[] = $url; + $imgs[] = '
    '; + + } + + $ids1_joined = join( ',', array_slice( $ids, 0, 3 ) ); + $ids2_joined = join( ',', array_slice( $ids, 3, 3 ) ); + + $blob = << + +BLOB; + + $post_id = self::factory()->post->create( array( 'post_content' => $blob ) ); + + $galleries = get_post_galleries( $post_id, false ); + $this->assertSameSetsWithIndex( + array( + array( + 'ids' => $ids1_joined, + 'src' => array_slice( $ids_srcs, 0, 3 ), + ), + array( + 'ids' => $ids2_joined, + 'src' => array_slice( $ids_srcs, 3, 3 ), + ), + ), + $galleries + ); + + } + + /** + * Test that galleries contain the additional attributes + * specified for their respective shortcode and block. + * + * @ticket 43826 + * + * @group blocks + * @group shortcode + */ + public function test_respects_additional_shortcode_and_block_attributes() { + // Test attributes returned by get_post_galleries() function in $html=false mode, with both shortcode and block galleries + $ids = array(); + $imgs = array(); + $ids_srcs = array(); + foreach ( range( 1, 6 ) as $i ) { + $attachment_id = self::factory()->attachment->create_object( + "image$i.jpg", + 0, + array( + 'post_mime_type' => 'image/jpeg', + 'post_type' => 'attachment', + ) + ); + $metadata = array_merge( array( 'file' => "image$i.jpg" ), $this->img_meta ); + wp_update_attachment_metadata( $attachment_id, $metadata ); + $ids[] = $attachment_id; + $url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . "image$i.jpg"; + $ids_srcs[] = $url; + $imgs[] = '
    '; + + } + + $ids1_joined = join( ',', array_slice( $ids, 0, 3 ) ); + $ids2_joined = join( ',', array_slice( $ids, 3, 3 ) ); + $blob = << + +BLOB; + + $post_id = self::factory()->post->create( array( 'post_content' => $blob ) ); + + $galleries = get_post_galleries( $post_id, false ); + $this->assertSameSetsWithIndex( + array( + array( + 'ids' => $ids1_joined, + // The shortcode code passes arbitrary attributes + 'type' => 'type', + 'foo' => 'bar', + 'src' => array_slice( $ids_srcs, 0, 3 ), + ), + array( + 'ids' => $ids2_joined, + // The block only passes ids, no other attributes + 'src' => array_slice( $ids_srcs, 3, 3 ), + ), + ), + $galleries + ); + + } + + /** + * Test that srcs are retrieved from the HTML of a block gallery + * that has no JSON blob. + * + * @ticket 43826 + * + * @group blocks + */ + public function test_returns_srcs_from_html_with_block_with_no_json_blob() { + // Set up an unattached image. + $image_id = $this->factory->attachment->create_object( + array( + 'file' => 'test.jpg', + 'post_parent' => 0, + 'post_mime_type' => 'image/jpeg', + 'post_type' => 'attachment', + ) + ); + + $image_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/test.jpg'; + + $blob = <<< BLOB + +
    • +
      +title +
      +
      • +
    + +BLOB; + + $post_id = $this->factory->post->create( + array( + 'post_content' => $blob, + ) + ); + + $expected_srcs = array( $image_url ); + $galleries = get_post_galleries( $post_id, false ); + + // The method can return an empty array. + $this->assertNotEmpty( + $galleries, + 'The galleries array is empty.' + ); + + // The method can return an array of strings + // instead of an array of arrays. + $this->assertIsArray( + $galleries[0], + 'The returned data does not contain an array.' + ); + + // This prevents future changes from causing + // backwards compatibility breaks. + $this->assertArrayHasKey( + 'src', + $galleries[0], + 'A src key does not exist.' + ); + + $this->assertSameSetsWithIndex( + $expected_srcs, + $galleries[0]['src'], + 'The expected and actual srcs are not the same.' + ); + } + + /** + * Test that srcs are returned for a block gallery nested within + * other blocks. + * + * @ticket 43826 + * + * @group blocks + */ + public function test_returns_srcs_with_nested_block_gallery() { + $post_id = $this->factory->post->create( + array( + 'post_content' => 'I have no gallery.', + ) + ); + $image_id = $this->factory->attachment->create_object( + array( + 'file' => 'test.jpg', + 'post_parent' => $post_id, + 'post_mime_type' => 'image/jpeg', + 'post_type' => 'attachment', + ) + ); + + $blob = << + + + + + +BLOB; + + $post_id_two = $this->factory->post->create( array( 'post_content' => $blob ) ); + + $galleries = get_post_galleries( $post_id_two, false ); + + // The method can return an empty array. + $this->assertNotEmpty( + $galleries, + 'The galleries array is empty.' + ); + + // The method can return an array of strings + // instead of an array of arrays. + $this->assertIsArray( + $galleries[0], + 'The returned data does not contain an array.' + ); + + // This prevents future changes from causing + // backwards compatibility breaks. + $this->assertArrayHasKey( + 'src', + $galleries[0], + 'A src key does not exist.' + ); + + $this->assertNotEmpty( + $galleries[0]['src'], + 'The src key of the first gallery is empty.' + ); + } +} diff --git a/tests/phpunit/tests/menu/walker-nav-menu.php b/tests/phpunit/tests/menu/walker-nav-menu.php index 1811284b50..b004819134 100644 --- a/tests/phpunit/tests/menu/walker-nav-menu.php +++ b/tests/phpunit/tests/menu/walker-nav-menu.php @@ -41,7 +41,7 @@ class Tests_Menu_Walker_Nav_Menu extends WP_UnitTestCase { * @ticket 43290 */ public function test_noopener_no_referrer_for_target_blank() { - $expected = ''; + $actual = ''; $post_id = $this->factory->post->create(); $post_title = get_the_title( $post_id ); @@ -61,9 +61,9 @@ class Tests_Menu_Walker_Nav_Menu extends WP_UnitTestCase { 'link_after' => '', ); - $this->walker->start_el( $expected, (object) $item, 0, (object) $args ); + $this->walker->start_el( $actual, (object) $item, 0, (object) $args ); - $this->assertSame( "
  • {$post_title}", $expected ); + $this->assertSame( "
  • {$post_title}", $actual ); } /** diff --git a/tests/phpunit/tests/meta/registerMeta.php b/tests/phpunit/tests/meta/registerMeta.php index 720f4deaef..ae2c1d6e63 100644 --- a/tests/phpunit/tests/meta/registerMeta.php +++ b/tests/phpunit/tests/meta/registerMeta.php @@ -179,7 +179,7 @@ class Tests_Meta_Register_Meta extends WP_UnitTestCase { ), ), ); - $this->assertSame( $actual, $expected ); + $this->assertSame( $expected, $actual ); } public function test_register_meta_with_current_sanitize_callback_returns_true() { @@ -521,11 +521,11 @@ class Tests_Meta_Register_Meta extends WP_UnitTestCase { $object_property_name = $object_type . '_id'; $object_id = self::$$object_property_name; $default_value = get_metadata_default( $object_type, $object_id, $meta_key, $single ); - $this->assertSame( $default_value, $expected ); + $this->assertSame( $expected, $default_value ); // Check for default value. $value = get_metadata( $object_type, $object_id, $meta_key, $single ); - $this->assertSame( $value, $expected ); + $this->assertSame( $expected, $value ); // Set value to check default is not being returned by mistake. $meta_value = 'dibble'; @@ -536,7 +536,7 @@ class Tests_Meta_Register_Meta extends WP_UnitTestCase { // Delete meta, make sure the default is returned. delete_metadata( $object_type, $object_id, $meta_key ); $value = get_metadata( $object_type, $object_id, $meta_key, $single ); - $this->assertSame( $value, $expected ); + $this->assertSame( $expected, $value ); // Set other meta key, to make sure other keys are not effects. $meta_value = 'hibble'; @@ -568,7 +568,7 @@ class Tests_Meta_Register_Meta extends WP_UnitTestCase { $object_property_name = $object_type . '_id'; $object_id = self::$$object_property_name; $default_value = get_metadata_default( $object_type, $object_id, $meta_key, $single ); - $this->assertSame( $default_value, $expected ); + $this->assertSame( $expected, $default_value ); } public function filter_get_object_subtype_for_customtype( $subtype, $object_id ) { diff --git a/tests/phpunit/tests/multisite/updatePostsCount.php b/tests/phpunit/tests/multisite/updatePostsCount.php new file mode 100644 index 0000000000..2806aaedd5 --- /dev/null +++ b/tests/phpunit/tests/multisite/updatePostsCount.php @@ -0,0 +1,56 @@ +blog->create(); + switch_to_blog( $blog_id ); + + $current_post_count = (int) get_option( 'post_count' ); + + $post_id = self::factory()->post->create( + array( + 'post_type' => 'post', + 'post_author' => '1', + 'post_date' => '2012-10-23 19:34:42', + 'post_status' => 'publish', + ) + ); + + /** + * Check that add_action( 'deleted_post', '_update_posts_count_on_delete' ) is called when a post is created. + * Check that _update_posts_count_on_transition_post_status() is called on that filter which then calls + * update_posts_count to update the count. + */ + $this->assertEquals( $current_post_count + 1, (int) get_option( 'post_count' ), 'post added' ); + + wp_delete_post( $post_id ); + + /** + * Check that add_action( 'transition_post_status', '_update_posts_count_on_transition_post_status', 10, 3 ) + * is called when a post is deleted. + * Check that _update_posts_count_on_delete() is called on that filter which then calls update_posts_count + * to update the count. + */ + $this->assertEquals( $current_post_count, (int) get_option( 'post_count' ), 'post deleted' ); + + restore_current_blog(); + + } + } + +endif; diff --git a/tests/phpunit/tests/oembed/getResponseData.php b/tests/phpunit/tests/oembed/getResponseData.php index 5cec227d99..d782014b25 100644 --- a/tests/phpunit/tests/oembed/getResponseData.php +++ b/tests/phpunit/tests/oembed/getResponseData.php @@ -12,6 +12,24 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase { self::touch( ABSPATH . WPINC . '/js/wp-embed.js' ); } + private function normalize_secret_attribute( $data ) { + if ( is_array( $data ) ) { + $html = $data['html']; + } else { + $html = $data; + } + + $html = preg_replace( '/secret=("?)\w+\1/', 'secret=__SECRET__', $html ); + + if ( is_array( $data ) ) { + $data['html'] = $html; + } else { + $data = $html; + } + + return $data; + } + public function test_get_oembed_response_data_non_existent_post() { $this->assertFalse( get_oembed_response_data( 0, 100 ) ); } @@ -36,9 +54,9 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase { 'type' => 'rich', 'width' => 400, 'height' => 225, - 'html' => get_post_embed_html( 400, 225, $post ), + 'html' => $this->normalize_secret_attribute( get_post_embed_html( 400, 225, $post ) ), ), - $data + $this->normalize_secret_attribute( $data ) ); } @@ -72,9 +90,9 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase { 'type' => 'rich', 'width' => 400, 'height' => 225, - 'html' => get_post_embed_html( 400, 225, $post ), + 'html' => $this->normalize_secret_attribute( get_post_embed_html( 400, 225, $post ) ), ), - $data + $this->normalize_secret_attribute( $data ) ); } diff --git a/tests/phpunit/tests/oembed/template.php b/tests/phpunit/tests/oembed/template.php index b330ae70cf..28a14ceac4 100644 --- a/tests/phpunit/tests/oembed/template.php +++ b/tests/phpunit/tests/oembed/template.php @@ -4,6 +4,21 @@ * @group oembed */ class Tests_Embed_Template extends WP_UnitTestCase { + + public function set_up() { + parent::set_up(); + + global $wp_scripts; + $wp_scripts = null; + } + + public function tear_down() { + parent::tear_down(); + + global $wp_scripts; + $wp_scripts = null; + } + public function test_oembed_output_post() { $user = self::factory()->user->create_and_get( array( @@ -281,15 +296,52 @@ class Tests_Embed_Template extends WP_UnitTestCase { ) ); - $expected = ''; + $expected = ''; + $actual = get_post_embed_html( 200, 200, $post_id ); + $actual = preg_replace( '/secret=("?)\w+\1/', 'secret=__SECRET__', $actual ); - $this->assertStringEndsWith( $expected, get_post_embed_html( 200, 200, $post_id ) ); + $this->assertStringStartsWith( '
    ', $actual ); + $this->assertStringContainsString( $expected, $actual ); + $this->assertStringEndsWith( '', trim( $actual ) ); } + /** @covers ::wp_oembed_add_host_js() */ public function test_add_host_js() { + remove_all_filters( 'embed_oembed_html' ); + + // This function is now a no-op. wp_oembed_add_host_js(); - $this->assertTrue( wp_script_is( 'wp-embed' ) ); + $this->assertFalse( has_filter( 'embed_oembed_html', 'wp_maybe_enqueue_oembed_host_js' ) ); + } + + /** @covers ::wp_maybe_enqueue_oembed_host_js() */ + public function test_wp_maybe_enqueue_oembed_host_js() { + $scripts = wp_scripts(); + + $this->assertFalse( $scripts->query( 'wp-embed', 'enqueued' ) ); + + $post_embed = '
    Embeds Changes in WordPress 4.5
    '; + $non_post_embed = ''; + + wp_maybe_enqueue_oembed_host_js( $non_post_embed ); + $this->assertFalse( $scripts->query( 'wp-embed', 'enqueued' ) ); + + wp_maybe_enqueue_oembed_host_js( $post_embed ); + $this->assertTrue( $scripts->query( 'wp-embed', 'enqueued' ) ); + } + + /** @covers ::wp_maybe_enqueue_oembed_host_js() */ + public function test_wp_maybe_enqueue_oembed_host_js_without_wp_head_action() { + $scripts = wp_scripts(); + + remove_action( 'wp_head', 'wp_oembed_add_host_js' ); + $this->assertFalse( $scripts->query( 'wp-embed', 'enqueued' ) ); + + $post_embed = '
    Embeds Changes in WordPress 4.5
    '; + + wp_maybe_enqueue_oembed_host_js( $post_embed ); + $this->assertFalse( $scripts->query( 'wp-embed', 'enqueued' ) ); } /** diff --git a/tests/phpunit/tests/option/sanitize-option.php b/tests/phpunit/tests/option/sanitize-option.php index 3a1c22215d..80342fed8f 100644 --- a/tests/phpunit/tests/option/sanitize-option.php +++ b/tests/phpunit/tests/option/sanitize-option.php @@ -155,6 +155,7 @@ class Tests_Sanitize_Option extends WP_UnitTestCase { array( '/%postname%/', '/%postname%/', true ), array( '/%year%/%monthnum%/%day%/%postname%/', '/%year%/%monthnum%/%day%/%postname%/', true ), array( '/%year/%postname%/', '/%year/%postname%/', true ), + array( new WP_Error( 'wpdb_get_table_charset_failure' ), false, false ), // @ticket 53986 ); } diff --git a/tests/phpunit/tests/post.php b/tests/phpunit/tests/post.php index f8edf13dae..c7d60f4b5f 100644 --- a/tests/phpunit/tests/post.php +++ b/tests/phpunit/tests/post.php @@ -68,8 +68,8 @@ class Tests_Post extends WP_UnitTestCase { $post = array( 'post_author' => self::$editor_id, 'post_status' => 'publish', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => "{$post_type}_content", + 'post_title' => "{$post_type}_title", 'tax_input' => array( 'post_tag' => 'tag1,tag2', 'ctax' => 'cterm1,cterm2', @@ -126,8 +126,8 @@ class Tests_Post extends WP_UnitTestCase { $post = array( 'post_author' => self::$editor_id, 'post_status' => 'publish', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', 'post_date' => date_format( date_create( "@{$future_date}" ), 'Y-m-d H:i:s' ), ); @@ -162,8 +162,8 @@ class Tests_Post extends WP_UnitTestCase { $post = array( 'post_author' => self::$editor_id, 'post_status' => 'publish', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', 'post_date' => date_format( date_create( "@{$future_date_1}" ), 'Y-m-d H:i:s' ), ); @@ -207,8 +207,8 @@ class Tests_Post extends WP_UnitTestCase { $post = array( 'post_author' => self::$editor_id, 'post_status' => 'publish', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', 'post_date' => date_format( date_create( "@{$future_date_1}" ), 'Y-m-d H:i:s' ), ); @@ -249,8 +249,8 @@ class Tests_Post extends WP_UnitTestCase { $post = array( 'post_author' => self::$editor_id, 'post_status' => 'draft', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', 'post_date' => date_format( date_create( "@{$future_date}" ), 'Y-m-d H:i:s' ), ); @@ -284,8 +284,8 @@ class Tests_Post extends WP_UnitTestCase { $post = array( 'post_author' => self::$editor_id, 'post_status' => 'publish', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', 'post_date' => date_format( date_create( "@{$future_date_1}" ), 'Y-m-d H:i:s' ), ); @@ -328,8 +328,8 @@ class Tests_Post extends WP_UnitTestCase { $post = array( 'post_author' => self::$editor_id, 'post_status' => 'publish', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => "{$status}_content", + 'post_title' => "{$status}_title", 'post_date' => date_format( date_create( "@{$future_date_1}" ), 'Y-m-d H:i:s' ), ); @@ -370,8 +370,8 @@ class Tests_Post extends WP_UnitTestCase { $post = array( 'post_author' => self::$editor_id, 'post_status' => 'private', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', 'post_date' => date_format( date_create( "@{$future_date}" ), 'Y-m-d H:i:s' ), ); @@ -404,8 +404,8 @@ class Tests_Post extends WP_UnitTestCase { $post = array( 'post_author' => self::$editor_id, 'post_status' => 'publish', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', 'post_date' => '2012-02-30 00:00:00', ); @@ -427,8 +427,8 @@ class Tests_Post extends WP_UnitTestCase { $post = array( 'post_author' => self::$editor_id, 'post_status' => 'publish', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', 'post_date' => date_format( date_create( "@{$future_date_1}" ), 'Y-m-d H:i:s' ), ); @@ -533,8 +533,8 @@ class Tests_Post extends WP_UnitTestCase { $post = array( 'post_author' => self::$editor_id, 'post_status' => 'publish', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', 'post_date' => date_format( date_create( "@{$future_date}" ), 'Y-m-d H:i:s' ), ); @@ -564,7 +564,7 @@ class Tests_Post extends WP_UnitTestCase { $post = array( 'post_author' => self::$editor_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '', 'post_date' => '2007-10-31 06:15:00', ); @@ -782,11 +782,11 @@ class Tests_Post extends WP_UnitTestCase { register_taxonomy( 'test_tax', 'post' ); - $title = rand_str(); + $title = 'title'; $post_data = array( 'post_author' => self::$editor_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => $title, 'tax_input' => array( 'test_tax' => array( 'term', 'term2', 'term3' ), @@ -906,7 +906,7 @@ class Tests_Post extends WP_UnitTestCase { register_taxonomy( $tax, $post_type ); $post = self::factory()->post->create( array( 'post_type' => $post_type ) ); - wp_set_object_terms( $post, rand_str(), $tax ); + wp_set_object_terms( $post, 'foo', $tax ); $wp_tag_cloud = wp_tag_cloud( array( @@ -973,8 +973,8 @@ class Tests_Post extends WP_UnitTestCase { array( 'post_author' => self::$editor_id, 'post_status' => 'publish', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', ) ); $post = get_post( $post_id ); @@ -991,8 +991,8 @@ class Tests_Post extends WP_UnitTestCase { array( 'post_author' => self::$editor_id, 'post_status' => 'publish', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', 'post_type' => 'page', ) ); @@ -1203,8 +1203,8 @@ class Tests_Post extends WP_UnitTestCase { $post = array( 'post_author' => self::$editor_id, 'post_status' => 'publish', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', 'post_date_gmt' => '2014-01-01 12:00:00', ); diff --git a/tests/phpunit/tests/post/attachments.php b/tests/phpunit/tests/post/attachments.php index 86b24cfd32..2922c185d2 100644 --- a/tests/phpunit/tests/post/attachments.php +++ b/tests/phpunit/tests/post/attachments.php @@ -272,8 +272,8 @@ class Tests_Post_Attachments extends WP_UnitTestCase { $post_id = wp_insert_post( array( - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', ) ); diff --git a/tests/phpunit/tests/post/meta.php b/tests/phpunit/tests/post/meta.php index 37c07d84e8..ad391e741f 100644 --- a/tests/phpunit/tests/post/meta.php +++ b/tests/phpunit/tests/post/meta.php @@ -23,8 +23,8 @@ class Tests_Post_Meta extends WP_UnitTestCase { array( 'post_author' => self::$author->ID, 'post_status' => 'publish', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', ) ); @@ -32,8 +32,8 @@ class Tests_Post_Meta extends WP_UnitTestCase { array( 'post_author' => self::$author->ID, 'post_status' => 'publish', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', ) ); } diff --git a/tests/phpunit/tests/post/nav-menu.php b/tests/phpunit/tests/post/nav-menu.php index 52d7a93c34..c95c6709c4 100644 --- a/tests/phpunit/tests/post/nav-menu.php +++ b/tests/phpunit/tests/post/nav-menu.php @@ -12,7 +12,7 @@ class Tests_Post_Nav_Menu extends WP_UnitTestCase { public function set_up() { parent::set_up(); - $this->menu_id = wp_create_nav_menu( rand_str() ); + $this->menu_id = wp_create_nav_menu( 'foo' ); } /** @@ -247,7 +247,7 @@ class Tests_Post_Nav_Menu extends WP_UnitTestCase { // And this is what we got when calling wp_get_nav_menus(). $nav_menus_names = wp_list_pluck( wp_get_nav_menus(), 'name' ); - $this->assertSame( $nav_menus_names, $expected_nav_menus_names ); + $this->assertSame( $expected_nav_menus_names, $nav_menus_names ); } /** @@ -255,8 +255,8 @@ class Tests_Post_Nav_Menu extends WP_UnitTestCase { */ public function test_wp_setup_nav_menu_item_for_post_type_archive() { - $post_type_slug = rand_str( 12 ); - $post_type_description = rand_str(); + $post_type_slug = 'fooo-bar-baz'; + $post_type_description = 'foo'; register_post_type( $post_type_slug, array( @@ -288,7 +288,7 @@ class Tests_Post_Nav_Menu extends WP_UnitTestCase { */ public function test_wp_setup_nav_menu_item_for_post_type_archive_no_description() { - $post_type_slug = rand_str( 12 ); + $post_type_slug = 'fooo-bar-baz'; $post_type_description = ''; register_post_type( $post_type_slug, @@ -319,8 +319,8 @@ class Tests_Post_Nav_Menu extends WP_UnitTestCase { */ public function test_wp_setup_nav_menu_item_for_post_type_archive_custom_description() { - $post_type_slug = rand_str( 12 ); - $post_type_description = rand_str(); + $post_type_slug = 'fooo-bar-baz'; + $post_type_description = 'foobaz'; register_post_type( $post_type_slug, array( @@ -331,7 +331,7 @@ class Tests_Post_Nav_Menu extends WP_UnitTestCase { ) ); - $menu_item_description = rand_str(); + $menu_item_description = 'foo_description'; $post_type_archive_item_id = wp_update_nav_menu_item( $this->menu_id, @@ -354,7 +354,7 @@ class Tests_Post_Nav_Menu extends WP_UnitTestCase { */ public function test_wp_setup_nav_menu_item_for_unknown_post_type_archive_no_description() { - $post_type_slug = rand_str( 12 ); + $post_type_slug = 'fooo-bar-baz'; $post_type_archive_item_id = wp_update_nav_menu_item( $this->menu_id, diff --git a/tests/phpunit/tests/post/query.php b/tests/phpunit/tests/post/query.php index 29267e429a..e7def81a0c 100644 --- a/tests/phpunit/tests/post/query.php +++ b/tests/phpunit/tests/post/query.php @@ -132,33 +132,33 @@ class Tests_Post_Query extends WP_UnitTestCase { $post_id1 = self::factory()->post->create( array( 'post_type' => 'page', - 'menu_order' => rand( 1, 100 ), + 'menu_order' => 1, ) ); $post_id2 = self::factory()->post->create( array( 'post_type' => 'page', - 'menu_order' => rand( 1, 100 ), + 'menu_order' => 2, ) ); $post_id3 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id2, - 'menu_order' => rand( 1, 100 ), + 'menu_order' => 3, ) ); $post_id4 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id2, - 'menu_order' => rand( 1, 100 ), + 'menu_order' => 4, ) ); $post_id5 = self::factory()->post->create( array( 'post_type' => 'page', - 'menu_order' => rand( 1, 100 ), + 'menu_order' => 5, ) ); @@ -219,7 +219,7 @@ class Tests_Post_Query extends WP_UnitTestCase { $post_id, array( 'post_mime_type' => 'image/jpeg', - 'menu_order' => rand( 1, 100 ), + 'menu_order' => 1, ) ); $att_ids[2] = self::factory()->attachment->create_object( @@ -227,7 +227,7 @@ class Tests_Post_Query extends WP_UnitTestCase { $post_id, array( 'post_mime_type' => 'image/jpeg', - 'menu_order' => rand( 1, 100 ), + 'menu_order' => 2, ) ); $att_ids[3] = self::factory()->attachment->create_object( @@ -235,7 +235,7 @@ class Tests_Post_Query extends WP_UnitTestCase { $post_id, array( 'post_mime_type' => 'image/jpeg', - 'menu_order' => rand( 1, 100 ), + 'menu_order' => 3, ) ); $att_ids[4] = self::factory()->attachment->create_object( @@ -243,7 +243,7 @@ class Tests_Post_Query extends WP_UnitTestCase { $post_id, array( 'post_mime_type' => 'image/jpeg', - 'menu_order' => rand( 1, 100 ), + 'menu_order' => 4, ) ); $att_ids[5] = self::factory()->attachment->create_object( @@ -251,7 +251,7 @@ class Tests_Post_Query extends WP_UnitTestCase { $post_id, array( 'post_mime_type' => 'image/jpeg', - 'menu_order' => rand( 1, 100 ), + 'menu_order' => 5, ) ); diff --git a/tests/phpunit/tests/post/revisions.php b/tests/phpunit/tests/post/revisions.php index 35e43f18ae..322114e474 100644 --- a/tests/phpunit/tests/post/revisions.php +++ b/tests/phpunit/tests/post/revisions.php @@ -17,7 +17,7 @@ class Tests_Post_Revisions extends WP_UnitTestCase { public function set_up() { parent::set_up(); - $this->post_type = rand_str( 20 ); + $this->post_type = 'test-revision'; } /** @@ -446,7 +446,7 @@ class Tests_Post_Revisions extends WP_UnitTestCase { array( 'post_status' => 'publish', 'ID' => $post_id, - 'post_content' => rand_str(), + 'post_content' => 'content', ) ); @@ -654,4 +654,163 @@ class Tests_Post_Revisions extends WP_UnitTestCase { $this->assertWPError( $revision ); } + + /** + * Tests that wp_get_post_revisions_url() returns the revisions URL. + * + * @ticket 39062 + * + * @dataProvider data_wp_get_post_revisions_url + * + * @covers ::wp_get_post_revisions_url + * + * @param int $revisions The number of revisions to create. + */ + public function test_wp_get_post_revisions_url( $revisions ) { + wp_set_current_user( self::$admin_user_id ); + + $post_id = self::factory()->post->create( array( 'post_title' => 'Some Post' ) ); + $latest_revision_id = null; + + if ( 0 !== $revisions ) { + $latest_revision_id = $post_id; + + for ( $i = 0; $i < $revisions; ++$i ) { + wp_update_post( + array( + 'ID' => $post_id, + 'post_title' => 'Some Post ' . $i, + ) + ); + + $latest_revision_id++; + } + } + + $expected = admin_url( 'revision.php?revision=' . $latest_revision_id ); + + $this->assertSame( + $expected, + wp_get_post_revisions_url( $post_id ), + 'Failed when passed the Post ID' + ); + + $this->assertSame( + $expected, + wp_get_post_revisions_url( $latest_revision_id ), + 'Failed when passed the latest revision ID' + ); + } + + /** + * Tests that wp_get_post_revisions_url() returns the revisions URL + * when passed a WP_Post object. + * + * @ticket 39062 + * + * @dataProvider data_wp_get_post_revisions_url + * + * @covers ::wp_get_post_revisions_url + * + * @param int $revisions The number of revisions to create. + */ + public function test_wp_get_post_revisions_url_with_post_object( $revisions ) { + wp_set_current_user( self::$admin_user_id ); + + $post = self::factory()->post->create_and_get( array( 'post_title' => 'Some Post' ) ); + $latest_revision_id = null; + + if ( 0 !== $revisions ) { + $latest_revision_id = $post->ID; + + for ( $i = 0; $i < $revisions; ++$i ) { + wp_update_post( + array( + 'ID' => $post->ID, + 'post_title' => 'Some Post ' . $i, + ) + ); + + $latest_revision_id++; + } + } + + $expected = admin_url( 'revision.php?revision=' . $latest_revision_id ); + + $this->assertSame( + $expected, + wp_get_post_revisions_url( $post ), + 'Failed when passed the Post Object' + ); + + $this->assertSame( + $expected, + wp_get_post_revisions_url( $latest_revision_id ), + 'Failed when passed the latest revision ID' + ); + } + + /** + * Data provider. + * + * @return array + */ + public function data_wp_get_post_revisions_url() { + return array( + 'one revision' => array( 'revisions' => 1 ), + 'multiple revisions' => array( 'revisions' => 2 ), + ); + } + + /** + * Tests that wp_get_post_revisions_url() returns NULL when a post does not exist. + * + * @ticket 39062 + * + * @covers ::wp_get_post_revisions_url + */ + public function test_wp_get_post_revisions_url_returns_null_when_post_does_not_exist() { + wp_set_current_user( self::$admin_user_id ); + $post_id = 99999; + $this->assertNull( wp_get_post_revisions_url( $post_id ) ); + } + + /** + * Tests that wp_get_post_revisions_url() returns NULL when there are no revisions. + * + * @ticket 39062 + * + * @covers ::wp_get_post_revisions_url + */ + public function test_wp_get_post_revisions_url_returns_null_with_no_revisions() { + wp_set_current_user( self::$admin_user_id ); + $post_id = self::factory()->post->create( array( 'post_title' => 'Some Post' ) ); + $this->assertNull( wp_get_post_revisions_url( $post_id ) ); + } + + /** + * Tests that wp_get_post_revisions_url() returns NULL when revisions are disabled. + * + * @ticket 39062 + * + * @covers ::wp_get_post_revisions_url + */ + public function test_wp_get_post_revisions_url_returns_null_with_revisions_disabled() { + wp_set_current_user( self::$admin_user_id ); + + remove_post_type_support( 'post', 'revisions' ); + + $post_id = self::factory()->post->create( array( 'post_title' => 'Some Post' ) ); + + wp_update_post( + array( + 'ID' => $post_id, + 'post_title' => 'Some Post 2', + ) + ); + + $this->assertNull( wp_get_post_revisions_url( $post_id ) ); + + add_post_type_support( 'post', 'revisions' ); + } } diff --git a/tests/phpunit/tests/post/types.php b/tests/phpunit/tests/post/types.php index 449467cf1d..7bba3b639b 100644 --- a/tests/phpunit/tests/post/types.php +++ b/tests/phpunit/tests/post/types.php @@ -21,7 +21,7 @@ class Tests_Post_Types extends WP_UnitTestCase { public function set_up() { parent::set_up(); - $this->post_type = rand_str( 20 ); + $this->post_type = 'foo1'; } public function test_register_post_type() { diff --git a/tests/phpunit/tests/post/wpGetPostParentId.php b/tests/phpunit/tests/post/wpGetPostParentId.php index bd25232830..c2160498bc 100644 --- a/tests/phpunit/tests/post/wpGetPostParentId.php +++ b/tests/phpunit/tests/post/wpGetPostParentId.php @@ -33,6 +33,15 @@ class Tests_Post_wpGetPostParentId extends WP_UnitTestCase { $this->assertSame( self::$parent_post_id, wp_get_post_parent_id( self::$post_id ) ); } + /** + * @ticket 48358 + * @covers ::wp_get_post_parent_id + */ + public function test_wp_get_post_parent_id_with_no_post_argument_default_to_global_post_id() { + $GLOBALS['post'] = get_post( self::$post_id ); + $this->assertSame( self::$parent_post_id, wp_get_post_parent_id() ); + } + public function test_wp_get_post_parent_id_with_non_existing_id_default_to_global_post_id() { $GLOBALS['post'] = get_post( self::$post_id ); $this->assertSame( self::$parent_post_id, wp_get_post_parent_id( 0 ) ); diff --git a/tests/phpunit/tests/query/commentCount.php b/tests/phpunit/tests/query/commentCount.php index 5c8bd2df26..5a759a3f06 100644 --- a/tests/phpunit/tests/query/commentCount.php +++ b/tests/phpunit/tests/query/commentCount.php @@ -21,7 +21,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) { $post_id = $factory->post->create( array( - 'post_content' => 1 . rand_str() . ' about', + 'post_content' => '1 about', 'post_type' => self::$post_type, ) ); @@ -30,7 +30,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $post_id = $factory->post->create( array( - 'post_content' => 1 . rand_str() . ' about', + 'post_content' => '2 about', 'post_type' => self::$post_type, ) ); @@ -41,7 +41,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $post_id = $factory->post->create( array( - 'post_content' => 1 . rand_str() . ' about', + 'post_content' => '3 about', 'post_type' => self::$post_type, ) ); @@ -52,7 +52,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $post_id = $factory->post->create( array( - 'post_content' => 1 . rand_str() . ' about', + 'post_content' => '4 about', 'post_type' => self::$post_type, ) ); @@ -81,7 +81,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $expected = self::$post_ids[4]; - $this->assertSameSets( $found_post_ids, $expected ); + $this->assertSameSets( $expected, $found_post_ids ); } public function test_operator_greater_than() { @@ -99,7 +99,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $expected = self::$post_ids[5]; - $this->assertSameSets( $found_post_ids, $expected ); + $this->assertSameSets( $expected, $found_post_ids ); } public function test_operator_greater_than_no_results() { @@ -117,7 +117,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $expected = array(); - $this->assertSameSets( $found_post_ids, $expected ); + $this->assertSameSets( $expected, $found_post_ids ); } public function test_operator_less_than() { $args = array( @@ -143,7 +143,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $expected[] = $expected_id; } - $this->assertSameSets( $found_post_ids, $expected ); + $this->assertSameSets( $expected, $found_post_ids ); } public function test_operator_less_than_no_results() { @@ -161,7 +161,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $expected = array(); - $this->assertSameSets( $found_post_ids, $expected ); + $this->assertSameSets( $expected, $found_post_ids ); } @@ -189,7 +189,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $expected[] = $expected_id; } - $this->assertSameSets( $found_post_ids, $expected ); + $this->assertSameSets( $expected, $found_post_ids ); } public function test_operator_equal_or_greater_than() { @@ -213,7 +213,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $expected[] = $expected_id; } - $this->assertSameSets( $found_post_ids, $expected ); + $this->assertSameSets( $expected, $found_post_ids ); } public function test_operator_equal_or_greater_than_no_results() { @@ -231,7 +231,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $expected = array(); - $this->assertSameSets( $found_post_ids, $expected ); + $this->assertSameSets( $expected, $found_post_ids ); } public function test_operator_equal_or_less_than() { @@ -255,7 +255,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $expected[] = $expected_id; } - $this->assertSameSets( $found_post_ids, $expected ); + $this->assertSameSets( $expected, $found_post_ids ); } public function test_operator_equal_or_less_than_no_results() { @@ -273,7 +273,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $expected = array(); - $this->assertSameSets( $found_post_ids, $expected ); + $this->assertSameSets( $expected, $found_post_ids ); } public function test_invalid_operator_should_fall_back_on_equals() { @@ -294,7 +294,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $expected[] = $expected_id; } - $this->assertSameSets( $found_post_ids, $expected ); + $this->assertSameSets( $expected, $found_post_ids ); } public function test_wrong_count_no_results() { @@ -312,7 +312,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $expected = array(); - $this->assertSameSets( $found_post_ids, $expected ); + $this->assertSameSets( $expected, $found_post_ids ); } public function test_no_operator_no_results() { @@ -329,7 +329,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $expected = self::$post_ids[5]; - $this->assertSameSets( $found_post_ids, $expected ); + $this->assertSameSets( $expected, $found_post_ids ); } public function test_empty_non_numeric_string_should_be_ignored() { @@ -353,7 +353,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $expected[] = $expected_id; } - $this->assertSameSets( $found_post_ids, $expected ); + $this->assertSameSets( $expected, $found_post_ids ); } public function test_simple_count() { @@ -368,7 +368,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase { $expected = self::$post_ids[5]; - $this->assertSameSets( $found_post_ids, $expected ); + $this->assertSameSets( $expected, $found_post_ids ); } } diff --git a/tests/phpunit/tests/query/invalidQueries.php b/tests/phpunit/tests/query/invalidQueries.php index ea18617b28..4c0b631f80 100644 --- a/tests/phpunit/tests/query/invalidQueries.php +++ b/tests/phpunit/tests/query/invalidQueries.php @@ -91,11 +91,10 @@ class Tests_Query_InvalidQueries extends WP_UnitTestCase { global $wpdb; $query = new WP_Query( array( 'post_type' => 'unregistered_cpt' ) ); - $posts = $query->get_posts(); $this->assertStringContainsString( "{$wpdb->posts}.post_type = 'unregistered_cpt'", self::$last_posts_request ); $this->assertStringContainsString( "{$wpdb->posts}.post_status = 'publish'", self::$last_posts_request ); - $this->assertCount( 0, $posts ); + $this->assertCount( 0, $query->posts ); } /** @@ -111,10 +110,9 @@ class Tests_Query_InvalidQueries extends WP_UnitTestCase { 'post_type' => array( 'unregistered_cpt', 'page' ), ) ); - $posts = $query->get_posts(); $this->assertStringContainsString( "{$wpdb->posts}.post_type = 'unregistered_cpt'", self::$last_posts_request ); - $this->assertCount( 1, $posts, 'the valid `page` post type should still return one post' ); + $this->assertCount( 1, $query->posts, 'the valid `page` post type should still return one post' ); } /** @@ -143,10 +141,9 @@ class Tests_Query_InvalidQueries extends WP_UnitTestCase { 'post_type' => 'page', ) ); - $posts = $query->get_posts(); // Only the published page should be returned. - $this->assertCount( 1, $posts ); + $this->assertCount( 1, $query->posts ); } /** @@ -158,9 +155,8 @@ class Tests_Query_InvalidQueries extends WP_UnitTestCase { 'static' => 'a', ) ); - $posts = $query->get_posts(); // Only the published post should be returned. - $this->assertCount( 1, $posts ); + $this->assertCount( 1, $query->posts ); } } diff --git a/tests/phpunit/tests/query/search.php b/tests/phpunit/tests/query/search.php index 2beda65d2f..418acbfc85 100644 --- a/tests/phpunit/tests/query/search.php +++ b/tests/phpunit/tests/query/search.php @@ -10,7 +10,7 @@ class Tests_Query_Search extends WP_UnitTestCase { public function set_up() { parent::set_up(); - $this->post_type = rand_str( 12 ); + $this->post_type = 'foo1'; register_post_type( $this->post_type ); $this->q = new WP_Query(); @@ -36,7 +36,7 @@ class Tests_Query_Search extends WP_UnitTestCase { foreach ( range( 1, 7 ) as $i ) { self::factory()->post->create( array( - 'post_content' => $i . rand_str() . ' about', + 'post_content' => "{$i} about", 'post_type' => $this->post_type, ) ); diff --git a/tests/phpunit/tests/query/taxQuery.php b/tests/phpunit/tests/query/taxQuery.php index 2ca00b605b..c44f19880f 100644 --- a/tests/phpunit/tests/query/taxQuery.php +++ b/tests/phpunit/tests/query/taxQuery.php @@ -1024,8 +1024,7 @@ class Tests_Query_TaxQuery extends WP_UnitTestCase { ) ); - $posts = $query->get_posts(); - $this->assertCount( 0, $posts ); + $this->assertCount( 0, $query->posts ); } /** @@ -1059,8 +1058,7 @@ class Tests_Query_TaxQuery extends WP_UnitTestCase { ) ); - $posts = $query->get_posts(); - $this->assertCount( 0, $posts ); + $this->assertCount( 0, $query->posts ); } public function test_tax_query_include_children() { @@ -1209,8 +1207,8 @@ class Tests_Query_TaxQuery extends WP_UnitTestCase { register_taxonomy_for_object_type( 'post_tag', 'attachment:image' ); $tag_id = self::factory()->term->create( array( - 'slug' => rand_str(), - 'name' => rand_str(), + 'slug' => 'foo-bar', + 'name' => 'Foo Bar', ) ); $image_id = self::factory()->attachment->create_object( diff --git a/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php b/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php index cbfe965fa1..993dd2d7c0 100644 --- a/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php +++ b/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php @@ -946,6 +946,86 @@ class WP_Test_REST_Application_Passwords_Controller extends WP_Test_REST_Control $this->assertErrorResponse( 'rest_application_password_not_found', $response, 500 ); } + /** + * @ticket 53658 + * + * @covers ::wp_is_application_passwords_supported + */ + public function test_wp_is_application_passwords_supported_with_https_only() { + $_SERVER['HTTPS'] = 'on'; + $this->assertTrue( wp_is_application_passwords_supported() ); + } + + /** + * @ticket 53658 + * + * @covers ::wp_is_application_passwords_supported + */ + public function test_wp_is_application_passwords_supported_with_local_environment_only() { + putenv( 'WP_ENVIRONMENT_TYPE=local' ); + + $actual = wp_is_application_passwords_supported(); + + // Revert to default behaviour so that other tests are not affected. + putenv( 'WP_ENVIRONMENT_TYPE' ); + + $this->assertTrue( $actual ); + } + + /** + * @dataProvider data_wp_is_application_passwords_available + * + * @ticket 53658 + * + * @covers ::wp_is_application_passwords_available + * + * @param bool|string $expected The expected value. + * @param string|null $callback Optional. The callback for the `wp_is_application_passwords_available` hook. + * Default: null. + */ + public function test_wp_is_application_passwords_available( $expected, $callback = null ) { + remove_filter( 'wp_is_application_passwords_available', '__return_true' ); + + if ( $callback ) { + add_filter( 'wp_is_application_passwords_available', $callback ); + } + + if ( 'default' === $expected ) { + putenv( 'WP_ENVIRONMENT_TYPE=local' ); + $expected = wp_is_application_passwords_supported(); + } + + $actual = wp_is_application_passwords_available(); + + if ( 'default' === $expected ) { + // Revert to default behaviour so that other tests are not affected. + putenv( 'WP_ENVIRONMENT_TYPE' ); + } + + $this->assertSame( $expected, $actual ); + } + + /** + * Data provider. + * + * @return array + */ + public function data_wp_is_application_passwords_available() { + return array( + 'availability not forced' => array( + 'expected' => 'default', + ), + 'availability forced true' => array( + 'expected' => true, + 'callback' => '__return_true', + ), + 'availability forced false' => array( + 'expected' => false, + 'callback' => '__return_false', + ), + ); + } + /** * Sets up a REST API request to be authenticated using an App Password. * diff --git a/tests/phpunit/tests/rest-api/rest-attachments-controller.php b/tests/phpunit/tests/rest-api/rest-attachments-controller.php index 14c1f08075..47ea5820f3 100644 --- a/tests/phpunit/tests/rest-api/rest-attachments-controller.php +++ b/tests/phpunit/tests/rest-api/rest-attachments-controller.php @@ -160,6 +160,7 @@ class WP_Test_REST_Attachments_Controller extends WP_Test_REST_Post_Type_Control $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/media' ); $response = rest_get_server()->dispatch( $request ); $data = $response->get_data(); + $this->assertArrayNotHasKey( 'allow_batch', $data['endpoints'][0] ); $this->assertSame( 'view', $data['endpoints'][0]['args']['context']['default'] ); $this->assertSame( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] ); // Single. @@ -174,6 +175,7 @@ class WP_Test_REST_Attachments_Controller extends WP_Test_REST_Post_Type_Control $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/media/' . $attachment_id ); $response = rest_get_server()->dispatch( $request ); $data = $response->get_data(); + $this->assertArrayNotHasKey( 'allow_batch', $data['endpoints'][0] ); $this->assertSame( 'view', $data['endpoints'][0]['args']['context']['default'] ); $this->assertSame( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] ); } @@ -520,8 +522,8 @@ class WP_Test_REST_Attachments_Controller extends WP_Test_REST_Post_Type_Control public function test_get_items_invalid_date() { $request = new WP_REST_Request( 'GET', '/wp/v2/media' ); - $request->set_param( 'after', rand_str() ); - $request->set_param( 'before', rand_str() ); + $request->set_param( 'after', 'foo' ); + $request->set_param( 'before', 'bar' ); $response = rest_get_server()->dispatch( $request ); $this->assertErrorResponse( 'rest_invalid_param', $response, 400 ); } @@ -568,8 +570,8 @@ class WP_Test_REST_Attachments_Controller extends WP_Test_REST_Post_Type_Control */ public function test_get_items_invalid_modified_date() { $request = new WP_REST_Request( 'GET', '/wp/v2/media' ); - $request->set_param( 'modified_after', rand_str() ); - $request->set_param( 'modified_before', rand_str() ); + $request->set_param( 'modified_after', 'foo' ); + $request->set_param( 'modified_before', 'bar' ); $response = rest_get_server()->dispatch( $request ); $this->assertErrorResponse( 'rest_invalid_param', $response, 400 ); } diff --git a/tests/phpunit/tests/rest-api/rest-block-directory-controller.php b/tests/phpunit/tests/rest-api/rest-block-directory-controller.php index ef70ecb319..f772c1e026 100644 --- a/tests/phpunit/tests/rest-api/rest-block-directory-controller.php +++ b/tests/phpunit/tests/rest-api/rest-block-directory-controller.php @@ -69,6 +69,11 @@ class WP_REST_Block_Directory_Controller_Test extends WP_Test_REST_Controller_Te */ public function test_get_items() { wp_set_current_user( self::$admin_id ); + $this->mock_remote_request( + array( + 'body' => '{"info":{"page":1,"pages":0,"results":0},"plugins":[]}', + ) + ); $request = new WP_REST_Request( 'GET', '/wp/v2/block-directory/search' ); $request->set_query_params( array( 'term' => 'foo' ) ); @@ -109,6 +114,11 @@ class WP_REST_Block_Directory_Controller_Test extends WP_Test_REST_Controller_Te */ public function test_get_items_no_results() { wp_set_current_user( self::$admin_id ); + $this->mock_remote_request( + array( + 'body' => '{"info":{"page":1,"pages":0,"results":0},"plugins":[]}', + ) + ); $request = new WP_REST_Request( 'GET', '/wp/v2/block-directory/search' ); $request->set_query_params( array( 'term' => '0c4549ee68f24eaaed46a49dc983ecde' ) ); @@ -287,4 +297,31 @@ class WP_REST_Block_Directory_Controller_Test extends WP_Test_REST_Controller_Te 'author_block_rating' => 0, ); } + + /** + * Mocks the remote request via `'pre_http_request'` filter by + * returning the expected response. + * + * @since 5.9.0 + * + * @param array $expected Expected response, which is merged with the default response. + */ + private function mock_remote_request( array $expected ) { + add_filter( + 'pre_http_request', + static function() use ( $expected ) { + $default = array( + 'headers' => array(), + 'response' => array( + 'code' => 200, + 'message' => 'OK', + ), + 'body' => '', + 'cookies' => array(), + 'filename' => null, + ); + return array_merge( $default, $expected ); + } + ); + } } diff --git a/tests/phpunit/tests/rest-api/rest-categories-controller.php b/tests/phpunit/tests/rest-api/rest-categories-controller.php index 3111371599..01bddd3738 100644 --- a/tests/phpunit/tests/rest-api/rest-categories-controller.php +++ b/tests/phpunit/tests/rest-api/rest-categories-controller.php @@ -117,6 +117,7 @@ class WP_Test_REST_Categories_Controller extends WP_Test_REST_Controller_Testcas $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/categories' ); $response = rest_get_server()->dispatch( $request ); $data = $response->get_data(); + $this->assertSame( array( 'v1' => true ), $data['endpoints'][0]['allow_batch'] ); $this->assertSame( 'view', $data['endpoints'][0]['args']['context']['default'] ); $this->assertSameSets( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] ); // Single. @@ -124,6 +125,7 @@ class WP_Test_REST_Categories_Controller extends WP_Test_REST_Controller_Testcas $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/categories/' . $category1 ); $response = rest_get_server()->dispatch( $request ); $data = $response->get_data(); + $this->assertSame( array( 'v1' => true ), $data['endpoints'][0]['allow_batch'] ); $this->assertSame( 'view', $data['endpoints'][0]['args']['context']['default'] ); $this->assertSameSets( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] ); } diff --git a/tests/phpunit/tests/rest-api/rest-comments-controller.php b/tests/phpunit/tests/rest-api/rest-comments-controller.php index 0c7ed625b7..99986a8037 100644 --- a/tests/phpunit/tests/rest-api/rest-comments-controller.php +++ b/tests/phpunit/tests/rest-api/rest-comments-controller.php @@ -888,8 +888,8 @@ class WP_Test_REST_Comments_Controller extends WP_Test_REST_Controller_Testcase public function test_get_comments_invalid_date() { $request = new WP_REST_Request( 'GET', '/wp/v2/comments' ); - $request->set_param( 'after', rand_str() ); - $request->set_param( 'before', rand_str() ); + $request->set_param( 'after', 'foo' ); + $request->set_param( 'before', 'bar' ); $response = rest_get_server()->dispatch( $request ); $this->assertErrorResponse( 'rest_invalid_param', $response, 400 ); } @@ -1477,7 +1477,7 @@ class WP_Test_REST_Comments_Controller extends WP_Test_REST_Controller_Testcase 'author_email' => 'lovejoy@example.com', 'author_url' => 'http://timothylovejoy.jr', 'content' => 'It\'s all over\, people! We don\'t have a prayer!', - 'date' => rand_str(), + 'date' => 'foo-bar', ); $request = new WP_REST_Request( 'POST', '/wp/v2/comments' ); @@ -2625,8 +2625,8 @@ class WP_Test_REST_Comments_Controller extends WP_Test_REST_Controller_Testcase wp_set_current_user( self::$admin_id ); $params = array( - 'content' => rand_str(), - 'date' => rand_str(), + 'content' => 'content', + 'date' => 'foo', ); $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) ); @@ -2641,8 +2641,8 @@ class WP_Test_REST_Comments_Controller extends WP_Test_REST_Controller_Testcase wp_set_current_user( self::$admin_id ); $params = array( - 'content' => rand_str(), - 'date_gmt' => rand_str(), + 'content' => 'content', + 'date_gmt' => 'foo', ); $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) ); @@ -2770,7 +2770,7 @@ class WP_Test_REST_Comments_Controller extends WP_Test_REST_Controller_Testcase // Change the comment parent. $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%s', $child_comment ) ); $request->set_param( 'parent', $comment_id_1 ); - $request->set_param( 'content', rand_str() ); + $request->set_param( 'content', 'foo bar' ); $response = rest_get_server()->dispatch( $request ); $this->assertSame( 200, $response->get_status() ); diff --git a/tests/phpunit/tests/rest-api/rest-global-styles-controller.php b/tests/phpunit/tests/rest-api/rest-global-styles-controller.php new file mode 100644 index 0000000000..60023e7c01 --- /dev/null +++ b/tests/phpunit/tests/rest-api/rest-global-styles-controller.php @@ -0,0 +1,458 @@ +user->create( + array( + 'role' => 'administrator', + ) + ); + + self::$subscriber_id = $factory->user->create( + array( + 'role' => 'subscriber', + ) + ); + + // This creates the global styles for the current theme. + self::$global_styles_id = $factory->post->create( + array( + 'post_content' => '{"version": ' . WP_Theme_JSON::LATEST_SCHEMA . ', "isGlobalStylesUserThemeJSON": true }', + 'post_status' => 'publish', + 'post_title' => 'Custom Styles', + 'post_type' => 'wp_global_styles', + 'post_name' => 'wp-global-styles-tt1-blocks', + 'tax_input' => array( + 'wp_theme' => 'tt1-blocks', + ), + ) + ); + + self::$post_id = $factory->post->create(); + } + + /** + * + */ + public static function wpTearDownAfterClass() { + self::delete_user( self::$admin_id ); + self::delete_user( self::$subscriber_id ); + } + + /** + * @covers WP_REST_Global_Styles_Controller::register_routes + * @ticket 54596 + */ + public function test_register_routes() { + $routes = rest_get_server()->get_routes(); + $this->assertArrayHasKey( + '/wp/v2/global-styles/(?P[\/\w-]+)', + $routes, + 'Single global style based on the given ID route does not exist' + ); + $this->assertCount( + 2, + $routes['/wp/v2/global-styles/(?P[\/\w-]+)'], + 'Single global style based on the given ID route does not have exactly two elements' + ); + $this->assertArrayHasKey( + '/wp/v2/global-styles/themes/(?P[^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)', + $routes, + 'Theme global styles route does not exist' + ); + $this->assertCount( + 1, + $routes['/wp/v2/global-styles/themes/(?P[^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)'], + 'Theme global styles route does not have exactly one element' + ); + } + + public function test_context_param() { + $this->markTestSkipped( 'Controller does not implement context_param().' ); + } + + public function test_get_items() { + $this->markTestSkipped( 'Controller does not implement get_items().' ); + } + + /** + * @covers WP_REST_Global_Styles_Controller::get_theme_item + * @ticket 54516 + */ + public function test_get_theme_item_no_user() { + wp_set_current_user( 0 ); + $request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/themes/tt1-blocks' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_cannot_manage_global_styles', $response, 401 ); + } + + /** + * @covers WP_REST_Global_Styles_Controller::get_theme_item + * @ticket 54516 + */ + public function test_get_theme_item_permission_check() { + wp_set_current_user( self::$subscriber_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/themes/tt1-blocks' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_cannot_manage_global_styles', $response, 403 ); + } + + /** + * @covers WP_REST_Global_Styles_Controller::get_theme_item + * @ticket 54516 + */ + public function test_get_theme_item_invalid() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/themes/invalid' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_theme_not_found', $response, 404 ); + } + + /** + * @dataProvider data_get_theme_item_invalid_theme_dirname + * @covers WP_REST_Global_Styles_Controller::get_theme_item + * @ticket 54596 + * + * @param string $theme_dirname Theme directory to test. + * @param string $expected Expected error code. + */ + public function test_get_theme_item_invalid_theme_dirname( $theme_dirname, $expected ) { + wp_set_current_user( self::$admin_id ); + switch_theme( $theme_dirname ); + + $request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/themes/' . $theme_dirname ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( $expected, $response, 404 ); + } + + /** + * Data provider. + * + * @return array + */ + public function data_get_theme_item_invalid_theme_dirname() { + return array( + '+' => array( + 'theme_dirname' => 'my+theme+', + 'expected' => 'rest_theme_not_found', + ), + ':' => array( + 'theme_dirname' => 'my:theme:', + 'expected' => 'rest_no_route', + ), + '<>' => array( + 'theme_dirname' => 'my', + 'expected' => 'rest_no_route', + ), + '*' => array( + 'theme_dirname' => 'my*theme*', + 'expected' => 'rest_no_route', + ), + '?' => array( + 'theme_dirname' => 'my?theme?', + 'expected' => 'rest_no_route', + ), + '"' => array( + 'theme_dirname' => 'my"theme?"', + 'expected' => 'rest_no_route', + ), + '| (invalid on Windows)' => array( + 'theme_dirname' => 'my|theme|', + 'expected' => 'rest_no_route', + ), + // Themes deep in subdirectories. + '2 subdirectories deep' => array( + 'theme_dirname' => 'subdir/subsubdir/mytheme', + 'expected' => 'rest_global_styles_not_found', + ), + ); + } + + /** + * @dataProvider data_get_theme_item + * @covers WP_REST_Global_Styles_Controller::get_theme_item + * @ticket 54596 + * + * @param string $theme Theme directory to test. + */ + public function test_get_theme_item( $theme ) { + wp_set_current_user( self::$admin_id ); + switch_theme( $theme ); + + $request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/themes/' . $theme ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $links = $response->get_links(); + $this->assertArrayHasKey( 'settings', $data, 'Data does not have "settings" key' ); + $this->assertArrayHasKey( 'styles', $data, 'Data does not have "styles" key' ); + $this->assertArrayHasKey( 'self', $links, 'Links do not have a "self" key' ); + $this->assertStringContainsString( '/wp/v2/global-styles/themes/' . $theme, $links['self'][0]['href'] ); + } + + /** + * Data provider. + * + * @return array + */ + public function data_get_theme_item() { + return array( + 'alphabetic' => array( 'mytheme' ), + 'alphanumeric' => array( 'mythemev1' ), + 'àáâãäåæç' => array( 'àáâãäåæç' ), + 'space' => array( 'my theme' ), + '-_.' => array( 'my_theme-0.1' ), + '[]' => array( 'my[theme]' ), + '()' => array( 'my(theme)' ), + '{}' => array( 'my{theme}' ), + '&=#@!$,^~%' => array( 'theme &=#@!$,^~%' ), + 'all combined' => array( 'thémé {}&=@!$,^~%[0.1](-_-)' ), + + // Themes in a subdirectory. + 'subdir: alphabetic' => array( 'subdir/mytheme' ), + 'subdir: alphanumeric in theme' => array( 'subdir/mythemev1' ), + 'subdir: alphanumeric in subdir' => array( 'subdirv1/mytheme' ), + 'subdir: alphanumeric in both' => array( 'subdirv1/mythemev1' ), + 'subdir: àáâãäåæç in theme' => array( 'subdir/àáâãäåæç' ), + 'subdir: àáâãäåæç in subdir' => array( 'àáâãäåæç/mythemev1' ), + 'subdir: àáâãäåæç in both' => array( 'àáâãäåæç/àáâãäåæç' ), + 'subdir: space in theme' => array( 'subdir/my theme' ), + 'subdir: space in subdir' => array( 'sub dir/mytheme' ), + 'subdir: space in both' => array( 'sub dir/my theme' ), + 'subdir: -_. in theme' => array( 'subdir/my_theme-0.1' ), + 'subdir: -_. in subdir' => array( 'sub_dir-0.1/mytheme' ), + 'subdir: -_. in both' => array( 'sub_dir-0.1/my_theme-0.1' ), + 'subdir: all combined in theme' => array( 'subdir/thémé {}&=@!$,^~%[0.1](-_-)' ), + 'subdir: all combined in subdir' => array( 'sűbdīr {}&=@!$,^~%[0.1](-_-)/mytheme' ), + 'subdir: all combined in both' => array( 'sűbdīr {}&=@!$,^~%[0.1](-_-)/thémé {}&=@!$,^~%[0.1](-_-)' ), + ); + } + + /** + * @covers WP_REST_Global_Styles_Controller::get_theme_item + * @ticket 54595 + */ + public function test_get_theme_item_fields() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/themes/tt1-blocks' ); + $request->set_param( '_fields', 'settings' ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $this->assertArrayHasKey( 'settings', $data ); + $this->assertArrayNotHasKey( 'styles', $data ); + } + + /** + * @covers WP_REST_Global_Styles_Controller::get_item + * @ticket 54516 + */ + public function test_get_item_no_user() { + wp_set_current_user( 0 ); + $request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_cannot_view', $response, 401 ); + } + + /** + * @covers WP_REST_Global_Styles_Controller::get_item + * @ticket 54516 + */ + public function test_get_item_invalid_post() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$post_id ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_global_styles_not_found', $response, 404 ); + } + + /** + * @covers WP_REST_Global_Styles_Controller::get_item + * @ticket 54516 + */ + public function test_get_item_permission_check() { + wp_set_current_user( self::$subscriber_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_cannot_view', $response, 403 ); + } + + /** + * @covers WP_REST_Global_Styles_Controller::get_item + * @ticket 54516 + */ + public function test_get_item_no_user_edit() { + wp_set_current_user( 0 ); + $request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id ); + $request->set_param( 'context', 'edit' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_forbidden_context', $response, 401 ); + } + + /** + * @covers WP_REST_Global_Styles_Controller::get_item + * @ticket 54516 + */ + public function test_get_item_permission_check_edit() { + wp_set_current_user( self::$subscriber_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id ); + $request->set_param( 'context', 'edit' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_forbidden_context', $response, 403 ); + } + + /** + * @covers WP_REST_Global_Styles_Controller::get_item + */ + public function test_get_item() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $links = $response->get_links(); + + $this->assertEquals( + array( + 'id' => self::$global_styles_id, + 'title' => array( + 'raw' => 'Custom Styles', + 'rendered' => 'Custom Styles', + ), + 'settings' => new stdClass(), + 'styles' => new stdClass(), + ), + $data + ); + + $this->assertArrayHasKey( 'self', $links ); + $this->assertStringContainsString( '/wp/v2/global-styles/' . self::$global_styles_id, $links['self'][0]['href'] ); + } + + public function test_create_item() { + $this->markTestSkipped( 'Controller does not implement create_item().' ); + } + + /** + * @covers WP_REST_Global_Styles_Controller::update_item + * @ticket 54516 + */ + public function test_update_item() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' . self::$global_styles_id ); + $request->set_body_params( + array( + 'title' => 'My new global styles title', + ) + ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $this->assertEquals( 'My new global styles title', $data['title']['raw'] ); + } + + + /** + * @covers WP_REST_Global_Styles_Controller::update_item + * @ticket 54516 + */ + public function test_update_item_no_user() { + wp_set_current_user( 0 ); + $request = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' . self::$global_styles_id ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_cannot_edit', $response, 401 ); + } + + /** + * @covers WP_REST_Global_Styles_Controller::update_item + * @ticket 54516 + */ + public function test_update_item_invalid_post() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' . self::$post_id ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_global_styles_not_found', $response, 404 ); + } + + /** + * @covers WP_REST_Global_Styles_Controller::update_item + * @ticket 54516 + */ + public function test_update_item_permission_check() { + wp_set_current_user( self::$subscriber_id ); + $request = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' . self::$global_styles_id ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_cannot_edit', $response, 403 ); + } + + public function test_delete_item() { + $this->markTestSkipped( 'Controller does not implement delete_item().' ); + } + + public function test_prepare_item() { + $this->markTestSkipped( 'Controller does not implement prepare_item().' ); + } + + /** + * @covers WP_REST_Global_Styles_Controller::get_item_schema + * @ticket 54516 + */ + public function test_get_item_schema() { + $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/global-styles/' . self::$global_styles_id ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $properties = $data['schema']['properties']; + $this->assertCount( 4, $properties, 'Schema properties array does not have exactly 4 elements' ); + $this->assertArrayHasKey( 'id', $properties, 'Schema properties array does not have "id" key' ); + $this->assertArrayHasKey( 'styles', $properties, 'Schema properties array does not have "styles" key' ); + $this->assertArrayHasKey( 'settings', $properties, 'Schema properties array does not have "settings" key' ); + $this->assertArrayHasKey( 'title', $properties, 'Schema properties array does not have "title" key' ); + } +} diff --git a/tests/phpunit/tests/rest-api/rest-pages-controller.php b/tests/phpunit/tests/rest-api/rest-pages-controller.php index 00047cce80..da24a13d9b 100644 --- a/tests/phpunit/tests/rest-api/rest-pages-controller.php +++ b/tests/phpunit/tests/rest-api/rest-pages-controller.php @@ -64,7 +64,8 @@ class WP_Test_REST_Pages_Controller extends WP_Test_REST_Post_Type_Controller_Te $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/pages' ); $response = rest_get_server()->dispatch( $request ); $data = $response->get_data(); - $keys = array_keys( $data['endpoints'][0]['args'] ); + $this->assertSame( array( 'v1' => true ), $data['endpoints'][0]['allow_batch'] ); + $keys = array_keys( $data['endpoints'][0]['args'] ); sort( $keys ); $this->assertSame( array( @@ -329,8 +330,8 @@ class WP_Test_REST_Pages_Controller extends WP_Test_REST_Post_Type_Controller_Te public function test_get_items_invalid_date() { $request = new WP_REST_Request( 'GET', '/wp/v2/pages' ); - $request->set_param( 'after', rand_str() ); - $request->set_param( 'before', rand_str() ); + $request->set_param( 'after', 'foo' ); + $request->set_param( 'before', 'bar' ); $response = rest_get_server()->dispatch( $request ); $this->assertErrorResponse( 'rest_invalid_param', $response, 400 ); } @@ -368,8 +369,8 @@ class WP_Test_REST_Pages_Controller extends WP_Test_REST_Post_Type_Controller_Te */ public function test_get_items_invalid_modified_date() { $request = new WP_REST_Request( 'GET', '/wp/v2/pages' ); - $request->set_param( 'modified_after', rand_str() ); - $request->set_param( 'modified_before', rand_str() ); + $request->set_param( 'modified_after', 'foo' ); + $request->set_param( 'modified_before', 'bar' ); $response = rest_get_server()->dispatch( $request ); $this->assertErrorResponse( 'rest_invalid_param', $response, 400 ); } diff --git a/tests/phpunit/tests/rest-api/rest-plugins-controller.php b/tests/phpunit/tests/rest-api/rest-plugins-controller.php index e2a61d605b..3cea054301 100644 --- a/tests/phpunit/tests/rest-api/rest-plugins-controller.php +++ b/tests/phpunit/tests/rest-api/rest-plugins-controller.php @@ -546,8 +546,26 @@ class WP_REST_Plugins_Controller_Test extends WP_Test_REST_Controller_Testcase { */ public function test_create_item_unknown_plugin() { wp_set_current_user( self::$super_admin ); + add_filter( + 'pre_http_request', + static function() { + /* + * Mocks the request to: + * https://api.wordpress.org/plugins/info/1.2/?action=plugin_information&request%5Bslug%5D=alex-says-this-block-definitely-doesnt-exist&request%5Bfields%5D%5Bsections%5D=0&request%5Bfields%5D%5Blanguage_packs%5D=1&request%5Blocale%5D=en_US&request%5Bwp_version%5D=5.9 + */ + return array( + 'headers' => array(), + 'response' => array( + 'code' => 404, + 'message' => 'Not Found', + ), + 'body' => '{"error":"Plugin not found."}', + 'cookies' => array(), + 'filename' => null, + ); + } + ); - // This will hit the live API. $request = new WP_REST_Request( 'POST', self::BASE ); $request->set_body_params( array( 'slug' => 'alex-says-this-block-definitely-doesnt-exist' ) ); $response = rest_do_request( $request ); diff --git a/tests/phpunit/tests/rest-api/rest-posts-controller.php b/tests/phpunit/tests/rest-api/rest-posts-controller.php index b35921a73d..f02037962c 100644 --- a/tests/phpunit/tests/rest-api/rest-posts-controller.php +++ b/tests/phpunit/tests/rest-api/rest-posts-controller.php @@ -154,12 +154,14 @@ class WP_Test_REST_Posts_Controller extends WP_Test_REST_Post_Type_Controller_Te $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/posts' ); $response = rest_get_server()->dispatch( $request ); $data = $response->get_data(); + $this->assertSame( array( 'v1' => true ), $data['endpoints'][0]['allow_batch'] ); $this->assertSame( 'view', $data['endpoints'][0]['args']['context']['default'] ); $this->assertSame( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] ); // Single. $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/posts/' . self::$post_id ); $response = rest_get_server()->dispatch( $request ); $data = $response->get_data(); + $this->assertSame( array( 'v1' => true ), $data['endpoints'][0]['allow_batch'] ); $this->assertSame( 'view', $data['endpoints'][0]['args']['context']['default'] ); $this->assertSame( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] ); } @@ -1692,8 +1694,8 @@ class WP_Test_REST_Posts_Controller extends WP_Test_REST_Post_Type_Controller_Te public function test_get_items_invalid_date() { $request = new WP_REST_Request( 'GET', '/wp/v2/posts' ); - $request->set_param( 'after', rand_str() ); - $request->set_param( 'before', rand_str() ); + $request->set_param( 'after', 'foo' ); + $request->set_param( 'before', 'bar' ); $response = rest_get_server()->dispatch( $request ); $this->assertErrorResponse( 'rest_invalid_param', $response, 400 ); } @@ -1717,8 +1719,8 @@ class WP_Test_REST_Posts_Controller extends WP_Test_REST_Post_Type_Controller_Te */ public function test_get_items_invalid_modified_date() { $request = new WP_REST_Request( 'GET', '/wp/v2/posts' ); - $request->set_param( 'modified_after', rand_str() ); - $request->set_param( 'modified_before', rand_str() ); + $request->set_param( 'modified_after', 'foo' ); + $request->set_param( 'modified_before', 'bar' ); $response = rest_get_server()->dispatch( $request ); $this->assertErrorResponse( 'rest_invalid_param', $response, 400 ); } @@ -1846,7 +1848,7 @@ class WP_Test_REST_Posts_Controller extends WP_Test_REST_Post_Type_Controller_Te $this->assertSame( rest_url( '/wp/v2/users/' . self::$author_id ), $links['author'][0]['href'] ); } - public function test_get_post_draft_status_not_authenicated() { + public function test_get_post_draft_status_not_authenticated() { $draft_id = $this->factory->post->create( array( 'post_status' => 'draft', @@ -2695,7 +2697,7 @@ class WP_Test_REST_Posts_Controller extends WP_Test_REST_Post_Type_Controller_Te 0, array( 'post_mime_type' => 'image/jpeg', - 'menu_order' => rand( 1, 100 ), + 'menu_order' => 1, ) ); @@ -3308,7 +3310,7 @@ class WP_Test_REST_Posts_Controller extends WP_Test_REST_Post_Type_Controller_Te public function test_update_post_ignore_readonly() { wp_set_current_user( self::$editor_id ); - $new_content = rand_str(); + $new_content = 'foo bar baz'; $expected_modified = current_time( 'mysql' ); $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/posts/%d', self::$post_id ) ); @@ -3373,7 +3375,7 @@ class WP_Test_REST_Posts_Controller extends WP_Test_REST_Post_Type_Controller_Te $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/posts/%d', self::$post_id ) ); $params = $this->set_post_data( array( - 'date' => rand_str(), + 'date' => 'foo', ) ); $request->set_body_params( $params ); @@ -3388,7 +3390,7 @@ class WP_Test_REST_Posts_Controller extends WP_Test_REST_Post_Type_Controller_Te $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/posts/%d', self::$post_id ) ); $params = $this->set_post_data( array( - 'date_gmt' => rand_str(), + 'date_gmt' => 'foo', ) ); $request->set_body_params( $params ); diff --git a/tests/phpunit/tests/rest-api/rest-request.php b/tests/phpunit/tests/rest-api/rest-request.php index 836cb6159d..509c754f65 100644 --- a/tests/phpunit/tests/rest-api/rest-request.php +++ b/tests/phpunit/tests/rest-api/rest-request.php @@ -18,6 +18,16 @@ class Tests_REST_Request extends WP_UnitTestCase { $this->request = new WP_REST_Request(); } + /** + * Called before setting up all tests. + */ + public static function set_up_before_class() { + parent::set_up_before_class(); + + // Require files that need to load once. + require_once DIR_TESTROOT . '/includes/mock-invokable.php'; + } + public function test_header() { $value = 'application/x-wp-example'; @@ -1014,7 +1024,7 @@ class Tests_REST_Request extends WP_UnitTestCase { $request->set_query_params( array( 'test' => 'value' ) ); $error = new WP_Error( 'error_code', __( 'Error Message' ), array( 'status' => 400 ) ); - $callback = $this->createPartialMock( 'stdClass', array( '__invoke' ) ); + $callback = $this->createPartialMock( 'Mock_Invokable', array( '__invoke' ) ); $callback->expects( self::once() )->method( '__invoke' )->with( self::identicalTo( $request ) )->willReturn( $error ); $request->set_attributes( array( @@ -1038,7 +1048,7 @@ class Tests_REST_Request extends WP_UnitTestCase { $request->set_query_params( array( 'test' => 'value' ) ); $error = new WP_Error( 'error_code', __( 'Error Message' ), array( 'status' => 400 ) ); - $callback = $this->createPartialMock( 'stdClass', array( '__invoke' ) ); + $callback = $this->createPartialMock( 'Mock_Invokable', array( '__invoke' ) ); $callback->expects( self::once() )->method( '__invoke' )->with( self::identicalTo( $request ) )->willReturn( $error ); $request->set_attributes( array( @@ -1056,7 +1066,7 @@ class Tests_REST_Request extends WP_UnitTestCase { $request = new WP_REST_Request(); $request->set_query_params( array( 'test' => 'value' ) ); - $callback = $this->createPartialMock( 'stdClass', array( '__invoke' ) ); + $callback = $this->createPartialMock( 'Mock_Invokable', array( '__invoke' ) ); $callback->expects( self::never() )->method( '__invoke' ); $request->set_attributes( array( diff --git a/tests/phpunit/tests/rest-api/rest-schema-setup.php b/tests/phpunit/tests/rest-api/rest-schema-setup.php index 8b522ef06b..3bec8d45d4 100644 --- a/tests/phpunit/tests/rest-api/rest-schema-setup.php +++ b/tests/phpunit/tests/rest-api/rest-schema-setup.php @@ -69,6 +69,9 @@ class WP_Test_REST_Schema_Initialization extends WP_Test_REST_TestCase { } } + /** + * @ticket 54596 + */ public function test_expected_routes_in_schema() { $routes = rest_get_server()->get_routes(); @@ -89,6 +92,14 @@ class WP_Test_REST_Schema_Initialization extends WP_Test_REST_TestCase { '/wp/v2/posts/(?P[\\d]+)/revisions/(?P[\\d]+)', '/wp/v2/posts/(?P[\\d]+)/autosaves', '/wp/v2/posts/(?P[\\d]+)/autosaves/(?P[\\d]+)', + '/wp/v2/menu-items', + '/wp/v2/menu-items/(?P[\d]+)', + '/wp/v2/menu-items/(?P[\d]+)/autosaves', + '/wp/v2/menu-items/(?P[\d]+)/autosaves/(?P[\d]+)', + '/wp/v2/menu-locations', + '/wp/v2/menu-locations/(?P[\w-]+)', + '/wp/v2/menus', + '/wp/v2/menus/(?P[\d]+)', '/wp/v2/pages', '/wp/v2/pages/(?P[\\d]+)', '/wp/v2/pages/(?P[\\d]+)/revisions', @@ -124,20 +135,28 @@ class WP_Test_REST_Schema_Initialization extends WP_Test_REST_TestCase { '/wp/v2/users/(?P(?:[\\d]+|me))/application-passwords/(?P[\\w\\-]+)', '/wp/v2/comments', '/wp/v2/comments/(?P[\\d]+)', + '/wp/v2/global-styles/(?P[\/\w-]+)', + '/wp/v2/global-styles/themes/(?P[^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)', '/wp/v2/search', '/wp/v2/block-renderer/(?P[a-z0-9-]+/[a-z0-9-]+)', '/wp/v2/block-types', '/wp/v2/block-types/(?P[a-zA-Z0-9_-]+)', '/wp/v2/block-types/(?P[a-zA-Z0-9_-]+)/(?P[a-zA-Z0-9_-]+)', '/wp/v2/settings', + '/wp/v2/template-parts', + '/wp/v2/template-parts/(?P[\d]+)/autosaves', + '/wp/v2/template-parts/(?P([^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)[\/\w-]+)', + '/wp/v2/template-parts/(?P[\d]+)/autosaves/(?P[\d]+)', + '/wp/v2/template-parts/(?P[\d]+)/revisions', + '/wp/v2/template-parts/(?P[\d]+)/revisions/(?P[\d]+)', '/wp/v2/templates', - '/wp/v2/templates/(?P[\/\w-]+)', '/wp/v2/templates/(?P[\d]+)/autosaves', + '/wp/v2/templates/(?P([^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)[\/\w-]+)', '/wp/v2/templates/(?P[\d]+)/autosaves/(?P[\d]+)', '/wp/v2/templates/(?P[\d]+)/revisions', '/wp/v2/templates/(?P[\d]+)/revisions/(?P[\d]+)', '/wp/v2/themes', - '/wp/v2/themes/(?P[^.\/]+(?:\/[^.\/]+)?)', + '/wp/v2/themes/(?P[^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)', '/wp/v2/plugins', '/wp/v2/plugins/(?P[^.\/]+(?:\/[^.\/]+)?)', '/wp/v2/block-directory/search', @@ -146,8 +165,15 @@ class WP_Test_REST_Schema_Initialization extends WP_Test_REST_TestCase { '/wp/v2/widget-types', '/wp/v2/widget-types/(?P[a-zA-Z0-9_-]+)', '/wp/v2/widget-types/(?P[a-zA-Z0-9_-]+)/encode', + '/wp/v2/widget-types/(?P[a-zA-Z0-9_-]+)/render', '/wp/v2/widgets', '/wp/v2/widgets/(?P[\w\-]+)', + '/wp/v2/navigation', + '/wp/v2/navigation/(?P[\d]+)', + '/wp/v2/navigation/(?P[\d]+)/autosaves', + '/wp/v2/navigation/(?P[\d]+)/autosaves/(?P[\d]+)', + '/wp/v2/navigation/(?P[\d]+)/revisions', + '/wp/v2/navigation/(?P[\d]+)/revisions/(?P[\d]+)', '/wp-site-health/v1', '/wp-site-health/v1/tests/background-updates', '/wp-site-health/v1/tests/loopback-requests', diff --git a/tests/phpunit/tests/rest-api/rest-server.php b/tests/phpunit/tests/rest-api/rest-server.php index 30977958fa..6c453c051c 100644 --- a/tests/phpunit/tests/rest-api/rest-server.php +++ b/tests/phpunit/tests/rest-api/rest-server.php @@ -10,6 +10,13 @@ * @group restapi */ class Tests_REST_Server extends WP_Test_REST_TestCase { + protected static $icon_id; + + public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) { + $filename = DIR_TESTDATA . '/images/test-image-large.jpg'; + self::$icon_id = $factory->attachment->create_upload_object( $filename ); + } + public function set_up() { parent::set_up(); @@ -28,6 +35,16 @@ class Tests_REST_Server extends WP_Test_REST_TestCase { parent::tear_down(); } + /** + * Called before setting up all tests. + */ + public static function set_up_before_class() { + parent::set_up_before_class(); + + // Require files that need to load once. + require_once DIR_TESTROOT . '/includes/mock-invokable.php'; + } + public function test_envelope() { $data = array( 'amount of arbitrary data' => 'alot', @@ -370,6 +387,38 @@ class Tests_REST_Server extends WP_Test_REST_TestCase { $this->assertSame( $sent_headers['Allow'], 'POST' ); } + /** + * @ticket 53063 + */ + public function test_batched_options() { + register_rest_route( + 'test-ns', + '/test', + array( + array( + 'methods' => array( 'GET' ), + 'callback' => '__return_null', + 'permission_callback' => '__return_true', + ), + array( + 'methods' => array( 'POST' ), + 'callback' => '__return_null', + 'permission_callback' => '__return_null', + 'allow_batch' => false, + ), + 'allow_batch' => array( 'v1' => true ), + ) + ); + + $request = new WP_REST_Request( 'OPTIONS', '/test-ns/test' ); + $response = rest_get_server()->dispatch( $request ); + + $data = $response->get_data(); + + $this->assertSame( array( 'v1' => true ), $data['endpoints'][0]['allow_batch'] ); + $this->assertArrayNotHasKey( 'allow_batch', $data['endpoints'][1] ); + } + public function test_allow_header_sent_on_options_request() { register_rest_route( 'test-ns', @@ -975,6 +1024,38 @@ class Tests_REST_Server extends WP_Test_REST_TestCase { $this->assertArrayHasKey( 'help', $index->get_links() ); $this->assertArrayNotHasKey( 'wp:active-theme', $index->get_links() ); + + // Check site logo and icon. + $this->assertArrayHasKey( 'site_logo', $data ); + $this->assertArrayHasKey( 'site_icon', $data ); + } + + /** + * @ticket 50152 + */ + public function test_index_includes_link_to_active_theme_if_authenticated() { + $server = new WP_REST_Server(); + wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) ); + + $request = new WP_REST_Request( 'GET', '/' ); + $index = $server->dispatch( $request ); + + $this->assertArrayHasKey( 'https://api.w.org/active-theme', $index->get_links() ); + } + + /** + * @ticket 52321 + */ + public function test_index_includes_site_icon() { + $server = new WP_REST_Server(); + update_option( 'site_icon', self::$icon_id ); + + $request = new WP_REST_Request( 'GET', '/' ); + $index = $server->dispatch( $request ); + $data = $index->get_data(); + + $this->assertArrayHasKey( 'site_icon', $data ); + $this->assertSame( self::$icon_id, $data['site_icon'] ); } public function test_get_namespace_index() { @@ -1573,9 +1654,9 @@ class Tests_REST_Server extends WP_Test_REST_TestCase { * @ticket 50244 */ public function test_callbacks_are_not_executed_if_request_validation_fails() { - $callback = $this->createPartialMock( 'stdClass', array( '__invoke' ) ); + $callback = $this->createPartialMock( 'Mock_Invokable', array( '__invoke' ) ); $callback->expects( self::never() )->method( '__invoke' ); - $permission_callback = $this->createPartialMock( 'stdClass', array( '__invoke' ) ); + $permission_callback = $this->createPartialMock( 'Mock_Invokable', array( '__invoke' ) ); $permission_callback->expects( self::never() )->method( '__invoke' ); register_rest_route( @@ -2012,16 +2093,6 @@ class Tests_REST_Server extends WP_Test_REST_TestCase { $this->assertSameSetsWithIndex( $expected, $args['param'] ); } - /** - * @ticket 50152 - */ - public function test_index_includes_link_to_active_theme_if_authenticated() { - wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) ); - - $index = rest_do_request( '/' ); - $this->assertArrayHasKey( 'https://api.w.org/active-theme', $index->get_links() ); - } - /** * @ticket 53056 */ diff --git a/tests/phpunit/tests/rest-api/rest-settings-controller.php b/tests/phpunit/tests/rest-api/rest-settings-controller.php index bb9a4bbdb6..fe99fccfa8 100644 --- a/tests/phpunit/tests/rest-api/rest-settings-controller.php +++ b/tests/phpunit/tests/rest-api/rest-settings-controller.php @@ -108,6 +108,7 @@ class WP_Test_REST_Settings_Controller extends WP_Test_REST_Controller_Testcase 'posts_per_page', 'default_ping_status', 'default_comment_status', + 'site_icon', // Registered in wp-includes/blocks/site-logo.php ); if ( ! is_multisite() ) { diff --git a/tests/phpunit/tests/rest-api/rest-tags-controller.php b/tests/phpunit/tests/rest-api/rest-tags-controller.php index 6ec4bbb689..b9ac20cf71 100644 --- a/tests/phpunit/tests/rest-api/rest-tags-controller.php +++ b/tests/phpunit/tests/rest-api/rest-tags-controller.php @@ -135,6 +135,7 @@ class WP_Test_REST_Tags_Controller extends WP_Test_REST_Controller_Testcase { $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/tags' ); $response = rest_get_server()->dispatch( $request ); $data = $response->get_data(); + $this->assertSame( array( 'v1' => true ), $data['endpoints'][0]['allow_batch'] ); $this->assertSame( 'view', $data['endpoints'][0]['args']['context']['default'] ); $this->assertSameSets( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] ); // Single. @@ -142,6 +143,7 @@ class WP_Test_REST_Tags_Controller extends WP_Test_REST_Controller_Testcase { $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/tags/' . $tag1 ); $response = rest_get_server()->dispatch( $request ); $data = $response->get_data(); + $this->assertSame( array( 'v1' => true ), $data['endpoints'][0]['allow_batch'] ); $this->assertSame( 'view', $data['endpoints'][0]['args']['context']['default'] ); $this->assertSameSets( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] ); } diff --git a/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php b/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php index 17be251c1d..38906f5513 100644 --- a/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php +++ b/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php @@ -68,7 +68,9 @@ class WP_Test_REST_Taxonomies_Controller extends WP_Test_REST_Controller_Testcas $request->set_param( 'context', 'edit' ); $response = rest_get_server()->dispatch( $request ); $data = $response->get_data(); - $taxonomies = $this->get_public_taxonomies( get_taxonomies( '', 'objects' ) ); + $taxonomies = get_taxonomies( '', 'objects' ); + unset( $taxonomies['nav_menu'] ); // Menus are not editable by contributors. + $taxonomies = $this->get_public_taxonomies( $taxonomies ); $this->assertSame( count( $taxonomies ), count( $data ) ); $this->assertSame( 'Categories', $data['category']['name'] ); $this->assertSame( 'category', $data['category']['slug'] ); diff --git a/tests/phpunit/tests/rest-api/rest-templates-controller.php b/tests/phpunit/tests/rest-api/rest-templates-controller.php deleted file mode 100644 index 356c868d76..0000000000 --- a/tests/phpunit/tests/rest-api/rest-templates-controller.php +++ /dev/null @@ -1,197 +0,0 @@ -user->create( - array( - 'role' => 'administrator', - ) - ); - - // Set up template post. - $args = array( - 'post_type' => 'wp_template', - 'post_name' => 'my_template', - 'post_title' => 'My Template', - 'post_content' => 'Content', - 'post_excerpt' => 'Description of my template.', - 'tax_input' => array( - 'wp_theme' => array( - get_stylesheet(), - ), - ), - ); - self::$post = self::factory()->post->create_and_get( $args ); - wp_set_post_terms( self::$post->ID, get_stylesheet(), 'wp_theme' ); - } - - public static function wpTearDownAfterClass() { - wp_delete_post( self::$post->ID ); - } - - - public function test_register_routes() { - $routes = rest_get_server()->get_routes(); - $this->assertArrayHasKey( '/wp/v2/templates', $routes ); - $this->assertArrayHasKey( '/wp/v2/templates/(?P[\/\w-]+)', $routes ); - } - - public function test_context_param() { - // TODO: Implement test_context_param() method. - } - - public function test_get_items() { - function find_and_normalize_template_by_id( $templates, $id ) { - foreach ( $templates as $template ) { - if ( $template['id'] === $id ) { - unset( $template['content'] ); - unset( $template['_links'] ); - return $template; - } - } - - return null; - } - - wp_set_current_user( 0 ); - $request = new WP_REST_Request( 'GET', '/wp/v2/templates' ); - $response = rest_get_server()->dispatch( $request ); - $this->assertErrorResponse( 'rest_cannot_manage_templates', $response, 401 ); - - wp_set_current_user( self::$admin_id ); - $request = new WP_REST_Request( 'GET', '/wp/v2/templates' ); - $response = rest_get_server()->dispatch( $request ); - $data = $response->get_data(); - - $this->assertSame( - array( - 'id' => 'default//my_template', - 'theme' => 'default', - 'slug' => 'my_template', - 'source' => 'custom', - 'type' => 'wp_template', - 'description' => 'Description of my template.', - 'title' => array( - 'raw' => 'My Template', - 'rendered' => 'My Template', - ), - 'status' => 'publish', - 'wp_id' => self::$post->ID, - 'has_theme_file' => false, - ), - find_and_normalize_template_by_id( $data, 'default//my_template' ) - ); - } - - public function test_get_item() { - wp_set_current_user( self::$admin_id ); - $request = new WP_REST_Request( 'GET', '/wp/v2/templates/default//my_template' ); - $response = rest_get_server()->dispatch( $request ); - $data = $response->get_data(); - unset( $data['content'] ); - unset( $data['_links'] ); - - $this->assertSame( - array( - 'id' => 'default//my_template', - 'theme' => 'default', - 'slug' => 'my_template', - 'source' => 'custom', - 'type' => 'wp_template', - 'description' => 'Description of my template.', - 'title' => array( - 'raw' => 'My Template', - 'rendered' => 'My Template', - ), - 'status' => 'publish', - 'wp_id' => self::$post->ID, - 'has_theme_file' => false, - ), - $data - ); - } - - public function test_create_item() { - wp_set_current_user( self::$admin_id ); - $request = new WP_REST_Request( 'POST', '/wp/v2/templates' ); - $request->set_body_params( - array( - 'slug' => 'my_custom_template', - 'description' => 'Just a description', - 'title' => 'My Template', - 'content' => 'Content', - ) - ); - $response = rest_get_server()->dispatch( $request ); - $data = $response->get_data(); - unset( $data['_links'] ); - unset( $data['wp_id'] ); - - $this->assertSame( - array( - 'id' => 'default//my_custom_template', - 'theme' => 'default', - 'content' => array( - 'raw' => 'Content', - ), - 'slug' => 'my_custom_template', - 'source' => 'custom', - 'type' => 'wp_template', - 'description' => 'Just a description', - 'title' => array( - 'raw' => 'My Template', - 'rendered' => 'My Template', - ), - 'status' => 'publish', - 'has_theme_file' => false, - ), - $data - ); - } - - public function test_update_item() { - wp_set_current_user( self::$admin_id ); - $request = new WP_REST_Request( 'PUT', '/wp/v2/templates/default//my_template' ); - $request->set_body_params( - array( - 'title' => 'My new Index Title', - ) - ); - $response = rest_get_server()->dispatch( $request ); - $data = $response->get_data(); - $this->assertSame( 'My new Index Title', $data['title']['raw'] ); - $this->assertSame( 'custom', $data['source'] ); - } - - public function test_delete_item() { - wp_set_current_user( self::$admin_id ); - $request = new WP_REST_Request( 'DELETE', '/wp/v2/templates/justrandom//template' ); - $response = rest_get_server()->dispatch( $request ); - $this->assertErrorResponse( 'rest_template_not_found', $response, 404 ); - } - - public function test_prepare_item() { - // TODO: Implement test_prepare_item() method. - } - - public function test_get_item_schema() { - // TODO: Implement test_get_item_schema() method. - } -} diff --git a/tests/phpunit/tests/rest-api/rest-themes-controller.php b/tests/phpunit/tests/rest-api/rest-themes-controller.php index 73a8b4c3cc..6737a707bd 100644 --- a/tests/phpunit/tests/rest-api/rest-themes-controller.php +++ b/tests/phpunit/tests/rest-api/rest-themes-controller.php @@ -1285,15 +1285,86 @@ class WP_Test_REST_Themes_Controller extends WP_Test_REST_Controller_Testcase { } /** - * @ticket 54349 + * @dataProvider data_get_item_non_subdir_theme + * @ticket 54596 + * @covers WP_REST_Themes_Controller::get_item + * + * @param string $theme_dir Theme directory to test. + * @param string $expected_name Expected theme name. */ - public function test_get_item_subdirectory_theme() { + public function test_get_item_non_subdir_theme( $theme_dir, $expected_name ) { wp_set_current_user( self::$admin_id ); - $request = new WP_REST_Request( 'GET', self::$themes_route . '/subdir/theme2' ); + $request = new WP_REST_Request( 'GET', self::$themes_route . $theme_dir ); $response = rest_do_request( $request ); $this->assertSame( 200, $response->get_status() ); - $this->assertSame( 'My Subdir Theme', $response->get_data()['name']['raw'] ); + $this->assertSame( $expected_name, $response->get_data()['name']['raw'] ); + } + + /** + * Data provider. + * + * @return array + */ + public function data_get_item_non_subdir_theme() { + return array( + 'parent theme' => array( + 'theme_dir' => '/block-theme', + 'expected_name' => 'Block Theme', + ), + 'child theme' => array( + 'theme_dir' => '/block-theme-child', + 'expected_name' => 'Block Theme Child Theme', + ), + 'theme with _-[]. characters' => array( + 'theme_dir' => '/block_theme-[0.4.0]', + 'expected_name' => 'Block Theme [0.4.0]', + ), + ); + } + + /** + * @dataProvider data_get_item_subdirectory_theme + * @ticket 54349 + * @ticket 54596 + * @covers WP_REST_Themes_Controller::get_item + * + * @param string $theme_dir Theme directory to test. + * @param string $expected_name Expected theme name. + */ + public function test_get_item_subdirectory_theme( $theme_dir, $expected_name ) { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'GET', self::$themes_route . $theme_dir ); + $response = rest_do_request( $request ); + + $this->assertSame( + 200, + $response->get_status(), + 'A 200 OK status was not returned.' + ); + $this->assertSame( + $expected_name, + $response->get_data()['name']['raw'], + 'The actual theme name was not the expected theme name.' + ); + } + + /** + * Data provider. + * + * @return array + */ + public function data_get_item_subdirectory_theme() { + return array( + 'theme2' => array( + 'theme_dir' => '/subdir/theme2', + 'expected_name' => 'My Subdir Theme', + ), + 'theme with _-[]. characters' => array( + 'theme_dir' => '/subdir/block_theme-[1.0.0]', + 'expected_name' => 'Block Theme [1.0.0] in subdirectory', + ), + ); } /** diff --git a/tests/phpunit/tests/rest-api/rest-users-controller.php b/tests/phpunit/tests/rest-api/rest-users-controller.php index c3f620c8cc..4a28f210a1 100644 --- a/tests/phpunit/tests/rest-api/rest-users-controller.php +++ b/tests/phpunit/tests/rest-api/rest-users-controller.php @@ -207,6 +207,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase { 'search', 'slug', 'who', + 'has_published_posts', ), $keys ); @@ -1444,7 +1445,10 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase { if ( 'user_name' === $error['code'] ) { $this->assertSame( 'Sorry, that username already exists!', $error['message'] ); } else { - $this->assertSame( 'Sorry, that email address is already used!', $error['message'] ); + $expected = 'Error: This email address is already registered. ' . + 'Log in with ' . + 'this address or choose another one.'; + $this->assertSame( $expected, $error['message'] ); } } } diff --git a/tests/phpunit/tests/rest-api/rest-widgets-controller.php b/tests/phpunit/tests/rest-api/rest-widgets-controller.php index d50172f2b3..a548ab79e1 100644 --- a/tests/phpunit/tests/rest-api/rest-widgets-controller.php +++ b/tests/phpunit/tests/rest-api/rest-widgets-controller.php @@ -1523,6 +1523,8 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase { $data = $response->get_data(); $properties = $data['schema']['properties']; + $this->assertSame( array( 'v1' => true ), $data['endpoints'][0]['allow_batch'] ); + $this->assertCount( 7, $properties ); $this->assertArrayHasKey( 'id', $properties ); $this->assertArrayHasKey( 'id_base', $properties ); diff --git a/tests/phpunit/tests/rest-api/wpRestEditSiteExportController.php b/tests/phpunit/tests/rest-api/wpRestEditSiteExportController.php new file mode 100644 index 0000000000..4683d68fed --- /dev/null +++ b/tests/phpunit/tests/rest-api/wpRestEditSiteExportController.php @@ -0,0 +1,156 @@ +user->create( + array( + 'role' => 'subscriber', + ) + ); + } + + /** + * Delete test data after our tests run. + * + * @since 5.9.0 + */ + public static function wpTearDownAfterClass() { + self::delete_user( self::$subscriber_id ); + } + + /** + * @covers WP_REST_Edit_Site_Export_Controller::register_routes + * @ticket 54448 + */ + public function test_register_routes() { + $routes = rest_get_server()->get_routes(); + $this->assertArrayHasKey( static::REQUEST_ROUTE, $routes ); + $this->assertCount( 1, $routes[ static::REQUEST_ROUTE ] ); + } + + /** + * @covers WP_REST_Edit_Site_Export_Controller::permissions_check + * + * @ticket 54448 + */ + public function test_export_for_no_user_permissions() { + wp_set_current_user( 0 ); + + $request = new WP_REST_Request( 'GET', static::REQUEST_ROUTE ); + $response = rest_get_server()->dispatch( $request ); + + $this->assertErrorResponse( 'rest_cannot_export_templates', $response, 401 ); + } + + /** + * @covers WP_REST_Edit_Site_Export_Controller::permissions_check + * + * @ticket 54448 + */ + public function test_export_for_user_with_insufficient_permissions() { + wp_set_current_user( self::$subscriber_id ); + + $request = new WP_REST_Request( 'GET', static::REQUEST_ROUTE ); + $response = rest_get_server()->dispatch( $request ); + + $this->assertErrorResponse( 'rest_cannot_export_templates', $response, 403 ); + } + + /** + * @ticket 54448 + */ + public function test_context_param() { + $this->markTestSkipped( 'Controller does not implement context_param().' ); + } + + /** + * @ticket 54448 + */ + public function test_get_item() { + $this->markTestSkipped( 'Controller does not implement get_item().' ); + } + + /** + * @ticket 54448 + */ + public function test_get_items() { + $this->markTestSkipped( 'Controller does not implement get_items().' ); + } + + /** + * @ticket 54448 + */ + public function test_create_item() { + $this->markTestSkipped( 'Controller does not implement create_item().' ); + } + + /** + * @ticket 54448 + */ + public function test_update_item() { + $this->markTestSkipped( 'Controller does not implement update_item().' ); + } + + /** + * @ticket 54448 + */ + public function test_delete_item() { + $this->markTestSkipped( 'Controller does not implement delete_item().' ); + } + + /** + * @ticket 54448 + */ + public function test_prepare_item() { + $this->markTestSkipped( 'Controller does not implement prepare_item().' ); + } + + /** + * @ticket 54448 + */ + public function test_get_item_schema() { + $this->markTestSkipped( 'Controller does not implement get_item_schema().' ); + } +} diff --git a/tests/phpunit/tests/rest-api/wpRestMenuItemsController.php b/tests/phpunit/tests/rest-api/wpRestMenuItemsController.php new file mode 100644 index 0000000000..9ef5b87d99 --- /dev/null +++ b/tests/phpunit/tests/rest-api/wpRestMenuItemsController.php @@ -0,0 +1,1058 @@ +user->create( + array( + 'role' => 'administrator', + ) + ); + self::$subscriber_id = $factory->user->create( + array( + 'role' => 'subscriber', + ) + ); + } + + /** + * + */ + public static function wpTearDownAfterClass() { + self::delete_user( self::$admin_id ); + self::delete_user( self::$subscriber_id ); + } + + /** + * + */ + public function set_up() { + parent::set_up(); + + $this->tag_id = self::factory()->tag->create(); + + $this->menu_id = wp_create_nav_menu( rand_str() ); + + $this->menu_item_id = wp_update_nav_menu_item( + $this->menu_id, + 0, + array( + 'menu-item-type' => 'taxonomy', + 'menu-item-object' => 'post_tag', + 'menu-item-object-id' => $this->tag_id, + 'menu-item-status' => 'publish', + ) + ); + } + + /** + * @ticket 40878 + * @covers ::register_routes + */ + public function test_register_routes() { + $routes = rest_get_server()->get_routes(); + + $this->assertArrayHasKey( '/wp/v2/menu-items', $routes ); + $this->assertCount( 2, $routes['/wp/v2/menu-items'] ); + $this->assertArrayHasKey( '/wp/v2/menu-items/(?P[\d]+)', $routes ); + $this->assertCount( 3, $routes['/wp/v2/menu-items/(?P[\d]+)'] ); + } + + /** + * @ticket 40878 + * @covers ::get_context_param + */ + public function test_context_param() { + // Collection. + $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/menu-items' ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $this->assertSame( 'view', $data['endpoints'][0]['args']['context']['default'] ); + $this->assertSame( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] ); + $this->assertSame( array( 'v1' => true ), $data['endpoints'][0]['allow_batch'] ); + // Single. + $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/menu-items/' . $this->menu_item_id ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $this->assertSame( 'view', $data['endpoints'][0]['args']['context']['default'] ); + $this->assertSame( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] ); + $this->assertSame( array( 'v1' => true ), $data['endpoints'][0]['allow_batch'] ); + } + + /** + * @ticket 40878 + * @covers ::get_collection_params + */ + public function test_registered_query_params() { + $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/menu-items' ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $properties = $data['endpoints'][0]['args']; + $this->assertArrayHasKey( 'before', $properties ); + $this->assertArrayHasKey( 'context', $properties ); + $this->assertArrayHasKey( 'exclude', $properties ); + $this->assertArrayHasKey( 'include', $properties ); + $this->assertArrayHasKey( 'menu_order', $properties ); + $this->assertArrayHasKey( 'menus', $properties ); + $this->assertArrayHasKey( 'menus_exclude', $properties ); + $this->assertArrayHasKey( 'offset', $properties ); + $this->assertArrayHasKey( 'order', $properties ); + $this->assertArrayHasKey( 'orderby', $properties ); + $this->assertArrayHasKey( 'page', $properties ); + $this->assertArrayHasKey( 'per_page', $properties ); + $this->assertArrayHasKey( 'search', $properties ); + $this->assertArrayHasKey( 'slug', $properties ); + $this->assertArrayHasKey( 'status', $properties ); + } + + /** + * @ticket 40878 + */ + public function test_registered_get_item_params() { + $request = new WP_REST_Request( 'OPTIONS', sprintf( '/wp/v2/menu-items/%d', $this->menu_item_id ) ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $keys = array_keys( $data['endpoints'][0]['args'] ); + sort( $keys ); + $this->assertSame( array( 'context', 'id' ), $keys ); + } + + /** + * @ticket 40878 + * @covers ::get_items + */ + public function test_get_items() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menu-items' ); + $response = rest_get_server()->dispatch( $request ); + + $this->check_get_menu_items_response( $response ); + } + + /** + * @ticket 40878 + * @covers ::get_item + */ + public function test_get_item() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/menu-items/%d', $this->menu_item_id ) ); + $response = rest_get_server()->dispatch( $request ); + + $this->check_get_menu_item_response( $response, 'view' ); + } + + /** + * @ticket 40878 + * @covers ::get_item + */ + public function test_get_item_edit() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/menu-items/%d', $this->menu_item_id ) ); + $request->set_param( 'context', 'edit' ); + $response = rest_get_server()->dispatch( $request ); + + $this->check_get_menu_item_response( $response, 'edit' ); + } + + /** + * @ticket 40878 + * @covers ::get_item + * @covers ::prepare_links + */ + public function test_get_item_term_links() { + wp_set_current_user( self::$admin_id ); + + $menu_item_id = wp_update_nav_menu_item( + $this->menu_id, + 0, + array( + 'menu-item-type' => 'taxonomy', + 'menu-item-object' => 'post_tag', + 'menu-item-object-id' => $this->tag_id, + 'menu-item-status' => 'publish', + 'menu-item-title' => 'Food', + ) + ); + $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/menu-items/%d', $menu_item_id ) ); + $request->set_param( 'context', 'edit' ); + $response = rest_get_server()->dispatch( $request ); + + $this->check_get_menu_item_response( $response, 'edit' ); + } + + /** + * @ticket 40878 + * @covers ::get_item + * @covers ::prepare_links + */ + public function test_get_item_term_posts() { + wp_set_current_user( self::$admin_id ); + + $post_id = self::factory()->post->create(); + + $menu_item_id = wp_update_nav_menu_item( + $this->menu_id, + 0, + array( + 'menu-item-type' => 'post_type', + 'menu-item-object' => 'post', + 'menu-item-object-id' => $post_id, + 'menu-item-status' => 'publish', + 'menu-item-title' => 'Food', + ) + ); + $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/menu-items/%d', $menu_item_id ) ); + $request->set_param( 'context', 'edit' ); + $response = rest_get_server()->dispatch( $request ); + + $this->check_get_menu_item_response( $response, 'edit' ); + } + + /** + * Test that title.raw contains the verbatim title and that title.rendered + * has been passed through the_title which escapes & characters. + * + * @see https://github.com/WordPress/gutenberg/pull/24673 + * + * @ticket 40878 + * @covers ::get_item + */ + public function test_get_item_escapes_title() { + wp_set_current_user( self::$admin_id ); + + $menu_item_id = wp_update_nav_menu_item( + $this->menu_id, + 0, + array( + 'menu-item-type' => 'taxonomy', + 'menu-item-object' => 'post_tag', + 'menu-item-object-id' => $this->tag_id, + 'menu-item-status' => 'publish', + 'menu-item-title' => 'Foo & bar', + ) + ); + + $request = new WP_REST_Request( + 'GET', + "/wp/v2/menu-items/$menu_item_id" + ); + $request->set_query_params( + array( + 'context' => 'edit', + ) + ); + + $response = rest_get_server()->dispatch( $request ); + + $data = $response->get_data(); + $title = $data['title']; + + if ( ! is_multisite() ) { + // Check that title.raw is the unescaped title and that + // title.rendered has been run through the_title. + $this->assertSame( 'Foo & bar', $title['rendered'] ); + $this->assertSame( 'Foo & bar', $title['raw'] ); + } else { + // In a multisite, administrators do not have unfiltered_html and + // post_title is ran through wp_kses before being saved in the + // database. Running the title through the_title does nothing in + // this case. + $this->assertSame( 'Foo & bar', $title['rendered'] ); + $this->assertSame( 'Foo & bar', $title['raw'] ); + } + + wp_delete_post( $menu_item_id ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item() { + wp_set_current_user( self::$admin_id ); + + $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data(); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + + $this->check_create_menu_item_response( $response ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item_invalid_invalid() { + wp_set_current_user( self::$admin_id ); + + $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data( + array( + 'menus' => array( 123, 456 ), + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + + $this->assertErrorResponse( 'rest_invalid_param', $response, 400 ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item_invalid_term() { + wp_set_current_user( self::$admin_id ); + + $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data( + array( + 'type' => 'taxonomy', + 'title' => 'Tags', + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_term_invalid_id', $response, 400 ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item_change_position() { + wp_set_current_user( self::$admin_id ); + $new_menu_id = wp_create_nav_menu( rand_str() ); + $expected = array(); + $actual = array(); + for ( $i = 1; $i < 5; $i ++ ) { + $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data( + array( + 'menu_order' => $i, + 'menus' => $new_menu_id, + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $this->check_create_menu_item_response( $response ); + $data = $response->get_data(); + + $expected[] = $i; + $actual[] = $data['menu_order']; + } + $this->assertSame( $expected, $actual ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_menu_order_must_be_set() { + wp_set_current_user( self::$admin_id ); + $new_menu_id = wp_create_nav_menu( rand_str() ); + + $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data( + array( + 'menu_order' => 0, + 'menus' => $new_menu_id, + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_invalid_param', $response, 400 ); + + $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data( + array( + 'menu_order' => 1, + 'menus' => $new_menu_id, + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $this->assertSame( 201, $response->get_status() ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item_invalid_position_2() { + wp_set_current_user( self::$admin_id ); + $new_menu_id = wp_create_nav_menu( rand_str() ); + $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data( + array( + 'menu_order' => 'ddddd', + 'menus' => $new_menu_id, + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_invalid_param', $response, 400 ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item_invalid_position_3() { + wp_set_current_user( self::$admin_id ); + $new_menu_id = wp_create_nav_menu( rand_str() ); + $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data( + array( + 'menu_order' => -9, + 'menus' => $new_menu_id, + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_invalid_param', $response, 400 ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item_invalid_parent() { + wp_set_current_user( self::$admin_id ); + wp_create_nav_menu( rand_str() ); + $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data( + array( + 'parent' => -9, + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_invalid_param', $response, 400 ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item_invalid_menu() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data( + array( + 'menus' => -9, + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'invalid_menu_id', $response, 400 ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item_invalid_post() { + wp_set_current_user( self::$admin_id ); + + $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data( + array( + 'type' => 'post_type', + 'title' => 'Post', + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_post_invalid_id', $response, 400 ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item_invalid_post_type() { + wp_set_current_user( self::$admin_id ); + + $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data( + array( + 'type' => 'post_type_archive', + 'menu-item-object' => 'invalid_post_type', + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_post_invalid_type', $response, 400 ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item_invalid_custom_link() { + wp_set_current_user( self::$admin_id ); + + $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data( + array( + 'type' => 'custom', + 'title' => '', + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_title_required', $response, 400 ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item_missing_custom_link_url() { + wp_set_current_user( self::$admin_id ); + + $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data( + array( + 'type' => 'custom', + 'url' => '', + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_url_required', $response, 400 ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item_invalid_custom_link_url() { + wp_set_current_user( self::$admin_id ); + + $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data( + array( + 'type' => 'custom', + 'url' => '"^<>{}`', + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_invalid_param', $response, 400 ); + $this->assertArrayHasKey( 'url', $response->get_data()['data']['details'] ); + $this->assertSame( 'rest_invalid_url', $response->get_data()['data']['details']['url']['code'] ); + } + + /** + * @ticket 40878 + * @covers ::update_item + */ + public function test_update_item() { + wp_set_current_user( self::$admin_id ); + + $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/menu-items/%d', $this->menu_item_id ) ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data( + array( + 'xfn' => array( 'test1', 'test2', 'test3' ), + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $this->check_update_menu_item_response( $response ); + $new_data = $response->get_data(); + $this->assertSame( $this->menu_item_id, $new_data['id'] ); + $this->assertSame( $params['title'], $new_data['title']['raw'] ); + $this->assertSame( $params['description'], $new_data['description'] ); + $this->assertSame( $params['type_label'], $new_data['type_label'] ); + $this->assertSame( $params['xfn'], $new_data['xfn'] ); + $post = get_post( $this->menu_item_id ); + $menu_item = wp_setup_nav_menu_item( $post ); + $this->assertSame( $params['title'], $menu_item->title ); + $this->assertSame( $params['description'], $menu_item->description ); + $this->assertSame( $params['xfn'], explode( ' ', $menu_item->xfn ) ); + } + + /** + * @ticket 40878 + * @covers ::update_item + */ + public function test_update_item_clean_xfn() { + wp_set_current_user( self::$admin_id ); + + $bad_data = array( 'test1":|":', 'test2+|+', 'test3±', 'test4😀' ); + $good_data = array( 'test1', 'test2', 'test3', 'test4' ); + + $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/menu-items/%d', $this->menu_item_id ) ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data( + array( + 'xfn' => $bad_data, + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $this->check_update_menu_item_response( $response ); + $new_data = $response->get_data(); + $this->assertSame( $this->menu_item_id, $new_data['id'] ); + $this->assertSame( $params['title'], $new_data['title']['raw'] ); + $this->assertSame( $params['description'], $new_data['description'] ); + $this->assertSame( $params['type_label'], $new_data['type_label'] ); + $this->assertSame( $good_data, $new_data['xfn'] ); + $post = get_post( $this->menu_item_id ); + $menu_item = wp_setup_nav_menu_item( $post ); + $this->assertSame( $params['title'], $menu_item->title ); + $this->assertSame( $params['description'], $menu_item->description ); + $this->assertSame( $good_data, explode( ' ', $menu_item->xfn ) ); + } + + + /** + * @ticket 40878 + * @covers ::update_item + */ + public function test_update_item_invalid() { + wp_set_current_user( self::$admin_id ); + $post_id = self::factory()->post->create(); + + $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/menu-items/%d', $post_id ) ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $params = $this->set_menu_item_data(); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_post_invalid_id', $response, 404 ); + } + + /** + * @ticket 40878 + * @covers ::delete_item + */ + public function test_delete_item() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/menu-items/%d', $this->menu_item_id ) ); + $request->set_param( 'force', true ); + $response = rest_get_server()->dispatch( $request ); + $this->assertSame( 200, $response->get_status() ); + $this->assertNull( get_post( $this->menu_item_id ) ); + } + + /** + * @ticket 40878 + * @covers ::delete_item + */ + public function test_delete_item_no_force() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/menu-items/%d', $this->menu_item_id ) ); + $request->set_param( 'force', false ); + $response = rest_get_server()->dispatch( $request ); + $this->assertSame( 501, $response->get_status() ); + $this->assertNotNull( get_post( $this->menu_item_id ) ); + } + + /** + * @ticket 40878 + * @covers ::delete_item + */ + public function test_delete_item_invalid() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'DELETE', '/wp/v2/menu-items/9999' ); + $request->set_param( 'force', true ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_post_invalid_id', $response, 404 ); + } + + /** + * @ticket 40878 + * @covers ::prepare_item_for_response + */ + public function test_prepare_item() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menu-items/' . $this->menu_item_id ); + $response = rest_get_server()->dispatch( $request ); + $this->assertSame( 200, $response->get_status() ); + $this->check_get_menu_item_response( $response ); + } + + /** + * @ticket 40878 + * @covers ::get_item_schema + */ + public function test_get_item_schema() { + $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/menu-items' ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $properties = $data['schema']['properties']; + $this->assertSame( 18, count( $properties ) ); + $this->assertArrayHasKey( 'type_label', $properties ); + $this->assertArrayHasKey( 'attr_title', $properties ); + $this->assertArrayHasKey( 'classes', $properties ); + $this->assertArrayHasKey( 'description', $properties ); + $this->assertArrayHasKey( 'id', $properties ); + $this->assertArrayHasKey( 'url', $properties ); + $this->assertArrayHasKey( 'meta', $properties ); + $this->assertArrayHasKey( 'menu_order', $properties ); + $this->assertArrayHasKey( 'object', $properties ); + $this->assertArrayHasKey( 'object_id', $properties ); + $this->assertArrayHasKey( 'target', $properties ); + $this->assertArrayHasKey( 'parent', $properties ); + $this->assertArrayHasKey( 'status', $properties ); + $this->assertArrayHasKey( 'title', $properties ); + $this->assertArrayHasKey( 'type', $properties ); + $this->assertArrayHasKey( 'xfn', $properties ); + $this->assertArrayHasKey( 'invalid', $properties ); + } + + /** + * @ticket 40878 + * @covers ::get_items_permissions_check + */ + public function test_get_items_no_permission() { + wp_set_current_user( 0 ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menu-items' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_cannot_view', $response, 401 ); + } + + /** + * @ticket 40878 + * @covers ::get_item_permissions_check + */ + public function test_get_item_no_permission() { + wp_set_current_user( 0 ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menu-items/' . $this->menu_item_id ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_cannot_view', $response, 401 ); + } + + /** + * @ticket 40878 + * @covers ::get_items_permissions_check + */ + public function test_get_items_wrong_permission() { + wp_set_current_user( self::$subscriber_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menu-items' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_cannot_view', $response, 403 ); + } + + /** + * @ticket 40878 + * @covers ::get_item_permissions_check + */ + public function test_get_item_wrong_permission() { + wp_set_current_user( self::$subscriber_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menu-items/' . $this->menu_item_id ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_cannot_view', $response, 403 ); + } + + /** + * @param WP_REST_Response $response Response Class. + * @param string $context Defaults to View. + */ + protected function check_get_menu_items_response( $response, $context = 'view' ) { + $this->assertNotWPError( $response ); + $response = rest_ensure_response( $response ); + $this->assertSame( 200, $response->get_status() ); + + $headers = $response->get_headers(); + $this->assertArrayHasKey( 'X-WP-Total', $headers ); + $this->assertArrayHasKey( 'X-WP-TotalPages', $headers ); + + $all_data = $response->get_data(); + foreach ( $all_data as $data ) { + $post = get_post( $data['id'] ); + // Base fields for every post. + $menu_item = wp_setup_nav_menu_item( $post ); + /** + * As the links for the post are "response_links" format in the data array we have to pull them out and parse them. + */ + $links = $data['_links']; + foreach ( $links as &$links_array ) { + foreach ( $links_array as &$link ) { + $attributes = array_diff_key( + $link, + array( + 'href' => 1, + 'name' => 1, + ) + ); + $link = array_diff_key( $link, $attributes ); + $link['attributes'] = $attributes; + } + } + + $this->check_menu_item_data( $menu_item, $data, $context, $links ); + } + } + + /** + * @param WP_Post $post WP_Post object. + * @param array $data Data compare. + * @param string $context Context of REST Request. + * @param array $links Array links. + */ + protected function check_menu_item_data( $post, $data, $context, $links ) { + $post_type_obj = get_post_type_object( self::POST_TYPE ); + + // Standard fields. + $this->assertSame( $post->ID, $data['id'] ); + $this->assertSame( wpautop( $post->post_content ), $data['description'] ); + + // Check filtered values. + if ( post_type_supports( self::POST_TYPE, 'title' ) ) { + add_filter( 'protected_title_format', array( $this, 'protected_title_format' ) ); + $this->assertSame( $post->title, $data['title']['rendered'] ); + remove_filter( 'protected_title_format', array( $this, 'protected_title_format' ) ); + if ( 'edit' === $context ) { + $this->assertSame( $post->title, $data['title']['raw'] ); + } else { + $this->assertFalse( isset( $data['title']['raw'] ) ); + } + } else { + $this->assertFalse( isset( $data['title'] ) ); + } + + // post_parent. + $this->assertArrayHasKey( 'parent', $data ); + if ( $post->post_parent ) { + if ( is_int( $data['parent'] ) ) { + $this->assertSame( $post->post_parent, $data['parent'] ); + } else { + $this->assertSame( $post->post_parent, $data['parent']['id'] ); + $menu_item = wp_setup_nav_menu_item( get_post( $data['parent']['id'] ) ); + $this->check_get_menu_item_response( $data['parent'], $menu_item, 'view-parent' ); + } + } else { + $this->assertEmpty( $data['parent'] ); + } + + $this->assertFalse( $data['invalid'] ); + + // page attributes. + $this->assertSame( $post->menu_order, $data['menu_order'] ); + + $taxonomies = wp_list_filter( get_object_taxonomies( self::POST_TYPE, 'objects' ), array( 'show_in_rest' => true ) ); + foreach ( $taxonomies as $taxonomy ) { + $this->assertTrue( isset( $data[ $taxonomy->rest_base ] ) ); + $terms = wp_get_object_terms( $post->ID, $taxonomy->name, array( 'fields' => 'ids' ) ); + sort( $terms ); + if ( 'nav_menu' === $taxonomy->name ) { + $term_id = $terms ? array_shift( $terms ) : 0; + $this->assertSame( $term_id, $data[ $taxonomy->rest_base ] ); + } else { + sort( $data[ $taxonomy->rest_base ] ); + $this->assertSame( $terms, $data[ $taxonomy->rest_base ] ); + } + } + + // test links. + if ( $links ) { + $links = test_rest_expand_compact_links( $links ); + $this->assertSame( $links['self'][0]['href'], rest_url( 'wp/v2/' . $post_type_obj->rest_base . '/' . $data['id'] ) ); + $this->assertSame( $links['collection'][0]['href'], rest_url( 'wp/v2/' . $post_type_obj->rest_base ) ); + $this->assertSame( $links['about'][0]['href'], rest_url( 'wp/v2/types/' . self::POST_TYPE ) ); + + $num = 0; + foreach ( $taxonomies as $taxonomy ) { + $this->assertSame( $taxonomy->name, $links['https://api.w.org/term'][ $num ]['attributes']['taxonomy'] ); + $this->assertSame( add_query_arg( 'post', $data['id'], rest_url( 'wp/v2/' . $taxonomy->rest_base ) ), $links['https://api.w.org/term'][ $num ]['href'] ); + $num ++; + } + + if ( 'post_type' === $data['type'] ) { + $this->assertArrayHasKey( 'https://api.w.org/menu-item-object', $links ); + $this->assertArrayHasKey( $data['type'], $links['https://api.w.org/menu-item-object'][0]['attributes'] ); + $this->assertSame( $links['https://api.w.org/menu-item-object'][0]['href'], rest_url( rest_get_route_for_post( $data['object_id'] ) ) ); + } + + if ( 'taxonomy' === $data['type'] ) { + $this->assertArrayHasKey( 'https://api.w.org/menu-item-object', $links ); + $this->assertArrayHasKey( $data['type'], $links['https://api.w.org/menu-item-object'][0]['attributes'] ); + $this->assertSame( $links['https://api.w.org/menu-item-object'][0]['href'], rest_url( rest_get_route_for_term( $data['object_id'] ) ) ); + } + } + } + + /** + * @param WP_REST_Response $response Response Class. + * @param string $context Defaults to View. + */ + protected function check_get_menu_item_response( $response, $context = 'view' ) { + $this->assertNotWPError( $response ); + $response = rest_ensure_response( $response ); + $this->assertSame( 200, $response->get_status() ); + + $data = $response->get_data(); + $post = get_post( $data['id'] ); + $menu_item = wp_setup_nav_menu_item( $post ); + $this->check_menu_item_data( $menu_item, $data, $context, $response->get_links() ); + } + + /** + * @param WP_REST_Response $response Response Class. + */ + protected function check_create_menu_item_response( $response ) { + $this->assertNotWPError( $response ); + $response = rest_ensure_response( $response ); + + $this->assertSame( 201, $response->get_status() ); + $headers = $response->get_headers(); + $this->assertArrayHasKey( 'Location', $headers ); + + $data = $response->get_data(); + $post = get_post( $data['id'] ); + $menu_item = wp_setup_nav_menu_item( $post ); + $this->check_menu_item_data( $menu_item, $data, 'edit', $response->get_links() ); + } + + /** + * @param WP_REST_Response $response Response Class. + */ + protected function check_update_menu_item_response( $response ) { + $this->assertNotWPError( $response ); + $response = rest_ensure_response( $response ); + + $this->assertSame( 200, $response->get_status() ); + $headers = $response->get_headers(); + $this->assertArrayNotHasKey( 'Location', $headers ); + + $data = $response->get_data(); + $post = get_post( $data['id'] ); + $menu_item = wp_setup_nav_menu_item( $post ); + $this->check_menu_item_data( $menu_item, $data, 'edit', $response->get_links() ); + } + + /** + * @param array $args Override params. + * + * @return mixed + */ + protected function set_menu_item_data( $args = array() ) { + $defaults = array( + 'object_id' => 0, + 'parent' => 0, + 'menu_order' => 1, + 'menus' => $this->menu_id, + 'type' => 'custom', + 'title' => 'Custom Link Title', + 'url' => '#', + 'description' => '', + 'attr-title' => '', + 'target' => '', + 'type_label' => 'Custom Link', + 'classes' => '', + 'xfn' => '', + 'status' => 'draft', + ); + + return wp_parse_args( $args, $defaults ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item_properly_handles_slashed_data() { + wp_set_current_user( self::$admin_id ); + + $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $parameters = $this->set_menu_item_data( + array( + 'title' => 'Some \\\'title', + ) + ); + $request->set_body_params( $parameters ); + $response = rest_get_server()->dispatch( $request ); + $this->assertNotWPError( $response->as_error() ); + $data = $response->get_data(); + $post = get_post( $data['id'] ); + $this->assertSame( $parameters['title'], $post->post_title ); + } + + /** + * @ticket 40878 + * @covers ::update_item + */ + public function test_update_item_properly_handles_slashed_data() { + wp_set_current_user( self::$admin_id ); + + $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/menu-items/%d', $this->menu_item_id ) ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $title = 'Some \\\'title'; + $params = $this->set_menu_item_data( + array( + 'title' => $title, + ) + ); + $request->set_body_params( $params ); + $response = rest_get_server()->dispatch( $request ); + $new_data = $response->get_data(); + $this->assertSame( $params['title'], $new_data['title']['raw'] ); + } +} diff --git a/tests/phpunit/tests/rest-api/wpRestMenuLocationsController.php b/tests/phpunit/tests/rest-api/wpRestMenuLocationsController.php new file mode 100644 index 0000000000..9f100719ff --- /dev/null +++ b/tests/phpunit/tests/rest-api/wpRestMenuLocationsController.php @@ -0,0 +1,207 @@ +user->create( + array( + 'role' => 'administrator', + ) + ); + } + + /** + * Set up. + */ + public function set_up() { + parent::set_up(); + + // Unregister all nav menu locations. + foreach ( array_keys( get_registered_nav_menus() ) as $location ) { + unregister_nav_menu( $location ); + } + } + + /** + * Register nav menu locations. + * + * @param array $locations Location slugs. + */ + public function register_nav_menu_locations( $locations ) { + foreach ( $locations as $location ) { + register_nav_menu( $location, ucfirst( $location ) ); + } + } + + /** + * @ticket 40878 + * @covers ::register_routes + */ + public function test_register_routes() { + $routes = rest_get_server()->get_routes(); + $this->assertArrayHasKey( '/wp/v2/menu-locations', $routes ); + $this->assertCount( 1, $routes['/wp/v2/menu-locations'] ); + $this->assertArrayHasKey( '/wp/v2/menu-locations/(?P[\w-]+)', $routes ); + $this->assertCount( 1, $routes['/wp/v2/menu-locations/(?P[\w-]+)'] ); + } + + /** + * @ticket 40878 + * @covers ::get_context_param + */ + public function test_context_param() { + // Collection. + $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/menu-locations' ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $this->assertSame( 'view', $data['endpoints'][0]['args']['context']['default'] ); + $this->assertSame( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] ); + $menu = 'primary'; + $this->register_nav_menu_locations( array( $menu ) ); + $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/menu-locations/' . $menu ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $this->assertSame( 'view', $data['endpoints'][0]['args']['context']['default'] ); + $this->assertSame( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] ); + } + + /** + * @ticket 40878 + * @covers ::get_items + */ + public function test_get_items() { + $menus = array( 'primary', 'secondary' ); + $this->register_nav_menu_locations( array( 'primary', 'secondary' ) ); + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menu-locations' ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $data = array_values( $data ); + $this->assertCount( 2, $data ); + $names = wp_list_pluck( $data, 'name' ); + $descriptions = wp_list_pluck( $data, 'description' ); + $this->assertSame( $menus, $names ); + $menu_descriptions = array_map( 'ucfirst', $names ); + $this->assertSame( $menu_descriptions, $descriptions ); + } + + /** + * @ticket 40878 + * @covers ::get_item + */ + public function test_get_item() { + $menu = 'primary'; + $this->register_nav_menu_locations( array( $menu ) ); + + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menu-locations/' . $menu ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $this->assertSame( $menu, $data['name'] ); + } + + /** + * @ticket 40878 + * @covers ::get_item + */ + public function test_get_item_invalid() { + $menu = 'primary'; + $this->register_nav_menu_locations( array( $menu ) ); + + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menu-locations/invalid' ); + $response = rest_get_server()->dispatch( $request ); + + $this->assertErrorResponse( 'rest_menu_location_invalid', $response, 404 ); + } + + /** + * The test_create_item() method does not exist for menu locations. + */ + public function test_create_item() {} + + /** + * The test_update_item() method does not exist for menu locations. + */ + public function test_update_item() {} + + /** + * The test_delete_item() method does not exist for menu locations. + */ + public function test_delete_item() {} + + /** + * The test_prepare_item() method does not exist for menu locations. + */ + public function test_prepare_item() {} + + /** + * @ticket 40878 + * @covers ::get_item_schema + */ + public function test_get_item_schema() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/menu-locations' ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $properties = $data['schema']['properties']; + $this->assertSame( 3, count( $properties ) ); + $this->assertArrayHasKey( 'name', $properties ); + $this->assertArrayHasKey( 'description', $properties ); + $this->assertArrayHasKey( 'menu', $properties ); + } + + + /** + * @ticket 40878 + * @covers ::get_items + * @covers ::get_items_permissions_check + */ + public function test_get_items_menu_location_context_without_permission() { + wp_set_current_user( 0 ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menu-locations' ); + $response = rest_get_server()->dispatch( $request ); + + $this->assertErrorResponse( 'rest_cannot_view', $response, rest_authorization_required_code() ); + } + + /** + * @ticket 40878 + * @covers ::get_item + * @covers ::get_item_permissions_check + */ + public function test_get_item_menu_location_context_without_permission() { + $menu = 'primary'; + $this->register_nav_menu_locations( array( $menu ) ); + + wp_set_current_user( 0 ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menu-locations/' . $menu ); + $response = rest_get_server()->dispatch( $request ); + + $this->assertErrorResponse( 'rest_cannot_view', $response, rest_authorization_required_code() ); + } +} diff --git a/tests/phpunit/tests/rest-api/wpRestMenusController.php b/tests/phpunit/tests/rest-api/wpRestMenusController.php new file mode 100644 index 0000000000..4b2384c1a7 --- /dev/null +++ b/tests/phpunit/tests/rest-api/wpRestMenusController.php @@ -0,0 +1,642 @@ +user->create( + array( + 'role' => 'administrator', + ) + ); + self::$editor_id = $factory->user->create( + array( + 'role' => 'editor', + ) + ); + self::$subscriber_id = $factory->user->create( + array( + 'role' => 'subscriber', + ) + ); + } + + /** + * + */ + public function set_up() { + parent::set_up(); + // Unregister all nav menu locations. + foreach ( array_keys( get_registered_nav_menus() ) as $location ) { + unregister_nav_menu( $location ); + } + + $orig_args = array( + 'name' => 'Original Name', + 'description' => 'Original Description', + 'slug' => 'original-slug', + 'taxonomy' => 'nav_menu', + ); + + $this->menu_id = $this->factory->term->create( $orig_args ); + + register_meta( + 'term', + 'test_single_menu', + array( + 'object_subtype' => self::TAXONOMY, + 'show_in_rest' => true, + 'single' => true, + 'type' => 'string', + ) + ); + } + + /** + * Register nav menu locations. + * + * @param array $locations Location slugs. + */ + public function register_nav_menu_locations( $locations ) { + foreach ( $locations as $location ) { + register_nav_menu( $location, ucfirst( $location ) ); + } + } + + /** + * @ticket 40878 + * @covers ::register_routes + */ + public function test_register_routes() { + $routes = rest_get_server()->get_routes(); + $this->assertArrayHasKey( '/wp/v2/menus', $routes ); + $this->assertArrayHasKey( '/wp/v2/menus/(?P[\d]+)', $routes ); + } + + /** + * @ticket 40878 + * @covers ::get_context_param + */ + public function test_context_param() { + // Collection. + $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/menus' ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $this->assertSame( 'view', $data['endpoints'][0]['args']['context']['default'] ); + $this->assertSameSets( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] ); + $this->assertSame( array( 'v1' => true ), $data['endpoints'][0]['allow_batch'] ); + // Single. + $tag1 = $this->factory->tag->create( array( 'name' => 'Season 5' ) ); + $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/menus/' . $tag1 ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $this->assertSame( 'view', $data['endpoints'][0]['args']['context']['default'] ); + $this->assertSameSets( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] ); + $this->assertSame( array( 'v1' => true ), $data['endpoints'][0]['allow_batch'] ); + } + + /** + * @ticket 40878 + * @covers ::get_collection_params + */ + public function test_registered_query_params() { + $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/menus' ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $keys = array_keys( $data['endpoints'][0]['args'] ); + sort( $keys ); + $this->assertSame( + array( + 'context', + 'exclude', + 'hide_empty', + 'include', + 'offset', + 'order', + 'orderby', + 'page', + 'per_page', + 'post', + 'search', + 'slug', + ), + $keys + ); + } + + /** + * @ticket 40878 + * @covers ::get_items + */ + public function test_get_items() { + wp_set_current_user( self::$admin_id ); + wp_update_nav_menu_object( + 0, + array( + 'description' => 'Test get', + 'menu-name' => 'test Name get', + ) + ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menus' ); + $request->set_param( 'per_page', self::$per_page ); + $response = rest_get_server()->dispatch( $request ); + $this->check_get_taxonomy_terms_response( $response ); + } + + /** + * @ticket 40878 + * @covers ::get_item + */ + public function test_get_item() { + wp_set_current_user( self::$admin_id ); + $nav_menu_id = wp_update_nav_menu_object( + 0, + array( + 'description' => 'Test menu', + 'menu-name' => 'test Name', + ) + ); + + $this->register_nav_menu_locations( array( 'primary' ) ); + set_theme_mod( 'nav_menu_locations', array( 'primary' => $nav_menu_id ) ); + + $request = new WP_REST_Request( 'GET', '/wp/v2/menus/' . $nav_menu_id ); + $response = rest_get_server()->dispatch( $request ); + $this->check_get_taxonomy_term_response( $response, $nav_menu_id ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item() { + wp_set_current_user( self::$admin_id ); + + $request = new WP_REST_Request( 'POST', '/wp/v2/menus' ); + $request->set_param( 'name', 'My Awesome menus' ); + $request->set_param( 'description', 'This menu is so awesome.' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertSame( 201, $response->get_status() ); + $headers = $response->get_headers(); + $data = $response->get_data(); + $this->assertStringContainsString( '/wp/v2/menus/' . $data['id'], $headers['Location'] ); + $this->assertSame( 'My Awesome menus', $data['name'] ); + $this->assertSame( 'This menu is so awesome.', $data['description'] ); + $this->assertSame( 'my-awesome-menus', $data['slug'] ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item_same_name() { + wp_set_current_user( self::$admin_id ); + + wp_update_nav_menu_object( + 0, + array( + 'description' => 'This menu is so Original', + 'menu-name' => 'Original', + ) + ); + + $request = new WP_REST_Request( 'POST', '/wp/v2/menus' ); + $request->set_param( 'name', 'Original' ); + $request->set_param( 'description', 'This menu is so Original' ); + $response = rest_get_server()->dispatch( $request ); + + $this->assertErrorResponse( 'menu_exists', $response, 400 ); + } + + /** + * @ticket 40878 + * @covers ::update_item + * @covers ::handle_auto_add + */ + public function test_update_item() { + wp_set_current_user( self::$admin_id ); + + $request = new WP_REST_Request( 'POST', '/wp/v2/menus/' . $this->menu_id ); + $request->set_param( 'name', 'New Name' ); + $request->set_param( 'description', 'New Description' ); + $request->set_param( 'auto_add', true ); + $request->set_param( + 'meta', + array( + 'test_single_menu' => 'just meta', + ) + ); + $response = rest_get_server()->dispatch( $request ); + $this->assertSame( 200, $response->get_status() ); + $data = $response->get_data(); + $this->assertSame( 'New Name', $data['name'] ); + $this->assertSame( 'New Description', $data['description'] ); + $this->assertSame( true, $data['auto_add'] ); + $this->assertSame( 'new-name', $data['slug'] ); + $this->assertSame( 'just meta', $data['meta']['test_single_menu'] ); + $this->assertFalse( isset( $data['meta']['test_cat_meta'] ) ); + } + + /** + * @ticket 40878 + * @covers ::delete_item + */ + public function test_delete_item() { + wp_set_current_user( self::$admin_id ); + + $nav_menu_id = wp_update_nav_menu_object( + 0, + array( + 'description' => 'Deleted Menu', + 'menu-name' => 'Deleted Menu', + ) + ); + + $term = get_term_by( 'id', $nav_menu_id, self::TAXONOMY ); + + $request = new WP_REST_Request( 'DELETE', '/wp/v2/menus/' . $term->term_id ); + $request->set_param( 'force', true ); + $response = rest_get_server()->dispatch( $request ); + $this->assertSame( 200, $response->get_status() ); + $data = $response->get_data(); + $this->assertTrue( $data['deleted'] ); + $this->assertSame( 'Deleted Menu', $data['previous']['name'] ); + } + + /** + * @ticket 40878 + * @covers ::prepare_item_for_response + * @covers ::get_item + */ + public function test_prepare_item() { + $nav_menu_id = wp_update_nav_menu_object( + 0, + array( + 'description' => 'Foo Menu', + 'menu-name' => 'Foo Menu', + ) + ); + + $term = get_term_by( 'id', $nav_menu_id, self::TAXONOMY ); + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menus/' . $term->term_id ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + + $this->check_taxonomy_term( $term, $data, $response->get_links() ); + } + + /** + * @ticket 40878 + * @covers ::get_item_schema + */ + public function test_get_item_schema() { + $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/menus' ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $properties = $data['schema']['properties']; + $this->assertSame( 7, count( $properties ) ); + $this->assertArrayHasKey( 'id', $properties ); + $this->assertArrayHasKey( 'description', $properties ); + $this->assertArrayHasKey( 'meta', $properties ); + $this->assertArrayHasKey( 'name', $properties ); + $this->assertArrayHasKey( 'slug', $properties ); + $this->assertArrayHasKey( 'locations', $properties ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item_with_location_permission_correct() { + $this->register_nav_menu_locations( array( 'primary', 'secondary' ) ); + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'POST', '/wp/v2/menus' ); + $request->set_param( 'name', 'My Awesome Term' ); + $request->set_param( 'slug', 'so-awesome' ); + $request->set_param( 'locations', 'primary' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertSame( 201, $response->get_status() ); + $data = $response->get_data(); + $term_id = $data['id']; + $locations = get_nav_menu_locations(); + $this->assertSame( $locations['primary'], $term_id ); + } + + /** + * @ticket 40878 + * @covers ::create_item + */ + public function test_create_item_with_invalid_location() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'POST', '/wp/v2/menus' ); + $request->set_param( 'name', 'My Awesome Term' ); + $request->set_param( 'slug', 'so-awesome' ); + $request->set_param( 'locations', 'bar' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertSame( 400, $response->get_status() ); + $this->assertErrorResponse( 'rest_invalid_param', $response, 400 ); + $this->assertArrayHasKey( 'locations', $response->get_data()['data']['details'] ); + $this->assertSame( 'rest_invalid_menu_location', $response->get_data()['data']['details']['locations']['code'] ); + } + + /** + * @ticket 40878 + * @covers ::update_item + */ + public function test_update_item_with_no_location() { + $this->register_nav_menu_locations( array( 'primary', 'secondary' ) ); + wp_set_current_user( self::$admin_id ); + + $request = new WP_REST_Request( 'POST', '/wp/v2/menus/' . $this->menu_id ); + $request->set_param( 'name', 'New Name' ); + $request->set_param( 'description', 'New Description' ); + $request->set_param( 'slug', 'new-slug' ); + $request->set_param( 'locations', 'bar' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertSame( 400, $response->get_status() ); + } + + /** + * @ticket 40878 + * @covers ::update_item + */ + public function test_update_item_with_location_permission_correct() { + $this->register_nav_menu_locations( array( 'primary', 'secondary' ) ); + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'POST', '/wp/v2/menus/' . $this->menu_id ); + $request->set_param( 'name', 'New Name' ); + $request->set_param( 'description', 'New Description' ); + $request->set_param( 'slug', 'new-slug' ); + $request->set_param( 'locations', 'primary' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertSame( 200, $response->get_status() ); + $locations = get_nav_menu_locations(); + $this->assertSame( $locations['primary'], $this->menu_id ); + } + + /** + * @ticket 40878 + * @covers ::update_item + */ + public function test_update_item_with_location_permission_incorrect() { + $this->register_nav_menu_locations( array( 'primary', 'secondary' ) ); + wp_set_current_user( self::$subscriber_id ); + $request = new WP_REST_Request( 'POST', '/wp/v2/menus/' . $this->menu_id ); + $request->set_param( 'name', 'New Name' ); + $request->set_param( 'description', 'New Description' ); + $request->set_param( 'slug', 'new-slug' ); + $request->set_param( 'locations', 'primary' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertSame( rest_authorization_required_code(), $response->get_status() ); + } + + /** + * @ticket 40878 + * @covers ::prepare_links + */ + public function test_get_item_links() { + wp_set_current_user( self::$admin_id ); + + $nav_menu_id = wp_update_nav_menu_object( + 0, + array( + 'description' => 'Foo Menu', + 'menu-name' => 'Foo Menu', + ) + ); + + register_nav_menu( 'foo', 'Bar' ); + + set_theme_mod( 'nav_menu_locations', array( 'foo' => $nav_menu_id ) ); + + $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/menus/%d', $nav_menu_id ) ); + $response = rest_get_server()->dispatch( $request ); + + $links = $response->get_links(); + $this->assertArrayHasKey( 'https://api.w.org/menu-location', $links ); + + $location_url = rest_url( '/wp/v2/menu-locations/foo' ); + $this->assertSame( $location_url, $links['https://api.w.org/menu-location'][0]['href'] ); + } + + /** + * @ticket 40878 + * @covers ::update_item + * @covers ::handle_locations + */ + public function test_change_menu_location() { + $this->register_nav_menu_locations( array( 'primary', 'secondary' ) ); + $secondary_id = self::factory()->term->create( + array( + 'name' => 'Secondary Name', + 'description' => 'Secondary Description', + 'slug' => 'secondary-slug', + 'taxonomy' => 'nav_menu', + ) + ); + + $locations = get_nav_menu_locations(); + $locations['primary'] = $this->menu_id; + $locations['secondary'] = $secondary_id; + set_theme_mod( 'nav_menu_locations', $locations ); + + wp_set_current_user( self::$admin_id ); + + $request = new WP_REST_Request( 'POST', '/wp/v2/menus/' . $this->menu_id ); + $request->set_body_params( + array( + 'locations' => array( 'secondary' ), + ) + ); + $response = rest_get_server()->dispatch( $request ); + + $this->assertSame( 200, $response->get_status() ); + + $locations = get_nav_menu_locations(); + $this->assertArrayNotHasKey( 'primary', $locations ); + $this->assertArrayHasKey( 'secondary', $locations ); + $this->assertSame( $this->menu_id, $locations['secondary'] ); + } + + /** + * @ticket 40878 + * @covers ::get_items + * @covers ::get_items_permissions_check + */ + public function test_get_items_no_permission() { + wp_set_current_user( 0 ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menus' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_cannot_view', $response, 401 ); + } + + /** + * @ticket 40878 + * @covers ::get_items + * @covers ::get_items_permissions_check + */ + public function test_get_item_no_permission() { + wp_set_current_user( 0 ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menus/' . $this->menu_id ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_cannot_view', $response, 401 ); + } + + /** + * @ticket 40878 + * @covers ::get_items + * @covers ::get_items_permissions_check + */ + public function test_get_items_wrong_permission() { + wp_set_current_user( self::$subscriber_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menus' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_cannot_view', $response, 403 ); + } + + /** + * @ticket 40878 + * @covers ::get_item + * @covers ::get_item_permissions_check + */ + public function test_get_item_wrong_permission() { + wp_set_current_user( self::$subscriber_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/menus/' . $this->menu_id ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_cannot_view', $response, 403 ); + } + + /** + * @ticket 40878 + */ + public function test_it_allows_batch_requests_when_updating_menus() { + $rest_server = rest_get_server(); + // This call is needed to initialize route_options. + $rest_server->get_routes(); + $route_options = $rest_server->get_route_options( '/wp/v2/menus/(?P[\d]+)' ); + + $this->assertArrayHasKey( 'allow_batch', $route_options ); + $this->assertSame( array( 'v1' => true ), $route_options['allow_batch'] ); + } + + /** + * @param WP_REST_Response $response Response Class. + */ + protected function check_get_taxonomy_terms_response( $response ) { + $this->assertSame( 200, $response->get_status() ); + $data = $response->get_data(); + $args = array( + 'hide_empty' => false, + ); + $tags = get_terms( self::TAXONOMY, $args ); + $this->assertSame( count( $tags ), count( $data ) ); + $this->assertSame( $tags[0]->term_id, $data[0]['id'] ); + $this->assertSame( $tags[0]->name, $data[0]['name'] ); + $this->assertSame( $tags[0]->slug, $data[0]['slug'] ); + $this->assertSame( $tags[0]->description, $data[0]['description'] ); + } + + /** + * @param WP_REST_Response $response Response Class. + * @param int $id Term ID. + */ + protected function check_get_taxonomy_term_response( $response, $id ) { + $this->assertSame( 200, $response->get_status() ); + + $data = $response->get_data(); + $menu = get_term( $id, self::TAXONOMY ); + $this->check_taxonomy_term( $menu, $data, $response->get_links() ); + } + + /** + * @param WP_Term $term WP_Term object. + * @param array $data Data from REST API. + * @param array $links Array of links. + */ + protected function check_taxonomy_term( $term, $data, $links ) { + $this->assertSame( $term->term_id, $data['id'] ); + $this->assertSame( $term->name, $data['name'] ); + $this->assertSame( $term->slug, $data['slug'] ); + $this->assertSame( $term->description, $data['description'] ); + $this->assertFalse( isset( $data['parent'] ) ); + + $locations = get_nav_menu_locations(); + if ( ! empty( $locations ) ) { + $menu_locations = array(); + foreach ( $locations as $location => $menu_id ) { + if ( $menu_id === $term->term_id ) { + $menu_locations[] = $location; + } + } + + $this->assertSame( $menu_locations, $data['locations'] ); + } + + $relations = array( + 'self', + 'collection', + 'about', + 'https://api.w.org/post_type', + ); + + if ( ! empty( $data['parent'] ) ) { + $relations[] = 'up'; + } + + if ( ! empty( $data['locations'] ) ) { + $relations[] = 'https://api.w.org/menu-location'; + } + + $this->assertSameSets( $relations, array_keys( $links ) ); + $this->assertStringContainsString( 'wp/v2/taxonomies/' . $term->taxonomy, $links['about'][0]['href'] ); + $this->assertSame( add_query_arg( 'menus', $term->term_id, rest_url( 'wp/v2/menu-items' ) ), $links['https://api.w.org/post_type'][0]['href'] ); + } +} diff --git a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php new file mode 100644 index 0000000000..5242436bd6 --- /dev/null +++ b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php @@ -0,0 +1,668 @@ +user->create( + array( + 'role' => 'administrator', + ) + ); + + // Set up template post. + $args = array( + 'post_type' => 'wp_template', + 'post_name' => 'my_template', + 'post_title' => 'My Template', + 'post_content' => 'Content', + 'post_excerpt' => 'Description of my template.', + 'tax_input' => array( + 'wp_theme' => array( + get_stylesheet(), + ), + ), + ); + self::$post = self::factory()->post->create_and_get( $args ); + wp_set_post_terms( self::$post->ID, get_stylesheet(), 'wp_theme' ); + } + + public static function wpTearDownAfterClass() { + wp_delete_post( self::$post->ID ); + } + + /** + * @covers WP_REST_Templates_Controller::register_routes + * @ticket 54596 + */ + public function test_register_routes() { + $routes = rest_get_server()->get_routes(); + $this->assertArrayHasKey( + '/wp/v2/templates', + $routes, + 'Templates route does not exist' + ); + $this->assertArrayHasKey( + '/wp/v2/templates/(?P([^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)[\/\w-]+)', + $routes, + 'Single template based on the given ID route does not exist' + ); + } + + /** + * @covers WP_REST_Templates_Controller::get_context_param + */ + public function test_context_param() { + // Collection. + $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/templates' ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $this->assertSame( 'view', $data['endpoints'][0]['args']['context']['default'] ); + $this->assertSame( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] ); + // Single. + $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/templates/default//my_template' ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $this->assertSame( 'view', $data['endpoints'][0]['args']['context']['default'] ); + $this->assertSame( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] ); + } + + /** + * @covers WP_REST_Templates_Controller::get_items + */ + public function test_get_items() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/templates' ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + + $this->assertSame( + array( + 'id' => 'default//my_template', + 'theme' => 'default', + 'slug' => 'my_template', + 'source' => 'custom', + 'origin' => null, + 'type' => 'wp_template', + 'description' => 'Description of my template.', + 'title' => array( + 'raw' => 'My Template', + 'rendered' => 'My Template', + ), + 'status' => 'publish', + 'wp_id' => self::$post->ID, + 'has_theme_file' => false, + 'is_custom' => true, + 'author' => 0, + ), + $this->find_and_normalize_template_by_id( $data, 'default//my_template' ) + ); + } + + /** + * @covers WP_REST_Templates_Controller::get_items + */ + public function test_get_items_no_permission() { + wp_set_current_user( 0 ); + $request = new WP_REST_Request( 'GET', '/wp/v2/templates' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_cannot_manage_templates', $response, 401 ); + } + + /** + * @covers WP_REST_Templates_Controller::get_item + */ + public function test_get_item() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'GET', '/wp/v2/templates/default//my_template' ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + unset( $data['content'] ); + unset( $data['_links'] ); + + $this->assertSame( + array( + 'id' => 'default//my_template', + 'theme' => 'default', + 'slug' => 'my_template', + 'source' => 'custom', + 'origin' => null, + 'type' => 'wp_template', + 'description' => 'Description of my template.', + 'title' => array( + 'raw' => 'My Template', + 'rendered' => 'My Template', + ), + 'status' => 'publish', + 'wp_id' => self::$post->ID, + 'has_theme_file' => false, + 'is_custom' => true, + 'author' => 0, + ), + $data + ); + } + + /** + * @ticket 54507 + * @dataProvider get_template_endpoint_urls + */ + public function test_get_item_works_with_a_single_slash( $endpoint_url ) { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'GET', $endpoint_url ); + $response = rest_get_server()->dispatch( $request ); + + $data = $response->get_data(); + unset( $data['content'] ); + unset( $data['_links'] ); + + $this->assertSame( + array( + 'id' => 'default//my_template', + 'theme' => 'default', + 'slug' => 'my_template', + 'source' => 'custom', + 'origin' => null, + 'type' => 'wp_template', + 'description' => 'Description of my template.', + 'title' => array( + 'raw' => 'My Template', + 'rendered' => 'My Template', + ), + 'status' => 'publish', + 'wp_id' => self::$post->ID, + 'has_theme_file' => false, + 'is_custom' => true, + 'author' => 0, + ), + $data + ); + } + + public function get_template_endpoint_urls() { + return array( + array( '/wp/v2/templates/default/my_template' ), + array( '/wp/v2/templates/default//my_template' ), + ); + } + + /** + * @dataProvider data_get_item_with_valid_theme_dirname + * @covers WP_REST_Templates_Controller::get_item + * @ticket 54596 + * + * @param string $theme_dir Theme directory to test. + * @param string $template Template to test. + * @param array $args Arguments to create the 'wp_template" post. + */ + public function test_get_item_with_valid_theme_dirname( $theme_dir, $template, array $args ) { + wp_set_current_user( self::$admin_id ); + switch_theme( $theme_dir ); + + // Set up template post. + $args['post_type'] = 'wp_template'; + $args['tax_input'] = array( + 'wp_theme' => array( + get_stylesheet(), + ), + ); + $post = self::factory()->post->create_and_get( $args ); + wp_set_post_terms( $post->ID, get_stylesheet(), 'wp_theme' ); + + $request = new WP_REST_Request( 'GET', "/wp/v2/templates/{$theme_dir}//{$template}" ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + unset( $data['content'] ); + unset( $data['_links'] ); + + $this->assertSameSetsWithIndex( + array( + 'id' => "{$theme_dir}//{$template}", + 'theme' => $theme_dir, + 'slug' => $template, + 'source' => 'custom', + 'origin' => null, + 'type' => 'wp_template', + 'description' => $args['post_excerpt'], + 'title' => array( + 'raw' => $args['post_title'], + 'rendered' => $args['post_title'], + ), + 'status' => 'publish', + 'wp_id' => $post->ID, + 'has_theme_file' => false, + 'is_custom' => true, + 'author' => self::$admin_id, + ), + $data + ); + } + + /** + * Data provider. + * + * @return array + */ + public function data_get_item_with_valid_theme_dirname() { + $theme_root_dir = DIR_TESTDATA . '/themedir1/'; + return array( + 'template parts: parent theme' => array( + 'theme_dir' => 'themedir1/block-theme', + 'template' => 'small-header', + 'args' => array( + 'post_name' => 'small-header', + 'post_title' => 'Small Header Template', + 'post_content' => file_get_contents( $theme_root_dir . '/block-theme/parts/small-header.html' ), + 'post_excerpt' => 'Description of small header template.', + ), + ), + 'template: parent theme' => array( + 'theme_dir' => 'themedir1/block-theme', + 'template' => 'page-home', + 'args' => array( + 'post_name' => 'page-home', + 'post_title' => 'Home Page Template', + 'post_content' => file_get_contents( $theme_root_dir . 'block-theme/templates/page-home.html' ), + 'post_excerpt' => 'Description of page home template.', + ), + ), + 'template: child theme' => array( + 'theme_dir' => 'themedir1/block-theme-child', + 'template' => 'page-1', + 'args' => array( + 'post_name' => 'page-1', + 'post_title' => 'Page 1 Template', + 'post_content' => file_get_contents( $theme_root_dir . 'block-theme-child/templates/page-1.html' ), + 'post_excerpt' => 'Description of page 1 template.', + ), + ), + 'template part: subdir with _-[]. characters' => array( + 'theme_dir' => 'themedir1/block_theme-[0.4.0]', + 'template' => 'large-header', + 'args' => array( + 'post_name' => 'large-header', + 'post_title' => 'Large Header Template Part', + 'post_content' => file_get_contents( $theme_root_dir . 'block_theme-[0.4.0]/parts/large-header.html' ), + 'post_excerpt' => 'Description of large header template.', + ), + ), + 'template: subdir with _-[]. characters' => array( + 'theme_dir' => 'themedir1/block_theme-[0.4.0]', + 'template' => 'page-large-header', + 'args' => array( + 'post_name' => 'page-large-header', + 'post_title' => 'Page Large Template', + 'post_content' => file_get_contents( $theme_root_dir . 'block_theme-[0.4.0]/templates/page-large-header.html' ), + 'post_excerpt' => 'Description of page large template.', + ), + ), + ); + } + + /** + * @ticket 54507 + * @dataProvider get_template_ids_to_sanitize + */ + public function test_sanitize_template_id( $input_id, $sanitized_id ) { + $endpoint = new WP_REST_Templates_Controller( 'wp_template' ); + $this->assertEquals( + $sanitized_id, + $endpoint->_sanitize_template_id( $input_id ) + ); + } + + public function get_template_ids_to_sanitize() { + return array( + array( 'tt1-blocks/index', 'tt1-blocks//index' ), + array( 'tt1-blocks//index', 'tt1-blocks//index' ), + + array( 'theme-experiments/tt1-blocks/index', 'theme-experiments/tt1-blocks//index' ), + array( 'theme-experiments/tt1-blocks//index', 'theme-experiments/tt1-blocks//index' ), + ); + } + + /** + * @ticket 54422 + * @covers WP_REST_Templates_Controller::create_item + */ + public function test_create_item() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'POST', '/wp/v2/templates' ); + $request->set_body_params( + array( + 'slug' => 'my_custom_template', + 'description' => 'Just a description', + 'title' => 'My Template', + 'content' => 'Content', + 'author' => self::$admin_id, + ) + ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + unset( $data['_links'] ); + unset( $data['wp_id'] ); + + $this->assertSame( + array( + 'id' => 'default//my_custom_template', + 'theme' => 'default', + 'content' => array( + 'raw' => 'Content', + ), + 'slug' => 'my_custom_template', + 'source' => 'custom', + 'origin' => null, + 'type' => 'wp_template', + 'description' => 'Just a description', + 'title' => array( + 'raw' => 'My Template', + 'rendered' => 'My Template', + ), + 'status' => 'publish', + 'has_theme_file' => false, + 'is_custom' => true, + 'author' => self::$admin_id, + ), + $data + ); + } + + /** + * @ticket 54680 + * @covers WP_REST_Templates_Controller::create_item + * @covers WP_REST_Templates_Controller::get_item_schema + */ + public function test_create_item_with_numeric_slug() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'POST', '/wp/v2/templates' ); + $request->set_body_params( + array( + 'slug' => '404', + 'description' => 'Template shown when no content is found.', + 'title' => '404', + 'author' => self::$admin_id, + ) + ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + unset( $data['_links'] ); + unset( $data['wp_id'] ); + + $this->assertSame( + array( + 'id' => 'default//404', + 'theme' => 'default', + 'content' => array( + 'raw' => '', + ), + 'slug' => '404', + 'source' => 'custom', + 'origin' => null, + 'type' => 'wp_template', + 'description' => 'Template shown when no content is found.', + 'title' => array( + 'raw' => '404', + 'rendered' => '404', + ), + 'status' => 'publish', + 'has_theme_file' => false, + 'is_custom' => false, + 'author' => self::$admin_id, + ), + $data + ); + } + + /** + * @ticket 54422 + * @covers WP_REST_Templates_Controller::create_item + */ + public function test_create_item_raw() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'POST', '/wp/v2/templates' ); + $request->set_body_params( + array( + 'slug' => 'my_custom_template_raw', + 'description' => 'Just a description', + 'title' => array( + 'raw' => 'My Template', + ), + 'content' => array( + 'raw' => 'Content', + ), + 'author' => self::$admin_id, + ) + ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + unset( $data['_links'] ); + unset( $data['wp_id'] ); + + $this->assertSame( + array( + 'id' => 'default//my_custom_template_raw', + 'theme' => 'default', + 'content' => array( + 'raw' => 'Content', + ), + 'slug' => 'my_custom_template_raw', + 'source' => 'custom', + 'origin' => null, + 'type' => 'wp_template', + 'description' => 'Just a description', + 'title' => array( + 'raw' => 'My Template', + 'rendered' => 'My Template', + ), + 'status' => 'publish', + 'has_theme_file' => false, + 'is_custom' => true, + 'author' => self::$admin_id, + ), + $data + ); + } + + public function test_create_item_invalid_author() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'POST', '/wp/v2/templates' ); + $request->set_body_params( + array( + 'slug' => 'my_custom_template_invalid_author', + 'description' => 'Just a description', + 'title' => 'My Template', + 'content' => 'Content', + 'author' => -1, + ) + ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_invalid_author', $response, 400 ); + } + + /** + * @covers WP_REST_Templates_Controller::update_item + */ + public function test_update_item() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'PUT', '/wp/v2/templates/default//my_template' ); + $request->set_body_params( + array( + 'title' => 'My new Index Title', + ) + ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $this->assertSame( 'My new Index Title', $data['title']['raw'] ); + $this->assertSame( 'custom', $data['source'] ); + } + + /** + * @covers WP_REST_Templates_Controller::update_item + */ + public function test_update_item_raw() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'PUT', '/wp/v2/templates/default//my_template' ); + $request->set_body_params( + array( + 'title' => array( 'raw' => 'My new raw Index Title' ), + ) + ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $this->assertSame( 'My new raw Index Title', $data['title']['raw'] ); + $this->assertSame( 'custom', $data['source'] ); + } + + /** + * @covers WP_REST_Templates_Controller::delete_item + */ + public function test_delete_item() { + // Set up template post. + $args = array( + 'post_type' => 'wp_template', + 'post_name' => 'my_test_template', + 'post_title' => 'My Template', + 'post_content' => 'Content', + 'post_excerpt' => 'Description of my template.', + 'tax_input' => array( + 'wp_theme' => array( + get_stylesheet(), + ), + ), + ); + $post_id = self::factory()->post->create( $args ); + wp_set_post_terms( $post_id, get_stylesheet(), 'wp_theme' ); + + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'DELETE', '/wp/v2/templates/default//my_test_template' ); + $request->set_param( 'force', 'false' ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $this->assertSame( 'My Template', $data['title']['raw'] ); + $this->assertSame( 'trash', $data['status'] ); + } + + /** + * @covers WP_REST_Templates_Controller::delete_item + */ + public function test_delete_item_skip_trash() { + // Set up template post. + $args = array( + 'post_type' => 'wp_template', + 'post_name' => 'my_test_template', + 'post_title' => 'My Template', + 'post_content' => 'Content', + 'post_excerpt' => 'Description of my template.', + 'tax_input' => array( + 'wp_theme' => array( + get_stylesheet(), + ), + ), + ); + $post_id = self::factory()->post->create( $args ); + wp_set_post_terms( $post_id, get_stylesheet(), 'wp_theme' ); + + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'DELETE', '/wp/v2/templates/default//my_test_template' ); + $request->set_param( 'force', 'true' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertSame( 200, $response->get_status() ); + $data = $response->get_data(); + $this->assertTrue( $data['deleted'] ); + $this->assertNotEmpty( $data['previous'] ); + } + + /** + * @covers WP_REST_Templates_Controller::delete_item + */ + public function test_delete_item_fail() { + wp_set_current_user( self::$admin_id ); + $request = new WP_REST_Request( 'DELETE', '/wp/v2/templates/justrandom//template' ); + $response = rest_get_server()->dispatch( $request ); + $this->assertErrorResponse( 'rest_template_not_found', $response, 404 ); + } + + public function test_prepare_item() { + // TODO: Implement test_prepare_item() method. + } + + public function test_prepare_item_limit_fields() { + wp_set_current_user( self::$admin_id ); + + $endpoint = new WP_REST_Templates_Controller( 'wp_template' ); + $request = new WP_REST_Request( 'GET', '/wp/v2/templates/default//my_template' ); + $request->set_param( 'context', 'edit' ); + $request->set_param( '_fields', 'id,slug' ); + $obj = get_block_template( 'default//my_template', 'wp_template' ); + $response = $endpoint->prepare_item_for_response( $obj, $request ); + $this->assertSame( + array( + 'id', + 'slug', + ), + array_keys( $response->get_data() ) + ); + } + + /** + * @ticket 54422 + * @covers WP_REST_Templates_Controller::get_item_schema + */ + public function test_get_item_schema() { + $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/templates' ); + $response = rest_get_server()->dispatch( $request ); + $data = $response->get_data(); + $properties = $data['schema']['properties']; + $this->assertCount( 14, $properties ); + $this->assertArrayHasKey( 'id', $properties ); + $this->assertArrayHasKey( 'description', $properties ); + $this->assertArrayHasKey( 'slug', $properties ); + $this->assertArrayHasKey( 'theme', $properties ); + $this->assertArrayHasKey( 'type', $properties ); + $this->assertArrayHasKey( 'source', $properties ); + $this->assertArrayHasKey( 'origin', $properties ); + $this->assertArrayHasKey( 'content', $properties ); + $this->assertArrayHasKey( 'title', $properties ); + $this->assertArrayHasKey( 'description', $properties ); + $this->assertArrayHasKey( 'status', $properties ); + $this->assertArrayHasKey( 'wp_id', $properties ); + $this->assertArrayHasKey( 'has_theme_file', $properties ); + $this->assertArrayHasKey( 'is_custom', $properties ); + $this->assertArrayHasKey( 'author', $properties ); + } + + protected function find_and_normalize_template_by_id( $templates, $id ) { + foreach ( $templates as $template ) { + if ( $template['id'] === $id ) { + unset( $template['content'] ); + unset( $template['_links'] ); + return $template; + } + } + + return null; + } + +} diff --git a/tests/phpunit/tests/rest-api/wpRestUrlDetailsController.php b/tests/phpunit/tests/rest-api/wpRestUrlDetailsController.php index db4d229da3..642e51235d 100644 --- a/tests/phpunit/tests/rest-api/wpRestUrlDetailsController.php +++ b/tests/phpunit/tests/rest-api/wpRestUrlDetailsController.php @@ -93,7 +93,7 @@ class Tests_REST_WpRestUrlDetailsController extends WP_Test_REST_Controller_Test add_filter( 'pre_http_request', array( $this, 'mock_success_request_to_remote_url' ), 10, 3 ); // Disables usage of cache during major of tests. - add_filter( 'pre_transient_' . $this->get_transient_name(), '__return_null' ); + add_filter( 'pre_site_transient_' . $this->get_transient_name(), '__return_null' ); } public function tear_down() { @@ -341,11 +341,11 @@ class Tests_REST_WpRestUrlDetailsController extends WP_Test_REST_Controller_Test */ public function test_will_return_from_cache_if_populated() { $transient_name = $this->get_transient_name(); - remove_filter( "pre_transient_{$transient_name}", '__return_null' ); + remove_filter( "pre_site_transient_{$transient_name}", '__return_null' ); // Force cache to return a known value as the remote URL http response body. add_filter( - "pre_transient_{$transient_name}", + "pre_site_transient_{$transient_name}", static function() { return 'This value from cache.'; } diff --git a/tests/phpunit/tests/rewrite.php b/tests/phpunit/tests/rewrite.php index 62697800cc..1a5ad9774b 100644 --- a/tests/phpunit/tests/rewrite.php +++ b/tests/phpunit/tests/rewrite.php @@ -173,7 +173,7 @@ class Tests_Rewrite extends WP_UnitTestCase { public function test_url_to_postid_custom_post_type() { delete_option( 'rewrite_rules' ); - $post_type = rand_str( 12 ); + $post_type = 'url_to_postid'; register_post_type( $post_type, array( 'public' => true ) ); $id = self::factory()->post->create( array( 'post_type' => $post_type ) ); diff --git a/tests/phpunit/tests/rewrite/numericSlugs.php b/tests/phpunit/tests/rewrite/numericSlugs.php index e11c6b2a46..41ef636368 100644 --- a/tests/phpunit/tests/rewrite/numericSlugs.php +++ b/tests/phpunit/tests/rewrite/numericSlugs.php @@ -23,7 +23,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '', 'post_name' => '2015', 'post_date' => '2015-02-01 01:00:00', @@ -53,7 +53,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '', 'post_name' => '2015', 'post_date' => '2015-02-01 01:00:00', @@ -80,7 +80,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '2015', 'post_date' => '2015-02-01 01:00:00', ) @@ -98,7 +98,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '2015', 'post_date' => '2015-02-01 01:00:00', ) @@ -114,7 +114,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '', 'post_name' => '02', 'post_date' => '2015-02-01 01:00:00', @@ -133,7 +133,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '', 'post_name' => '02', 'post_date' => '2015-02-01 01:00:00', @@ -150,7 +150,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '', 'post_name' => '2', 'post_date' => '2015-02-01 01:00:00', @@ -169,7 +169,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '', 'post_name' => '2', 'post_date' => '2015-02-01 01:00:00', @@ -186,7 +186,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '02', 'post_date' => '2015-02-01 01:00:00', ) @@ -204,7 +204,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '02', 'post_date' => '2015-02-01 01:00:00', ) @@ -220,7 +220,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '2', 'post_date' => '2015-02-01 01:00:00', ) @@ -238,7 +238,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '2', 'post_date' => '2015-02-01 01:00:00', ) @@ -254,7 +254,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '', 'post_name' => '01', 'post_date' => '2015-02-01 01:00:00', @@ -273,7 +273,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '', 'post_name' => '01', 'post_date' => '2015-02-01 01:00:00', @@ -290,7 +290,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '01', 'post_date' => '2015-02-01 01:00:00', ) @@ -308,7 +308,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '01', 'post_date' => '2015-02-01 01:00:00', ) @@ -324,7 +324,7 @@ class Tests_Rewrite_NumericSlugs extends WP_UnitTestCase { array( 'post_author' => $this->author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), + 'post_content' => 'content', 'post_title' => '01', 'post_date' => '2015-02-01 01:00:00', ) diff --git a/tests/phpunit/tests/taxonomy.php b/tests/phpunit/tests/taxonomy.php index 6d7cc06602..122f55b6bc 100644 --- a/tests/phpunit/tests/taxonomy.php +++ b/tests/phpunit/tests/taxonomy.php @@ -17,7 +17,7 @@ class Tests_Taxonomy extends WP_UnitTestCase { */ public function test_get_unknown_taxonomies() { // Taxonomies for an unknown object type. - $this->assertSame( array(), get_object_taxonomies( rand_str() ) ); + $this->assertSame( array(), get_object_taxonomies( 'unknown' ) ); $this->assertSame( array(), get_object_taxonomies( '' ) ); $this->assertSame( array(), get_object_taxonomies( 0 ) ); $this->assertSame( array(), get_object_taxonomies( null ) ); @@ -144,7 +144,7 @@ class Tests_Taxonomy extends WP_UnitTestCase { public function test_register_taxonomy() { // Make up a new taxonomy name, and ensure it's unused. - $tax = rand_str(); + $tax = 'tax_new'; $this->assertFalse( taxonomy_exists( $tax ) ); register_taxonomy( $tax, 'post' ); @@ -158,7 +158,7 @@ class Tests_Taxonomy extends WP_UnitTestCase { public function test_register_hierarchical_taxonomy() { // Make up a new taxonomy name, and ensure it's unused. - $tax = rand_str(); + $tax = 'tax_new'; $this->assertFalse( taxonomy_exists( $tax ) ); register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) ); diff --git a/tests/phpunit/tests/term.php b/tests/phpunit/tests/term.php index 61fbb3a397..4cc0701097 100644 --- a/tests/phpunit/tests/term.php +++ b/tests/phpunit/tests/term.php @@ -51,14 +51,17 @@ class Tests_Term extends WP_UnitTestCase { */ public function test_is_term_type() { // Insert a term. - $term = rand_str(); + $term = 'term_new'; $t = wp_insert_term( $term, $this->taxonomy ); $this->assertIsArray( $t ); $term_obj = get_term_by( 'name', $term, $this->taxonomy ); - $this->assertEquals( $t['term_id'], term_exists( $term_obj->slug ) ); + $exists = term_exists( $term_obj->slug ); // Clean up. - $this->assertTrue( wp_delete_term( $t['term_id'], $this->taxonomy ) ); + $deleted = wp_delete_term( $t['term_id'], $this->taxonomy ); + + $this->assertEquals( $t['term_id'], $exists ); + $this->assertTrue( $deleted ); } /** @@ -120,7 +123,7 @@ class Tests_Term extends WP_UnitTestCase { } foreach ( $posts as $post_id ) { - $this->assertTrue( (bool) wp_delete_post( $post_id ) ); + $this->assertInstanceOf( 'WP_Post', wp_delete_post( $post_id ) ); } } diff --git a/tests/phpunit/tests/term/getTermField.php b/tests/phpunit/tests/term/getTermField.php index a5a132a9b4..c69044564c 100644 --- a/tests/phpunit/tests/term/getTermField.php +++ b/tests/phpunit/tests/term/getTermField.php @@ -91,7 +91,7 @@ class Tests_Term_getTermField extends WP_UnitTestCase { } public function test_get_term_field_name() { - $name = rand_str( 15 ); + $name = 'baz'; $term = self::factory()->term->create_and_get( array( @@ -106,7 +106,7 @@ class Tests_Term_getTermField extends WP_UnitTestCase { } public function test_get_term_field_slug_when_slug_is_set() { - $slug = rand_str( 15 ); + $slug = 'baz'; $term = self::factory()->term->create_and_get( array( @@ -121,7 +121,7 @@ class Tests_Term_getTermField extends WP_UnitTestCase { } public function test_get_term_field_slug_when_slug_falls_back_from_name() { - $name = rand_str( 15 ); + $name = 'baz'; $term = self::factory()->term->create_and_get( array( @@ -156,7 +156,7 @@ class Tests_Term_getTermField extends WP_UnitTestCase { } public function test_get_term_field_description() { - $desc = wpautop( rand_str() ); + $desc = wpautop( 'baz' ); $term = self::factory()->term->create_and_get( array( diff --git a/tests/phpunit/tests/term/getTermLink.php b/tests/phpunit/tests/term/getTermLink.php index c5b9fbbe32..3522464cd1 100644 --- a/tests/phpunit/tests/term/getTermLink.php +++ b/tests/phpunit/tests/term/getTermLink.php @@ -2,13 +2,24 @@ /** * @group taxonomy + * @covers ::get_term_link */ class Tests_Term_GetTermLink extends WP_UnitTestCase { + public static $terms; + + public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) { + self::register_custom_taxonomy(); + + $taxonomies = array( 'category', 'post_tag', 'wptests_tax' ); + foreach ( $taxonomies as $taxonomy ) { + self::$terms[ $taxonomy ] = $factory->term->create_and_get( array( 'taxonomy' => $taxonomy ) ); + } + } + public function set_up() { parent::set_up(); - - register_taxonomy( 'wptests_tax', 'post' ); + self::register_custom_taxonomy(); } public function test_integer_should_be_interpreted_as_term_id() { @@ -207,4 +218,134 @@ class Tests_Term_GetTermLink extends WP_UnitTestCase { $this->assertStringContainsString( '/foo/term2/', $actual ); } + + /** + * @dataProvider data_get_term_link + * + * @ticket 50225 + * + * @param string $taxonomy Taxonomy being tested (used for index of term keys). + * @param bool $use_id When true, pass term ID. Else, pass term object. + */ + public function test_get_term_link_filter_is_object_by_term_id( $taxonomy, $use_id ) { + $term = $this->get_term( $taxonomy, $use_id ); + + add_filter( + 'term_link', + function( $location, $term ) { + $this->assertInstanceOf( 'WP_Term', $term ); + }, + 10, + 2 + ); + + get_term_link( $term, $taxonomy ); + } + + /** + * @dataProvider data_get_term_link + * + * @ticket 50225 + * + * @param string $taxonomy Taxonomy being tested (used for index of term keys). + * @param bool $use_id When true, pass term ID. Else, pass term object. + */ + public function test_get_term_link_filter_is_object_by_term_object( $taxonomy, $use_id ) { + $term = $this->get_term( $taxonomy, $use_id ); + + add_filter( + 'term_link', + function( $location, $term ) { + $this->assertInstanceOf( 'WP_Term', $term ); + }, + 10, + 2 + ); + + get_term_link( get_term( $term, $taxonomy ), $taxonomy ); + } + + /** + * @dataProvider data_get_term_link + * + * @ticket 50225 + * + * @param string $taxonomy Taxonomy being tested (used for index of term keys). + * @param bool $use_id When true, pass term ID. Else, skip the test. + */ + public function test_get_term_feed_link_backward_compatibility( $taxonomy, $use_id ) { + if ( $use_id ) { + $term = $this->get_term( $taxonomy, $use_id ); + + $term_feed_link = get_term_feed_link( $term, $taxonomy ); + $this->assertIsString( $term_feed_link ); + + $term_feed_link = get_term_feed_link( $term, '' ); + $this->assertIsString( $term_feed_link ); + } else { + $this->markTestSkipped( 'This test requires to pass an ID to get_term_feed_link()' ); + } + } + + /** + * Data provider. + * + * @return array + */ + public function data_get_term_link() { + return array( + 'category passing term_id' => array( + 'taxonomy' => 'category', + 'use_id' => false, + ), + 'category passing term object' => array( + 'taxonomy' => 'category', + 'use_id' => true, + ), + 'post_tag passing term_id' => array( + 'taxonomy' => 'post_tag', + 'use_id' => false, + ), + 'post_tag passing term object' => array( + 'taxonomy' => 'post_tag', + 'use_id' => true, + ), + 'a custom taxonomy passing term_id' => array( + 'taxonomy' => 'wptests_tax', + 'use_id' => false, + ), + 'a custom taxonomy passing term_id' => array( + 'taxonomy' => 'wptests_tax', + 'use_id' => true, + 'expected' => 'term.php?taxonomy=custom_taxonomy&tag_ID=%ID%&post_type=post', + ), + ); + } + + /** + * Helper to register a custom taxonomy for use in tests. + * + * @since 5.9.0 + */ + private static function register_custom_taxonomy() { + register_taxonomy( 'wptests_tax', 'post' ); + } + + /** + * Helper to get the term for the given taxonomy. + * + * @since 5.9.0 + * + * @param string $taxonomy Taxonomy being tested (used for index of term keys). + * @param bool $use_id When true, pass term ID. Else, pass term object. + * @return WP_Term|int If $use_id is true, term ID is returned; else instance of WP_Term. + */ + private function get_term( $taxonomy, $use_id ) { + $term = self::$terms[ $taxonomy ]; + if ( $use_id ) { + $term = $term->term_id; + } + + return $term; + } } diff --git a/tests/phpunit/tests/term/splitSharedTerm.php b/tests/phpunit/tests/term/splitSharedTerm.php index 65cefe8c4a..52e4281016 100644 --- a/tests/phpunit/tests/term/splitSharedTerm.php +++ b/tests/phpunit/tests/term/splitSharedTerm.php @@ -208,7 +208,7 @@ class Tests_Term_SplitSharedTerm extends WP_UnitTestCase { array( '%d' ) ); - $menu_id = wp_create_nav_menu( rand_str() ); + $menu_id = wp_create_nav_menu( 'Nav Menu Bar' ); $cat_menu_item = wp_update_nav_menu_item( $menu_id, 0, diff --git a/tests/phpunit/tests/term/termExists.php b/tests/phpunit/tests/term/termExists.php index bb4381036b..8bd9a783c7 100644 --- a/tests/phpunit/tests/term/termExists.php +++ b/tests/phpunit/tests/term/termExists.php @@ -260,7 +260,7 @@ class Tests_TermExists extends WP_UnitTestCase { register_taxonomy( 'wptests_tax', 'post' ); // Insert a term. - $term = rand_str(); + $term = __FUNCTION__; $t = wp_insert_term( $term, 'wptests_tax' ); $this->assertIsArray( $t ); $this->assertEquals( $t['term_id'], term_exists( $t['term_id'] ) ); diff --git a/tests/phpunit/tests/term/wpSetObjectTerms.php b/tests/phpunit/tests/term/wpSetObjectTerms.php index b0da2fa3d6..8032a50e79 100644 --- a/tests/phpunit/tests/term/wpSetObjectTerms.php +++ b/tests/phpunit/tests/term/wpSetObjectTerms.php @@ -133,9 +133,9 @@ class Tests_Term_WpSetObjectTerms extends WP_UnitTestCase { $ids = self::$post_ids; $terms = array( - rand_str(), - rand_str(), - rand_str(), + 'term0', + 'term1', + 'term2', ); foreach ( $ids as $id ) { @@ -164,7 +164,7 @@ class Tests_Term_WpSetObjectTerms extends WP_UnitTestCase { public function test_set_object_terms_invalid() { // Bogus taxonomy. - $result = wp_set_object_terms( self::$post_ids[0], array( rand_str() ), rand_str() ); + $result = wp_set_object_terms( self::$post_ids[0], array( 'foo' ), 'invalid-taxonomy' ); $this->assertWPError( $result ); } diff --git a/tests/phpunit/tests/term/wpTaxonomy.php b/tests/phpunit/tests/term/wpTaxonomy.php index a8689284c2..a47edcc9ee 100644 --- a/tests/phpunit/tests/term/wpTaxonomy.php +++ b/tests/phpunit/tests/term/wpTaxonomy.php @@ -18,7 +18,7 @@ class Tests_WP_Taxonomy extends WP_UnitTestCase { /* @var WP $wp */ global $wp; - $taxonomy = rand_str(); + $taxonomy = 'taxonomy1'; $taxonomy_object = new WP_Taxonomy( $taxonomy, 'post' ); $taxonomy_object->add_rewrite_rules(); @@ -31,7 +31,7 @@ class Tests_WP_Taxonomy extends WP_UnitTestCase { /* @var WP $wp */ global $wp; - $taxonomy = rand_str(); + $taxonomy = 'taxonomy2'; $taxonomy_object = new WP_Taxonomy( $taxonomy, 'post', @@ -58,7 +58,7 @@ class Tests_WP_Taxonomy extends WP_UnitTestCase { /* @var WP_Rewrite $wp_rewrite */ global $wp_rewrite; - $taxonomy = rand_str(); + $taxonomy = 'taxonomy3'; $taxonomy_object = new WP_Taxonomy( $taxonomy, 'post', @@ -79,7 +79,7 @@ class Tests_WP_Taxonomy extends WP_UnitTestCase { } public function test_adds_ajax_callback() { - $taxonomy = rand_str(); + $taxonomy = 'taxonomy4'; $taxonomy_object = new WP_Taxonomy( $taxonomy, 'post', diff --git a/tests/phpunit/tests/theme.php b/tests/phpunit/tests/theme.php index 6c495ed023..e16dd4c900 100644 --- a/tests/phpunit/tests/theme.php +++ b/tests/phpunit/tests/theme.php @@ -20,6 +20,7 @@ class Tests_Theme extends WP_UnitTestCase { 'twentynineteen', 'twentytwenty', 'twentytwentyone', + 'twentytwentytwo', ); public function set_up() { @@ -298,7 +299,7 @@ class Tests_Theme extends WP_UnitTestCase { // get_query_template() // Template file that doesn't exist. - $this->assertSame( '', get_query_template( rand_str() ) ); + $this->assertSame( '', get_query_template( 'nonexistant' ) ); // Template files that do exist. /* @@ -332,8 +333,8 @@ class Tests_Theme extends WP_UnitTestCase { public function test_switch_theme_bogus() { // Try switching to a theme that doesn't exist. - $template = rand_str(); - $style = rand_str(); + $template = 'some_template'; + $style = 'some_style'; update_option( 'template', $template ); update_option( 'stylesheet', $style ); @@ -699,4 +700,168 @@ class Tests_Theme extends WP_UnitTestCase { ), ); } + + + /** + * Tests that block themes support a feature by default. + * + * @ticket 54597 + * @ticket 54731 + * + * @dataProvider data_block_theme_has_default_support + * + * @covers ::_add_default_theme_supports + * + * @param array $support { + * The feature to check. + * + * @type string $feature The feature to check. + * @type string $sub_feature Optional. The sub-feature to check. + * } + */ + public function test_block_theme_has_default_support( $support ) { + $this->helper_requires_block_theme(); + + $support_data = array_values( $support ); + $support_data_str = implode( ': ', $support_data ); + + // Remove existing support. + if ( current_theme_supports( ...$support_data ) ) { + remove_theme_support( ...$support_data ); + } + + $this->assertFalse( + current_theme_supports( ...$support_data ), + "Could not remove support for $support_data_str." + ); + + do_action( 'setup_theme' ); + + $this->assertTrue( + current_theme_supports( ...$support_data ), + "Does not have default support for $support_data_str." + ); + } + + /** + * Data provider. + * + * @return array + */ + public function data_block_theme_has_default_support() { + return array( + 'post-thumbnails' => array( + 'support' => array( + 'feature' => 'post-thumbnails', + ), + ), + 'responsive-embeds' => array( + 'support' => array( + 'feature' => 'responsive-embeds', + ), + ), + 'editor-styles' => array( + 'support' => array( + 'feature' => 'editor-styles', + ), + ), + 'html5: comment-list' => array( + 'support' => array( + 'feature' => 'html5', + 'sub_feature' => 'comment-list', + ), + ), + 'html5: comment-form' => array( + 'support' => array( + 'feature' => 'html5', + 'sub_feature' => 'comment-form', + ), + ), + 'html5: search-form' => array( + 'support' => array( + 'feature' => 'html5', + 'sub_feature' => 'search-form', + ), + ), + 'html5: gallery' => array( + 'support' => array( + 'feature' => 'html5', + 'sub_feature' => 'gallery', + ), + ), + 'html5: caption' => array( + 'support' => array( + 'feature' => 'html5', + 'sub_feature' => 'caption', + ), + ), + 'html5: style' => array( + 'support' => array( + 'feature' => 'html5', + 'sub_feature' => 'style', + ), + ), + 'html5: script' => array( + 'support' => array( + 'feature' => 'html5', + 'sub_feature' => 'script', + ), + ), + 'automatic-feed-links' => array( + 'support' => array( + 'feature' => 'automatic-feed-links', + ), + ), + ); + } + + /** + * Tests that block themes load separate core block assets by default. + * + * @ticket 54597 + * + * @covers ::_add_default_theme_supports + * @covers ::wp_should_load_separate_core_block_assets + */ + public function test_block_theme_should_load_separate_core_block_assets_by_default() { + $this->helper_requires_block_theme(); + + add_filter( 'should_load_separate_core_block_assets', '__return_false' ); + + $this->assertFalse( + wp_should_load_separate_core_block_assets(), + 'Could not disable loading separate core block assets.' + ); + + do_action( 'setup_theme' ); + + $this->assertTrue( + wp_should_load_separate_core_block_assets(), + 'Block themes do not load separate core block assets by default.' + ); + } + + /** + * Helper function to ensure that a block theme is available and active. + */ + private function helper_requires_block_theme() { + // No need to switch if we're already on a block theme. + if ( wp_is_block_theme() ) { + return; + } + + $block_theme = 'twentytwentytwo'; + + // Skip if the block theme is not available. + if ( ! wp_get_theme( $block_theme )->exists() ) { + $this->markTestSkipped( "$block_theme must be available." ); + } + + switch_theme( $block_theme ); + + // Skip if we could not switch to the block theme. + if ( wp_get_theme()->stylesheet !== $block_theme ) { + $this->markTestSkipped( "Could not switch to $block_theme." ); + } + } } diff --git a/tests/phpunit/tests/theme/themeDir.php b/tests/phpunit/tests/theme/themeDir.php index da24493a48..377ff79fc1 100644 --- a/tests/phpunit/tests/theme/themeDir.php +++ b/tests/phpunit/tests/theme/themeDir.php @@ -162,6 +162,9 @@ class Tests_Theme_ThemeDir extends WP_UnitTestCase { 'camelCase', 'REST Theme', 'Block Theme', + 'Block Theme Child Theme', + 'Block Theme [0.4.0]', + 'Block Theme [1.0.0] in subdirectory', ); sort( $theme_names ); diff --git a/tests/phpunit/tests/theme/wpGetGlobalStylesheet.php b/tests/phpunit/tests/theme/wpGetGlobalStylesheet.php new file mode 100644 index 0000000000..b3bd7754bd --- /dev/null +++ b/tests/phpunit/tests/theme/wpGetGlobalStylesheet.php @@ -0,0 +1,188 @@ +orig_theme_dir = $GLOBALS['wp_theme_directories']; + $this->theme_root = realpath( DIR_TESTDATA . '/themedir1' ); + + // /themes is necessary as theme.php functions assume /themes is the root if there is only one root. + $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root ); + + // Set up the new root. + add_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) ); + add_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) ); + add_filter( 'template_root', array( $this, 'filter_set_theme_root' ) ); + + // Clear caches. + wp_clean_themes_cache(); + unset( $GLOBALS['wp_themes'] ); + } + + public function tear_down() { + $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir; + + // Clear up the filters to modify the theme root. + remove_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) ); + remove_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) ); + remove_filter( 'template_root', array( $this, 'filter_set_theme_root' ) ); + + wp_clean_themes_cache(); + unset( $GLOBALS['wp_themes'] ); + + parent::tear_down(); + } + + public function filter_set_theme_root() { + return $this->theme_root; + } + + public function test_block_theme_using_variables() { + switch_theme( 'block-theme' ); + + $styles = wp_get_global_stylesheet( array( 'variables' ) ); + $this->assertStringContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is 13px' ); + $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' ); + $this->assertStringContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is 36px' ); + $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' ); + $this->assertStringContainsString( '--wp--preset--font-size--custom: 100px;', $styles, 'custom font size is 100px' ); + + switch_theme( WP_DEFAULT_THEME ); + } + + public function test_block_theme_using_presets() { + switch_theme( 'block-theme' ); + + $styles = wp_get_global_stylesheet( array( 'presets' ) ); + $this->assertStringNotContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is not present' ); + $this->assertStringNotContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is not present' ); + $this->assertStringNotContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is not present' ); + $this->assertStringNotContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is not present' ); + $this->assertStringNotContainsString( '--wp--preset--font-size--custom: 100px;', $styles, 'custom font size is not present' ); + + switch_theme( WP_DEFAULT_THEME ); + } + + public function test_block_theme_using_defaults() { + switch_theme( 'block-theme' ); + + $styles = wp_get_global_stylesheet(); + $this->assertStringContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is 13px' ); + $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' ); + $this->assertStringContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is 36px' ); + $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' ); + $this->assertStringContainsString( '--wp--preset--font-size--custom: 100px;', $styles, 'custom font size is 100px' ); + + switch_theme( WP_DEFAULT_THEME ); + } + + public function test_variables_in_classic_theme_with_no_presets_using_variables() { + $styles = wp_get_global_stylesheet( array( 'variables' ) ); + $this->assertStringContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is 13px' ); + $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' ); + $this->assertStringContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is 36px' ); + $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' ); + } + + public function test_variables_in_classic_theme_with_no_presets_using_presets() { + $styles = wp_get_global_stylesheet( array( 'presets' ) ); + $this->assertStringNotContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is not present' ); + $this->assertStringNotContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is not present' ); + $this->assertStringNotContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is not present' ); + $this->assertStringNotContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is not present' ); + } + + public function test_variables_in_classic_theme_with_no_presets_using_defaults() { + $styles = wp_get_global_stylesheet(); + $this->assertStringContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is 13px' ); + $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' ); + $this->assertStringContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is 36px' ); + $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' ); + } + + public function test_variables_in_classic_theme_with_presets_using_variables() { + add_theme_support( + 'editor-font-sizes', + array( + array( + 'name' => 'Small', + 'size' => 18, + 'slug' => 'small', + ), + array( + 'name' => 'Large', + 'size' => 26.25, + 'slug' => 'large', + ), + ) + ); + + $styles = wp_get_global_stylesheet( array( 'variables' ) ); + $this->assertStringContainsString( '--wp--preset--font-size--small: 18px', $styles, 'small font size is 18px' ); + $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' ); + $this->assertStringContainsString( '--wp--preset--font-size--large: 26.25px', $styles, 'large font size is 26.25px' ); + $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' ); + + remove_theme_support( 'editor-font-sizes' ); + } + + public function test_variables_in_classic_theme_with_presets_using_presets() { + add_theme_support( + 'editor-font-sizes', + array( + array( + 'name' => 'Small', + 'size' => 18, + 'slug' => 'small', + ), + array( + 'name' => 'Large', + 'size' => 26.25, + 'slug' => 'large', + ), + ) + ); + + $styles = wp_get_global_stylesheet( array( 'presets' ) ); + $this->assertStringNotContainsString( '--wp--preset--font-size--small: 18px', $styles, 'small font size is not present' ); + $this->assertStringNotContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is not present' ); + $this->assertStringNotContainsString( '--wp--preset--font-size--large: 26.25px', $styles, 'large font size is not present' ); + $this->assertStringNotContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is not present' ); + + remove_theme_support( 'editor-font-sizes' ); + } + + public function test_variables_in_classic_theme_with_presets_using_defaults() { + add_theme_support( + 'editor-font-sizes', + array( + array( + 'name' => 'Small', + 'size' => 18, + 'slug' => 'small', + ), + array( + 'name' => 'Large', + 'size' => 26.25, + 'slug' => 'large', + ), + ) + ); + + $styles = wp_get_global_stylesheet(); + $this->assertStringContainsString( '--wp--preset--font-size--small: 18px', $styles, 'small font size is 18px' ); + $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' ); + $this->assertStringContainsString( '--wp--preset--font-size--large: 26.25px', $styles, 'large font size is 26.25px' ); + $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'small font size is 42px' ); + + remove_theme_support( 'editor-font-sizes' ); + } + +} diff --git a/tests/phpunit/tests/theme/wpTheme.php b/tests/phpunit/tests/theme/wpTheme.php index a85bcc89aa..3fb1e6e4b7 100644 --- a/tests/phpunit/tests/theme/wpTheme.php +++ b/tests/phpunit/tests/theme/wpTheme.php @@ -246,4 +246,111 @@ class Tests_Theme_wpTheme extends WP_UnitTestCase { $this->assertSameSetsWithIndex( $allowed_themes, $new_allowed_themes ); } + + /** + * @dataProvider data_is_block_theme + * @ticket 54460 + * + * @covers WP_Theme::is_block_theme + * + * @param string $theme_dir Directory of the theme to test. + * @param bool $expected Expected result. + */ + public function test_is_block_theme( $theme_dir, $expected ) { + $theme = new WP_Theme( $theme_dir, $this->theme_root ); + $this->assertSame( $expected, $theme->is_block_theme() ); + } + + /** + * Data provider. + * + * @return array + */ + public function data_is_block_theme() { + return array( + 'default - non-block theme' => array( + 'theme_dir' => 'default', + 'expected' => false, + ), + 'parent block theme' => array( + 'theme_dir' => 'block-theme', + 'expected' => true, + ), + 'child block theme' => array( + 'theme_dir' => 'block-theme-child', + 'expected' => true, + ), + ); + } + + /** + * @dataProvider data_get_file_path + * @ticket 54460 + * + * @covers WP_Theme::get_file_path + * + * @param string $theme_dir Directory of the theme to test. + * @param string $file Given file name to test. + * @param string $expected Expected file path. + */ + public function test_get_file_path( $theme_dir, $file, $expected ) { + $theme = new WP_Theme( $theme_dir, $this->theme_root ); + + $this->assertStringEndsWith( $expected, $theme->get_file_path( $file ) ); + } + + /** + * Data provider. + * + * @return array + */ + public function data_get_file_path() { + return array( + 'no theme: no file given' => array( + 'theme_dir' => 'nonexistent', + 'file' => '', + 'expected' => '/nonexistent', + ), + 'parent theme: no file given' => array( + 'theme_dir' => 'block-theme', + 'file' => '', + 'expected' => '/block-theme', + ), + 'child theme: no file given' => array( + 'theme_dir' => 'block-theme-child', + 'file' => '', + 'expected' => '/block-theme-child', + ), + 'nonexistent theme: file given' => array( + 'theme_dir' => 'nonexistent', + 'file' => '/templates/page.html', + 'expected' => '/nonexistent/templates/page.html', + ), + 'parent theme: file exists' => array( + 'theme_dir' => 'block-theme', + 'file' => '/templates/page-home.html', + 'expected' => '/block-theme/templates/page-home.html', + ), + 'parent theme: file does not exist' => array( + 'theme_dir' => 'block-theme', + 'file' => '/templates/nonexistent.html', + 'expected' => '/block-theme/templates/nonexistent.html', + ), + 'child theme: file exists' => array( + 'theme_dir' => 'block-theme-child', + 'file' => '/templates/page-1.html', + 'expected' => '/block-theme-child/templates/page-1.html', + ), + 'child theme: file does not exist' => array( + 'theme_dir' => 'block-theme-child', + 'file' => '/templates/nonexistent.html', + 'expected' => '/block-theme/templates/nonexistent.html', + ), + 'child theme: file exists in parent, not in child' => array( + 'theme_dir' => 'block-theme-child', + 'file' => '/templates/page.html', + 'expected' => '/block-theme/templates/page.html', + ), + ); + } } diff --git a/tests/phpunit/tests/theme/wpThemeJson.php b/tests/phpunit/tests/theme/wpThemeJson.php index 1a663407b6..6d92c3741b 100644 --- a/tests/phpunit/tests/theme/wpThemeJson.php +++ b/tests/phpunit/tests/theme/wpThemeJson.php @@ -15,6 +15,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { /** * @ticket 52991 + * @ticket 54336 */ public function test_get_settings() { $theme_json = new WP_Theme_JSON( @@ -24,6 +25,10 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { 'color' => array( 'custom' => false, ), + 'layout' => array( + 'contentSize' => 'value', + 'invalid/key' => 'value', + ), 'invalid/key' => 'value', 'blocks' => array( 'core/group' => array( @@ -52,6 +57,9 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { 'color' => array( 'custom' => false, ), + 'layout' => array( + 'contentSize' => 'value', + ), 'blocks' => array( 'core/group' => array( 'color' => array( @@ -61,14 +69,14 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ), ); - $this->assertSameSetsWithIndex( $expected, $actual ); + $this->assertEqualSetsWithIndex( $expected, $actual ); } /** * @ticket 53397 */ public function test_get_settings_presets_are_keyed_by_origin() { - $core_origin = new WP_Theme_JSON( + $default_origin = new WP_Theme_JSON( array( 'version' => WP_Theme_JSON::LATEST_SCHEMA, 'settings' => array( @@ -95,9 +103,9 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ), ), ), - 'core' + 'default' ); - $no_origin = new WP_Theme_JSON( + $no_origin = new WP_Theme_JSON( array( 'version' => WP_Theme_JSON::LATEST_SCHEMA, 'settings' => array( @@ -126,15 +134,15 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ) ); - $actual_core = $core_origin->get_raw_data(); + $actual_default = $default_origin->get_raw_data(); $actual_no_origin = $no_origin->get_raw_data(); - $expected_core = array( + $expected_default = array( 'version' => WP_Theme_JSON::LATEST_SCHEMA, 'settings' => array( 'color' => array( 'palette' => array( - 'core' => array( + 'default' => array( array( 'slug' => 'white', 'color' => 'white', @@ -146,7 +154,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { 'core/group' => array( 'color' => array( 'palette' => array( - 'core' => array( + 'default' => array( array( 'slug' => 'white', 'color' => 'white', @@ -188,12 +196,241 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ), ); - $this->assertEqualSetsWithIndex( $expected_core, $actual_core ); + $this->assertEqualSetsWithIndex( $expected_default, $actual_default ); $this->assertEqualSetsWithIndex( $expected_no_origin, $actual_no_origin ); } + function test_get_settings_appearance_true_opts_in() { + $theme_json = new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'appearanceTools' => true, + 'spacing' => array( + 'blockGap' => false, // This should override appearanceTools. + ), + 'blocks' => array( + 'core/paragraph' => array( + 'typography' => array( + 'lineHeight' => false, + ), + ), + 'core/group' => array( + 'appearanceTools' => true, + 'typography' => array( + 'lineHeight' => false, // This should override appearanceTools. + ), + 'spacing' => array( + 'blockGap' => null, + ), + ), + ), + ), + ) + ); + + $actual = $theme_json->get_settings(); + $expected = array( + 'border' => array( + 'width' => true, + 'style' => true, + 'radius' => true, + 'color' => true, + ), + 'color' => array( + 'link' => true, + ), + 'spacing' => array( + 'blockGap' => false, + 'margin' => true, + 'padding' => true, + ), + 'typography' => array( + 'lineHeight' => true, + ), + 'blocks' => array( + 'core/paragraph' => array( + 'typography' => array( + 'lineHeight' => false, + ), + ), + 'core/group' => array( + 'border' => array( + 'width' => true, + 'style' => true, + 'radius' => true, + 'color' => true, + ), + 'color' => array( + 'link' => true, + ), + 'spacing' => array( + 'blockGap' => false, + 'margin' => true, + 'padding' => true, + ), + 'typography' => array( + 'lineHeight' => false, + ), + ), + ), + ); + + $this->assertEqualSetsWithIndex( $expected, $actual ); + } + + function test_get_settings_appearance_false_does_not_opt_in() { + $theme_json = new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'appearanceTools' => false, + 'border' => array( + 'width' => true, + ), + 'blocks' => array( + 'core/paragraph' => array( + 'typography' => array( + 'lineHeight' => false, + ), + ), + 'core/group' => array( + 'typography' => array( + 'lineHeight' => false, + ), + ), + ), + ), + ) + ); + + $actual = $theme_json->get_settings(); + $expected = array( + 'appearanceTools' => false, + 'border' => array( + 'width' => true, + ), + 'blocks' => array( + 'core/paragraph' => array( + 'typography' => array( + 'lineHeight' => false, + ), + ), + 'core/group' => array( + 'typography' => array( + 'lineHeight' => false, + ), + ), + ), + ); + + $this->assertEqualSetsWithIndex( $expected, $actual ); + } + + /** + * @ticket 54336 + */ + public function test_get_stylesheet_support_for_shorthand_and_longhand_values() { + $theme_json = new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'styles' => array( + 'blocks' => array( + 'core/group' => array( + 'border' => array( + 'radius' => '10px', + ), + 'spacing' => array( + 'padding' => '24px', + 'margin' => '1em', + ), + ), + 'core/image' => array( + 'border' => array( + 'radius' => array( + 'topLeft' => '10px', + 'bottomRight' => '1em', + ), + ), + 'spacing' => array( + 'padding' => array( + 'top' => '15px', + ), + 'margin' => array( + 'bottom' => '30px', + ), + ), + ), + ), + ), + ) + ); + + $styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-block-group{border-radius: 10px;margin: 1em;padding: 24px;}.wp-block-image{border-top-left-radius: 10px;border-bottom-right-radius: 1em;margin-bottom: 30px;padding-top: 15px;}'; + $this->assertEquals( $styles, $theme_json->get_stylesheet() ); + $this->assertEquals( $styles, $theme_json->get_stylesheet( array( 'styles' ) ) ); + } + + /** + * @ticket 54336 + */ + public function test_get_stylesheet_skips_disabled_protected_properties() { + $theme_json = new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'spacing' => array( + 'blockGap' => null, + ), + ), + 'styles' => array( + 'spacing' => array( + 'blockGap' => '1em', + ), + 'blocks' => array( + 'core/columns' => array( + 'spacing' => array( + 'blockGap' => '24px', + ), + ), + ), + ), + ) + ); + + $expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }'; + $this->assertEquals( $expected, $theme_json->get_stylesheet() ); + $this->assertEquals( $expected, $theme_json->get_stylesheet( array( 'styles' ) ) ); + } + + /** + * @ticket 54336 + */ + public function test_get_stylesheet_renders_enabled_protected_properties() { + $theme_json = new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'spacing' => array( + 'blockGap' => true, + ), + ), + 'styles' => array( + 'spacing' => array( + 'blockGap' => '1em', + ), + ), + ) + ); + + $expected = 'body { margin: 0; }body{--wp--style--block-gap: 1em;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-site-blocks > * { margin-top: 0; margin-bottom: 0; }.wp-site-blocks > * + * { margin-top: var( --wp--style--block-gap ); }'; + $this->assertSame( $expected, $theme_json->get_stylesheet() ); + $this->assertSame( $expected, $theme_json->get_stylesheet( array( 'styles' ) ) ); + } + /** * @ticket 53175 + * @ticket 54336 */ public function test_get_stylesheet() { $theme_json = new WP_Theme_JSON( @@ -221,6 +458,9 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ), ), ), + 'spacing' => array( + 'blockGap' => false, + ), 'misc' => 'value', 'blocks' => array( 'core/group' => array( @@ -250,6 +490,9 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ), 'blocks' => array( 'core/group' => array( + 'border' => array( + 'radius' => '10px', + ), 'elements' => array( 'link' => array( 'color' => array( @@ -258,10 +501,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ), ), 'spacing' => array( - 'padding' => array( - 'top' => '12px', - 'bottom' => '24px', - ), + 'padding' => '24px', ), ), 'core/heading' => array( @@ -293,28 +533,38 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ), ), ), + 'core/image' => array( + 'border' => array( + 'radius' => array( + 'topLeft' => '10px', + 'bottomRight' => '1em', + ), + ), + 'spacing' => array( + 'margin' => array( + 'bottom' => '30px', + ), + ), + ), ), ), 'misc' => 'value', ) ); - $this->assertSame( - 'body{--wp--preset--color--grey: grey;}.wp-block-group{--wp--custom--base-font: 16;--wp--custom--line-height--small: 1.2;--wp--custom--line-height--medium: 1.4;--wp--custom--line-height--large: 1.8;}body{color: var(--wp--preset--color--grey);}a{background-color: #333;color: #111;}.wp-block-group{padding-top: 12px;padding-bottom: 24px;}.wp-block-group a{color: #111;}h1,h2,h3,h4,h5,h6{color: #123456;}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{background-color: #333;color: #111;font-size: 60px;}.wp-block-post-date{color: #123456;}.wp-block-post-date a{background-color: #777;color: #555;}.has-grey-color{color: var(--wp--preset--color--grey) !important;}.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}', - $theme_json->get_stylesheet() - ); - $this->assertSame( - 'body{color: var(--wp--preset--color--grey);}a{background-color: #333;color: #111;}.wp-block-group{padding-top: 12px;padding-bottom: 24px;}.wp-block-group a{color: #111;}h1,h2,h3,h4,h5,h6{color: #123456;}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{background-color: #333;color: #111;font-size: 60px;}.wp-block-post-date{color: #123456;}.wp-block-post-date a{background-color: #777;color: #555;}.has-grey-color{color: var(--wp--preset--color--grey) !important;}.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}', - $theme_json->get_stylesheet( 'block_styles' ) - ); - $this->assertSame( - 'body{--wp--preset--color--grey: grey;}.wp-block-group{--wp--custom--base-font: 16;--wp--custom--line-height--small: 1.2;--wp--custom--line-height--medium: 1.4;--wp--custom--line-height--large: 1.8;}', - $theme_json->get_stylesheet( 'css_variables' ) - ); + $variables = 'body{--wp--preset--color--grey: grey;--wp--preset--font-family--small: 14px;--wp--preset--font-family--big: 41px;}.wp-block-group{--wp--custom--base-font: 16;--wp--custom--line-height--small: 1.2;--wp--custom--line-height--medium: 1.4;--wp--custom--line-height--large: 1.8;}'; + $styles = 'body { margin: 0; }body{color: var(--wp--preset--color--grey);}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-site-blocks > * { margin-top: 0; margin-bottom: 0; }.wp-site-blocks > * + * { margin-top: var( --wp--style--block-gap ); }a{background-color: #333;color: #111;}.wp-block-group{border-radius: 10px;padding: 24px;}.wp-block-group a{color: #111;}h1,h2,h3,h4,h5,h6{color: #123456;}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{background-color: #333;color: #111;font-size: 60px;}.wp-block-post-date{color: #123456;}.wp-block-post-date a{background-color: #777;color: #555;}.wp-block-image{border-top-left-radius: 10px;border-bottom-right-radius: 1em;margin-bottom: 30px;}'; + $presets = '.has-grey-color{color: var(--wp--preset--color--grey) !important;}.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}.has-grey-border-color{border-color: var(--wp--preset--color--grey) !important;}.has-small-font-family{font-family: var(--wp--preset--font-family--small) !important;}.has-big-font-family{font-family: var(--wp--preset--font-family--big) !important;}'; + $all = $variables . $styles . $presets; + $this->assertSame( $all, $theme_json->get_stylesheet() ); + $this->assertSame( $styles, $theme_json->get_stylesheet( array( 'styles' ) ) ); + $this->assertSame( $presets, $theme_json->get_stylesheet( array( 'presets' ) ) ); + $this->assertSame( $variables, $theme_json->get_stylesheet( array( 'variables' ) ) ); } /** * @ticket 52991 + * @ticket 54336 */ public function test_get_stylesheet_preset_classes_work_with_compounded_selectors() { $theme_json = new WP_Theme_JSON( @@ -337,14 +587,15 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ) ); - $this->assertSame( - 'h1.has-white-color,h2.has-white-color,h3.has-white-color,h4.has-white-color,h5.has-white-color,h6.has-white-color{color: var(--wp--preset--color--white) !important;}h1.has-white-background-color,h2.has-white-background-color,h3.has-white-background-color,h4.has-white-background-color,h5.has-white-background-color,h6.has-white-background-color{background-color: var(--wp--preset--color--white) !important;}', - $theme_json->get_stylesheet( 'block_styles' ) + $this->assertEquals( + 'h1.has-white-color,h2.has-white-color,h3.has-white-color,h4.has-white-color,h5.has-white-color,h6.has-white-color{color: var(--wp--preset--color--white) !important;}h1.has-white-background-color,h2.has-white-background-color,h3.has-white-background-color,h4.has-white-background-color,h5.has-white-background-color,h6.has-white-background-color{background-color: var(--wp--preset--color--white) !important;}h1.has-white-border-color,h2.has-white-border-color,h3.has-white-border-color,h4.has-white-border-color,h5.has-white-border-color,h6.has-white-border-color{border-color: var(--wp--preset--color--white) !important;}', + $theme_json->get_stylesheet( array( 'presets' ) ) ); } /** * @ticket 53175 + * @ticket 54336 */ public function test_get_stylesheet_preset_rules_come_after_block_rules() { $theme_json = new WP_Theme_JSON( @@ -376,18 +627,65 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ) ); - $this->assertSame( - '.wp-block-group{--wp--preset--color--grey: grey;}.wp-block-group{color: red;}.wp-block-group.has-grey-color{color: var(--wp--preset--color--grey) !important;}.wp-block-group.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}', - $theme_json->get_stylesheet() + $styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-block-group{color: red;}'; + $presets = '.wp-block-group.has-grey-color{color: var(--wp--preset--color--grey) !important;}.wp-block-group.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}.wp-block-group.has-grey-border-color{border-color: var(--wp--preset--color--grey) !important;}'; + $variables = '.wp-block-group{--wp--preset--color--grey: grey;}'; + $all = $variables . $styles . $presets; + $this->assertEquals( $all, $theme_json->get_stylesheet() ); + $this->assertEquals( $styles, $theme_json->get_stylesheet( array( 'styles' ) ) ); + $this->assertEquals( $presets, $theme_json->get_stylesheet( array( 'presets' ) ) ); + $this->assertEquals( $variables, $theme_json->get_stylesheet( array( 'variables' ) ) ); + } + + /** + * @ticket 54336 + */ + public function test_get_stylesheet_generates_proper_classes_and_css_vars_from_slugs() { + $theme_json = new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'color' => array( + 'palette' => array( + array( + 'slug' => 'grey', + 'color' => 'grey', + ), + array( + 'slug' => 'dark grey', + 'color' => 'grey', + ), + array( + 'slug' => 'light-grey', + 'color' => 'grey', + ), + array( + 'slug' => 'white2black', + 'color' => 'grey', + ), + ), + ), + 'custom' => array( + 'white2black' => 'value', + ), + ), + ) + ); + + $this->assertEquals( + '.has-grey-color{color: var(--wp--preset--color--grey) !important;}.has-dark-grey-color{color: var(--wp--preset--color--dark-grey) !important;}.has-light-grey-color{color: var(--wp--preset--color--light-grey) !important;}.has-white-2-black-color{color: var(--wp--preset--color--white-2-black) !important;}.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}.has-dark-grey-background-color{background-color: var(--wp--preset--color--dark-grey) !important;}.has-light-grey-background-color{background-color: var(--wp--preset--color--light-grey) !important;}.has-white-2-black-background-color{background-color: var(--wp--preset--color--white-2-black) !important;}.has-grey-border-color{border-color: var(--wp--preset--color--grey) !important;}.has-dark-grey-border-color{border-color: var(--wp--preset--color--dark-grey) !important;}.has-light-grey-border-color{border-color: var(--wp--preset--color--light-grey) !important;}.has-white-2-black-border-color{border-color: var(--wp--preset--color--white-2-black) !important;}', + $theme_json->get_stylesheet( array( 'presets' ) ) ); - $this->assertSame( - '.wp-block-group{color: red;}.wp-block-group.has-grey-color{color: var(--wp--preset--color--grey) !important;}.wp-block-group.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}', - $theme_json->get_stylesheet( 'block_styles' ) + $this->assertEquals( + 'body{--wp--preset--color--grey: grey;--wp--preset--color--dark-grey: grey;--wp--preset--color--light-grey: grey;--wp--preset--color--white-2-black: grey;--wp--custom--white-2-black: value;}', + $theme_json->get_stylesheet( array( 'variables' ) ) ); + } /** * @ticket 53175 + * @ticket 54336 */ public function test_get_stylesheet_preset_values_are_marked_as_important() { $theme_json = new WP_Theme_JSON( @@ -418,17 +716,18 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ), ), ), - 'core' + 'default' ); - $this->assertSame( - 'body{--wp--preset--color--grey: grey;}p{background-color: blue;color: red;font-size: 12px;line-height: 1.3;}.has-grey-color{color: var(--wp--preset--color--grey) !important;}.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}', + $this->assertEquals( + 'body{--wp--preset--color--grey: grey;}body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }p{background-color: blue;color: red;font-size: 12px;line-height: 1.3;}.has-grey-color{color: var(--wp--preset--color--grey) !important;}.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}.has-grey-border-color{border-color: var(--wp--preset--color--grey) !important;}', $theme_json->get_stylesheet() ); } /** * @ticket 52991 + * @ticket 54336 */ public function test_merge_incoming_data() { $theme_json = new WP_Theme_JSON( @@ -608,7 +907,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ), ), 'typography' => array( - 'fontSizes' => array( + 'fontSizes' => array( 'theme' => array( array( 'slug' => 'fontSize', @@ -616,6 +915,14 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ), ), ), + 'fontFamilies' => array( + 'theme' => array( + array( + 'slug' => 'fontFamily', + 'fontFamily' => 'fontFamily', + ), + ), + ), ), 'blocks' => array( 'core/paragraph' => array( @@ -669,6 +976,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { /** * @ticket 53175 + * @ticket 54336 */ public function test_merge_incoming_data_empty_presets() { $theme_json = new WP_Theme_JSON( @@ -736,7 +1044,9 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { 'version' => WP_Theme_JSON::LATEST_SCHEMA, 'settings' => array( 'color' => array( - 'duotone' => array(), + 'duotone' => array( + 'theme' => array(), + ), 'gradients' => array( 'theme' => array(), ), @@ -760,6 +1070,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { /** * @ticket 53175 + * @ticket 54336 */ public function test_merge_incoming_data_null_presets() { $theme_json = new WP_Theme_JSON( @@ -810,10 +1121,10 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { 'custom' => false, ), 'spacing' => array( - 'customMargin' => false, + 'margin' => false, ), 'typography' => array( - 'customLineHeight' => false, + 'lineHeight' => false, ), ), ) @@ -827,9 +1138,11 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { 'color' => array( 'custom' => false, 'duotone' => array( - array( - 'slug' => 'value', - 'colors' => array( 'red', 'green' ), + 'theme' => array( + array( + 'slug' => 'value', + 'colors' => array( 'red', 'green' ), + ), ), ), 'gradients' => array( @@ -850,12 +1163,12 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ), ), 'spacing' => array( - 'customMargin' => false, - 'units' => array( 'px', 'em' ), + 'margin' => false, + 'units' => array( 'px', 'em' ), ), 'typography' => array( - 'customLineHeight' => false, - 'fontSizes' => array( + 'lineHeight' => false, + 'fontSizes' => array( 'theme' => array( array( 'slug' => 'size', @@ -870,44 +1183,1006 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { $this->assertEqualSetsWithIndex( $expected, $actual ); } - /** - * @ticket 52991 - */ - public function test_get_from_editor_settings() { - $input = array( - 'disableCustomColors' => true, - 'disableCustomGradients' => true, - 'disableCustomFontSizes' => true, - 'enableCustomLineHeight' => true, - 'enableCustomUnits' => true, - 'colors' => array( - array( - 'slug' => 'color-slug', - 'name' => 'Color Name', - 'color' => 'colorvalue', - ), - ), - 'gradients' => array( - array( - 'slug' => 'gradient-slug', - 'name' => 'Gradient Name', - 'gradient' => 'gradientvalue', - ), - ), - 'fontSizes' => array( - array( - 'slug' => 'size-slug', - 'name' => 'Size Name', - 'size' => 'sizevalue', + public function test_merge_incoming_data_color_presets_with_same_slugs_as_default_are_removed() { + $defaults = new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'color' => array( + 'defaultPalette' => true, + 'palette' => array( + array( + 'slug' => 'red', + 'color' => 'red', + 'name' => 'Red', + ), + array( + 'slug' => 'green', + 'color' => 'green', + 'name' => 'Green', + ), + ), + ), + 'blocks' => array( + 'core/paragraph' => array( + 'color' => array( + 'palette' => array( + array( + 'slug' => 'blue', + 'color' => 'blue', + 'name' => 'Blue', + ), + ), + ), + ), + ), ), ), + 'default' ); - - $expected = array( - 'version' => WP_Theme_JSON::LATEST_SCHEMA, - 'settings' => array( - 'color' => array( - 'custom' => false, + $theme = new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'color' => array( + 'palette' => array( + array( + 'slug' => 'pink', + 'color' => 'pink', + 'name' => 'Pink', + ), + array( + 'slug' => 'green', + 'color' => 'green', + 'name' => 'Greenish', + ), + ), + ), + 'blocks' => array( + 'core/paragraph' => array( + 'color' => array( + 'palette' => array( + array( + 'slug' => 'blue', + 'color' => 'blue', + 'name' => 'Bluish', + ), + array( + 'slug' => 'yellow', + 'color' => 'yellow', + 'name' => 'Yellow', + ), + array( + 'slug' => 'green', + 'color' => 'green', + 'name' => 'Block Green', + ), + ), + ), + ), + ), + ), + ) + ); + + $expected = array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'color' => array( + 'palette' => array( + 'default' => array( + array( + 'slug' => 'red', + 'color' => 'red', + 'name' => 'Red', + ), + array( + 'slug' => 'green', + 'color' => 'green', + 'name' => 'Green', + ), + ), + 'theme' => array( + array( + 'slug' => 'pink', + 'color' => 'pink', + 'name' => 'Pink', + ), + ), + ), + 'defaultPalette' => true, + ), + 'blocks' => array( + 'core/paragraph' => array( + 'color' => array( + 'palette' => array( + 'default' => array( + array( + 'slug' => 'blue', + 'color' => 'blue', + 'name' => 'Blue', + ), + ), + 'theme' => array( + array( + 'slug' => 'yellow', + 'color' => 'yellow', + 'name' => 'Yellow', + ), + ), + ), + ), + ), + ), + ), + ); + + $defaults->merge( $theme ); + $actual = $defaults->get_raw_data(); + + $this->assertEqualSetsWithIndex( $expected, $actual ); + } + + public function test_merge_incoming_data_color_presets_with_same_slugs_as_default_are_not_removed_if_defaults_are_disabled() { + $defaults = new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'color' => array( + 'defaultPalette' => true, // Emulate the defaults from core theme.json. + 'palette' => array( + array( + 'slug' => 'red', + 'color' => 'red', + 'name' => 'Red', + ), + array( + 'slug' => 'green', + 'color' => 'green', + 'name' => 'Green', + ), + ), + ), + 'blocks' => array( + 'core/paragraph' => array( + 'color' => array( + 'palette' => array( + array( + 'slug' => 'blue', + 'color' => 'blue', + 'name' => 'Blue', + ), + ), + ), + ), + ), + ), + ), + 'default' + ); + $theme = new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'color' => array( + 'defaultPalette' => false, + 'palette' => array( + array( + 'slug' => 'pink', + 'color' => 'pink', + 'name' => 'Pink', + ), + array( + 'slug' => 'green', + 'color' => 'green', + 'name' => 'Greenish', + ), + ), + ), + 'blocks' => array( + 'core/paragraph' => array( + 'color' => array( + 'palette' => array( + array( + 'slug' => 'blue', + 'color' => 'blue', + 'name' => 'Bluish', + ), + array( + 'slug' => 'yellow', + 'color' => 'yellow', + 'name' => 'Yellow', + ), + array( + 'slug' => 'green', + 'color' => 'green', + 'name' => 'Block Green', + ), + ), + ), + ), + ), + ), + ) + ); + + $expected = array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'color' => array( + 'defaultPalette' => false, + 'palette' => array( + 'default' => array( + array( + 'slug' => 'red', + 'color' => 'red', + 'name' => 'Red', + ), + array( + 'slug' => 'green', + 'color' => 'green', + 'name' => 'Green', + ), + ), + 'theme' => array( + array( + 'slug' => 'pink', + 'color' => 'pink', + 'name' => 'Pink', + ), + array( + 'slug' => 'green', + 'color' => 'green', + 'name' => 'Greenish', + ), + ), + ), + ), + 'blocks' => array( + 'core/paragraph' => array( + 'color' => array( + 'palette' => array( + 'default' => array( + array( + 'slug' => 'blue', + 'color' => 'blue', + 'name' => 'Blue', + ), + ), + 'theme' => array( + array( + 'slug' => 'blue', + 'color' => 'blue', + 'name' => 'Bluish', + ), + array( + 'slug' => 'yellow', + 'color' => 'yellow', + 'name' => 'Yellow', + ), + array( + 'slug' => 'green', + 'color' => 'green', + 'name' => 'Block Green', + ), + ), + ), + ), + ), + ), + ), + ); + + $defaults->merge( $theme ); + $actual = $defaults->get_raw_data(); + + $this->assertEqualSetsWithIndex( $expected, $actual ); + } + + /** + * @ticket 54640 + */ + public function test_merge_incoming_data_presets_use_default_names() { + $defaults = new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'typography' => array( + 'fontSizes' => array( + array( + 'name' => 'Small', + 'slug' => 'small', + 'size' => '12px', + ), + array( + 'name' => 'Large', + 'slug' => 'large', + 'size' => '20px', + ), + ), + ), + ), + ), + 'default' + ); + $theme_json = new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'typography' => array( + 'fontSizes' => array( + array( + 'slug' => 'small', + 'size' => '1.1rem', + ), + array( + 'slug' => 'large', + 'size' => '1.75rem', + ), + array( + 'name' => 'Huge', + 'slug' => 'huge', + 'size' => '3rem', + ), + ), + ), + ), + ), + 'theme' + ); + $expected = array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'typography' => array( + 'fontSizes' => array( + 'default' => array( + array( + 'name' => 'Small', + 'slug' => 'small', + 'size' => '12px', + ), + array( + 'name' => 'Large', + 'slug' => 'large', + 'size' => '20px', + ), + ), + 'theme' => array( + array( + 'slug' => 'small', + 'size' => '1.1rem', + 'name' => 'Small', + ), + array( + 'slug' => 'large', + 'size' => '1.75rem', + 'name' => 'Large', + ), + array( + 'name' => 'Huge', + 'slug' => 'huge', + 'size' => '3rem', + ), + ), + ), + ), + ), + ); + $defaults->merge( $theme_json ); + $actual = $defaults->get_raw_data(); + $this->assertSameSetsWithIndex( $expected, $actual ); + } + + /** + * @ticket 54336 + */ + public function test_remove_insecure_properties_removes_unsafe_styles() { + $actual = WP_Theme_JSON::remove_insecure_properties( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'styles' => array( + 'color' => array( + 'gradient' => 'url(\'data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxMCcgaGVpZ2h0PScxMCc+PHNjcmlwdD5hbGVydCgnb2snKTwvc2NyaXB0PjxsaW5lYXJHcmFkaWVudCBpZD0nZ3JhZGllbnQnPjxzdG9wIG9mZnNldD0nMTAlJyBzdG9wLWNvbG9yPScjRjAwJy8+PHN0b3Agb2Zmc2V0PSc5MCUnIHN0b3AtY29sb3I9JyNmY2MnLz4gPC9saW5lYXJHcmFkaWVudD48cmVjdCBmaWxsPSd1cmwoI2dyYWRpZW50KScgeD0nMCcgeT0nMCcgd2lkdGg9JzEwMCUnIGhlaWdodD0nMTAwJScvPjwvc3ZnPg==\')', + 'text' => 'var:preset|color|dark-red', + ), + 'elements' => array( + 'link' => array( + 'color' => array( + 'gradient' => 'url(\'data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxMCcgaGVpZ2h0PScxMCc+PHNjcmlwdD5hbGVydCgnb2snKTwvc2NyaXB0PjxsaW5lYXJHcmFkaWVudCBpZD0nZ3JhZGllbnQnPjxzdG9wIG9mZnNldD0nMTAlJyBzdG9wLWNvbG9yPScjRjAwJy8+PHN0b3Agb2Zmc2V0PSc5MCUnIHN0b3AtY29sb3I9JyNmY2MnLz4gPC9saW5lYXJHcmFkaWVudD48cmVjdCBmaWxsPSd1cmwoI2dyYWRpZW50KScgeD0nMCcgeT0nMCcgd2lkdGg9JzEwMCUnIGhlaWdodD0nMTAwJScvPjwvc3ZnPg==\')', + 'text' => 'var:preset|color|dark-pink', + 'background' => 'var:preset|color|dark-red', + ), + ), + ), + 'blocks' => array( + 'core/image' => array( + 'filter' => array( + 'duotone' => 'var:preset|duotone|blue-red', + ), + ), + 'core/cover' => array( + 'filter' => array( + 'duotone' => 'var(--wp--preset--duotone--blue-red, var(--fallback-unsafe))', + ), + ), + 'core/group' => array( + 'color' => array( + 'gradient' => 'url(\'data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxMCcgaGVpZ2h0PScxMCc+PHNjcmlwdD5hbGVydCgnb2snKTwvc2NyaXB0PjxsaW5lYXJHcmFkaWVudCBpZD0nZ3JhZGllbnQnPjxzdG9wIG9mZnNldD0nMTAlJyBzdG9wLWNvbG9yPScjRjAwJy8+PHN0b3Agb2Zmc2V0PSc5MCUnIHN0b3AtY29sb3I9JyNmY2MnLz4gPC9saW5lYXJHcmFkaWVudD48cmVjdCBmaWxsPSd1cmwoI2dyYWRpZW50KScgeD0nMCcgeT0nMCcgd2lkdGg9JzEwMCUnIGhlaWdodD0nMTAwJScvPjwvc3ZnPg==\')', + 'text' => 'var:preset|color|dark-gray', + ), + 'elements' => array( + 'link' => array( + 'color' => array( + 'gradient' => 'url(\'data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxMCcgaGVpZ2h0PScxMCc+PHNjcmlwdD5hbGVydCgnb2snKTwvc2NyaXB0PjxsaW5lYXJHcmFkaWVudCBpZD0nZ3JhZGllbnQnPjxzdG9wIG9mZnNldD0nMTAlJyBzdG9wLWNvbG9yPScjRjAwJy8+PHN0b3Agb2Zmc2V0PSc5MCUnIHN0b3AtY29sb3I9JyNmY2MnLz4gPC9saW5lYXJHcmFkaWVudD48cmVjdCBmaWxsPSd1cmwoI2dyYWRpZW50KScgeD0nMCcgeT0nMCcgd2lkdGg9JzEwMCUnIGhlaWdodD0nMTAwJScvPjwvc3ZnPg==\')', + 'text' => 'var:preset|color|dark-pink', + ), + ), + ), + ), + 'invalid/key' => array( + 'background' => 'green', + ), + ), + ), + ) + ); + + $expected = array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'styles' => array( + 'color' => array( + 'text' => 'var:preset|color|dark-red', + ), + 'elements' => array( + 'link' => array( + 'color' => array( + 'text' => 'var:preset|color|dark-pink', + 'background' => 'var:preset|color|dark-red', + ), + ), + ), + 'blocks' => array( + 'core/image' => array( + 'filter' => array( + 'duotone' => 'var:preset|duotone|blue-red', + ), + ), + 'core/group' => array( + 'color' => array( + 'text' => 'var:preset|color|dark-gray', + ), + 'elements' => array( + 'link' => array( + 'color' => array( + 'text' => 'var:preset|color|dark-pink', + ), + ), + ), + ), + ), + ), + ); + $this->assertEqualSetsWithIndex( $expected, $actual ); + } + + /** + * @ticket 54336 + */ + public function test_remove_insecure_properties_removes_unsafe_styles_sub_properties() { + $actual = WP_Theme_JSON::remove_insecure_properties( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'styles' => array( + 'border' => array( + 'radius' => array( + 'topLeft' => '6px', + 'topRight' => 'var(--top-right, var(--unsafe-fallback))', + 'bottomRight' => '6px', + 'bottomLeft' => '6px', + ), + ), + 'spacing' => array( + 'padding' => array( + 'top' => '1px', + 'right' => '1px', + 'bottom' => 'var(--bottom, var(--unsafe-fallback))', + 'left' => '1px', + ), + ), + 'elements' => array( + 'link' => array( + 'spacing' => array( + 'padding' => array( + 'top' => '2px', + 'right' => '2px', + 'bottom' => 'var(--bottom, var(--unsafe-fallback))', + 'left' => '2px', + ), + ), + ), + ), + 'blocks' => array( + 'core/group' => array( + 'border' => array( + 'radius' => array( + 'topLeft' => '5px', + 'topRight' => 'var(--top-right, var(--unsafe-fallback))', + 'bottomRight' => '5px', + 'bottomLeft' => '5px', + ), + ), + 'spacing' => array( + 'padding' => array( + 'top' => '3px', + 'right' => '3px', + 'bottom' => 'var(bottom, var(--unsafe-fallback))', + 'left' => '3px', + ), + ), + 'elements' => array( + 'link' => array( + 'spacing' => array( + 'padding' => array( + 'top' => '4px', + 'right' => '4px', + 'bottom' => 'var(--bottom, var(--unsafe-fallback))', + 'left' => '4px', + ), + ), + ), + ), + ), + ), + ), + ), + true + ); + + $expected = array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'styles' => array( + 'border' => array( + 'radius' => array( + 'topLeft' => '6px', + 'bottomRight' => '6px', + 'bottomLeft' => '6px', + ), + ), + 'spacing' => array( + 'padding' => array( + 'top' => '1px', + 'right' => '1px', + 'left' => '1px', + ), + ), + 'elements' => array( + 'link' => array( + 'spacing' => array( + 'padding' => array( + 'top' => '2px', + 'right' => '2px', + 'left' => '2px', + ), + ), + ), + ), + 'blocks' => array( + 'core/group' => array( + 'border' => array( + 'radius' => array( + 'topLeft' => '5px', + 'bottomRight' => '5px', + 'bottomLeft' => '5px', + ), + ), + 'spacing' => array( + 'padding' => array( + 'top' => '3px', + 'right' => '3px', + 'left' => '3px', + ), + ), + 'elements' => array( + 'link' => array( + 'spacing' => array( + 'padding' => array( + 'top' => '4px', + 'right' => '4px', + 'left' => '4px', + ), + ), + ), + ), + ), + ), + ), + ); + $this->assertEqualSetsWithIndex( $expected, $actual ); + } + + /** + * @ticket 54336 + */ + public function test_remove_insecure_properties_removes_non_preset_settings() { + $actual = WP_Theme_JSON::remove_insecure_properties( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'color' => array( + 'custom' => true, + 'palette' => array( + 'custom' => array( + array( + 'name' => 'Red', + 'slug' => 'red', + 'color' => '#ff0000', + ), + array( + 'name' => 'Green', + 'slug' => 'green', + 'color' => '#00ff00', + ), + array( + 'name' => 'Blue', + 'slug' => 'blue', + 'color' => '#0000ff', + ), + ), + ), + ), + 'spacing' => array( + 'padding' => false, + ), + 'blocks' => array( + 'core/group' => array( + 'color' => array( + 'custom' => true, + 'palette' => array( + 'custom' => array( + array( + 'name' => 'Yellow', + 'slug' => 'yellow', + 'color' => '#ff0000', + ), + array( + 'name' => 'Pink', + 'slug' => 'pink', + 'color' => '#00ff00', + ), + array( + 'name' => 'Orange', + 'slug' => 'orange', + 'color' => '#0000ff', + ), + ), + ), + ), + 'spacing' => array( + 'padding' => false, + ), + ), + ), + ), + ) + ); + + $expected = array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'color' => array( + 'palette' => array( + 'custom' => array( + array( + 'name' => 'Red', + 'slug' => 'red', + 'color' => '#ff0000', + ), + array( + 'name' => 'Green', + 'slug' => 'green', + 'color' => '#00ff00', + ), + array( + 'name' => 'Blue', + 'slug' => 'blue', + 'color' => '#0000ff', + ), + ), + ), + ), + 'blocks' => array( + 'core/group' => array( + 'color' => array( + 'palette' => array( + 'custom' => array( + array( + 'name' => 'Yellow', + 'slug' => 'yellow', + 'color' => '#ff0000', + ), + array( + 'name' => 'Pink', + 'slug' => 'pink', + 'color' => '#00ff00', + ), + array( + 'name' => 'Orange', + 'slug' => 'orange', + 'color' => '#0000ff', + ), + ), + ), + ), + ), + ), + ), + ); + $this->assertEqualSetsWithIndex( $expected, $actual ); + } + + /** + * @ticket 54336 + */ + public function test_remove_insecure_properties_removes_unsafe_preset_settings() { + $actual = WP_Theme_JSON::remove_insecure_properties( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'color' => array( + 'palette' => array( + 'custom' => array( + array( + 'name' => 'Red/>ok', + 'slug' => 'red', + 'color' => '#ff0000', + ), + array( + 'name' => 'Green', + 'slug' => 'a" attr', + 'color' => '#00ff00', + ), + array( + 'name' => 'Blue', + 'slug' => 'blue', + 'color' => 'var(--color, var(--unsafe-fallback))', + ), + array( + 'name' => 'Pink', + 'slug' => 'pink', + 'color' => '#FFC0CB', + ), + ), + ), + ), + 'typography' => array( + 'fontFamilies' => array( + 'custom' => array( + array( + 'name' => 'Helvetica Arial/>test', + 'slug' => 'helvetica-arial', + 'fontFamily' => 'Helvetica Neue, Helvetica, Arial, sans-serif', + ), + array( + 'name' => 'Geneva', + 'slug' => 'geneva#asa', + 'fontFamily' => 'Geneva, Tahoma, Verdana, sans-serif', + ), + array( + 'name' => 'Cambria', + 'slug' => 'cambria', + 'fontFamily' => 'Cambria, Georgia, serif', + ), + array( + 'name' => 'Helvetica Arial', + 'slug' => 'helvetica-arial', + 'fontFamily' => 'var(--fontFamily, var(--unsafe-fallback))', + ), + ), + ), + ), + 'blocks' => array( + 'core/group' => array( + 'color' => array( + 'palette' => array( + 'custom' => array( + array( + 'name' => 'Red/>ok', + 'slug' => 'red', + 'color' => '#ff0000', + ), + array( + 'name' => 'Green', + 'slug' => 'a" attr', + 'color' => '#00ff00', + ), + array( + 'name' => 'Blue', + 'slug' => 'blue', + 'color' => 'var(--color, var(--unsafe--fallback))', + ), + array( + 'name' => 'Pink', + 'slug' => 'pink', + 'color' => '#FFC0CB', + ), + ), + ), + ), + ), + ), + ), + ) + ); + + $expected = array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'color' => array( + 'palette' => array( + 'custom' => array( + array( + 'name' => 'Pink', + 'slug' => 'pink', + 'color' => '#FFC0CB', + ), + ), + ), + ), + 'typography' => array( + 'fontFamilies' => array( + 'custom' => array( + array( + 'name' => 'Cambria', + 'slug' => 'cambria', + 'fontFamily' => 'Cambria, Georgia, serif', + ), + ), + ), + ), + 'blocks' => array( + 'core/group' => array( + 'color' => array( + 'palette' => array( + 'custom' => array( + array( + 'name' => 'Pink', + 'slug' => 'pink', + 'color' => '#FFC0CB', + ), + ), + ), + ), + ), + ), + ), + ); + $this->assertEqualSetsWithIndex( $expected, $actual ); + } + + /** + * @ticket 54336 + */ + public function test_remove_insecure_properties_applies_safe_styles() { + $actual = WP_Theme_JSON::remove_insecure_properties( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'styles' => array( + 'color' => array( + 'text' => '#abcabc ', // Trailing space. + ), + ), + ), + true + ); + + $expected = array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'styles' => array( + 'color' => array( + 'text' => '#abcabc ', + ), + ), + ); + $this->assertEqualSetsWithIndex( $expected, $actual ); + } + + /** + * @ticket 54336 + */ + public function test_get_custom_templates() { + $theme_json = new WP_Theme_JSON( + array( + 'version' => 1, + 'customTemplates' => array( + array( + 'name' => 'page-home', + 'title' => 'Homepage template', + ), + ), + ) + ); + + $page_templates = $theme_json->get_custom_templates(); + + $this->assertEqualSetsWithIndex( + $page_templates, + array( + 'page-home' => array( + 'title' => 'Homepage template', + 'postTypes' => array( 'page' ), + ), + ) + ); + } + + /** + * @ticket 54336 + */ + public function test_get_template_parts() { + $theme_json = new WP_Theme_JSON( + array( + 'version' => 1, + 'templateParts' => array( + array( + 'name' => 'small-header', + 'title' => 'Small Header', + 'area' => 'header', + ), + ), + ) + ); + + $template_parts = $theme_json->get_template_parts(); + + $this->assertEqualSetsWithIndex( + $template_parts, + array( + 'small-header' => array( + 'title' => 'Small Header', + 'area' => 'header', + ), + ) + ); + } + + /** + * @ticket 52991 + */ + public function test_get_from_editor_settings() { + $input = array( + 'disableCustomColors' => true, + 'disableCustomGradients' => true, + 'disableCustomFontSizes' => true, + 'enableCustomLineHeight' => true, + 'enableCustomUnits' => true, + 'colors' => array( + array( + 'slug' => 'color-slug', + 'name' => 'Color Name', + 'color' => 'colorvalue', + ), + ), + 'gradients' => array( + array( + 'slug' => 'gradient-slug', + 'name' => 'Gradient Name', + 'gradient' => 'gradientvalue', + ), + ), + 'fontSizes' => array( + array( + 'slug' => 'size-slug', + 'name' => 'Size Name', + 'size' => 'sizevalue', + ), + ), + ); + + $expected = array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'color' => array( + 'custom' => false, 'customGradient' => false, 'gradients' => array( array( @@ -928,9 +2203,9 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { 'units' => array( 'px', 'em', 'rem', 'vh', 'vw', '%' ), ), 'typography' => array( - 'customFontSize' => false, - 'customLineHeight' => true, - 'fontSizes' => array( + 'customFontSize' => false, + 'lineHeight' => true, + 'fontSizes' => array( array( 'slug' => 'size-slug', 'name' => 'Size Name', @@ -948,6 +2223,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { /** * @ticket 52991 + * @ticket 54336 */ public function test_get_editor_settings_no_theme_support() { $input = array( @@ -990,8 +2266,8 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { 'units' => false, ), 'typography' => array( - 'customFontSize' => true, - 'customLineHeight' => false, + 'customFontSize' => true, + 'lineHeight' => false, ), ), ); @@ -1003,6 +2279,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { /** * @ticket 52991 + * @ticket 54336 */ public function test_get_editor_settings_blank() { $expected = array( @@ -1011,58 +2288,100 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ); $actual = WP_Theme_JSON::get_from_editor_settings( array() ); - $this->assertSameSetsWithIndex( $expected, $actual ); + $this->assertEqualSetsWithIndex( $expected, $actual ); } /** * @ticket 52991 + * @ticket 54336 */ public function test_get_editor_settings_custom_units_can_be_disabled() { add_theme_support( 'custom-units', array() ); - $input = get_default_block_editor_settings(); + $actual = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() ); + remove_theme_support( 'custom-units' ); $expected = array( - 'units' => array( array() ), - 'customPadding' => false, + 'units' => array( array() ), + 'padding' => false, ); - $actual = WP_Theme_JSON::get_from_editor_settings( $input ); - - $this->assertSameSetsWithIndex( $expected, $actual['settings']['spacing'] ); + $this->assertEqualSetsWithIndex( $expected, $actual['settings']['spacing'] ); } /** * @ticket 52991 + * @ticket 54336 */ public function test_get_editor_settings_custom_units_can_be_enabled() { add_theme_support( 'custom-units' ); - $input = get_default_block_editor_settings(); + $actual = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() ); + remove_theme_support( 'custom-units' ); $expected = array( - 'units' => array( 'px', 'em', 'rem', 'vh', 'vw', '%' ), - 'customPadding' => false, + 'units' => array( 'px', 'em', 'rem', 'vh', 'vw', '%' ), + 'padding' => false, ); - $actual = WP_Theme_JSON::get_from_editor_settings( $input ); - - $this->assertSameSetsWithIndex( $expected, $actual['settings']['spacing'] ); + $this->assertEqualSetsWithIndex( $expected, $actual['settings']['spacing'] ); } /** * @ticket 52991 + * @ticket 54336 */ public function test_get_editor_settings_custom_units_can_be_filtered() { add_theme_support( 'custom-units', 'rem', 'em' ); - $input = get_default_block_editor_settings(); + $actual = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() ); + remove_theme_support( 'custom-units' ); $expected = array( - 'units' => array( 'rem', 'em' ), - 'customPadding' => false, + 'units' => array( 'rem', 'em' ), + 'padding' => false, ); + $this->assertEqualSetsWithIndex( $expected, $actual['settings']['spacing'] ); + } - $actual = WP_Theme_JSON::get_from_editor_settings( $input ); + /** + * @ticket 54487 + */ + public function test_sanitization() { + $theme_json = new WP_Theme_JSON( + array( + 'version' => 2, + 'styles' => array( + 'spacing' => array( + 'blockGap' => 'valid value', + ), + 'blocks' => array( + 'core/group' => array( + 'spacing' => array( + 'margin' => 'valid value', + 'blockGap' => 'invalid value', + ), + ), + ), + ), + ) + ); + + $actual = $theme_json->get_raw_data(); + $expected = array( + 'version' => 2, + 'styles' => array( + 'spacing' => array( + 'blockGap' => 'valid value', + ), + 'blocks' => array( + 'core/group' => array( + 'spacing' => array( + 'margin' => 'valid value', + ), + ), + ), + ), + ); - $this->assertSameSetsWithIndex( $expected, $actual['settings']['spacing'] ); + $this->assertEqualSetsWithIndex( $expected, $actual ); } } diff --git a/tests/phpunit/tests/theme/wpThemeJsonResolver.php b/tests/phpunit/tests/theme/wpThemeJsonResolver.php index 7e4bd37d54..6c88666e38 100644 --- a/tests/phpunit/tests/theme/wpThemeJsonResolver.php +++ b/tests/phpunit/tests/theme/wpThemeJsonResolver.php @@ -24,6 +24,7 @@ class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase { add_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) ); add_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) ); add_filter( 'template_root', array( $this, 'filter_set_theme_root' ) ); + $this->queries = array(); // Clear caches. wp_clean_themes_cache(); unset( $GLOBALS['wp_themes'] ); @@ -44,15 +45,22 @@ class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase { return 'pl_PL'; } + function filter_db_query( $query ) { + if ( preg_match( '#post_type = \'wp_global_styles\'#', $query ) ) { + $this->queries[] = $query; + } + return $query; + } + /** * @ticket 52991 + * @ticket 54336 */ public function test_translations_are_applied() { add_filter( 'locale', array( $this, 'filter_set_locale_to_polish' ) ); load_textdomain( 'block-theme', realpath( DIR_TESTDATA . '/languages/themes/block-theme-pl_PL.mo' ) ); switch_theme( 'block-theme' ); - $actual = WP_Theme_JSON_Resolver::get_theme_data(); unload_textdomain( 'block-theme' ); @@ -62,6 +70,8 @@ class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase { $this->assertSame( array( 'color' => array( + 'custom' => false, + 'customGradient' => false, 'palette' => array( 'theme' => array( array( @@ -85,11 +95,11 @@ class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase { ), ), ), - 'custom' => false, - 'customGradient' => false, ), 'typography' => array( - 'fontSizes' => array( + 'customFontSize' => false, + 'lineHeight' => true, + 'fontSizes' => array( 'theme' => array( array( 'name' => 'Custom', @@ -98,14 +108,10 @@ class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase { ), ), ), - 'customFontSize' => false, - 'customLineHeight' => true, ), 'spacing' => array( - 'units' => array( - 'rem', - ), - 'customPadding' => true, + 'units' => array( 'rem' ), + 'padding' => true, ), 'blocks' => array( 'core/paragraph' => array( @@ -125,14 +131,32 @@ class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase { ), $actual->get_settings() ); + $this->assertSame( + $actual->get_custom_templates(), + array( + 'page-home' => array( + 'title' => 'Szablon strony głównej', + 'postTypes' => array( 'page' ), + ), + ) + ); + $this->assertSame( + $actual->get_template_parts(), + array( + 'small-header' => array( + 'title' => 'Mały nagłówek', + 'area' => 'header', + ), + ) + ); } /** * @ticket 52991 */ public function test_switching_themes_recalculates_data() { - // By default, the theme for unit tests is "default", - // which doesn't have theme.json support. + // The "default" theme doesn't have theme.json support. + switch_theme( 'default' ); $default = WP_Theme_JSON_Resolver::theme_has_support(); // Switch to a theme that does have support. @@ -143,4 +167,183 @@ class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase { $this->assertTrue( $has_theme_json_support ); } + /** + * @ticket 54336 + */ + function test_add_theme_supports_are_loaded_for_themes_without_theme_json() { + switch_theme( 'default' ); + $color_palette = array( + array( + 'name' => 'Primary', + 'slug' => 'primary', + 'color' => '#F00', + ), + array( + 'name' => 'Secondary', + 'slug' => 'secondary', + 'color' => '#0F0', + ), + array( + 'name' => 'Tertiary', + 'slug' => 'tertiary', + 'color' => '#00F', + ), + ); + add_theme_support( 'editor-color-palette', $color_palette ); + add_theme_support( 'custom-line-height' ); + + $settings = WP_Theme_JSON_Resolver::get_theme_data()->get_settings(); + + remove_theme_support( 'custom-line-height' ); + remove_theme_support( 'editor-color-palette' ); + + $this->assertFalse( WP_Theme_JSON_Resolver::theme_has_support() ); + $this->assertTrue( $settings['typography']['lineHeight'] ); + $this->assertSame( $color_palette, $settings['color']['palette']['theme'] ); + } + + /** + * Recursively applies ksort to an array. + */ + private static function recursive_ksort( &$array ) { + foreach ( $array as &$value ) { + if ( is_array( $value ) ) { + self::recursive_ksort( $value ); + } + } + ksort( $array ); + } + + /** + * @ticket 54336 + */ + function test_merges_child_theme_json_into_parent_theme_json() { + switch_theme( 'block-theme-child' ); + + $actual_settings = WP_Theme_JSON_Resolver::get_theme_data()->get_settings(); + $expected_settings = array( + 'color' => array( + 'custom' => false, + 'customGradient' => false, + 'gradients' => array( + 'theme' => array( + array( + 'name' => 'Custom gradient', + 'gradient' => 'linear-gradient(135deg,rgba(0,0,0) 0%,rgb(0,0,0) 100%)', + 'slug' => 'custom-gradient', + ), + ), + ), + 'palette' => array( + 'theme' => array( + array( + 'slug' => 'light', + 'name' => 'Light', + 'color' => '#f3f4f6', + ), + array( + 'slug' => 'primary', + 'name' => 'Primary', + 'color' => '#3858e9', + ), + array( + 'slug' => 'dark', + 'name' => 'Dark', + 'color' => '#111827', + ), + ), + ), + 'link' => true, + ), + 'typography' => array( + 'customFontSize' => false, + 'lineHeight' => true, + 'fontSizes' => array( + 'theme' => array( + array( + 'name' => 'Custom', + 'slug' => 'custom', + 'size' => '100px', + ), + ), + ), + ), + 'spacing' => array( + 'units' => array( 'rem' ), + 'padding' => true, + ), + 'blocks' => array( + 'core/paragraph' => array( + 'color' => array( + 'palette' => array( + 'theme' => array( + array( + 'slug' => 'light', + 'name' => 'Light', + 'color' => '#f5f7f9', + ), + ), + ), + ), + ), + 'core/post-title' => array( + 'color' => array( + 'palette' => array( + 'theme' => array( + array( + 'slug' => 'light', + 'name' => 'Light', + 'color' => '#f3f4f6', + ), + ), + ), + ), + ), + ), + ); + self::recursive_ksort( $actual_settings ); + self::recursive_ksort( $expected_settings ); + + // Should merge settings. + $this->assertSame( + $expected_settings, + $actual_settings + ); + + $this->assertSame( + WP_Theme_JSON_Resolver::get_theme_data()->get_custom_templates(), + array( + 'page-home' => array( + 'title' => 'Homepage', + 'postTypes' => array( 'page' ), + ), + ) + ); + } + + function test_get_user_data_from_wp_global_styles_does_not_use_uncached_queries() { + add_filter( 'query', array( $this, 'filter_db_query' ) ); + $query_count = count( $this->queries ); + for ( $i = 0; $i < 3; $i++ ) { + WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( wp_get_theme() ); + WP_Theme_JSON_Resolver::clean_cached_data(); + } + $query_count = count( $this->queries ) - $query_count; + $this->assertEquals( 1, $query_count, 'Only one SQL query should be peformed for multiple invocations of WP_Theme_JSON_Resolver::get_global_styles_from_post()' ); + + $user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( wp_get_theme() ); + $this->assertEmpty( $user_cpt ); + + $user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( wp_get_theme(), true ); + $this->assertNotEmpty( $user_cpt ); + + $query_count = count( $this->queries ); + for ( $i = 0; $i < 3; $i++ ) { + WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( wp_get_theme() ); + WP_Theme_JSON_Resolver::clean_cached_data(); + } + $query_count = count( $this->queries ) - $query_count; + $this->assertEquals( 0, $query_count, 'Unexpected SQL queries detected for the wp_global_style post type' ); + remove_filter( 'query', array( $this, 'filter_db_query' ) ); + } } diff --git a/tests/phpunit/tests/theme/wpThemeJsonSchema.php b/tests/phpunit/tests/theme/wpThemeJsonSchema.php new file mode 100644 index 0000000000..25cfcf7c97 --- /dev/null +++ b/tests/phpunit/tests/theme/wpThemeJsonSchema.php @@ -0,0 +1,193 @@ + 1, + 'settings' => array( + 'color' => array( + 'palette' => array( + array( + 'name' => 'Pale Pink', + 'slug' => 'pale-pink', + 'color' => '#f78da7', + ), + array( + 'name' => 'Vivid Red', + 'slug' => 'vivid-red', + 'color' => '#cf2e2e', + ), + ), + 'custom' => false, + 'link' => true, + ), + 'border' => array( + 'color' => false, + 'customRadius' => false, + 'style' => false, + 'width' => false, + ), + 'typography' => array( + 'fontStyle' => false, + 'fontWeight' => false, + 'letterSpacing' => false, + 'textDecoration' => false, + 'textTransform' => false, + ), + 'blocks' => array( + 'core/group' => array( + 'border' => array( + 'color' => true, + 'customRadius' => true, + 'style' => true, + 'width' => true, + ), + 'typography' => array( + 'fontStyle' => true, + 'fontWeight' => true, + 'letterSpacing' => true, + 'textDecoration' => true, + 'textTransform' => true, + ), + ), + ), + ), + 'styles' => array( + 'color' => array( + 'background' => 'purple', + ), + 'blocks' => array( + 'core/group' => array( + 'color' => array( + 'background' => 'red', + ), + 'spacing' => array( + 'padding' => array( + 'top' => '10px', + ), + ), + 'elements' => array( + 'link' => array( + 'color' => array( + 'text' => 'yellow', + ), + ), + ), + ), + ), + 'elements' => array( + 'link' => array( + 'color' => array( + 'text' => 'red', + ), + ), + ), + ), + ); + + $actual = WP_Theme_JSON_Schema::migrate( $theme_json_v1 ); + + $expected = array( + 'version' => self::LATEST_SCHEMA_VERSION, + 'settings' => array( + 'color' => array( + 'palette' => array( + array( + 'name' => 'Pale Pink', + 'slug' => 'pale-pink', + 'color' => '#f78da7', + ), + array( + 'name' => 'Vivid Red', + 'slug' => 'vivid-red', + 'color' => '#cf2e2e', + ), + ), + 'custom' => false, + 'link' => true, + ), + 'border' => array( + 'color' => false, + 'radius' => false, + 'style' => false, + 'width' => false, + ), + 'typography' => array( + 'fontStyle' => false, + 'fontWeight' => false, + 'letterSpacing' => false, + 'textDecoration' => false, + 'textTransform' => false, + ), + 'blocks' => array( + 'core/group' => array( + 'border' => array( + 'color' => true, + 'radius' => true, + 'style' => true, + 'width' => true, + ), + 'typography' => array( + 'fontStyle' => true, + 'fontWeight' => true, + 'letterSpacing' => true, + 'textDecoration' => true, + 'textTransform' => true, + ), + ), + ), + ), + 'styles' => array( + 'color' => array( + 'background' => 'purple', + ), + 'blocks' => array( + 'core/group' => array( + 'color' => array( + 'background' => 'red', + ), + 'spacing' => array( + 'padding' => array( + 'top' => '10px', + ), + ), + 'elements' => array( + 'link' => array( + 'color' => array( + 'text' => 'yellow', + ), + ), + ), + ), + ), + 'elements' => array( + 'link' => array( + 'color' => array( + 'text' => 'red', + ), + ), + ), + ), + ); + + $this->assertEqualSetsWithIndex( $expected, $actual ); + } +} diff --git a/tests/phpunit/tests/user.php b/tests/phpunit/tests/user.php index caa9a5e24d..67ab0f04f7 100644 --- a/tests/phpunit/tests/user.php +++ b/tests/phpunit/tests/user.php @@ -104,7 +104,7 @@ class Tests_User extends WP_UnitTestCase { $this->assertSame( $val, get_user_option( $key, self::$author_id ) ); // Change and get again. - $val2 = rand_str(); + $val2 = 'baz'; update_user_option( self::$author_id, $key, $val2 ); $this->assertSame( $val2, get_user_option( $key, self::$author_id ) ); } @@ -135,7 +135,7 @@ class Tests_User extends WP_UnitTestCase { // Delete by key AND value. update_user_meta( self::$author_id, $key, $val ); // Incorrect key: key still exists. - delete_user_meta( self::$author_id, $key, rand_str() ); + delete_user_meta( self::$author_id, $key, 'foo' ); $this->assertSame( $val, get_user_meta( self::$author_id, $key, true ) ); // Correct key: deleted. delete_user_meta( self::$author_id, $key, $val ); @@ -149,9 +149,9 @@ class Tests_User extends WP_UnitTestCase { public function test_usermeta_array() { // Some values to set. $vals = array( - rand_str() => 'val-' . rand_str(), - rand_str() => 'val-' . rand_str(), - rand_str() => 'val-' . rand_str(), + 'key0' => 'val0', + 'key1' => 'val1', + 'key2' => 'val2', ); // There is already some stuff in the array. @@ -475,8 +475,8 @@ class Tests_User extends WP_UnitTestCase { $post = array( 'post_author' => self::$author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', 'post_type' => 'post', ); @@ -636,7 +636,7 @@ class Tests_User extends WP_UnitTestCase { public function test_user_meta_error() { $id1 = wp_insert_user( array( - 'user_login' => rand_str(), + 'user_login' => 'taco_burrito', 'user_pass' => 'password', 'user_email' => 'taco@burrito.com', ) @@ -645,7 +645,7 @@ class Tests_User extends WP_UnitTestCase { $id2 = wp_insert_user( array( - 'user_login' => rand_str(), + 'user_login' => 'taco_burrito2', 'user_pass' => 'password', 'user_email' => 'taco@burrito.com', ) @@ -826,9 +826,9 @@ class Tests_User extends WP_UnitTestCase { */ public function test_wp_insert_user_should_not_wipe_existing_password() { $user_details = array( - 'user_login' => rand_str(), + 'user_login' => 'jonsnow', 'user_pass' => 'password', - 'user_email' => rand_str() . '@example.com', + 'user_email' => 'jonsnow@example.com', ); $user_id = wp_insert_user( $user_details ); @@ -1000,6 +1000,24 @@ class Tests_User extends WP_UnitTestCase { $this->assertSame( $expected, $user->user_nicename ); } + /** + * @ticket 44107 + */ + public function test_wp_insert_user_should_reject_user_url_over_100_characters() { + $user_url = str_repeat( 'a', 101 ); + $u = wp_insert_user( + array( + 'user_login' => 'test', + 'user_email' => 'test@example.com', + 'user_pass' => 'password', + 'user_url' => $user_url, + ) + ); + + $this->assertWPError( $u ); + $this->assertSame( 'user_url_too_long', $u->get_error_code() ); + } + /** * @ticket 28004 */ @@ -1909,9 +1927,9 @@ class Tests_User extends WP_UnitTestCase { * This hook is used in `test_wp_insert_user_with_meta()`. */ public function filter_custom_meta( $meta_input ) { - // Update some meta inputs + // Update some meta inputs. $meta_input['test_meta_key'] = 'update_from_filter'; - // Add a new meta + // Add a new meta. $meta_input['new_meta_from_filter'] = 'new_from_filter'; return $meta_input; diff --git a/tests/phpunit/tests/user/author.php b/tests/phpunit/tests/user/author.php index 5786578855..1a624ec833 100644 --- a/tests/phpunit/tests/user/author.php +++ b/tests/phpunit/tests/user/author.php @@ -26,8 +26,8 @@ class Tests_User_Author_Template extends WP_UnitTestCase { array( 'post_author' => self::$author_id, 'post_status' => 'publish', - 'post_content' => rand_str(), - 'post_title' => rand_str(), + 'post_content' => 'content', + 'post_title' => 'title', 'post_type' => 'post', ) ); diff --git a/tests/phpunit/tests/user/retrievePassword.php b/tests/phpunit/tests/user/retrievePassword.php new file mode 100644 index 0000000000..5a0e1d638e --- /dev/null +++ b/tests/phpunit/tests/user/retrievePassword.php @@ -0,0 +1,70 @@ +user = self::factory()->user->create_and_get( + array( + 'user_login' => 'jane', + 'user_email' => 'r.jane@example.com', + ) + ); + } + + /** + * The function should not error when the email was sent. + * + * @ticket 54690 + */ + public function test_retrieve_password_reset_notification_email() { + $message = 'Sending password reset notification email failed.'; + $this->assertNotWPError( retrieve_password( $this->user->user_login ), $message ); + } + + /** + * The function should error when the email was not sent. + * + * @ticket 54690 + */ + public function test_retrieve_password_should_return_wp_error_on_failed_email() { + add_filter( + 'retrieve_password_notification_email', + static function() { + return array( 'message' => '' ); + } + ); + + $message = 'Sending password reset notification email succeeded.'; + $this->assertWPError( retrieve_password( $this->user->user_login ), $message ); + } +} diff --git a/tests/phpunit/tests/user/wpListUsers.php b/tests/phpunit/tests/user/wpListUsers.php new file mode 100644 index 0000000000..32d30699c1 --- /dev/null +++ b/tests/phpunit/tests/user/wpListUsers.php @@ -0,0 +1,202 @@ +user->create( + array( + 'user_login' => 'zack', + 'display_name' => 'zack', + 'role' => 'subscriber', + 'first_name' => 'zack', + 'last_name' => 'moon', + 'user_email' => 'm.zack@example.com', + 'user_url' => 'http://moonzack.fake', + ) + ); + + self::$user_ids[] = $factory->user->create( + array( + 'user_login' => 'jane', + 'display_name' => 'jane', + 'role' => 'contributor', + 'first_name' => 'jane', + 'last_name' => 'reno', + 'user_email' => 'r.jane@example.com', + 'user_url' => 'http://janereno.fake', + ) + ); + + self::$user_ids[] = $factory->user->create( + array( + 'user_login' => 'michelle', + 'display_name' => 'michelle', + 'role' => 'subscriber', + 'first_name' => 'michelle', + 'last_name' => 'jones', + 'user_email' => 'j.michelle@example.com', + 'user_url' => 'http://lemichellejones.fake', + ) + ); + + self::$user_ids[] = $factory->user->create( + array( + 'user_login' => 'paul', + 'display_name' => 'paul', + 'role' => 'subscriber', + 'first_name' => 'paul', + 'last_name' => 'norris', + 'user_email' => 'n.paul@example.com', + 'user_url' => 'http://awildpaulappeared.fake', + ) + ); + + foreach ( self::$user_ids as $user ) { + $factory->post->create( + array( + 'post_type' => 'post', + 'post_author' => $user, + ) + ); + } + } + + /** + * Test that wp_list_users() creates the expected list of users. + * + * @dataProvider data_should_create_a_user_list + * + * @ticket 15145 + * + * @param array|string $args The arguments to create a list of users. + * @param string $expected The expected result. + */ + public function test_should_create_a_user_list( $args, $expected ) { + $actual = wp_list_users( $args ); + + $expected = str_replace( + array( 'AUTHOR_ID_zack', 'AUTHOR_ID_jane', 'AUTHOR_ID_michelle', 'AUTHOR_ID_paul' ), + array( self::$user_ids[0], self::$user_ids[1], self::$user_ids[2], self::$user_ids[3] ), + $expected + ); + + if ( null === $actual ) { + $this->expectOutputString( $expected ); + } else { + $this->assertSame( $expected, $actual ); + } + } + + /** + * Data provider. + * + * @return array + */ + public function data_should_create_a_user_list() { + return array( + 'defaults when no args are supplied' => array( + 'args' => '', + 'expected' => '
  • jane
  • michelle
  • paul
  • zack
    • ', + ), + 'the admin account included' => array( + 'args' => array( + 'exclude_admin' => false, + ), + 'expected' => '
  • admin
  • jane
  • michelle
  • paul
  • zack
    • ', + ), + 'the full name of each user' => array( + 'args' => array( + 'show_fullname' => true, + ), + 'expected' => '
  • jane reno
  • michelle jones
  • paul norris
  • zack moon
    • ', + ), + 'the feed of each user' => array( + 'args' => array( + 'feed' => 'User feed', + ), + 'expected' => '
  • jane (User feed)
    • ' . + '
  • michelle (User feed)
    • ' . + '
  • paul (User feed)
    • ' . + '
  • zack (User feed)
    • ', + ), + 'the feed of each user and an image' => array( + 'args' => array( + 'feed' => 'User feed with image', + 'feed_image' => 'http://example.org/image.jpg', + ), + 'expected' => '
  • jane User feed with image
    • ' . + '
  • michelle User feed with image
    • ' . + '
  • paul User feed with image
    • ' . + '
  • zack User feed with image
    • ', + ), + 'a feed of the specified type' => array( + 'args' => array( + 'feed' => 'User feed as atom', + 'feed_type' => 'atom', + ), + 'expected' => '
  • jane (User feed as atom)
    • ' . + '
  • michelle (User feed as atom)
    • ' . + '
  • paul (User feed as atom)
    • ' . + '
  • zack (User feed as atom)
    • ', + ), + 'no output via echo' => array( + 'args' => array( + 'echo' => false, + ), + 'expected' => '
  • jane
  • michelle
  • paul
  • zack
    • ', + ), + 'commas separating each user' => array( + 'args' => array( + 'style' => '', + ), + 'expected' => 'jane, michelle, paul, zack', + ), + 'plain text format' => array( + 'args' => array( + 'html' => false, + ), + 'expected' => 'jane, michelle, paul, zack', + ), + ); + } + + /** + * Tests that wp_list_users() does not create a user list. + * + * @dataProvider data_should_not_create_a_user_list + * + * @ticket 15145 + * + * @param array|string $args The arguments to create a list of users. + */ + public function test_should_not_create_a_user_list( $args ) { + $actual = wp_list_users( $args ); + + if ( null === $actual ) { + $this->expectOutputString( '', 'wp_list_users() did not output an empty string.' ); + } else { + $this->assertSame( $actual, 'wp_list_users() did not return an empty string.' ); + } + } + + /** + * Data provider. + * + * @return array + */ + public function data_should_not_create_a_user_list() { + return array( + 'an empty user query result' => array( + 'args' => array( + 'include' => array( 9999 ), + ), + 'expected' => '', + ), + ); + } +} diff --git a/tests/phpunit/tests/widgets.php b/tests/phpunit/tests/widgets.php index 679d2b7a59..7cfce4719b 100644 --- a/tests/phpunit/tests/widgets.php +++ b/tests/phpunit/tests/widgets.php @@ -590,6 +590,42 @@ class Tests_Widgets extends WP_UnitTestCase { // @todo Test WP_Widget::display_callback(). + /** + * @ticket 52728 + */ + function test_widget_display_callback_handles_arrayobject() { + $widget = new WP_Widget_Text(); + + register_widget( $widget ); + + add_filter( + "pre_option_{$widget->option_name}", + static function() { + return new ArrayObject( + array( + 2 => array( 'title' => 'Test Title' ), + '_multiwidget' => 1, + '__i__' => true, + ) + ); + } + ); + + $this->expectOutputRegex( '/Test Title/' ); + + $widget->display_callback( + array( + 'before_widget' => '
    ', + 'after_widget' => "
    \n", + 'before_title' => '

    ', + 'after_title' => "

    \n", + ), + 2 + ); + + unregister_widget( $widget ); + } + /** * @see WP_Widget::is_preview() */ diff --git a/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php b/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php index 047b5653a0..a2ef5c35a7 100644 --- a/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php +++ b/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php @@ -185,7 +185,7 @@ class Tests_Widgets_wpWidgetCustomHtml extends WP_UnitTestCase { 'content' => $instance['content'], ); $result = $widget->update( $instance, array() ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Make sure KSES is applying as expected. add_filter( 'map_meta_cap', array( $this, 'grant_unfiltered_html_cap' ), 10, 2 ); @@ -193,7 +193,7 @@ class Tests_Widgets_wpWidgetCustomHtml extends WP_UnitTestCase { $instance['content'] = ''; $expected['content'] = $instance['content']; $result = $widget->update( $instance, array() ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); remove_filter( 'map_meta_cap', array( $this, 'grant_unfiltered_html_cap' ) ); add_filter( 'map_meta_cap', array( $this, 'revoke_unfiltered_html_cap' ), 10, 2 ); @@ -201,7 +201,7 @@ class Tests_Widgets_wpWidgetCustomHtml extends WP_UnitTestCase { $instance['content'] = ''; $expected['content'] = wp_kses_post( $instance['content'] ); $result = $widget->update( $instance, array() ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); remove_filter( 'map_meta_cap', array( $this, 'revoke_unfiltered_html_cap' ), 10 ); } diff --git a/tests/phpunit/tests/widgets/wpWidgetMedia.php b/tests/phpunit/tests/widgets/wpWidgetMedia.php index cd127fb999..fd85f37714 100644 --- a/tests/phpunit/tests/widgets/wpWidgetMedia.php +++ b/tests/phpunit/tests/widgets/wpWidgetMedia.php @@ -244,7 +244,7 @@ class Tests_Widgets_wpWidgetMedia extends WP_UnitTestCase { 'attachment_id' => 1, ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid attachment ID. $result = $widget->update( @@ -260,7 +260,7 @@ class Tests_Widgets_wpWidgetMedia extends WP_UnitTestCase { 'url' => 'https://example.org', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid attachment url. $result = $widget->update( @@ -276,7 +276,7 @@ class Tests_Widgets_wpWidgetMedia extends WP_UnitTestCase { 'title' => 'What a title', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid attachment title. $result = $widget->update( diff --git a/tests/phpunit/tests/widgets/wpWidgetMediaAudio.php b/tests/phpunit/tests/widgets/wpWidgetMediaAudio.php index 5f54fc2d8b..a02c1bb042 100644 --- a/tests/phpunit/tests/widgets/wpWidgetMediaAudio.php +++ b/tests/phpunit/tests/widgets/wpWidgetMediaAudio.php @@ -125,7 +125,7 @@ class Tests_Widgets_wpWidgetMediaAudio extends WP_UnitTestCase { 'attachment_id' => 1, ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid attachment ID. $result = $widget->update( @@ -141,7 +141,7 @@ class Tests_Widgets_wpWidgetMediaAudio extends WP_UnitTestCase { 'url' => 'https://chickenandribs.org', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid attachment url. $result = $widget->update( @@ -158,7 +158,7 @@ class Tests_Widgets_wpWidgetMediaAudio extends WP_UnitTestCase { 'loop' => true, ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid loop setting. $result = $widget->update( @@ -174,7 +174,7 @@ class Tests_Widgets_wpWidgetMediaAudio extends WP_UnitTestCase { 'title' => 'An audio sample of parrots', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid attachment title. $result = $widget->update( @@ -190,7 +190,7 @@ class Tests_Widgets_wpWidgetMediaAudio extends WP_UnitTestCase { 'preload' => 'none', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid preload setting. $result = $widget->update( diff --git a/tests/phpunit/tests/widgets/wpWidgetMediaImage.php b/tests/phpunit/tests/widgets/wpWidgetMediaImage.php index 82e67e189e..57ffc9a6aa 100644 --- a/tests/phpunit/tests/widgets/wpWidgetMediaImage.php +++ b/tests/phpunit/tests/widgets/wpWidgetMediaImage.php @@ -132,7 +132,7 @@ class Tests_Widgets_wpWidgetMediaImage extends WP_UnitTestCase { 'attachment_id' => 1, ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid attachment ID. $result = $widget->update( @@ -148,7 +148,7 @@ class Tests_Widgets_wpWidgetMediaImage extends WP_UnitTestCase { 'url' => 'https://example.org', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid attachment url. $result = $widget->update( @@ -165,7 +165,7 @@ class Tests_Widgets_wpWidgetMediaImage extends WP_UnitTestCase { 'title' => 'What a title', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid attachment title. $result = $widget->update( @@ -181,7 +181,7 @@ class Tests_Widgets_wpWidgetMediaImage extends WP_UnitTestCase { 'size' => 'thumbnail', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid image size. $result = $widget->update( @@ -197,7 +197,7 @@ class Tests_Widgets_wpWidgetMediaImage extends WP_UnitTestCase { 'width' => 300, ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid image width. $result = $widget->update( @@ -213,7 +213,7 @@ class Tests_Widgets_wpWidgetMediaImage extends WP_UnitTestCase { 'height' => 200, ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid image height. $result = $widget->update( @@ -229,7 +229,7 @@ class Tests_Widgets_wpWidgetMediaImage extends WP_UnitTestCase { 'caption' => 'A caption with link', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid image caption. $result = $widget->update( @@ -250,7 +250,7 @@ class Tests_Widgets_wpWidgetMediaImage extends WP_UnitTestCase { 'alt' => 'A water tower', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid alt text. $result = $widget->update( @@ -271,7 +271,7 @@ class Tests_Widgets_wpWidgetMediaImage extends WP_UnitTestCase { 'link_type' => 'file', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid link type. $result = $widget->update( @@ -287,7 +287,7 @@ class Tests_Widgets_wpWidgetMediaImage extends WP_UnitTestCase { 'link_url' => 'https://example.org', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid link url. $result = $widget->update( @@ -304,7 +304,7 @@ class Tests_Widgets_wpWidgetMediaImage extends WP_UnitTestCase { 'image_classes' => 'A water tower', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid image classes. $result = $widget->update( @@ -325,7 +325,7 @@ class Tests_Widgets_wpWidgetMediaImage extends WP_UnitTestCase { 'link_classes' => 'A water tower', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid link classes. $result = $widget->update( @@ -346,7 +346,7 @@ class Tests_Widgets_wpWidgetMediaImage extends WP_UnitTestCase { 'link_rel' => 'previous', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid rel text. $result = $widget->update( @@ -367,7 +367,7 @@ class Tests_Widgets_wpWidgetMediaImage extends WP_UnitTestCase { 'link_target_blank' => false, ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid link target. $result = $widget->update( @@ -383,7 +383,7 @@ class Tests_Widgets_wpWidgetMediaImage extends WP_UnitTestCase { 'image_title' => 'What a title', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid image title. $result = $widget->update( diff --git a/tests/phpunit/tests/widgets/wpWidgetMediaVideo.php b/tests/phpunit/tests/widgets/wpWidgetMediaVideo.php index d3a6b9e266..2d4207e9f0 100644 --- a/tests/phpunit/tests/widgets/wpWidgetMediaVideo.php +++ b/tests/phpunit/tests/widgets/wpWidgetMediaVideo.php @@ -126,7 +126,7 @@ class Tests_Widgets_wpWidgetMediaVideo extends WP_UnitTestCase { 'attachment_id' => 1, ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid attachment ID. $result = $widget->update( @@ -142,7 +142,7 @@ class Tests_Widgets_wpWidgetMediaVideo extends WP_UnitTestCase { 'url' => 'https://chickenandribs.org', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid attachment url. $result = $widget->update( @@ -159,7 +159,7 @@ class Tests_Widgets_wpWidgetMediaVideo extends WP_UnitTestCase { 'loop' => true, ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid loop setting. $result = $widget->update( @@ -175,7 +175,7 @@ class Tests_Widgets_wpWidgetMediaVideo extends WP_UnitTestCase { 'title' => 'A video of goats', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid attachment title. $result = $widget->update( @@ -191,7 +191,7 @@ class Tests_Widgets_wpWidgetMediaVideo extends WP_UnitTestCase { 'preload' => 'none', ); $result = $widget->update( $expected, $instance ); - $this->assertSame( $result, $expected ); + $this->assertSame( $expected, $result ); // Should filter invalid preload setting. $result = $widget->update( diff --git a/tests/phpunit/tests/xmlrpc/wp/editProfile.php b/tests/phpunit/tests/xmlrpc/wp/editProfile.php index 7c00626908..2789dbe460 100644 --- a/tests/phpunit/tests/xmlrpc/wp/editProfile.php +++ b/tests/phpunit/tests/xmlrpc/wp/editProfile.php @@ -16,13 +16,13 @@ class Tests_XMLRPC_wp_editProfile extends WP_XMLRPC_UnitTestCase { $subscriber_id = $this->make_user_by_role( 'subscriber' ); $new_data = array( - 'first_name' => rand_str(), - 'last_name' => rand_str(), + 'first_name' => 'firstname', + 'last_name' => 'lastname', 'url' => 'http://www.example.org/subscriber', - 'display_name' => rand_str(), - 'nickname' => rand_str(), - 'nicename' => rand_str(), - 'bio' => rand_str( 200 ), + 'display_name' => 'displayname', + 'nickname' => 'nickname', + 'nicename' => 'nicename', + 'bio' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', ); $result = $this->myxmlrpcserver->wp_editProfile( array( 1, 'subscriber', 'subscriber', $new_data ) ); $this->assertNotIXRError( $result ); diff --git a/tests/phpunit/tests/xmlrpc/wp/getComment.php b/tests/phpunit/tests/xmlrpc/wp/getComment.php index e43a733910..08cd4a5b00 100644 --- a/tests/phpunit/tests/xmlrpc/wp/getComment.php +++ b/tests/phpunit/tests/xmlrpc/wp/getComment.php @@ -18,7 +18,7 @@ class Tests_XMLRPC_wp_getComment extends WP_XMLRPC_UnitTestCase { 'comment_author' => 'Test commenter', 'comment_author_url' => 'http://example.com/', 'comment_author_email' => 'example@example.com', - 'comment_content' => rand_str( 100 ), + 'comment_content' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', ); self::$parent_comment_id = wp_insert_comment( self::$parent_comment_data ); @@ -28,7 +28,7 @@ class Tests_XMLRPC_wp_getComment extends WP_XMLRPC_UnitTestCase { 'comment_author_url' => 'http://example.org/', 'comment_author_email' => 'example@example.org', 'comment_parent' => self::$parent_comment_id, - 'comment_content' => rand_str( 100 ), + 'comment_content' => 'Duis non neque cursus, commodo massa in, bibendum nisl.', ); self::$child_comment_id = wp_insert_comment( self::$child_comment_data ); } diff --git a/tests/phpunit/tests/xmlrpc/wp/getPost.php b/tests/phpunit/tests/xmlrpc/wp/getPost.php index 0fd81ada8a..be25ca2770 100644 --- a/tests/phpunit/tests/xmlrpc/wp/getPost.php +++ b/tests/phpunit/tests/xmlrpc/wp/getPost.php @@ -14,9 +14,9 @@ class Tests_XMLRPC_wp_getPost extends WP_XMLRPC_UnitTestCase { $this->post_date_ts = strtotime( '+1 day' ); $this->post_data = array( - 'post_title' => rand_str(), - 'post_content' => rand_str( 2000 ), - 'post_excerpt' => rand_str( 100 ), + 'post_title' => 'Post Title', + 'post_content' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', + 'post_excerpt' => 'Post Excerpt', 'post_author' => $this->make_user_by_role( 'author' ), 'post_date' => date_format( date_create( "@{$this->post_date_ts}" ), 'Y-m-d H:i:s' ), ); diff --git a/tests/phpunit/tests/xmlrpc/wp/newComment.php b/tests/phpunit/tests/xmlrpc/wp/newComment.php index 6cc6c30160..7c2eacc6b1 100644 --- a/tests/phpunit/tests/xmlrpc/wp/newComment.php +++ b/tests/phpunit/tests/xmlrpc/wp/newComment.php @@ -55,7 +55,7 @@ class Tests_XMLRPC_wp_newComment extends WP_XMLRPC_UnitTestCase { 'administrator', self::$posts['publish']->ID, array( - 'content' => rand_str( 100 ), + 'content' => 'Content', ), ) ); @@ -155,7 +155,7 @@ class Tests_XMLRPC_wp_newComment extends WP_XMLRPC_UnitTestCase { 'administrator', $post->ID, array( - 'content' => rand_str( 100 ), + 'content' => 'Content', ), ) ); @@ -171,7 +171,7 @@ class Tests_XMLRPC_wp_newComment extends WP_XMLRPC_UnitTestCase { 'administrator', self::$posts['publish']->ID, array( - 'content' => rand_str( 100 ), + 'content' => 'Content', ), ); diff --git a/tests/qunit/fixtures/wp-api-generated.js b/tests/qunit/fixtures/wp-api-generated.js index 24296670a0..9566fb0ded 100644 --- a/tests/qunit/fixtures/wp-api-generated.js +++ b/tests/qunit/fixtures/wp-api-generated.js @@ -18,7 +18,13 @@ mockedApiResponse.Schema = { "wp-site-health/v1", "wp-block-editor/v1" ], - "authentication": [], + "authentication": { + "application-passwords": { + "endpoints": { + "authorization": "http://example.org/wp-admin/authorize-application.php" + } + } + }, "routes": { "/": { "namespace": "", @@ -261,6 +267,9 @@ mockedApiResponse.Schema = { "methods": [ "GET" ], + "allow_batch": { + "v1": true + }, "args": { "context": { "description": "Scope under which the request is made; determines fields present in response.", @@ -602,6 +611,9 @@ mockedApiResponse.Schema = { "methods": [ "POST" ], + "allow_batch": { + "v1": true + }, "args": { "date": { "description": "The date the post was published, in the site's timezone.", @@ -840,6 +852,9 @@ mockedApiResponse.Schema = { "methods": [ "GET" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the post.", @@ -870,6 +885,9 @@ mockedApiResponse.Schema = { "PUT", "PATCH" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the post.", @@ -1098,6 +1116,9 @@ mockedApiResponse.Schema = { "methods": [ "DELETE" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the post.", @@ -1579,6 +1600,9 @@ mockedApiResponse.Schema = { "methods": [ "GET" ], + "allow_batch": { + "v1": true + }, "args": { "context": { "description": "Scope under which the request is made; determines fields present in response.", @@ -1766,6 +1790,9 @@ mockedApiResponse.Schema = { "methods": [ "POST" ], + "allow_batch": { + "v1": true + }, "args": { "date": { "description": "The date the post was published, in the site's timezone.", @@ -1976,6 +2003,9 @@ mockedApiResponse.Schema = { "methods": [ "GET" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the post.", @@ -2006,6 +2036,9 @@ mockedApiResponse.Schema = { "PUT", "PATCH" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the post.", @@ -2206,6 +2239,9 @@ mockedApiResponse.Schema = { "methods": [ "DELETE" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the post.", @@ -3385,7 +3421,7 @@ mockedApiResponse.Schema = { } ] }, - "/wp/v2/blocks": { + "/wp/v2/menu-items": { "namespace": "wp/v2", "methods": [ "GET", @@ -3396,6 +3432,9 @@ mockedApiResponse.Schema = { "methods": [ "GET" ], + "allow_batch": { + "v1": true + }, "args": { "context": { "description": "Scope under which the request is made; determines fields present in response.", @@ -3418,7 +3457,7 @@ mockedApiResponse.Schema = { "per_page": { "description": "Maximum number of items to be returned in result set.", "type": "integer", - "default": 10, + "default": 100, "minimum": 1, "maximum": 100, "required": false @@ -3478,7 +3517,7 @@ mockedApiResponse.Schema = { "order": { "description": "Order sort attribute ascending or descending.", "type": "string", - "default": "desc", + "default": "asc", "enum": [ "asc", "desc" @@ -3486,9 +3525,9 @@ mockedApiResponse.Schema = { "required": false }, "orderby": { - "description": "Sort collection by post attribute.", + "description": "Sort collection by object attribute.", "type": "string", - "default": "date", + "default": "menu_order", "enum": [ "author", "date", @@ -3499,7 +3538,8 @@ mockedApiResponse.Schema = { "relevance", "slug", "include_slugs", - "title" + "title", + "menu_order" ], "required": false }, @@ -3534,6 +3574,97 @@ mockedApiResponse.Schema = { "type": "string" }, "required": false + }, + "tax_relation": { + "description": "Limit result set based on relationship between multiple taxonomies.", + "type": "string", + "enum": [ + "AND", + "OR" + ], + "required": false + }, + "menus": { + "description": "Limit result set to items with specific terms assigned in the menus taxonomy.", + "type": [ + "object", + "array" + ], + "oneOf": [ + { + "title": "Term ID List", + "description": "Match terms with the listed IDs.", + "type": "array", + "items": { + "type": "integer" + } + }, + { + "title": "Term ID Taxonomy Query", + "description": "Perform an advanced term query.", + "type": "object", + "properties": { + "terms": { + "description": "Term IDs.", + "type": "array", + "items": { + "type": "integer" + }, + "default": [] + }, + "operator": { + "description": "Whether items must be assigned all or any of the specified terms.", + "type": "string", + "enum": [ + "AND", + "OR" + ], + "default": "OR" + } + }, + "additionalProperties": false + } + ], + "required": false + }, + "menus_exclude": { + "description": "Limit result set to items except those with specific terms assigned in the menus taxonomy.", + "type": [ + "object", + "array" + ], + "oneOf": [ + { + "title": "Term ID List", + "description": "Match terms with the listed IDs.", + "type": "array", + "items": { + "type": "integer" + } + }, + { + "title": "Term ID Taxonomy Query", + "description": "Perform an advanced term query.", + "type": "object", + "properties": { + "terms": { + "description": "Term IDs.", + "type": "array", + "items": { + "type": "integer" + }, + "default": [] + } + }, + "additionalProperties": false + } + ], + "required": false + }, + "menu_order": { + "description": "Limit result set to posts with a specific menu_order value.", + "type": "integer", + "required": false } } }, @@ -3541,32 +3672,52 @@ mockedApiResponse.Schema = { "methods": [ "POST" ], + "allow_batch": { + "v1": true + }, "args": { - "date": { - "description": "The date the post was published, in the site's timezone.", - "type": [ - "string", - "null" - ], - "format": "date-time", - "required": false - }, - "date_gmt": { - "description": "The date the post was published, as GMT.", + "title": { + "description": "The title for the object.", "type": [ "string", - "null" + "object" ], - "format": "date-time", + "properties": { + "raw": { + "description": "Title for the object, as it exists in the database.", + "type": "string", + "context": [ + "edit" + ] + }, + "rendered": { + "description": "HTML title for the object, transformed for display.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, "required": false }, - "slug": { - "description": "An alphanumeric identifier for the post unique to its type.", + "type": { + "default": "custom", + "description": "The family of objects originally represented, such as \"post_type\" or \"taxonomy\".", "type": "string", + "enum": [ + "taxonomy", + "post_type", + "post_type_archive", + "custom" + ], "required": false }, "status": { - "description": "A named status for the post.", + "default": "publish", + "description": "A named status for the object.", "type": "string", "enum": [ "publish", @@ -3577,72 +3728,96 @@ mockedApiResponse.Schema = { ], "required": false }, - "password": { - "description": "A password to protect access to the content and excerpt.", + "parent": { + "default": 0, + "description": "The ID for the parent of the object.", + "type": "integer", + "minimum": 0, + "required": false + }, + "attr_title": { + "description": "Text for the title attribute of the link element for this menu item.", "type": "string", "required": false }, - "title": { - "description": "The title for the post.", - "type": "object", - "properties": { - "raw": { - "description": "Title for the post, as it exists in the database.", - "type": "string", - "context": [ - "view", - "edit" - ] - } + "classes": { + "description": "Class names for the link element of this menu item.", + "type": "array", + "items": { + "type": "string" }, "required": false }, - "content": { - "description": "The content for the post.", - "type": "object", - "properties": { - "raw": { - "description": "Content for the post, as it exists in the database.", - "type": "string", - "context": [ - "view", - "edit" - ] - }, - "block_version": { - "description": "Version of the content block format used by the post.", - "type": "integer", - "context": [ - "edit" - ], - "readonly": true - }, - "protected": { - "description": "Whether the content is protected with a password.", - "type": "boolean", - "context": [ - "view", - "edit", - "embed" - ], - "readonly": true - } - }, + "description": { + "description": "The description of this menu item.", + "type": "string", "required": false }, - "template": { - "description": "The theme file to use to display the post.", + "menu_order": { + "default": 1, + "description": "The DB ID of the nav_menu_item that is this item's menu parent, if any, otherwise 0.", + "type": "integer", + "minimum": 1, + "required": false + }, + "object": { + "description": "The type of object originally represented, such as \"category\", \"post\", or \"attachment\".", + "type": "string", + "required": false + }, + "object_id": { + "default": 0, + "description": "The database ID of the original object this menu item represents, for example the ID for posts or the term_id for categories.", + "type": "integer", + "minimum": 0, + "required": false + }, + "target": { + "description": "The target attribute of the link element for this menu item.", + "type": "string", + "enum": [ + "_blank", + "" + ], + "required": false + }, + "url": { + "description": "The URL to which this menu item points.", "type": "string", + "format": "uri", + "required": false + }, + "xfn": { + "description": "The XFN relationship expressed in the link of this menu item.", + "type": "array", + "items": { + "type": "string" + }, + "required": false + }, + "menus": { + "description": "The terms assigned to the object in the nav_menu taxonomy.", + "type": "integer", + "required": false + }, + "meta": { + "description": "Meta fields.", + "type": "object", + "properties": [], "required": false } } } ], "_links": { - "self": "http://example.org/index.php?rest_route=/wp/v2/blocks" + "self": [ + { + "href": "http://example.org/index.php?rest_route=/wp/v2/menu-items" + } + ] } }, - "/wp/v2/blocks/(?P[\\d]+)": { + "/wp/v2/menu-items/(?P[\\d]+)": { "namespace": "wp/v2", "methods": [ "GET", @@ -3656,6 +3831,9 @@ mockedApiResponse.Schema = { "methods": [ "GET" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the post.", @@ -3672,11 +3850,6 @@ mockedApiResponse.Schema = { ], "default": "view", "required": false - }, - "password": { - "description": "The password for the post if it is password protected.", - "type": "string", - "required": false } } }, @@ -3686,37 +3859,55 @@ mockedApiResponse.Schema = { "PUT", "PATCH" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the post.", "type": "integer", "required": false }, - "date": { - "description": "The date the post was published, in the site's timezone.", - "type": [ - "string", - "null" - ], - "format": "date-time", - "required": false - }, - "date_gmt": { - "description": "The date the post was published, as GMT.", + "title": { + "description": "The title for the object.", "type": [ "string", - "null" + "object" ], - "format": "date-time", + "properties": { + "raw": { + "description": "Title for the object, as it exists in the database.", + "type": "string", + "context": [ + "edit" + ] + }, + "rendered": { + "description": "HTML title for the object, transformed for display.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, "required": false }, - "slug": { - "description": "An alphanumeric identifier for the post unique to its type.", + "type": { + "description": "The family of objects originally represented, such as \"post_type\" or \"taxonomy\".", "type": "string", + "enum": [ + "taxonomy", + "post_type", + "post_type_archive", + "custom" + ], "required": false }, "status": { - "description": "A named status for the post.", + "description": "A named status for the object.", "type": "string", "enum": [ "publish", @@ -3727,62 +3918,79 @@ mockedApiResponse.Schema = { ], "required": false }, - "password": { - "description": "A password to protect access to the content and excerpt.", + "parent": { + "description": "The ID for the parent of the object.", + "type": "integer", + "minimum": 0, + "required": false + }, + "attr_title": { + "description": "Text for the title attribute of the link element for this menu item.", "type": "string", "required": false }, - "title": { - "description": "The title for the post.", - "type": "object", - "properties": { - "raw": { - "description": "Title for the post, as it exists in the database.", - "type": "string", - "context": [ - "view", - "edit" - ] - } + "classes": { + "description": "Class names for the link element of this menu item.", + "type": "array", + "items": { + "type": "string" }, "required": false }, - "content": { - "description": "The content for the post.", - "type": "object", - "properties": { - "raw": { - "description": "Content for the post, as it exists in the database.", - "type": "string", - "context": [ - "view", - "edit" - ] - }, - "block_version": { - "description": "Version of the content block format used by the post.", - "type": "integer", - "context": [ - "edit" - ], - "readonly": true - }, - "protected": { - "description": "Whether the content is protected with a password.", - "type": "boolean", - "context": [ - "view", - "edit", - "embed" - ], - "readonly": true - } - }, + "description": { + "description": "The description of this menu item.", + "type": "string", "required": false }, - "template": { - "description": "The theme file to use to display the post.", + "menu_order": { + "description": "The DB ID of the nav_menu_item that is this item's menu parent, if any, otherwise 0.", + "type": "integer", + "minimum": 1, + "required": false + }, + "object": { + "description": "The type of object originally represented, such as \"category\", \"post\", or \"attachment\".", + "type": "string", + "required": false + }, + "object_id": { + "description": "The database ID of the original object this menu item represents, for example the ID for posts or the term_id for categories.", + "type": "integer", + "minimum": 0, + "required": false + }, + "target": { + "description": "The target attribute of the link element for this menu item.", + "type": "string", + "enum": [ + "_blank", + "" + ], + "required": false + }, + "url": { + "description": "The URL to which this menu item points.", "type": "string", + "format": "uri", + "required": false + }, + "xfn": { + "description": "The XFN relationship expressed in the link of this menu item.", + "type": "array", + "items": { + "type": "string" + }, + "required": false + }, + "menus": { + "description": "The terms assigned to the object in the nav_menu taxonomy.", + "type": "integer", + "required": false + }, + "meta": { + "description": "Meta fields.", + "type": "object", + "properties": [], "required": false } } @@ -3791,6 +3999,9 @@ mockedApiResponse.Schema = { "methods": [ "DELETE" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the post.", @@ -3807,10 +4018,11 @@ mockedApiResponse.Schema = { } ] }, - "/wp/v2/blocks/(?P[\\d]+)/revisions": { + "/wp/v2/menu-items/(?P[\\d]+)/autosaves": { "namespace": "wp/v2", "methods": [ - "GET" + "GET", + "POST" ], "endpoints": [ { @@ -3819,7 +4031,7 @@ mockedApiResponse.Schema = { ], "args": { "parent": { - "description": "The ID for the parent of the revision.", + "description": "The ID for the parent of the autosave.", "type": "integer", "required": false }, @@ -3833,83 +4045,147 @@ mockedApiResponse.Schema = { ], "default": "view", "required": false - }, - "page": { - "description": "Current page of the collection.", + } + } + }, + { + "methods": [ + "POST" + ], + "args": { + "parent": { + "description": "The ID for the parent of the object.", "type": "integer", - "default": 1, - "minimum": 1, + "minimum": 0, "required": false }, - "per_page": { - "description": "Maximum number of items to be returned in result set.", - "type": "integer", - "minimum": 1, - "maximum": 100, + "title": { + "description": "The title for the object.", + "type": [ + "string", + "object" + ], + "properties": { + "raw": { + "description": "Title for the object, as it exists in the database.", + "type": "string", + "context": [ + "edit" + ] + }, + "rendered": { + "description": "HTML title for the object, transformed for display.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, "required": false }, - "search": { - "description": "Limit results to those matching a string.", + "type": { + "description": "The family of objects originally represented, such as \"post_type\" or \"taxonomy\".", "type": "string", + "enum": [ + "taxonomy", + "post_type", + "post_type_archive", + "custom" + ], "required": false }, - "exclude": { - "description": "Ensure result set excludes specific IDs.", - "type": "array", - "items": { - "type": "integer" - }, - "default": [], + "status": { + "description": "A named status for the object.", + "type": "string", + "enum": [ + "publish", + "future", + "draft", + "pending", + "private" + ], "required": false }, - "include": { - "description": "Limit result set to specific IDs.", + "attr_title": { + "description": "Text for the title attribute of the link element for this menu item.", + "type": "string", + "required": false + }, + "classes": { + "description": "Class names for the link element of this menu item.", "type": "array", "items": { - "type": "integer" + "type": "string" }, - "default": [], "required": false }, - "offset": { - "description": "Offset the result set by a specific number of items.", + "description": { + "description": "The description of this menu item.", + "type": "string", + "required": false + }, + "menu_order": { + "description": "The DB ID of the nav_menu_item that is this item's menu parent, if any, otherwise 0.", "type": "integer", + "minimum": 1, "required": false }, - "order": { - "description": "Order sort attribute ascending or descending.", + "object": { + "description": "The type of object originally represented, such as \"category\", \"post\", or \"attachment\".", "type": "string", - "default": "desc", - "enum": [ - "asc", - "desc" - ], "required": false }, - "orderby": { - "description": "Sort collection by object attribute.", + "object_id": { + "description": "The database ID of the original object this menu item represents, for example the ID for posts or the term_id for categories.", + "type": "integer", + "minimum": 0, + "required": false + }, + "target": { + "description": "The target attribute of the link element for this menu item.", "type": "string", - "default": "date", "enum": [ - "date", - "id", - "include", - "relevance", - "slug", - "include_slugs", - "title" + "_blank", + "" ], "required": false + }, + "url": { + "description": "The URL to which this menu item points.", + "type": "string", + "format": "uri", + "required": false + }, + "xfn": { + "description": "The XFN relationship expressed in the link of this menu item.", + "type": "array", + "items": { + "type": "string" + }, + "required": false + }, + "menus": { + "description": "The terms assigned to the object in the nav_menu taxonomy.", + "type": "integer", + "required": false + }, + "meta": { + "description": "Meta fields.", + "type": "object", + "properties": [], + "required": false } } } ] }, - "/wp/v2/blocks/(?P[\\d]+)/revisions/(?P[\\d]+)": { + "/wp/v2/menu-items/(?P[\\d]+)/autosaves/(?P[\\d]+)": { "namespace": "wp/v2", "methods": [ - "GET", - "DELETE" + "GET" ], "endpoints": [ { @@ -3918,12 +4194,12 @@ mockedApiResponse.Schema = { ], "args": { "parent": { - "description": "The ID for the parent of the revision.", + "description": "The ID for the parent of the autosave.", "type": "integer", "required": false }, "id": { - "description": "Unique identifier for the revision.", + "description": "The ID for the autosave.", "type": "integer", "required": false }, @@ -3939,33 +4215,10 @@ mockedApiResponse.Schema = { "required": false } } - }, - { - "methods": [ - "DELETE" - ], - "args": { - "parent": { - "description": "The ID for the parent of the revision.", - "type": "integer", - "required": false - }, - "id": { - "description": "Unique identifier for the revision.", - "type": "integer", - "required": false - }, - "force": { - "type": "boolean", - "default": false, - "description": "Required to be true, as revisions do not support trashing.", - "required": false - } - } } ] }, - "/wp/v2/blocks/(?P[\\d]+)/autosaves": { + "/wp/v2/blocks": { "namespace": "wp/v2", "methods": [ "GET", @@ -3976,12 +4229,10 @@ mockedApiResponse.Schema = { "methods": [ "GET" ], + "allow_batch": { + "v1": true + }, "args": { - "parent": { - "description": "The ID for the parent of the autosave.", - "type": "integer", - "required": false - }, "context": { "description": "Scope under which the request is made; determines fields present in response.", "type": "string", @@ -3992,6 +4243,133 @@ mockedApiResponse.Schema = { ], "default": "view", "required": false + }, + "page": { + "description": "Current page of the collection.", + "type": "integer", + "default": 1, + "minimum": 1, + "required": false + }, + "per_page": { + "description": "Maximum number of items to be returned in result set.", + "type": "integer", + "default": 10, + "minimum": 1, + "maximum": 100, + "required": false + }, + "search": { + "description": "Limit results to those matching a string.", + "type": "string", + "required": false + }, + "after": { + "description": "Limit response to posts published after a given ISO8601 compliant date.", + "type": "string", + "format": "date-time", + "required": false + }, + "modified_after": { + "description": "Limit response to posts modified after a given ISO8601 compliant date.", + "type": "string", + "format": "date-time", + "required": false + }, + "before": { + "description": "Limit response to posts published before a given ISO8601 compliant date.", + "type": "string", + "format": "date-time", + "required": false + }, + "modified_before": { + "description": "Limit response to posts modified before a given ISO8601 compliant date.", + "type": "string", + "format": "date-time", + "required": false + }, + "exclude": { + "description": "Ensure result set excludes specific IDs.", + "type": "array", + "items": { + "type": "integer" + }, + "default": [], + "required": false + }, + "include": { + "description": "Limit result set to specific IDs.", + "type": "array", + "items": { + "type": "integer" + }, + "default": [], + "required": false + }, + "offset": { + "description": "Offset the result set by a specific number of items.", + "type": "integer", + "required": false + }, + "order": { + "description": "Order sort attribute ascending or descending.", + "type": "string", + "default": "desc", + "enum": [ + "asc", + "desc" + ], + "required": false + }, + "orderby": { + "description": "Sort collection by post attribute.", + "type": "string", + "default": "date", + "enum": [ + "author", + "date", + "id", + "include", + "modified", + "parent", + "relevance", + "slug", + "include_slugs", + "title" + ], + "required": false + }, + "slug": { + "description": "Limit result set to posts with one or more specific slugs.", + "type": "array", + "items": { + "type": "string" + }, + "required": false + }, + "status": { + "default": "publish", + "description": "Limit result set to posts assigned one or more statuses.", + "type": "array", + "items": { + "enum": [ + "publish", + "future", + "draft", + "pending", + "private", + "trash", + "auto-draft", + "inherit", + "request-pending", + "request-confirmed", + "request-failed", + "request-completed", + "any" + ], + "type": "string" + }, + "required": false } } }, @@ -3999,12 +4377,10 @@ mockedApiResponse.Schema = { "methods": [ "POST" ], + "allow_batch": { + "v1": true + }, "args": { - "parent": { - "description": "The ID for the parent of the autosave.", - "type": "integer", - "required": false - }, "date": { "description": "The date the post was published, in the site's timezone.", "type": [ @@ -4100,26 +4476,31 @@ mockedApiResponse.Schema = { } } } - ] + ], + "_links": { + "self": "http://example.org/index.php?rest_route=/wp/v2/blocks" + } }, - "/wp/v2/blocks/(?P[\\d]+)/autosaves/(?P[\\d]+)": { + "/wp/v2/blocks/(?P[\\d]+)": { "namespace": "wp/v2", "methods": [ - "GET" + "GET", + "POST", + "PUT", + "PATCH", + "DELETE" ], "endpoints": [ { "methods": [ "GET" ], + "allow_batch": { + "v1": true + }, "args": { - "parent": { - "description": "The ID for the parent of the autosave.", - "type": "integer", - "required": false - }, "id": { - "description": "The ID for the autosave.", + "description": "Unique identifier for the post.", "type": "integer", "required": false }, @@ -4133,162 +4514,119 @@ mockedApiResponse.Schema = { ], "default": "view", "required": false - } - } - } - ] - }, - "/wp/v2/templates": { - "namespace": "wp/v2", - "methods": [ - "GET", - "POST" - ], - "endpoints": [ - { - "methods": [ - "GET" - ], - "args": { - "context": { - "description": "Scope under which the request is made; determines fields present in response.", - "type": "string", - "enum": [ - "view", - "embed", - "edit" - ], - "required": false }, - "wp_id": { - "description": "Limit to the specified post id.", - "type": "integer", + "password": { + "description": "The password for the post if it is password protected.", + "type": "string", "required": false } } }, { "methods": [ - "POST" + "POST", + "PUT", + "PATCH" ], + "allow_batch": { + "v1": true + }, "args": { - "slug": { - "description": "Unique slug identifying the template.", - "type": "string", - "minLength": 1, - "pattern": "[a-zA-Z_\\-]+", - "required": true - }, - "theme": { - "description": "Theme identifier for the template.", - "type": "string", + "id": { + "description": "Unique identifier for the post.", + "type": "integer", "required": false }, - "content": { - "default": "", - "description": "Content of template.", + "date": { + "description": "The date the post was published, in the site's timezone.", "type": [ - "object", - "string" + "string", + "null" ], + "format": "date-time", "required": false }, - "title": { - "default": "", - "description": "Title of template.", + "date_gmt": { + "description": "The date the post was published, as GMT.", "type": [ - "object", - "string" + "string", + "null" ], + "format": "date-time", "required": false }, - "description": { - "default": "", - "description": "Description of template.", + "slug": { + "description": "An alphanumeric identifier for the post unique to its type.", "type": "string", "required": false }, "status": { - "default": "publish", - "description": "Status of template.", + "description": "A named status for the post.", "type": "string", - "required": false - } - } - } - ], - "_links": { - "self": [ - { - "href": "http://example.org/index.php?rest_route=/wp/v2/templates" - } - ] - } - }, - "/wp/v2/templates/(?P[\\/\\w-]+)": { - "namespace": "wp/v2", - "methods": [ - "GET", - "POST", - "PUT", - "PATCH", - "DELETE" - ], - "endpoints": [ - { - "methods": [ - "GET" - ], - "args": { - "id": { - "description": "The id of a template", - "type": "string", - "required": false - } - } - }, - { - "methods": [ - "POST", - "PUT", - "PATCH" - ], - "args": { - "slug": { - "description": "Unique slug identifying the template.", - "type": "string", - "minLength": 1, - "pattern": "[a-zA-Z_\\-]+", + "enum": [ + "publish", + "future", + "draft", + "pending", + "private" + ], "required": false }, - "theme": { - "description": "Theme identifier for the template.", + "password": { + "description": "A password to protect access to the content and excerpt.", "type": "string", "required": false }, - "content": { - "description": "Content of template.", - "type": [ - "object", - "string" - ], - "required": false - }, "title": { - "description": "Title of template.", - "type": [ - "object", - "string" - ], + "description": "The title for the post.", + "type": "object", + "properties": { + "raw": { + "description": "Title for the post, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit" + ] + } + }, "required": false }, - "description": { - "description": "Description of template.", - "type": "string", + "content": { + "description": "The content for the post.", + "type": "object", + "properties": { + "raw": { + "description": "Content for the post, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit" + ] + }, + "block_version": { + "description": "Version of the content block format used by the post.", + "type": "integer", + "context": [ + "edit" + ], + "readonly": true + }, + "protected": { + "description": "Whether the content is protected with a password.", + "type": "boolean", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, "required": false }, - "status": { - "description": "Status of template.", + "template": { + "description": "The theme file to use to display the post.", "type": "string", "required": false } @@ -4298,7 +4636,15 @@ mockedApiResponse.Schema = { "methods": [ "DELETE" ], + "allow_batch": { + "v1": true + }, "args": { + "id": { + "description": "Unique identifier for the post.", + "type": "integer", + "required": false + }, "force": { "type": "boolean", "default": false, @@ -4309,7 +4655,7 @@ mockedApiResponse.Schema = { } ] }, - "/wp/v2/templates/(?P[\\d]+)/revisions": { + "/wp/v2/blocks/(?P[\\d]+)/revisions": { "namespace": "wp/v2", "methods": [ "GET" @@ -4407,11 +4753,2375 @@ mockedApiResponse.Schema = { } ] }, - "/wp/v2/templates/(?P[\\d]+)/revisions/(?P[\\d]+)": { + "/wp/v2/blocks/(?P[\\d]+)/revisions/(?P[\\d]+)": { + "namespace": "wp/v2", + "methods": [ + "GET", + "DELETE" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "parent": { + "description": "The ID for the parent of the revision.", + "type": "integer", + "required": false + }, + "id": { + "description": "Unique identifier for the revision.", + "type": "integer", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + }, + { + "methods": [ + "DELETE" + ], + "args": { + "parent": { + "description": "The ID for the parent of the revision.", + "type": "integer", + "required": false + }, + "id": { + "description": "Unique identifier for the revision.", + "type": "integer", + "required": false + }, + "force": { + "type": "boolean", + "default": false, + "description": "Required to be true, as revisions do not support trashing.", + "required": false + } + } + } + ] + }, + "/wp/v2/blocks/(?P[\\d]+)/autosaves": { + "namespace": "wp/v2", + "methods": [ + "GET", + "POST" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "parent": { + "description": "The ID for the parent of the autosave.", + "type": "integer", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + }, + { + "methods": [ + "POST" + ], + "args": { + "parent": { + "description": "The ID for the parent of the autosave.", + "type": "integer", + "required": false + }, + "date": { + "description": "The date the post was published, in the site's timezone.", + "type": [ + "string", + "null" + ], + "format": "date-time", + "required": false + }, + "date_gmt": { + "description": "The date the post was published, as GMT.", + "type": [ + "string", + "null" + ], + "format": "date-time", + "required": false + }, + "slug": { + "description": "An alphanumeric identifier for the post unique to its type.", + "type": "string", + "required": false + }, + "status": { + "description": "A named status for the post.", + "type": "string", + "enum": [ + "publish", + "future", + "draft", + "pending", + "private" + ], + "required": false + }, + "password": { + "description": "A password to protect access to the content and excerpt.", + "type": "string", + "required": false + }, + "title": { + "description": "The title for the post.", + "type": "object", + "properties": { + "raw": { + "description": "Title for the post, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit" + ] + } + }, + "required": false + }, + "content": { + "description": "The content for the post.", + "type": "object", + "properties": { + "raw": { + "description": "Content for the post, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit" + ] + }, + "block_version": { + "description": "Version of the content block format used by the post.", + "type": "integer", + "context": [ + "edit" + ], + "readonly": true + }, + "protected": { + "description": "Whether the content is protected with a password.", + "type": "boolean", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, + "required": false + }, + "template": { + "description": "The theme file to use to display the post.", + "type": "string", + "required": false + } + } + } + ] + }, + "/wp/v2/blocks/(?P[\\d]+)/autosaves/(?P[\\d]+)": { + "namespace": "wp/v2", + "methods": [ + "GET" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "parent": { + "description": "The ID for the parent of the autosave.", + "type": "integer", + "required": false + }, + "id": { + "description": "The ID for the autosave.", + "type": "integer", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + } + ] + }, + "/wp/v2/templates": { + "namespace": "wp/v2", + "methods": [ + "GET", + "POST" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + }, + "wp_id": { + "description": "Limit to the specified post id.", + "type": "integer", + "required": false + }, + "area": { + "description": "Limit to the specified template part area.", + "type": "string", + "required": false + }, + "post_type": { + "description": "Post type to get the templates for.", + "type": "string", + "required": false + } + } + }, + { + "methods": [ + "POST" + ], + "args": { + "slug": { + "description": "Unique slug identifying the template.", + "type": "string", + "minLength": 1, + "pattern": "[a-zA-Z0-9_\\-]+", + "required": true + }, + "theme": { + "description": "Theme identifier for the template.", + "type": "string", + "required": false + }, + "type": { + "description": "Type of template.", + "type": "string", + "required": false + }, + "content": { + "default": "", + "description": "Content of template.", + "type": [ + "object", + "string" + ], + "properties": { + "raw": { + "description": "Content for the template, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit" + ] + }, + "block_version": { + "description": "Version of the content block format used by the template.", + "type": "integer", + "context": [ + "edit" + ], + "readonly": true + } + }, + "required": false + }, + "title": { + "default": "", + "description": "Title of template.", + "type": [ + "object", + "string" + ], + "properties": { + "raw": { + "description": "Title for the template, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ] + }, + "rendered": { + "description": "HTML title for the template, transformed for display.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, + "required": false + }, + "description": { + "default": "", + "description": "Description of template.", + "type": "string", + "required": false + }, + "status": { + "default": "publish", + "description": "Status of template.", + "type": "string", + "enum": [ + "publish", + "future", + "draft", + "pending", + "private" + ], + "required": false + }, + "author": { + "description": "The ID for the author of the template.", + "type": "integer", + "required": false + } + } + } + ], + "_links": { + "self": [ + { + "href": "http://example.org/index.php?rest_route=/wp/v2/templates" + } + ] + } + }, + "/wp/v2/templates/(?P([^\\/:<>\\*\\?\"\\|]+(?:\\/[^\\/:<>\\*\\?\"\\|]+)?)[\\/\\w-]+)": { + "namespace": "wp/v2", + "methods": [ + "GET", + "POST", + "PUT", + "PATCH", + "DELETE" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "id": { + "description": "The id of a template", + "type": "string", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + }, + { + "methods": [ + "POST", + "PUT", + "PATCH" + ], + "args": { + "id": { + "description": "The id of a template", + "type": "string", + "required": false + }, + "slug": { + "description": "Unique slug identifying the template.", + "type": "string", + "minLength": 1, + "pattern": "[a-zA-Z0-9_\\-]+", + "required": false + }, + "theme": { + "description": "Theme identifier for the template.", + "type": "string", + "required": false + }, + "type": { + "description": "Type of template.", + "type": "string", + "required": false + }, + "content": { + "description": "Content of template.", + "type": [ + "object", + "string" + ], + "properties": { + "raw": { + "description": "Content for the template, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit" + ] + }, + "block_version": { + "description": "Version of the content block format used by the template.", + "type": "integer", + "context": [ + "edit" + ], + "readonly": true + } + }, + "required": false + }, + "title": { + "description": "Title of template.", + "type": [ + "object", + "string" + ], + "properties": { + "raw": { + "description": "Title for the template, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ] + }, + "rendered": { + "description": "HTML title for the template, transformed for display.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, + "required": false + }, + "description": { + "description": "Description of template.", + "type": "string", + "required": false + }, + "status": { + "description": "Status of template.", + "type": "string", + "enum": [ + "publish", + "future", + "draft", + "pending", + "private" + ], + "required": false + }, + "author": { + "description": "The ID for the author of the template.", + "type": "integer", + "required": false + } + } + }, + { + "methods": [ + "DELETE" + ], + "args": { + "id": { + "description": "The id of a template", + "type": "string", + "required": false + }, + "force": { + "type": "boolean", + "default": false, + "description": "Whether to bypass Trash and force deletion.", + "required": false + } + } + } + ] + }, + "/wp/v2/templates/(?P[\\d]+)/revisions": { + "namespace": "wp/v2", + "methods": [ + "GET" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "parent": { + "description": "The ID for the parent of the revision.", + "type": "integer", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + }, + "page": { + "description": "Current page of the collection.", + "type": "integer", + "default": 1, + "minimum": 1, + "required": false + }, + "per_page": { + "description": "Maximum number of items to be returned in result set.", + "type": "integer", + "minimum": 1, + "maximum": 100, + "required": false + }, + "search": { + "description": "Limit results to those matching a string.", + "type": "string", + "required": false + }, + "exclude": { + "description": "Ensure result set excludes specific IDs.", + "type": "array", + "items": { + "type": "integer" + }, + "default": [], + "required": false + }, + "include": { + "description": "Limit result set to specific IDs.", + "type": "array", + "items": { + "type": "integer" + }, + "default": [], + "required": false + }, + "offset": { + "description": "Offset the result set by a specific number of items.", + "type": "integer", + "required": false + }, + "order": { + "description": "Order sort attribute ascending or descending.", + "type": "string", + "default": "desc", + "enum": [ + "asc", + "desc" + ], + "required": false + }, + "orderby": { + "description": "Sort collection by object attribute.", + "type": "string", + "default": "date", + "enum": [ + "date", + "id", + "include", + "relevance", + "slug", + "include_slugs", + "title" + ], + "required": false + } + } + } + ] + }, + "/wp/v2/templates/(?P[\\d]+)/revisions/(?P[\\d]+)": { + "namespace": "wp/v2", + "methods": [ + "GET", + "DELETE" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "parent": { + "description": "The ID for the parent of the revision.", + "type": "integer", + "required": false + }, + "id": { + "description": "Unique identifier for the revision.", + "type": "integer", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + }, + { + "methods": [ + "DELETE" + ], + "args": { + "parent": { + "description": "The ID for the parent of the revision.", + "type": "integer", + "required": false + }, + "id": { + "description": "Unique identifier for the revision.", + "type": "integer", + "required": false + }, + "force": { + "type": "boolean", + "default": false, + "description": "Required to be true, as revisions do not support trashing.", + "required": false + } + } + } + ] + }, + "/wp/v2/templates/(?P[\\d]+)/autosaves": { + "namespace": "wp/v2", + "methods": [ + "GET", + "POST" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "parent": { + "description": "The ID for the parent of the autosave.", + "type": "integer", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + }, + { + "methods": [ + "POST" + ], + "args": { + "parent": { + "description": "The ID for the parent of the autosave.", + "type": "integer", + "required": false + }, + "slug": { + "description": "Unique slug identifying the template.", + "type": "string", + "minLength": 1, + "pattern": "[a-zA-Z0-9_\\-]+", + "required": false + }, + "theme": { + "description": "Theme identifier for the template.", + "type": "string", + "required": false + }, + "type": { + "description": "Type of template.", + "type": "string", + "required": false + }, + "content": { + "description": "Content of template.", + "type": [ + "object", + "string" + ], + "properties": { + "raw": { + "description": "Content for the template, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit" + ] + }, + "block_version": { + "description": "Version of the content block format used by the template.", + "type": "integer", + "context": [ + "edit" + ], + "readonly": true + } + }, + "required": false + }, + "title": { + "description": "Title of template.", + "type": [ + "object", + "string" + ], + "properties": { + "raw": { + "description": "Title for the template, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ] + }, + "rendered": { + "description": "HTML title for the template, transformed for display.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, + "required": false + }, + "description": { + "description": "Description of template.", + "type": "string", + "required": false + }, + "status": { + "description": "Status of template.", + "type": "string", + "enum": [ + "publish", + "future", + "draft", + "pending", + "private" + ], + "required": false + }, + "author": { + "description": "The ID for the author of the template.", + "type": "integer", + "required": false + } + } + } + ] + }, + "/wp/v2/templates/(?P[\\d]+)/autosaves/(?P[\\d]+)": { + "namespace": "wp/v2", + "methods": [ + "GET" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "parent": { + "description": "The ID for the parent of the autosave.", + "type": "integer", + "required": false + }, + "id": { + "description": "The ID for the autosave.", + "type": "integer", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + } + ] + }, + "/wp/v2/template-parts": { + "namespace": "wp/v2", + "methods": [ + "GET", + "POST" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + }, + "wp_id": { + "description": "Limit to the specified post id.", + "type": "integer", + "required": false + }, + "area": { + "description": "Limit to the specified template part area.", + "type": "string", + "required": false + }, + "post_type": { + "description": "Post type to get the templates for.", + "type": "string", + "required": false + } + } + }, + { + "methods": [ + "POST" + ], + "args": { + "slug": { + "description": "Unique slug identifying the template.", + "type": "string", + "minLength": 1, + "pattern": "[a-zA-Z0-9_\\-]+", + "required": true + }, + "theme": { + "description": "Theme identifier for the template.", + "type": "string", + "required": false + }, + "type": { + "description": "Type of template.", + "type": "string", + "required": false + }, + "content": { + "default": "", + "description": "Content of template.", + "type": [ + "object", + "string" + ], + "properties": { + "raw": { + "description": "Content for the template, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit" + ] + }, + "block_version": { + "description": "Version of the content block format used by the template.", + "type": "integer", + "context": [ + "edit" + ], + "readonly": true + } + }, + "required": false + }, + "title": { + "default": "", + "description": "Title of template.", + "type": [ + "object", + "string" + ], + "properties": { + "raw": { + "description": "Title for the template, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ] + }, + "rendered": { + "description": "HTML title for the template, transformed for display.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, + "required": false + }, + "description": { + "default": "", + "description": "Description of template.", + "type": "string", + "required": false + }, + "status": { + "default": "publish", + "description": "Status of template.", + "type": "string", + "enum": [ + "publish", + "future", + "draft", + "pending", + "private" + ], + "required": false + }, + "author": { + "description": "The ID for the author of the template.", + "type": "integer", + "required": false + }, + "area": { + "description": "Where the template part is intended for use (header, footer, etc.)", + "type": "string", + "required": false + } + } + } + ], + "_links": { + "self": [ + { + "href": "http://example.org/index.php?rest_route=/wp/v2/template-parts" + } + ] + } + }, + "/wp/v2/template-parts/(?P([^\\/:<>\\*\\?\"\\|]+(?:\\/[^\\/:<>\\*\\?\"\\|]+)?)[\\/\\w-]+)": { + "namespace": "wp/v2", + "methods": [ + "GET", + "POST", + "PUT", + "PATCH", + "DELETE" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "id": { + "description": "The id of a template", + "type": "string", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + }, + { + "methods": [ + "POST", + "PUT", + "PATCH" + ], + "args": { + "id": { + "description": "The id of a template", + "type": "string", + "required": false + }, + "slug": { + "description": "Unique slug identifying the template.", + "type": "string", + "minLength": 1, + "pattern": "[a-zA-Z0-9_\\-]+", + "required": false + }, + "theme": { + "description": "Theme identifier for the template.", + "type": "string", + "required": false + }, + "type": { + "description": "Type of template.", + "type": "string", + "required": false + }, + "content": { + "description": "Content of template.", + "type": [ + "object", + "string" + ], + "properties": { + "raw": { + "description": "Content for the template, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit" + ] + }, + "block_version": { + "description": "Version of the content block format used by the template.", + "type": "integer", + "context": [ + "edit" + ], + "readonly": true + } + }, + "required": false + }, + "title": { + "description": "Title of template.", + "type": [ + "object", + "string" + ], + "properties": { + "raw": { + "description": "Title for the template, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ] + }, + "rendered": { + "description": "HTML title for the template, transformed for display.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, + "required": false + }, + "description": { + "description": "Description of template.", + "type": "string", + "required": false + }, + "status": { + "description": "Status of template.", + "type": "string", + "enum": [ + "publish", + "future", + "draft", + "pending", + "private" + ], + "required": false + }, + "author": { + "description": "The ID for the author of the template.", + "type": "integer", + "required": false + }, + "area": { + "description": "Where the template part is intended for use (header, footer, etc.)", + "type": "string", + "required": false + } + } + }, + { + "methods": [ + "DELETE" + ], + "args": { + "id": { + "description": "The id of a template", + "type": "string", + "required": false + }, + "force": { + "type": "boolean", + "default": false, + "description": "Whether to bypass Trash and force deletion.", + "required": false + } + } + } + ] + }, + "/wp/v2/template-parts/(?P[\\d]+)/revisions": { + "namespace": "wp/v2", + "methods": [ + "GET" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "parent": { + "description": "The ID for the parent of the revision.", + "type": "integer", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + }, + "page": { + "description": "Current page of the collection.", + "type": "integer", + "default": 1, + "minimum": 1, + "required": false + }, + "per_page": { + "description": "Maximum number of items to be returned in result set.", + "type": "integer", + "minimum": 1, + "maximum": 100, + "required": false + }, + "search": { + "description": "Limit results to those matching a string.", + "type": "string", + "required": false + }, + "exclude": { + "description": "Ensure result set excludes specific IDs.", + "type": "array", + "items": { + "type": "integer" + }, + "default": [], + "required": false + }, + "include": { + "description": "Limit result set to specific IDs.", + "type": "array", + "items": { + "type": "integer" + }, + "default": [], + "required": false + }, + "offset": { + "description": "Offset the result set by a specific number of items.", + "type": "integer", + "required": false + }, + "order": { + "description": "Order sort attribute ascending or descending.", + "type": "string", + "default": "desc", + "enum": [ + "asc", + "desc" + ], + "required": false + }, + "orderby": { + "description": "Sort collection by object attribute.", + "type": "string", + "default": "date", + "enum": [ + "date", + "id", + "include", + "relevance", + "slug", + "include_slugs", + "title" + ], + "required": false + } + } + } + ] + }, + "/wp/v2/template-parts/(?P[\\d]+)/revisions/(?P[\\d]+)": { + "namespace": "wp/v2", + "methods": [ + "GET", + "DELETE" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "parent": { + "description": "The ID for the parent of the revision.", + "type": "integer", + "required": false + }, + "id": { + "description": "Unique identifier for the revision.", + "type": "integer", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + }, + { + "methods": [ + "DELETE" + ], + "args": { + "parent": { + "description": "The ID for the parent of the revision.", + "type": "integer", + "required": false + }, + "id": { + "description": "Unique identifier for the revision.", + "type": "integer", + "required": false + }, + "force": { + "type": "boolean", + "default": false, + "description": "Required to be true, as revisions do not support trashing.", + "required": false + } + } + } + ] + }, + "/wp/v2/template-parts/(?P[\\d]+)/autosaves": { + "namespace": "wp/v2", + "methods": [ + "GET", + "POST" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "parent": { + "description": "The ID for the parent of the autosave.", + "type": "integer", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + }, + { + "methods": [ + "POST" + ], + "args": { + "parent": { + "description": "The ID for the parent of the autosave.", + "type": "integer", + "required": false + }, + "slug": { + "description": "Unique slug identifying the template.", + "type": "string", + "minLength": 1, + "pattern": "[a-zA-Z0-9_\\-]+", + "required": false + }, + "theme": { + "description": "Theme identifier for the template.", + "type": "string", + "required": false + }, + "type": { + "description": "Type of template.", + "type": "string", + "required": false + }, + "content": { + "description": "Content of template.", + "type": [ + "object", + "string" + ], + "properties": { + "raw": { + "description": "Content for the template, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit" + ] + }, + "block_version": { + "description": "Version of the content block format used by the template.", + "type": "integer", + "context": [ + "edit" + ], + "readonly": true + } + }, + "required": false + }, + "title": { + "description": "Title of template.", + "type": [ + "object", + "string" + ], + "properties": { + "raw": { + "description": "Title for the template, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ] + }, + "rendered": { + "description": "HTML title for the template, transformed for display.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, + "required": false + }, + "description": { + "description": "Description of template.", + "type": "string", + "required": false + }, + "status": { + "description": "Status of template.", + "type": "string", + "enum": [ + "publish", + "future", + "draft", + "pending", + "private" + ], + "required": false + }, + "author": { + "description": "The ID for the author of the template.", + "type": "integer", + "required": false + }, + "area": { + "description": "Where the template part is intended for use (header, footer, etc.)", + "type": "string", + "required": false + } + } + } + ] + }, + "/wp/v2/template-parts/(?P[\\d]+)/autosaves/(?P[\\d]+)": { + "namespace": "wp/v2", + "methods": [ + "GET" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "parent": { + "description": "The ID for the parent of the autosave.", + "type": "integer", + "required": false + }, + "id": { + "description": "The ID for the autosave.", + "type": "integer", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + } + ] + }, + "/wp/v2/navigation": { + "namespace": "wp/v2", + "methods": [ + "GET", + "POST" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "allow_batch": { + "v1": true + }, + "args": { + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + }, + "page": { + "description": "Current page of the collection.", + "type": "integer", + "default": 1, + "minimum": 1, + "required": false + }, + "per_page": { + "description": "Maximum number of items to be returned in result set.", + "type": "integer", + "default": 10, + "minimum": 1, + "maximum": 100, + "required": false + }, + "search": { + "description": "Limit results to those matching a string.", + "type": "string", + "required": false + }, + "after": { + "description": "Limit response to posts published after a given ISO8601 compliant date.", + "type": "string", + "format": "date-time", + "required": false + }, + "modified_after": { + "description": "Limit response to posts modified after a given ISO8601 compliant date.", + "type": "string", + "format": "date-time", + "required": false + }, + "before": { + "description": "Limit response to posts published before a given ISO8601 compliant date.", + "type": "string", + "format": "date-time", + "required": false + }, + "modified_before": { + "description": "Limit response to posts modified before a given ISO8601 compliant date.", + "type": "string", + "format": "date-time", + "required": false + }, + "exclude": { + "description": "Ensure result set excludes specific IDs.", + "type": "array", + "items": { + "type": "integer" + }, + "default": [], + "required": false + }, + "include": { + "description": "Limit result set to specific IDs.", + "type": "array", + "items": { + "type": "integer" + }, + "default": [], + "required": false + }, + "offset": { + "description": "Offset the result set by a specific number of items.", + "type": "integer", + "required": false + }, + "order": { + "description": "Order sort attribute ascending or descending.", + "type": "string", + "default": "desc", + "enum": [ + "asc", + "desc" + ], + "required": false + }, + "orderby": { + "description": "Sort collection by post attribute.", + "type": "string", + "default": "date", + "enum": [ + "author", + "date", + "id", + "include", + "modified", + "parent", + "relevance", + "slug", + "include_slugs", + "title" + ], + "required": false + }, + "slug": { + "description": "Limit result set to posts with one or more specific slugs.", + "type": "array", + "items": { + "type": "string" + }, + "required": false + }, + "status": { + "default": "publish", + "description": "Limit result set to posts assigned one or more statuses.", + "type": "array", + "items": { + "enum": [ + "publish", + "future", + "draft", + "pending", + "private", + "trash", + "auto-draft", + "inherit", + "request-pending", + "request-confirmed", + "request-failed", + "request-completed", + "any" + ], + "type": "string" + }, + "required": false + } + } + }, + { + "methods": [ + "POST" + ], + "allow_batch": { + "v1": true + }, + "args": { + "date": { + "description": "The date the post was published, in the site's timezone.", + "type": [ + "string", + "null" + ], + "format": "date-time", + "required": false + }, + "date_gmt": { + "description": "The date the post was published, as GMT.", + "type": [ + "string", + "null" + ], + "format": "date-time", + "required": false + }, + "slug": { + "description": "An alphanumeric identifier for the post unique to its type.", + "type": "string", + "required": false + }, + "status": { + "description": "A named status for the post.", + "type": "string", + "enum": [ + "publish", + "future", + "draft", + "pending", + "private" + ], + "required": false + }, + "password": { + "description": "A password to protect access to the content and excerpt.", + "type": "string", + "required": false + }, + "title": { + "description": "The title for the post.", + "type": "object", + "properties": { + "raw": { + "description": "Title for the post, as it exists in the database.", + "type": "string", + "context": [ + "edit" + ] + }, + "rendered": { + "description": "HTML title for the post, transformed for display.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, + "required": false + }, + "content": { + "description": "The content for the post.", + "type": "object", + "properties": { + "raw": { + "description": "Content for the post, as it exists in the database.", + "type": "string", + "context": [ + "edit" + ] + }, + "rendered": { + "description": "HTML content for the post, transformed for display.", + "type": "string", + "context": [ + "view", + "edit" + ], + "readonly": true + }, + "block_version": { + "description": "Version of the content block format used by the post.", + "type": "integer", + "context": [ + "edit" + ], + "readonly": true + }, + "protected": { + "description": "Whether the content is protected with a password.", + "type": "boolean", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, + "required": false + }, + "template": { + "description": "The theme file to use to display the post.", + "type": "string", + "required": false + } + } + } + ], + "_links": { + "self": [ + { + "href": "http://example.org/index.php?rest_route=/wp/v2/navigation" + } + ] + } + }, + "/wp/v2/navigation/(?P[\\d]+)": { + "namespace": "wp/v2", + "methods": [ + "GET", + "POST", + "PUT", + "PATCH", + "DELETE" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "allow_batch": { + "v1": true + }, + "args": { + "id": { + "description": "Unique identifier for the post.", + "type": "integer", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + }, + "password": { + "description": "The password for the post if it is password protected.", + "type": "string", + "required": false + } + } + }, + { + "methods": [ + "POST", + "PUT", + "PATCH" + ], + "allow_batch": { + "v1": true + }, + "args": { + "id": { + "description": "Unique identifier for the post.", + "type": "integer", + "required": false + }, + "date": { + "description": "The date the post was published, in the site's timezone.", + "type": [ + "string", + "null" + ], + "format": "date-time", + "required": false + }, + "date_gmt": { + "description": "The date the post was published, as GMT.", + "type": [ + "string", + "null" + ], + "format": "date-time", + "required": false + }, + "slug": { + "description": "An alphanumeric identifier for the post unique to its type.", + "type": "string", + "required": false + }, + "status": { + "description": "A named status for the post.", + "type": "string", + "enum": [ + "publish", + "future", + "draft", + "pending", + "private" + ], + "required": false + }, + "password": { + "description": "A password to protect access to the content and excerpt.", + "type": "string", + "required": false + }, + "title": { + "description": "The title for the post.", + "type": "object", + "properties": { + "raw": { + "description": "Title for the post, as it exists in the database.", + "type": "string", + "context": [ + "edit" + ] + }, + "rendered": { + "description": "HTML title for the post, transformed for display.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, + "required": false + }, + "content": { + "description": "The content for the post.", + "type": "object", + "properties": { + "raw": { + "description": "Content for the post, as it exists in the database.", + "type": "string", + "context": [ + "edit" + ] + }, + "rendered": { + "description": "HTML content for the post, transformed for display.", + "type": "string", + "context": [ + "view", + "edit" + ], + "readonly": true + }, + "block_version": { + "description": "Version of the content block format used by the post.", + "type": "integer", + "context": [ + "edit" + ], + "readonly": true + }, + "protected": { + "description": "Whether the content is protected with a password.", + "type": "boolean", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, + "required": false + }, + "template": { + "description": "The theme file to use to display the post.", + "type": "string", + "required": false + } + } + }, + { + "methods": [ + "DELETE" + ], + "allow_batch": { + "v1": true + }, + "args": { + "id": { + "description": "Unique identifier for the post.", + "type": "integer", + "required": false + }, + "force": { + "type": "boolean", + "default": false, + "description": "Whether to bypass Trash and force deletion.", + "required": false + } + } + } + ] + }, + "/wp/v2/navigation/(?P[\\d]+)/revisions": { + "namespace": "wp/v2", + "methods": [ + "GET" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "parent": { + "description": "The ID for the parent of the revision.", + "type": "integer", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + }, + "page": { + "description": "Current page of the collection.", + "type": "integer", + "default": 1, + "minimum": 1, + "required": false + }, + "per_page": { + "description": "Maximum number of items to be returned in result set.", + "type": "integer", + "minimum": 1, + "maximum": 100, + "required": false + }, + "search": { + "description": "Limit results to those matching a string.", + "type": "string", + "required": false + }, + "exclude": { + "description": "Ensure result set excludes specific IDs.", + "type": "array", + "items": { + "type": "integer" + }, + "default": [], + "required": false + }, + "include": { + "description": "Limit result set to specific IDs.", + "type": "array", + "items": { + "type": "integer" + }, + "default": [], + "required": false + }, + "offset": { + "description": "Offset the result set by a specific number of items.", + "type": "integer", + "required": false + }, + "order": { + "description": "Order sort attribute ascending or descending.", + "type": "string", + "default": "desc", + "enum": [ + "asc", + "desc" + ], + "required": false + }, + "orderby": { + "description": "Sort collection by object attribute.", + "type": "string", + "default": "date", + "enum": [ + "date", + "id", + "include", + "relevance", + "slug", + "include_slugs", + "title" + ], + "required": false + } + } + } + ] + }, + "/wp/v2/navigation/(?P[\\d]+)/revisions/(?P[\\d]+)": { + "namespace": "wp/v2", + "methods": [ + "GET", + "DELETE" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "parent": { + "description": "The ID for the parent of the revision.", + "type": "integer", + "required": false + }, + "id": { + "description": "Unique identifier for the revision.", + "type": "integer", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + }, + { + "methods": [ + "DELETE" + ], + "args": { + "parent": { + "description": "The ID for the parent of the revision.", + "type": "integer", + "required": false + }, + "id": { + "description": "Unique identifier for the revision.", + "type": "integer", + "required": false + }, + "force": { + "type": "boolean", + "default": false, + "description": "Required to be true, as revisions do not support trashing.", + "required": false + } + } + } + ] + }, + "/wp/v2/navigation/(?P[\\d]+)/autosaves": { + "namespace": "wp/v2", + "methods": [ + "GET", + "POST" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "parent": { + "description": "The ID for the parent of the autosave.", + "type": "integer", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + }, + { + "methods": [ + "POST" + ], + "args": { + "parent": { + "description": "The ID for the parent of the autosave.", + "type": "integer", + "required": false + }, + "date": { + "description": "The date the post was published, in the site's timezone.", + "type": [ + "string", + "null" + ], + "format": "date-time", + "required": false + }, + "date_gmt": { + "description": "The date the post was published, as GMT.", + "type": [ + "string", + "null" + ], + "format": "date-time", + "required": false + }, + "slug": { + "description": "An alphanumeric identifier for the post unique to its type.", + "type": "string", + "required": false + }, + "status": { + "description": "A named status for the post.", + "type": "string", + "enum": [ + "publish", + "future", + "draft", + "pending", + "private" + ], + "required": false + }, + "password": { + "description": "A password to protect access to the content and excerpt.", + "type": "string", + "required": false + }, + "title": { + "description": "The title for the post.", + "type": "object", + "properties": { + "raw": { + "description": "Title for the post, as it exists in the database.", + "type": "string", + "context": [ + "edit" + ] + }, + "rendered": { + "description": "HTML title for the post, transformed for display.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, + "required": false + }, + "content": { + "description": "The content for the post.", + "type": "object", + "properties": { + "raw": { + "description": "Content for the post, as it exists in the database.", + "type": "string", + "context": [ + "edit" + ] + }, + "rendered": { + "description": "HTML content for the post, transformed for display.", + "type": "string", + "context": [ + "view", + "edit" + ], + "readonly": true + }, + "block_version": { + "description": "Version of the content block format used by the post.", + "type": "integer", + "context": [ + "edit" + ], + "readonly": true + }, + "protected": { + "description": "Whether the content is protected with a password.", + "type": "boolean", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, + "required": false + }, + "template": { + "description": "The theme file to use to display the post.", + "type": "string", + "required": false + } + } + } + ] + }, + "/wp/v2/navigation/(?P[\\d]+)/autosaves/(?P[\\d]+)": { + "namespace": "wp/v2", + "methods": [ + "GET" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "parent": { + "description": "The ID for the parent of the autosave.", + "type": "integer", + "required": false + }, + "id": { + "description": "The ID for the autosave.", + "type": "integer", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + } + ] + }, + "/wp/v2/types": { "namespace": "wp/v2", "methods": [ - "GET", - "DELETE" + "GET" ], "endpoints": [ { @@ -4419,16 +7129,6 @@ mockedApiResponse.Schema = { "GET" ], "args": { - "parent": { - "description": "The ID for the parent of the revision.", - "type": "integer", - "required": false - }, - "id": { - "description": "Unique identifier for the revision.", - "type": "integer", - "required": false - }, "context": { "description": "Scope under which the request is made; determines fields present in response.", "type": "string", @@ -4441,37 +7141,47 @@ mockedApiResponse.Schema = { "required": false } } - }, + } + ], + "_links": { + "self": "http://example.org/index.php?rest_route=/wp/v2/types" + } + }, + "/wp/v2/types/(?P[\\w-]+)": { + "namespace": "wp/v2", + "methods": [ + "GET" + ], + "endpoints": [ { "methods": [ - "DELETE" + "GET" ], "args": { - "parent": { - "description": "The ID for the parent of the revision.", - "type": "integer", - "required": false - }, - "id": { - "description": "Unique identifier for the revision.", - "type": "integer", + "type": { + "description": "An alphanumeric identifier for the post type.", + "type": "string", "required": false }, - "force": { - "type": "boolean", - "default": false, - "description": "Required to be true, as revisions do not support trashing.", + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", "required": false } } } ] }, - "/wp/v2/templates/(?P[\\d]+)/autosaves": { + "/wp/v2/statuses": { "namespace": "wp/v2", "methods": [ - "GET", - "POST" + "GET" ], "endpoints": [ { @@ -4479,11 +7189,6 @@ mockedApiResponse.Schema = { "GET" ], "args": { - "parent": { - "description": "The ID for the parent of the autosave.", - "type": "integer", - "required": false - }, "context": { "description": "Scope under which the request is made; determines fields present in response.", "type": "string", @@ -4496,60 +7201,44 @@ mockedApiResponse.Schema = { "required": false } } - }, + } + ], + "_links": { + "self": "http://example.org/index.php?rest_route=/wp/v2/statuses" + } + }, + "/wp/v2/statuses/(?P[\\w-]+)": { + "namespace": "wp/v2", + "methods": [ + "GET" + ], + "endpoints": [ { "methods": [ - "POST" + "GET" ], "args": { - "parent": { - "description": "The ID for the parent of the autosave.", - "type": "integer", - "required": false - }, - "slug": { - "description": "Unique slug identifying the template.", + "status": { + "description": "An alphanumeric identifier for the status.", "type": "string", - "minLength": 1, - "pattern": "[a-zA-Z_\\-]+", "required": false }, - "theme": { - "description": "Theme identifier for the template.", + "context": { + "description": "Scope under which the request is made; determines fields present in response.", "type": "string", - "required": false - }, - "content": { - "description": "Content of template.", - "type": [ - "object", - "string" - ], - "required": false - }, - "title": { - "description": "Title of template.", - "type": [ - "object", - "string" + "enum": [ + "view", + "embed", + "edit" ], - "required": false - }, - "description": { - "description": "Description of template.", - "type": "string", - "required": false - }, - "status": { - "description": "Status of template.", - "type": "string", + "default": "view", "required": false } } } ] }, - "/wp/v2/templates/(?P[\\d]+)/autosaves/(?P[\\d]+)": { + "/wp/v2/taxonomies": { "namespace": "wp/v2", "methods": [ "GET" @@ -4560,16 +7249,6 @@ mockedApiResponse.Schema = { "GET" ], "args": { - "parent": { - "description": "The ID for the parent of the autosave.", - "type": "integer", - "required": false - }, - "id": { - "description": "The ID for the autosave.", - "type": "integer", - "required": false - }, "context": { "description": "Scope under which the request is made; determines fields present in response.", "type": "string", @@ -4580,12 +7259,20 @@ mockedApiResponse.Schema = { ], "default": "view", "required": false + }, + "type": { + "description": "Limit results to taxonomies associated with a specific post type.", + "type": "string", + "required": false } } } - ] + ], + "_links": { + "self": "http://example.org/index.php?rest_route=/wp/v2/taxonomies" + } }, - "/wp/v2/types": { + "/wp/v2/taxonomies/(?P[\\w-]+)": { "namespace": "wp/v2", "methods": [ "GET" @@ -4596,6 +7283,11 @@ mockedApiResponse.Schema = { "GET" ], "args": { + "taxonomy": { + "description": "An alphanumeric identifier for the taxonomy.", + "type": "string", + "required": false + }, "context": { "description": "Scope under which the request is made; determines fields present in response.", "type": "string", @@ -4609,27 +7301,23 @@ mockedApiResponse.Schema = { } } } - ], - "_links": { - "self": "http://example.org/index.php?rest_route=/wp/v2/types" - } + ] }, - "/wp/v2/types/(?P[\\w-]+)": { + "/wp/v2/categories": { "namespace": "wp/v2", "methods": [ - "GET" + "GET", + "POST" ], "endpoints": [ { "methods": [ "GET" ], + "allow_batch": { + "v1": true + }, "args": { - "type": { - "description": "An alphanumeric identifier for the post type.", - "type": "string", - "required": false - }, "context": { "description": "Scope under which the request is made; determines fields present in response.", "type": "string", @@ -4640,54 +7328,160 @@ mockedApiResponse.Schema = { ], "default": "view", "required": false + }, + "page": { + "description": "Current page of the collection.", + "type": "integer", + "default": 1, + "minimum": 1, + "required": false + }, + "per_page": { + "description": "Maximum number of items to be returned in result set.", + "type": "integer", + "default": 10, + "minimum": 1, + "maximum": 100, + "required": false + }, + "search": { + "description": "Limit results to those matching a string.", + "type": "string", + "required": false + }, + "exclude": { + "description": "Ensure result set excludes specific IDs.", + "type": "array", + "items": { + "type": "integer" + }, + "default": [], + "required": false + }, + "include": { + "description": "Limit result set to specific IDs.", + "type": "array", + "items": { + "type": "integer" + }, + "default": [], + "required": false + }, + "order": { + "description": "Order sort attribute ascending or descending.", + "type": "string", + "default": "asc", + "enum": [ + "asc", + "desc" + ], + "required": false + }, + "orderby": { + "description": "Sort collection by term attribute.", + "type": "string", + "default": "name", + "enum": [ + "id", + "include", + "name", + "slug", + "include_slugs", + "term_group", + "description", + "count" + ], + "required": false + }, + "hide_empty": { + "description": "Whether to hide terms not assigned to any posts.", + "type": "boolean", + "default": false, + "required": false + }, + "parent": { + "description": "Limit result set to terms assigned to a specific parent.", + "type": "integer", + "required": false + }, + "post": { + "description": "Limit result set to terms assigned to a specific post.", + "type": "integer", + "default": null, + "required": false + }, + "slug": { + "description": "Limit result set to terms with one or more specific slugs.", + "type": "array", + "items": { + "type": "string" + }, + "required": false } } - } - ] - }, - "/wp/v2/statuses": { - "namespace": "wp/v2", - "methods": [ - "GET" - ], - "endpoints": [ + }, { "methods": [ - "GET" + "POST" ], + "allow_batch": { + "v1": true + }, "args": { - "context": { - "description": "Scope under which the request is made; determines fields present in response.", + "description": { + "description": "HTML description of the term.", "type": "string", - "enum": [ - "view", - "embed", - "edit" - ], - "default": "view", + "required": false + }, + "name": { + "description": "HTML title for the term.", + "type": "string", + "required": true + }, + "slug": { + "description": "An alphanumeric identifier for the term unique to its type.", + "type": "string", + "required": false + }, + "parent": { + "description": "The parent term ID.", + "type": "integer", + "required": false + }, + "meta": { + "description": "Meta fields.", + "type": "object", + "properties": [], "required": false } } } ], "_links": { - "self": "http://example.org/index.php?rest_route=/wp/v2/statuses" + "self": "http://example.org/index.php?rest_route=/wp/v2/categories" } }, - "/wp/v2/statuses/(?P[\\w-]+)": { + "/wp/v2/categories/(?P[\\d]+)": { "namespace": "wp/v2", "methods": [ - "GET" + "GET", + "POST", + "PUT", + "PATCH", + "DELETE" ], "endpoints": [ { "methods": [ "GET" ], + "allow_batch": { + "v1": true + }, "args": { - "status": { - "description": "An alphanumeric identifier for the status.", - "type": "string", + "id": { + "description": "Unique identifier for the term.", + "type": "integer", "required": false }, "context": { @@ -4702,75 +7496,74 @@ mockedApiResponse.Schema = { "required": false } } - } - ] - }, - "/wp/v2/taxonomies": { - "namespace": "wp/v2", - "methods": [ - "GET" - ], - "endpoints": [ + }, { "methods": [ - "GET" + "POST", + "PUT", + "PATCH" ], + "allow_batch": { + "v1": true + }, "args": { - "context": { - "description": "Scope under which the request is made; determines fields present in response.", + "id": { + "description": "Unique identifier for the term.", + "type": "integer", + "required": false + }, + "description": { + "description": "HTML description of the term.", "type": "string", - "enum": [ - "view", - "embed", - "edit" - ], - "default": "view", "required": false }, - "type": { - "description": "Limit results to taxonomies associated with a specific post type.", + "name": { + "description": "HTML title for the term.", + "type": "string", + "required": false + }, + "slug": { + "description": "An alphanumeric identifier for the term unique to its type.", "type": "string", "required": false + }, + "parent": { + "description": "The parent term ID.", + "type": "integer", + "required": false + }, + "meta": { + "description": "Meta fields.", + "type": "object", + "properties": [], + "required": false } } - } - ], - "_links": { - "self": "http://example.org/index.php?rest_route=/wp/v2/taxonomies" - } - }, - "/wp/v2/taxonomies/(?P[\\w-]+)": { - "namespace": "wp/v2", - "methods": [ - "GET" - ], - "endpoints": [ + }, { "methods": [ - "GET" + "DELETE" ], + "allow_batch": { + "v1": true + }, "args": { - "taxonomy": { - "description": "An alphanumeric identifier for the taxonomy.", - "type": "string", + "id": { + "description": "Unique identifier for the term.", + "type": "integer", "required": false }, - "context": { - "description": "Scope under which the request is made; determines fields present in response.", - "type": "string", - "enum": [ - "view", - "embed", - "edit" - ], - "default": "view", + "force": { + "type": "boolean", + "default": false, + "description": "Required to be true, as terms do not support trashing.", "required": false } } } ] }, - "/wp/v2/categories": { + "/wp/v2/tags": { "namespace": "wp/v2", "methods": [ "GET", @@ -4781,6 +7574,9 @@ mockedApiResponse.Schema = { "methods": [ "GET" ], + "allow_batch": { + "v1": true + }, "args": { "context": { "description": "Scope under which the request is made; determines fields present in response.", @@ -4831,6 +7627,11 @@ mockedApiResponse.Schema = { "default": [], "required": false }, + "offset": { + "description": "Offset the result set by a specific number of items.", + "type": "integer", + "required": false + }, "order": { "description": "Order sort attribute ascending or descending.", "type": "string", @@ -4863,11 +7664,6 @@ mockedApiResponse.Schema = { "default": false, "required": false }, - "parent": { - "description": "Limit result set to terms assigned to a specific parent.", - "type": "integer", - "required": false - }, "post": { "description": "Limit result set to terms assigned to a specific post.", "type": "integer", @@ -4888,6 +7684,9 @@ mockedApiResponse.Schema = { "methods": [ "POST" ], + "allow_batch": { + "v1": true + }, "args": { "description": { "description": "HTML description of the term.", @@ -4904,11 +7703,6 @@ mockedApiResponse.Schema = { "type": "string", "required": false }, - "parent": { - "description": "The parent term ID.", - "type": "integer", - "required": false - }, "meta": { "description": "Meta fields.", "type": "object", @@ -4919,10 +7713,10 @@ mockedApiResponse.Schema = { } ], "_links": { - "self": "http://example.org/index.php?rest_route=/wp/v2/categories" + "self": "http://example.org/index.php?rest_route=/wp/v2/tags" } }, - "/wp/v2/categories/(?P[\\d]+)": { + "/wp/v2/tags/(?P[\\d]+)": { "namespace": "wp/v2", "methods": [ "GET", @@ -4936,6 +7730,9 @@ mockedApiResponse.Schema = { "methods": [ "GET" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the term.", @@ -4961,6 +7758,9 @@ mockedApiResponse.Schema = { "PUT", "PATCH" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the term.", @@ -4982,11 +7782,6 @@ mockedApiResponse.Schema = { "type": "string", "required": false }, - "parent": { - "description": "The parent term ID.", - "type": "integer", - "required": false - }, "meta": { "description": "Meta fields.", "type": "object", @@ -4999,6 +7794,9 @@ mockedApiResponse.Schema = { "methods": [ "DELETE" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the term.", @@ -5015,7 +7813,7 @@ mockedApiResponse.Schema = { } ] }, - "/wp/v2/tags": { + "/wp/v2/menus": { "namespace": "wp/v2", "methods": [ "GET", @@ -5026,6 +7824,9 @@ mockedApiResponse.Schema = { "methods": [ "GET" ], + "allow_batch": { + "v1": true + }, "args": { "context": { "description": "Scope under which the request is made; determines fields present in response.", @@ -5133,6 +7934,9 @@ mockedApiResponse.Schema = { "methods": [ "POST" ], + "allow_batch": { + "v1": true + }, "args": { "description": { "description": "HTML description of the term.", @@ -5154,15 +7958,32 @@ mockedApiResponse.Schema = { "type": "object", "properties": [], "required": false + }, + "locations": { + "description": "The locations assigned to the menu.", + "type": "array", + "items": { + "type": "string" + }, + "required": false + }, + "auto_add": { + "description": "Whether to automatically add top level pages to this menu.", + "type": "boolean", + "required": false } } } ], "_links": { - "self": "http://example.org/index.php?rest_route=/wp/v2/tags" + "self": [ + { + "href": "http://example.org/index.php?rest_route=/wp/v2/menus" + } + ] } }, - "/wp/v2/tags/(?P[\\d]+)": { + "/wp/v2/menus/(?P[\\d]+)": { "namespace": "wp/v2", "methods": [ "GET", @@ -5176,6 +7997,9 @@ mockedApiResponse.Schema = { "methods": [ "GET" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the term.", @@ -5201,6 +8025,9 @@ mockedApiResponse.Schema = { "PUT", "PATCH" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the term.", @@ -5227,6 +8054,19 @@ mockedApiResponse.Schema = { "type": "object", "properties": [], "required": false + }, + "locations": { + "description": "The locations assigned to the menu.", + "type": "array", + "items": { + "type": "string" + }, + "required": false + }, + "auto_add": { + "description": "Whether to automatically add top level pages to this menu.", + "type": "boolean", + "required": false } } }, @@ -5234,6 +8074,9 @@ mockedApiResponse.Schema = { "methods": [ "DELETE" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the term.", @@ -5373,6 +8216,27 @@ mockedApiResponse.Schema = { "authors" ], "required": false + }, + "has_published_posts": { + "description": "Limit result set to users who have published posts.", + "type": [ + "boolean", + "array" + ], + "items": { + "type": "string", + "enum": { + "post": "post", + "page": "page", + "attachment": "attachment", + "nav_menu_item": "nav_menu_item", + "wp_block": "wp_block", + "wp_template": "wp_template", + "wp_template_part": "wp_template_part", + "wp_navigation": "wp_navigation" + } + }, + "required": false } } }, @@ -6527,7 +9391,66 @@ mockedApiResponse.Schema = { "/wp/v2/block-types/(?P[a-zA-Z0-9_-]+)/(?P[a-zA-Z0-9_-]+)": { "namespace": "wp/v2", "methods": [ - "GET" + "GET" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "name": { + "description": "Block name.", + "type": "string", + "required": false + }, + "namespace": { + "description": "Block namespace.", + "type": "string", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + } + ] + }, + "/wp/v2/global-styles/themes/(?P[^\\/:<>\\*\\?\"\\|]+(?:\\/[^\\/:<>\\*\\?\"\\|]+)?)": { + "namespace": "wp/v2", + "methods": [ + "GET" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "stylesheet": { + "description": "The theme identifier", + "type": "string", + "required": false + } + } + } + ] + }, + "/wp/v2/global-styles/(?P[\\/\\w-]+)": { + "namespace": "wp/v2", + "methods": [ + "GET", + "POST", + "PUT", + "PATCH" ], "endpoints": [ { @@ -6535,25 +9458,61 @@ mockedApiResponse.Schema = { "GET" ], "args": { - "name": { - "description": "Block name.", + "id": { + "description": "The id of a template", "type": "string", "required": false + } + } + }, + { + "methods": [ + "POST", + "PUT", + "PATCH" + ], + "args": { + "styles": { + "description": "Global styles.", + "type": [ + "object" + ], + "required": false }, - "namespace": { - "description": "Block namespace.", - "type": "string", + "settings": { + "description": "Global settings.", + "type": [ + "object" + ], "required": false }, - "context": { - "description": "Scope under which the request is made; determines fields present in response.", - "type": "string", - "enum": [ - "view", - "embed", - "edit" + "title": { + "description": "Title of the global styles variation.", + "type": [ + "object", + "string" ], - "default": "view", + "properties": { + "raw": { + "description": "Title for the global styles variation, as it exists in the database.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ] + }, + "rendered": { + "description": "HTML title for the post, transformed for display.", + "type": "string", + "context": [ + "view", + "edit", + "embed" + ], + "readonly": true + } + }, "required": false } } @@ -6671,6 +9630,11 @@ mockedApiResponse.Schema = { "description": "Site logo.", "type": "integer", "required": false + }, + "site_icon": { + "description": "Site icon.", + "type": "integer", + "required": false } } } @@ -6709,7 +9673,7 @@ mockedApiResponse.Schema = { "self": "http://example.org/index.php?rest_route=/wp/v2/themes" } }, - "/wp/v2/themes/(?P[^.\\/]+(?:\\/[^.\\/]+)?)": { + "/wp/v2/themes/(?P[^\\/:<>\\*\\?\"\\|]+(?:\\/[^\\/:<>\\*\\?\"\\|]+)?)": { "namespace": "wp/v2", "methods": [ "GET" @@ -7076,6 +10040,31 @@ mockedApiResponse.Schema = { } ] }, + "/wp/v2/widget-types/(?P[a-zA-Z0-9_-]+)/render": { + "namespace": "wp/v2", + "methods": [ + "POST" + ], + "endpoints": [ + { + "methods": [ + "POST" + ], + "args": { + "id": { + "description": "The widget type id.", + "type": "string", + "required": true + }, + "instance": { + "description": "Current instance settings of the widget.", + "type": "object", + "required": false + } + } + } + ] + }, "/wp/v2/widgets": { "namespace": "wp/v2", "methods": [ @@ -7087,6 +10076,9 @@ mockedApiResponse.Schema = { "methods": [ "GET" ], + "allow_batch": { + "v1": true + }, "args": { "context": { "description": "Scope under which the request is made; determines fields present in response.", @@ -7110,6 +10102,9 @@ mockedApiResponse.Schema = { "methods": [ "POST" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the widget.", @@ -7185,6 +10180,9 @@ mockedApiResponse.Schema = { "methods": [ "GET" ], + "allow_batch": { + "v1": true + }, "args": { "context": { "description": "Scope under which the request is made; determines fields present in response.", @@ -7205,6 +10203,9 @@ mockedApiResponse.Schema = { "PUT", "PATCH" ], + "allow_batch": { + "v1": true + }, "args": { "id": { "description": "Unique identifier for the widget.", @@ -7260,6 +10261,9 @@ mockedApiResponse.Schema = { "methods": [ "DELETE" ], + "allow_batch": { + "v1": true + }, "args": { "force": { "description": "Whether to force removal of the widget, or move it to the inactive sidebar.", @@ -7585,9 +10589,95 @@ mockedApiResponse.Schema = { } ] } + }, + "/wp/v2/menu-locations": { + "namespace": "wp/v2", + "methods": [ + "GET" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + } + ], + "_links": { + "self": [ + { + "href": "http://example.org/index.php?rest_route=/wp/v2/menu-locations" + } + ] + } + }, + "/wp/v2/menu-locations/(?P[\\w-]+)": { + "namespace": "wp/v2", + "methods": [ + "GET" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "location": { + "description": "An alphanumeric identifier for the menu location.", + "type": "string", + "required": false + }, + "context": { + "description": "Scope under which the request is made; determines fields present in response.", + "type": "string", + "enum": [ + "view", + "embed", + "edit" + ], + "default": "view", + "required": false + } + } + } + ] + }, + "/wp-block-editor/v1/export": { + "namespace": "wp-block-editor/v1", + "methods": [ + "GET" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": [] + } + ], + "_links": { + "self": [ + { + "href": "http://example.org/index.php?rest_route=/wp-block-editor/v1/export" + } + ] + } } }, - "site_logo": false + "site_logo": 0, + "site_icon": 0 }; mockedApiResponse.oembed = { @@ -8460,6 +11550,36 @@ mockedApiResponse.TypesCollection = { ] } }, + "nav_menu_item": { + "description": "", + "hierarchical": false, + "name": "Navigation Menu Items", + "slug": "nav_menu_item", + "taxonomies": [ + "nav_menu" + ], + "rest_base": "menu-items", + "rest_namespace": "wp/v2", + "_links": { + "collection": [ + { + "href": "http://example.org/index.php?rest_route=/wp/v2/types" + } + ], + "wp:items": [ + { + "href": "http://example.org/index.php?rest_route=/wp/v2/menu-items" + } + ], + "curies": [ + { + "name": "wp", + "href": "https://api.w.org/{rel}", + "templated": true + } + ] + } + }, "wp_block": { "description": "", "hierarchical": false, @@ -8515,6 +11635,62 @@ mockedApiResponse.TypesCollection = { } ] } + }, + "wp_template_part": { + "description": "Template parts to include in your templates.", + "hierarchical": false, + "name": "Template Parts", + "slug": "wp_template_part", + "taxonomies": [], + "rest_base": "template-parts", + "rest_namespace": "wp/v2", + "_links": { + "collection": [ + { + "href": "http://example.org/index.php?rest_route=/wp/v2/types" + } + ], + "wp:items": [ + { + "href": "http://example.org/index.php?rest_route=/wp/v2/template-parts" + } + ], + "curies": [ + { + "name": "wp", + "href": "https://api.w.org/{rel}", + "templated": true + } + ] + } + }, + "wp_navigation": { + "description": "Navigation menus that can be inserted into your site.", + "hierarchical": false, + "name": "Navigation Menus", + "slug": "wp_navigation", + "taxonomies": [], + "rest_base": "navigation", + "rest_namespace": "wp/v2", + "_links": { + "collection": [ + { + "href": "http://example.org/index.php?rest_route=/wp/v2/types" + } + ], + "wp:items": [ + { + "href": "http://example.org/index.php?rest_route=/wp/v2/navigation" + } + ], + "curies": [ + { + "name": "wp", + "href": "https://api.w.org/{rel}", + "templated": true + } + ] + } } }; @@ -8686,6 +11862,36 @@ mockedApiResponse.TaxonomiesCollection = { } ] } + }, + "nav_menu": { + "name": "Navigation Menus", + "slug": "nav_menu", + "description": "", + "types": [ + "nav_menu_item" + ], + "hierarchical": false, + "rest_base": "menus", + "rest_namespace": "wp/v2", + "_links": { + "collection": [ + { + "href": "http://example.org/index.php?rest_route=/wp/v2/taxonomies" + } + ], + "wp:items": [ + { + "href": "http://example.org/index.php?rest_route=/wp/v2/menus" + } + ], + "curies": [ + { + "name": "wp", + "href": "https://api.w.org/{rel}", + "templated": true + } + ] + } } }; @@ -9011,5 +12217,6 @@ mockedApiResponse.settings = { "posts_per_page": 10, "default_ping_status": "open", "default_comment_status": "open", - "site_logo": null + "site_logo": null, + "site_icon": 0 }; diff --git a/tests/qunit/wp-admin/js/nav-menu.js b/tests/qunit/wp-admin/js/nav-menu.js index 98a3448a34..c630d07829 100644 --- a/tests/qunit/wp-admin/js/nav-menu.js +++ b/tests/qunit/wp-admin/js/nav-menu.js @@ -23,6 +23,20 @@ var testString = '
    Hello World
    '; + // Mock global menus. + if ( ! window.hasOwnProperty( 'menus' ) ) { + window.menus = { + 'itemAdded': false, + 'itemDeleted': false + }; + } + + // Mock global wp.a11y. + window.wp = window.wp || {}; + window.wp.a11y = { + 'speak': function() {} + }; + // Mock the internal function calls so the don't fail. $.fn.hideAdvancedMenuItemFields = function() { return { diff --git a/tools/webpack/blocks.js b/tools/webpack/blocks.js index 2934732ab3..2579ce11d4 100644 --- a/tools/webpack/blocks.js +++ b/tools/webpack/blocks.js @@ -28,17 +28,26 @@ module.exports = function( env = { environment: 'production', watch: false, buil 'calendar', 'categories', 'file', + 'gallery', + 'image', 'latest-comments', 'latest-posts', 'loginout', + 'navigation', + 'navigation-link', + 'navigation-submenu', 'page-list', + 'pattern', + 'post-author', + 'post-comments', 'post-content', 'post-date', 'post-excerpt', 'post-featured-image', + 'post-navigation-link', + 'post-template', 'post-terms', 'post-title', - 'post-template', 'query', 'query-pagination', 'query-pagination-next', @@ -53,6 +62,8 @@ module.exports = function( env = { environment: 'production', watch: false, buil 'site-title', 'social-link', 'tag-cloud', + 'template-part', + 'term-description', ]; const blockFolders = [ 'audio', @@ -64,11 +75,9 @@ module.exports = function( env = { environment: 'production', watch: false, buil 'cover', 'embed', 'freeform', - 'gallery', 'group', 'heading', 'html', - 'image', 'list', 'media-text', 'missing', @@ -89,6 +98,7 @@ module.exports = function( env = { environment: 'production', watch: false, buil ]; const blockPHPFiles = { 'widgets/src/blocks/legacy-widget/index.php': 'wp-includes/blocks/legacy-widget.php', + 'widgets/src/blocks/widget-group/index.php': 'wp-includes/blocks/widget-group.php', ...dynamicBlockFolders.reduce( ( files, blockName ) => { files[ `block-library/src/${ blockName }/index.php` ] = `wp-includes/blocks/${ blockName }.php`; return files; @@ -96,6 +106,7 @@ module.exports = function( env = { environment: 'production', watch: false, buil }; const blockMetadataFiles = { 'widgets/src/blocks/legacy-widget/block.json': 'wp-includes/blocks/legacy-widget/block.json', + 'widgets/src/blocks/widget-group/block.json': 'wp-includes/blocks/widget-group/block.json', ...blockFolders.reduce( ( files, blockName ) => { files[ `block-library/src/${ blockName }/block.json` ] = `wp-includes/blocks/${ blockName }/block.json`; return files; @@ -142,6 +153,7 @@ module.exports = function( env = { environment: 'production', watch: false, buil mode, entry: { 'file/view': join( baseDir, `node_modules/@wordpress/block-library/build-module/file/view` ), + 'navigation/view': join( baseDir, `node_modules/@wordpress/block-library/build-module/navigation/view` ), }, output: { devtoolNamespace: 'wp', diff --git a/wp-config-sample.php b/wp-config-sample.php index d8469e730f..c095f50f6c 100644 --- a/wp-config-sample.php +++ b/wp-config-sample.php @@ -8,7 +8,7 @@ * * This file contains the following configurations: * - * * MySQL settings + * * Database settings * * Secret keys * * Database table prefix * * ABSPATH @@ -18,17 +18,17 @@ * @package WordPress */ -// ** MySQL settings - You can get this info from your web host ** // +// ** Database settings - You can get this info from your web host ** // /** The name of the database for WordPress */ define( 'DB_NAME', 'database_name_here' ); -/** MySQL database username */ +/** Database username */ define( 'DB_USER', 'username_here' ); -/** MySQL database password */ +/** Database password */ define( 'DB_PASSWORD', 'password_here' ); -/** MySQL hostname */ +/** Database hostname */ define( 'DB_HOST', 'localhost' ); /** Database charset to use in creating database tables. */ diff --git a/wp-tests-config-sample.php b/wp-tests-config-sample.php index 62636da344..934eda9162 100644 --- a/wp-tests-config-sample.php +++ b/wp-tests-config-sample.php @@ -26,7 +26,7 @@ define( 'WP_DEFAULT_THEME', 'default' ); // Test with WordPress debug mode (default). define( 'WP_DEBUG', true ); -// ** MySQL settings ** // +// ** Database settings ** // /* * This configuration file will be used by the copy of WordPress being tested.