Immediately resolve crypto in browser environment. Resolves #1

ngnjs · Feb 14, 2022 · 9418189 · 9418189
1 parent 6e7a063
commit 9418189
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngnjs/libdata",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "description": "A plugin module for NGN.",
   "main": "src/index.js",
   "module": "index.js",

diff --git a/src/identifiers/nanoid.js b/src/identifiers/nanoid.js
@@ -2,13 +2,17 @@
 
 // Cross-runtime buffer fill
 let fill
-;(async () => {
-  const available = globalThis.crypto !== undefined
-  const CRYPTO = await (globalThis.crypto || import('crypto'))
-  fill = size => available ? CRYPTO.getRandomValues(new Uint8Array(size)) : CRYPTO.randomBytes(size)
-})()
+let CRYPTO = globalThis.crypto
+if (!CRYPTO) {
+  ;(async () => {
+    CRYPTO = await import('crypto')
+    fill = size => CRYPTO.randomBytes(size)
+  })()
+} else {
+  fill = size => CRYPTO.getRandomValues(new Uint8Array(size))
+}
 
-function NANOID (size = 21) {
+export default function NANOID (size = 21) {
   const bytes = fill(size)
   let id = ''
 
@@ -21,6 +25,5 @@ function NANOID (size = 21) {
 }
 
 export {
-  NANOID as default,
   NANOID
 }