From d53c7be8e8f5374fb826d2ed28f7565cd6e899e8 Mon Sep 17 00:00:00 2001 From: Devin Mullins Date: Wed, 5 Aug 2020 15:51:07 -0700 Subject: [PATCH] Validator rollup (#29698) * cl/323700659 Revision bump for #29329 * cl/323797874 Revision bump for #29542 * cl/323858009 Revision bump for #29409 * cl/323889989 n/a * cl/324641097 Implements document level byte count limitation. * cl/324911894 Remove AMP Actions from Validator * cl/324915915 Revision bump for #29642 Co-authored-by: Greg Grothaus Co-authored-by: Amaltas Bohra Co-authored-by: honeybadgerdontcare --- .../validator-amp-accordion.protoascii | 3 - .../validator-amp-action-macro.protoascii | 2 - .../validator-amp-analytics.protoascii | 3 - .../amp-anim/validator-amp-anim.protoascii | 2 - .../validator-amp-animation.protoascii | 3 - .../validator-amp-base-carousel.protoascii | 5 - .../amp-bind/validator-amp-bind.protoascii | 35 - .../validator-amp-carousel.protoascii | 2 - .../validator-amp-experiment.protoascii | 3 - .../validator-amp-fit-text.protoascii | 2 - .../amp-font/validator-amp-font.protoascii | 2 - .../amp-form/validator-amp-form.protoascii | 1 - .../validator-amp-fx-collection.protoascii | 1 - .../validator-amp-image-lightbox.protoascii | 1 - .../validator-amp-lightbox.protoascii | 2 - .../amp-list/validator-amp-list.protoascii | 79 -- .../validator-amp-live-list.protoascii | 6 - .../validator-amp-mustache.protoascii | 5 +- ...idator-amp-orientation-observer.protoascii | 2 - .../validator-amp-pan-zoom.protoascii | 2 - ...tor-actions-amp-payment-google-button.html | 94 -- ...ator-actions-amp-payment-google-button.out | 97 --- ...dator-amp-payment-google-button.protoascii | 65 -- ...tions-amp-payment-google-inline-async.html | 108 --- ...ctions-amp-payment-google-inline-async.out | 115 --- ...amp-payment-google-inline-async.protoascii | 73 -- ...tor-actions-amp-payment-google-inline.html | 129 --- ...ator-actions-amp-payment-google-inline.out | 136 --- ...dator-amp-payment-google-inline.protoascii | 76 -- ...validator-amp-position-observer.protoascii | 2 - .../validator-amp-selector.protoascii | 4 - .../validator-amp-sidebar.protoascii | 3 - .../amp-story/validator-amp-story.protoascii | 1 - .../validator-amp-timeago.protoascii | 2 - .../amp-video/validator-amp-video.protoascii | 3 - ...lidator-actions-amp-viewer-assistance.html | 41 - ...alidator-actions-amp-viewer-assistance.out | 42 - ...validator-amp-viewer-assistance.protoascii | 51 -- .../amp-yotpo/validator-amp-yotpo.protoascii | 2 - .../validator-amp-youtube.protoascii | 2 - validator/engine/htmlparser-interface.js | 6 + validator/engine/htmlparser.js | 27 + validator/engine/validator.js | 171 +++- validator/engine/validator_test.js | 227 ++--- validator/nodejs/index.js | 8 +- .../actions_feature_tests/amp_bind.html | 60 -- .../actions_feature_tests/amp_bind.out | 61 -- .../actions_feature_tests/amp_form.html | 121 --- .../actions_feature_tests/amp_form.out | 126 --- .../actions_feature_tests/amp_list.html | 73 -- .../actions_feature_tests/amp_list.out | 75 -- .../actions_feature_tests/css_length.html | 36 - .../actions_feature_tests/minimum_valid.html | 40 - .../type_identifier_missing.html | 32 - .../amp4ads_feature_tests/amp_actions.html | 29 - .../{amp_actions.out => doctype.out.cpponly} | 10 +- .../{amp_actions.html => doc_size.html} | 11 +- .../{amp_actions.out => doc_size.out} | 15 +- .../.cpponly} | 35 +- .../testdata/feature_tests/amp_actions.html | 33 - .../duplicate_attribute.out.cpponly | 64 ++ .../testdata/feature_tests/empty.out.cpponly | 24 + .../json-parsing-invalid.out.cpponly | 98 +++ .../testdata/feature_tests/leaks.out.cpponly | 387 +++++++++ .../manufactured_body_whitespace.out.cpponly | 49 ++ .../multiple_body_tags.out.cpponly} | 20 +- .../multiple_body_tags_2.out.cpponly} | 18 +- .../multiple_body_tags_3.out.cpponly | 54 ++ .../testdata/feature_tests/parser.out.cpponly | 117 +++ ...mp_actions.out => slash_attrs.out.cpponly} | 28 +- .../unprintable_chars.out.cpponly | 64 ++ validator/validator-css.protoascii | 53 +- validator/validator-main.protoascii | 273 +----- validator/validator.pb.go | 807 ++++++++++-------- validator/validator.proto | 38 +- 75 files changed, 1671 insertions(+), 2826 deletions(-) delete mode 100644 extensions/amp-payment-google-button/0.1/test/validator-actions-amp-payment-google-button.html delete mode 100644 extensions/amp-payment-google-button/0.1/test/validator-actions-amp-payment-google-button.out delete mode 100644 extensions/amp-payment-google-button/validator-amp-payment-google-button.protoascii delete mode 100644 extensions/amp-payment-google-inline-async/0.1/test/validator-actions-amp-payment-google-inline-async.html delete mode 100644 extensions/amp-payment-google-inline-async/0.1/test/validator-actions-amp-payment-google-inline-async.out delete mode 100644 extensions/amp-payment-google-inline-async/validator-amp-payment-google-inline-async.protoascii delete mode 100644 extensions/amp-payment-google-inline/0.1/test/validator-actions-amp-payment-google-inline.html delete mode 100644 extensions/amp-payment-google-inline/0.1/test/validator-actions-amp-payment-google-inline.out delete mode 100644 extensions/amp-payment-google-inline/validator-amp-payment-google-inline.protoascii delete mode 100644 extensions/amp-viewer-assistance/0.1/test/validator-actions-amp-viewer-assistance.html delete mode 100644 extensions/amp-viewer-assistance/0.1/test/validator-actions-amp-viewer-assistance.out delete mode 100644 extensions/amp-viewer-assistance/validator-amp-viewer-assistance.protoascii delete mode 100644 validator/testdata/actions_feature_tests/amp_bind.html delete mode 100644 validator/testdata/actions_feature_tests/amp_bind.out delete mode 100644 validator/testdata/actions_feature_tests/amp_form.html delete mode 100644 validator/testdata/actions_feature_tests/amp_form.out delete mode 100644 validator/testdata/actions_feature_tests/amp_list.html delete mode 100644 validator/testdata/actions_feature_tests/amp_list.out delete mode 100644 validator/testdata/actions_feature_tests/css_length.html delete mode 100644 validator/testdata/actions_feature_tests/minimum_valid.html delete mode 100644 validator/testdata/actions_feature_tests/type_identifier_missing.html delete mode 100644 validator/testdata/amp4ads_feature_tests/amp_actions.html rename validator/testdata/amp4ads_feature_tests/{amp_actions.out => doctype.out.cpponly} (74%) rename validator/testdata/amp4email_feature_tests/{amp_actions.html => doc_size.html} (70%) rename validator/testdata/amp4email_feature_tests/{amp_actions.out => doc_size.out} (68%) rename validator/testdata/{actions_feature_tests/minimum_valid.out => feature_tests/.cpponly} (65%) delete mode 100644 validator/testdata/feature_tests/amp_actions.html create mode 100644 validator/testdata/feature_tests/duplicate_attribute.out.cpponly create mode 100644 validator/testdata/feature_tests/empty.out.cpponly create mode 100644 validator/testdata/feature_tests/json-parsing-invalid.out.cpponly create mode 100644 validator/testdata/feature_tests/leaks.out.cpponly create mode 100644 validator/testdata/feature_tests/manufactured_body_whitespace.out.cpponly rename validator/testdata/{actions_feature_tests/css_length.out => feature_tests/multiple_body_tags.out.cpponly} (79%) rename validator/testdata/{actions_feature_tests/type_identifier_missing.out => feature_tests/multiple_body_tags_2.out.cpponly} (73%) create mode 100644 validator/testdata/feature_tests/multiple_body_tags_3.out.cpponly create mode 100644 validator/testdata/feature_tests/parser.out.cpponly rename validator/testdata/feature_tests/{amp_actions.out => slash_attrs.out.cpponly} (65%) create mode 100644 validator/testdata/feature_tests/unprintable_chars.out.cpponly diff --git a/extensions/amp-accordion/validator-amp-accordion.protoascii b/extensions/amp-accordion/validator-amp-accordion.protoascii index a10bcc4a04d6..3d35a015c418 100644 --- a/extensions/amp-accordion/validator-amp-accordion.protoascii +++ b/extensions/amp-accordion/validator-amp-accordion.protoascii @@ -16,7 +16,6 @@ tags: { # amp-accordion html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "SCRIPT" extension_spec: { name: "amp-accordion" @@ -42,7 +41,6 @@ tags: { # html_format: AMP html_format: AMP4ADS html_format: AMP4EMAIL - html_format: ACTIONS tag_name: "AMP-ACCORDION" requires_extension: "amp-accordion" attrs: { name: "animate" value: "" } @@ -66,7 +64,6 @@ tags: { # >
html_format: AMP html_format: AMP4ADS html_format: AMP4EMAIL - html_format: ACTIONS tag_name: "SECTION" spec_name: "amp-accordion > section" descriptive_name: "amp-accordion > section" diff --git a/extensions/amp-action-macro/validator-amp-action-macro.protoascii b/extensions/amp-action-macro/validator-amp-action-macro.protoascii index a60ac468b44b..22a34c3efed7 100644 --- a/extensions/amp-action-macro/validator-amp-action-macro.protoascii +++ b/extensions/amp-action-macro/validator-amp-action-macro.protoascii @@ -15,7 +15,6 @@ # tags: { # amp-action-macro html_format: AMP - html_format: ACTIONS tag_name: "SCRIPT" extension_spec: { name: "amp-action-macro" @@ -26,7 +25,6 @@ tags: { # amp-action-macro } tags: { # html_format: AMP - html_format: ACTIONS tag_name: "AMP-ACTION-MACRO" requires_extension: "amp-action-macro" attrs: { diff --git a/extensions/amp-analytics/validator-amp-analytics.protoascii b/extensions/amp-analytics/validator-amp-analytics.protoascii index 29b460e934c0..59b3042efcbb 100644 --- a/extensions/amp-analytics/validator-amp-analytics.protoascii +++ b/extensions/amp-analytics/validator-amp-analytics.protoascii @@ -18,7 +18,6 @@ tags: { # amp-analytics html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "SCRIPT" extension_spec: { name: "amp-analytics" @@ -32,7 +31,6 @@ tags: { # amp-analytics tags: { # amp-analytics (json) html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "SCRIPT" spec_name: "amp-analytics extension .json script" descriptive_name: "amp-analytics extension .json script" @@ -56,7 +54,6 @@ tags: { # amp-analytics (json) tags: { # html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "AMP-ANALYTICS" requires_extension: "amp-analytics" attrs: { diff --git a/extensions/amp-anim/validator-amp-anim.protoascii b/extensions/amp-anim/validator-amp-anim.protoascii index 7e9a569c701e..39aa3e94fbdf 100644 --- a/extensions/amp-anim/validator-amp-anim.protoascii +++ b/extensions/amp-anim/validator-amp-anim.protoascii @@ -17,7 +17,6 @@ tags: { # amp-anim html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "SCRIPT" extension_spec: { name: "amp-anim" @@ -42,7 +41,6 @@ tags: { # amp-anim tags: { # html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "AMP-ANIM" requires_extension: "amp-anim" attrs: { name: "alt" } diff --git a/extensions/amp-animation/validator-amp-animation.protoascii b/extensions/amp-animation/validator-amp-animation.protoascii index 477695c94e8a..0fce91192541 100644 --- a/extensions/amp-animation/validator-amp-animation.protoascii +++ b/extensions/amp-animation/validator-amp-animation.protoascii @@ -17,7 +17,6 @@ tags: { # amp-animation html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "SCRIPT" extension_spec: { name: "amp-animation" @@ -29,7 +28,6 @@ tags: { # amp-animation tags: { # (json) html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "SCRIPT" spec_name: "amp-animation extension .json script" mandatory_parent: "AMP-ANIMATION" @@ -52,7 +50,6 @@ tags: { # (json) tags: { # html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "AMP-ANIMATION" requires_extension: "amp-animation" requires: "amp-animation extension .json script" diff --git a/extensions/amp-base-carousel/validator-amp-base-carousel.protoascii b/extensions/amp-base-carousel/validator-amp-base-carousel.protoascii index e7132e6bcd21..70f94e45fffe 100644 --- a/extensions/amp-base-carousel/validator-amp-base-carousel.protoascii +++ b/extensions/amp-base-carousel/validator-amp-base-carousel.protoascii @@ -16,7 +16,6 @@ tags: { # amp-base-carousel html_format: AMP - html_format: ACTIONS tag_name: "SCRIPT" extension_spec: { name: "amp-base-carousel" @@ -116,7 +115,6 @@ attr_lists: { tags: { # html_format: AMP - html_format: ACTIONS tag_name: "AMP-BASE-CAROUSEL" requires_extension: "amp-base-carousel" attr_lists: "amp-base-carousel-common" @@ -135,7 +133,6 @@ tags: { # tags: { # html_format: AMP - html_format: ACTIONS tag_name: "AMP-BASE-CAROUSEL" spec_name: "AMP-BASE-CAROUSEL [lightbox]" requires_extension: "amp-base-carousel" @@ -166,7 +163,6 @@ tags: { # tags: { html_format: AMP - html_format: ACTIONS tag_name: "$REFERENCE_POINT" spec_name: "AMP-BASE-CAROUSEL lightbox [lightbox-exclude]" attrs: { @@ -176,7 +172,6 @@ tags: { } tags: { html_format: AMP - html_format: ACTIONS tag_name: "$REFERENCE_POINT" spec_name: "AMP-BASE-CAROUSEL lightbox [child]" attrs: { diff --git a/extensions/amp-bind/validator-amp-bind.protoascii b/extensions/amp-bind/validator-amp-bind.protoascii index 36e16935f47c..2e062877969b 100644 --- a/extensions/amp-bind/validator-amp-bind.protoascii +++ b/extensions/amp-bind/validator-amp-bind.protoascii @@ -16,7 +16,6 @@ tags: { # amp-bind html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "SCRIPT" extension_spec: { name: "amp-bind" @@ -48,7 +47,6 @@ tags: { # (json) html_format: AMP html_format: AMP4ADS html_format: AMP4EMAIL - html_format: ACTIONS tag_name: "SCRIPT" spec_name: "amp-bind extension .json script" requires_extension: "amp-bind" @@ -115,41 +113,8 @@ tags: { # } spec_url: "https://amp.dev/documentation/components/amp-bind/" } -# ACTIONS with POST identity -tags: { # - html_format: ACTIONS - tag_name: "AMP-STATE" - spec_name: "AMP-STATE (ACTIONS)" - requires_extension: "amp-bind" - attrs: { - name: "credentials" - } - attrs: { - name: "crossorigin" - value: "amp-viewer-auth-token-via-post" - } - attrs: { - name: "overridable" - } - attrs: { - name: "src" - value_url: { - protocol: "https" - allow_relative: true # Will be set to false at a future date. - } - disallowed_value_regex: "__amp_source_origin" - } - attr_lists: "mandatory-id-attr" - # - attrs: { name: "[src]" } - child_tags: { - first_child_tag_name_oneof: "SCRIPT" - } - spec_url: "https://amp.dev/documentation/components/amp-bind/" -} tags: { # html_format: AMP - html_format: ACTIONS html_format: AMP4EMAIL tag_name: "AMP-BIND-MACRO" requires_extension: "amp-bind" diff --git a/extensions/amp-carousel/validator-amp-carousel.protoascii b/extensions/amp-carousel/validator-amp-carousel.protoascii index 0549b2bbfeae..897aad1767af 100644 --- a/extensions/amp-carousel/validator-amp-carousel.protoascii +++ b/extensions/amp-carousel/validator-amp-carousel.protoascii @@ -17,7 +17,6 @@ tags: { # amp-carousel html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "SCRIPT" extension_spec: { name: "amp-carousel" @@ -86,7 +85,6 @@ tags: { # html_format: AMP html_format: AMP4ADS html_format: AMP4EMAIL - html_format: ACTIONS tag_name: "AMP-CAROUSEL" spec_name: "AMP-CAROUSEL" requires_extension: "amp-carousel" diff --git a/extensions/amp-experiment/validator-amp-experiment.protoascii b/extensions/amp-experiment/validator-amp-experiment.protoascii index d84b5ec70c58..7db7c9c47ae8 100644 --- a/extensions/amp-experiment/validator-amp-experiment.protoascii +++ b/extensions/amp-experiment/validator-amp-experiment.protoascii @@ -17,7 +17,6 @@ # Specific script tags for custom elements and runtime imports. tags: { # amp-experiment html_format: AMP - html_format: ACTIONS tag_name: "SCRIPT" extension_spec: { name: "amp-experiment" @@ -31,7 +30,6 @@ tags: { # amp-experiment } tags: { # amp-experiment (json) html_format: AMP - html_format: ACTIONS tag_name: "SCRIPT" spec_name: "amp-experiment extension .json script" mandatory_parent: "AMP-EXPERIMENT" @@ -54,7 +52,6 @@ tags: { # amp-experiment (json) } tags: { # html_format: AMP - html_format: ACTIONS tag_name: "AMP-EXPERIMENT" requires_extension: "amp-experiment" unique: true diff --git a/extensions/amp-fit-text/validator-amp-fit-text.protoascii b/extensions/amp-fit-text/validator-amp-fit-text.protoascii index cbab0b8587b5..4b0f8703e75c 100644 --- a/extensions/amp-fit-text/validator-amp-fit-text.protoascii +++ b/extensions/amp-fit-text/validator-amp-fit-text.protoascii @@ -17,7 +17,6 @@ tags: { # amp-fit-text html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "SCRIPT" extension_spec: { name: "amp-fit-text" @@ -43,7 +42,6 @@ tags: { # html_format: AMP html_format: AMP4ADS html_format: AMP4EMAIL - html_format: ACTIONS tag_name: "AMP-FIT-TEXT" requires_extension: "amp-fit-text" attrs: { name: "max-font-size" } diff --git a/extensions/amp-font/validator-amp-font.protoascii b/extensions/amp-font/validator-amp-font.protoascii index 7b375a3e3b4c..a77474651586 100644 --- a/extensions/amp-font/validator-amp-font.protoascii +++ b/extensions/amp-font/validator-amp-font.protoascii @@ -17,7 +17,6 @@ tags: { # amp-font html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "SCRIPT" extension_spec: { name: "amp-font" @@ -31,7 +30,6 @@ tags: { # amp-font tags: { # html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "AMP-FONT" requires_extension: "amp-font" attrs: { diff --git a/extensions/amp-form/validator-amp-form.protoascii b/extensions/amp-form/validator-amp-form.protoascii index a5b212134f80..6487139d6a68 100644 --- a/extensions/amp-form/validator-amp-form.protoascii +++ b/extensions/amp-form/validator-amp-form.protoascii @@ -18,7 +18,6 @@ tags: { # amp-form # under section "4.10 Forms" html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "SCRIPT" extension_spec: { name: "amp-form" diff --git a/extensions/amp-fx-collection/validator-amp-fx-collection.protoascii b/extensions/amp-fx-collection/validator-amp-fx-collection.protoascii index 6b93d762e626..074bc0365842 100644 --- a/extensions/amp-fx-collection/validator-amp-fx-collection.protoascii +++ b/extensions/amp-fx-collection/validator-amp-fx-collection.protoascii @@ -17,7 +17,6 @@ tags: { # amp-fx-collection # Accepted amp-fx-collection attributes can be found in # validator-main.protoascii html_format: AMP - html_format: ACTIONS tag_name: "SCRIPT" extension_spec: { name: "amp-fx-collection" diff --git a/extensions/amp-image-lightbox/validator-amp-image-lightbox.protoascii b/extensions/amp-image-lightbox/validator-amp-image-lightbox.protoascii index 43c62d817c44..3befadb762eb 100644 --- a/extensions/amp-image-lightbox/validator-amp-image-lightbox.protoascii +++ b/extensions/amp-image-lightbox/validator-amp-image-lightbox.protoascii @@ -15,7 +15,6 @@ # tags: { # amp-image-lightbox html_format: AMP - html_format: ACTIONS tag_name: "SCRIPT" extension_spec: { name: "amp-image-lightbox" diff --git a/extensions/amp-lightbox/validator-amp-lightbox.protoascii b/extensions/amp-lightbox/validator-amp-lightbox.protoascii index 308668f21763..e99a3941edfe 100644 --- a/extensions/amp-lightbox/validator-amp-lightbox.protoascii +++ b/extensions/amp-lightbox/validator-amp-lightbox.protoascii @@ -16,7 +16,6 @@ tags: { # amp-lightbox html_format: AMP - html_format: ACTIONS tag_name: "SCRIPT" extension_spec: { name: "amp-lightbox" @@ -54,7 +53,6 @@ tags: { # amp-lightbox tags: { # html_format: AMP html_format: AMP4EMAIL - html_format: ACTIONS tag_name: "AMP-LIGHTBOX" requires_extension: "amp-lightbox" attrs: { diff --git a/extensions/amp-list/validator-amp-list.protoascii b/extensions/amp-list/validator-amp-list.protoascii index 9ec7c59a1909..de73fe62a0ce 100644 --- a/extensions/amp-list/validator-amp-list.protoascii +++ b/extensions/amp-list/validator-amp-list.protoascii @@ -36,17 +36,6 @@ tags: { # amp-list } attr_lists: "common-extension-attrs" } -tags: { # amp-list - html_format: ACTIONS - tag_name: "SCRIPT" - spec_name: "SCRIPT[custom-element=amp-list] (ACTIONS)" - extension_spec: { - name: "amp-list" - version: "0.1" - version: "latest" - } - attr_lists: "common-extension-attrs" -} tags: { # with mandatory src and/or [src] attr html_format: AMP tag_name: "AMP-LIST" @@ -130,7 +119,6 @@ tags: { html_format: AMP html_format: AMP4ADS html_format: AMP4EMAIL - html_format: ACTIONS tag_name: "DIV" spec_name: "AMP-LIST DIV [fetch-error]" mandatory_ancestor: "AMP-LIST" @@ -143,7 +131,6 @@ tags: { tags: { # amp-list-load-more html_format: AMP - html_format: ACTIONS tag_name: "AMP-LIST-LOAD-MORE" requires_extension: "amp-list" mandatory_parent: "AMP-LIST" @@ -172,7 +159,6 @@ tags: { # amp-list-load-more # The button element variant allowed in amp-list-load-more. tags: { html_format: AMP - html_format: ACTIONS requires_extension: "amp-list" tag_name: "BUTTON" spec_name: "amp-list-load-more button[load-more-clickable]" @@ -253,68 +239,3 @@ tags: { # supported_layouts: RESPONSIVE } } -# ACTIONS with POST identity token -tags: { # - html_format: ACTIONS - tag_name: "AMP-LIST" - spec_name: "AMP-LIST (ACTIONS)" - requires_extension: "amp-list" - attrs: { - name: "auto-resize" - value: "" - deprecation: "replacement-to-be-determined-at-a-later-date" - deprecation_url: "https://github.com/ampproject/amphtml/issues/18849" - } - attrs: { - name: "binding" - value: "always" - value: "no" - value: "refresh" - } - attrs: { name: "credentials" } - attrs: { - name: "crossorigin" - value: "amp-viewer-auth-token-via-post" - } - attrs: { - name: "diffable" - value: "" - } - attrs: { name: "items" } - attrs: { name: "max-items" } - attrs: { - name: "reset-on-refresh" - value: "" - value: "always" - value: "fetch" - } - attrs: { name: "single-item" } - attrs: { - name: "src" - mandatory_anyof: "['src','[src]','data-amp-bind-src']" - value_url: { - protocol: "https" - allow_relative: true - } - disallowed_value_regex: "__amp_source_origin" - } - attrs: { name: "template" } - # - attrs: { - name: "[src]" - mandatory_anyof: "['src','[src]','data-amp-bind-src']" - } - attrs: { - name: "[state]" - deprecation: "[src]" - } - attr_lists: "extended-amp-global" - amp_layout: { - supported_layouts: FILL - supported_layouts: FIXED - supported_layouts: FIXED_HEIGHT - supported_layouts: FLEX_ITEM - supported_layouts: NODISPLAY - supported_layouts: RESPONSIVE - } -} diff --git a/extensions/amp-live-list/validator-amp-live-list.protoascii b/extensions/amp-live-list/validator-amp-live-list.protoascii index 350fa7db4303..531fc218399d 100644 --- a/extensions/amp-live-list/validator-amp-live-list.protoascii +++ b/extensions/amp-live-list/validator-amp-live-list.protoascii @@ -15,7 +15,6 @@ # tags: { # amp-live-list html_format: AMP - html_format: ACTIONS tag_name: "SCRIPT" mandatory_parent: "HEAD" unique_warning: true @@ -29,7 +28,6 @@ tags: { # amp-live-list } tags: { # html_format: AMP - html_format: ACTIONS tag_name: "AMP-LIVE-LIST" requires_extension: "amp-live-list" attrs: { @@ -71,7 +69,6 @@ tags: { # } tags: { html_format: AMP - html_format: ACTIONS tag_name: "$REFERENCE_POINT" spec_name : "AMP-LIVE-LIST [update]" descriptive_name : "amp-live-list [update]" @@ -83,7 +80,6 @@ tags: { } tags: { html_format: AMP - html_format: ACTIONS tag_name: "$REFERENCE_POINT" spec_name: "AMP-LIVE-LIST [items]" descriptive_name : "amp-live-list [items]" @@ -98,7 +94,6 @@ tags: { } tags: { html_format: AMP - html_format: ACTIONS tag_name: "$REFERENCE_POINT" spec_name : "AMP-LIVE-LIST [pagination]" descriptive_name : "amp-live-list [pagination]" @@ -110,7 +105,6 @@ tags: { } tags: { html_format: AMP - html_format: ACTIONS tag_name: "$REFERENCE_POINT" spec_name : "AMP-LIVE-LIST [items] item" descriptive_name : "amp-live-list [items] item" diff --git a/extensions/amp-mustache/validator-amp-mustache.protoascii b/extensions/amp-mustache/validator-amp-mustache.protoascii index 470835b36d72..c64acbe80527 100644 --- a/extensions/amp-mustache/validator-amp-mustache.protoascii +++ b/extensions/amp-mustache/validator-amp-mustache.protoascii @@ -36,9 +36,8 @@ tags: { # amp-mustache } tags: { # amp-mustache html_format: AMP4ADS - html_format: ACTIONS tag_name: "SCRIPT" - spec_name: "SCRIPT[custom-template=amp-mustache] (AMP4ADS/ACTIONS)" + spec_name: "SCRIPT[custom-template=amp-mustache] (AMP4ADS)" extension_spec: { name: "amp-mustache" extension_type: CUSTOM_TEMPLATE @@ -67,7 +66,6 @@ tags: { # amp-mustache tags: { html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "SCRIPT" spec_name: "SCRIPT type=text/plain" disallowed_ancestor: "TEMPLATE" @@ -389,7 +387,6 @@ tags: { tags: { html_format: AMP html_format: AMP4ADS - html_format: ACTIONS tag_name: "TEMPLATE" mandatory_ancestor: "BODY" #