update dependencies, rename BentoVideoBaseElement

ampproject · Jan 11, 2022 · b2aeac3 · b2aeac3
1 parent 267b65a
commit b2aeac3
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 21 deletions.
diff --git a/build-system/test-configs/dep-check-config.js b/build-system/test-configs/dep-check-config.js
@@ -223,8 +223,9 @@ exports.rules = [
       'extensions/amp-facebook-page/0.1/amp-facebook-page.js->extensions/amp-facebook/0.1/facebook-loader.js',
       'extensions/amp-facebook-comments/0.1/amp-facebook-comments.js->extensions/amp-facebook/0.1/facebook-loader.js',
 
-      // VideoBaseElement, VideoIframe and VideoWrapper are meant to be shared.
+      // AmpVideoBaseElement, BentoVideoBaseElement, VideoIframe and VideoWrapper are meant to be shared.
       'extensions/**->extensions/amp-video/1.0/video-base-element.js',
+      'extensions/**->extensions/amp-video/1.0/base-element.js',
       'extensions/**->extensions/amp-video/1.0/video-iframe.js',
 
       // <amp-video-iframe> versions share this message API definition.

diff --git a/extensions/amp-brightcove/1.0/base-element.js b/extensions/amp-brightcove/1.0/base-element.js
@@ -1,8 +1,8 @@
 import {BentoBrightcove} from './component';
-import {BaseElement as BentoVideo} from '../../amp-video/1.0/base-element';
+import {BentoVideoBaseElement} from '../../amp-video/1.0/base-element';
 import {createParseAttrsWithPrefix} from '#preact/parse-props';
 
-export class BaseElement extends BentoVideo {}
+export class BaseElement extends BentoVideoBaseElement {}
 
 /** @override */
 BaseElement['Component'] = BentoBrightcove;

diff --git a/extensions/amp-jwplayer/1.0/base-element.js b/extensions/amp-jwplayer/1.0/base-element.js
@@ -5,9 +5,9 @@ import {createParseAttrsWithPrefix} from '#preact/parse-props';
 
 import {BentoJwplayer} from './component';
 
-import {BaseElement as BentoVideo} from '../../amp-video/1.0/base-element';
+import {BentoVideoBaseElement} from '../../amp-video/1.0/base-element';
 
-export class BaseElement extends BentoVideo {
+export class BaseElement extends BentoVideoBaseElement {
   /** @override */
   init() {
     super.init();

diff --git a/extensions/amp-video-iframe/1.0/base-element.js b/extensions/amp-video-iframe/1.0/base-element.js
@@ -1,8 +1,8 @@
 import {BentoVideoIframe} from './component';
 
-import {BaseElement as BentoVideo} from '../../amp-video/1.0/base-element';
+import {BentoVideoBaseElement} from '../../amp-video/1.0/base-element';
 
-export class BaseElement extends BentoVideo {}
+export class BaseElement extends BentoVideoBaseElement {}
 
 /** @override */
 BaseElement['Component'] = BentoVideoIframe;

diff --git a/extensions/amp-video/1.0/base-element.js b/extensions/amp-video/1.0/base-element.js
@@ -3,16 +3,18 @@ import {CSS as CSS_AUTOPLAY} from './autoplay.jss';
 import {PreactBaseElement} from '#preact/base-element';
 import {BentoVideo} from './component';
 
-export class BaseElement extends PreactBaseElement {}
+export class BentoVideoBaseElement extends PreactBaseElement {}
+// export with alias for bento builds
+export {BentoVideoBaseElement as BaseElement};
 
 /** @override */
-BaseElement['Component'] = BentoVideo;
+BentoVideoBaseElement['Component'] = BentoVideo;
 
 /** @override */
-BaseElement['loadable'] = true;
+BentoVideoBaseElement['loadable'] = true;
 
 /** @override */
-BaseElement['layoutSizeDefined'] = true;
+BentoVideoBaseElement['layoutSizeDefined'] = true;
 
 /**
  * Defaults to `{component: 'video'}` from `BentoVideo` component.
@@ -24,10 +26,10 @@ BaseElement['layoutSizeDefined'] = true;
  * ```
  * @override
  */
-BaseElement['staticProps'];
+BentoVideoBaseElement['staticProps'];
 
 /** @override */
-BaseElement['props'] = {
+BentoVideoBaseElement['props'] = {
   'album': {attr: 'album'},
   'alt': {attr: 'alt'},
   'artist': {attr: 'artist'},
@@ -59,7 +61,7 @@ BaseElement['props'] = {
 };
 
 /** @override */
-BaseElement['shadowCss'] = CSS + CSS_AUTOPLAY;
+BentoVideoBaseElement['shadowCss'] = CSS + CSS_AUTOPLAY;
 
 /** @override */
-BaseElement['usesShadowDom'] = true;
+BentoVideoBaseElement['usesShadowDom'] = true;
diff --git a/extensions/amp-video/1.0/video-base-element.js b/extensions/amp-video/1.0/video-base-element.js
@@ -1,10 +1,10 @@
 import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
-import {BaseElement as BentoVideo} from './base-element';
+import {BentoVideoBaseElement} from './base-element';
 
 /** @extends {PreactBaseElement<VideoWrapperDef.Api>} */
 export class AmpVideoBaseElement extends setSuperClass(
-  BentoVideo,
+  BentoVideoBaseElement,
   AmpPreactBaseElement
 ) {
   /** @override */

diff --git a/extensions/amp-vimeo/1.0/base-element.js b/extensions/amp-vimeo/1.0/base-element.js
@@ -1,8 +1,8 @@
 import {BentoVimeo} from './component';
 
-import {BaseElement as BentoVideo} from '../../amp-video/1.0/base-element';
+import {BentoVideoBaseElement} from '../../amp-video/1.0/base-element';
 
-export class BaseElement extends BentoVideo {}
+export class BaseElement extends BentoVideoBaseElement {}
 
 /** @override */
 BaseElement['Component'] = BentoVimeo;

diff --git a/extensions/amp-youtube/1.0/base-element.js b/extensions/amp-youtube/1.0/base-element.js
@@ -2,9 +2,9 @@ import {createParseAttrsWithPrefix} from '#preact/parse-props';
 
 import {BentoYoutube} from './component';
 
-import {BaseElement as BentoVideo} from '../../amp-video/1.0/base-element';
+import {BentoVideoBaseElement} from '../../amp-video/1.0/base-element';
 
-export class BaseElement extends BentoVideo {}
+export class BaseElement extends BentoVideoBaseElement {}
 
 /** @override */
 BaseElement['Component'] = BentoYoutube;