From 38d3b8d08751f2cff7e15f5237c4c65db354971b Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sun, 24 May 2020 01:41:05 -0700
Subject: [PATCH] Ignore proxy-polyfill in workers (#6011)

---
 build-scripts/bundle.js                       | 21 +++++++++++--------
 build-scripts/rollup-plugins/worker-plugin.js |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/build-scripts/bundle.js b/build-scripts/bundle.js
index 848c386632..6123a7a095 100644
--- a/build-scripts/bundle.js
+++ b/build-scripts/bundle.js
@@ -11,15 +11,18 @@ module.exports.ignorePackages = ({ latestBuild }) => [
 ];
 
 // Files from NPM packages that we should replace with empty file
-module.exports.emptyPackages = ({ latestBuild }) => [
-  // Contains all color definitions for all material color sets.
-  // We don't use it
-  require.resolve("@polymer/paper-styles/color.js"),
-  require.resolve("@polymer/paper-styles/default-theme.js"),
-  // Loads stuff from a CDN
-  require.resolve("@polymer/font-roboto/roboto.js"),
-  require.resolve("@vaadin/vaadin-material-styles/font-roboto.js"),
-];
+module.exports.emptyPackages = ({ latestBuild }) =>
+  [
+    // Contains all color definitions for all material color sets.
+    // We don't use it
+    require.resolve("@polymer/paper-styles/color.js"),
+    require.resolve("@polymer/paper-styles/default-theme.js"),
+    // Loads stuff from a CDN
+    require.resolve("@polymer/font-roboto/roboto.js"),
+    require.resolve("@vaadin/vaadin-material-styles/font-roboto.js"),
+    // Polyfill only needed for ES5 workers so filter out in latestBuild
+    latestBuild && require.resolve("proxy-polyfill/src/index.js"),
+  ].filter(Boolean);
 
 module.exports.definedVars = ({ isProdBuild, latestBuild, defineOverlay }) => ({
   __DEV__: !isProdBuild,
diff --git a/build-scripts/rollup-plugins/worker-plugin.js b/build-scripts/rollup-plugins/worker-plugin.js
index c075a08495..96dc7c8acd 100644
--- a/build-scripts/rollup-plugins/worker-plugin.js
+++ b/build-scripts/rollup-plugins/worker-plugin.js
@@ -25,7 +25,7 @@ const defaultOpts = {
   // A RegExp to find `new Workers()` calls. The second capture group _must_
   // capture the provided file name without the quotes.
   workerRegexp: /new Worker\((["'])(.+?)\1(,[^)]+)?\)/g,
-  plugins: ["node-resolve", "commonjs", "babel"],
+  plugins: ["node-resolve", "commonjs", "babel", "terser", "ignore"],
 };
 
 async function getBundledWorker(workerPath, rollupOptions) {