From 38c123a1572581372db756141e228a4e7850f30c Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Tue, 3 Apr 2018 13:20:59 -0700
Subject: [PATCH] Fix feature detection of TextEncoder too

It took me an embarrassingly long time to debug this issue that "I already
fixed"...
---
 crates/cli-support/src/js.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/crates/cli-support/src/js.rs b/crates/cli-support/src/js.rs
index e973c1cb..caab3ed2 100644
--- a/crates/cli-support/src/js.rs
+++ b/crates/cli-support/src/js.rs
@@ -642,8 +642,9 @@ impl<'a> Context<'a> {
             "));
         } else if !self.config.browser {
             self.globals.push_str(&format!("
-                if (typeof window === 'undefined')
-                    var TextEncoder = require('util').TextEncoder;
+                const TextEncoder = typeof window === 'object' && window.TextEncoder
+                    ? window.TextEncoder
+                    : require('util').TextEncoder;
             "));
         }
         self.globals.push_str(&format!("