Skip to content

Commit

Permalink
Merge pull request #4 from mi-sec/development
Browse files Browse the repository at this point in the history
Update primary methods
  • Loading branch information
iSkore authored Sep 28, 2019
2 parents 921c585 + 8d8c175 commit a31da89
Show file tree
Hide file tree
Showing 15 changed files with 5,430 additions and 4,104 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
root = true

[*]
indent_style = tab
indent_style = space
indent_size = 4
charset = utf-8
trim_trailing_whitespace = true
Expand Down
74 changes: 51 additions & 23 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,17 @@ module.exports = {
es6: true,
node: true
},
extends: 'eslint:recommended',

extends: [
'eslint:recommended'
],

parserOptions: {
parser: 'babel-eslint',
ecmaVersion: 2017,
ecmaFeatures: {
experimentalObjectRestSpread: true
},
sourceType: 'module'
},

globals: {
before: true,
after: true,
Expand All @@ -20,6 +23,7 @@ module.exports = {
JSON: true,
console: true,
'$': true,
M: true,
document: true,
location: true,
window: true,
Expand All @@ -29,12 +33,16 @@ module.exports = {
L: true,
Materialize: true,
navigator: true,
alert: true
alert: true,
import: true,
require: true,
fetch: true
},

rules: {
indent: [
2,
'tab',
4,
{ SwitchCase: 1 }
],
'linebreak-style': [ 2, 'unix' ],
Expand Down Expand Up @@ -65,8 +73,8 @@ module.exports = {
'comma-spacing': [
1,
{
'before': false,
'after': true
before: false,
after: true
}
],
'comma-style': [ 1, 'last' ],
Expand All @@ -80,8 +88,8 @@ module.exports = {
'generator-star-spacing': [
1,
{
'before': true,
'after': true
before: true,
after: true
}
],
'handle-callback-err': [ 1, '^(err|error)$' ],
Expand All @@ -90,11 +98,11 @@ module.exports = {
1,
{
overrides: {
catch: { after: false },
if: { after: false },
for: { after: false },
while: { after: false },
switch: { after: false }
catch: { after: true },
if: { after: true },
for: { after: true },
while: { after: true },
switch: { after: true }
}
}
],
Expand All @@ -111,10 +119,10 @@ module.exports = {
'no-case-declarations': 'off',
'no-class-assign': 1,
'no-cond-assign': 1,
'no-console': 'off',
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-const-assign': 1,
'no-control-regex': 1,
'no-debugger': 1,
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-delete-var': 1,
'no-dupe-args': 1,
'no-dupe-class-members': 1,
Expand All @@ -127,7 +135,7 @@ module.exports = {
'no-ex-assign': 1,
'no-extend-native': 1,
'no-extra-bind': 1,
'no-extra-boolean-cast': 1,
'no-extra-boolean-cast': 'off',
'no-extra-parens': [ 1, 'functions' ],
'no-fallthrough': 1,
'no-floating-decimal': 1,
Expand Down Expand Up @@ -200,7 +208,7 @@ module.exports = {
'no-useless-escape': 1,
'no-whitespace-before-property': 1,
'no-with': 1,
'one-var': [ 1, { var: 'always' } ],
'one-var': [ 1, { 'var': 'always' } ],
'operator-linebreak': [
1,
'after',
Expand Down Expand Up @@ -233,7 +241,11 @@ module.exports = {
}
],
'space-before-blocks': [ 1, 'always' ],
'space-before-function-paren': [ 1, 'never' ],
'space-before-function-paren': [ 1, {
anonymous: 'never',
named: 'never',
asyncArrow: 'always'
} ],
'space-in-parens': [ 1, 'always' ],
'space-infix-ops': 1,
'space-unary-ops': [
Expand All @@ -259,11 +271,27 @@ module.exports = {
}
],
'use-isnan': 1,
'valid-jsdoc': [ 1, { 'requireReturn': false } ],
'valid-jsdoc': [ 1, { requireReturn: false } ],
'valid-typeof': 1,
'wrap-iife': [ 1, 'any' ],
'yield-star-spacing': [ 1, 'both' ],
yoda: [ 1, 'never' ],
'max-statements-per-line': [ 1, { 'max': 2 } ]
}
'max-statements-per-line': [ 1, { max: 2 } ]
},

overrides: [
{
files: [ '*.vue' ],
rules: {
'indent': 'off',
'vue/script-indent': [
'warn',
'tab',
{ baseIndent: 1 }
]
}
}
],

root: true
};
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

Loading

0 comments on commit a31da89

Please sign in to comment.