More fixes

ampproject · Apr 25, 2019 · 59797b1 · 59797b1
1 parent 3bea9b1
commit 59797b1
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/assets/src/block-editor/amp-block-validation.js b/assets/src/block-editor/amp-block-validation.js
@@ -5,9 +5,8 @@
  * If one exists for a block, it display it inline with a Notice component.
  */
 
-/* exported ampBlockValidation */
 /* global wp, _ */
-const ampBlockValidation = ( function() { // eslint-disable-line no-unused-vars
+window.ampBlockValidation = ( function() { // eslint-disable-line no-unused-vars
 	'use strict';
 
 	const module = {

diff --git a/assets/src/block-editor/amp-editor-blocks.js b/assets/src/block-editor/amp-editor-blocks.js
@@ -1,8 +1,7 @@
 /* global _ */
-/* exported ampEditorBlocks */
 /* eslint no-magic-numbers: [ "error", { "ignore": [ 1, -1, 0, 4 ] } ] */
 
-const ampEditorBlocks = ( function() {
+window.ampEditorBlocks = ( function() {
 	const __ = wp.i18n.__;
 	const _x = wp.i18n._x;
 

diff --git a/assets/src/classic-editor/amp-post-meta-box.js b/assets/src/classic-editor/amp-post-meta-box.js
@@ -1,13 +1,11 @@
-/* exported ampPostMetaBox */
-
 /**
  * AMP Post Meta Box.
  *
  * @todo Rename this to be just the ampEditPostScreen?
  *
  * @since 0.6
  */
-const ampPostMetaBox = ( function( $ ) { // eslint-disable-line no-unused-vars
+window.ampPostMetaBox = ( function( $ ) { // eslint-disable-line no-unused-vars
 	'use strict';
 
 	const component = {

diff --git a/includes/admin/class-amp-editor-blocks.php b/includes/admin/class-amp-editor-blocks.php
@@ -138,7 +138,7 @@ public function enqueue_block_editor_assets() {
 			// phpcs:ignore WordPress.WP.EnqueuedResourceParameters.NotInFooter
 			wp_enqueue_script(
 				'amp-editor-blocks',
-				amp_get_asset_url( 'js/amp-blocks.js' ),
+				amp_get_asset_url( 'js/amp-editor-blocks.js' ),
 				array( 'wp-editor', 'wp-blocks', 'lodash', 'wp-i18n', 'wp-element', 'wp-components' ),
 				AMP__VERSION
 			);

diff --git a/webpack.config.js b/webpack.config.js
@@ -113,7 +113,6 @@ const blockEditor = {
 		{
 			// Make localized data importable.
 			'amp-block-editor-data': 'wpAmpEditor',
-			'amp-stories-fonts': 'ampStoriesFonts',
 		},
 	],
 	entry: {