Merge pull request #1781 from ampproject/remove/redundant-dependencies-1.0

Prevent re-bundling WordPress packages

Author: westonruter

.dev-lib

@@ -4,6 +4,7 @@ ASSETS_DIR=wp-assets
 PROJECT_SLUG=amp
 SKIP_ECHO_PATHS_SCOPE=1
 README_MD_TITLE="AMP Plugin for WordPress"
+DEV_LIB_SKIP="$DEV_LIB_SKIP,jshint"
 
 function after_wp_install {
     echo "Installing plugins..."

.jshintignore

@@ -1,5 +1,4 @@
 /* eslint-env node */
-/* jshint node:true */
 /* eslint-disable camelcase, no-console, no-param-reassign */
 
 module.exports = function( grunt ) {

.jshintrc

@@ -0,0 +1,7 @@
+import domReady from '@wordpress/dom-ready';
+
+if ( ! window.wp ) {
+	window.wp = {};
+}
+
+wp.domReady = domReady;

Gruntfile.js

@@ -0,0 +1,7 @@
+import * as i18n from '@wordpress/i18n';
+
+if ( ! window.wp ) {
+	window.wp = {};
+}
+
+wp.i18n = i18n;

assets/js/wp-dom-ready.js

@@ -1,8 +1,3 @@
-/**
- * WordPress dependencies
- */
-import domReady from '@wordpress/dom-ready';
-
 /**
  * Localized data
  */
@@ -79,7 +74,7 @@ function addTermListTableRowClasses() {
 	} );
 }
 
-domReady( () => {
+wp.domReady( () => {
 	addToggleButtons( 'th.column-details.manage-column', detailToggleBtnAriaLabel )
 		.forEach( ( btn ) => {
 			addToggleAllListener( {

assets/js/wp-i18n.js

@@ -1,8 +1,3 @@
-/**
- * WordPress dependencies
- */
-import domReady from '@wordpress/dom-ready';
-
 /**
  * Toggles the contents of a details element as an additional table tr.
  */
@@ -154,6 +149,6 @@ class ErrorRows {
 	}
 }
 
-domReady( () => {
+wp.domReady( () => {
 	new ErrorRows().init();
 } );

assets/src/amp-validation-detail-toggle.js

@@ -1,8 +1,3 @@
-/**
- * WordPress dependencies
- */
-import domReady from '@wordpress/dom-ready';
-
 // WIP Pointer function
 function sourcesPointer() {
 	jQuery( document ).on( 'click', '.tooltip-button', function() {
@@ -17,6 +12,5 @@ function sourcesPointer() {
 	} );
 }
 
-domReady( () => {
-	sourcesPointer();
-} );
+// Run at DOM ready.
+jQuery( sourcesPointer );

assets/src/amp-validation-single-error-url-details.js

@@ -333,6 +333,16 @@ function amp_add_generator_metadata() {
  * @param WP_Scripts $wp_scripts Scripts.
  */
 function amp_register_default_scripts( $wp_scripts ) {
+	/*
+	 * Polyfill dependencies that are registered in Gutenberg and WordPress 5.0.
+	 * Note that Gutenberg will override these at wp_enqueue_scripts if it is active.
+	 */
+	$handles = array( 'wp-i18n', 'wp-dom-ready' );
+	foreach ( $handles as $handle ) {
+		if ( ! isset( $wp_scripts->registered[ $handle ] ) ) {
+			$wp_scripts->add( $handle, amp_get_asset_url( sprintf( 'js/%s-compiled.js', $handle ) ) );
+		}
+	}
 
 	// AMP Runtime.
 	$handle = 'amp-runtime';