Merge branch 1.7 into 2.0

Author: ali-ince

package-lock.json

@@ -101,7 +101,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.4.4",
-    "text-encoding": "^0.7.0",
+    "text-encoding-utf-8": "^1.0.2",
     "uri-js": "^4.2.2"
   }
 }

package.json

@@ -17,11 +17,11 @@
  * limitations under the License.
  */
 
-import HeapBuffer from './browser-buf'
-import textEncoding from 'text-encoding'
+import HeapBuffer from '../browser/browser-buf'
+import { TextEncoder, TextDecoder } from 'text-encoding-utf-8'
 
-const encoder = new textEncoding.TextEncoder('utf-8')
-const decoder = new textEncoding.TextDecoder('utf-8')
+const encoder = new TextEncoder('utf-8')
+const decoder = new TextDecoder('utf-8')
 
 function encode (str) {
   return new HeapBuffer(encoder.encode(str).buffer)