Skip to content
This repository was archived by the owner on Dec 1, 2023. It is now read-only.

Commit 380c643

Browse files
author
Steffan
committed
update eslint
1 parent a685ab7 commit 380c643

File tree

9 files changed

+83
-75
lines changed

9 files changed

+83
-75
lines changed

.circleci/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ jobs:
2424
key: yarn-{{ checksum "yarn.lock" }}
2525
paths:
2626
- ~/.yarn
27+
- run:
28+
name: Lint JavaScript
29+
command: yarn run eslint
2730
- run:
2831
name: Run Tests
2932
command: |

.eslintrc.js

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,46 @@
11
module.exports = {
2-
"root":true,
3-
"env": {
4-
"es6": true,
5-
"browser": true,
6-
"commonjs": true,
7-
},
8-
"extends": [
9-
"eslint:recommended"
10-
],
11-
"parserOptions": {
12-
"sourceType": "module"
13-
},
14-
"rules": {
15-
"brace-style": ["error", "1tbs", {"allowSingleLine": true}],
16-
"comma-style": "error",
17-
"comma-spacing": "error",
18-
"eqeqeq": ["off", "smart"],
19-
"indent": "off",
20-
"indent-legacy": ["error", 4, {"SwitchCase": 1}],
21-
"key-spacing": "error",
22-
"keyword-spacing": "error",
23-
"linebreak-style": ["error", "unix"],
24-
"no-multi-spaces": "error",
25-
"no-trailing-spaces": "error",
26-
"no-lone-blocks": "error",
27-
"no-extend-native": "error",
28-
"no-unused-vars": ["error", {"vars": "local", "args": "none"}],
29-
"no-empty": ["error", {"allowEmptyCatch": true}],
30-
"no-duplicate-imports": "error",
31-
"no-array-constructor": "error",
32-
"no-multiple-empty-lines": "error",
33-
"no-template-curly-in-string": "error",
34-
"no-console": "off",
35-
"object-curly-spacing": "error",
36-
"quotes": ["error", "single", {"avoidEscape": true}],
37-
"semi": ["error", "always"],
38-
"space-infix-ops": "error",
39-
"space-unary-ops": "error",
40-
"space-in-parens": "error",
41-
"space-before-blocks": "error",
42-
"template-curly-spacing": "error"
43-
}
2+
"root": true,
3+
"env": {
4+
"es6": true,
5+
"browser": true,
6+
"commonjs": true,
7+
},
8+
"extends": [
9+
"eslint:recommended"
10+
],
11+
"parserOptions": {
12+
"sourceType": "module"
13+
},
14+
"rules": {
15+
"brace-style": ["error", "1tbs", {"allowSingleLine": true}],
16+
"comma-style": "error",
17+
"comma-spacing": "error",
18+
"eqeqeq": ["off", "smart"],
19+
"indent": "off",
20+
"indent-legacy": ["error", 4, {"SwitchCase": 1}],
21+
"key-spacing": "error",
22+
"keyword-spacing": "error",
23+
"linebreak-style": ["error", "unix"],
24+
"no-var": "error",
25+
"no-multi-spaces": "error",
26+
"no-trailing-spaces": "error",
27+
"no-lone-blocks": "error",
28+
"no-extend-native": "error",
29+
"no-unused-vars": ["error", {"vars": "local", "args": "none"}],
30+
"no-empty": ["error", {"allowEmptyCatch": true}],
31+
"no-duplicate-imports": "error",
32+
"no-array-constructor": "error",
33+
"no-multiple-empty-lines": "error",
34+
"no-template-curly-in-string": "error",
35+
"no-console": "off",
36+
"object-curly-spacing": "error",
37+
"prefer-const": "error",
38+
"quotes": ["error", "single", {"avoidEscape": true}],
39+
"semi": ["error", "always"],
40+
"space-infix-ops": "error",
41+
"space-unary-ops": "error",
42+
"space-in-parens": "error",
43+
"space-before-blocks": "error",
44+
"template-curly-spacing": "error"
45+
}
4446
};

build/build.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* eslint-env node */
22

3-
var fs = require('fs');
4-
var rollup = require('rollup');
5-
var uglify = require('uglify-js');
6-
var buble = require('rollup-plugin-buble');
7-
var {version} = require('../package.json');
8-
var banner =
3+
const fs = require('fs');
4+
const rollup = require('rollup');
5+
const uglify = require('uglify-js');
6+
const buble = require('rollup-plugin-buble');
7+
const {version} = require('../package.json');
8+
const banner =
99
'/*!\n' +
1010
' * vue-event-manager v' + version + '\n' +
1111
' * https://github.com/pagekit/vue-event-manager\n' +

build/release.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env node */
22

3-
var replace = require('replace-in-file');
4-
var version = process.argv[2];
3+
const replace = require('replace-in-file');
4+
const version = process.argv[2];
55

66
replace({
77
files: 'package.json',

package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
},
2323
"scripts": {
2424
"karma": "karma start test/karma.conf.js --single-run",
25-
"build": "node build/build.js",
26-
"release": "node build/release.js"
25+
"build": "node ./build/build.js",
26+
"release": "node ./build/release.js",
27+
"eslint": "eslint .",
28+
"eslint-fix": "eslint . --fix"
2729
},
2830
"devDependencies": {
2931
"buble": "^0.18.0",
@@ -38,9 +40,9 @@
3840
"karma-safari-launcher": "^1.0.0",
3941
"karma-webpack": "^2.0.9",
4042
"replace-in-file": "^3.1.0",
41-
"rollup": "^0.55.1",
43+
"rollup": "^0.55.3",
4244
"rollup-plugin-buble": "^0.18.0",
43-
"uglify-js": "^3.2.2",
45+
"uglify-js": "^3.3.9",
4446
"vue": "^2.5.13",
4547
"webpack": "^3.10.0"
4648
}

src/EventManager.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ export default class EventManager {
1212

1313
on(event, callback, priority = 0) {
1414

15-
var listeners = this.listeners[event] || [], index;
16-
17-
index = listeners.findIndex(listener => listener.priority < priority);
15+
const listeners = this.listeners[event] || [];
16+
const index = listeners.findIndex(listener => listener.priority < priority);
1817

1918
if (~index) {
2019
listeners.splice(index, 0, {callback, priority});
@@ -33,11 +32,11 @@ export default class EventManager {
3332
delete this.listeners[event];
3433
}
3534

36-
var listeners = this.listeners[event], index;
35+
const listeners = this.listeners[event];
3736

3837
if (listeners && callback) {
3938

40-
index = listeners.findIndex(listener => listener.callback === callback);
39+
const index = listeners.findIndex(listener => listener.callback === callback);
4140

4241
if (~index) {
4342
listeners.splice(index, 1);
@@ -53,7 +52,7 @@ export default class EventManager {
5352

5453
return ((this.listeners[event] || []).concat()).reduce((result, listener) => {
5554

56-
var callback = result => {
55+
const callback = result => {
5756

5857
if (result === false) {
5958
return result;

src/index.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import EventManager from './EventManager';
66
import {forEach, isArray, isObject} from './util';
77

8-
var Events = new EventManager();
8+
const Events = new EventManager();
99

1010
Events.install = function (Vue) {
1111

@@ -21,14 +21,15 @@ Events.install = function (Vue) {
2121

2222
function initEvents() {
2323

24-
var {events} = this.$options, _events = [];
24+
const _events = [];
25+
const {events} = this.$options;
2526

2627
if (events) {
2728

2829
forEach(events, (listeners, event) => {
2930
forEach(isArray(listeners) ? listeners : [listeners], listener => {
3031

31-
var priority = 0;
32+
let priority = 0;
3233

3334
if (isObject(listener)) {
3435
priority = listener.priority;
@@ -48,7 +49,7 @@ function bindListener(fn, vm) {
4849
if (typeof fn === 'string') {
4950
return function () {
5051
return vm[fn].apply(vm, arguments);
51-
}
52+
};
5253
}
5354

5455
return fn.bind(vm);

src/util.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@ if (!Array.prototype.findIndex) {
3232
throw new TypeError('predicate must be a function');
3333
}
3434

35-
var o = Object(this);
36-
var len = o.length >>> 0;
37-
var thisArg = arguments[1];
38-
var k = 0;
35+
const o = Object(this);
36+
const len = o.length >>> 0;
37+
const thisArg = arguments[1];
38+
39+
let k = 0;
3940

4041
while (k < len) {
4142

42-
var kValue = o[k];
43+
const kValue = o[k];
4344

4445
if (predicate.call(thisArg, kValue, k, o)) {
4546
return k;

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3454,9 +3454,9 @@ rollup-pluginutils@^2.0.1:
34543454
estree-walker "^0.3.0"
34553455
micromatch "^2.3.11"
34563456

3457-
rollup@^0.55.1:
3458-
version "0.55.1"
3459-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.55.1.tgz#baf4f23abe3014b29e56dea7d72d9946e56ac7dd"
3457+
rollup@^0.55.3:
3458+
version "0.55.3"
3459+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.55.3.tgz#0af082a766d51c3058430c8372442ff5207d8736"
34603460

34613461
run-async@^2.2.0:
34623462
version "2.3.0"
@@ -3947,9 +3947,9 @@ uglify-js@^2.8.29:
39473947
optionalDependencies:
39483948
uglify-to-browserify "~1.0.0"
39493949

3950-
uglify-js@^3.2.2:
3951-
version "3.3.8"
3952-
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.8.tgz#51e9a5db73afb53ac98603d08224edcd0be45fd8"
3950+
uglify-js@^3.3.9:
3951+
version "3.3.9"
3952+
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.9.tgz#33869666c8ab7f7658ce3d22f0f1ced40097d33a"
39533953
dependencies:
39543954
commander "~2.13.0"
39553955
source-map "~0.6.1"

0 commit comments

Comments
 (0)