From e099cd61ad8350c4aff6f38a86a4653f3c3c7fc3 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 14 Jun 2021 14:37:11 -0400
Subject: [PATCH] Replace deprecated `@babel/polyfill` with
 `@wordpress/babel-preset-default/build/polyfill`

See https://github.com/WordPress/gutenberg/pull/31279
See https://github.com/WordPress/wordpress-develop/pull/1361
---
 assets/src/polyfills/wp-polyfill.js |  4 ++--
 package-lock.json                   | 26 +++++---------------------
 package.json                        |  1 -
 webpack.config.js                   |  9 ++++-----
 4 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/assets/src/polyfills/wp-polyfill.js b/assets/src/polyfills/wp-polyfill.js
index fbac6e1cb99..e5205de476a 100644
--- a/assets/src/polyfills/wp-polyfill.js
+++ b/assets/src/polyfills/wp-polyfill.js
@@ -1,6 +1,6 @@
 /**
- * External dependencies
+ * WordPress dependencies
  */
-import * as polyfill from '@babel/polyfill';
+import * as polyfill from '@wordpress/babel-preset-default/build/polyfill';
 
 export default polyfill;
diff --git a/package-lock.json b/package-lock.json
index 296bd520769..28271a1029b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,9 +4,9 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "amp-wp",
       "license": "GPL-2.0-or-later",
       "dependencies": {
-        "@babel/polyfill": "7.12.1",
         "@wordpress/api-fetch": "5.1.1",
         "@wordpress/autop": "3.1.1",
         "@wordpress/components": "14.1.2",
@@ -1117,15 +1117,6 @@
         "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
-    "node_modules/@babel/polyfill": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz",
-      "integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==",
-      "dependencies": {
-        "core-js": "^2.6.5",
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
     "node_modules/@babel/preset-env": {
       "version": "7.13.12",
       "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.12.tgz",
@@ -8376,7 +8367,8 @@
     "node_modules/core-js": {
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "dev": true
     },
     "node_modules/core-js-compat": {
       "version": "3.9.1",
@@ -32367,15 +32359,6 @@
         "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
-    "@babel/polyfill": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz",
-      "integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==",
-      "requires": {
-        "core-js": "^2.6.5",
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
     "@babel/preset-env": {
       "version": "7.13.12",
       "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.12.tgz",
@@ -38487,7 +38470,8 @@
     "core-js": {
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "dev": true
     },
     "core-js-compat": {
       "version": "3.9.1",
diff --git a/package.json b/package.json
index c2861dc64da..a71d1cd2e08 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,6 @@
     "npm": ">= 7"
   },
   "dependencies": {
-    "@babel/polyfill": "7.12.1",
     "@wordpress/api-fetch": "5.1.1",
     "@wordpress/autop": "3.1.1",
     "@wordpress/components": "14.1.2",
diff --git a/webpack.config.js b/webpack.config.js
index ad32d7a45cc..a6a2980fbc8 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -159,18 +159,17 @@ const customizer = {
 };
 
 const WORDPRESS_NAMESPACE = '@wordpress/';
-const BABEL_NAMESPACE = '@babel/';
-const gutenbergPackages = [ '@babel/polyfill', '@wordpress/dom-ready', '@wordpress/i18n', '@wordpress/hooks', '@wordpress/html-entities', '@wordpress/url' ].map(
+const gutenbergPackages = [ '@wordpress/polyfill', '@wordpress/dom-ready', '@wordpress/i18n', '@wordpress/hooks', '@wordpress/html-entities', '@wordpress/url' ].map(
 	( packageName ) => {
-		if ( 0 !== packageName.indexOf( WORDPRESS_NAMESPACE ) && 0 !== packageName.indexOf( BABEL_NAMESPACE ) ) {
+		if ( 0 !== packageName.indexOf( WORDPRESS_NAMESPACE ) ) {
 			return null;
 		}
 
 		const camelCaseName = '@wordpress/i18n' === packageName
 			? 'i18n'
-			: camelCaseDash( packageName.replace( WORDPRESS_NAMESPACE, '' ).replace( BABEL_NAMESPACE, '' ) );
+			: camelCaseDash( packageName.replace( WORDPRESS_NAMESPACE, '' ) );
 
-		const handle = packageName.replace( WORDPRESS_NAMESPACE, 'wp-' ).replace( BABEL_NAMESPACE, 'wp-' );
+		const handle = packageName.replace( WORDPRESS_NAMESPACE, 'wp-' );
 
 		return {
 			camelCaseName,