From 877d9ea21711412bd4fe9057784011b8d2771719 Mon Sep 17 00:00:00 2001 From: Bryce Gibson Date: Wed, 17 Jan 2018 14:19:57 +1100 Subject: [PATCH 01/14] Using require rather than importExtension for static analysis. --- generate/templates/templates/nodegit.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate/templates/templates/nodegit.js b/generate/templates/templates/nodegit.js index 15b8f322c..0c31b4a9a 100644 --- a/generate/templates/templates/nodegit.js +++ b/generate/templates/templates/nodegit.js @@ -102,10 +102,10 @@ require("./enums.js"); // Import extensions // [Manual] extensions -importExtension("filter_registry"); +require("./filter_registry"); {% each %} {% if type != "enum" %} - importExtension("{{ filename }}"); + require("./{{ filename }}"); {% endif %} {% endeach %} /* jshint ignore:start */ From b3c1edd08943370966190cb072f07698961c8a3a Mon Sep 17 00:00:00 2001 From: Bryce Gibson Date: Wed, 17 Jan 2018 14:21:58 +1100 Subject: [PATCH 02/14] Require as json, for bundling. --- generate/templates/templates/nodegit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate/templates/templates/nodegit.js b/generate/templates/templates/nodegit.js index 0c31b4a9a..7514d4b5a 100644 --- a/generate/templates/templates/nodegit.js +++ b/generate/templates/templates/nodegit.js @@ -136,7 +136,7 @@ require("./filter_registry"); promisify(exports); // Set version. -exports.version = require("../package").version; +exports.version = require("../package.json").version; // Expose Promise implementation. exports.Promise = Promise; From 692f377c43317ec70e150b8faadbcd7e72e32d21 Mon Sep 17 00:00:00 2001 From: Bryce Gibson Date: Wed, 17 Jan 2018 15:47:06 +1100 Subject: [PATCH 03/14] Namespace. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d15f8cc36..eb3280b51 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "nodegit", + "name": "@bryce-gibson/nodegit", "description": "Node.js libgit2 asynchronous native bindings", "version": "0.20.3", "homepage": "http://nodegit.org", From 2ab5dcd845e3b601f5e31e9574113e8b7e183a78 Mon Sep 17 00:00:00 2001 From: Bryce Gibson Date: Thu, 18 Jan 2018 13:13:50 +1100 Subject: [PATCH 04/14] HACK: only require actual js files. --- generate/scripts/generateNativeCode.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/generate/scripts/generateNativeCode.js b/generate/scripts/generateNativeCode.js index 30fc52707..28eba9e9f 100644 --- a/generate/scripts/generateNativeCode.js +++ b/generate/scripts/generateNativeCode.js @@ -117,7 +117,18 @@ module.exports = function generateNativeCode() { // Write out single purpose templates. utils.writeLocalFile("../binding.gyp", beautify(templates.binding.render(enabled)), "binding.gyp"); utils.writeFile(path.join(tempSrcDirPath, "nodegit.cc"), templates.nodegitCC.render(enabled), "nodegit.cc"); - utils.writeLocalFile("../lib/nodegit.js", beautify(templates.nodegitJS.render(enabled)), "nodegit.js"); + const nodegitjs = beautify(templates.nodegitJS.render(enabled)) + const nodegitjsOut = nodegitjs.split('\n').filter( (x) => { + const res = /require\(['"](\.\/[^'"]+)['"]\)/g.exec(x) + if(!res) return true + try { + require.resolve(`../../lib/${res[1].replace(/^\.\//, '')}`) + return true + } catch (e) { + return false + } + }).join('\n') + utils.writeLocalFile("../lib/nodegit.js", nodegitjsOut, "nodegit.js"); // Write out all the classes. enabled.forEach(function(idef) { if (idef.type && idef.type != "enum") { From 6f512b33f34ecbca716fde6f3f0694b5e773cf64 Mon Sep 17 00:00:00 2001 From: Bryce Gibson Date: Thu, 18 Jan 2018 13:16:01 +1100 Subject: [PATCH 05/14] v --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb3280b51..470122938 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@bryce-gibson/nodegit", "description": "Node.js libgit2 asynchronous native bindings", - "version": "0.20.3", + "version": "0.20.4", "homepage": "http://nodegit.org", "keywords": [ "libgit2", From 24655b3b7cb75c8b942744b8f9abfa33ea563fc6 Mon Sep 17 00:00:00 2001 From: Bryce Gibson Date: Thu, 18 Jan 2018 14:59:14 +1100 Subject: [PATCH 06/14] WIP, avoid circular deps. --- generate/templates/templates/nodegit.js | 16 ++++++++-------- lib/blame.js | 3 ++- lib/blob.js | 3 ++- lib/branch.js | 3 ++- lib/checkout.js | 3 ++- lib/cherrypick.js | 3 ++- lib/clone.js | 3 ++- lib/commit.js | 3 ++- lib/config.js | 3 ++- lib/convenient_hunks.js | 3 ++- lib/convenient_patch.js | 3 ++- lib/diff.js | 3 ++- lib/diff_file.js | 3 ++- lib/diff_line.js | 3 ++- lib/filter_registry.js | 3 ++- lib/index.js | 3 ++- lib/merge.js | 3 ++- lib/note.js | 3 ++- lib/object.js | 3 ++- lib/odb.js | 3 ++- lib/odb_object.js | 3 ++- lib/oid.js | 3 ++- lib/rebase.js | 3 ++- lib/reference.js | 3 ++- lib/remote.js | 3 ++- lib/repository.js | 3 ++- lib/reset.js | 3 ++- lib/revert.js | 3 ++- lib/revwalk.js | 3 ++- lib/signature.js | 3 ++- lib/stash.js | 3 ++- lib/status.js | 3 ++- lib/status_file.js | 3 ++- lib/status_list.js | 3 ++- lib/submodule.js | 3 ++- lib/tag.js | 3 ++- lib/tree.js | 3 ++- lib/tree_entry.js | 3 ++- lib/utils/lookup_wrapper.js | 3 ++- lib/utils/normalize_fetch_options.js | 3 ++- lib/utils/normalize_options.js | 3 ++- lib/utils/shallow_clone.js | 3 ++- 42 files changed, 90 insertions(+), 49 deletions(-) diff --git a/generate/templates/templates/nodegit.js b/generate/templates/templates/nodegit.js index 7514d4b5a..58fd28d01 100644 --- a/generate/templates/templates/nodegit.js +++ b/generate/templates/templates/nodegit.js @@ -91,21 +91,21 @@ var importExtension = function(name) { // Load up utils rawApi.Utils = {}; -require("./utils/lookup_wrapper"); -require("./utils/normalize_options"); -require("./utils/shallow_clone"); -require("./utils/normalize_fetch_options"); +require("./utils/lookup_wrapper")(module.exports); +require("./utils/normalize_options")(module.exports); +require("./utils/shallow_clone")(module.exports); +require("./utils/normalize_fetch_options")(module.exports); // Load up extra types; -require("./status_file"); -require("./enums.js"); +require("./status_file")(module.exports); +require("./enums.js")(module.exports); // Import extensions // [Manual] extensions -require("./filter_registry"); +require("./filter_registry")(module.exports); {% each %} {% if type != "enum" %} - require("./{{ filename }}"); + require("./{{ filename }}")(module.exports); {% endif %} {% endeach %} /* jshint ignore:start */ diff --git a/lib/blame.js b/lib/blame.js index 7893d0c87..8fdcdfb6a 100644 --- a/lib/blame.js +++ b/lib/blame.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var normalizeOptions = NodeGit.Utils.normalizeOptions; var Blame = NodeGit.Blame; @@ -17,3 +17,4 @@ Blame.file = function(repo, path, options) { return _file.call(this, repo, path, options); }; +} diff --git a/lib/blob.js b/lib/blob.js index 073623fdd..780349623 100644 --- a/lib/blob.js +++ b/lib/blob.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var Blob = NodeGit.Blob; var LookupWrapper = NodeGit.Utils.lookupWrapper; var TreeEntry = NodeGit.TreeEntry; @@ -40,3 +40,4 @@ Blob.prototype.filemode = function() { Blob.prototype.toString = function() { return this.content().toString(); }; +} diff --git a/lib/branch.js b/lib/branch.js index bc4b23443..1130a9246 100644 --- a/lib/branch.js +++ b/lib/branch.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var Branch = NodeGit.Branch; var _remoteName = Branch.remoteName; @@ -17,3 +17,4 @@ Branch.remoteName = function(repo, remoteRef) { return remoteNameBuffer.toString(); }); }; +} diff --git a/lib/checkout.js b/lib/checkout.js index dd94b3cfb..20be74d57 100644 --- a/lib/checkout.js +++ b/lib/checkout.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var normalizeOptions = NodeGit.Utils.normalizeOptions; var Checkout = NodeGit.Checkout; @@ -49,3 +49,4 @@ Checkout.tree = function(repo, treeish, options) { return _tree.call(this, repo, treeish, options); }; +} diff --git a/lib/cherrypick.js b/lib/cherrypick.js index cf003c2a5..920f0d223 100644 --- a/lib/cherrypick.js +++ b/lib/cherrypick.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var shallowClone = NodeGit.Utils.shallowClone; var normalizeOptions = NodeGit.Utils.normalizeOptions; @@ -71,3 +71,4 @@ Cherrypick.commit = function( mainline, merge_options); }; +} diff --git a/lib/clone.js b/lib/clone.js index d81e1a5da..541bd05bb 100644 --- a/lib/clone.js +++ b/lib/clone.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var shallowClone = NodeGit.Utils.shallowClone; var normalizeFetchOptions = NodeGit.Utils.normalizeFetchOptions; var normalizeOptions = NodeGit.Utils.normalizeOptions; @@ -45,3 +45,4 @@ Clone.clone = function(url, local_path, options) { .then(freeRepository) .then(openRepository); }; +} diff --git a/lib/commit.js b/lib/commit.js index 73d3f62b4..0cb1a8b63 100644 --- a/lib/commit.js +++ b/lib/commit.js @@ -1,4 +1,4 @@ -var events = require("events"); +module.exports = function(NodeGit) { var NodeGit = require("../"); var Commit = NodeGit.Commit; var LookupWrapper = NodeGit.Utils.lookupWrapper; @@ -252,3 +252,4 @@ Commit.prototype.timeMs = function() { Commit.prototype.toString = function() { return this.sha(); }; +} diff --git a/lib/config.js b/lib/config.js index 1527ede7b..f2fa96db2 100644 --- a/lib/config.js +++ b/lib/config.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var Config = NodeGit.Config; @@ -6,3 +6,4 @@ var Config = NodeGit.Config; Config.prototype.getString = function() { return this.getStringBuf.apply(this, arguments); }; +} diff --git a/lib/convenient_hunks.js b/lib/convenient_hunks.js index ef8070d06..55ee900a1 100644 --- a/lib/convenient_hunks.js +++ b/lib/convenient_hunks.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var ConvenientHunk = NodeGit.ConvenientHunk; @@ -59,3 +59,4 @@ var size = ConvenientHunk.prototype.size; * @return {Number} */ ConvenientHunk.prototype.size = size; +} diff --git a/lib/convenient_patch.js b/lib/convenient_patch.js index 1e825382b..c7346fa35 100644 --- a/lib/convenient_patch.js +++ b/lib/convenient_patch.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var ConvenientPatch = NodeGit.ConvenientPatch; @@ -129,3 +129,4 @@ var status = ConvenientPatch.prototype.status; * @return {Number} */ ConvenientPatch.prototype.status = status; +} diff --git a/lib/diff.js b/lib/diff.js index b393595f8..f2e8eaa5e 100644 --- a/lib/diff.js +++ b/lib/diff.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var Diff = NodeGit.Diff; var normalizeOptions = NodeGit.Utils.normalizeOptions; var Patch = NodeGit.Patch; @@ -111,3 +111,4 @@ Diff.prototype.findSimilar = function(opts) { Diff.prototype.patches = function() { return Patch.convenientFromDiff(this); }; +} diff --git a/lib/diff_file.js b/lib/diff_file.js index 34ce315ce..2bf81b91a 100644 --- a/lib/diff_file.js +++ b/lib/diff_file.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var DiffFile = NodeGit.DiffFile; @@ -36,3 +36,4 @@ var size = DiffFile.prototype.size; * @return {Number} */ DiffFile.prototype.size = size; +} diff --git a/lib/diff_line.js b/lib/diff_line.js index 83e434401..4863ce342 100644 --- a/lib/diff_line.js +++ b/lib/diff_line.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var DiffLine = NodeGit.DiffLine; var _rawContent = DiffLine.prototype.content; @@ -30,3 +30,4 @@ DiffLine.prototype.rawContent = function() { }; NodeGit.DiffLine = DiffLine; +} diff --git a/lib/filter_registry.js b/lib/filter_registry.js index 76dfba573..16490aa4b 100644 --- a/lib/filter_registry.js +++ b/lib/filter_registry.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var normalizeOptions = NodeGit.Utils.normalizeOptions; var FilterRegistry = NodeGit.FilterRegistry; @@ -40,3 +40,4 @@ FilterRegistry.unregister = function(name, callback) { return result; }, callback); }; +} diff --git a/lib/index.js b/lib/index.js index cb87784d3..f7a9c0282 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var Index = NodeGit.Index; @@ -32,3 +32,4 @@ Index.prototype.removeAll = function(pathspec, matchedCallback) { Index.prototype.updateAll = function(pathspec, matchedCallback) { return _updateAll.call(this, pathspec || "*", matchedCallback, null); }; +} diff --git a/lib/merge.js b/lib/merge.js index e9b9b5c18..fe60e3109 100644 --- a/lib/merge.js +++ b/lib/merge.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var normalizeOptions = NodeGit.Utils.normalizeOptions; var Merge = NodeGit.Merge; @@ -45,3 +45,4 @@ Merge.merge = function(repo, theirHead, mergeOpts, checkoutOpts) { return _merge.call(this, repo, theirHeads, theirHeads.length, mergeOpts, checkoutOpts); }; +} diff --git a/lib/note.js b/lib/note.js index 8e46427cf..f046041b3 100644 --- a/lib/note.js +++ b/lib/note.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var Note = NodeGit.Note; @@ -15,3 +15,4 @@ Note.foreach = function(repo, notesRef, callback) { return _foreach(repo, notesRef, wrapperCallback, null); }; +} diff --git a/lib/object.js b/lib/object.js index 85917987a..c685d7b2c 100644 --- a/lib/object.js +++ b/lib/object.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var Obj = NodeGit.Object; @@ -33,3 +33,4 @@ Obj.prototype.isTag = function() { Obj.prototype.isTree = function() { return this.type() == Obj.TYPE.TREE; }; +} diff --git a/lib/odb.js b/lib/odb.js index 8bbd15a62..7677f7943 100644 --- a/lib/odb.js +++ b/lib/odb.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var Odb = NodeGit.Odb; @@ -13,3 +13,4 @@ Odb.prototype.read = function(oid, callback) { return odbObject; }, callback); }; +} diff --git a/lib/odb_object.js b/lib/odb_object.js index cd5995eb5..ebdddb6fe 100644 --- a/lib/odb_object.js +++ b/lib/odb_object.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var OdbObject = NodeGit.OdbObject; @@ -7,3 +7,4 @@ OdbObject.prototype.toString = function(size) { return this.data().toBuffer(size).toString(); }; +} diff --git a/lib/oid.js b/lib/oid.js index fcbf9b48f..13fa2b217 100644 --- a/lib/oid.js +++ b/lib/oid.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var Oid = NodeGit.Oid; @@ -21,3 +21,4 @@ Oid.prototype.copy = function() { Oid.prototype.inspect = function() { return "[Oid " + this.allocfmt() + "]"; }; +} diff --git a/lib/rebase.js b/lib/rebase.js index 28882ea6c..d8d2efa0d 100644 --- a/lib/rebase.js +++ b/lib/rebase.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var Rebase = NodeGit.Rebase; var normalizeOptions = NodeGit.Utils.normalizeOptions; var shallowClone = NodeGit.Utils.shallowClone; @@ -94,3 +94,4 @@ Rebase.prototype.abort = function() { return _abort.call(this); }; +} diff --git a/lib/reference.js b/lib/reference.js index 8cfdded6c..dc91486a3 100644 --- a/lib/reference.js +++ b/lib/reference.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var LookupWrapper = NodeGit.Utils.lookupWrapper; var Reference = NodeGit.Reference; @@ -63,3 +63,4 @@ Reference.prototype.isValid = function() { Reference.prototype.toString = function() { return this.name(); }; +} diff --git a/lib/remote.js b/lib/remote.js index b7c897957..298dacdbb 100644 --- a/lib/remote.js +++ b/lib/remote.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var normalizeFetchOptions = NodeGit.Utils.normalizeFetchOptions; var normalizeOptions = NodeGit.Utils.normalizeOptions; var lookupWrapper = NodeGit.Utils.lookupWrapper; @@ -176,3 +176,4 @@ Remote.prototype.upload = function(refSpecs, opts) { return _upload.call(this, refSpecs, opts); }; +} diff --git a/lib/repository.js b/lib/repository.js index 56d2f5a6f..d4bba7083 100644 --- a/lib/repository.js +++ b/lib/repository.js @@ -1,4 +1,4 @@ -var promisify = require("promisify-node"); +module.exports = function(NodeGit) { var fse = promisify(require("fs-extra")); var fp = require("lodash/fp"); var NodeGit = require("../"); @@ -1867,3 +1867,4 @@ Repository.prototype.treeBuilder = function() { return builder; }; +} diff --git a/lib/reset.js b/lib/reset.js index df770304a..55330315e 100644 --- a/lib/reset.js +++ b/lib/reset.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var normalizeOptions = NodeGit.Utils.normalizeOptions; var Reset = NodeGit.Reset; @@ -73,3 +73,4 @@ Reset.fromAnnotated = function(repo, target, resetType, opts) { return _fromAnnotated.call(this, repo, target, resetType, opts); }; +} diff --git a/lib/revert.js b/lib/revert.js index 2dddb2cee..c3f039794 100644 --- a/lib/revert.js +++ b/lib/revert.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var shallowClone = NodeGit.Utils.shallowClone; var normalizeOptions = NodeGit.Utils.normalizeOptions; @@ -83,3 +83,4 @@ Revert.revert = function(repo, commit, revertOpts) { return _revert.call(this, repo, commit, revertOpts); }; +} diff --git a/lib/revwalk.js b/lib/revwalk.js index a12d9f7f4..ddcf91ea9 100644 --- a/lib/revwalk.js +++ b/lib/revwalk.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var Revwalk = NodeGit.Revwalk; Object.defineProperty(Revwalk.prototype, "repo", { @@ -140,3 +140,4 @@ Revwalk.prototype.walk = function(oid, callback) { walk(); }; +} diff --git a/lib/signature.js b/lib/signature.js index 7fc8e274d..4c6aa8fa4 100644 --- a/lib/signature.js +++ b/lib/signature.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var Signature = NodeGit.Signature; /** @@ -9,3 +9,4 @@ var Signature = NodeGit.Signature; Signature.prototype.toString = function() { return this.name().toString() + " <" + this.email().toString() + ">"; }; +} diff --git a/lib/stash.js b/lib/stash.js index 7067b24ce..558fb29eb 100644 --- a/lib/stash.js +++ b/lib/stash.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var normalizeOptions = NodeGit.Utils.normalizeOptions; var shallowClone = NodeGit.Utils.shallowClone; var Stash = NodeGit.Stash; @@ -60,3 +60,4 @@ Stash.pop = function(repo, index, options) { return _pop(repo, index, options); }; +} diff --git a/lib/status.js b/lib/status.js index c5c762baa..2002c3291 100644 --- a/lib/status.js +++ b/lib/status.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var normalizeOptions = NodeGit.Utils.normalizeOptions; var Status = NodeGit.Status; @@ -16,3 +16,4 @@ Status.foreachExt = function(repo, opts, callback) { opts = normalizeOptions(opts, NodeGit.StatusOptions); return _foreachExt(repo, opts, callback, null); }; +} diff --git a/lib/status_file.js b/lib/status_file.js index ac6b124e3..1018baaf8 100644 --- a/lib/status_file.js +++ b/lib/status_file.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var Status = NodeGit.Status; var StatusFile = function(args) { @@ -104,3 +104,4 @@ var StatusFile = function(args) { }; NodeGit.StatusFile = StatusFile; +} diff --git a/lib/status_list.js b/lib/status_list.js index efccbad2e..543cb73e1 100644 --- a/lib/status_list.js +++ b/lib/status_list.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var normalizeOptions = NodeGit.Utils.normalizeOptions; var StatusList = NodeGit.StatusList; @@ -10,3 +10,4 @@ StatusList.create = function(repo, opts) { opts = normalizeOptions(opts, NodeGit.StatusOptions); return _create(repo, opts); }; +} diff --git a/lib/submodule.js b/lib/submodule.js index 92b0e6ec0..5e64d8c88 100644 --- a/lib/submodule.js +++ b/lib/submodule.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var normalizeFetchOptions = NodeGit.Utils.normalizeFetchOptions; var normalizeOptions = NodeGit.Utils.normalizeOptions; var shallowClone = NodeGit.Utils.shallowClone; @@ -49,3 +49,4 @@ Submodule.prototype.update = function(init, options) { return _update.call(this, init, options); }; +} diff --git a/lib/tag.js b/lib/tag.js index bf8ddff49..99c1fe071 100644 --- a/lib/tag.js +++ b/lib/tag.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { var LookupWrapper = NodeGit.Utils.lookupWrapper; var Tag = NodeGit.Tag; @@ -10,3 +10,4 @@ var Tag = NodeGit.Tag; * @return {Tag} */ Tag.lookup = LookupWrapper(Tag); +} diff --git a/lib/tree.js b/lib/tree.js index 1be687075..3563b9265 100644 --- a/lib/tree.js +++ b/lib/tree.js @@ -1,4 +1,4 @@ -var path = require("path"); +module.exports = function(NodeGit) { var events = require("events"); var NodeGit = require("../"); var Diff = NodeGit.Diff; @@ -186,3 +186,4 @@ Tree.prototype.walk = function(blobsOnly) { return event; }; +} diff --git a/lib/tree_entry.js b/lib/tree_entry.js index a65d85172..fa0e48f7c 100644 --- a/lib/tree_entry.js +++ b/lib/tree_entry.js @@ -1,4 +1,4 @@ -var path = require("path"); +module.exports = function(NodeGit) { var NodeGit = require("../"); var TreeEntry = NodeGit.TreeEntry; @@ -108,3 +108,4 @@ TreeEntry.prototype.sha = function() { TreeEntry.prototype.toString = function() { return this.path(); }; +} diff --git a/lib/utils/lookup_wrapper.js b/lib/utils/lookup_wrapper.js index eee4dd768..6d48ac7e5 100644 --- a/lib/utils/lookup_wrapper.js +++ b/lib/utils/lookup_wrapper.js @@ -1,4 +1,4 @@ -var NodeGit = require("../../"); +module.exports = function(NodeGit) { /** * Wraps a method so that you can pass in either a string, OID or the object @@ -37,3 +37,4 @@ function lookupWrapper(objectType, lookupFunction) { } NodeGit.Utils.lookupWrapper = lookupWrapper; +} diff --git a/lib/utils/normalize_fetch_options.js b/lib/utils/normalize_fetch_options.js index 2b4370705..90f650282 100644 --- a/lib/utils/normalize_fetch_options.js +++ b/lib/utils/normalize_fetch_options.js @@ -1,4 +1,4 @@ -var NodeGit = require("../../"); +module.exports = function(NodeGit) { var normalizeOptions = NodeGit.Utils.normalizeOptions; var shallowClone = NodeGit.Utils.shallowClone; @@ -41,3 +41,4 @@ function normalizeFetchOptions(options) { } NodeGit.Utils.normalizeFetchOptions = normalizeFetchOptions; +} diff --git a/lib/utils/normalize_options.js b/lib/utils/normalize_options.js index a1a46255c..48377ab4c 100644 --- a/lib/utils/normalize_options.js +++ b/lib/utils/normalize_options.js @@ -1,4 +1,4 @@ -var NodeGit = require("../../"); +module.exports = function(NodeGit) { /** * Normalize an object to match a struct. @@ -27,3 +27,4 @@ function normalizeOptions(options, Ctor) { } NodeGit.Utils.normalizeOptions = normalizeOptions; +} diff --git a/lib/utils/shallow_clone.js b/lib/utils/shallow_clone.js index 0dbe4113e..8e20bfb7a 100644 --- a/lib/utils/shallow_clone.js +++ b/lib/utils/shallow_clone.js @@ -1,4 +1,4 @@ -var NodeGit = require("../../"); +module.exports = function(NodeGit) { function shallowClone() { var merges = Array.prototype.slice.call(arguments); @@ -12,3 +12,4 @@ function shallowClone() { } NodeGit.Utils.shallowClone = shallowClone; +} From 57a12763dbcd17fff767765520bdaa242253fd5f Mon Sep 17 00:00:00 2001 From: Bryce Gibson Date: Thu, 18 Jan 2018 14:59:27 +1100 Subject: [PATCH 07/14] Version. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 470122938..157708912 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@bryce-gibson/nodegit", "description": "Node.js libgit2 asynchronous native bindings", - "version": "0.20.4", + "version": "0.20.5", "homepage": "http://nodegit.org", "keywords": [ "libgit2", From a2fdff6ef7991033424f2d6bb7268203fcf71fa4 Mon Sep 17 00:00:00 2001 From: Bryce Gibson Date: Thu, 18 Jan 2018 15:08:22 +1100 Subject: [PATCH 08/14] Update template. --- generate/templates/templates/enums.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/generate/templates/templates/enums.js b/generate/templates/templates/enums.js index cfb95ebd2..0466829a1 100644 --- a/generate/templates/templates/enums.js +++ b/generate/templates/templates/enums.js @@ -1,4 +1,4 @@ -var NodeGit = require("../"); +module.exports = function(NodeGit) { NodeGit.Enums = {}; {% each . as enumerable %} @@ -12,3 +12,4 @@ NodeGit.Enums = {}; {% endif %} {% endif %} {% endeach %} +} From 84e62f91438ee6d9a5fd65d95b6f98503fabc6aa Mon Sep 17 00:00:00 2001 From: Bryce Gibson Date: Thu, 18 Jan 2018 15:08:43 +1100 Subject: [PATCH 09/14] Version. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 157708912..665b253be 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@bryce-gibson/nodegit", "description": "Node.js libgit2 asynchronous native bindings", - "version": "0.20.5", + "version": "0.20.6", "homepage": "http://nodegit.org", "keywords": [ "libgit2", From f3e1563f3424c6d0897fbd9d89d32a02495044e3 Mon Sep 17 00:00:00 2001 From: Bryce Gibson Date: Thu, 18 Jan 2018 15:09:33 +1100 Subject: [PATCH 10/14] Version. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 665b253be..9a8672135 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@bryce-gibson/nodegit", "description": "Node.js libgit2 asynchronous native bindings", - "version": "0.20.6", + "version": "0.20.7", "homepage": "http://nodegit.org", "keywords": [ "libgit2", From cd7f447c5dc215caca72415b8cbeb573feefa407 Mon Sep 17 00:00:00 2001 From: Bryce Gibson Date: Thu, 18 Jan 2018 15:24:29 +1100 Subject: [PATCH 11/14] Bugfix, macro fix - replace correct line. --- lib/commit.js | 2 +- lib/repository.js | 4 ++-- lib/tree.js | 4 ++-- lib/tree_entry.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/commit.js b/lib/commit.js index 0cb1a8b63..5f9842b24 100644 --- a/lib/commit.js +++ b/lib/commit.js @@ -1,5 +1,5 @@ +var events = require("events"); module.exports = function(NodeGit) { -var NodeGit = require("../"); var Commit = NodeGit.Commit; var LookupWrapper = NodeGit.Utils.lookupWrapper; diff --git a/lib/repository.js b/lib/repository.js index d4bba7083..552c677db 100644 --- a/lib/repository.js +++ b/lib/repository.js @@ -1,7 +1,7 @@ -module.exports = function(NodeGit) { +var promisify = require("promisify-node"); var fse = promisify(require("fs-extra")); var fp = require("lodash/fp"); -var NodeGit = require("../"); +module.exports = function(NodeGit) { var Blob = NodeGit.Blob; var Checkout = NodeGit.Checkout; var Commit = NodeGit.Commit; diff --git a/lib/tree.js b/lib/tree.js index 3563b9265..503997388 100644 --- a/lib/tree.js +++ b/lib/tree.js @@ -1,6 +1,6 @@ -module.exports = function(NodeGit) { +var path = require("path"); var events = require("events"); -var NodeGit = require("../"); +module.exports = function(NodeGit) { var Diff = NodeGit.Diff; var LookupWrapper = NodeGit.Utils.lookupWrapper; var Tree = NodeGit.Tree; diff --git a/lib/tree_entry.js b/lib/tree_entry.js index fa0e48f7c..0193846f7 100644 --- a/lib/tree_entry.js +++ b/lib/tree_entry.js @@ -1,5 +1,5 @@ +var path = require("path"); module.exports = function(NodeGit) { -var NodeGit = require("../"); var TreeEntry = NodeGit.TreeEntry; /** From 1cded259b6d3e1d705f3757ede55c0621a02aff0 Mon Sep 17 00:00:00 2001 From: Bryce Gibson Date: Thu, 18 Jan 2018 15:24:43 +1100 Subject: [PATCH 12/14] Version. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9a8672135..a86dff65c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@bryce-gibson/nodegit", "description": "Node.js libgit2 asynchronous native bindings", - "version": "0.20.7", + "version": "0.20.8", "homepage": "http://nodegit.org", "keywords": [ "libgit2", From 0ec956d9797fc28b3ea53bd44558fe073569de7c Mon Sep 17 00:00:00 2001 From: Bryce Gibson Date: Thu, 18 Jan 2018 21:14:19 +1100 Subject: [PATCH 13/14] Force version to use upstream v. --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index a86dff65c..eac5c63a0 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,8 @@ "binary": { "module_name": "nodegit", "module_path": "./build/Release/", - "host": "https://nodegit.s3.amazonaws.com/nodegit/nodegit/" + "host": "https://nodegit.s3.amazonaws.com/nodegit/nodegit/", + "package_name": "{module_name}-v0.20.3-{node_abi}-{platform}-{arch}.tar.gz" }, "scripts": { "babel": "babel --presets es2015 -d ./dist ./lib", From 68a86b864c45c02a6cf64d52346df588d503efb9 Mon Sep 17 00:00:00 2001 From: Bryce Gibson Date: Thu, 18 Jan 2018 21:14:36 +1100 Subject: [PATCH 14/14] Version. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eac5c63a0..51f9bde7c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@bryce-gibson/nodegit", "description": "Node.js libgit2 asynchronous native bindings", - "version": "0.20.8", + "version": "0.20.9", "homepage": "http://nodegit.org", "keywords": [ "libgit2",