v3.0.10: no auto-install, fix promisify

This commit is contained in:
AJ ONeal 2019-10-29 13:55:46 -06:00
parent a8299191f5
commit 98e8eaf3f0
4 changed files with 11 additions and 4 deletions

View File

@ -14,8 +14,6 @@ var A = require('./accounts.js');
var C = require('./certificates.js'); var C = require('./certificates.js');
var UserEvents = require('./user-events.js'); var UserEvents = require('./user-events.js');
var promisify = require('util').promisify;
var caches = {}; var caches = {};
// { maintainerEmail, directoryUrl, subscriberEmail, store, challenges } // { maintainerEmail, directoryUrl, subscriberEmail, store, challenges }

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "@root/greenlock", "name": "@root/greenlock",
"version": "3.0.9", "version": "3.0.10",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "@root/greenlock", "name": "@root/greenlock",
"version": "3.0.9", "version": "3.0.10",
"description": "The easiest Let's Encrypt client for Node.js and Browsers", "description": "The easiest Let's Encrypt client for Node.js and Browsers",
"homepage": "https://rootprojects.org/greenlock/", "homepage": "https://rootprojects.org/greenlock/",
"main": "greenlock.js", "main": "greenlock.js",

View File

@ -4,6 +4,7 @@ var P = module.exports;
var spawn = require('child_process').spawn; var spawn = require('child_process').spawn;
var spawnSync = require('child_process').spawnSync; var spawnSync = require('child_process').spawnSync;
var promisify = require('util').promisify;
// Exported for CLIs and such to override // Exported for CLIs and such to override
P.PKG_DIR = __dirname; P.PKG_DIR = __dirname;
@ -27,9 +28,17 @@ P._loadHelper = function(modname) {
try { try {
return Promise.resolve(require(modname)); return Promise.resolve(require(modname));
} catch (e) { } catch (e) {
console.error("Could not load '%s'", modname);
console.error('Did you install it?');
console.error('\tnpm install --save %s', modname);
throw e;
// Fun experiment, bad idea
/*
return P._install(modname).then(function() { return P._install(modname).then(function() {
return require(modname); return require(modname);
}); });
*/
} }
}; };