diff --git a/package-lock.json b/package-lock.json index 8eaccaf..fc20daa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "bip39", - "version": "3.0.1", + "version": "3.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9edba43..1c31b1e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bip39", - "version": "3.0.1", + "version": "3.0.2", "description": "Bitcoin BIP39: Mnemonic code for generating deterministic keys", "main": "src/index.js", "types": "./types/index.d.ts", diff --git a/src/_wordlists.js b/src/_wordlists.js index 134cc71..9f2f8b2 100644 --- a/src/_wordlists.js +++ b/src/_wordlists.js @@ -3,28 +3,49 @@ Object.defineProperty(exports, "__esModule", { value: true }); // browserify by default only pulls in files that are hard coded in requires // In order of last to first in this file, the default wordlist will be chosen // based on what is present. (Bundles may remove wordlists they don't need) -const wordlistFilenames = [ - 'chinese_simplified', - 'chinese_traditional', - 'korean', - 'french', - 'italian', - 'spanish', - 'japanese', - 'english', -]; const wordlists = {}; exports.wordlists = wordlists; let _default; exports._default = _default; -wordlistFilenames.forEach(lang => { - try { - exports._default = _default = require('./wordlists/' + lang + '.json'); - wordlists[lang] = _default; - if (lang === 'japanese') - wordlists.JA = _default; - if (lang === 'english') - wordlists.EN = _default; - } - catch (err) { } -}); +try { + exports._default = _default = require('./wordlists/chinese_simplified.json'); + wordlists.chinese_simplified = _default; +} +catch (err) { } +try { + exports._default = _default = require('./wordlists/chinese_traditional.json'); + wordlists.chinese_traditional = _default; +} +catch (err) { } +try { + exports._default = _default = require('./wordlists/korean.json'); + wordlists.korean = _default; +} +catch (err) { } +try { + exports._default = _default = require('./wordlists/french.json'); + wordlists.french = _default; +} +catch (err) { } +try { + exports._default = _default = require('./wordlists/italian.json'); + wordlists.italian = _default; +} +catch (err) { } +try { + exports._default = _default = require('./wordlists/spanish.json'); + wordlists.spanish = _default; +} +catch (err) { } +try { + exports._default = _default = require('./wordlists/japanese.json'); + wordlists.japanese = _default; + wordlists.JA = _default; +} +catch (err) { } +try { + exports._default = _default = require('./wordlists/english.json'); + wordlists.english = _default; + wordlists.EN = _default; +} +catch (err) { } diff --git a/ts_src/_wordlists.ts b/ts_src/_wordlists.ts index 242533d..746467d 100644 --- a/ts_src/_wordlists.ts +++ b/ts_src/_wordlists.ts @@ -1,26 +1,42 @@ // browserify by default only pulls in files that are hard coded in requires // In order of last to first in this file, the default wordlist will be chosen // based on what is present. (Bundles may remove wordlists they don't need) -const wordlistFilenames: string[] = [ - 'chinese_simplified', - 'chinese_traditional', - 'korean', - 'french', - 'italian', - 'spanish', - 'japanese', - 'english', // Last language available in list will be the default. -]; const wordlists: { [index: string]: string[] } = {}; let _default: string[] | undefined; -wordlistFilenames.forEach(lang => { - try { - _default = require('./wordlists/' + lang + '.json'); - wordlists[lang] = _default as string[]; - if (lang === 'japanese') wordlists.JA = _default as string[]; - if (lang === 'english') wordlists.EN = _default as string[]; - } catch (err) {} -}); +try { + _default = require('./wordlists/chinese_simplified.json'); + wordlists.chinese_simplified = _default as string[]; +} catch (err) {} +try { + _default = require('./wordlists/chinese_traditional.json'); + wordlists.chinese_traditional = _default as string[]; +} catch (err) {} +try { + _default = require('./wordlists/korean.json'); + wordlists.korean = _default as string[]; +} catch (err) {} +try { + _default = require('./wordlists/french.json'); + wordlists.french = _default as string[]; +} catch (err) {} +try { + _default = require('./wordlists/italian.json'); + wordlists.italian = _default as string[]; +} catch (err) {} +try { + _default = require('./wordlists/spanish.json'); + wordlists.spanish = _default as string[]; +} catch (err) {} +try { + _default = require('./wordlists/japanese.json'); + wordlists.japanese = _default as string[]; + wordlists.JA = _default as string[]; +} catch (err) {} +try { + _default = require('./wordlists/english.json'); + wordlists.english = _default as string[]; + wordlists.EN = _default as string[]; +} catch (err) {} // Last one to overwrite wordlist gets to be default. export { wordlists, _default };