From 8029e23ffec0ccb9d26d1ace62bd194261129fca Mon Sep 17 00:00:00 2001
From: Jake Spurlock <whyisjake@git.wordpress.org>
Date: Wed, 18 Sep 2019 17:40:35 +0000
Subject: [PATCH] Accessibility: Replace wp-a11y.js with @wordpress/a11y
 package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We've extracted wp-includes/wp-a11y.js to a reusable package wordpress/a11y which is published on NPM. Let's make sure this package is also used in WordPress core. Once all the JavaScript is built using webpack, we can also import this package wherever it is used and configure webpack to load is an external.

Props omarreiss, herregroen, desrosj, ocean90, afercia, sstoqnov



git-svn-id: https://develop.svn.wordpress.org/trunk@46167 602fd350-edb4-49c9-b593-d223f7449a82
---
 Gruntfile.js                                 |  2 --
 src/wp-admin/includes/update-core.php        |  3 +++
 tests/phpunit/tests/dependencies/scripts.php | 10 ++++++----
 tests/qunit/index.html                       |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 829a4c5d11..6948a6098d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -303,7 +303,6 @@ module.exports = function(grunt) {
 					[ WORKING_DIR + 'wp-includes/js/quicktags.js' ]: [ './src/js/_enqueues/lib/quicktags.js' ],
 					[ WORKING_DIR + 'wp-includes/js/shortcode.js' ]: [ './src/js/_enqueues/wp/shortcode.js' ],
 					[ WORKING_DIR + 'wp-includes/js/utils.js' ]: [ './src/js/_enqueues/lib/cookies.js' ],
-					[ WORKING_DIR + 'wp-includes/js/wp-a11y.js' ]: [ './src/js/_enqueues/wp/a11y.js' ],
 					[ WORKING_DIR + 'wp-includes/js/wp-ajax-response.js' ]: [ './src/js/_enqueues/lib/ajax-response.js' ],
 					[ WORKING_DIR + 'wp-includes/js/wp-api.js' ]: [ './src/js/_enqueues/wp/api.js' ],
 					[ WORKING_DIR + 'wp-includes/js/wp-auth-check.js' ]: [ './src/js/_enqueues/lib/auth-check.js' ],
@@ -846,7 +845,6 @@ module.exports = function(grunt) {
 					'src/wp-includes/js/quicktags.js': 'src/js/_enqueues/lib/quicktags.js',
 					'src/wp-includes/js/shortcode.js': 'src/js/_enqueues/wp/shortcode.js',
 					'src/wp-includes/js/utils.js': 'src/js/_enqueues/lib/cookies.js',
-					'src/wp-includes/js/wp-a11y.js': 'src/js/_enqueues/wp/a11y.js',
 					'src/wp-includes/js/wp-ajax-response.js': 'src/js/_enqueues/lib/ajax-response.js',
 					'src/wp-includes/js/wp-api.js': 'src/js/_enqueues/wp/api.js',
 					'src/wp-includes/js/wp-auth-check.js': 'src/js/_enqueues/lib/auth-check.js',
diff --git a/src/wp-admin/includes/update-core.php b/src/wp-admin/includes/update-core.php
index d031a901e0..e0ac9450ef 100644
--- a/src/wp-admin/includes/update-core.php
+++ b/src/wp-admin/includes/update-core.php
@@ -786,6 +786,9 @@ $_old_files = array(
 	// 5.1
 	'wp-includes/random_compat/random_bytes_openssl.php',
 	'wp-includes/js/tinymce/wp-tinymce.js.gz',
+	// 5.3
+	'wp-includes/js/wp-a11y.js', // Moved to: wp-includes/js/dist/a11y.js
+	'wp-includes/js/wp-a11y.min.js', // Moved to: wp-includes/js/dist/a11y.min.js
 );
 
 /**
diff --git a/tests/phpunit/tests/dependencies/scripts.php b/tests/phpunit/tests/dependencies/scripts.php
index d55b41b01b..e077398d6e 100644
--- a/tests/phpunit/tests/dependencies/scripts.php
+++ b/tests/phpunit/tests/dependencies/scripts.php
@@ -734,12 +734,12 @@ JS;
 		global $wp_scripts;
 
 		wp_default_scripts( $wp_scripts );
+		wp_default_packages( $wp_scripts );
 
 		$wp_scripts->base_url  = '';
 		$wp_scripts->do_concat = true;
 
-		$expected_tail  = "<![endif]-->\n";
-		$expected_tail .= "<script type='text/javascript' src='/customize-dependency.js'></script>\n";
+		$expected_tail = "<script type='text/javascript' src='/customize-dependency.js'></script>\n";
 		$expected_tail .= "<script type='text/javascript'>\n";
 		$expected_tail .= "tryCustomizeDependency()\n";
 		$expected_tail .= "</script>\n";
@@ -748,10 +748,12 @@ JS;
 		wp_enqueue_script( $handle, '/customize-dependency.js', array( 'customize-controls' ), null );
 		wp_add_inline_script( $handle, 'tryCustomizeDependency()' );
 
+		// Open a buffer to get the output of `wp_print_scripts`.
+		ob_start();
 		wp_print_scripts();
-		$print_scripts = get_echo( '_print_scripts' );
+		$print_scripts = ob_get_clean();
 
-		$tail = substr( $print_scripts, strrpos( $print_scripts, '<![endif]-->' ) );
+		$tail = substr( $print_scripts, strrpos( $print_scripts, "<script type='text/javascript' src='/customize-dependency.js'>" ) );
 		$this->assertEquals( $expected_tail, $tail );
 	}
 
diff --git a/tests/qunit/index.html b/tests/qunit/index.html
index 2f2ad59b39..460a67be53 100644
--- a/tests/qunit/index.html
+++ b/tests/qunit/index.html
@@ -24,7 +24,7 @@
 			};
 		</script>
 		<script src="../../build/wp-includes/js/wp-util.js"></script>
-		<script src="../../build/wp-includes/js/wp-a11y.js"></script>
+		<script src="../../build/wp-includes/js/dist/a11y.js"></script>
 		<script>
 			window._wpMediaModelsL10n = {"settings":{"ajaxurl":"\/wp-admin\/admin-ajax.php","post":{"id":0}}};
 		</script>