Merge pull request #147 from hshoff/harry-fix-tests

[hierarchy] fix name collisions

package.json

@@ -1,15 +1,5 @@
 {
-  "devDependencies": {
-    "babel-jest": "^20.0.3",
-    "coveralls": "^2.13.1",
-    "jest": "^20.0.3",
-    "lerna": "2.1.2",
-    "react": "^15.5.4",
-    "react-addons-test-utils": "^15.5.1",
-    "react-dom": "^15.5.4",
-    "regenerator-runtime": "^0.10.5"
-  },
-  "name": "@vx/vx",
+  "name": "@vx/dev",
   "version": "0.0.1",
   "description": "Low-level visualization components",
   "main": "index.js",
@@ -41,5 +31,15 @@
     "charts"
   ],
   "author": "@hshoff",
-  "license": "MIT"
+  "license": "MIT",
+  "devDependencies": {
+    "babel-jest": "^20.0.3",
+    "coveralls": "^2.13.1",
+    "jest": "^20.0.3",
+    "lerna": "2.1.2",
+    "react": "^15.5.4",
+    "react-addons-test-utils": "^15.5.1",
+    "react-dom": "^15.5.4",
+    "regenerator-runtime": "^0.10.5"
+  }
 }

packages/vx-hierarchy/src/DefaultLink.js → packages/vx-hierarchy/src/HierarchyDefaultLink.js

@@ -1,6 +1,6 @@
 import React from "react";
 
-export default function DefaultLink({ link }) {
+export default function HierarchyDefaultLink({ link }) {
   return (
     <line
       x1={link.source.x}

packages/vx-hierarchy/src/DefaultNode.js → packages/vx-hierarchy/src/HierarchyDefaultNode.js

@@ -1,5 +1,5 @@
 import React from "react";
 
-export default function DefaultNode({ node }) {
+export default function HierarchyDefaultNode({ node }) {
   return <circle cx={node.x} cy={node.y} r={15} fill="#21D4FD" />;
 }

packages/vx-hierarchy/src/hierarchies/Cluster.js

@@ -2,8 +2,8 @@ import React from "react";
 import cx from "classnames";
 import { Group } from "@vx/group";
 import { cluster as d3cluster } from "d3-hierarchy";
-import DefaultLink from "../DefaultLink";
-import DefaultNode from "../DefaultNode";
+import DefaultLink from "../HierarchyDefaultLink";
+import DefaultNode from "../HierarchyDefaultNode";
 
 export default function Cluster({
   top,

packages/vx-hierarchy/src/hierarchies/Tree.js

@@ -2,8 +2,8 @@ import React from "react";
 import cx from "classnames";
 import { Group } from "@vx/group";
 import { tree as d3tree } from "d3-hierarchy";
-import DefaultLink from "../DefaultLink";
-import DefaultNode from "../DefaultNode";
+import DefaultLink from "../HierarchyDefaultLink";
+import DefaultNode from "../HierarchyDefaultNode";
 
 export default function Tree({
   top,

packages/vx-hierarchy/src/index.js

@@ -1,4 +1,4 @@
 export { default as Tree } from "./hierarchies/Tree";
 export { default as Cluster } from "./hierarchies/Cluster";
-export { default as DefaultLink } from "./DefaultLink";
-export { default as DefaultNode } from "./DefaultNode";
+export { default as HierarchyDefaultLink } from "./HierarchyDefaultLink";
+export { default as HierarchyDefaultNode } from "./HierarchyDefaultNode";

packages/vx-hierarchy/test/Defaults.test.js

@@ -1,13 +1,13 @@
-import { DefaultLink, DefaultNode } from "../src";
+import { HierarchyDefaultLink, HierarchyDefaultNode } from "../src";
 
 describe("<DefaultLink />", () => {
   test("it should be defined", () => {
-    expect(DefaultLink).toBeDefined();
+    expect(HierarchyDefaultLink).toBeDefined();
   });
 });
 
 describe("<DefaultNode />", () => {
   test("it should be defined", () => {
-    expect(DefaultNode).toBeDefined();
+    expect(HierarchyDefaultNode).toBeDefined();
   });
 });