Update node version to 11.10.1 and npm packages (#1385)

ifmeorg · Mar 1, 2019 · ea52c5c · ea52c5c
1 parent 6132b14
commit ea52c5c
Show file tree

Hide file tree

Showing 10 changed files with 756 additions and 588 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,7 +10,7 @@ defaults: &defaults
     - image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37
       command: /sbin/init
     - image: circleci/ruby:2.3.4
-    - image: circleci/node:8.12.0
+    - image: circleci/node:11.10.1
 jobs:
   setup-coverage:
     <<: *defaults
@@ -38,7 +38,7 @@ jobs:
           command: rm -f ifmeorg/ifme/.rvmrc; echo 2.3.4 > ifmeorg/ifme/.ruby-version; rvm use 2.3.4 --default
       - run:
           working_directory: ~/ifmeorg/ifme
-          command: nvm install 8.12.0 && nvm alias default 8.12.0
+          command: nvm install 11.10.1 && nvm alias default 11.10.1
       - restore_cache:
           keys:
           - v1-dep-{{ .Branch }}-

diff --git a/client/.babelrc b/client/.babelrc
@@ -1,6 +1,9 @@
 {
   "presets": [
-    "@babel/preset-env",
+    ["@babel/env", {
+      "useBuiltIns": "usage",
+      "modules": "commonjs"
+    }],
     "@babel/preset-flow",
     "@babel/preset-react"
   ],

diff --git a/client/app/components/Form/index.jsx b/client/app/components/Form/index.jsx
@@ -145,7 +145,7 @@ export class Form extends React.Component<Props, State> {
     );
   };
 
-  displayInputs = () => {
+  displayInputs = (): any => {
     const { inputs } = this.state;
     return inputs.map((input: any) => {
       if (INPUT_TYPES.includes(input.type)) {

diff --git a/client/app/components/Header/index.jsx b/client/app/components/Header/index.jsx
@@ -62,7 +62,7 @@ export class Header extends React.Component<Props, State> {
     return <FontAwesomeIcon icon={faBars} />;
   };
 
-  displayLinks = () => {
+  displayLinks = (): any => {
     const { links } = this.props;
     return links.map((link: Link) => (
       <div className={css.headerLink} key={link.name}>

diff --git a/client/app/components/Input/utils.js b/client/app/components/Input/utils.js
@@ -1,7 +1,7 @@
 // @flow
 import { REQUIRES_DEFAULT, DEFAULT_WITH_LABEL } from './InputDefault';
 
-export const TYPES = REQUIRES_DEFAULT.concat([
+export const TYPES: string[] = REQUIRES_DEFAULT.concat([
   'textarea',
   'submit',
   'checkbox',
@@ -12,15 +12,15 @@ export const TYPES = REQUIRES_DEFAULT.concat([
   'location',
 ]);
 
-export const REQUIRES_LABEL = DEFAULT_WITH_LABEL.concat([
+export const REQUIRES_LABEL: string[] = DEFAULT_WITH_LABEL.concat([
   'textarea',
   'select',
   'checkboxGroup',
   'tag',
   'switch',
 ]);
 
-export const REQUIRED_POSSIBLE = DEFAULT_WITH_LABEL.concat([
+export const REQUIRED_POSSIBLE: string[] = DEFAULT_WITH_LABEL.concat([
   'textarea',
   'checkboxGroup',
 ]);

diff --git a/client/app/widgets/Resources/__tests__/Resources.spec.jsx b/client/app/widgets/Resources/__tests__/Resources.spec.jsx
@@ -3,7 +3,7 @@ import { mount } from 'enzyme';
 import React from 'react';
 import { Resources } from '../index';
 
-const component = props => (
+const getComponent = props => (
   <Resources
     keywords={[]}
     resources={[
@@ -36,7 +36,7 @@ const component = props => (
 
 describe('Resources', () => {
   it('filters when tag selected', () => {
-    const wrapper = mount(component());
+    const wrapper = mount(getComponent());
     expect(wrapper.find('.resource').length).toEqual(2);
     wrapper.find('.tagAutocomplete').simulate('focus');
     expect(wrapper.find('.tagMenu').exists()).toEqual(true);
@@ -57,7 +57,7 @@ describe('Resources', () => {
   });
 
   it('unfilters when tag unselected', () => {
-    const wrapper = mount(component());
+    const wrapper = mount(getComponent());
     expect(wrapper.find('.resource').length).toEqual(2);
     wrapper.find('.tagAutocomplete').simulate('focus');
     const id = wrapper
@@ -91,7 +91,7 @@ describe('Resources', () => {
 
     describe('and the resources are being filtered', () => {
       it('sends the selected tags to the URL', () => {
-        const wrapper = mount(component({ history }));
+        const wrapper = mount(getComponent({ history }));
 
         wrapper.setState({
           checkboxes: [
@@ -110,7 +110,7 @@ describe('Resources', () => {
 
     describe('and there is no filters selected', () => {
       it('resets the search query parameter', () => {
-        const wrapper = mount(component({ history }));
+        const wrapper = mount(getComponent({ history }));
 
         wrapper.setState({
           checkboxes: [],

diff --git a/client/app/widgets/Resources/index.jsx b/client/app/widgets/Resources/index.jsx
@@ -95,9 +95,9 @@ export class Resources extends React.Component<Props, State> {
     });
   };
 
-  filterList = (checkboxes: Checkbox[]) => {
+  filterList = (checkboxes: Checkbox[]): ResourceProp[] => {
     const { resources } = this.props;
-    const selectedCheckboxes = checkboxes.filter(
+    const selectedCheckboxes: Checkbox[] = checkboxes.filter(
       (checkbox: Checkbox) => !!checkbox.checked,
     );
     return resources.filter((resource: ResourceProp) => {

diff --git a/client/package.json b/client/package.json
@@ -30,7 +30,7 @@
     "axios": "^0.18.0",
     "babel-core": "7.0.0-bridge.0",
     "chart.js": "^2.6.0",
-    "chartkick": "^2.2.4",
+    "chartkick": "^3.0.2",
     "es5-shim": "^4.5.9",
     "font-awesome": "^4.7.0",
     "history": "^4.7.2",
@@ -40,7 +40,7 @@
     "pell": "^1.0.6",
     "react": "^16.4.0",
     "react-autocomplete": "^1.8.1",
-    "react-chartkick": "^0.1.3",
+    "react-chartkick": "^0.3.0",
     "react-dom": "^16.5.2",
     "react-html-parser": "^2.0.2",
     "react-lazyload": "^2.3.0",
@@ -61,31 +61,31 @@
     "@storybook/addons": "^4.0.0-alpha.21",
     "@storybook/react": "^4.0.0-alpha.21",
     "babel-cli": "^6.24.1",
-    "babel-eslint": "^9.0.0",
-    "babel-jest": "^23.6.0",
+    "babel-eslint": "^10.0.1",
+    "babel-jest": "^24.1.0",
     "babel-loader": "^8.0.2",
-    "babel-plugin-flow-react-proptypes": "^24.1.2",
+    "babel-plugin-flow-react-proptypes": "^25.0.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
     "compression-webpack-plugin": "^2.0.0",
-    "css-loader": "^1.0.0",
+    "css-loader": "^2.1.0",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.5.0",
     "eslint": "^5.5.0",
     "eslint-config-airbnb": "^17.1.0",
-    "eslint-import-resolver-webpack": "^0.8.3",
-    "eslint-plugin-flowtype": "^2.50.0",
+    "eslint-import-resolver-webpack": "^0.11.0",
+    "eslint-plugin-flowtype": "^3.4.2",
     "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-jest": "^21.22.1",
+    "eslint-plugin-jest": "^22.3.0",
     "eslint-plugin-jsx-a11y": "^6.1.1",
     "eslint-plugin-react": "^7.11.1",
     "extract-css-chunks-webpack-plugin": "^3.1.1",
-    "file-loader": "^2.0.0",
+    "file-loader": "^3.0.1",
     "flow-bin": "^0.80.0",
     "flow-typed": "^2.5.1",
     "glob": "^7.1.2",
     "identity-obj-proxy": "^3.0.0",
     "imports-loader": "^0.8.0",
-    "jest": "^23.6.0",
+    "jest": "^24.1.0",
     "node-sass": "^4.9.2",
     "optimize-css-assets-webpack-plugin": "^5.0.0",
     "prettier-eslint": "^8.8.2",