Skip to content

Commit

Permalink
Add require to d3.js
Browse files Browse the repository at this point in the history
  • Loading branch information
lutzroeder committed Dec 30, 2017
1 parent 1e389a3 commit 6d4f686
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 2 deletions.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
MOD = dagre-d3

NODE = node
NPM = npm
BROWSERIFY = ./node_modules/browserify/bin/cmd.js
ISTANBUL = ./node_modules/istanbul/lib/cli.js
Expand Down Expand Up @@ -37,7 +38,7 @@ lib/version.js: package.json
$(DIRS):
@mkdir -p $@

test: browser-test demo-test
test: browser-test demo-test node-test

browser-test: $(BUILD_FILES)
$(KARMA) start --single-run $(KARMA_OPTS)
Expand All @@ -46,6 +47,9 @@ browser-test: $(BUILD_FILES)
demo-test: test/demo-test.js | $(BUILD_FILES)
$(PHANTOMJS) $<

node-test: test/node-test.js | $(BUILD_FILES)
$(NODE) $<

bower.json: package.json src/release/make-bower.json.js
@src/release/make-bower.json.js > $@

Expand Down
18 changes: 17 additions & 1 deletion lib/d3.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
// Stub to get D3 either via NPM or from the global object
module.exports = window.d3;
var d3;

if (!d3) {
if (require) {
try {
d3 = require("d3");
}
catch (e) {
}
}
}

if (!d3) {
d3 = window.d3;
}

module.exports = d3;
1 change: 1 addition & 0 deletions lib/render.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var _ = require("./lodash"),
d3 = require("./d3"),
layout = require("./dagre").layout;

module.exports = render;
Expand Down
2 changes: 2 additions & 0 deletions test/node-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
var dagreD3 = require("../build/dist/dagre-d3");
var dagreD3Core = require("../build/dist/dagre-d3.core");

0 comments on commit 6d4f686

Please sign in to comment.