Merge pull request #1781 from ampproject/remove/redundant-dependencie…

…s-1.0 Prevent re-bundling WordPress packages
ampproject · Jan 3, 2019 · c96e3cd · c96e3cd
2 parents 4ad849f + 8e2090e
commit c96e3cd
Show file tree

Hide file tree

Showing 15 changed files with 86 additions and 73 deletions.
diff --git a/.dev-lib b/.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..."

diff --git a/.jshintignore b/.jshintignore
diff --git a/.jshintrc b/.jshintrc
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,5 +1,4 @@
 /* eslint-env node */
-/* jshint node:true */
 /* eslint-disable camelcase, no-console, no-param-reassign */
 
 module.exports = function( grunt ) {

diff --git a/assets/js/wp-dom-ready.js b/assets/js/wp-dom-ready.js
@@ -0,0 +1,7 @@
+import domReady from '@wordpress/dom-ready';
+
+if ( ! window.wp ) {
+	window.wp = {};
+}
+
+wp.domReady = domReady;
diff --git a/assets/js/wp-i18n.js b/assets/js/wp-i18n.js
@@ -0,0 +1,7 @@
+import * as i18n from '@wordpress/i18n';
+
+if ( ! window.wp ) {
+	window.wp = {};
+}
+
+wp.i18n = i18n;
diff --git a/assets/src/amp-validation-detail-toggle.js b/assets/src/amp-validation-detail-toggle.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( {

diff --git a/assets/src/amp-validation-single-error-url-details.js b/assets/src/amp-validation-single-error-url-details.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();
 } );
diff --git a/assets/src/amp-validation-tooltips.js b/assets/src/amp-validation-tooltips.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 );
diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
@@ -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';

diff --git a/includes/validation/class-amp-validated-url-post-type.php b/includes/validation/class-amp-validated-url-post-type.php
@@ -276,7 +276,7 @@ public static function enqueue_post_list_screen_scripts() {
 		wp_enqueue_script(
 			'amp-validation-detail-toggle',
 			amp_get_asset_url( 'js/amp-validation-detail-toggle-compiled.js' ),
-			array( 'amp-validation-tooltips' ),
+			array( 'wp-dom-ready', 'amp-validation-tooltips' ),
 			AMP__VERSION,
 			true
 		);

diff --git a/includes/validation/class-amp-validation-error-taxonomy.php b/includes/validation/class-amp-validation-error-taxonomy.php
@@ -852,7 +852,7 @@ public static function add_admin_hooks() {
 				wp_enqueue_script(
 					'amp-validation-detail-toggle',
 					amp_get_asset_url( 'js/amp-validation-detail-toggle-compiled.js' ),
-					array( 'amp-validation-tooltips' ),
+					array( 'wp-dom-ready', 'amp-validation-tooltips' ),
 					AMP__VERSION,
 					true
 				);
@@ -878,7 +878,7 @@ public static function add_admin_hooks() {
 				wp_enqueue_script(
 					'amp-validation-single-error-url-details',
 					amp_get_asset_url( 'js/amp-validation-single-error-url-details-compiled.js' ),
-					array(),
+					array( 'wp-dom-ready' ),
 					AMP__VERSION,
 					true
 				);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,7 +9,8 @@
  "license": "GPL-2.0+",
  "private": true,
  "devDependencies": {
-  "@wordpress/i18n": "^1.1.0",
+  "@wordpress/dom-ready": "2.0.2",
+  "@wordpress/i18n": "1.2.3",
   "babel-core": "^6.25.0",
   "babel-loader": "^7.1.1",
   "babel-plugin-transform-object-rest-spread": "^6.26.0",
@@ -33,8 +34,5 @@
   "build": "grunt build && grunt create-build-zip",
   "deploy": "grunt deploy",
   "dev": "cross-env BABEL_ENV=default webpack --watch"
- },
- "dependencies": {
-  "@wordpress/dom-ready": "^2.0.0"
  }
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -5,6 +5,8 @@ const path = require( 'path' );
 module.exports = {
 	entry: {
 		'./assets/js/amp-blocks-compiled': './blocks/index.js',
+		'./assets/js/wp-i18n-compiled': './assets/js/wp-i18n',
+		'./assets/js/wp-dom-ready-compiled': './assets/js/wp-dom-ready',
 		'./assets/js/amp-block-editor-toggle-compiled': './assets/src/amp-block-editor-toggle',
 		'./assets/js/amp-validation-detail-toggle-compiled': './assets/src/amp-validation-detail-toggle',
 		'./assets/js/amp-validation-tooltips-compiled': './assets/src/amp-validation-tooltips',