Fix lint warnings

Author: blikblum

lib/components/animated-outlet.js

@@ -29,15 +29,15 @@ export class AnimationHook {
 }
 
 // code extracted from vue
-var raf = window.requestAnimationFrame
-var TRANSITION = 'transition'
-var ANIMATION = 'animation'
+const raf = window.requestAnimationFrame
+const TRANSITION = 'transition'
+const ANIMATION = 'animation'
 
 // Transition property/event sniffing
-var transitionProp = 'transition'
-var transitionEndEvent = 'transitionend'
-var animationProp = 'animation'
-var animationEndEvent = 'animationend'
+const transitionProp = 'transition'
+const transitionEndEvent = 'transitionend'
+const animationProp = 'animation'
+const animationEndEvent = 'animationend'
 
 function nextFrame (fn) {
   raf(function () {
@@ -49,18 +49,18 @@ function whenTransitionEnds (
   el,
   cb
 ) {
-  var ref = getTransitionInfo(el)
-  var type = ref.type
-  var timeout = ref.timeout
-  var propCount = ref.propCount
+  const ref = getTransitionInfo(el)
+  const type = ref.type
+  const timeout = ref.timeout
+  const propCount = ref.propCount
   if (!type) { return cb() }
-  var event = type === TRANSITION ? transitionEndEvent : animationEndEvent
-  var ended = 0
-  var end = function () {
+  const event = type === TRANSITION ? transitionEndEvent : animationEndEvent
+  let ended = 0
+  const end = function () {
     el.removeEventListener(event, onEnd)
     cb()
   }
-  var onEnd = function (e) {
+  const onEnd = function (e) {
     if (e.target === el) {
       if (++ended >= propCount) {
         end()
@@ -76,29 +76,25 @@ function whenTransitionEnds (
 }
 
 function getTransitionInfo (el) {
-  var styles = window.getComputedStyle(el)
+  const styles = window.getComputedStyle(el)
   // JSDOM may return undefined for transition properties
-  var transitionDelays = (styles[transitionProp + 'Delay'] || '').split(', ')
-  var transitionDurations = (styles[transitionProp + 'Duration'] || '').split(', ')
-  var transitionTimeout = getTimeout(transitionDelays, transitionDurations)
-  var animationDelays = (styles[animationProp + 'Delay'] || '').split(', ')
-  var animationDurations = (styles[animationProp + 'Duration'] || '').split(', ')
-  var animationTimeout = getTimeout(animationDelays, animationDurations)
-
-  var type
-  var timeout = 0
-  var propCount = 0
-
-  timeout = Math.max(transitionTimeout, animationTimeout)
-  type = timeout > 0
+  const transitionDelays = (styles[transitionProp + 'Delay'] || '').split(', ')
+  const transitionDurations = (styles[transitionProp + 'Duration'] || '').split(', ')
+  const transitionTimeout = getTimeout(transitionDelays, transitionDurations)
+  const animationDelays = (styles[animationProp + 'Delay'] || '').split(', ')
+  const animationDurations = (styles[animationProp + 'Duration'] || '').split(', ')
+  const animationTimeout = getTimeout(animationDelays, animationDurations)
+
+  const timeout = Math.max(transitionTimeout, animationTimeout)
+  const type = timeout > 0
     ? transitionTimeout > animationTimeout
-      ? TRANSITION
-      : ANIMATION
+        ? TRANSITION
+        : ANIMATION
     : null
-  propCount = type
+  const propCount = type
     ? type === TRANSITION
-      ? transitionDurations.length
-      : animationDurations.length
+        ? transitionDurations.length
+        : animationDurations.length
     : 0
 
   return {

lib/function-dsl.js

@@ -1,4 +1,4 @@
-/* eslint-disable standard/no-callback-literal */
+/* eslint-disable node/no-callback-literal */
 import invariant from './invariant'
 
 export default function functionDsl (callback) {

lib/middlewares/router-links.js

@@ -15,7 +15,7 @@ let router
 
 const delegate = function (el, eventName, selector, listener, context) {
   const handler = function (e) {
-    var node = e.target
+    let node = e.target
     for (; node && node !== el; node = node.parentNode) {
       if (node.matches && node.matches(selector)) {
         e.selectorTarget = node

lib/router.js

@@ -1,3 +1,4 @@
+/* eslint-disable array-callback-return */
 import { pick, clone, extend, isEqual, keys } from './utils'
 import functionDsl from './function-dsl'
 import arrayDsl from './array-dsl'

lib/utils.js

@@ -6,8 +6,8 @@ export const keys = Object.keys
 export const clone = obj =>
   obj
     ? isArray(obj)
-      ? obj.slice(0)
-      : extend({}, obj)
+        ? obj.slice(0)
+        : extend({}, obj)
     : obj
 
 export const pick = (obj, attrs) =>

tests/functional/nanodom.js

@@ -23,7 +23,7 @@ Dom.prototype.html = function (content) {
 }
 
 Dom.prototype.find = function (selector) {
-  var result = new Dom()
+  const result = new Dom()
   this.forEach(function (el) {
     [].slice.call(el.querySelectorAll(selector)).forEach(function (e) { result.push(e) })
   })
@@ -46,16 +46,16 @@ Dom.prototype.get = function (index) {
   return this[index]
 }
 
-function domify (str) { var d = document.createElement('div'); d.innerHTML = str; return d.childNodes }
+function domify (str) { const d = document.createElement('div'); d.innerHTML = str; return d.childNodes }
 
-var nanodom = function (selector) {
-  var d
+const nanodom = function (selector) {
+  let d
   if (selector instanceof Dom) return selector
   if (selector instanceof HTMLElement) { d = new Dom(); d.push(selector); return d }
   if (typeof selector !== 'string') return
   d = new Dom()
-  var s; var c = (selector.indexOf('<') === 0)
-  s = c ? domify(selector) : document.querySelectorAll(selector);
+  const c = (selector.indexOf('<') === 0)
+  const s = c ? domify(selector) : document.querySelectorAll(selector);
   [].slice.call(s).forEach(function (e) { d.push(e) })
   return d
 }

tests/functional/routerTest.js

@@ -42,7 +42,7 @@ describe('app', () => {
   it('cancelling and retrying transitions', async function () {
     await router.transitionTo('/posts/filter/foo')
     assert.equal(router.location.getURL(), '/posts/filter/foo')
-    var transition = router.transitionTo('about')
+    const transition = router.transitionTo('about')
     transition.cancel()
     await transition.catch(() => {})
     assert.equal(router.location.getURL(), '/posts/filter/foo')
@@ -52,22 +52,20 @@ describe('app', () => {
   })
 
   it('transition.followRedirects resolves when all of the redirects have finished', async function () {
-    var transition
-
     await router.transitionTo('application')
     // initiate a transition
-    transition = router.transitionTo('/posts/filter/foo')
+    const transition = router.transitionTo('/posts/filter/foo')
     // and a redirect
     router.transitionTo('/about')
 
     // if followRedirects is not used - the original transition is rejected
-    var rejected = false
+    let rejected = false
     await transition.catch(() => rejected = true)
     assert(rejected)
 
     await router.transitionTo('application')
     // initiate a transition
-    var t = router.transitionTo('/posts/filter/foo')
+    const t = router.transitionTo('/posts/filter/foo')
     // and a redirect, this time using `redirectTo`
     t.redirectTo('/about')
 
@@ -78,41 +76,37 @@ describe('app', () => {
   })
 
   it('transition.followRedirects is rejected if transition fails', async function () {
-    var transition
-
     // silence the errors for the tests
     router.logError = () => {}
 
     // initiate a transition
-    transition = router.transitionTo('/posts/filter/foo')
+    const transition = router.transitionTo('/posts/filter/foo')
     // install a breaking middleware
     router.use(() => {
       throw new Error('middleware error')
     })
     // and a redirect
     router.transitionTo('/about')
 
-    var rejected = false
+    let rejected = false
     await transition.followRedirects().catch((err) => rejected = err.message)
     assert.equal(rejected, 'middleware error')
   })
 
   it('transition.followRedirects is rejected if transition fails asynchronously', async function () {
-    var transition
-
     // silence the errors for the tests
     router.logError = () => {}
 
     // initiate a transition
-    transition = router.transitionTo('/posts/filter/foo')
+    const transition = router.transitionTo('/posts/filter/foo')
     // install a breaking middleware
     router.use(() => {
       return Promise.reject(new Error('middleware promise error'))
     })
     // and a redirect
     router.transitionTo('/about')
 
-    var rejected = false
+    let rejected = false
     await transition.followRedirects().catch((err) => rejected = err.message)
     assert.equal(rejected, 'middleware promise error')
   })
@@ -125,7 +119,7 @@ describe('app', () => {
     assert.equal(window.location.hash, '#posts/filter/foo')
 
     // now attempt to transition to about and cancel
-    var transition = router.transitionTo('/about')
+    const transition = router.transitionTo('/about')
     transition.cancel()
     await transition.catch(() => {})
 

tests/functional/testApp.js

@@ -1,11 +1,12 @@
+/* eslint-disable array-callback-return */
 import $ from './nanodom'
 import { Router } from '../../lib/router'
 
 export default function TestApp (options) {
   options = options || {}
 
   // create the router
-  var router = this.router = new Router(options)
+  const router = this.router = new Router(options)
 
   // provide the route map
   router.map(function (route) {
@@ -20,7 +21,7 @@ export default function TestApp (options) {
     })
   })
 
-  var handlers = {}
+  const handlers = {}
 
   handlers.application = {
     // this is a hook for 'performing'

tests/lib/fakeHistory.js

@@ -1,7 +1,7 @@
 export default function fakeHistory (location) {
   const history = []
 
-  var originalPushState = window.history.pushState
+  const originalPushState = window.history.pushState
   window.history.pushState = function (state, title, url) {
     history.push(url)
   }

tests/unit/routerTest.js

@@ -1,4 +1,4 @@
-/* eslint-disable no-return-assign */
+/* eslint-disable no-return-assign,array-callback-return */
 import BrowserLocation from '../../lib/locations/browser'
 import { extend } from '../../lib/utils'
 import { Router, interceptLinks } from '../../lib/router'
@@ -132,7 +132,7 @@ describe('Slick Router', () => {
 
   it('#use middleware resolve and done hooks are called on successful transition', (done) => {
     router.map(routes)
-    var m = {
+    const m = {
       resolve: sinon.spy(),
       done: sinon.spy()
     }
@@ -148,7 +148,7 @@ describe('Slick Router', () => {
 
   it('#use middleware error hook is called on failed transition', (done) => {
     router.map(routes)
-    var m = {
+    const m = {
       error: sinon.spy()
     }
     router.use(m)
@@ -162,7 +162,7 @@ describe('Slick Router', () => {
 
   it('#use middleware cancel hook is called on cancelled transition', (done) => {
     router.map(routes)
-    var m = {
+    const m = {
       cancel: sinon.spy()
     }
     router.listen().then(() => {
@@ -177,7 +177,7 @@ describe('Slick Router', () => {
 
   it('#use middleware cancel hook is called on redirected transition', (done) => {
     router.map(routes)
-    var m = {
+    const m = {
       cancel: sinon.spy()
     }
     router.listen().then(() => {
@@ -253,7 +253,7 @@ describe('Slick Router', () => {
 
   it('#generate generates urls given route name and params as object', () => {
     router.map(routes).listen()
-    var url = router.generate('status', { user: 'foo', id: 1 }, { withReplies: true })
+    const url = router.generate('status', { user: 'foo', id: 1 }, { withReplies: true })
     assert.equal(url, '#application/foo/status/1?withReplies=true')
   })
 
@@ -262,7 +262,7 @@ describe('Slick Router', () => {
       router.options.pushState = true
       router.options.root = '/foo/bar'
       router.map(routes).listen()
-      var url = router.generate('status', { user: 'usr', id: 1 }, { withReplies: true })
+      const url = router.generate('status', { user: 'usr', id: 1 }, { withReplies: true })
       assert.equal(url, '/foo/bar/application/usr/status/1?withReplies=true')
     })
   }
@@ -285,7 +285,7 @@ describe('Slick Router', () => {
       })
 
       router.map(routes).listen()
-      var url = router.generate('status', { user: 'usr', id: 1 }, { withReplies: true })
+      const url = router.generate('status', { user: 'usr', id: 1 }, { withReplies: true })
       assert.equal(browserRedirectedTo, '/foo/bar/#different')
       assert.equal(url, '#application/usr/status/1?withReplies=true')
     })