diff --git a/package.json b/package.json
index 20bd9936e4..058e583002 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
   "scripts": {
     "test": "npm run lint && cross-env NODE_ENV=test npm run build:nuxt && nyc ava --verbose --serial test/ -- && nyc report --reporter=html",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
-    "lint": "eslint --ext .js,.vue bin/** lib/** test/*.js --ignore-pattern app",
+    "lint": "eslint --ext .js,.vue bin/** lib/** test/** --ignore-pattern app --ignore-pattern node_modules --ignore-pattern dist/",
     "build": "rimraf dist/ && npm run build:nuxt && npm run build:core",
     "build:nuxt": "rollup -c build/rollup.config.js --environment TARGET:nuxt",
     "build:core": "rollup -c build/rollup.config.js --environment TARGET:core",
diff --git a/test/fixtures/basic/pages/async-data.vue b/test/fixtures/basic/pages/async-data.vue
index f999fb6871..752a286c18 100755
--- a/test/fixtures/basic/pages/async-data.vue
+++ b/test/fixtures/basic/pages/async-data.vue
@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  asyncData () {
+  asyncData() {
     return new Promise((resolve) => {
       setTimeout(() => resolve({ name: 'Nuxt.js' }), 10)
     })
diff --git a/test/fixtures/basic/pages/await-async-data.vue b/test/fixtures/basic/pages/await-async-data.vue
index bb090bc901..e6468dbcc3 100644
--- a/test/fixtures/basic/pages/await-async-data.vue
+++ b/test/fixtures/basic/pages/await-async-data.vue
@@ -10,8 +10,9 @@ const fetchData = () => {
 }
 
 export default {
-  async asyncData () {
-    return await fetchData()
+  async asyncData() {
+    const data = await fetchData()
+    return data
   }
 }
 </script>
diff --git a/test/fixtures/basic/pages/callback-async-data.vue b/test/fixtures/basic/pages/callback-async-data.vue
index 7b0610e5ac..07481dd1fb 100644
--- a/test/fixtures/basic/pages/callback-async-data.vue
+++ b/test/fixtures/basic/pages/callback-async-data.vue
@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  async asyncData (context, callback) {
+  async asyncData(context, callback) {
     setTimeout(function () {
       callback(null, { name: 'Callback Nuxt.js' })
     }, 10)
diff --git a/test/fixtures/basic/pages/error.vue b/test/fixtures/basic/pages/error.vue
index 19704e7ade..48f35a3b40 100644
--- a/test/fixtures/basic/pages/error.vue
+++ b/test/fixtures/basic/pages/error.vue
@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  asyncData ({ req }) {
+  asyncData({ req }) {
     // Not for nuxt generate
     if (req) {
       throw new Error('Error mouahahah')
diff --git a/test/fixtures/basic/pages/error2.vue b/test/fixtures/basic/pages/error2.vue
index 156a0e958c..252ad842a4 100644
--- a/test/fixtures/basic/pages/error2.vue
+++ b/test/fixtures/basic/pages/error2.vue
@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  asyncData ({ error }) {
+  asyncData({ error }) {
     error({ message: 'Custom error' })
   }
 }
diff --git a/test/fixtures/basic/pages/redirect.vue b/test/fixtures/basic/pages/redirect.vue
index dd01d3e909..111dc983fa 100644
--- a/test/fixtures/basic/pages/redirect.vue
+++ b/test/fixtures/basic/pages/redirect.vue
@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  fetch ({ redirect }) {
+  fetch({ redirect }) {
     return redirect('/')
   }
 }
diff --git a/test/fixtures/basic/pages/redirect2.vue b/test/fixtures/basic/pages/redirect2.vue
index 1b44bef173..0bd4dab057 100644
--- a/test/fixtures/basic/pages/redirect2.vue
+++ b/test/fixtures/basic/pages/redirect2.vue
@@ -3,7 +3,7 @@
 <script>
 export default {
   middleware: 'redirect',
-  created () {
+  created() {
     throw new Error('NOPE!')
   }
 }
diff --git a/test/fixtures/basic/pages/special-state.vue b/test/fixtures/basic/pages/special-state.vue
index 0b996707f3..0448e50b6d 100644
--- a/test/fixtures/basic/pages/special-state.vue
+++ b/test/fixtures/basic/pages/special-state.vue
@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  fetch ({ beforeNuxtRender }) {
+  fetch({ beforeNuxtRender }) {
     if (process.server) {
       beforeNuxtRender(({ nuxtState }) => {
         nuxtState.test = true
diff --git a/test/fixtures/basic/pages/stateful.vue b/test/fixtures/basic/pages/stateful.vue
index 3931e79db1..27b5563ed9 100755
--- a/test/fixtures/basic/pages/stateful.vue
+++ b/test/fixtures/basic/pages/stateful.vue
@@ -6,10 +6,10 @@
 
 <script>
 export default {
-  data () {
+  data() {
     return { answer: null }
   },
-  created () {
+  created() {
     this.answer = 42
   }
 }
diff --git a/test/fixtures/basic/pages/users/_id.vue b/test/fixtures/basic/pages/users/_id.vue
index ed71a446ec..6b76de7149 100644
--- a/test/fixtures/basic/pages/users/_id.vue
+++ b/test/fixtures/basic/pages/users/_id.vue
@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  asyncData ({ params, payload }) {
+  asyncData({ params, payload }) {
     if (payload) return payload
     return { id: params.id }
   }
diff --git a/test/fixtures/basic/pages/validate.vue b/test/fixtures/basic/pages/validate.vue
index 403b9ed4c6..f0b69fe74c 100644
--- a/test/fixtures/basic/pages/validate.vue
+++ b/test/fixtures/basic/pages/validate.vue
@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  validate ({ query }) {
+  validate({ query }) {
     return Boolean(query.valid)
   }
 }
diff --git a/test/fixtures/basic/store/foo/bar.js b/test/fixtures/basic/store/foo/bar.js
index 9a709f66e7..6dc9eb520d 100644
--- a/test/fixtures/basic/store/foo/bar.js
+++ b/test/fixtures/basic/store/foo/bar.js
@@ -3,7 +3,7 @@ export const state = () => ({
 })
 
 export const getters = {
-  baz (state) {
+  baz(state) {
     return state.baz
   }
 }
diff --git a/test/fixtures/basic/store/index.js b/test/fixtures/basic/store/index.js
index ca4a3ef3b7..5c1372507f 100755
--- a/test/fixtures/basic/store/index.js
+++ b/test/fixtures/basic/store/index.js
@@ -3,7 +3,7 @@ export const state = () => ({
 })
 
 export const mutations = {
-  increment (state) {
+  increment(state) {
     state.counter++
   }
 }
diff --git a/test/fixtures/children/pages/parent.vue b/test/fixtures/children/pages/parent.vue
index 88aad4420b..dfaa205163 100644
--- a/test/fixtures/children/pages/parent.vue
+++ b/test/fixtures/children/pages/parent.vue
@@ -8,16 +8,16 @@
 <script>
 export default {
   async asyncData({ route }) {
-    const asyncData = {};
+    const asyncData = {}
 
     await new Promise((resolve, reject) => {
       setTimeout(() => {
         asyncData.name = 'parent'
-        resolve();
+        resolve()
       }, 100)
-    });
+    })
 
-    return asyncData;
+    return asyncData
   }
 }
 </script>
diff --git a/test/fixtures/children/pages/parent/_id.vue b/test/fixtures/children/pages/parent/_id.vue
index 39d66d2396..8fbd0650a0 100644
--- a/test/fixtures/children/pages/parent/_id.vue
+++ b/test/fixtures/children/pages/parent/_id.vue
@@ -5,16 +5,16 @@
 <script>
 export default {
   async asyncData({ route }) {
-    const asyncData = {};
+    const asyncData = {}
 
     await new Promise((resolve, reject) => {
       setTimeout(() => {
-        asyncData.id = route.params.id;
-        resolve();
+        asyncData.id = route.params.id
+        resolve()
       }, 50)
-    });
+    })
 
-    return asyncData;
+    return asyncData
   }
 }
 </script>
diff --git a/test/fixtures/children/pages/parent/validate-child.vue b/test/fixtures/children/pages/parent/validate-child.vue
index 4fd4d4bb2d..c832cd4be0 100644
--- a/test/fixtures/children/pages/parent/validate-child.vue
+++ b/test/fixtures/children/pages/parent/validate-child.vue
@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  validate ({ query }) {
+  validate({ query }) {
     return query.key === '12345'
   }
 }
diff --git a/test/fixtures/debug/pages/error.vue b/test/fixtures/debug/pages/error.vue
index ed9d681ade..9be9c6d927 100644
--- a/test/fixtures/debug/pages/error.vue
+++ b/test/fixtures/debug/pages/error.vue
@@ -5,7 +5,7 @@
 <script>
 /* eslint no-undef: 0 */
 export default {
-  data () {
+  data() {
     throw new Error('test youch !')
   }
 }
diff --git a/test/fixtures/module/modules/basic/index.js b/test/fixtures/module/modules/basic/index.js
index 62a3ced7fa..040ca4e5b8 100755
--- a/test/fixtures/module/modules/basic/index.js
+++ b/test/fixtures/module/modules/basic/index.js
@@ -1,6 +1,6 @@
 const path = require('path')
 
-module.exports = function basicModule (options, resolve) {
+module.exports = function basicModule(options, resolve) {
   // Add  vendor
   this.addVendor('lodash')
 
diff --git a/test/fixtures/module/modules/basic/reverse.js b/test/fixtures/module/modules/basic/reverse.js
index 5955969033..6d4b9d356f 100755
--- a/test/fixtures/module/modules/basic/reverse.js
+++ b/test/fixtures/module/modules/basic/reverse.js
@@ -2,7 +2,7 @@
 
 import Vue from 'vue'
 
-function $reverseStr (str) {
+function $reverseStr(str) {
   return str.split('').reverse().join('')
 }
 
diff --git a/test/fixtures/module/modules/empty/index.js b/test/fixtures/module/modules/empty/index.js
index e9d4d060d1..05c0b3f72e 100755
--- a/test/fixtures/module/modules/empty/index.js
+++ b/test/fixtures/module/modules/empty/index.js
@@ -1,4 +1,4 @@
-module.exports = function middlewareModule (options) {
+module.exports = function middlewareModule(options) {
   // Empty module
 }
 
diff --git a/test/fixtures/module/modules/middleware/index.js b/test/fixtures/module/modules/middleware/index.js
index 4fee13ae84..33f1880806 100755
--- a/test/fixtures/module/modules/middleware/index.js
+++ b/test/fixtures/module/modules/middleware/index.js
@@ -1,9 +1,9 @@
-module.exports = function middlewareModule (options) {
+module.exports = function middlewareModule(options) {
   return new Promise((resolve, reject) => {
     // Add /api endpoint
     this.addServerMiddleware({
       path: '/api',
-      handler (req, res, next) {
+      handler(req, res, next) {
         res.end('It works!')
       }
     })
diff --git a/test/fixtures/module/router.js b/test/fixtures/module/router.js
index 4856380eca..3899de8cd8 100644
--- a/test/fixtures/module/router.js
+++ b/test/fixtures/module/router.js
@@ -6,7 +6,7 @@ Vue.use(Router)
 const indexPage = () => import('~/views/index.vue').then(m => m.default || m)
 const aboutPage = () => import('~/views/about.vue').then(m => m.default || m)
 
-export function createRouter () {
+export function createRouter() {
   return new Router({
     mode: 'history',
     routes: [
diff --git a/test/fixtures/spa/pages/custom.vue b/test/fixtures/spa/pages/custom.vue
index 0a1aee7b46..e2c5286044 100644
--- a/test/fixtures/spa/pages/custom.vue
+++ b/test/fixtures/spa/pages/custom.vue
@@ -5,9 +5,9 @@
 <script>
 export default {
   layout: 'custom',
-  mounted () {
+  mounted() {
     window.customMounted = (+window.customMounted) + 1
-    console.log('mounted')
+    console.log('mounted') // eslint-disable-line no-console
   }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/test/fixtures/spa/pages/index.vue b/test/fixtures/spa/pages/index.vue
index 54eff53255..c60926b6ac 100644
--- a/test/fixtures/spa/pages/index.vue
+++ b/test/fixtures/spa/pages/index.vue
@@ -4,9 +4,9 @@
 
 <script>
 export default {
-  mounted () {
+  mounted() {
     window.indexMounted = (+window.indexMounted) + 1
-    console.log('mounted')
+    console.log('mounted') // eslint-disable-line no-console
   }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/test/fixtures/ssr/components/test.vue b/test/fixtures/ssr/components/test.vue
index cdc10f9b6f..9a0b51634b 100644
--- a/test/fixtures/ssr/components/test.vue
+++ b/test/fixtures/ssr/components/test.vue
@@ -8,10 +8,10 @@
 import { nextId } from '@/lib/db'
 
 export default {
-    data() {
-        return {
-            id: nextId()
-        }
+  data() {
+    return {
+      id: nextId()
     }
+  }
 }
 </script>
\ No newline at end of file
diff --git a/test/fixtures/ssr/pages/asyncComponent.vue b/test/fixtures/ssr/pages/asyncComponent.vue
index 947aa7994c..53b77b0d20 100644
--- a/test/fixtures/ssr/pages/asyncComponent.vue
+++ b/test/fixtures/ssr/pages/asyncComponent.vue
@@ -8,7 +8,7 @@
 const AsyncTest = () => import('@/components/test.vue').then((m) => m.default || m)
 
 export default {
-  components:{
+  components: {
     AsyncTest
   }
 }
diff --git a/test/fixtures/ssr/pages/asyncData.vue b/test/fixtures/ssr/pages/asyncData.vue
index 5f194666ed..f2883f6dc1 100644
--- a/test/fixtures/ssr/pages/asyncData.vue
+++ b/test/fixtures/ssr/pages/asyncData.vue
@@ -6,10 +6,10 @@
 import { nextId } from '@/lib/db'
 
 export default {
-    async asyncData() {
-        return {
-            id: nextId()
-        }
+  async asyncData() {
+    return {
+      id: nextId()
     }
+  }
 }
 </script>
diff --git a/test/fixtures/ssr/pages/component.vue b/test/fixtures/ssr/pages/component.vue
index 316ad6e5ec..3ab75cac5b 100644
--- a/test/fixtures/ssr/pages/component.vue
+++ b/test/fixtures/ssr/pages/component.vue
@@ -8,8 +8,8 @@
 import test from '@/components/test'
 
 export default {
-    components : {
-        test
-    }
+  components: {
+    test
+  }
 }
 </script>
\ No newline at end of file
diff --git a/test/fixtures/ssr/pages/data.vue b/test/fixtures/ssr/pages/data.vue
index f627b7b373..fbf8c51259 100644
--- a/test/fixtures/ssr/pages/data.vue
+++ b/test/fixtures/ssr/pages/data.vue
@@ -6,10 +6,10 @@
 import { nextId } from '@/lib/db'
 
 export default {
-    data() {
-        return {
-            id: nextId()
-        }
+  data() {
+    return {
+      id: nextId()
     }
+  }
 }
 </script>
diff --git a/test/fixtures/ssr/pages/fetch.vue b/test/fixtures/ssr/pages/fetch.vue
index 27ed0ec8bc..6accc75c5c 100644
--- a/test/fixtures/ssr/pages/fetch.vue
+++ b/test/fixtures/ssr/pages/fetch.vue
@@ -6,9 +6,9 @@
 import { nextId } from '@/lib/db'
 
 export default {
-    async fetch({store}) {
-        // We use store just as a shared reference
-        store.__id = nextId()
-    },
+  async fetch({store}) {
+    // We use store just as a shared reference
+    store.__id = nextId()
+  }
 }
 </script>
diff --git a/test/fixtures/ssr/store/index.js b/test/fixtures/ssr/store/index.js
index e98ccc4f5d..4e5552d398 100644
--- a/test/fixtures/ssr/store/index.js
+++ b/test/fixtures/ssr/store/index.js
@@ -8,13 +8,13 @@ export const state = () => {
 }
 
 export const mutations = {
-  setId2 (state, id) {
+  setId2(state, id) {
     state.id2 = id
   }
 }
 
 export const actions = {
-  nuxtServerInit ({ commit, state }, { route }) {
+  nuxtServerInit({ commit, state }, { route }) {
     if (route.query.onServerInit === '1') {
       commit('setId2', nextId())
     }
diff --git a/test/fixtures/with-config/components/loading.vue b/test/fixtures/with-config/components/loading.vue
index 9c28022726..4cec640bfc 100644
--- a/test/fixtures/with-config/components/loading.vue
+++ b/test/fixtures/with-config/components/loading.vue
@@ -10,10 +10,10 @@ export default {
     loading: false
   }),
   methods: {
-    start () {
+    start() {
       this.loading = true
     },
-    finish () {
+    finish() {
       this.loading = false
     }
   }
diff --git a/test/fixtures/with-config/middleware/noop.js b/test/fixtures/with-config/middleware/noop.js
index 26f7210f3d..335d554e10 100644
--- a/test/fixtures/with-config/middleware/noop.js
+++ b/test/fixtures/with-config/middleware/noop.js
@@ -1,3 +1,3 @@
 export default function () {
-    // NOOP!
-}
\ No newline at end of file
+  // NOOP!
+}
diff --git a/test/fixtures/with-config/nuxt.config.js b/test/fixtures/with-config/nuxt.config.js
index 2b60043d1c..44ec31ec13 100644
--- a/test/fixtures/with-config/nuxt.config.js
+++ b/test/fixtures/with-config/nuxt.config.js
@@ -3,7 +3,7 @@ module.exports = {
   router: {
     base: '/test/',
     middleware: 'noop',
-    extendRoutes (routes) {
+    extendRoutes(routes) {
       return [
         ...routes,
         {
@@ -42,7 +42,7 @@ module.exports = {
       analyzerMode: 'disabled',
       generateStatsFile: true
     },
-    extend (config, options) {
+    extend(config, options) {
       return Object.assign({}, config, {
         devtool: 'nosources-source-map'
       })
diff --git a/test/fixtures/with-config/pages/env.vue b/test/fixtures/with-config/pages/env.vue
index 5f65ca8d87..1c2dd3419e 100644
--- a/test/fixtures/with-config/pages/env.vue
+++ b/test/fixtures/with-config/pages/env.vue
@@ -13,7 +13,7 @@ export default {
   data() {
     return { processEnv: process.env.object }
   },
-  asyncData ({ env }) {
+  asyncData({ env }) {
     delete env.object
     return { env }
   }
diff --git a/test/fixtures/with-config/pages/error.vue b/test/fixtures/with-config/pages/error.vue
index a707538cd6..d786a73ea4 100644
--- a/test/fixtures/with-config/pages/error.vue
+++ b/test/fixtures/with-config/pages/error.vue
@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  fetch ({ error }) {
+  fetch({ error }) {
     error({ message: 'Nuxt Error', statusCode: 200 })
   }
 }
diff --git a/test/fixtures/with-config/pages/user-agent.vue b/test/fixtures/with-config/pages/user-agent.vue
index dff65e97d8..904156ace0 100644
--- a/test/fixtures/with-config/pages/user-agent.vue
+++ b/test/fixtures/with-config/pages/user-agent.vue
@@ -5,7 +5,7 @@
 <script>
 export default {
   middleware: 'user-agent',
-  asyncData ({ userAgent }) {
+  asyncData({ userAgent }) {
     return { userAgent }
   }
 }
diff --git a/test/fixtures/with-config/store/index.js b/test/fixtures/with-config/store/index.js
index 20b0601fcf..3eb99f46e0 100644
--- a/test/fixtures/with-config/store/index.js
+++ b/test/fixtures/with-config/store/index.js
@@ -8,7 +8,7 @@ const store = () => new Vuex.Store({
     counter: 0
   },
   mutations: {
-    increment (state) {
+    increment(state) {
       state.counter++
     }
   }