luxolus/open-consul
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

UI: Bugfix. Move to a different TextEncoder/Decoder (#4613)

Browse source 
1. The previously used TextEncoder/Decoder (used as a polyfill for
browsers that don't have a native version) didn't expose an encoder via
CommonJS. Use a different polyfill that exposes both a decoder and an
encoder.
2. The feature detection itself was flawed. This does a less error prone
detection that ensures native encoding/decoding where available and polyfilled
encoding/decoding where not available.
This commit is contained in:
John Cowen 2018-09-12 20:15:58 +01:00 committed by GitHub
parent fcdea1ffbb
commit d9764ed04b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ui-v2/app/utils/atob.js
View file

@ -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
);
}

4
ui-v2/app/utils/btoa.js
View file

@ -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);
}

2
ui-v2/package.json
View file

@ -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.*"

4
ui-v2/yarn.lock
View file

@ -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"