Skip to content

Commit

Permalink
Allow amp-access and amp-subscriptions to coexist
Browse files Browse the repository at this point in the history
Although the valdiator error is useful for pushing users to
avoid errors, in practice amp-access and amp-subscriptions
appear to coexist fine. This change is needed to allow
amp-subscriptions users to also use amp-access-scroll to
let Scroll customers avoid ads.
  • Loading branch information
kushal committed Mar 18, 2020
1 parent 04f021a commit cc6910d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
1 change: 0 additions & 1 deletion extensions/amp-access/validator-amp-access.protoascii
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ tags: { # amp-access (json)
mandatory_parent: "HEAD"
requires_extension: "amp-access"
satisfies: "amp-access extension .json script"
excludes: "amp-subscriptions extension .json script"
attrs: {
name: "id"
mandatory: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FAIL
PASS
| <!--
| Copyright 2018 The AMP HTML Authors. All Rights Reserved.
|
Expand Down Expand Up @@ -71,8 +71,4 @@ FAIL
| Dialog for non logged in users
| </template>
| </body>
| </html>
>> ^~~~~~~~~
amp-subscriptions/0.1/test/validator-amp-subscriptions-errors.html:73:6 The tag 'amp-access extension .json script' is present, but is excluded by the presence of 'amp-subscriptions extension .json script'. (see https://amp.dev/documentation/components/amp-access)
>> ^~~~~~~~~
amp-subscriptions/0.1/test/validator-amp-subscriptions-errors.html:73:6 The tag 'amp-subscriptions extension .json script' is present, but is excluded by the presence of 'amp-access extension .json script'. (see https://amp.dev/documentation/components/amp-subscriptions)
| </html>
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ tags: { # amp-subscriptions (json)
unique: true
mandatory_parent: "HEAD"
requires_extension: "amp-subscriptions"
satisfies: "amp-subscriptions extension .json script"
excludes: "amp-access extension .json script"
satisfies: "amp-subscriptions extension .json script"
attrs: {
name: "id"
mandatory: true
Expand Down

0 comments on commit cc6910d

Please sign in to comment.