Add AMP v0.js during post-processing instead of wp_head action

ampproject · Aug 22, 2019 · 5fff2fa · 5fff2fa
1 parent c1f14c1
commit 5fff2fa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/includes/class-amp-story-post-type.php b/includes/class-amp-story-post-type.php
@@ -213,9 +213,6 @@ function() {
 		add_action(
 			'amp_story_head',
 			function() {
-				// @todo Temporary until sanitizer automatically supplies runtime.
-				wp_scripts()->do_items( [ 'amp-runtime' ] ); // @todo Duplicate with AMP_Theme_Support::enqueue_assets().
-
 				wp_styles()->do_items();
 			}
 		);

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
@@ -1646,8 +1646,12 @@ public static function ensure_required_markup( DOMDocument $dom, $script_handles
 
 		// "5. Load the AMP runtime."
 		if ( isset( $amp_scripts['amp-runtime'] ) ) {
-			// @todo What if not present?
 			$ordered_scripts['amp-runtime'] = $amp_scripts['amp-runtime'];
+		} else {
+			$script = $dom->createElement( 'script' );
+			$script->setAttribute( 'async', '' );
+			$script->setAttribute( 'src', $runtime_src );
+			$ordered_scripts['amp-runtime'] = $script;
 		}
 
 		/*
@@ -2337,8 +2341,6 @@ public static function whitelist_layout_in_wp_kses_allowed_html( $context ) {
 	 * @return void
 	 */
 	public static function enqueue_assets() {
-		wp_enqueue_script( 'amp-runtime' );
-
 		// Enqueue default styles expected by sanitizer.
 		wp_enqueue_style( 'amp-default', amp_get_asset_url( 'css/amp-default.css' ), [], AMP__VERSION );
 		wp_styles()->add_data( 'amp-default', 'rtl', 'replace' );

diff --git a/tests/php/test-class-amp-theme-support.php b/tests/php/test-class-amp-theme-support.php
@@ -1903,12 +1903,9 @@ static function( $url ) use ( &$redirects ) {
 	 * @covers AMP_Theme_Support::enqueue_assets()
 	 */
 	public function test_enqueue_assets() {
-		$script_slug = 'amp-runtime';
 		$style_slug  = 'amp-default';
-		wp_dequeue_script( $script_slug );
 		wp_dequeue_style( $style_slug );
 		AMP_Theme_Support::enqueue_assets();
-		$this->assertContains( $script_slug, wp_scripts()->queue );
 		$this->assertContains( $style_slug, wp_styles()->queue );
 	}