Skip to content

Fixed protobuf imports with respect to root_dir #13

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

Open
bydga wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed protobuf imports with respect to root_dir #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = function(proto, opts) {
if (!opts) opts = {}
if (!proto) throw new Error('Pass in a .proto string or a protobuf-schema parsed object')

var sch = (typeof proto === 'object' && !Buffer.isBuffer(proto)) ? proto : schema.parse(proto)
var sch = (typeof proto === 'object' && !Buffer.isBuffer(proto)) ? proto : schema.parse(proto, opts)

// to not make toString,toJSON enumarable we make a fire-and-forget prototype
var Messages = function() {
Expand Down
2 changes: 1 addition & 1 deletion require.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ var protobuf = require('./')
delete require.cache[require.resolve(__filename)]

module.exports = function(filename, opts) {
return protobuf(resolve.sync(path.resolve(path.dirname(module.parent.filename), filename)), opts)
return protobuf(resolve.sync(path.resolve(path.dirname(module.parent.filename), filename), opts))
}