From 2c1412dda42f32c2cd67c39aa91c09d20e09f5bd Mon Sep 17 00:00:00 2001
From: DD <liudi08@gmail.com>
Date: Tue, 16 Jan 2018 17:41:18 -0500
Subject: [PATCH 1/2] Use text-encoding library for text encoder

---
 package.json           | 1 +
 src/virtual-machine.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/package.json b/package.json
index 02caa814e..e1a5af558 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     "socket.io-client": "2.0.4",
     "stats.js": "^0.17.0",
     "tap": "^10.2.0",
+    "text-encoding": "0.6.4",
     "tiny-worker": "^2.1.1",
     "webpack": "^3.10.0",
     "webpack-dev-server": "^2.4.1",
diff --git a/src/virtual-machine.js b/src/virtual-machine.js
index 61b61e518..5cacafee5 100644
--- a/src/virtual-machine.js
+++ b/src/virtual-machine.js
@@ -1,3 +1,4 @@
+import {TextEncoder} from 'text-encoding';
 const EventEmitter = require('events');
 
 const centralDispatch = require('./dispatch/central-dispatch');

From c0db708986f7f3d511122e8459c531370e75fb33 Mon Sep 17 00:00:00 2001
From: Ray Schamp <ray@scratch.mit.edu>
Date: Wed, 17 Jan 2018 09:47:01 -0500
Subject: [PATCH 2/2] Fix import syntax

---
 src/virtual-machine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/virtual-machine.js b/src/virtual-machine.js
index 5cacafee5..0612261a9 100644
--- a/src/virtual-machine.js
+++ b/src/virtual-machine.js
@@ -1,4 +1,4 @@
-import {TextEncoder} from 'text-encoding';
+const TextEncoder = require('text-encoding');
 const EventEmitter = require('events');
 
 const centralDispatch = require('./dispatch/central-dispatch');