Fix requireOptional error and nodemailer require, fix keystonejs#15

I had to make the same fixes that I later saw suggested by @ivanclaud to get this working locally.
neagle · Dec 8, 2016 · 7540d1c · 7540d1c · ansgarm · May 10, 2017
1 parent c70cecc
commit 7540d1c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/transports/nodemailer/index.js b/lib/transports/nodemailer/index.js
@@ -1,4 +1,4 @@
-var requireOptional = require('../util/requireOptional');
+var requireOptional = require('../../util/requireOptional');
 
 var assign = require('object-assign');
 var nodemailer = requireOptional('nodemailer', 'Please install the nodemailer package to use this transport');

diff --git a/lib/util/requireOptional.js b/lib/util/requireOptional.js
@@ -1,6 +1,6 @@
 module.exports = function (pkg, msg) {
 	try {
-		return require('pkg');
+		return require(pkg);
 	} catch (e) {
 		if (e.code === 'MODULE_NOT_FOUND') {
 			throw new Error(msg);