From edc830696ee586bce14b706f6a9d256e23cd7c52 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 8 Oct 2019 13:40:01 -0600 Subject: [PATCH] relocate packages for easier export --- lib/acme.js => acme.js | 4 ++-- {lib/asn1 => asn1}/README.md | 0 {lib/asn1 => asn1}/index.js | 0 {lib/asn1 => asn1}/packer.js | 0 {lib/asn1 => asn1}/parser.js | 0 lib/csr.js => csr.js | 0 lib/ecdsa.js => ecdsa.js | 4 ++-- lib/keypairs.js => keypairs.js | 2 +- lib/node/rsa.js | 6 +++--- package-lock.json | 4 ++-- package.json | 6 ++---- lib/pem.js => pem.js | 0 lib/rsa.js => rsa.js | 4 ++-- tests/index.js | 4 ++-- lib/x509.js => x509.js | 0 15 files changed, 16 insertions(+), 18 deletions(-) rename lib/acme.js => acme.js (99%) rename {lib/asn1 => asn1}/README.md (100%) rename {lib/asn1 => asn1}/index.js (100%) rename {lib/asn1 => asn1}/packer.js (100%) rename {lib/asn1 => asn1}/parser.js (100%) rename lib/csr.js => csr.js (100%) rename lib/ecdsa.js => ecdsa.js (98%) rename lib/keypairs.js => keypairs.js (99%) rename lib/pem.js => pem.js (100%) rename lib/rsa.js => rsa.js (98%) rename lib/x509.js => x509.js (100%) diff --git a/lib/acme.js b/acme.js similarity index 99% rename from lib/acme.js rename to acme.js index 415f619..2469ccf 100644 --- a/lib/acme.js +++ b/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 ( diff --git a/lib/asn1/README.md b/asn1/README.md similarity index 100% rename from lib/asn1/README.md rename to asn1/README.md diff --git a/lib/asn1/index.js b/asn1/index.js similarity index 100% rename from lib/asn1/index.js rename to asn1/index.js diff --git a/lib/asn1/packer.js b/asn1/packer.js similarity index 100% rename from lib/asn1/packer.js rename to asn1/packer.js diff --git a/lib/asn1/parser.js b/asn1/parser.js similarity index 100% rename from lib/asn1/parser.js rename to asn1/parser.js diff --git a/lib/csr.js b/csr.js similarity index 100% rename from lib/csr.js rename to csr.js diff --git a/lib/ecdsa.js b/ecdsa.js similarity index 98% rename from lib/ecdsa.js rename to ecdsa.js index 07f8008..8d6018a 100644 --- a/lib/ecdsa.js +++ b/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) diff --git a/lib/keypairs.js b/keypairs.js similarity index 99% rename from lib/keypairs.js rename to keypairs.js index 1b027c7..e456d4a 100644 --- a/lib/keypairs.js +++ b/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" + diff --git a/lib/node/rsa.js b/lib/node/rsa.js index 5d322e1..0590eda 100644 --- a/lib/node/rsa.js +++ b/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'; diff --git a/package-lock.json b/package-lock.json index 5807f79..d1e47f1 100644 --- a/package-lock.json +++ b/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": { diff --git a/package.json b/package.json index 3d5d304..5176553 100644 --- a/package.json +++ b/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" ], diff --git a/lib/pem.js b/pem.js similarity index 100% rename from lib/pem.js rename to pem.js diff --git a/lib/rsa.js b/rsa.js similarity index 98% rename from lib/rsa.js rename to rsa.js index a86456a..c4567cc 100644 --- a/lib/rsa.js +++ b/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 = diff --git a/tests/index.js b/tests/index.js index 8607a19..a7a1b36 100644 --- a/tests/index.js +++ b/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 }); diff --git a/lib/x509.js b/x509.js similarity index 100% rename from lib/x509.js rename to x509.js