relocate packages for easier export

acme.js

@@ -10,8 +10,8 @@ var Enc = require('@root/encoding/base64');
 var ACME = module.exports;
 //var Keypairs = exports.Keypairs || {};
 //var CSR = exports.CSR;
-var sha2 = require('./node/sha2.js');
-var http = require('./node/http.js');
+var sha2 = require('./lib/node/sha2.js');
+var http = require('./lib/node/http.js');
 
 ACME.formatPemChain = function formatPemChain(str) {
 	return (

ecdsa.js

@@ -4,7 +4,7 @@
 var Enc = require('@root/encoding');
 
 var EC = module.exports;
-var native = require('./node/ecdsa.js');
+var native = require('./lib/node/ecdsa.js');
 
 // TODO SSH
 var SSH;
@@ -12,7 +12,7 @@ var SSH;
 var x509 = require('./x509.js');
 var PEM = require('./pem.js');
 //var SSH = require('./ssh-keys.js');
-var sha2 = require('./node/sha2.js');
+var sha2 = require('./lib/node/sha2.js');
 
 // 1.2.840.10045.3.1.7
 // prime256v1 (ANSI X9.62 named elliptic curve)

keypairs.js

@@ -7,7 +7,7 @@ var Enc = require('@root/encoding/base64');
 var Keypairs = module.exports;
 var Rasha = require('./rsa.js');
 var Eckles = require('./ecdsa.js');
-var native = require('./node/keypairs.js');
+var native = require('./lib/node/keypairs.js');
 
 Keypairs._stance =
 	"We take the stance that if you're knowledgeable enough to" +

lib/node/rsa.js

@@ -4,9 +4,9 @@ var native = module.exports;
 
 // XXX provided by caller: export
 var RSA = native;
-var PEM = require('../pem.js');
-var x509 = require('../x509.js');
-var ASN1 = require('../asn1/parser.js');
+var PEM = require('../../pem.js');
+var x509 = require('../../x509.js');
+var ASN1 = require('../../asn1/parser.js');
 
 native.generate = function(opts) {
 	opts.kty = 'RSA';

package-lock.json

@@ -1,6 +1,6 @@
 {
-  "name": "acme",
-  "version": "2.0.0-wip.0",
+  "name": "@root/acme",
+  "version": "3.0.0-wip.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -3,7 +3,7 @@
 	"version": "3.0.0-wip.0",
 	"description": "Free SSL certificates through Let's Encrypt, right in your browser",
 	"homepage": "https://rootprojects.org/acme/",
-	"main": "lib/acme.js",
+	"main": "acme.js",
 	"browser": {
 		"./lib/node/sha2.js": "./lib/browser/sha2.js",
 		"./lib/node/http.js": "./lib/browser/http.js",
@@ -11,10 +11,8 @@
 		"./lib/node/rsa.js": "./lib/browser/rsa.js",
 		"./lib/node/keypairs.js": "./lib/browser/keypairs.js"
 	},
-	"directories": {
-		"lib": "lib"
-	},
 	"files": [
+		"*.js",
 		"lib",
 		"dist"
 	],

rsa.js

@@ -2,11 +2,11 @@
 'use strict';
 
 var RSA = module.exports;
-var native = require('./node/rsa.js');
+var native = require('./lib/node/rsa.js');
 var x509 = require('./x509.js');
 var PEM = require('./pem.js');
 //var SSH = require('./ssh-keys.js');
-var sha2 = require('./node/sha2.js');
+var sha2 = require('./lib/node/sha2.js');
 var Enc = require('@root/encoding/base64');
 
 RSA._universal =

tests/index.js

@@ -3,8 +3,8 @@
 require('dotenv').config();
 
 var punycode = require('punycode');
-var ACME = require('../');
-var Keypairs = require('../lib/keypairs.js');
+var ACME = require('../acme.js');
+var Keypairs = require('../keypairs.js');
 var acme = ACME.create({
 	// debug: true
 });