From 76cc1ca2952eca3b2ca213230f4c728a2b007b74 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 3 Apr 2018 08:09:25 -0700
Subject: [PATCH] Fix imports of TextEncoder/TextDecoder

---
 crates/cli-support/src/js.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/crates/cli-support/src/js.rs b/crates/cli-support/src/js.rs
index dd328689..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!("
@@ -667,8 +668,9 @@ impl<'a> Context<'a> {
             "));
         } else if !self.config.browser {
             self.globals.push_str(&format!("
-                if (typeof window === 'undefined')
-                    var TextDecoder = require('util').TextDecoder;
+                const TextDecoder = typeof window === 'object' && window.TextDecoder
+                    ? window.TextDecoder
+                    : require('util').TextDecoder;
             "));
         }
         self.globals.push_str(&format!("