jab2870
/
Vim-Vixen
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-lint'

Browse Source
jh-changes
Shin'ya Ueoka 7 years ago
parent cd47088981 92d958f65b
commit ae317113e7
3 changed files with 102 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      .eslintrc
  2. 130
      package-lock.json
  3. 2
      package.json

18
.eslintrc
Unescape View File

@ -14,35 +14,33 @@
"extends": [ "eslint:all" ], "extends": [ "eslint:all" ],
"rules": { "rules": {
"array-bracket-newline": ["error", { "multiline": true }], "array-bracket-newline": ["error", { "multiline": true }],
"arrow-body-style": "off",
"array-element-newline": "off", "array-element-newline": "off",
"arrow-body-style": "off",
"arrow-parens": ["error", "as-needed", { "requireForBlockBody": true }], "arrow-parens": ["error", "as-needed", { "requireForBlockBody": true }],
"brace-style": ["error", "1tbs", { "allowSingleLine": true }], "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
"capitalized-comments": "off",
"comma-dangle": "off", "comma-dangle": "off",
"consistent-return": "off", "consistent-return": "off",
"default-case": "off", "default-case": "off",
"function-paren-newline": "off",
"id-length": "off", "id-length": "off",
"indent": ["error", 2], "indent": ["error", 2],
"max-statements": ["error", 15], "max-statements": ["error", 15],
"multiline-ternary": "off", "multiline-ternary": "off",
"newline-after-var": "off", "newline-after-var": "off",
"newline-before-return": "off", "newline-before-return": "off",
"no-magic-numbers": "off",
"no-bitwise": "off", "no-bitwise": "off",
"no-use-before-define": "off",
"no-warning-comments": "off",
"no-console": ["error", { "allow": ["warn", "error"] }], "no-console": ["error", { "allow": ["warn", "error"] }],
"no-empty-function": "off", "no-empty-function": "off",
"no-magic-numbers": "off",
"no-mixed-operators": "off", "no-mixed-operators": "off",
"no-plusplus": "off", "no-plusplus": "off",
"capitalized-comments": "off",
"no-ternary": "off", "no-ternary": "off",
"no-undefined": "off", "no-undefined": "off",
"object-curly-spacing": [ "no-use-before-define": "off",
"error", "no-warning-comments": "off",
"always", { "arraysInObjects": false, "objectsInObjects": false }
],
"object-curly-newline": ["error", { "consistent": true }], "object-curly-newline": ["error", { "consistent": true }],
"object-curly-spacing": ["error", "always", { "arraysInObjects": false, "objectsInObjects": false }],
"object-property-newline": ["error", { "allowMultiplePropertiesPerLine": true }], "object-property-newline": ["error", { "allowMultiplePropertiesPerLine": true }],
"object-shorthand": "off", "object-shorthand": "off",
"one-var": "off", "one-var": "off",
@ -50,8 +48,8 @@
"prefer-const": "off", "prefer-const": "off",
"prefer-destructuring": ["error", { "AssignmentExpression": {"array": false}}], "prefer-destructuring": ["error", { "AssignmentExpression": {"array": false}}],
"prefer-template": "off", "prefer-template": "off",
"quotes": ["error", "single", { "allowTemplateLiterals": true }],
"quote-props": "off", "quote-props": "off",
"quotes": ["error", "single", { "allowTemplateLiterals": true }],
"require-jsdoc": "off", "require-jsdoc": "off",
"sort-imports": "off", "sort-imports": "off",
"sort-keys": "off", "sort-keys": "off",

130
package-lock.json generated
Unescape View File

@ -1366,9 +1366,9 @@
} }
}, },
"cli-width": { "cli-width": {
"version": "2.1.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
"integrity": "sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao=", "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
"dev": true "dev": true
}, },
"cliui": { "cliui": {
@ -2354,20 +2354,20 @@
} }
}, },
"eslint": { "eslint": {
"version": "4.4.1", "version": "4.7.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-4.4.1.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.7.0.tgz",
"integrity": "sha1-mc1+r8/8ov+Zpcj18qR01jZLS9M=", "integrity": "sha1-01/AfEclIL496Fs9oR6ZxXav1RU=",
"dev": true, "dev": true,
"requires": { "requires": {
"ajv": "5.2.2", "ajv": "5.2.2",
"babel-code-frame": "6.22.0", "babel-code-frame": "6.22.0",
"chalk": "1.1.3", "chalk": "2.1.0",
"concat-stream": "1.6.0", "concat-stream": "1.6.0",
"cross-spawn": "5.1.0", "cross-spawn": "5.1.0",
"debug": "2.6.8", "debug": "3.0.1",
"doctrine": "2.0.0", "doctrine": "2.0.0",
"eslint-scope": "3.7.1", "eslint-scope": "3.7.1",
"espree": "3.5.0", "espree": "3.5.1",
"esquery": "1.0.0", "esquery": "1.0.0",
"estraverse": "4.2.0", "estraverse": "4.2.0",
"esutils": "2.0.2", "esutils": "2.0.2",
@ -2375,11 +2375,11 @@
"functional-red-black-tree": "1.0.1", "functional-red-black-tree": "1.0.1",
"glob": "7.1.2", "glob": "7.1.2",
"globals": "9.18.0", "globals": "9.18.0",
"ignore": "3.3.3", "ignore": "3.3.5",
"imurmurhash": "0.1.4", "imurmurhash": "0.1.4",
"inquirer": "3.2.1", "inquirer": "3.2.3",
"is-resolvable": "1.0.0", "is-resolvable": "1.0.0",
"js-yaml": "3.9.1", "js-yaml": "3.10.0",
"json-stable-stringify": "1.0.1", "json-stable-stringify": "1.0.1",
"levn": "0.3.0", "levn": "0.3.0",
"lodash": "4.17.4", "lodash": "4.17.4",
@ -2388,13 +2388,69 @@
"natural-compare": "1.4.0", "natural-compare": "1.4.0",
"optionator": "0.8.2", "optionator": "0.8.2",
"path-is-inside": "1.0.2", "path-is-inside": "1.0.2",
"pluralize": "4.0.0", "pluralize": "7.0.0",
"progress": "2.0.0", "progress": "2.0.0",
"require-uncached": "1.0.3", "require-uncached": "1.0.3",
"semver": "5.4.1", "semver": "5.4.1",
"strip-ansi": "4.0.0",
"strip-json-comments": "2.0.1", "strip-json-comments": "2.0.1",
"table": "4.0.1", "table": "4.0.1",
"text-table": "0.2.0" "text-table": "0.2.0"
},
"dependencies": {
"ansi-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
"dev": true
},
"ansi-styles": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
"dev": true,
"requires": {
"color-convert": "1.9.0"
}
},
"chalk": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
"integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
"dev": true,
"requires": {
"ansi-styles": "3.2.0",
"escape-string-regexp": "1.0.5",
"supports-color": "4.4.0"
}
},
"debug": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.0.1.tgz",
"integrity": "sha512-6nVc6S36qbt/mutyt+UGMnawAMrPDZUPQjRZI3FS9tCtDRhvxJbK79unYBLPi+z5SLXQ3ftoVBFCblQtNSls8w==",
"dev": true,
"requires": {
"ms": "2.0.0"
}
},
"strip-ansi": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": {
"ansi-regex": "3.0.0"
}
},
"supports-color": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
"integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
"dev": true,
"requires": {
"has-flag": "2.0.0"
}
}
} }
}, },
"eslint-scope": { "eslint-scope": {
@ -2408,9 +2464,9 @@
} }
}, },
"espree": { "espree": {
"version": "3.5.0", "version": "3.5.1",
"resolved": "https://registry.npmjs.org/espree/-/espree-3.5.0.tgz", "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz",
"integrity": "sha1-mDWGJb3QVYYeon4oZ+pyn69GPY0=", "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=",
"dev": true, "dev": true,
"requires": { "requires": {
"acorn": "5.1.1", "acorn": "5.1.1",
@ -2574,7 +2630,7 @@
"integrity": "sha1-HtkZnanL/i7y96MbL96LDRI2iXI=", "integrity": "sha1-HtkZnanL/i7y96MbL96LDRI2iXI=",
"dev": true, "dev": true,
"requires": { "requires": {
"iconv-lite": "0.4.18", "iconv-lite": "0.4.19",
"jschardet": "1.5.1", "jschardet": "1.5.1",
"tmp": "0.0.31" "tmp": "0.0.31"
} }
@ -3250,9 +3306,9 @@
"dev": true "dev": true
}, },
"iconv-lite": { "iconv-lite": {
"version": "0.4.18", "version": "0.4.19",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
"integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA==", "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
"dev": true "dev": true
}, },
"icss-replace-symbols": { "icss-replace-symbols": {
@ -3319,9 +3375,9 @@
"dev": true "dev": true
}, },
"ignore": { "ignore": {
"version": "3.3.3", "version": "3.3.5",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz", "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz",
"integrity": "sha1-QyNS5XrM2HqzEQ6C0/6g5HgSFW0=", "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==",
"dev": true "dev": true
}, },
"imurmurhash": { "imurmurhash": {
@ -3374,15 +3430,15 @@
"dev": true "dev": true
}, },
"inquirer": { "inquirer": {
"version": "3.2.1", "version": "3.2.3",
"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.2.1.tgz", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.2.3.tgz",
"integrity": "sha512-QgW3eiPN8gpj/K5vVpHADJJgrrF0ho/dZGylikGX7iqAdRgC9FVKYKWFLx6hZDBFcOLEoSqINYrVPeFAeG/PdA==", "integrity": "sha512-Bc3KbimpDTOeQdDj18Ir/rlsGuhBSSNqdOnxaAuKhpkdnMMuKsEGbZD2v5KFF9oso2OU+BPh7+/u5obmFDRmWw==",
"dev": true, "dev": true,
"requires": { "requires": {
"ansi-escapes": "2.0.0", "ansi-escapes": "2.0.0",
"chalk": "2.1.0", "chalk": "2.1.0",
"cli-cursor": "2.1.0", "cli-cursor": "2.1.0",
"cli-width": "2.1.0", "cli-width": "2.2.0",
"external-editor": "2.0.4", "external-editor": "2.0.4",
"figures": "2.0.0", "figures": "2.0.0",
"lodash": "4.17.4", "lodash": "4.17.4",
@ -3418,7 +3474,7 @@
"requires": { "requires": {
"ansi-styles": "3.2.0", "ansi-styles": "3.2.0",
"escape-string-regexp": "1.0.5", "escape-string-regexp": "1.0.5",
"supports-color": "4.2.1" "supports-color": "4.4.0"
} }
}, },
"strip-ansi": { "strip-ansi": {
@ -3431,9 +3487,9 @@
} }
}, },
"supports-color": { "supports-color": {
"version": "4.2.1", "version": "4.4.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
"integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==", "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"has-flag": "2.0.0" "has-flag": "2.0.0"
@ -3708,9 +3764,9 @@
"dev": true "dev": true
}, },
"js-yaml": { "js-yaml": {
"version": "3.9.1", "version": "3.10.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
"integrity": "sha512-CbcG379L1e+mWBnLvHWWeLs8GyV/EMw862uLI3c+GxVyDHWZcjZinwuBd3iW2pgxgIlksW/1vNJa4to+RvDOww==", "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
"dev": true, "dev": true,
"requires": { "requires": {
"argparse": "1.0.9", "argparse": "1.0.9",
@ -5133,9 +5189,9 @@
} }
}, },
"pluralize": { "pluralize": {
"version": "4.0.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
"integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I=", "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
"dev": true "dev": true
}, },
"postcss": { "postcss": {

2
package.json
Unescape View File

@ -23,7 +23,7 @@
"babel-preset-es2015": "^6.24.1", "babel-preset-es2015": "^6.24.1",
"chai": "^4.1.1", "chai": "^4.1.1",
"css-loader": "^0.28.4", "css-loader": "^0.28.4",
"eslint": "^4.4.1", "eslint": "^4.7.0",
"html-webpack-plugin": "^2.30.1", "html-webpack-plugin": "^2.30.1",
"karma": "^1.7.0", "karma": "^1.7.0",
"karma-firefox-launcher": "^1.0.1", "karma-firefox-launcher": "^1.0.1",