Permalink
Browse files

Change to plain eslint from gulp-eslint. Remove jshint.

  • Loading branch information...
1 parent 25b881a commit 7c781042c0bda68e5f6a12f61d053159db655ffd @brycekahle brycekahle committed Jan 21, 2017
View
@@ -0,0 +1,4 @@
+dist/*
+build/*
+tests/html/lib/sockjs.js
+tests/html/static/*
View
@@ -1,19 +1,17 @@
{
+ "extends": ["eslint:recommended"],
"env": {
"node": true,
"browser": true
},
"rules": {
- "consistent-this": [2, "self"],
- "quotes": [1, "single", "avoid-escape"],
- "no-space-before-semi": [0],
- "no-underscore-dangle": [0],
- "no-mixed-requires": [0]
+ "consistent-this": ["error", "self"],
+ "quotes": ["warn", "single", "avoid-escape"],
+ "no-space-before-semi": "off",
+ "no-underscore-dangle": "off",
+ "no-mixed-requires": "off"
},
"globals": {
- "describe": true,
- "before": true,
- "it": true,
- "after": true
+ "Uint8Array": true
}
}
View
@@ -1,17 +0,0 @@
-{
- "undef": true
-, "unused": "vars"
-, "newcap": true
-, "laxcomma": true
-, "laxbreak": true
-, "strict": true
-, "node": true
-, "browser": true
-, "predef": [
- "XDomainRequest"
- , "EventSource"
- , "describe"
- , "it"
- , "before"
- ]
-}
View
@@ -5,7 +5,6 @@ build/
.zuul.yml
.eslintrc
.jscsrc
-.jshintrc
bower.json
gulpfile.js
Makefile
View
@@ -1,4 +1,4 @@
-/* eslint camelcase: 0 */
+/* eslint camelcase: "off" */
'use strict';
var util = require('util')
@@ -10,7 +10,6 @@ var util = require('util')
, buffer = require('vinyl-buffer')
, envify = require('envify/custom')
, mocha = require('gulp-mocha')
- , eslint = require('gulp-eslint')
, rename = require('gulp-rename')
, header = require('gulp-header')
, pkg = require('./package.json')
@@ -36,17 +35,6 @@ gulp.task('test', function () {
.pipe(mocha());
});
-gulp.task('eslint', function () {
- gulp.src([
- 'lib/**/*.js',
- 'tests/lib/**/*.js',
- 'tests/support/**/*.js',
- 'tests/*.js'
- ])
- .pipe(eslint())
- .pipe(eslint.format());
-});
-
gulp.task('watch', function () {
gulp.watch('tests/*.js', ['test']);
});
View
@@ -4,6 +4,7 @@ var JSON3 = require('json3');
// Some extra characters that Chrome gets wrong, and substitutes with
// something else on the wire.
+// eslint-disable-next-line no-control-regex
var extraEscapable = /[\x00-\x1f\ud800-\udfff\ufffe\uffff\u0300-\u0333\u033d-\u0346\u034a-\u034c\u0350-\u0352\u0357-\u0358\u035c-\u0362\u0374\u037e\u0387\u0591-\u05af\u05c4\u0610-\u0617\u0653-\u0654\u0657-\u065b\u065d-\u065e\u06df-\u06e2\u06eb-\u06ec\u0730\u0732-\u0733\u0735-\u0736\u073a\u073d\u073f-\u0741\u0743\u0745\u0747\u07eb-\u07f1\u0951\u0958-\u095f\u09dc-\u09dd\u09df\u0a33\u0a36\u0a59-\u0a5b\u0a5e\u0b5c-\u0b5d\u0e38-\u0e39\u0f43\u0f4d\u0f52\u0f57\u0f5c\u0f69\u0f72-\u0f76\u0f78\u0f80-\u0f83\u0f93\u0f9d\u0fa2\u0fa7\u0fac\u0fb9\u1939-\u193a\u1a17\u1b6b\u1cda-\u1cdb\u1dc0-\u1dcf\u1dfc\u1dfe\u1f71\u1f73\u1f75\u1f77\u1f79\u1f7b\u1f7d\u1fbb\u1fbe\u1fc9\u1fcb\u1fd3\u1fdb\u1fe3\u1feb\u1fee-\u1fef\u1ff9\u1ffb\u1ffd\u2000-\u2001\u20d0-\u20d1\u20d4-\u20d7\u20e7-\u20e9\u2126\u212a-\u212b\u2329-\u232a\u2adc\u302b-\u302c\uaab2-\uaab3\uf900-\ufa0d\ufa10\ufa12\ufa15-\ufa1e\ufa20\ufa22\ufa25-\ufa26\ufa2a-\ufa2d\ufa30-\ufa6d\ufa70-\ufad9\ufb1d\ufb1f\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40-\ufb41\ufb43-\ufb44\ufb46-\ufb4e\ufff0-\uffff]/g
, extraLookup;
View
@@ -111,8 +111,7 @@ module.exports = {
};
}
-/* jshint undef: false, newcap: false */
-/* eslint no-undef: 0, new-cap: 0 */
+/* eslint no-undef: "off", new-cap: "off" */
, createHtmlfile: function(iframeUrl, errorCallback) {
var axo = ['Active'].concat('Object').join('X');
var doc = new global[axo]('htmlfile');
View
@@ -34,9 +34,9 @@
"devDependencies": {
"browserify": "^6.1.0",
"envify": "~3.0.0",
+ "eslint": "^3.14.0",
"expect.js": "~0.3.1",
"gulp": "^3.8.8",
- "gulp-eslint": "~0.1.8",
"gulp-header": "^1.2.2",
"gulp-mocha": "~1.1.1",
"gulp-rename": "~1.2.0",
@@ -66,6 +66,6 @@
"test_local": "zuul --local 9090 -- tests/browser.js",
"zuul": "zuul -- tests/browser.js",
"gulp": "gulp",
- "lint": "gulp eslint"
+ "lint": "eslint .",
}
}
View
@@ -0,0 +1,5 @@
+{
+ "env": {
+ "mocha": true
+ }
+}
@@ -1,4 +1,5 @@
-/* global importScripts, postMessage, onmessage: true, SockJS */
+/* eslint-env worker */
+/* global SockJS */
'use strict';
importScripts('sockjs.js');
@@ -101,6 +101,7 @@ module.exports.echoUtfEncodingSimple = function echoUtfEncodingSimple(url, trans
it('echo utf encoding 0x00-0xFF', echoFactory(transport, [chars.join('')], url + '/echo'));
};
+// eslint-disable-next-line no-control-regex
var escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u2000-\u20ff\ufeff\ufff0-\uffff\x00-\x1f\ufffe\uffff\u0300-\u0333\u033d-\u0346\u034a-\u034c\u0350-\u0352\u0357-\u0358\u035c-\u0362\u0374\u037e\u0387\u0591-\u05af\u05c4\u0610-\u0617\u0653-\u0654\u0657-\u065b\u065d-\u065e\u06df-\u06e2\u06eb-\u06ec\u0730\u0732-\u0733\u0735-\u0736\u073a\u073d\u073f-\u0741\u0743\u0745\u0747\u07eb-\u07f1\u0951\u0958-\u095f\u09dc-\u09dd\u09df\u0a33\u0a36\u0a59-\u0a5b\u0a5e\u0b5c-\u0b5d\u0e38-\u0e39\u0f43\u0f4d\u0f52\u0f57\u0f5c\u0f69\u0f72-\u0f76\u0f78\u0f80-\u0f83\u0f93\u0f9d\u0fa2\u0fa7\u0fac\u0fb9\u1939-\u193a\u1a17\u1b6b\u1cda-\u1cdb\u1dc0-\u1dcf\u1dfc\u1dfe\u1f71\u1f73\u1f75\u1f77\u1f79\u1f7b\u1f7d\u1fbb\u1fbe\u1fc9\u1fcb\u1fd3\u1fdb\u1fe3\u1feb\u1fee-\u1fef\u1ff9\u1ffb\u1ffd\u2000-\u2001\u20d0-\u20d1\u20d4-\u20d7\u20e7-\u20e9\u2126\u212a-\u212b\u2329-\u232a\u2adc\u302b-\u302c\uaab2-\uaab3\uf900-\ufa0d\ufa10\ufa12\ufa15-\ufa1e\ufa20\ufa22\ufa25-\ufa26\ufa2a-\ufa2d\ufa30-\ufa6d\ufa70-\ufad9\ufb1d\ufb1f\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40-\ufb41\ufb43-\ufb44\ufb46-\ufb4e]/g;
module.exports.echoUtfEncoding = function echoUtfEncoding(url, transport) {
var chars = [], message = [];
View
@@ -1,4 +1,4 @@
-/* eslint quotes: 0, camelcase: 0 */
+/* eslint quotes: "off", camelcase: "off" */
'use strict';
var expect = require('expect.js')
View
@@ -1,5 +1,4 @@
-/* eslint new-cap: 0, no-new: 0 */
-/* jshint ignore: start */
+/* eslint new-cap: "off", no-new: "off" */
'use strict';
var expect = require('expect.js')
@@ -1,4 +1,4 @@
-/* eslint camelcase: 0 */
+/* eslint camelcase: "off" */
'use strict';
var expect = require('expect.js')
@@ -1,4 +1,4 @@
-/* eslint camelcase: 0 */
+/* eslint camelcase: "off" */
'use strict';
var sockjs = require('sockjs');
var debug = require('debug')('sockjs-client:test-server:app');
@@ -1,4 +1,4 @@
-/* eslint camelcase: 0 */
+/* eslint camelcase: "off", no-console: "off" */
'use strict';
var http = require('http');

0 comments on commit 7c78104

Please sign in to comment.