Update AMP validator spec to 2008290323001 and improve i-amphtml-* sanitization #5356
Conversation
westonruter
force-pushed
the
update/amphtml-2008290323001
branch
from
be07024 to
4871fc6
Compare
…with other required sanitizers
| 'class' => array( | ||
| 'disallowed_value_regex' => '(^|\\W)i-amphtml-', | ||
| ), |
There was a problem hiding this comment.
This is now sanitized via AMP_Style_Sanitizer.
|
Plugin builds for 3d0d68a are ready 🛎️!
|
| $results = array_merge( | ||
| $results, | ||
| $this->ampify_ruleset_selectors( $ruleset ) | ||
| ); |
There was a problem hiding this comment.
$results would always be an empty array. no?
| $results = array_merge( | |
| $results, | |
| $this->ampify_ruleset_selectors( $ruleset ) | |
| ); | |
| $results = $this->ampify_ruleset_selectors( $ruleset ); |
There was a problem hiding this comment.
Yes, if this if condition remains the first one to mutate $results. The idea behind merging is that it's how the logic below amends $results.
westonruter
changed the title
|
QA Passed ✅ When the AMP plugin is active and I create a Web Story, the expected Previously these would be stripped out. Also I created the Custom HTML block as shown before and I got the expected validation errors: And the expected output is correct: The <div title="What will come after?" data-hint="Look at the CSS!" class="testing">Test results: </div>Previously it would have been removed along with the |
westonruter
added
the
Changelogged
Previously #5075.
./bin/amphtml-update.sh(lando ssh -c 'bash ./bin/amphtml-update.sh vendor/amphtml').Changelog
selectanduseelements inside ofamp-mega-menuandamp-nested-menuelements.amp-story-interactive-binary-poll,amp-story-interactive-poll,amp-story-interactive-quiz, andamp-story-interactive-resultscomponents. Allow inside ofamp-story-grid-layer.imagesizesandimagesrcsetattributes tolinkelement.metatags withnamevalues foramp-story-generator-nameandamp-story-generator-version'. See Add meta tags for creation tool name and version GoogleForCreators/web-stories-wp#4332 (comment).stickyattribute toamp-ad.entity,entity-logo-src, andentity-urltoamp-story.amp-story-cta-layerandamp-story-grid-layer:scale-fade-downandscale-fade-up.amp-scriptprotocol forsrcattribute foramp-listand addsnodomattribute toamp-script.imgfrom appearing inamp-story-cta-layer,amp-story-grid-layer, andamp-story-page-attachment, since these are only relevant for transformed AMP (which the AMP Optimizer outputs after validation).Sanitizing
i-amphtml-*Validation errors are now raised for each instance of
i-amphtml-*in CSS selectors and for each instance inclassattributes. When status of validation error is removed, the selector or class name is removed, but other selectors in the stylesheet and other class names are retained. Fixes #771.Creating a Custom HTML block:
On the frontend, before the result would be no styles at all being on the page since
style[amp-custom]got removed during validation. After, however, only the invalid styles and invalid class names are removed:As for the markup emitted to the frontend, notice instead of the
classattribute getting removed entirely, only the invalidi-amphtml-testingclass name is removed:<div title="What will come after?" data-hint="Look at the CSS!">Test results: </div><div title="What will come after?" data-hint="Look at the CSS!" class="testing">Test results: </div>Additionally, you may mark the two validation errors as Kept, at which point a third validation error will appear for the
style[amp-custom]as a whole given the presence ofi-amphtml-. This can be marked as Kept as well:As expected, the invalid styles are then retained (as see by "FAIL" successfully not being sanitized):
Details
( PREV_VERSION=3aa007a; THIS_VERSION=2008290323001; git checkout $THIS_VERSION; git diff $PREV_VERSION...$THIS_VERSION -w -- $( git ls-files | grep '.protoascii' ); git checkout - > /dev/null )3aa007a...2008290323001