Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ampproject/amp-wp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.5.2
Choose a base ref
...
head repository: ampproject/amp-wp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2.5.3
Choose a head ref

Commits on Feb 2, 2024

  1. Bump actions/cache from 3.3.2 to 4.0.0

    Bumps [actions/cache](https://github.com/actions/cache) from 3.3.2 to 4.0.0.
    - [Release notes](https://github.com/actions/cache/releases)
    - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
    - [Commits](actions/cache@v3.3.2...v4.0.0)
    
    ---
    updated-dependencies:
    - dependency-name: actions/cache
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Feb 2, 2024
    Copy the full SHA
    6e58d70 View commit details
  2. Bump copy-webpack-plugin from 11.0.0 to 12.0.2

    Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin) from 11.0.0 to 12.0.2.
    - [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases)
    - [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md)
    - [Commits](webpack-contrib/copy-webpack-plugin@v11.0.0...v12.0.2)
    
    ---
    updated-dependencies:
    - dependency-name: copy-webpack-plugin
      dependency-type: direct:development
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Feb 2, 2024
    Copy the full SHA
    0e760a3 View commit details
  3. Bump postcss from 8.4.31 to 8.4.33

    Bumps [postcss](https://github.com/postcss/postcss) from 8.4.31 to 8.4.33.
    - [Release notes](https://github.com/postcss/postcss/releases)
    - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
    - [Commits](postcss/postcss@8.4.31...8.4.33)
    
    ---
    updated-dependencies:
    - dependency-name: postcss
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Feb 2, 2024
    Copy the full SHA
    4bf145d View commit details
  4. Bump lint-staged from 15.2.0 to 15.2.1

    Bumps [lint-staged](https://github.com/okonet/lint-staged) from 15.2.0 to 15.2.1.
    - [Release notes](https://github.com/okonet/lint-staged/releases)
    - [Changelog](https://github.com/lint-staged/lint-staged/blob/master/CHANGELOG.md)
    - [Commits](lint-staged/lint-staged@v15.2.0...v15.2.1)
    
    ---
    updated-dependencies:
    - dependency-name: lint-staged
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Feb 2, 2024
    Copy the full SHA
    8023823 View commit details
  5. bump eslint-plugin-jsdoc from 48.0.2 to 48.0.4

    ---
    updated-dependencies:
    - dependency-name: eslint-plugin-jsdoc
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Feb 2, 2024
    Copy the full SHA
    de7836d View commit details

Commits on Feb 5, 2024

  1. Copy the full SHA
    c3a639f View commit details

Commits on Feb 7, 2024

  1. Copy the full SHA
    ce9f036 View commit details
  2. Copy the full SHA
    58815f0 View commit details
  3. Copy the full SHA
    3bafe7b View commit details
  4. Merge pull request #7736 from ampproject/bump/amp-toolbox-to-0.11.5

    Bump ampproject/amp-toolbox from 0.11.4 to 0.11.5
    westonruter authored Feb 7, 2024
    Copy the full SHA
    b5eb42c View commit details
  5. Merge pull request #7731 from ampproject/dependabot/npm_and_yarn/lint…

    …-staged-15.2.1
    
    Bump lint-staged from 15.2.0 to 15.2.1
    westonruter authored Feb 7, 2024
    Copy the full SHA
    a8a864d View commit details
  6. Merge pull request #7735 from ampproject/dependabot/npm_and_yarn/esli…

    …nt-plugin-jsdoc-48.0.4
    
    bump eslint-plugin-jsdoc from 48.0.2 to 48.0.4
    westonruter authored Feb 7, 2024
    Copy the full SHA
    be61240 View commit details
  7. Merge pull request #7730 from ampproject/dependabot/npm_and_yarn/post…

    …css-8.4.33
    
    Bump postcss from 8.4.31 to 8.4.33
    westonruter authored Feb 7, 2024
    Copy the full SHA
    c830857 View commit details
  8. Merge pull request #7728 from ampproject/dependabot/npm_and_yarn/copy…

    …-webpack-plugin-12.0.2
    
    Bump copy-webpack-plugin from 11.0.0 to 12.0.2
    westonruter authored Feb 7, 2024
    Copy the full SHA
    2ebb8f8 View commit details
  9. Bump eslint-plugin-jest from 27.6.0 to 27.6.3

    Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 27.6.0 to 27.6.3.
    - [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
    - [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/main/CHANGELOG.md)
    - [Commits](jest-community/eslint-plugin-jest@v27.6.0...v27.6.3)
    
    ---
    updated-dependencies:
    - dependency-name: eslint-plugin-jest
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Feb 7, 2024
    Copy the full SHA
    7944766 View commit details
  10. Merge pull request #7725 from ampproject/dependabot/github_actions/ac…

    …tions/cache-4.0.0
    
    Bump actions/cache from 3.3.2 to 4.0.0
    westonruter authored Feb 7, 2024
    Copy the full SHA
    38a8e99 View commit details
  11. Bump the wp-cli-packages group with 2 updates

    Bumps the wp-cli-packages group with 2 updates: [wp-cli/extension-command](https://github.com/wp-cli/extension-command) and [wp-cli/wp-cli](https://github.com/wp-cli/wp-cli).
    
    
    Updates `wp-cli/extension-command` from 2.1.16 to 2.1.19
    - [Release notes](https://github.com/wp-cli/extension-command/releases)
    - [Commits](wp-cli/extension-command@v2.1.16...v2.1.19)
    
    Updates `wp-cli/wp-cli` from 2.9.0 to `9a10827`
    - [Release notes](https://github.com/wp-cli/wp-cli/releases)
    - [Commits](https://github.com/wp-cli/wp-cli/commits)
    
    ---
    updated-dependencies:
    - dependency-name: wp-cli/extension-command
      dependency-type: direct:development
      update-type: version-update:semver-patch
      dependency-group: wp-cli-packages
    - dependency-name: wp-cli/wp-cli
      dependency-type: direct:development
      dependency-group: wp-cli-packages
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Feb 7, 2024
    Copy the full SHA
    b4aed30 View commit details
  12. Merge pull request #7734 from ampproject/dependabot/npm_and_yarn/esli…

    …nt-plugin-jest-27.6.3
    
    Bump eslint-plugin-jest from 27.6.0 to 27.6.3
    westonruter authored Feb 7, 2024
    Copy the full SHA
    73f8285 View commit details
  13. Merge pull request #7739 from ampproject/dependabot/composer/wp-cli-p…

    …ackages-9828991e71
    
    Bump the wp-cli-packages group with 2 updates
    westonruter authored Feb 7, 2024
    Copy the full SHA
    5d629fc View commit details
  14. Bump eslint-plugin-prettier from 5.0.1 to 5.1.3

    Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 5.0.1 to 5.1.3.
    - [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
    - [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
    - [Commits](prettier/eslint-plugin-prettier@v5.0.1...v5.1.3)
    
    ---
    updated-dependencies:
    - dependency-name: eslint-plugin-prettier
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Feb 7, 2024
    Copy the full SHA
    a24f12c View commit details
  15. Bump prettier from 3.1.0 to 3.2.5

    Bumps [prettier](https://github.com/prettier/prettier) from 3.1.0 to 3.2.5.
    - [Release notes](https://github.com/prettier/prettier/releases)
    - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
    - [Commits](prettier/prettier@3.1.0...3.2.5)
    
    ---
    updated-dependencies:
    - dependency-name: prettier
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Feb 7, 2024
    Copy the full SHA
    70f1b39 View commit details
  16. Copy the full SHA
    e821ac5 View commit details
  17. Merge pull request #7729 from ampproject/dependabot/npm_and_yarn/esli…

    …nt-plugin-prettier-5.1.3
    
    Bump eslint-plugin-prettier from 5.0.1 to 5.1.3
    westonruter authored Feb 7, 2024
    Copy the full SHA
    ac68637 View commit details
  18. Merge pull request #7738 from ampproject/dependabot/npm_and_yarn/pret…

    …tier-3.2.5
    
    Bump prettier from 3.1.0 to 3.2.5
    westonruter authored Feb 7, 2024
    Copy the full SHA
    2690b34 View commit details

Commits on Feb 15, 2024

  1. Copy the full SHA
    522f2f1 View commit details
  2. Copy the full SHA
    12c7556 View commit details
  3. Bump 2.5.3-alpha

    westonruter committed Feb 15, 2024
    Copy the full SHA
    3dc31ba View commit details
  4. Copy the full SHA
    c77692c View commit details
  5. Copy the full SHA
    4bbec27 View commit details
  6. Merge pull request #7742 from ampproject/bump/php-css-parser

    Bump PHP-CSS-Parser to v8.5.1
    westonruter authored Feb 15, 2024
    Copy the full SHA
    f2a9863 View commit details

Commits on Feb 21, 2024

  1. Bump ip from 1.1.8 to 1.1.9

    Bumps [ip](https://github.com/indutny/node-ip) from 1.1.8 to 1.1.9.
    - [Commits](indutny/node-ip@v1.1.8...v1.1.9)
    
    ---
    updated-dependencies:
    - dependency-name: ip
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Feb 21, 2024
    Copy the full SHA
    7273308 View commit details
  2. Merge pull request #7743 from ampproject/dependabot/npm_and_yarn/ip-1…

    ….1.9
    
    Bump ip from 1.1.8 to 1.1.9
    westonruter authored Feb 21, 2024
    Copy the full SHA
    2efb5c8 View commit details

Commits on Mar 2, 2024

  1. Bump actions/cache from 4.0.0 to 4.0.1

    Bumps [actions/cache](https://github.com/actions/cache) from 4.0.0 to 4.0.1.
    - [Release notes](https://github.com/actions/cache/releases)
    - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
    - [Commits](actions/cache@v4.0.0...v4.0.1)
    
    ---
    updated-dependencies:
    - dependency-name: actions/cache
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Mar 2, 2024
    Copy the full SHA
    63adf79 View commit details
  2. Bump google/cloud-storage from 1.36.1 to 1.39.0

    Bumps [google/cloud-storage](https://github.com/googleapis/google-cloud-php-storage) from 1.36.1 to 1.39.0.
    - [Release notes](https://github.com/googleapis/google-cloud-php-storage/releases)
    - [Commits](googleapis/google-cloud-php-storage@v1.36.1...v1.39.0)
    
    ---
    updated-dependencies:
    - dependency-name: google/cloud-storage
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Mar 2, 2024
    Copy the full SHA
    74660ba View commit details
  3. Bump php-stubs/wordpress-stubs from 6.4.1 to 6.4.3

    Bumps [php-stubs/wordpress-stubs](https://github.com/php-stubs/wordpress-stubs) from 6.4.1 to 6.4.3.
    - [Release notes](https://github.com/php-stubs/wordpress-stubs/releases)
    - [Commits](php-stubs/wordpress-stubs@v6.4.1...v6.4.3)
    
    ---
    updated-dependencies:
    - dependency-name: php-stubs/wordpress-stubs
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Mar 2, 2024
    Copy the full SHA
    f26d04c View commit details

Commits on Mar 14, 2024

  1. Bump node from 18 to 20

    thelovekesh committed Mar 14, 2024
    Copy the full SHA
    cbff875 View commit details
  2. Copy the full SHA
    9a5f309 View commit details
  3. Update jest snapshots

    thelovekesh committed Mar 14, 2024
    Copy the full SHA
    8858dab View commit details
  4. Update e2e plugins zips

    thelovekesh committed Mar 14, 2024
    Copy the full SHA
    a9305f3 View commit details
  5. Copy the full SHA
    fd5823e View commit details
  6. Bump NPM and Node engine

    thelovekesh committed Mar 14, 2024
    Copy the full SHA
    f7addee View commit details
  7. Bump codecov/codecov-action from 3 to 4

    Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4.
    - [Release notes](https://github.com/codecov/codecov-action/releases)
    - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
    - [Commits](codecov/codecov-action@v3...v4)
    
    ---
    updated-dependencies:
    - dependency-name: codecov/codecov-action
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Mar 14, 2024
    Copy the full SHA
    211137d View commit details
  8. Copy the full SHA
    e87f9f6 View commit details
  9. Copy the full SHA
    fb0d507 View commit details
  10. Copy the full SHA
    ae566e5 View commit details
  11. Copy the full SHA
    1a909d3 View commit details
  12. Merge pull request #7719 from ampproject/bump/node

    Bump Nodejs; Fix PHPStan and PHPUnit failures
    westonruter authored Mar 14, 2024
    Copy the full SHA
    ecb3124 View commit details
  13. Copy the full SHA
    9370718 View commit details
  14. Copy the full SHA
    eb02f7e View commit details
  15. Copy the full SHA
    8ca9caa View commit details
Showing with 2,740 additions and 2,725 deletions.
  1. +6 −4 .github/workflows/build-test-measure.yml
  2. +1 −1 .nvmrc
  3. +2 −2 README.md
  4. +2 −2 amp.php
  5. +3 −3 assets/src/block-validation/components/amp-document-status/index.js
  6. +1 −1 assets/src/block-validation/components/error/error-panel-title.js
  7. +1 −1 assets/src/block-validation/components/sidebar/index.js
  8. +10 −0 assets/src/components/clipboard-button/test/__snapshots__/index.js.snap
  9. +10 −0 assets/src/components/error-screen/test/__snapshots__/index.js.snap
  10. +1 −1 assets/src/components/site-scan-context-provider/index.js
  11. +1 −1 assets/src/components/site-scan-results/plugins-with-amp-incompatibility.js
  12. +1 −1 assets/src/components/site-scan-results/themes-with-amp-incompatibility.js
  13. +27 −0 assets/src/components/template-mode-option/test/__snapshots__/index.js.snap
  14. +2 −2 assets/src/onboarding-wizard/components/nav/index.js
  15. +19 −0 assets/src/onboarding-wizard/components/nav/test/__snapshots__/index.js.snap
  16. +4 −4 assets/src/onboarding-wizard/pages/site-scan/index.js
  17. +1 −1 assets/src/settings-page/site-scan.js
  18. +1 −1 assets/src/settings-page/supported-templates.js
  19. +2 −2 composer.json
  20. +397 −115 composer.lock
  21. +1 −1 includes/amp-helper-functions.php
  22. +13 −6 includes/class-amp-theme-support.php
  23. +2 −0 includes/embeds/class-amp-tiktok-embed-handler.php
  24. +7 −2 includes/sanitizers/class-amp-allowed-tags-generated.php
  25. +2,149 −2,517 package-lock.json
  26. +52 −52 package.json
  27. BIN tests/e2e/plugins/do-not-allow-amp-validate-capability.zip
  28. BIN tests/e2e/plugins/e2e-tests-demo-plugin.zip
  29. +6 −0 tests/php/src/PluginRegistryTest.php
  30. +8 −2 tests/php/test-amp-helper-functions.php
  31. +1 −1 tests/php/test-class-amp-theme-support.php
  32. +7 −0 tests/php/validation/test-class-amp-validation-manager.php
  33. +2 −2 webpack.config.js
10 changes: 6 additions & 4 deletions .github/workflows/build-test-measure.yml
Original file line number Diff line number Diff line change
@@ -171,7 +171,7 @@ jobs:
uses: ./.github/actions/setup-node-npm

- name: Setup Jest cache
uses: actions/cache@v3.3.2
uses: actions/cache@v4.0.1
with:
path: ~/.jest-cache
key: ${{ runner.os }}-jest
@@ -181,11 +181,12 @@ jobs:

- name: Upload code coverage report
if: github.actor != 'dependabot[bot]'
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
file: build/logs/lcov.info
flags: javascript
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}

#-----------------------------------------------------------------------------------------------------------------------

@@ -218,7 +219,7 @@ jobs:
uses: ./.github/actions/plugin-build

- name: Setup Jest cache
uses: actions/cache@v3.3.2
uses: actions/cache@v4.0.1
with:
path: ~/.jest-cache
key: ${{ runner.os }}-jest-e2e-${{ matrix.part }}
@@ -456,11 +457,12 @@ jobs:

- name: Upload code coverage report
if: ${{ matrix.coverage == true && needs.pre-run.outputs.changed-php-count > 0 && github.actor != 'dependabot[bot]' }}
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
file: ${{ env.WP_CORE_DIR }}/src/wp-content/plugins/amp/build/logs/clover.xml
flags: php,unit
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}

#-----------------------------------------------------------------------------------------------------------------------

2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -7,8 +7,8 @@ An easier path to great Page Experience for everyone. Powered by AMP.
**Contributors:** [google](https://profiles.wordpress.org/google), [xwp](https://profiles.wordpress.org/xwp), [rtcamp](https://profiles.wordpress.org/rtcamp), [automattic](https://profiles.wordpress.org/automattic), [westonruter](https://profiles.wordpress.org/westonruter), [albertomedina](https://profiles.wordpress.org/albertomedina), [schlessera](https://profiles.wordpress.org/schlessera), [delawski](https://profiles.wordpress.org/delawski/), [swissspidy](https://profiles.wordpress.org/swissspidy), [pierlo](https://profiles.wordpress.org/pierlo), [joshuawold](https://profiles.wordpress.org/joshuawold), [thelovekesh](https://profiles.wordpress.org/thelovekesh/)
**Tags:** [page experience](https://wordpress.org/plugins/tags/page-experience), [performance](https://wordpress.org/plugins/tags/performance), [amp](https://wordpress.org/plugins/tags/amp), [mobile](https://wordpress.org/plugins/tags/mobile), [optimization](https://wordpress.org/plugins/tags/optimization), [accelerated mobile pages](https://wordpress.org/plugins/tags/accelerated-mobile-pages)
**Requires at least:** 5.3
**Tested up to:** 6.4
**Stable tag:** 2.5.2
**Tested up to:** 6.5
**Stable tag:** 2.5.3
**License:** [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)
**Requires PHP:** 7.4

4 changes: 2 additions & 2 deletions amp.php
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
* Plugin URI: https://amp-wp.org
* Author: AMP Project Contributors
* Author URI: https://github.com/ampproject/amp-wp/graphs/contributors
* Version: 2.5.2
* Version: 2.5.3
* License: GPLv2 or later
* Requires at least: 5.3
* Requires PHP: 7.4
@@ -15,7 +15,7 @@

define( 'AMP__FILE__', __FILE__ );
define( 'AMP__DIR__', dirname( __FILE__ ) );
define( 'AMP__VERSION', '2.5.2' );
define( 'AMP__VERSION', '2.5.3' );

/**
* Errors encountered while loading the plugin.
Original file line number Diff line number Diff line change
@@ -94,11 +94,11 @@ export default function AMPDocumentStatusNotification() {
? __(
'Content may have changed. Trigger validation in the AMP Validation sidebar.',
'amp'
)
)
: __(
'Content has changed. Trigger validation in the AMP Validation sidebar.',
'amp'
)
)
}
isSmall={true}
/>
@@ -213,7 +213,7 @@ export default function AMPDocumentStatusNotification() {
'amp'
),
reviewedValidationErrorCount
)
)
: __('No AMP validation issues detected.', 'amp')
}
isSmall={true}
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ export function ErrorPanelTitle({ kept, title, error: { type } }) {
? __(
'This error has been kept, making this URL not AMP-compatible.',
'amp'
)
)
: ''
}
>
2 changes: 1 addition & 1 deletion assets/src/block-validation/components/sidebar/index.js
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ export function Sidebar() {
? select(blockValidationStore).getValidationErrors()
: select(
blockValidationStore
).getUnreviewedValidationErrors(),
).getUnreviewedValidationErrors(),
hasReviewedValidationErrors:
select(blockValidationStore).getReviewedValidationErrors()
?.length > 0,

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/src/components/site-scan-context-provider/index.js
Original file line number Diff line number Diff line change
@@ -610,7 +610,7 @@ export function SiteScanContextProvider({
? Math.min(
scannableUrls.length,
...urlIndexesPendingScan
)
)
: 0) - 1,
stale,
startSiteScan,
Original file line number Diff line number Diff line change
@@ -86,7 +86,7 @@ export function PluginsWithAmpIncompatibility({
<a href={AMP_COMPATIBLE_PLUGINS_URL} />
),
}
)
)
: ''}
</p>
)}
Original file line number Diff line number Diff line change
@@ -99,7 +99,7 @@ export function ThemesWithAmpIncompatibility({
<a href={AMP_COMPATIBLE_THEMES_URL} />
),
}
)
)
: ''}
</p>
)}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions assets/src/onboarding-wizard/components/nav/index.js
Original file line number Diff line number Diff line change
@@ -110,9 +110,9 @@ export function Nav({ closeLink, finishLink }) {
? {
'autofocus[panel]': 'amp_panel',
url: previewPermalink,
}
}
: { url: previewPermalink, [AMP_QUERY_VAR]: '1' }
)
)
: undefined;
} else if (isLastPage) {
nextText = __('Finish', 'amp');

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions assets/src/onboarding-wizard/pages/site-scan/index.js
Original file line number Diff line number Diff line change
@@ -117,11 +117,11 @@ export function SiteScan() {
? __(
'Site scan found issues on your site. Proceed to the next step to follow recommendations for choosing a template mode.',
'amp'
)
)
: __(
'Site scan found no issues on your site. Proceed to the next step to follow recommendations for choosing a template mode.',
'amp'
)}
)}
</p>
}
>
@@ -175,7 +175,7 @@ export function SiteScan() {
isCompleted
? 100
: (scannedUrlsMaxIndex / scannableUrls.length) *
100
100
}
/>
<p className="site-scan__status">
@@ -190,7 +190,7 @@ export function SiteScan() {
scannedUrlsMaxIndex + 1,
scannableUrls.length,
scannableUrls[scannedUrlsMaxIndex]?.label
)}
)}
</p>
</>
}
2 changes: 1 addition & 1 deletion assets/src/settings-page/site-scan.js
Original file line number Diff line number Diff line change
@@ -297,7 +297,7 @@ function SiteScanInProgress() {
scannedUrlsMaxIndex + 1,
scannableUrls.length,
scannableUrls[scannedUrlsMaxIndex]?.label
)}
)}
</p>
</>
);
2 changes: 1 addition & 1 deletion assets/src/settings-page/supported-templates.js
Original file line number Diff line number Diff line change
@@ -197,7 +197,7 @@ export function SupportedTemplatesCheckboxes({ supportableTemplates }) {
supportableTemplate.id
)
);
});
});

return (
<ul>
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -14,10 +14,10 @@
"ext-json": "*",
"ext-libxml": "*",
"ext-spl": "*",
"ampproject/amp-toolbox": "0.11.4",
"ampproject/amp-toolbox": "0.11.5",
"cweagans/composer-patches": "^1.0",
"fasterimage/fasterimage": "1.5.0",
"sabberworm/php-css-parser": "dev-master#cc791ad"
"sabberworm/php-css-parser": "8.5.1"
},
"require-dev": {
"automattic/vipwpcs": "^3.0",
Loading