Skip to content

Commit

Permalink
Update ESLint config
Browse files Browse the repository at this point in the history
  • Loading branch information
ai committed May 21, 2018
1 parent bf71df1 commit f309933
Show file tree
Hide file tree
Showing 28 changed files with 228 additions and 327 deletions.
1 change: 0 additions & 1 deletion cli.js
@@ -1,5 +1,4 @@
#!/usr/bin/env node
'use strict'

const ciJobNumber = require('ci-job-number')
const chalk = require('chalk')
Expand Down
17 changes: 8 additions & 9 deletions package.json
Expand Up @@ -19,7 +19,7 @@
"chalk": "^2.4.1",
"ci-job-number": "^0.3.0",
"compression-webpack-plugin": "^1.1.11",
"cosmiconfig": "^5.0.2",
"cosmiconfig": "^5.0.4",
"css-loader": "^0.28.11",
"escape-string-regexp": "^1.0.5",
"file-loader": "^1.1.11",
Expand All @@ -29,23 +29,23 @@
"read-pkg-up": "^3.0.0",
"style-loader": "^0.21.0",
"webpack": "^4.1.1",
"webpack-bundle-analyzer": "^2.11.2",
"webpack-bundle-analyzer": "^2.13.0",
"yargs": "^11.0.0"
},
"devDependencies": {
"cross-spawn": "^6.0.5",
"eslint": "^4.19.1",
"eslint-ci": "^0.1.1",
"eslint-config-logux": "^21.0.0",
"eslint-config-logux": "^23.0.0",
"eslint-config-standard": "^11.0.0",
"eslint-plugin-import": "^2.11.0",
"eslint-plugin-import": "^2.12.0",
"eslint-plugin-jest": "^21.15.1",
"eslint-plugin-node": "^6.0.1",
"eslint-plugin-promise": "^3.7.0",
"eslint-plugin-security": "^1.4.0",
"eslint-plugin-standard": "^3.1.0",
"jest": "^22.4.3",
"lint-staged": "^7.0.0",
"jest": "^22.4.4",
"lint-staged": "^7.1.2",
"pre-commit": "^1.2.2",
"redux": "^4.0.0",
"yaspeller-ci": "^1.0.0"
Expand All @@ -60,12 +60,11 @@
"node": ">=6.11.5"
},
"eslintConfig": {
"extends": "eslint-config-logux/node4",
"extends": "eslint-config-logux/node",
"rules": {
"security/detect-non-literal-require": "off",
"security/detect-non-literal-regexp": "off",
"global-require": "off",
"strict": "off"
"global-require": "off"
}
},
"jest": {
Expand Down
2 changes: 0 additions & 2 deletions promisify.js
@@ -1,5 +1,3 @@
'use strict'

module.exports = function promisify (callback) {
return new Promise((resolve, reject) => {
callback((err, result) => {
Expand Down
38 changes: 19 additions & 19 deletions test/cli.test.js
Expand Up @@ -106,7 +106,7 @@ it('shows config content error', () => {
it('uses .size-limit file config', () => {
return run([], { cwd: fixture('config') }).then(result => {
expect(result.out).toEqual('\n' +
' Package size: 19 B\n' +
' Package size: 9 B\n' +
' Size limit: 1 KB\n' +
' With all dependencies, minified and gzipped\n' +
'\n')
Expand All @@ -117,7 +117,7 @@ it('uses .size-limit file config', () => {
it('uses .size-limit.js file config', () => {
return run([], { cwd: fixture('js') }).then(result => {
expect(result.out).toEqual('\n' +
' Package size: 19 B\n' +
' Package size: 9 B\n' +
' Size limit: 1 KB\n' +
' With all dependencies, minified and gzipped\n' +
'\n')
Expand All @@ -126,8 +126,8 @@ it('uses .size-limit.js file config', () => {
})

it('overrides config by limit argument', () => {
return run(['--limit', '18B'], { cwd: fixture('config') }).then(result => {
expect(result.out).toContain('Size limit: 18 B\n')
return run(['--limit', '1B'], { cwd: fixture('config') }).then(result => {
expect(result.out).toContain('Size limit: 1 B\n')
expect(result.code).toEqual(3)
})
})
Expand Down Expand Up @@ -174,15 +174,15 @@ it('shows limit', () => {
return run([], { cwd: fixture('good') }).then(result => {
expect(result.out).toEqual('\n' +
' index.js\n' +
' Package size: 19 B\n' +
' Package size: 9 B\n' +
' Size limit: 1 KB\n' +
'\n' +
' index2.js\n' +
' Package size: 19 B\n' +
' Package size: 9 B\n' +
' Size limit: 1 KB\n' +
'\n' +
' index3.js\n' +
' Package size: 19 B\n' +
' Package size: 9 B\n' +
' Size limit: 1 KB\n' +
'\n' +
' With all dependencies, minified and gzipped\n' +
Expand All @@ -208,21 +208,21 @@ it('accepts array for path', () => {

it('supports glob patterns', () => {
return run([], { cwd: fixture('glob') }).then(result => {
expect(result.out).toContain('Package size: 19 B\n')
expect(result.out).toContain('Package size: 9 B\n')
expect(result.code).toEqual(0)
})
})

it('supports ES2016', () => {
return run([], { cwd: fixture('es2016') }).then(result => {
expect(result.out).toContain('Package size: 34 B\n')
expect(result.out).toContain('Package size: 24 B\n')
expect(result.code).toEqual(0)
})
})

it('supports multiple files', () => {
return run([], { cwd: fixture('multiple') }).then(result => {
expect(result.out).toContain('Package size: 25 B\n')
expect(result.out).toContain('Package size: 15 B\n')
expect(result.code).toEqual(0)
})
})
Expand All @@ -238,11 +238,11 @@ it('uses names', () => {
return run([], { cwd: fixture('named') }).then(result => {
expect(result.out).toEqual('\n' +
' First\n' +
' Package size: 19 B\n' +
' Package size: 9 B\n' +
' Size limit: 1 KB\n' +
'\n' +
' Second\n' +
' Package size: 19 B\n' +
' Package size: 9 B\n' +
' Size limit: 1 KB\n' +
'\n' +
' With all dependencies, minified and gzipped\n' +
Expand Down Expand Up @@ -300,35 +300,35 @@ it('supports absolute path', () => {

it('ignores peerDependencies', () => {
return run([], { cwd: fixture('peer') }).then(result => {
expect(result.out).toContain('Package size: 92 B\n')
expect(result.out).toContain('Package size: 80 B\n')
expect(result.code).toEqual(0)
})
})

it('disables webpack by argument', () => {
return run(['--no-webpack', 'test/fixtures/bad/index.js']).then(result => {
expect(result.out).toContain('Package size: 51 B\n')
expect(result.out).toContain('Package size: 37 B\n')
expect(result.code).toEqual(0)
})
})

it('disables webpack by option', () => {
return run([], { cwd: fixture('bundled') }).then(result => {
expect(result.out).toContain('Package size: 51 B\n')
expect(result.out).toContain('Package size: 37 B\n')
expect(result.code).toEqual(0)
})
})

it('disables gzip by argument', () => {
return run(['--no-gzip', 'test/fixtures/bad/index.js']).then(result => {
expect(result.out).toContain('Package size: 6.87 KB\n')
expect(result.out).toContain('Package size: 6.85 KB\n')
expect(result.code).toEqual(0)
})
})

it('disables gzip by option', () => {
return run([], { cwd: fixture('gzip') }).then(result => {
expect(result.out).toContain('Package size: 29 B\n')
expect(result.out).toContain('Package size: 14 B\n')
expect(result.code).toEqual(0)
})
})
Expand All @@ -342,7 +342,7 @@ it('throws on --why with disabled webpack', () => {

it('uses custom webpack', () => {
return run([], { cwd: fixture('webpack-config') }).then(result => {
expect(result.out).toContain('Package size: 2.29 KB')
expect(result.out).toContain('Package size: 2.26 KB')
expect(result.code).toEqual(0)
})
})
Expand All @@ -352,7 +352,7 @@ it('uses custom webpack when specified via --config', () => {
'--config', fixture('webpack-config/webpack.config.js'),
fixture('webpack-config/index.js')
]).then(result => {
expect(result.out).toContain('Package size: 2.46 KB')
expect(result.out).toContain('Package size: 2.43 KB')
expect(result.code).toEqual(0)
})
})
2 changes: 0 additions & 2 deletions test/fixtures/bad-config/index.js
@@ -1,3 +1 @@
'use strict'

console.log(2)
2 changes: 0 additions & 2 deletions test/fixtures/bad/index.js
@@ -1,3 +1 @@
'use strict'

require('redux')
2 changes: 0 additions & 2 deletions test/fixtures/bundled/index.js
@@ -1,3 +1 @@
'use strict'

require('redux')
2 changes: 0 additions & 2 deletions test/fixtures/config/index.js
@@ -1,3 +1 @@
'use strict'

console.log(2)
2 changes: 0 additions & 2 deletions test/fixtures/css/index.js
@@ -1,3 +1 @@
'use strict'

require('./index.css')
2 changes: 0 additions & 2 deletions test/fixtures/cssmodules/index.js
@@ -1,3 +1 @@
'use strict'

require('./index.module.css')
2 changes: 0 additions & 2 deletions test/fixtures/es2016/index.js
@@ -1,3 +1 @@
'use strict';

[1, 2].forEach(i => console.log(i))
2 changes: 0 additions & 2 deletions test/fixtures/glob/index.random.js
@@ -1,3 +1 @@
'use strict'

console.log(2)
2 changes: 0 additions & 2 deletions test/fixtures/good/index.js
@@ -1,3 +1 @@
'use strict'

console.log(2)
2 changes: 0 additions & 2 deletions test/fixtures/good/index2.js
@@ -1,3 +1 @@
'use strict'

console.log(2)
2 changes: 0 additions & 2 deletions test/fixtures/good/index3.js
@@ -1,3 +1 @@
'use strict'

console.log(2)
2 changes: 0 additions & 2 deletions test/fixtures/gzip/index.js
@@ -1,3 +1 @@
'use strict'

console.log(2)
2 changes: 0 additions & 2 deletions test/fixtures/img/index.js
@@ -1,3 +1 @@
'use strict'

require('./1.png')
2 changes: 0 additions & 2 deletions test/fixtures/js/index.js
@@ -1,3 +1 @@
'use strict'

console.log(2)
2 changes: 0 additions & 2 deletions test/fixtures/multiple/index.js
@@ -1,3 +1 @@
'use strict'

console.log(2)
2 changes: 0 additions & 2 deletions test/fixtures/multiple/production.js
@@ -1,5 +1,3 @@
'use strict'

if (process.env.NODE_ENV !== 'production') {
console.log(12345678901234567890)
}
2 changes: 0 additions & 2 deletions test/fixtures/named/index1.js
@@ -1,3 +1 @@
'use strict'

console.log(2)
2 changes: 0 additions & 2 deletions test/fixtures/named/index2.js
@@ -1,3 +1 @@
'use strict'

console.log(2)
2 changes: 0 additions & 2 deletions test/fixtures/peer/index.js
@@ -1,4 +1,2 @@
'use strict'

require('redux')
require('redux/lib/redux')
2 changes: 0 additions & 2 deletions test/fixtures/webpack-config/index.js
@@ -1,4 +1,2 @@
'use strict'

for (let i = 1; i <= 100; i++) {
}
3 changes: 3 additions & 0 deletions test/fixtures/webpack-config/package.json
@@ -1,5 +1,8 @@
{
"private": true,
"engines": {
"node": ">=6.0.0"
},
"size-limit": [
{
"config": "./webpack.config.js",
Expand Down
2 changes: 0 additions & 2 deletions test/fixtures/webpack-config/webpack.config.js
@@ -1,5 +1,3 @@
'use strict'

const path = require('path')

module.exports = {
Expand Down
20 changes: 10 additions & 10 deletions test/index.test.js
Expand Up @@ -19,13 +19,13 @@ it('returns 0 for parsed and gzip empty project', () => {

it('shows project parsed and gzip sizes', () => {
return getSize(fixture('bad/index')).then(size => {
expect(size).toEqual({ parsed: 7031, gzip: 2405 })
expect(size).toEqual({ parsed: 7018, gzip: 2405 })
})
})

it('accepts array', () => {
return getSize([fixture('bad/index'), fixture('good/index')]).then(size => {
expect(size).toEqual({ parsed: 7081, gzip: 2422 })
expect(size).toEqual({ parsed: 7053, gzip: 2418 })
})
})

Expand All @@ -37,13 +37,13 @@ it('returns error', () => {

it('supports ES2016', () => {
return getSize(fixture('es2016/index')).then(size => {
expect(size).toEqual({ parsed: 47, gzip: 34 })
expect(size).toEqual({ parsed: 32, gzip: 24 })
})
})

it('support images', () => {
return getSize(fixture('img/index')).then(size => {
expect(size).toEqual({ parsed: 89, gzip: 53 })
expect(size).toEqual({ parsed: 76, gzip: 44 })
})
})

Expand All @@ -61,42 +61,42 @@ it('supports CSS modules', () => {

it('removes non-production code', () => {
return getSize(fixture('multiple/production')).then(size => {
expect(size).toEqual({ parsed: 14, gzip: 8 })
expect(size).toEqual({ parsed: 3, gzip: 1 })
})
})

it('ignores dependencies on request', () => {
return getSize(fixture('peer/index'), { ignore: ['redux'] }).then(size => {
expect(size).toEqual({ parsed: 220, gzip: 92 })
expect(size).toEqual({ parsed: 207, gzip: 80 })
})
})

it('disables webpack on request', () => {
return getSize([
fixture('bad/index'), fixture('es2016/index')
], { webpack: false }).then(size => {
expect(size).toEqual({ parsed: 82, gzip: 122 })
expect(size).toEqual({ parsed: 53, gzip: 93 })
})
})

it('disables gzip on request', () => {
return getSize([fixture('bad/index')], { gzip: false }).then(size => {
expect(size).toEqual({ parsed: 7031 })
expect(size).toEqual({ parsed: 7018 })
})
})

it('disables gzip and webpack on request', () => {
return getSize([
fixture('bad/index')
], { webpack: false, gzip: false }).then(size => {
expect(size).toEqual({ parsed: 31 })
expect(size).toEqual({ parsed: 17 })
})
})

it('uses custom webpack config', () => {
return getSize(fixture('webpack-config/index'), {
config: fixture('webpack-config/webpack.config')
}).then(size => {
expect(size).toEqual({ parsed: 2523 })
expect(size).toEqual({ parsed: 2484 })
})
})

0 comments on commit f309933

Please sign in to comment.