Merge pull request #2900 from weaveworks/2899-update-minor-node-deps

Update minor node dependencies

client/.babelrc

@@ -3,5 +3,5 @@
     "lodash",
     ["transform-object-rest-spread", { "useBuiltIns": true }]
   ],
-  "presets": ["es2015", "react"]
+  "presets": ["env", "react"]
 }

client/app/scripts/reducers/__tests__/root-test.js

@@ -1,5 +1,4 @@
 import { is, fromJS } from 'immutable';
-import expect from 'expect';
 
 import { TABLE_VIEW_MODE } from '../../constants/naming';
 import { constructEdgeId } from '../../utils/layouter-utils';
@@ -23,29 +22,12 @@ describe('RootReducer', () => {
   const NODE_SET = {
     n1: {
       id: 'n1',
-      rank: undefined,
       adjacency: ['n1', 'n2'],
-      pseudo: undefined,
-      label: undefined,
-      labelMinor: undefined,
       filtered: false,
-      metrics: undefined,
-      node_count: undefined,
-      shape: undefined,
-      stack: undefined
     },
     n2: {
       id: 'n2',
-      rank: undefined,
-      adjacency: undefined,
-      pseudo: undefined,
-      label: undefined,
-      labelMinor: undefined,
       filtered: false,
-      metrics: undefined,
-      node_count: undefined,
-      shape: undefined,
-      stack: undefined
     }
   };
 
@@ -336,7 +318,7 @@ describe('RootReducer', () => {
     expect(nextState.get('topologies').size).toBe(2);
     expect(nextState.get('currentTopology').get('name')).toBe('Topo1');
     expect(nextState.get('currentTopology').get('url')).toBe('/topo1');
-    expect(nextState.get('currentTopology').get('options').first().get('id')).toEqual(['option1']);
+    expect(nextState.get('currentTopology').get('options').first().get('id')).toEqual('option1');
     expect(nextState.getIn(['currentTopology', 'options']).toJS()).toEqual([{
       id: 'option1',
       defaultValue: 'off',
@@ -356,7 +338,7 @@ describe('RootReducer', () => {
     expect(nextState.get('topologies').size).toBe(2);
     expect(nextState.get('currentTopology').get('name')).toBe('topo 1 grouped');
     expect(nextState.get('currentTopology').get('url')).toBe('/topo1-grouped');
-    expect(nextState.get('currentTopology').get('options')).toNotExist();
+    expect(nextState.get('currentTopology').get('options')).toBeUndefined();
   });
 
   // topology options
@@ -368,7 +350,7 @@ describe('RootReducer', () => {
 
     // default options
     expect(activeTopologyOptionsSelector(nextState).has('option1')).toBeTruthy();
-    expect(activeTopologyOptionsSelector(nextState).get('option1')).toBeA('array');
+    expect(activeTopologyOptionsSelector(nextState).get('option1')).toBeInstanceOf(Array);
     expect(activeTopologyOptionsSelector(nextState).get('option1')).toEqual(['off']);
     expect(getUrlState(nextState).topologyOptions.topo1.option1).toEqual(['off']);
 
@@ -469,7 +451,7 @@ describe('RootReducer', () => {
   it('shows nodes that were received', () => {
     let nextState = initialState;
     nextState = reducer(nextState, ReceiveNodesDeltaAction);
-    expect(nextState.get('nodes').toJS()).toInclude(NODE_SET);
+    expect(nextState.get('nodes').toJS()).toEqual(NODE_SET);
   });
 
   it('knows a route was set', () => {
@@ -485,11 +467,11 @@ describe('RootReducer', () => {
     nextState = reducer(nextState, ClickNodeAction);
 
     expect(nextState.get('selectedNodeId')).toBe('n1');
-    expect(nextState.get('nodes').toJS()).toInclude(NODE_SET);
+    expect(nextState.get('nodes').toJS()).toEqual(NODE_SET);
 
     nextState = reducer(nextState, deSelectNode);
     expect(nextState.get('selectedNodeId')).toBe(null);
-    expect(nextState.get('nodes').toJS()).toInclude(NODE_SET);
+    expect(nextState.get('nodes').toJS()).toEqual(NODE_SET);
   });
 
   it('keeps showing nodes on navigating back after node click', () => {
@@ -506,7 +488,7 @@ describe('RootReducer', () => {
     RouteAction.state = {topologyId: 'topo1', selectedNodeId: null};
     nextState = reducer(nextState, RouteAction);
     expect(nextState.get('selectedNodeId')).toBe(null);
-    expect(nextState.get('nodes').toJS()).toInclude(NODE_SET);
+    expect(nextState.get('nodes').toJS()).toEqual(NODE_SET);
   });
 
   it('closes details when changing topologies', () => {
@@ -532,12 +514,12 @@ describe('RootReducer', () => {
   it('resets topology on websocket reconnect', () => {
     let nextState = initialState;
     nextState = reducer(nextState, ReceiveNodesDeltaAction);
-    expect(nextState.get('nodes').toJS()).toInclude(NODE_SET);
+    expect(nextState.get('nodes').toJS()).toEqual(NODE_SET);
 
     nextState = reducer(nextState, CloseWebsocketAction);
     expect(nextState.get('websocketClosed')).toBeTruthy();
     // keep showing old nodes
-    expect(nextState.get('nodes').toJS()).toInclude(NODE_SET);
+    expect(nextState.get('nodes').toJS()).toEqual(NODE_SET);
 
     nextState = reducer(nextState, OpenWebsocketAction);
     expect(nextState.get('websocketClosed')).toBeFalsy();

client/app/scripts/utils/__tests__/time-utils-test.js

@@ -1,6 +1,6 @@
-import expect from 'expect';
 import { timer } from '../time-utils';
 
+
 describe('timer', () => {
   it('records how long a function takes to execute', () => {
     const add100k = (number) => {
@@ -13,6 +13,6 @@ describe('timer', () => {
     const timedFn = timer(add100k);
     const result = timedFn(70);
     expect(result).toEqual(100070);
-    expect(timedFn.time).toBeA('number');
+    expect(Number.isInteger(timedFn.time)).toBeTruthy();
   });
 });

client/package.json

@@ -8,83 +8,83 @@
   "main": "index.js",
   "dependencies": {
     "babel-plugin-lodash": "3.2.11",
-    "babel-polyfill": "6.23.0",
+    "babel-polyfill": "6.26.0",
     "classnames": "2.2.5",
-    "d3-array": "1.2.0",
+    "d3-array": "1.2.1",
     "d3-color": "1.0.3",
-    "d3-drag": "1.0.4",
+    "d3-drag": "1.2.1",
     "d3-format": "1.2.0",
-    "d3-scale": "1.0.5",
-    "d3-selection": "1.0.5",
-    "d3-shape": "1.0.6",
-    "d3-time-format": "2.0.5",
+    "d3-scale": "1.0.6",
+    "d3-selection": "1.1.0",
+    "d3-shape": "1.2.0",
+    "d3-time-format": "2.1.0",
     "dagre": "0.7.4",
-    "debug": "2.6.6",
-    "filesize": "3.5.9",
+    "debug": "3.1.0",
+    "filesize": "3.5.11",
     "filter-invalid-dom-props": "2.0.0",
     "font-awesome": "4.7.0",
-    "immutable": "3.8.1",
+    "immutable": "3.8.2",
     "lcp": "1.1.0",
     "lodash": "4.17.4",
     "materialize-css": "0.98.1",
-    "moment": "2.18.1",
+    "moment": "2.19.1",
     "page": "1.7.1",
-    "prop-types": "^15.5.8",
-    "rc-slider": "^7.0.2",
-    "react": "15.5.4",
+    "prop-types": "15.6.0",
+    "rc-slider": "8.3.2",
+    "react": "15.6.1",
     "react-addons-perf": "15.4.2",
-    "react-dom": "15.5.4",
-    "react-motion": "0.5.0",
-    "react-redux": "5.0.4",
-    "redux": "3.6.0",
+    "react-dom": "15.6.1",
+    "react-motion": "0.5.2",
+    "react-redux": "5.0.6",
+    "redux": "3.7.2",
     "redux-immutable": "4.0.0",
-    "redux-logger": "3.0.1",
+    "redux-logger": "3.0.6",
     "redux-thunk": "2.2.0",
     "reqwest": "2.0.5",
-    "reselect": "3.0.0",
-    "reselect-map": "1.0.1",
+    "reselect": "3.0.1",
+    "reselect-map": "1.0.3",
     "styled-components": "^2.2.1",
     "weaveworks-ui-components": "git+https://github.com/weaveworks/ui-components.git#v0.1.45",
     "whatwg-fetch": "2.0.3",
-    "xterm": "2.5.0"
+    "xterm": "2.9.2"
   },
   "devDependencies": {
-    "autoprefixer": "6.7.7",
-    "babel-cli": "6.24.1",
-    "babel-core": "6.24.1",
+    "autoprefixer": "7.1.5",
+    "babel-cli": "6.26.0",
+    "babel-core": "6.26.0",
     "babel-eslint": "8.0.1",
-    "babel-jest": "19.0.0",
-    "babel-loader": "7.0.0",
-    "babel-plugin-transform-object-rest-spread": "6.23.0",
-    "babel-preset-es2015": "6.24.1",
+    "babel-jest": "21.2.0",
+    "babel-loader": "6.4.1",
+    "babel-plugin-transform-object-rest-spread": "6.26.0",
+    "babel-preset-env": "1.6.1",
     "babel-preset-react": "6.24.1",
-    "clean-webpack-plugin": "0.1.16",
-    "css-loader": "0.28.1",
+    "clean-webpack-plugin": "0.1.17",
+    "css-loader": "0.28.7",
     "eslint": "4.9.0",
     "eslint-config-airbnb": "16.1.0",
     "eslint-loader": "1.9.0",
     "eslint-plugin-import": "2.7.0",
     "eslint-plugin-jsx-a11y": "6.0.2",
     "eslint-plugin-react": "7.4.0",
-    "expect": "1.20.2",
     "extract-text-webpack-plugin": "2.1.0",
-    "file-loader": "0.11.1",
-    "html-webpack-plugin": "2.28.0",
-    "http-proxy-rules": "1.1.0",
+    "file-loader": "1.1.5",
+    "html-webpack-plugin": "2.30.1",
+    "http-proxy-rules": "1.1.1",
     "immutable-devtools": "0.0.7",
-    "jest-cli": "19.0.2",
-    "json-loader": "0.5.4",
-    "mockdate": "^2.0.1",
-    "node-sass": "4.5.2",
+    "jest": "21.2.1",
+    "jest-cli": "21.2.1",
+    "json-loader": "0.5.7",
+    "mockdate": "2.0.2",
+    "node-sass": "4.5.3",
     "postcss-loader": "1.3.3",
     "react-addons-perf": "15.4.2",
     "redux-devtools": "3.4.0",
     "redux-devtools-dock-monitor": "1.1.2",
     "redux-devtools-log-monitor": "1.3.0",
-    "sass-loader": "6.0.3",
-    "style-loader": "0.17.0",
+    "sass-loader": "6.0.6",
+    "style-loader": "0.19.0",
     "url": "0.11.0",
-    "url-loader": "0.5.8",
+    "url-loader": "0.6.2",
     "webpack": "2.4.1"
   },
   "optionalDependencies": {