Remove extraneous amp_enable_esm filter

Author: westonruter

includes/class-amp-theme-support.php

@@ -1388,7 +1388,7 @@ public static function filter_admin_bar_script_loader_tag( $tag, $handle ) {
 	 */
 	public static function ensure_required_markup( Document $dom, $script_handles = [] ) {
 		// Gather all links.
-		$links         = [
+		$links = [
 			Attribute::REL_PRECONNECT => [
 				// Include preconnect link for AMP CDN for browsers that don't support preload.
 				AMP_DOM_Utils::create_node(
@@ -1403,6 +1403,7 @@ public static function ensure_required_markup( Document $dom, $script_handles =
 		];
 
 		$link_elements = $dom->head->getElementsByTagName( Tag::LINK );
+
 		/**
 		 * Link element.
 		 *
@@ -2079,10 +2080,6 @@ private static function get_optimizer( $args ) {
 	private static function get_optimizer_configuration( $args ) {
 		$transformers = Optimizer\Configuration::DEFAULT_TRANSFORMERS;
 
-		$enable_esm = array_key_exists( ConfigurationArgument::ENABLE_ESM, $args )
-				? $args[ ConfigurationArgument::ENABLE_ESM ]
-				: true;
-
 		$enable_ssr = array_key_exists( ConfigurationArgument::ENABLE_SSR, $args )
 			? $args[ ConfigurationArgument::ENABLE_SSR ]
 			: true;
@@ -2096,15 +2093,6 @@ private static function get_optimizer_configuration( $args ) {
 		 */
 		$enable_ssr = apply_filters( 'amp_enable_ssr', $enable_ssr );
 
-		/**
-		 * Filter whether the AMP Optimizer should use ES modules for the runtime and extensions.
-		 *
-		 * @since 2.1.0
-		 *
-		 * @param bool $enable_esm Whether the AMP Optimizer should use ES modules for the runtime and extensions.
-		 */
-		$enable_esm = apply_filters( 'amp_enable_esm', $enable_esm );
-
 		// In debugging mode, we don't use server-side rendering, as it further obfuscates the HTML markup.
 		if ( ! $enable_ssr ) {
 			$transformers = array_diff(
@@ -2135,9 +2123,6 @@ private static function get_optimizer_configuration( $args ) {
 					Optimizer\Transformer\PreloadHeroImage::class => [
 						Optimizer\Configuration\PreloadHeroImageConfiguration::INLINE_STYLE_BACKUP_ATTRIBUTE => 'data-amp-original-style',
 					],
-					Optimizer\Transformer\RewriteAmpUrls::class => [
-						Optimizer\Configuration\RewriteAmpUrlsConfiguration::ESM_MODULES_ENABLED => $enable_esm,
-					],
 				],
 				$args
 			)