Integrate RewriteAmpUrls transformer from toolbox library

[schlessera]

Summary

This PR fetches the new changes from the toolbox library and integrates them with the plugin.

The ES Modules can be tested and profiled with the following plugin: https://gist.github.com/schlessera/4127ab30f4235f1acbc11e3eee77701a

Dependency for #4600
Dependency for #5581
Related #5378

Depends on:

• Add RewriteAmpUrls transformer amp-toolbox-php#119
• Fix deduplication of AMP scripts and improve ReorderHead transformer amp-toolbox-php#130

To opt-in to LTS versioning for AMP scripts, the following plugin code can be used:

use AmpProject\Optimizer\Transformer\RewriteAmpUrls;
use AmpProject\Optimizer\Configuration\RewriteAmpUrlsConfiguration;

add_filter( 'amp_optimizer_config', static function ( $config ) {
	$config[ RewriteAmpUrls::class ][ RewriteAmpUrlsConfiguration::LTS ] = true;
	return $config;
} );

Checklist

• My code is tested and passes existing tests.
• My code follows the Engineering Guidelines (updates are often made to the guidelines, check it out periodically).

[westonruter]

I haven't yet looked into this in depth, but I'm seeing AMP validation errors:

For scripts, I'm seeing this:

<script async nomodule src="https://cdn.ampproject.org/v0.js"></script>
<script src="https://cdn.ampproject.org/v0/amp-analytics-0.1.mjs" async="" custom-element="amp-analytics" type="module" crossorigin="anonymous"></script>
<script src="https://cdn.ampproject.org/v0/amp-bind-0.1.mjs" async="" custom-element="amp-bind" type="module" crossorigin="anonymous"></script>
<script src="https://cdn.ampproject.org/v0/amp-form-0.1.mjs" async="" custom-element="amp-form" type="module" crossorigin="anonymous"></script>
<script src="https://cdn.ampproject.org/v0/amp-install-serviceworker-0.1.mjs" async="" custom-element="amp-install-serviceworker" type="module" crossorigin="anonymous"></script>
<script src="https://cdn.ampproject.org/v0/amp-lightbox-0.1.mjs" async="" custom-element="amp-lightbox" type="module" crossorigin="anonymous"></script>
<script src="https://cdn.ampproject.org/v0/amp-mustache-0.2.mjs" async="" custom-template="amp-mustache" type="module" crossorigin="anonymous"></script>
<!-- dns-prefetch links, style[amp-custom], various other link elements... -->
<script async="" src="https://cdn.ampproject.org/v0.mjs" type="module" crossorigin="anonymous"></script>

It seems:

1. The nomodule versions of the AMP component scripts are missing, except for the AMP runtime.
2. The v0.mjs script is not located in the same spot as the v0.js script is located. I'd expect them to appear next to each other.

[schlessera]

Yes, that's why the PR is currently still in draft. Some component seems to strip the nomodule scripts at some point.

[schlessera]

The problem of the missing nomodules was due to the ordering of the default transformers, where ReorderHead came after RewriteAmpUrls. Switching these in the ordering solved the immediate issue.

However, this made me aware that the ReorderHead transformer uses the URL as array key, so it implicitly deduplicates based on the URL, which was the reason why the nomodule versions went missing. I've created an issue for this, as there might be other instances where multiple <script> elements share a same URL and need to pass through the ReorderHead transformer: ampproject/amp-toolbox-php#125

[codecov]

Codecov Report

Merging #6037 (d70bd74) into develop (81b9df7) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

❗ Current head d70bd74 differs from pull request most recent head f78bcab. Consider uploading reports for the commit f78bcab to get more accurate results

@@              Coverage Diff              @@
##             develop    #6037      +/-   ##
=============================================
- Coverage      75.39%   75.38%   -0.01%     
  Complexity      5706     5706              
=============================================
  Files            218      218              
  Lines          17270    17265       -5     
=============================================
- Hits           13021    13016       -5     
  Misses          4249     4249              

Flag	Coverage Δ	Complexity Δ
javascript	80.05% <ø> (ø)	0.00 <ø> (ø)
php	75.19% <100.00%> (-0.01%)	0.00 <0.00> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ	Complexity Δ
amp.php	0.00% <ø> (ø)	0.00 <0.00> (ø)
includes/class-amp-theme-support.php	86.22% <100.00%> (-0.09%)	245.00 <0.00> (ø)

[swissspidy]

Can't wait to leverage this in the Web Stories plugin as well 😻

[westonruter]

Note that I've changed the description to make it so it doesn't actually fix two issues:

• Integrate support for AMP release channels  #4600: There are additional changes needed to support release channels (namely to allow opting-in to beta/experimental which requires omission of crossorigin=anonymous).
• Transformer: Implement self-hosting of AMP scripts #5581: Self-hosting of scripts will require actually downloading the scripts and then once they are downloaded configure the RewriteAmpUrls transformer to point to them. Additional changes to AMP will be needed to support the plugin's needs, per I2I: AMP Runtime Self-Hosting amphtml#25873 (comment).

[github-actions]

Plugin builds for f78bcab are ready 🛎️!

• Download development build
• Download production build