Using the org versions of dagre & graphlib

dagrejs · Jun 2, 2023 · 27c2d7c · 27c2d7c
1 parent 10e37c7
commit 27c2d7c
Show file tree

Hide file tree

Showing 9 changed files with 8,359 additions and 426 deletions.
diff --git a/Makefile b/Makefile
@@ -23,7 +23,6 @@ DEMO_FILES = $(shell find demo -type f)
 SRC_FILES = index.js lib/version.js $(shell find lib -type f -name '*.js')
 BUILD_FILES = $(addprefix $(BUILD_DIR)/dist/, \
 		$(MOD).js $(MOD).min.js \
-		$(MOD).core.js $(MOD).core.min.js \
 		$(DEMO_FILES))
 
 DIRS = $(BUILD_DIR) $(BUILD_DIR)/dist $(BUILD_DIR)/dist/demo
@@ -45,7 +44,6 @@ test: browser-test demo-test node-test
 
 browser-test: $(BUILD_FILES)
 	$(KARMA) start --single-run $(KARMA_OPTS)
-	$(KARMA) start karma.core.conf.js --single-run $(KARMA_OPTS)
 
 demo-test: test/demo-test.js | $(BUILD_FILES)
 	echo $(PHANTOMJS) $<
@@ -63,12 +61,6 @@ $(BUILD_DIR)/dist/$(MOD).js: index.js $(SRC_FILES) | $(BUILD_DIR)/dist node_modu
 $(BUILD_DIR)/dist/$(MOD).min.js: $(BUILD_DIR)/dist/$(MOD).js | $(BUILD_DIR)/dist
 	@$(UGLIFY) $< --comments '@license' --source-map --output $@
 
-$(BUILD_DIR)/dist/$(MOD).core.js: index.js $(SRC_FILES) | $(BUILD_DIR)/dist node_modules
-	@$(BROWSERIFY) $< > $@ --no-bundle-external -s dagreD3
-
-$(BUILD_DIR)/dist/$(MOD).core.min.js: $(BUILD_DIR)/dist/$(MOD).core.js | $(BUILD_DIR)/dist
-	@$(UGLIFY) $< --comments '@license' --source-map --output $@
-
 $(BUILD_DIR)/dist/demo/%: demo/% | $(BUILD_DIR)/dist/demo
 	@cp $< $@
 

diff --git a/bower.json b/bower.json
@@ -21,8 +21,8 @@
   ],
   "dependencies": {
     "d3": "^5.14",
-    "dagre": "^0.8.5",
-    "graphlib": "^2.1.8",
+    "@dagrejs/dagre": "1.0.2",
+    "g@dagrejs/raphlib": "2.1.13",
     "lodash": "^4.17.15"
   }
 }
diff --git a/index.js b/index.js
@@ -21,8 +21,8 @@
  * THE SOFTWARE.
  */
 module.exports =  {
-  graphlib: require("./lib/graphlib"),
-  dagre: require("./lib/dagre"),
+  graphlib: require("@dagrejs/graphlib"),
+  dagre: require("@dagrejs/dagre"),
   intersect: require("./lib/intersect"),
   render: require("./lib/render"),
   util: require("./lib/util"),

diff --git a/karma.core.conf.js b/karma.core.conf.js
diff --git a/lib/dagre.js b/lib/dagre.js
diff --git a/lib/graphlib.js b/lib/graphlib.js
diff --git a/lib/render.js b/lib/render.js
@@ -1,6 +1,6 @@
 var _ = require("./lodash");
 var d3 = require("./d3");
-var layout = require("./dagre").layout;
+var layout = require("@dagrejs/dagre").layout;
 
 module.exports = render;