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

Commit fe5b261

Browse files
author
Steffan
committed
add eslint
1 parent 952cc9d commit fe5b261

27 files changed

+411
-100
lines changed

.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/node_modules
2+
/dist
3+
/test

.eslintrc.js

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
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+
}
44+
};

build/build.js

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
1+
/* eslint-env node */
2+
13
var fs = require('fs');
24
var rollup = require('rollup');
35
var uglify = require('uglify-js');
46
var buble = require('rollup-plugin-buble');
5-
var package = require('../package.json');
7+
var {version} = require('../package.json');
68
var banner =
7-
"/*!\n" +
8-
" * vue-resource v" + package.version + "\n" +
9-
" * https://github.com/pagekit/vue-resource\n" +
10-
" * Released under the MIT License.\n" +
11-
" */\n";
9+
'/*!\n' +
10+
' * vue-resource v' + version + '\n' +
11+
' * https://github.com/pagekit/vue-resource\n' +
12+
' * Released under the MIT License.\n' +
13+
' */\n';
1214

1315
rollup.rollup({
14-
input: 'src/index.js',
15-
plugins: [buble()]
16+
input: 'src/index.js',
17+
plugins: [buble()]
1618
})
1719
.then(bundle =>
1820
bundle.generate({
19-
format: 'umd',
20-
banner: banner,
21-
name: 'VueResource'
21+
format: 'umd',
22+
banner: banner,
23+
name: 'VueResource'
2224
}).then(({code}) => write('dist/vue-resource.js', code, bundle))
2325
)
2426
.then(bundle =>
@@ -28,41 +30,41 @@ rollup.rollup({
2830
)
2931
.then(bundle =>
3032
bundle.generate({
31-
format: 'es',
32-
banner: banner,
33-
footer: 'export { Url, Http, Resource };'
33+
format: 'es',
34+
banner: banner,
35+
footer: 'export { Url, Http, Resource };'
3436
}).then(({code}) => write('dist/vue-resource.esm.js', code, bundle))
3537
)
3638
.then(bundle =>
3739
bundle.generate({
38-
format: 'cjs',
39-
banner: banner
40+
format: 'cjs',
41+
banner: banner
4042
}).then(({code}) => write('dist/vue-resource.common.js', code, bundle))
4143
)
4244
.catch(logError);
4345

4446
function read(path) {
45-
return fs.readFileSync(path, 'utf8');
47+
return fs.readFileSync(path, 'utf8');
4648
}
4749

4850
function write(dest, code, bundle) {
49-
return new Promise(function (resolve, reject) {
50-
fs.writeFile(dest, code, function (err) {
51-
if (err) return reject(err);
52-
console.log(blue(dest) + ' ' + getSize(code));
53-
resolve(bundle);
51+
return new Promise(function (resolve, reject) {
52+
fs.writeFile(dest, code, function (err) {
53+
if (err) return reject(err);
54+
console.log(blue(dest) + ' ' + getSize(code));
55+
resolve(bundle);
56+
});
5457
});
55-
});
5658
}
5759

5860
function getSize(code) {
59-
return (code.length / 1024).toFixed(2) + 'kb';
61+
return (code.length / 1024).toFixed(2) + 'kb';
6062
}
6163

6264
function logError(e) {
63-
console.log(e);
65+
console.log(e);
6466
}
6567

6668
function blue(str) {
67-
return '\x1b[1m\x1b[34m' + str + '\x1b[39m\x1b[22m';
69+
return '\x1b[1m\x1b[34m' + str + '\x1b[39m\x1b[22m';
6870
}

build/release.js

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1+
/* eslint-env node */
2+
13
var replace = require('replace-in-file');
24
var version = process.argv[2];
35

46
replace({
5-
files: "bower.json",
6-
from: /("version"\s*:\s*")\d+\.\d+\.\d+("\s*,)/g,
7-
to: "$1" + version + "$2"
7+
files: 'bower.json',
8+
from: /("version"\s*:\s*")\d+\.\d+\.\d+("\s*,)/g,
9+
to: '$1' + version + '$2'
810
});
911

1012
replace({
11-
files: "package.json",
12-
from: /("version"\s*:\s*")\d+\.\d+\.\d+("\s*,)/g,
13-
to: "$1" + version + "$2"
13+
files: 'package.json',
14+
from: /("version"\s*:\s*")\d+\.\d+\.\d+("\s*,)/g,
15+
to: '$1' + version + '$2'
1416
});
1517

1618
replace({
17-
files: "README.md",
18-
from: /(\/|@)\d+\.\d+\.\d+/g,
19-
to: "$1" + version
19+
files: 'README.md',
20+
from: /(\/|@)\d+\.\d+\.\d+/g,
21+
to: '$1' + version
2022
});

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"devDependencies": {
3838
"buble": "^0.18.0",
3939
"buble-loader": "^0.4.1",
40+
"eslint": "^4.13.1",
4041
"generate-release": "^0.14.0",
4142
"jasmine": "^2.8.0",
4243
"jasmine-core": "^2.8.0",

src/http/client/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import Promise from '../../promise';
66
import xhrClient from './xhr';
77
import nodeClient from './node';
8-
import { warn, when, isObject, isFunction, inBrowser } from '../../util';
8+
import {warn, when, isObject, isFunction, inBrowser} from '../../util';
99

1010
export default function (context) {
1111

src/http/client/node.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44

55
import Promise from '../../promise';
6-
import { each, trim } from '../../util';
6+
import {each, trim} from '../../util';
77

88
export default function (request) {
99

@@ -23,10 +23,9 @@ export default function (request) {
2323
client(url, {body, method, headers}).then(handler = (resp) => {
2424

2525
var response = request.respondWith(resp.body, {
26-
status: resp.statusCode,
27-
statusText: trim(resp.statusMessage)
28-
}
29-
);
26+
status: resp.statusCode,
27+
statusText: trim(resp.statusMessage)
28+
});
3029

3130
each(resp.headers, (value, name) => {
3231
response.headers.set(name, value);

src/http/client/xdr.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ export default function (request) {
99

1010
var xdr = new XDomainRequest(), handler = ({type}) => {
1111

12-
var status = 0;
12+
var status = 0;
1313

14-
if (type === 'load') {
15-
status = 200;
16-
} else if (type === 'error') {
17-
status = 500;
18-
}
14+
if (type === 'load') {
15+
status = 200;
16+
} else if (type === 'error') {
17+
status = 500;
18+
}
1919

20-
resolve(request.respondWith(xdr.responseText, {status}));
21-
};
20+
resolve(request.respondWith(xdr.responseText, {status}));
21+
};
2222

2323
request.abort = () => xdr.abort();
2424

src/http/client/xhr.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,25 @@
33
*/
44

55
import Promise from '../../promise';
6-
import { each, trim } from '../../util';
6+
import {each, trim} from '../../util';
77

88
export default function (request) {
99
return new Promise(resolve => {
1010

1111
var xhr = new XMLHttpRequest(), handler = (event) => {
1212

13-
var response = request.respondWith(
13+
var response = request.respondWith(
1414
'response' in xhr ? xhr.response : xhr.responseText, {
1515
status: xhr.status === 1223 ? 204 : xhr.status, // IE9 status bug
1616
statusText: xhr.status === 1223 ? 'No Content' : trim(xhr.statusText)
17-
}
18-
);
17+
});
1918

20-
each(trim(xhr.getAllResponseHeaders()).split('\n'), row => {
21-
response.headers.append(row.slice(0, row.indexOf(':')), row.slice(row.indexOf(':') + 1));
22-
});
19+
each(trim(xhr.getAllResponseHeaders()).split('\n'), row => {
20+
response.headers.append(row.slice(0, row.indexOf(':')), row.slice(row.indexOf(':') + 1));
21+
});
2322

24-
resolve(response);
25-
};
23+
resolve(response);
24+
};
2625

2726
request.abort = () => xhr.abort();
2827

src/http/headers.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* HTTP Headers.
33
*/
44

5-
import { each, trim, toLower } from '../util';
5+
import {each, trim, toLower} from '../util';
66

77
export default class Headers {
88

@@ -32,7 +32,7 @@ export default class Headers {
3232
this.map[normalizeName(getName(this.map, name) || name)] = [trim(value)];
3333
}
3434

35-
append(name, value){
35+
append(name, value) {
3636

3737
var list = this.map[getName(this.map, name)];
3838

@@ -43,11 +43,11 @@ export default class Headers {
4343
}
4444
}
4545

46-
delete(name){
46+
delete(name) {
4747
delete this.map[getName(this.map, name)];
4848
}
4949

50-
deleteAll(){
50+
deleteAll() {
5151
this.map = {};
5252
}
5353

@@ -67,7 +67,7 @@ function getName(map, name) {
6767

6868
function normalizeName(name) {
6969

70-
if (/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(name)) {
70+
if (/[^a-z0-9\-#$%&'*+.^_`|~]/i.test(name)) {
7171
throw new TypeError('Invalid character in header field name');
7272
}
7373

src/http/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import header from './interceptor/header';
1515
import Client from './client/index';
1616
import Request from './request';
1717
import Promise from '../promise';
18-
import { assign, defaults, error, isString, isFunction } from '../util';
18+
import {assign, defaults, error, isString, isFunction} from '../util';
1919

2020
export default function Http(options) {
2121

src/http/interceptor/before.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Before Interceptor.
33
*/
44

5-
import { isFunction } from '../../util';
5+
import {isFunction} from '../../util';
66

77
export default function (request, next) {
88

src/http/interceptor/cors.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import Url from '../../url/index';
66
import xdrClient from '../client/xdr';
7-
import { inBrowser } from '../../util';
7+
import {inBrowser} from '../../util';
88

99
const SUPPORTS_CORS = inBrowser && 'withCredentials' in new XMLHttpRequest();
1010

src/http/interceptor/form.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44

55
import Url from '../../url/index';
6-
import { isObject, isFormData } from '../../util';
6+
import {isObject, isFormData} from '../../util';
77

88
export default function (request, next) {
99

src/http/interceptor/header.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44

55
import Http from '../index';
6-
import { assign, each, toLower } from '../../util';
6+
import {assign, each, toLower} from '../../util';
77

88
export default function (request, next) {
99

src/http/interceptor/json.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
* JSON Interceptor.
33
*/
44

5-
import Url from '../../url/index';
6-
import { when, isObject } from '../../util';
5+
import {when, isObject} from '../../util';
76

87
export default function (request, next) {
98

src/http/request.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import Url from '../url/index';
66
import Headers from './headers';
77
import Response from './response';
8-
import { assign, toUpper } from '../util';
8+
import {assign, toUpper} from '../util';
99

1010
export default class Request {
1111

@@ -23,11 +23,11 @@ export default class Request {
2323
}
2424
}
2525

26-
getUrl(){
26+
getUrl() {
2727
return Url(this);
2828
}
2929

30-
getBody(){
30+
getBody() {
3131
return this.body;
3232
}
3333

0 commit comments

Comments
 (0)