From b78e8781ff3976b3bff1ba881cf66dd2609b5c07 Mon Sep 17 00:00:00 2001
From: Jake Fried <samouri@users.noreply.github.com>
Date: Wed, 24 Nov 2021 16:30:04 -0500
Subject: [PATCH] esbuild: prioritize "module" over "browser" (#37052)

* Update esbuild mainFields for better tree shaking

* also update test runner
---
 build-system/tasks/helpers.js                        | 1 +
 build-system/tasks/runtime-test/runtime-test-base.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/build-system/tasks/helpers.js b/build-system/tasks/helpers.js
index 2d44ddcf1de1..53e22de39183 100644
--- a/build-system/tasks/helpers.js
+++ b/build-system/tasks/helpers.js
@@ -456,6 +456,7 @@ async function esbuildCompile(srcDir, srcFilename, destDir, options) {
         incremental: !!options.watch,
         logLevel: 'silent',
         external: options.externalDependencies,
+        mainFields: ['module', 'browser', 'main'],
         write: false,
       });
     } else {
diff --git a/build-system/tasks/runtime-test/runtime-test-base.js b/build-system/tasks/runtime-test/runtime-test-base.js
index 880e3be687d3..02f6b86faa76 100644
--- a/build-system/tasks/runtime-test/runtime-test-base.js
+++ b/build-system/tasks/runtime-test/runtime-test-base.js
@@ -236,6 +236,7 @@ class RuntimeTestConfig {
         'process.env.NODE_ENV': '"test"',
       },
       plugins: [importPathPlugin, babelPlugin],
+      mainFields: ['module', 'browser', 'main'],
       sourcemap: 'inline',
     };
   }