Fix flow to newer version

kurrik · Jun 30, 2017 · c2e3fe2 · c2e3fe2
1 parent f62ad5a
commit c2e3fe2
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 35 deletions.
diff --git a/blog.roomanna.com/src/javascript/.babelrc b/blog.roomanna.com/src/javascript/.babelrc
@@ -1,4 +1,3 @@
 {
-  "presets": ["es2015", "react", "stage-0"],
-  "plugins": "transform-flow-comments",
+  "presets": ["flow", "es2015", "react", "stage-0"],
 }
diff --git a/blog.roomanna.com/src/javascript/npm-shrinkwrap.json b/blog.roomanna.com/src/javascript/npm-shrinkwrap.json
diff --git a/blog.roomanna.com/src/javascript/package.json b/blog.roomanna.com/src/javascript/package.json
@@ -13,32 +13,35 @@
   },
   "author": "Arne Roomann-Kurrik",
   "devDependencies": {
-    "babel-core": "^6.18.2",
+    "babel-core": "^6.25.0",
     "babel-loader": "^6.4.1",
-    "babel-polyfill": "^6.16.0",
-    "babel-preset-es2015": "^6.18.0",
+    "babel-polyfill": "^6.23.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-flow": "^6.23.0",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "bootstrap": "^3.3.7",
     "chai": "^3.5.0",
     "classnames": "^2.2.5",
     "css-loader": "^0.26.4",
-    "d3": "^4.7.4",
+    "d3": "^4.9.1",
     "enzyme": "^2.8.2",
-    "exports-loader": "^0.6.3",
+    "exports-loader": "^0.6.4",
     "extract-text-webpack-plugin": "^2.1.2",
     "file-loader": "^0.11.2",
     "flow-babel-webpack-plugin": "^1.0.1",
-    "flow-bin": "^0.48.0",
+    "flow-bin": "^0.49.1",
     "icanhaz": "^0.10.3",
     "imports-loader": "^0.7.1",
     "jest": "^20.0.4",
-    "jquery": "^3.1.1",
+    "jquery": "^3.2.1",
     "moment": "^2.18.1",
-    "photoswipe": "^4.1.1",
-    "react-addons-test-utils": "^15.5.1",
-    "react-test-renderer": "^15.5.4",
-    "seedrandom": "^2.4.2",
+    "photoswipe": "^4.1.2",
+    "react": "^15.6.1",
+    "react-addons-test-utils": "^15.6.0",
+    "react-dom": "^15.6.1",
+    "react-test-renderer": "^15.6.1",
+    "seedrandom": "^2.4.3",
     "style-loader": "^0.13.2",
     "url-loader": "^0.5.9",
     "webpack": "^2.6.1",
@@ -54,25 +57,5 @@
     "transform": [
       "browserify-shim"
     ]
-  },
-  "dependencies": {
-    "babel-core": "^6.25.0",
-    "babel-loader": "^6.4.1",
-    "babel-polyfill": "^6.23.0",
-    "babel-preset-es2015": "^6.24.1",
-    "css-loader": "^0.26.4",
-    "d3": "^4.9.1",
-    "exports-loader": "^0.6.4",
-    "file-loader": "^0.11.2",
-    "jquery": "^3.2.1",
-    "photoswipe": "^4.1.2",
-    "react": "^15.6.1",
-    "react-addons-test-utils": "^15.6.0",
-    "react-dom": "^15.6.1",
-    "react-test-renderer": "^15.6.1",
-    "seedrandom": "^2.4.3",
-    "style-loader": "^0.13.2",
-    "url-loader": "^0.5.9",
-    "webpack": "^2.6.1"
   }
 }
diff --git a/blog.roomanna.com/src/javascript/src/components/TimestampChart/TimestampChart.jsx b/blog.roomanna.com/src/javascript/src/components/TimestampChart/TimestampChart.jsx
@@ -14,11 +14,14 @@ import styles from './TimestampChart.css';
 
 type DataPoint = {
   value: Moment,
+};
+
+type DataSeries = DataPoint & {
   points?: Array<DataPoint>,
 };
 
 type Props = {
-  data: Array<DataPoint>,
+  data: Array<DataSeries>,
   marginTop: number,
   marginRight: number,
   marginBottom: number,
@@ -56,7 +59,7 @@ export default class TimestampChart extends React.Component {
     return date.valueOf();
   }
 
-  timeRangePad = (points: Array<DataPoint>) => {
+  timeRangePad = (points: $ReadOnlyArray<DataPoint>) => {
     let minDate;
     let maxDate;
     let pad = 'days';