dchest · jessetane · Nov 18, 2020
diff --git a/nacl-util.js b/nacl-util.js
@@ -1,81 +1,69 @@
 // Written in 2014-2016 by Dmitry Chestnykh and Devi Mandiri.
 // Public domain.
-(function(root, f) {
-  'use strict';
-  if (typeof module !== 'undefined' && module.exports) module.exports = f();
-  else if (root.nacl) root.nacl.util = f();
-  else {
-    root.nacl = {};
-    root.nacl.util = f();
-  }
-}(this, function() {
-  'use strict';
 
-  var util = {};
+var util = {};
 
-  function validateBase64(s) {
-    if (!(/^(?:[A-Za-z0-9+\/]{2}[A-Za-z0-9+\/]{2})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.test(s))) {
-      throw new TypeError('invalid encoding');
-    }
+function validateBase64(s) {
+  if (!(/^(?:[A-Za-z0-9+\/]{2}[A-Za-z0-9+\/]{2})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.test(s))) {
+    throw new TypeError('invalid encoding');
   }
+}
 
-  util.decodeUTF8 = function(s) {
-    if (typeof s !== 'string') throw new TypeError('expected string');
-    var i, d = unescape(encodeURIComponent(s)), b = new Uint8Array(d.length);
-    for (i = 0; i < d.length; i++) b[i] = d.charCodeAt(i);
-    return b;
-  };
-
-  util.encodeUTF8 = function(arr) {
-    var i, s = [];
-    for (i = 0; i < arr.length; i++) s.push(String.fromCharCode(arr[i]));
-    return decodeURIComponent(escape(s.join('')));
-  };
-
-  if (typeof atob === 'undefined') {
-    // Node.js
+util.decodeUTF8 = function(s) {
+  if (typeof s !== 'string') throw new TypeError('expected string');
+  var i, d = unescape(encodeURIComponent(s)), b = new Uint8Array(d.length);
+  for (i = 0; i < d.length; i++) b[i] = d.charCodeAt(i);
+  return b;
+};
 
-    if (typeof Buffer.from !== 'undefined') {
-       // Node v6 and later
-      util.encodeBase64 = function (arr) { // v6 and later
-          return Buffer.from(arr).toString('base64');
-      };
+util.encodeUTF8 = function(arr) {
+  var i, s = [];
+  for (i = 0; i < arr.length; i++) s.push(String.fromCharCode(arr[i]));
+  return decodeURIComponent(escape(s.join('')));
+};
 
-      util.decodeBase64 = function (s) {
-        validateBase64(s);
-        return new Uint8Array(Array.prototype.slice.call(Buffer.from(s, 'base64'), 0));
-      };
+if (typeof atob === 'undefined') {
+  // Node.js
 
-    } else {
-      // Node earlier than v6
-      util.encodeBase64 = function (arr) { // v6 and later
-        return (new Buffer(arr)).toString('base64');
-      };
+  if (typeof Buffer.from !== 'undefined') {
+     // Node v6 and later
+    util.encodeBase64 = function (arr) { // v6 and later
+        return Buffer.from(arr).toString('base64');
+    };
 
-      util.decodeBase64 = function(s) {
-        validateBase64(s);
-        return new Uint8Array(Array.prototype.slice.call(new Buffer(s, 'base64'), 0));
-      };
-    }
+    util.decodeBase64 = function (s) {
+      validateBase64(s);
+      return new Uint8Array(Array.prototype.slice.call(Buffer.from(s, 'base64'), 0));
+    };
 
   } else {
-    // Browsers
-
-    util.encodeBase64 = function(arr) {
-      var i, s = [], len = arr.length;
-      for (i = 0; i < len; i++) s.push(String.fromCharCode(arr[i]));
-      return btoa(s.join(''));
+    // Node earlier than v6
+    util.encodeBase64 = function (arr) { // v6 and later
+      return (new Buffer(arr)).toString('base64');
     };
 
     util.decodeBase64 = function(s) {
       validateBase64(s);
-      var i, d = atob(s), b = new Uint8Array(d.length);
-      for (i = 0; i < d.length; i++) b[i] = d.charCodeAt(i);
-      return b;
+      return new Uint8Array(Array.prototype.slice.call(new Buffer(s, 'base64'), 0));
     };
-
   }
 
-  return util;
+} else {
+  // Browsers
+
+  util.encodeBase64 = function(arr) {
+    var i, s = [], len = arr.length;
+    for (i = 0; i < len; i++) s.push(String.fromCharCode(arr[i]));
+    return btoa(s.join(''));
+  };
+
+  util.decodeBase64 = function(s) {
+    validateBase64(s);
+    var i, d = atob(s), b = new Uint8Array(d.length);
+    for (i = 0; i < d.length; i++) b[i] = d.charCodeAt(i);
+    return b;
+  };
+
+}
 
-}));
+export default util;
diff --git a/nacl-util.min.js b/nacl-util.min.js
diff --git a/package.json b/package.json
@@ -2,12 +2,16 @@
   "name": "tweetnacl-util",
   "version": "0.15.1",
   "description": "String encoding utilitlies extracted from TweetNaCl.js",
-  "main": "nacl-util.js",
+  "type": "module",
   "types": "nacl-util.d.ts",
+  "main": "nacl-util.js",
+  "exports": {
+    ".": "./nacl-util.js",
+    "./*": "./*"
+  },
   "scripts": {
-    "build": "uglifyjs nacl-util.js -c -m -o nacl-util.min.js",
-    "test": "tape test/*.js; yarn run build-browser-test",
-    "build-browser-test": "browserify test/test.js > test/browser/bundle.js"
+    "test": "node test",
+    "test-browser": "ecstatic --cache no-cache --port 7357 test"
   },
   "repository": {
     "type": "git",
@@ -26,11 +30,8 @@
   },
   "homepage": "https://github.com/dchest/tweetnacl-util-js",
   "devDependencies": {
-    "browserify": "^16.5.0",
-    "tape": "^4.13.0",
-    "uglify-js": "^3.7.6"
-  },
-  "browser": {
-    "buffer": false
+    "ecstatic": "^4.1.4",
+    "es-module-shims": "^0.7.1",
+    "tap-esm": "^1.4.1"
   }
 }