Using the org versions of dagre & graphlib

.eslintrc.json

@@ -1,10 +1,14 @@
 {
+  "extends": "eslint:recommended",
   "env": {
     "browser": true,
-    "node": true,
-    "mocha": true
+    "es6": true,
+    "mocha": true,
+    "node": true
+  },
+  "parserOptions": {
+    "ecmaVersion": "latest"
   },
-  "extends": "eslint:recommended",
   "rules": {
     "indent": [ "error", 2 ],
     "linebreak-style": [ "error", "unix" ],

.github/workflows/build.yml

@@ -11,16 +11,18 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node-version: [12.x]
+        node-version: [18.x]
 
     steps:
     - uses: actions/checkout@v2
     - uses: browser-actions/setup-firefox@latest
 
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+        cache-dependency-path: package-lock.json
 
     - name: Install dependencies
       run: |

.jshintrc

@@ -1,13 +1,19 @@
 {
-    "eqeqeq": true,
-    "newcap": true,
-    "quotmark": true,
-    "unused": true,
-    "trailing": true,
-    "laxbreak": true,
-    "node": true,
-    "expr": true,
-    "globals": {
-        "location": false
-    }
+  "camelcase": true,
+  "eqeqeq": true,
+  "expr": true,
+  "freeze": true,
+  "immed": true,
+  "laxbreak": true,
+  "newcap": true,
+  "noarg": true,
+  "node": true,
+  "quotmark": "double",
+  "trailing": true,
+  "undef": true,
+  "unused": true,
+
+  "globals": {
+    "location": false
+  }
 }

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 $< $@
 

README.md

@@ -1,10 +1,3 @@
-
-# Important!
-
-**This project does not have a maintainer or active project members. There won’t be any support or attention to pull requests. Please do not contact previous maintainers unless you are qualified and have the resources to make a serious commitment to fully take over ownership of the project.**
-
-
-
 # dagre-d3 - A D3-based renderer for dagre
 
 [![Build Status](https://github.com/dagrejs/dagre-d3/workflows/Build%20Status/badge.svg?branch=master)](https://github.com/dagrejs/dagre-d3/actions?query=workflow%3A%22Build+Status%22)

bower.json

@@ -2,7 +2,7 @@
   "name": "dagre-d3",
   "version": "0.6.4",
   "main": [
-    "dist/dagre-d3.core.js"
+    "dist/dagre-d3.js"
   ],
   "ignore": [
     ".*",
@@ -20,9 +20,9 @@
     "test/**"
   ],
   "dependencies": {
-    "d3": "^5.14",
-    "dagre": "^0.8.5",
-    "graphlib": "^2.1.8",
+    "d3": "^7.8.5",
+    "@dagrejs/dagre": "1.0.2",
+    "@dagrejs/graphlib": "2.1.13",
     "lodash": "^4.17.15"
   }
 }

index.d.ts

@@ -0,0 +1,146 @@
+// Type definitions for dagre-d3.js 0.6
+// Project: https://github.com/dagrejs/dagre-d3
+// Definitions by: Matthew Simmons <https://github.com/simmonmt>
+//                 Mark Wong Siang Kai <https://github.com/markwongsk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import {
+  BaseType,
+  Selection,
+  SelectionOrTransition,
+  ValueFn,
+} from "d3";
+import * as dagre from "dagre";
+import * as graphlib from "graphlib";
+
+export as namespace dagreD3;
+
+export {
+  dagre as dagre,
+  graphlib as graphlib,
+};
+
+export interface Point {
+  x: number;
+  y: number;
+}
+
+export const intersect: {
+  node: (node: dagre.Node, point: any) => any;
+
+  circle: (
+    node: dagre.Node,
+    rx: number,
+    point: Point,
+  ) => Point;
+
+  ellipse: (
+    node: dagre.Node,
+    rx: number,
+    ry: number,
+    point: Point,
+  ) => Point;
+
+  polygon: (
+    node: dagre.Node,
+    polyPoints: Point[],
+    point: Point,
+  ) => Point;
+
+  rect: (
+    node: dagre.Node,
+    point: Point,
+  ) => Point;
+};
+
+export const render: { new(): Render };
+
+export const util: {
+  isSubgraph: (g: dagre.graphlib.Graph<any>, v: string) => boolean,
+
+  edgeToId: (e: {v: string, w: string, name: string}) => string,
+
+  applyStyle: <GElement extends BaseType, Datum>(
+    dom: Selection<GElement, Datum, any, any>,
+    styleFn: ValueFn<GElement, Datum, string | number | boolean | null>,
+  ) => void,
+
+  applyClass: <GElement extends BaseType, Datum>(
+    dom: Selection<GElement, Datum, any, any>,
+    classFn: ValueFn<GElement, Datum, string | number | boolean | null>,
+    otherClasses: string,
+  ) => void,
+
+  applyTransition: <GElement extends BaseType, Datum, PElement extends BaseType, PDatum>(
+    selection: Selection<GElement, Datum, PElement, PDatum>,
+    g: dagre.graphlib.Graph<any>,
+  ) => SelectionOrTransition<GElement, Datum, PElement, PDatum>,
+};
+
+export type CreateNodes = (
+  selection: Selection<SVGGElement, string, any, any>,
+  g: dagre.graphlib.Graph<any>,
+  shapes: Shapes,
+) => SelectionOrTransition<BaseType, any, any, any>;
+
+export type CreateClusters = (
+  selection: Selection<SVGGElement, string, any, any>,
+  g: dagre.graphlib.Graph<any>,
+) => SelectionOrTransition<BaseType, any, any, any>;
+
+export type CreateEdgeLabels = (
+  selection: Selection<SVGGElement, string, any, any>,
+  g: dagre.graphlib.Graph<any>,
+) => SelectionOrTransition<BaseType, any, any, any>;
+
+export type CreateEdgePaths = (
+  selection: Selection<SVGGElement, string, any, any>,
+  g: dagre.graphlib.Graph<any>,
+  arrows: Arrows,
+) => SelectionOrTransition<BaseType, any, any, any>;
+
+export type Arrow = (
+  parent: Selection<any, any, any, any>,
+  id: string,
+  edge: dagre.Edge,
+  type: string,
+) => void;
+
+export interface Arrows {
+  [arrowStyleName: string]: Arrow;
+}
+
+export type Shape = (
+  parent: Selection<any, string, any, any>,
+  bbox: any,
+  node: dagre.Node,
+) => Selection<any, string, any, any>;
+
+export interface Shapes {
+  [shapeStyleName: string]: Shape;
+}
+
+export interface Render {
+  // see https://dagrejs.github.io/project/dagre-d3/latest/demo/user-defined.html for example usage
+
+  (selection: Selection<any, any, any, any>, g: dagre.graphlib.Graph<any>): void;
+
+  createNodes(): CreateNodes;
+  createNodes(value: CreateNodes): Render;
+
+  createClusters(): CreateClusters;
+  createClusters(value: CreateClusters): Render;
+
+  createEdgeLabels(): CreateEdgeLabels;
+  createEdgeLabels(value: CreateEdgeLabels): Render;
+
+  createEdgePaths(): CreateEdgePaths;
+  createEdgePaths(value: CreateEdgePaths): Render;
+
+  arrows(): Arrows;
+  arrows(value: Arrows): Render;
+
+  shapes(): Shapes;
+  shapes(value: Shapes): Render;
+}

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"),