Merge pull request #178 from hshoff/harry-r16

[deps][test] use react 16 in dev, fix travis test run script. fixes #171

.travis.yml

@@ -1,6 +1,8 @@
+git:
+  depth: 10
 language: node_js
 node_js:
-  - "6"
+  - "8"
 cache:
   directories:
     - node_modules

package.json

@@ -4,7 +4,7 @@
   "description": "Low-level visualization components",
   "main": "index.js",
   "scripts": {
-    "test": "lerna exec npm install && jest",
+    "test": "lerna clean --yes && lerna bootstrap && lerna exec npm run test",
     "docs": "node ./scripts/docs/index.js",
     "prepare-release": "git checkout master && git pull --rebase origin master && npm run docs && lerna updated",
     "release": "npm run prepare-release && lerna publish --exact"

packages/vx-annotation/package.json

@@ -29,13 +29,15 @@
   },
   "homepage": "https://github.com/hshoff/vx#readme",
   "devDependencies": {
-    "babel-jest": "^20.0.3",
-    "enzyme": "^2.8.2",
-    "jest": "^20.0.3",
-    "react": "^15.0.0-0 || ^16.0.0-0",
-    "react-addons-test-utils": "15.4.2",
+    "babel-jest": "^21.2.0",
+    "enzyme": "^3.1.0",
+    "enzyme-adapter-react-16": "^1.0.2",
+    "jest": "^21.2.1",
+    "raf": "^3.4.0",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
     "react-fatigue-dev": "github:tj/react-fatigue-dev",
-    "react-test-renderer": "^15.6.1",
+    "react-test-renderer": "^16.0.0",
     "react-tools": "^0.10.0",
     "regenerator-runtime": "^0.10.5"
   },
@@ -51,5 +53,11 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "jest": {
+    "setupFiles": [
+      "raf/polyfill",
+      "<rootDir>/test/enzyme-setup.js"
+    ]
   }
 }

packages/vx-annotation/test/enzyme-setup.js

@@ -0,0 +1,4 @@
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+Enzyme.configure({ adapter: new Adapter() });

packages/vx-axis/package.json

@@ -36,12 +36,15 @@
     "prop-types": "15.5.10"
   },
   "devDependencies": {
-    "babel-jest": "^20.0.3",
-    "enzyme": "^2.8.2",
-    "jest": "^20.0.3",
-    "react": "^15.0.0-0 || ^16.0.0-0",
+    "babel-jest": "^21.2.0",
+    "enzyme": "^3.1.0",
+    "enzyme-adapter-react-16": "^1.0.2",
+    "jest": "^21.2.1",
+    "raf": "^3.4.0",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
     "react-fatigue-dev": "github:tj/react-fatigue-dev",
-    "react-test-renderer": "^15.6.1",
+    "react-test-renderer": "^16.0.0",
     "react-tools": "^0.10.0",
     "regenerator-runtime": "^0.10.5"
   },
@@ -50,5 +53,11 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "jest": {
+    "setupFiles": [
+      "raf/polyfill",
+      "<rootDir>/test/enzyme-setup.js"
+    ]
   }
 }

packages/vx-axis/test/enzyme-setup.js

@@ -0,0 +1,4 @@
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+Enzyme.configure({ adapter: new Adapter() });

packages/vx-bounds/package.json

@@ -32,12 +32,14 @@
   },
   "devDependencies": {
     "babel-jest": "^20.0.3",
-    "enzyme": "^2.8.2",
-    "jest": "^20.0.3",
-    "react": "^15.0.0-0 || ^16.0.0-0",
-    "react-dom": "^15.0.0-0 || ^16.0.0-0",
+    "enzyme": "^3.1.0",
+    "enzyme-adapter-react-16": "^1.0.2",
+    "jest": "^21.2.1",
+    "raf": "^3.4.0",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
     "react-fatigue-dev": "github:tj/react-fatigue-dev",
-    "react-test-renderer": "^15.6.1",
+    "react-test-renderer": "^16.0.0",
     "react-tools": "^0.10.0",
     "regenerator-runtime": "^0.10.5"
   },
@@ -47,5 +49,11 @@
   "peerDependencies": {
     "react": "^15.0.0-0 || ^16.0.0-0",
     "react-dom": "^15.0.0-0 || ^16.0.0-0"
+  },
+  "jest": {
+    "setupFiles": [
+      "raf/polyfill",
+      "<rootDir>/test/enzyme-setup.js"
+    ]
   }
 }

packages/vx-bounds/test/enzyme-setup.js

@@ -0,0 +1,4 @@
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+Enzyme.configure({ adapter: new Adapter() });

packages/vx-boxplot/package.json

@@ -30,12 +30,15 @@
     "classnames": "^2.2.5"
   },
   "devDependencies": {
-    "babel-jest": "^20.0.3",
-    "enzyme": "^2.8.2",
-    "jest": "^20.0.3",
-    "react": "^15.0.0-0 || ^16.0.0-0",
+    "babel-jest": "^21.2.0",
+    "enzyme": "^3.1.0",
+    "enzyme-adapter-react-16": "^1.0.2",
+    "jest": "^21.2.1",
+    "raf": "^3.4.0",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
     "react-fatigue-dev": "github:tj/react-fatigue-dev",
-    "react-test-renderer": "^15.6.1",
+    "react-test-renderer": "^16.0.0",
     "react-tools": "^0.10.0",
     "regenerator-runtime": "^0.10.5"
   },
@@ -44,5 +47,11 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "jest": {
+    "setupFiles": [
+      "raf/polyfill",
+      "<rootDir>/test/enzyme-setup.js"
+    ]
   }
 }

packages/vx-boxplot/test/enzyme-setup.js

@@ -0,0 +1,4 @@
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+Enzyme.configure({ adapter: new Adapter() });

packages/vx-brush/package.json

@@ -32,12 +32,15 @@
     "access": "public"
   },
   "devDependencies": {
-    "babel-jest": "^20.0.3",
-    "enzyme": "^2.8.2",
-    "jest": "^20.0.3",
-    "react": "^15.0.0-0 || ^16.0.0-0",
+    "babel-jest": "^21.2.0",
+    "enzyme": "^3.1.0",
+    "enzyme-adapter-react-16": "^1.0.2",
+    "jest": "^21.2.1",
+    "raf": "^3.4.0",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
     "react-fatigue-dev": "github:tj/react-fatigue-dev",
-    "react-test-renderer": "^15.6.1",
+    "react-test-renderer": "^16.0.0",
     "react-tools": "^0.10.0",
     "regenerator-runtime": "^0.10.5"
   },
@@ -47,5 +50,11 @@
   "dependencies": {
     "classnames": "^2.2.5",
     "recompose": "^0.23.1"
+  },
+  "jest": {
+    "setupFiles": [
+      "raf/polyfill",
+      "<rootDir>/test/enzyme-setup.js"
+    ]
   }
 }

packages/vx-brush/test/enzyme-setup.js

@@ -0,0 +1,4 @@
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+Enzyme.configure({ adapter: new Adapter() });

packages/vx-clip-path/package.json

@@ -30,12 +30,15 @@
   },
   "homepage": "https://github.com/hshoff/vx#readme",
   "devDependencies": {
-    "babel-jest": "^20.0.3",
-    "enzyme": "^2.8.2",
-    "jest": "^20.0.3",
-    "react": "^15.0.0-0 || ^16.0.0-0",
-    "react-addons-test-utils": "15.4.2",
+    "babel-jest": "^21.2.0",
+    "enzyme": "^3.1.0",
+    "enzyme-adapter-react-16": "^1.0.2",
+    "jest": "^21.2.1",
+    "raf": "^3.4.0",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
     "react-fatigue-dev": "github:tj/react-fatigue-dev",
+    "react-test-renderer": "^16.0.0",
     "react-tools": "^0.10.0",
     "regenerator-runtime": "^0.10.5"
   },
@@ -44,5 +47,11 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "jest": {
+    "setupFiles": [
+      "raf/polyfill",
+      "<rootDir>/test/enzyme-setup.js"
+    ]
   }
 }

packages/vx-clip-path/test/enzyme-setup.js

@@ -0,0 +1,4 @@
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+Enzyme.configure({ adapter: new Adapter() });

packages/vx-curve/package.json

@@ -25,12 +25,25 @@
     "d3-shape": "^1.0.6"
   },
   "devDependencies": {
-    "babel-jest": "^20.0.3",
-    "jest": "^20.0.3",
+    "babel-jest": "^21.2.0",
+    "enzyme": "^3.1.0",
+    "enzyme-adapter-react-16": "^1.0.2",
+    "jest": "^21.2.1",
+    "raf": "^3.4.0",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
     "react-fatigue-dev": "github:tj/react-fatigue-dev",
+    "react-test-renderer": "^16.0.0",
+    "react-tools": "^0.10.0",
     "regenerator-runtime": "^0.10.5"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "jest": {
+    "setupFiles": [
+      "raf/polyfill",
+      "<rootDir>/test/enzyme-setup.js"
+    ]
   }
 }

packages/vx-curve/test/enzyme-setup.js

@@ -0,0 +1,4 @@
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+Enzyme.configure({ adapter: new Adapter() });

packages/vx-drag/package.json

@@ -32,16 +32,25 @@
     "access": "public"
   },
   "devDependencies": {
-    "babel-jest": "^20.0.3",
-    "enzyme": "^2.8.2",
-    "jest": "^20.0.3",
-    "react": "^15.0.0-0 || ^16.0.0-0",
+    "babel-jest": "^21.2.0",
+    "enzyme": "^3.1.0",
+    "enzyme-adapter-react-16": "^1.0.2",
+    "jest": "^21.2.1",
+    "raf": "^3.4.0",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
     "react-fatigue-dev": "github:tj/react-fatigue-dev",
-    "react-test-renderer": "^15.6.1",
+    "react-test-renderer": "^16.0.0",
     "react-tools": "^0.10.0",
     "regenerator-runtime": "^0.10.5"
   },
   "peerDependencies": {
     "react": "^15.0.0-0 || ^16.0.0-0"
+  },
+  "jest": {
+    "setupFiles": [
+      "raf/polyfill",
+      "<rootDir>/test/enzyme-setup.js"
+    ]
   }
 }

packages/vx-drag/test/enzyme-setup.js

@@ -0,0 +1,4 @@
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+Enzyme.configure({ adapter: new Adapter() });

packages/vx-event/package.json

@@ -32,15 +32,25 @@
     "access": "public"
   },
   "devDependencies": {
-    "babel-jest": "^20.0.3",
-    "enzyme": "^2.8.2",
-    "jest": "^20.0.3",
+    "babel-jest": "^21.2.0",
+    "enzyme": "^3.1.0",
+    "enzyme-adapter-react-16": "^1.0.2",
+    "jest": "^21.2.1",
+    "raf": "^3.4.0",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
     "react-fatigue-dev": "github:tj/react-fatigue-dev",
-    "react-test-renderer": "^15.6.1",
+    "react-test-renderer": "^16.0.0",
     "react-tools": "^0.10.0",
     "regenerator-runtime": "^0.10.5"
   },
   "dependencies": {
     "@vx/point": "0.0.136"
+  },
+  "jest": {
+    "setupFiles": [
+      "raf/polyfill",
+      "<rootDir>/test/enzyme-setup.js"
+    ]
   }
 }

packages/vx-event/test/enzyme-setup.js

@@ -0,0 +1,4 @@
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+Enzyme.configure({ adapter: new Adapter() });

packages/vx-geo/package.json

@@ -33,12 +33,15 @@
     "prop-types": "^15.5.10"
   },
   "devDependencies": {
-    "babel-jest": "^20.0.3",
-    "enzyme": "^2.9.1",
-    "jest": "^20.0.4",
-    "react": "^15.0.0-0 || ^16.0.0-0",
+    "babel-jest": "^21.2.0",
+    "enzyme": "^3.1.0",
+    "enzyme-adapter-react-16": "^1.0.2",
+    "jest": "^21.2.1",
+    "raf": "^3.4.0",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
     "react-fatigue-dev": "github:tj/react-fatigue-dev",
-    "react-test-renderer": "^15.6.1",
+    "react-test-renderer": "^16.0.0",
     "react-tools": "^0.13.3",
     "regenerator-runtime": "^0.10.5",
     "topojson-client": "^3.0.0"
@@ -48,5 +51,11 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "jest": {
+    "setupFiles": [
+      "raf/polyfill",
+      "<rootDir>/test/enzyme-setup.js"
+    ]
   }
 }

packages/vx-geo/test/enzyme-setup.js

@@ -0,0 +1,4 @@
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+Enzyme.configure({ adapter: new Adapter() });