🚮 [Story bookend] Remove bookend extended code (#34343)

* Started removing bookend * Finished removing bookend from files * Fixed linting * Updated validation tests * Updated validation tests 2 * Removed bookend strings * Disabled bookend and related tests * Removed checks to bookend * Linted * Made bookend an alias of social-share * Removed bookend test since it's not showing * Removed bookend tests * Fixed linting * Cleanup * Fixed linting again * Removed visual tests * Fixed test * Fixed test * Fixed request service tests * Fixed visual tests * Bring back validation tests for bookend
ampproject · May 17, 2021 · 8c42aa4 · 8c42aa4
1 parent e19ff39
commit 8c42aa4
Show file tree

Hide file tree

Showing 159 changed files with 84 additions and 4,130 deletions.
diff --git a/...el-plugin-transform-stringish-literals/test/fixtures/transform/binary-expression/input.js b/...el-plugin-transform-stringish-literals/test/fixtures/transform/binary-expression/input.js
@@ -24,12 +24,12 @@ let numberStart = 1 + `/foo`;
 let stringStart = '1' + `/foo`;
 let numberEnd = `foo/` + 1;
 let stringEnd = `foo/` + '1';
-let illegalCharacterString = `Invalid share providers configuration for in bookend. ` + 'Value must be `true` or a params object.';
+let illegalCharacterString = `Invalid share providers configuration for story. ` + 'Value must be `true` or a params object.';
 let illegalCharacterTemplate = `Invalid ${x}` + 'Value must be `true` or a params object.';
 let illegalEscapeValue = `Invalid ${x}` + '${foo}';
 
 inverted: {
-  let illegalCharacterString = 'Value must be `true` or a params object. ' + `Invalid share providers configuration for in bookend.`;
+  let illegalCharacterString = 'Value must be `true` or a params object. ' + `Invalid share providers configuration for story.`;
   let illegalCharacterTemplate = 'Value must be `true` or a params object. ' + `Invalid ${x}`;
   let illegalEscapeValue = '${foo}' + `Invalid ${x}`;
 }

diff --git a/...l-plugin-transform-stringish-literals/test/fixtures/transform/binary-expression/output.js b/...l-plugin-transform-stringish-literals/test/fixtures/transform/binary-expression/output.js
@@ -22,12 +22,12 @@ let numberStart = "1/foo";
 let stringStart = "1/foo";
 let numberEnd = "foo/1";
 let stringEnd = "foo/1";
-let illegalCharacterString = "Invalid share providers configuration for in bookend. Value must be `true` or a params object.";
+let illegalCharacterString = "Invalid share providers configuration for story. Value must be `true` or a params object.";
 let illegalCharacterTemplate = `Invalid ${x}Value must be \`true\` or a params object.`;
 let illegalEscapeValue = `Invalid ${x}\${foo}`;
 
 inverted: {
-  let illegalCharacterString = "Value must be `true` or a params object. Invalid share providers configuration for in bookend.";
+  let illegalCharacterString = "Value must be `true` or a params object. Invalid share providers configuration for story.";
   let illegalCharacterTemplate = `Value must be \`true\` or a params object. Invalid ${x}`;
   let illegalEscapeValue = `\${foo}Invalid ${x}`;
 }

diff --git a/build-system/compile/bundles.config.extensions.json b/build-system/compile/bundles.config.extensions.json
@@ -511,7 +511,6 @@
     "options": {
       "hasCss": true,
       "cssBinaries": [
-        "amp-story-bookend",
         "amp-story-consent",
         "amp-story-draggable-drawer-header",
         "amp-story-hint",

diff --git a/build-system/test-configs/config.js b/build-system/test-configs/config.js
@@ -428,8 +428,6 @@ const htmlFixtureGlobs = [
   '!examples/visual-tests/amp-story-player/player-local-story.html',
   '!examples/visual-tests/amp-story-player/story-attribution.html',
   '!examples/visual-tests/amp-story/amp-story-360-image.html',
-  '!examples/visual-tests/amp-story/amp-story-bookend.html',
-  '!examples/visual-tests/amp-story/amp-story-bookend.rtl.html',
   '!examples/visual-tests/amp-story/amp-story-bot-rendering.html',
   '!examples/visual-tests/amp-story/amp-story-consent.html',
   '!examples/visual-tests/amp-story/amp-story-consent.rtl.html',

diff --git a/css/Z_INDEX.md b/css/Z_INDEX.md
@@ -48,7 +48,6 @@
 `.i-amphtml-story-button-container` | 100002 | [extensions/amp-story/1.0/pagination-buttons.css](/extensions/amp-story/1.0/pagination-buttons.css)
 `.i-amphtml-ad-overlay-container` | 100001 | [extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-ad-badge.css](/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-ad-badge.css)
 `.i-amphtml-story-ad-progress-background` | 100001 | [extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-progress-bar.css](/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-progress-bar.css)
-`.i-amphtml-story-bookend` | 100001 | [extensions/amp-story/1.0/amp-story-bookend.css](/extensions/amp-story/1.0/amp-story-bookend.css)
 `.i-amphtml-story-info-dialog` | 100001 | [extensions/amp-story/1.0/amp-story-info-dialog.css](/extensions/amp-story/1.0/amp-story-info-dialog.css)
 `.i-amphtml-story-progress-bar` | 100001 | [extensions/amp-story/1.0/amp-story-system-layer.css](/extensions/amp-story/1.0/amp-story-system-layer.css)
 `.i-amphtml-story-focused-state-layer` | 100001 | [extensions/amp-story/1.0/amp-story-tooltip.css](/extensions/amp-story/1.0/amp-story-tooltip.css)
@@ -99,7 +98,6 @@
 `.i-amphtml-story-access-header` | 2 | [extensions/amp-story/1.0/amp-story-access.css](/extensions/amp-story/1.0/amp-story-access.css)
 `.i-amphtml-story-consent-header` | 2 | [extensions/amp-story/1.0/amp-story-consent.css](/extensions/amp-story/1.0/amp-story-consent.css)
 `.i-amphtml-story-hint-container` | 2 | [extensions/amp-story/1.0/amp-story-hint.css](/extensions/amp-story/1.0/amp-story-hint.css)
-`.i-amphtml-story-bookend-active amp-story-page[active]::after` | 2 | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)
 `amp-story-grid-layer` | 2 | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)
 `.controls` | 1 | [css/amp-ima-video-iframe.css](/css/amp-ima-video-iframe.css)
 `.amp-story-player-exit-control-button` | 1 | [css/amp-story-player-iframe.css](/css/amp-story-player-iframe.css)
@@ -137,7 +135,6 @@
 `.i-amphtml-story-consent-actions` | 1 | [extensions/amp-story/1.0/amp-story-consent.css](/extensions/amp-story/1.0/amp-story-consent.css)
 `.i-amphtml-story-draggable-drawer-header` | 1 | [extensions/amp-story/1.0/amp-story-draggable-drawer-header.css](/extensions/amp-story/1.0/amp-story-draggable-drawer-header.css)
 `.i-amphtml-story-hint-container .i-amphtml-story-hint-tap-button-icon` | 1 | [extensions/amp-story/1.0/amp-story-hint.css](/extensions/amp-story/1.0/amp-story-hint.css)
-`.i-amphtml-story-bookend-active.i-amphtml-story-system-layer` | 1 | [extensions/amp-story/1.0/amp-story-system-layer.css](/extensions/amp-story/1.0/amp-story-system-layer.css)
 `.i-amphtml-expanded-mode .i-amphtml-embedded-component.i-amphtml-expanded-component` | 1 | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)
 `amp-story-page[active]` | 1 | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)
 `.i-amphtml-stream-gallery-next` | 1 | [extensions/amp-stream-gallery/0.1/arrows.css](/extensions/amp-stream-gallery/0.1/arrows.css)

diff --git a/examples/amp-story/ad-development.html b/examples/amp-story/ad-development.html
@@ -143,9 +143,6 @@ <h1>fifteen Page</h1>
           <h1>sixteen Page</h1>
         </amp-story-grid-layer>
       </amp-story-page>
-
-      <amp-story-bookend src="../../examples/amp-story/bookendv1.json" layout="nodisplay">
-      </amp-story-bookend>
     </amp-story>
   </body>
 </html>
diff --git a/examples/amp-story/amp-story-animation.html b/examples/amp-story/amp-story-animation.html
@@ -117,11 +117,6 @@
           </script>
         </amp-story-animation>
       </amp-story-page>
-
-      <amp-story-bookend
-        src="bookendv1.json"
-        layout="nodisplay"
-      ></amp-story-bookend>
     </amp-story>
   </body>
 </html>
diff --git a/examples/amp-story/amp-story-branching.html b/examples/amp-story/amp-story-branching.html
@@ -46,7 +46,7 @@
                   "endpoint": "https://raw.githubusercontent.com/ampproject/amphtml/main/examples/img/ampicon.png",
                   "base": "${endpoint}?${type|default:foo}&path=${canonicalPath}",
                   "pageView": "${base}?&index=${storyPageIndex}&count=${storyPageCount}&id=${storyPageId}&muted=${storyIsMuted}&progress=${storyProgress}",
-                  "click": "${base}?&index=${storyPageIndex}&id=${storyPageId}&bookendTargetHref=${storyBookendTargetHref}&bookendCardType=${storyBookendComponentType}&bookendCardPosition=${storyBookendComponentPosition}"
+                  "click": "${base}?&index=${storyPageIndex}&id=${storyPageId}"
                 },
                 "triggers": {
                   "trackSideBarOpen": {

diff --git a/examples/amp-story/ampconf.html b/examples/amp-story/ampconf.html
@@ -298,9 +298,6 @@ <h1 grid-area="middle-third" class="bold">Join the worldwide AMP Roadshow</h1>
           </a>
         </amp-story-cta-layer>
       </amp-story-page>
-
-      <amp-story-bookend src="./bookendv1.json" layout="nodisplay">
-      </amp-story-bookend>
     </amp-story>
   </body>
 </html>
diff --git a/examples/amp-story/analytics.html b/examples/amp-story/analytics.html
@@ -43,7 +43,7 @@
               "endpoint": "https://raw.githubusercontent.com/ampproject/amphtml/main/examples/img/ampicon.png",
               "base": "${endpoint}?${type|default:foo}&path=${canonicalPath}",
               "pageView": "${base}?&index=${storyPageIndex}&count=${storyPageCount}&id=${storyPageId}&muted=${storyIsMuted}&progress=${storyProgress}",
-              "click": "${base}?&index=${storyPageIndex}&id=${storyPageId}&bookendTargetHref=${storyBookendTargetHref}&bookendCardType=${storyBookendComponentType}&bookendCardPosition=${storyBookendComponentPosition}"
+              "click": "${base}?&index=${storyPageIndex}&id=${storyPageId}"
             },
             "triggers": {
               "trackAnchorClicks": {
@@ -54,13 +54,6 @@
                   "eventId": "clickOnAnyAnchor"
                 }
               },
-              "trackBookendClicks": {
-                "on": "story-bookend-click",
-                "request": "click",
-                "vars": {
-                  "eventId": "clickOnBookend"
-                }
-              },
               "trackPageAttachmentOpen": {
                 "on": "story-open",
                 "tagName": "amp-story-page-attachment",
@@ -88,16 +81,6 @@
                   "repeat": false
                 }
               },
-              "trackBookendEnter": {
-                "on": "story-open",
-                "tagName": "amp-story-bookend",
-                "request": "pageView"
-              },
-              "trackBookendExit": {
-                "on": "story-close",
-                "tagName": "amp-story-bookend",
-                "request": "pageView"
-              },
               "trackAudioEnable": {
                 "on": "story-audio-muted",
                 "request": "pageView"
@@ -192,9 +175,6 @@ <h1>Page Five</h1>
           </amp-video>
         </amp-story-grid-layer>
       </amp-story-page>
-
-      <amp-story-bookend src="bookendv1.json" layout="nodisplay">
-      </amp-story-bookend>
     </amp-story>
   </body>
 </html>
diff --git a/examples/amp-story/attachment.html b/examples/amp-story/attachment.html
@@ -343,62 +343,20 @@
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-bookend layout="nodisplay">
+      <amp-story-social-share layout="nodisplay">
         <script type="application/json">
           {
-            "bookendVersion": "v1.0",
             "shareProviders": [
               "email",
               {"provider": "facebook", "app_id": "254325784911610"},
               {"provider": "twitter", "text": "This is custom share text that I would like for the Twitter platform"},
               "whatsapp",
               "pinterest",
               "line"
-            ],
-            "components": [
-              {
-                "type": "heading",
-                "text": "test"
-              },
-              {
-                "type": "small",
-                "title": "This is an example article",
-                "url": "/article.html",
-                "image": "http://placehold.it/500x600"
-              },
-              {
-                "type": "small",
-                "title": "This is an example article2",
-                "url": "http://example.com/article.html",
-                "image": "http://placehold.it/256x128"
-              },
-              {
-                "type": "small",
-                "title": "This is an example article3",
-                "url": "http://example.com/article.html",
-                "image": "http://placehold.it/256x128"
-              },
-              {
-                "type": "heading",
-                "text": "test2"
-              },
-              {
-                "type": "small",
-                "title": "This is an example article",
-                "url": "http://example.com/article.html",
-                "image": "http://placehold.it/256x128"
-              },
-              {
-                "type": "portrait",
-                "title": "Heading for portrait",
-                "category": "This is an example portrait",
-                "url": "http://example.com/article.html",
-                "image": "http://placehold.it/350x470"
-              }
             ]
           }
         </script>
-      </amp-story-bookend>
+      </amp-story-social-share>
     </amp-story>
   </body>
 </html>
diff --git a/examples/amp-story/auto-analytics.html b/examples/amp-story/auto-analytics.html
@@ -109,9 +109,6 @@ <h1>Page Five</h1>
           </amp-video>
         </amp-story-grid-layer>
       </amp-story-page>
-
-      <amp-story-bookend src="bookendv1.json" layout="nodisplay">
-      </amp-story-bookend>
     </amp-story>
   </body>
 </html>
diff --git a/examples/amp-story/bookend.html b/examples/amp-story/bookend.html
diff --git a/examples/amp-story/bookend.json b/examples/amp-story/bookend.json
diff --git a/examples/amp-story/bookendv1.html b/examples/amp-story/bookendv1.html