From 1f4611458c1353d26515e2eb4d8e04a879e8f699 Mon Sep 17 00:00:00 2001
From: Brad Jorsch <brad.jorsch@automattic.com>
Date: Mon, 11 Apr 2022 18:49:39 -0400
Subject: [PATCH] Upgrade `eval` again, it's a React bug.

https://github.com/facebook/react/issues/20756#issuecomment-780927519 again
---
 pnpm-lock.yaml                                             | 7 ++++---
 .../plugins/jetpack/tools/webpack.config.extensions.js     | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 08d82955ff2e8..a9114fe089e41 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12016,10 +12016,11 @@ packages:
     engines: {node: '>= 0.6'}
     dev: true
 
-  /eval/0.1.6:
-    resolution: {integrity: sha512-o0XUw+5OGkXw4pJZzQoXUk+H87DHuC+7ZE//oSrRGtatTmr12oTnLfg6QOq9DyTt0c/p4TwzgmkKrBzWTSizyQ==}
+  /eval/0.1.8:
+    resolution: {integrity: sha512-EzV94NYKoO09GLXGjXj9JIlXijVck4ONSr5wiCWDvhsvj5jxSrzTmRU/9C1DyB6uToszLs8aifA6NQ7lEQdvFw==}
     engines: {node: '>= 0.8'}
     dependencies:
+      '@types/node': 17.0.23
       require-like: 0.1.2
     dev: false
 
@@ -20053,7 +20054,7 @@ packages:
     dependencies:
       bluebird: 3.7.2
       cheerio: 0.22.0
-      eval: 0.1.6
+      eval: 0.1.8
       url: 0.11.0
       webpack-sources: 0.2.3
     dev: false
diff --git a/projects/plugins/jetpack/tools/webpack.config.extensions.js b/projects/plugins/jetpack/tools/webpack.config.extensions.js
index dc6852f73143d..a635dc4c8084f 100644
--- a/projects/plugins/jetpack/tools/webpack.config.extensions.js
+++ b/projects/plugins/jetpack/tools/webpack.config.extensions.js
@@ -253,6 +253,7 @@ module.exports = [
 					CSS: {
 						supports: () => false,
 					},
+					MessageChannel: null, // React <17.1 is broken on Node 16 if this is set. https://github.com/facebook/react/issues/20756#issuecomment-780927519
 				},
 			} ),
 			new RemoveAssetWebpackPlugin( {