Skip to content

Commit 1cb30e8

Browse files
committed
Relax some rules
1 parent 0dfae66 commit 1cb30e8

File tree

3 files changed

+3
-15
lines changed

3 files changed

+3
-15
lines changed

config/eslint.js

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module.exports = {
3737
settings: {
3838
'import/ignore': [
3939
'node_modules',
40-
'\\.(json|css|jpg|png|gif|svg|eot|svg|ttf|woff|woff2|mp4|webm)$',
40+
'\\.(json|css|jpg|png|gif|eot|svg|ttf|woff|woff2|mp4|webm)$',
4141
],
4242
'import/extensions': ['.js'],
4343
'import/resolver': {
@@ -54,7 +54,6 @@ module.exports = {
5454
'block-scoped-var': WARNING,
5555
'block-spacing': [WARNING, 'always'],
5656
'brace-style': [WARNING, '1tbs', { allowSingleLine: true }],
57-
camelcase: [WARNING, { properties: 'never' }],
5857
'comma-spacing': [WARNING, { before: false, after: true }],
5958
'comma-style': [WARNING, 'last'],
6059
'computed-property-spacing': [WARNING, 'never'],
@@ -131,7 +130,6 @@ module.exports = {
131130
],
132131
allowSamePrecedence: false
133132
}],
134-
'no-mixed-spaces-and-tabs': WARNING,
135133
'no-multi-spaces': WARNING,
136134
'no-multi-str': ERROR,
137135
'no-multiple-empty-lines': [WARNING, { max: 2, maxEOF: 1 }],
@@ -190,14 +188,7 @@ module.exports = {
190188
'object-property-newline': [WARNING, {
191189
allowMultiplePropertiesPerLine: true,
192190
}],
193-
'one-var': [WARNING, 'never'],
194-
'one-var-declaration-per-line': [WARNING, 'always'],
195191
'operator-assignment': [ERROR, 'always'],
196-
'prefer-arrow-callback': [WARNING, {
197-
allowNamedFunctions: false,
198-
allowUnboundThis: true,
199-
}],
200-
'prefer-rest-params': ERROR,
201192
radix: ERROR,
202193
'require-yield': ERROR,
203194
'rest-spread-spacing': [ERROR, 'never'],
@@ -234,19 +225,16 @@ module.exports = {
234225
'import/no-commonjs': WARNING,
235226
'import/no-duplicates': ERROR,
236227
'import/no-extraneous-dependencies': ERROR,
237-
'import/no-mutable-exports': WARNING,
238228
'import/no-named-as-default': ERROR,
239229
'import/no-named-as-default-member': ERROR,
240230
'import/no-unresolved': [ERROR, { commonjs: true }],
241-
'import/prefer-default-export': WARNING,
242231

243232
// https://github.com/yannickcr/eslint-plugin-react/tree/master/docs/rules
244233
'react/jsx-equals-spacing': [ERROR, 'never'],
245234
'react/jsx-handler-names': [WARNING, {
246235
eventHandlerPrefix: 'handle',
247236
eventHandlerPropPrefix: 'on',
248237
}],
249-
'react/jsx-indent': [WARNING, 2],
250238
'react/jsx-key': WARNING,
251239
'react/jsx-no-duplicate-props': [ERROR, { ignoreCase: true }],
252240
'react/jsx-no-undef': ERROR,

config/webpack.config.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ module.exports = {
5454
loader: 'json'
5555
},
5656
{
57-
test: /\.(jpg|png|gif|svg|eot|svg|ttf|woff|woff2)$/,
57+
test: /\.(jpg|png|gif|eot|svg|ttf|woff|woff2)$/,
5858
loader: 'file',
5959
},
6060
{

config/webpack.config.prod.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ module.exports = {
5151
loader: 'json'
5252
},
5353
{
54-
test: /\.(jpg|png|gif|svg|eot|svg|ttf|woff|woff2)$/,
54+
test: /\.(jpg|png|gif|eot|svg|ttf|woff|woff2)$/,
5555
loader: 'file',
5656
},
5757
{

0 commit comments

Comments
 (0)