upgrade dependencies

Author: bertho-zero

.babelrc

@@ -1,7 +1,15 @@
 {
   "presets": [
     "react",
-    "es2015",
+    [
+      "env",
+      {
+        "targets": {
+          "browsers": ["last 2 versions", "IE >= 8"],
+          "node": "current"
+        }
+      }
+    ],
     "stage-0"
   ],
   "plugins": [
@@ -11,7 +19,9 @@
   ],
   "env": {
     "development": {
-      "plugins": []
+      "plugins": [
+        "transform-react-jsx-source"
+      ]
     }
   }
 }

.eslintrc

@@ -18,13 +18,24 @@
     "no-console": "off",
     "no-param-reassign": "off",
     "no-underscore-dangle": "off",
+    "prefer-promise-reject-errors": "warn",
     "prefer-template": "warn",
     "react/forbid-prop-types": "warn",
+    "react/jsx-closing-tag-location": ["warn", "line-aligned"],
     "react/jsx-filename-extension": "off",
     "react/jsx-no-target-blank": "warn",
     "react/no-multi-comp": ["error", {"ignoreStateless": true}],
     "react/no-unescaped-entities": "off",
     "react/prefer-stateless-function": "warn",
+    "jsx-a11y/label-has-for": ["error", {"allowChildren": true}],
+    "jsx-a11y/anchor-is-valid": [
+      "error",
+      {
+        "components": ["Link"],
+        "specialLink": ["to"],
+        "aspects": ["noHref", "invalidHref", "preferButton"]
+      }
+    ],
     "import/default": "off",
     "import/extensions": "off",
     "import/no-extraneous-dependencies": "off",

api/actions/__tests__/loadInfo-test.js

@@ -1,12 +1,16 @@
 import { expect } from 'chai';
-import timekeeper from 'timekeeper';
+import sinon from 'sinon';
 import loadInfo from '../loadInfo';
 
+let clock;
+
 describe('loadInfo', () => {
   it('loads the current date', () => {
     const now = Date.now();
-    timekeeper.freeze(now);
+    clock = sinon.useFakeTimers({ now });
 
     expect(loadInfo()).to.deep.equal({ time: now, message: 'This came from the api server' });
+
+    clock.restore();
   });
 });

api/actions/__tests__/widget-load-test.js

@@ -15,12 +15,22 @@ describe('widget load', () => {
     });
 
     it('uses the widgets from the session', async () => {
-      const widgets = await load({ session: { user: {}, widgets: ['a', 'b', 'c'] } }, undefined);
+      const clock = sinon.useFakeTimers();
+      const [widgets] = await Promise.all([
+        load({ session: { user: {}, widgets: ['a', 'b', 'c'] } }, undefined),
+        clock.tick(1000),
+        clock.restore()
+      ]);
       expect(widgets.length).to.equal(3);
     });
 
     it('initializes the widgets ', async () => {
-      const widgets = await load({ session: { user: {} } }, undefined);
+      const clock = sinon.useFakeTimers();
+      const [widgets] = await Promise.all([
+        load({ session: { user: {} } }, undefined),
+        clock.tick(1000),
+        clock.restore()
+      ]);
       expect(widgets.length).to.equal(4);
       expect(widgets[0].color).to.equal('Red');
     });
@@ -32,8 +42,9 @@ describe('widget load', () => {
     });
 
     it('rejects the call', async () => {
+      const clock = sinon.useFakeTimers();
       try {
-        await load({ session: { user: {} } }, undefined);
+        await Promise.all([load({ session: { user: {} } }, undefined), clock.tick(1000), clock.restore()]);
       } catch (err) {
         expect(err).to.equal('Widget load fails 33% of the time. You were unlucky.');
       }

api/actions/__tests__/widget-update-test.js

@@ -25,26 +25,29 @@ describe('widget update', () => {
 
     it('does not accept green widgets', async () => {
       sinon.stub(load, 'default').resolves(widgets);
+      const clock = sinon.useFakeTimers();
       try {
-        await update({ session: {}, body: { color: 'Green' } });
+        await Promise.all([update({ session: {}, body: { color: 'Green' } }), clock.tick(1500), clock.restore()]);
       } catch (err) {
         expect(err.color).to.equal('We do not accept green widgets');
       }
     });
 
     it('fails to load widgets', async () => {
       sinon.stub(load, 'default').rejects(new Error('Widget fail to load.'));
+      const clock = sinon.useFakeTimers();
       try {
-        await update({ session: {}, body: { color: 'Blue' } });
+        await Promise.all([update({ session: {}, body: { color: 'Blue' } }), clock.tick(1500), clock.restore()]);
       } catch (err) {
         expect(err.message).to.equal('Widget fail to load.');
       }
     });
 
     it('updates a widget', async () => {
       sinon.stub(load, 'default').resolves(widgets);
+      const clock = sinon.useFakeTimers();
       const widget = { id: 2, color: 'Blue' };
-      const res = await update({ session: {}, body: widget });
+      const [res] = await Promise.all([update({ session: {}, body: widget }), clock.tick(1500), clock.restore()]);
       expect(res).to.deep.equal(widget);
       expect(widgets[1]).to.deep.equal(widget);
     });

api/actions/widget/load.js

@@ -1,12 +1,32 @@
 const initialWidgets = [
-  { id: 1, color: 'Red', sprocketCount: 7, owner: 'John' },
-  { id: 2, color: 'Taupe', sprocketCount: 1, owner: 'George' },
-  { id: 3, color: 'Green', sprocketCount: 8, owner: 'Ringo' },
-  { id: 4, color: 'Blue', sprocketCount: 2, owner: 'Paul' }
+  {
+    id: 1,
+    color: 'Red',
+    sprocketCount: 7,
+    owner: 'John'
+  },
+  {
+    id: 2,
+    color: 'Taupe',
+    sprocketCount: 1,
+    owner: 'George'
+  },
+  {
+    id: 3,
+    color: 'Green',
+    sprocketCount: 8,
+    owner: 'Ringo'
+  },
+  {
+    id: 4,
+    color: 'Blue',
+    sprocketCount: 2,
+    owner: 'Paul'
+  }
 ];
 
 export function getWidgets(req) {
-  let widgets = req.session.widgets;
+  let { widgets } = req.session;
   if (!widgets) {
     widgets = initialWidgets;
     req.session.widgets = widgets;

api/api.js

@@ -12,7 +12,7 @@ import middleware from './middleware';
 import services from './services';
 import * as actions from './actions';
 import mapUrl from './utils/url.js';
-import auth, { socketAuth } from './services/authentication';
+import auth from './services/authentication';
 
 process.on('unhandledRejection', error => console.error(error));
 
@@ -23,14 +23,12 @@ app
   .set('config', config)
   .use(morgan('dev'))
   .use(cookieParser())
-  .use(
-    session({
-      secret: 'react and redux rule!!!!',
-      resave: false,
-      saveUninitialized: false,
-      cookie: { maxAge: 60000 }
-    })
-  )
+  .use(session({
+    secret: 'react and redux rule!!!!',
+    resave: false,
+    saveUninitialized: false,
+    cookie: { maxAge: 60000 }
+  }))
   .use(bodyParser.urlencoded({ extended: true }))
   .use(bodyParser.json());
 
@@ -96,8 +94,6 @@ const bufferSize = 100;
 const messageBuffer = new Array(bufferSize);
 let messageIndex = 0;
 
-app.io.use(socketAuth(app));
-
 app.io.on('connection', socket => {
   const user = socket.feathers.user ? { ...socket.feathers.user, password: undefined } : undefined;
   socket.emit('news', { msg: "'Hello World!' from server", user });

api/middleware/index.js

@@ -7,16 +7,14 @@ export default function middleware() {
 
   app.use(notFound());
   app.use(logger(app));
-  app.use(
-    errorHandler({
-      json: (error, req, res) => {
-        res.json(error);
-      },
-      html: (error, req, res) => {
-        res.json(error);
-        // render your error view with the error object
-        // res.render('error', error); // set view engine of express if you want to use res.render
-      }
-    })
-  );
+  app.use(errorHandler({
+    json: (error, req, res) => {
+      res.json(error);
+    },
+    html: (error, req, res) => {
+      res.json(error);
+      // render your error view with the error object
+      // res.render('error', error); // set view engine of express if you want to use res.render
+    }
+  }));
 }

api/services/authentication/index.js

@@ -6,8 +6,6 @@ import oauth2 from 'feathers-authentication-oauth2';
 import FacebookTokenStrategy from 'passport-facebook-token';
 import { discard } from 'feathers-hooks-common';
 
-export socketAuth from './socketAuth';
-
 function populateUser(authConfig) {
   return async hook => {
     const payload = await hook.app.passport.verifyJWT(hook.result.accessToken, authConfig);
@@ -44,12 +42,10 @@ export default function authenticationService() {
     .configure(auth(config))
     .configure(jwt())
     .configure(local()) // .configure(oauth1()) // TODO twitter example
-    .configure(
-      oauth2({
-        name: 'facebook', // if the name differs from your config key you need to pass your config options explicitly
-        Strategy: FacebookTokenStrategy
-      })
-    );
+    .configure(oauth2({
+      name: 'facebook', // if the name differs from your config key you need to pass your config options explicitly
+      Strategy: FacebookTokenStrategy
+    }));
 
   app.service('authentication').hooks({
     before: {