updates

.gitignore

@@ -1,5 +1,4 @@
 .env
-dist/
 *.gz
 .*.sw*
 .ignore

acme.js

@@ -1317,7 +1317,7 @@ ACME.create = function create(me) {
 	}
 	// me.debug = true;
 	me.challengePrefixes = ACME.challengePrefixes;
-	me.Keypairs = me.Keypairs || require('./keypairs.js');
+	me.Keypairs = me.Keypairs || require('@root/keypairs');
 	me.CSR = me.CSR || require('./csr.js');
 	me._nonces = [];
 	me._canUse = {};

csr.js

@@ -14,7 +14,7 @@ var UInt = ASN1.UInt;
 var Asn1Parser = require('./asn1/parser.js');
 var PEM = require('./pem.js');
 var X509 = require('./x509.js');
-var Keypairs = require('./keypairs');
+var Keypairs = require('@root/keypairs');
 
 // TODO find a way that the prior node-ish way of `module.exports = function () {}` isn't broken
 var CSR = module.exports;

examples/app.js

@@ -2,12 +2,12 @@
 (function() {
 	'use strict';
 
-	var Keypairs = window.Keypairs;
+	var Keypairs = require('@root/keypairs');
-	var Rasha = window.Rasha;
+	var Rasha = require('@root/acme/rsa');
-	var Eckles = window.Eckles;
+	var Eckles = require('@root/acme/ecdsa');
-	var x509 = window.x509;
+	var x509 = require('@root/acme/x509');
-	var CSR = window.CSR;
+	var CSR = require('@root/csr');
-	var ACME = window.ACME;
+	var ACME = require('@root/acme');
 	var accountStuff = {};
 
 	function $(sel) {

examples/dist

@@ -0,0 +1 @@
+../dist

examples/index.html

@@ -224,15 +224,8 @@
 			>
 		</footer>
 
-		<script src="./lib/encoding.js"></script>
+		<!-- script src="../dist/acme.js"></script>
-		<script src="./lib/asn1-packer.js"></script>
+		<script src="./app.js"></script -->
-		<script src="./lib/x509.js"></script>
+		<script src="../dist/app.js"></script>
-		<script src="./lib/ecdsa.js"></script>
-		<script src="./lib/rsa.js"></script>
-		<script src="./lib/keypairs.js"></script>
-		<script src="./lib/asn1-parser.js"></script>
-		<script src="./lib/csr.js"></script>
-		<script src="./lib/acme.js"></script>
-		<script src="./app.js"></script>
 	</body>
 </html>

package-lock.json

@@ -1,178 +0,0 @@
-{
-  "name": "@root/acme",
-  "version": "3.0.0-wip.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@root/encoding": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@root/encoding/-/encoding-1.0.1.tgz",
-      "integrity": "sha512-OaEub02ufoU038gy6bsNHQOjIn8nUjGiLcaRmJ40IUykneJkIW5fxDqKxQx48cszuNflYldsJLPPXCrGfHs8yQ=="
-    },
-    "@root/request": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@root/request/-/request-1.3.10.tgz",
-      "integrity": "sha512-GSn8dfsGp0juJyXS9k7B/DjYm7Axe85wiCHfPs30eQ+/V6p2aqey45e1czb3ZwP+iPmzWCKXahhWnZhSDIil6w==",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "bluebird": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
-      "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==",
-      "dev": true
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "cli": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz",
-      "integrity": "sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=",
-      "dev": true,
-      "requires": {
-        "exit": "0.1.2",
-        "glob": "^7.1.1"
-      }
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "dig.js": {
-      "version": "1.3.9",
-      "resolved": "https://registry.npmjs.org/dig.js/-/dig.js-1.3.9.tgz",
-      "integrity": "sha512-O/tSWZuW7AwpjsgePPmTanwvSDL9xF+FzLTJD9byN3C6lk79iMejC/Ahz9CERAXTW4e2TXL1vtqh3T0Ug79ocA==",
-      "dev": true,
-      "requires": {
-        "cli": "^1.0.1",
-        "dns-suite": "git+https://git.coolaj86.com/coolaj86/dns-suite.js#v1.2",
-        "hexdump.js": "git+https://git.coolaj86.com/coolaj86/hexdump.js#v1.0.4"
-      },
-      "dependencies": {
-        "dns-suite": {
-          "version": "git+https://git.coolaj86.com/coolaj86/dns-suite.js#092008f766540909d27c934211495c9e03705bf3",
-          "from": "git+https://git.coolaj86.com/coolaj86/dns-suite.js#v1.2",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.0",
-            "hexdump.js": "git+https://git.coolaj86.com/coolaj86/hexdump.js#v1.0.4"
-          }
-        }
-      }
-    },
-    "dns-suite": {
-      "version": "1.2.12",
-      "resolved": "https://registry.npmjs.org/dns-suite/-/dns-suite-1.2.12.tgz",
-      "integrity": "sha512-K4LWqmJT/T2QLaGCJ+qRvrT9DicKs5XxXYXw6uIZ1apdwyfToQk7K9AZbpFd0FLRdZG809v2vAcsquPbQh+Ipg==",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.5.0",
-        "hexdump.js": "git+https://git.coolaj86.com/coolaj86/hexdump.js#v1.0.4"
-      }
-    },
-    "dotenv": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.1.0.tgz",
-      "integrity": "sha512-GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA==",
-      "dev": true
-    },
-    "exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-      "dev": true
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "hexdump.js": {
-      "version": "git+https://git.coolaj86.com/coolaj86/hexdump.js#222fa7de5036a16397de2fe703c35ac54a3d8d0c",
-      "from": "git+https://git.coolaj86.com/coolaj86/hexdump.js#v1.0.4",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-      "dev": true
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    }
-  }
-}

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@root/acme",
-	"version": "3.0.0-wip.0",
+	"version": "3.0.0-wip.1",
 	"description": "Free SSL certificates through Let's Encrypt, right in your browser",
 	"homepage": "https://rootprojects.org/acme/",
 	"main": "acme.js",
@@ -40,8 +40,9 @@
 	"author": "AJ ONeal <coolaj86@gmail.com> (https://coolaj86.com/)",
 	"license": "MPL-2.0",
 	"dependencies": {
+		"@root/csr": "^1.0.0-wip.0",
 		"@root/encoding": "^1.0.1",
-		"@root/csr": "^1.0.0-wip.0"
+		"@root/keypairs": "^1.0.0-wip.0"
 	},
 	"devDependencies": {
 		"@root/request": "^1.3.10",

webpack.config.js

@@ -3,16 +3,18 @@
 var path = require('path');
 
 module.exports = {
-	entry: './lib/acme.js',
+	entry: './examples/app.js',
+	//entry: './acme.js',
 	output: {
 		path: path.resolve(__dirname, 'dist'),
-		filename: 'acme.js',
+		filename: 'app.js'
-		library: '@root/acme',
+		//filename: 'acme.js',
-		libraryTarget: 'umd',
+		//library: '@root/acme',
-		globalObject: "typeof self !== 'undefined' ? self : this"
+		//libraryTarget: 'umd'
+		//globalObject: "typeof self !== 'undefined' ? self : this"
 	},
 	resolve: {
 		aliasFields: ['webpack', 'browser'],
-		mainFields: ['browser']
+		mainFields: ['browser', 'main']
 	}
 };