From 5fd74ec0bb31abc082d42e7b9139b6f0ae4e8494 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Fri, 27 Jan 2017 14:21:57 +0100 Subject: [PATCH 1/2] Replace "ember-cli-jshint" with "ember-cli-eslint" --- .eslintrc.js | 13 +++++++++++ .jshintrc | 32 ------------------------- .jshintrc-tests | 6 ----- blueprints/.eslintrc.js | 5 ++++ blueprints/.jshintrc | 7 ------ package.json | 2 +- server/.eslintrc.js | 5 ++++ server/.jshintrc | 3 --- tests/.eslintrc.js | 5 ++++ tests/.jshintrc | 52 ----------------------------------------- 10 files changed, 29 insertions(+), 101 deletions(-) create mode 100644 .eslintrc.js delete mode 100644 .jshintrc delete mode 100644 .jshintrc-tests create mode 100644 blueprints/.eslintrc.js delete mode 100644 blueprints/.jshintrc create mode 100644 server/.eslintrc.js delete mode 100644 server/.jshintrc create mode 100644 tests/.eslintrc.js delete mode 100644 tests/.jshintrc diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 000000000..fbfc36405 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,13 @@ +module.exports = { + root: true, + parserOptions: { + ecmaVersion: 6, + sourceType: 'module' + }, + extends: 'eslint:recommended', + env: { + browser: true + }, + rules: { + } +}; diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index d421faa30..000000000 --- a/.jshintrc +++ /dev/null @@ -1,32 +0,0 @@ -{ - "predef": [ - "document", - "window", - "-Promise" - ], - "browser": true, - "boss": true, - "curly": true, - "debug": false, - "devel": true, - "eqeqeq": true, - "evil": true, - "forin": false, - "immed": false, - "laxbreak": false, - "newcap": true, - "noarg": true, - "noempty": false, - "nonew": false, - "nomen": false, - "onevar": false, - "plusplus": false, - "regexp": false, - "undef": true, - "sub": true, - "strict": false, - "white": false, - "eqnull": true, - "esversion": 6, - "unused": true -} diff --git a/.jshintrc-tests b/.jshintrc-tests deleted file mode 100644 index aacd299d2..000000000 --- a/.jshintrc-tests +++ /dev/null @@ -1,6 +0,0 @@ -{ - "esnext": true, - "boss": true, - "debug": true, - "expr": true -} diff --git a/blueprints/.eslintrc.js b/blueprints/.eslintrc.js new file mode 100644 index 000000000..1147d299f --- /dev/null +++ b/blueprints/.eslintrc.js @@ -0,0 +1,5 @@ +module.exports = { + env: { + node: true + } +}; diff --git a/blueprints/.jshintrc b/blueprints/.jshintrc deleted file mode 100644 index 345543677..000000000 --- a/blueprints/.jshintrc +++ /dev/null @@ -1,7 +0,0 @@ -{ - "predef": [ - "console" - ], - "strict": false, - "node": true -} diff --git a/package.json b/package.json index 3242c900c..35d8be66f 100644 --- a/package.json +++ b/package.json @@ -46,11 +46,11 @@ "ember-cli-chai": "^0.3.2", "ember-cli-content-security-policy": "~0.5.0", "ember-cli-dependency-checker": "^1.3.0", + "ember-cli-eslint": "^3.0.2", "ember-cli-fastboot": "1.0.0-beta.13", "ember-cli-htmlbars": "^1.1.1", "ember-cli-htmlbars-inline-precompile": "^0.3.3", "ember-cli-inject-live-reload": "^1.4.1", - "ember-cli-jshint": "^2.0.1", "ember-cli-mocha": "^0.13.1", "ember-cli-pretender": "~0.7.0", "ember-cli-release": "^0.2.9", diff --git a/server/.eslintrc.js b/server/.eslintrc.js new file mode 100644 index 000000000..1147d299f --- /dev/null +++ b/server/.eslintrc.js @@ -0,0 +1,5 @@ +module.exports = { + env: { + node: true + } +}; diff --git a/server/.jshintrc b/server/.jshintrc deleted file mode 100644 index c1f2978bc..000000000 --- a/server/.jshintrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "node": true -} diff --git a/tests/.eslintrc.js b/tests/.eslintrc.js new file mode 100644 index 000000000..fbf255520 --- /dev/null +++ b/tests/.eslintrc.js @@ -0,0 +1,5 @@ +module.exports = { + env: { + embertest: true + } +}; diff --git a/tests/.jshintrc b/tests/.jshintrc deleted file mode 100644 index d2bd11343..000000000 --- a/tests/.jshintrc +++ /dev/null @@ -1,52 +0,0 @@ -{ - "predef": [ - "document", - "window", - "location", - "setTimeout", - "$", - "-Promise", - "define", - "console", - "visit", - "exists", - "fillIn", - "click", - "keyEvent", - "triggerEvent", - "find", - "findWithAssert", - "wait", - "DS", - "andThen", - "currentURL", - "currentPath", - "currentRouteName" - ], - "node": false, - "browser": false, - "boss": true, - "curly": true, - "debug": false, - "devel": false, - "eqeqeq": true, - "evil": true, - "forin": false, - "immed": false, - "laxbreak": false, - "newcap": true, - "noarg": true, - "noempty": false, - "nonew": false, - "nomen": false, - "onevar": false, - "plusplus": false, - "regexp": false, - "undef": true, - "sub": true, - "strict": false, - "white": false, - "eqnull": true, - "esversion": 6, - "unused": true -} From a53a7397293d7d745065cc55c712c11f9e4d586e Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Fri, 27 Jan 2017 14:23:56 +0100 Subject: [PATCH 2/2] Fix ESLint issues --- addon/internal-session.js | 4 ++-- addon/session-stores/cookie.js | 2 +- config/ember-try.js | 2 +- config/environment.js | 2 +- tests/dummy/config/environment.js | 4 ++-- tests/unit/session-stores/shared/cookie-store-behavior.js | 6 +----- 6 files changed, 8 insertions(+), 12 deletions(-) diff --git a/addon/internal-session.js b/addon/internal-session.js index 58bb3353e..dd7290396 100644 --- a/addon/internal-session.js +++ b/addon/internal-session.js @@ -68,7 +68,7 @@ export default ObjectProxy.extend(Evented, { return this._callStoreAsync('restore').then((restoredContent) => { let { authenticator: authenticatorFactory } = restoredContent.authenticated || {}; - if (!!authenticatorFactory) { + if (authenticatorFactory) { delete restoredContent.authenticated.authenticator; const authenticator = this._lookupAuthenticator(authenticatorFactory); return authenticator.restore(restoredContent.authenticated).then((content) => { @@ -187,7 +187,7 @@ export default ObjectProxy.extend(Evented, { if (!this._busy) { this._busy = true; let { authenticator: authenticatorFactory } = (content.authenticated || {}); - if (!!authenticatorFactory) { + if (authenticatorFactory) { delete content.authenticated.authenticator; const authenticator = this._lookupAuthenticator(authenticatorFactory); authenticator.restore(content.authenticated).then((authenticatedContent) => { diff --git a/addon/session-stores/cookie.js b/addon/session-stores/cookie.js index 7de45fae3..6d30470f1 100644 --- a/addon/session-stores/cookie.js +++ b/addon/session-stores/cookie.js @@ -211,7 +211,7 @@ export default BaseStore.extend({ _calculateExpirationTime() { let cachedExpirationTime = this._read(`${this.get('cookieName')}-expiration_time`); - cachedExpirationTime = !!cachedExpirationTime ? new Date().getTime() + cachedExpirationTime * 1000 : null; + cachedExpirationTime = cachedExpirationTime ? new Date().getTime() + cachedExpirationTime * 1000 : null; return this.get('cookieExpirationTime') ? new Date().getTime() + this.get('cookieExpirationTime') * 1000 : cachedExpirationTime; }, diff --git a/config/ember-try.js b/config/ember-try.js index 1d8d6c281..82327d8dd 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -1,4 +1,4 @@ -/*jshint node:true*/ +/* eslint-env node */ module.exports = { scenarios: [ { diff --git a/config/environment.js b/config/environment.js index 28a787b62..012a412f6 100644 --- a/config/environment.js +++ b/config/environment.js @@ -1,4 +1,4 @@ -/*jshint node:true*/ +/* eslint-env node */ 'use strict'; module.exports = function(/* environment, appConfig */) { diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index 909adbbb8..3800b9095 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -1,4 +1,4 @@ -/* jshint node: true */ +/* eslint-env node */ module.exports = function(environment) { var ENV = { @@ -66,7 +66,7 @@ module.exports = function(environment) { } if (environment === 'production') { - + // put production settings here } return ENV; diff --git a/tests/unit/session-stores/shared/cookie-store-behavior.js b/tests/unit/session-stores/shared/cookie-store-behavior.js index 27258c7af..3a7ce0831 100644 --- a/tests/unit/session-stores/shared/cookie-store-behavior.js +++ b/tests/unit/session-stores/shared/cookie-store-behavior.js @@ -14,7 +14,6 @@ export default function(options) { let sync; let cookieService; let spyRewriteCookieMethod; - let unspyRewriteCookieMethod; beforeEach(() => { createStore = options.createStore; @@ -25,7 +24,6 @@ export default function(options) { sinon.spy(cookieService, 'write'); store = createStore(cookieService); spyRewriteCookieMethod = options.spyRewriteCookieMethod; - unspyRewriteCookieMethod = options.unspyRewriteCookieMethod; }); afterEach(() => { @@ -77,10 +75,8 @@ export default function(options) { }); it('sends a warning when `cookieExpirationTime` is less than 90 seconds', (done) => { - let store; - run(() => { - store = createStore(cookieService, { + createStore(cookieService, { cookieName: 'session-cookie-domain', cookieDomain: 'example.com', cookieExpirationTime: 60