Skip to content

Commit

Permalink
feat: use @nuxt/eslint-config
Browse files Browse the repository at this point in the history
  • Loading branch information
pimlie committed Oct 19, 2018
1 parent 33a5666 commit 598697f
Show file tree
Hide file tree
Showing 5 changed files with 1,346 additions and 97 deletions.
10 changes: 10 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"root": true,
"parserOptions": {
"parser": "babel-eslint",
"sourceType": "module"
},
"extends": [
"@nuxtjs"
]
}
84 changes: 0 additions & 84 deletions .eslintrc.js

This file was deleted.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"@babel/core": "^7.1.0",
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.1.0",
"@nuxtjs/eslint-config": "^0.0.1",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^23.6.0",
Expand All @@ -61,11 +62,11 @@
"codecov": "^3.1.0",
"cross-env": "^5.2.0",
"cross-spawn": "^6.0.5",
"eslint": "^5.6.0",
"eslint": "^5.7.0",
"eslint-config-standard": "^12.0.0",
"eslint-config-standard-jsx": "^6.0.2",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jest": "^21.22.1",
"eslint-plugin-jest": "^21.24.1",
"eslint-plugin-node": "^7.0.1",
"eslint-plugin-promise": "^4.0.1",
"eslint-plugin-react": "^7.11.1",
Expand Down
6 changes: 3 additions & 3 deletions test/unit/cluster.worker.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ describe('cluster worker', () => {
worker = new Cluster.Worker(config)
await worker.run()
})

beforeEach(() => {
jest.resetAllMocks()
})

test('can generate routes', async () => {
let routes = worker.generator.nuxt.options.generate.routes
routes = worker.generator.decorateWithPayloads([], routes)
routes = worker.generator.decorateWithPayloads([], routes)

const routesLength = routes.length
const spy = jest.fn()
Expand All @@ -43,7 +43,7 @@ describe('cluster worker', () => {
consola.worker = cworker

let routes = worker.generator.nuxt.options.generate.routes
routes = worker.generator.decorateWithPayloads([], routes)
routes = worker.generator.decorateWithPayloads([], routes)

const routesLength = routes.length
const spy = jest.fn()
Expand Down

0 comments on commit 598697f

Please sign in to comment.