Skip to content

Fix deprecation warning & remove Module._resolveLookupPaths usage #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DamonOehlman merged 3 commits into from
Apr 8, 2019
Merged

Fix deprecation warning & remove Module._resolveLookupPaths usage #36

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f7af72
chore: future proof module hooks
BridgeAR Apr 7, 2019
12727b2
chore: fix buffer deprecation warning
BridgeAR Apr 7, 2019
00435b2
chore: remove unused variables
BridgeAR Apr 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ Rigger.prototype.end = function() {
}
else {
// emit a buffer for the parsed lines
rigger.emit('data', new Buffer(content));
rigger.emit('data', Buffer.from ? Buffer.from(content) : new Buffer(content));
rigger.emit('end');
}
});
Expand Down Expand Up @@ -262,10 +262,8 @@ Rigger.prototype.write = function(data, all) {
/* core action handlers */

Rigger.prototype.include = function(match, settings, callback) {
var rigger = this;
var target;
var targetExt;
var conversion;

var templateText = match[3]
.replace(regexes.trailingDot, '')
Expand Down Expand Up @@ -295,14 +293,15 @@ Rigger.prototype.include = function(match, settings, callback) {
Rigger.prototype.plugin = function(match, settings, callback) {
var rigger = this;
var pluginName = match[3];
var plugin;
var scope = {
done: callback
};

var basePaths = ['.'].concat(mod._nodeModulePaths('.'), mod.globalPaths);

var paths = mod._nodeModulePaths(this.cwd)
.concat(mod._nodeModulePaths(this.csd))
.concat(mod._resolveLookupPaths(this.cwd)[1]);
.concat(basePaths);

// add the module name to the paths
paths = paths.map(function(basePath) {
Expand Down