diff --git a/ui-v2/app/utils/atob.js b/ui-v2/app/utils/atob.js index 237a4b5d4..f2df4317e 100644 --- a/ui-v2/app/utils/atob.js +++ b/ui-v2/app/utils/atob.js @@ -1,8 +1,9 @@ -import TextEncoderLite from 'npm:text-encoder-lite'; +import TextEncoding from 'npm:text-encoding'; import base64js from 'npm:base64-js'; export default function(str, encoding = 'utf-8') { - // str = String(str).trim(); - //decode + // decode const bytes = base64js.toByteArray(str); - return new (TextDecoder || TextEncoderLite)(encoding).decode(bytes); + return new ('TextDecoder' in window ? TextDecoder : TextEncoding.TextDecoder)(encoding).decode( + bytes + ); } diff --git a/ui-v2/app/utils/btoa.js b/ui-v2/app/utils/btoa.js index 3dddf02bf..ae1c058ad 100644 --- a/ui-v2/app/utils/btoa.js +++ b/ui-v2/app/utils/btoa.js @@ -1,7 +1,7 @@ -import TextEncoderLite from 'npm:text-encoder-lite'; +import TextEncoding from 'npm:text-encoding'; import base64js from 'npm:base64-js'; export default function(str, encoding = 'utf-8') { // encode - const bytes = new (TextEncoder || TextEncoderLite)(encoding).encode(str); + const bytes = new ('TextEncoder' in window ? TextEncoder : TextEncoding.TextEncoder)(encoding).encode(str); return base64js.fromByteArray(bytes); } diff --git a/ui-v2/package.json b/ui-v2/package.json index 7f822a76d..f47636cfd 100644 --- a/ui-v2/package.json +++ b/ui-v2/package.json @@ -86,7 +86,7 @@ "loader.js": "^4.2.3", "prettier": "^1.10.2", "svgo": "^1.0.5", - "text-encoder-lite": "^1.0.1" + "text-encoding": "^0.6.4" }, "engines": { "node": "^4.5 || 6.* || >= 7.*" diff --git a/ui-v2/yarn.lock b/ui-v2/yarn.lock index 7b11ec92c..40d940680 100644 --- a/ui-v2/yarn.lock +++ b/ui-v2/yarn.lock @@ -8933,10 +8933,6 @@ testem@^2.0.0: tap-parser "^5.1.0" xmldom "^0.1.19" -text-encoder-lite@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/text-encoder-lite/-/text-encoder-lite-1.0.1.tgz#121c5ee74dfeb307037770ec75748c6824ac0518" - text-encoding@0.6.4, text-encoding@^0.6.4: version "0.6.4" resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"