From b71c387d1324e48767cc3295a15a292cea7924ab Mon Sep 17 00:00:00 2001 From: Diato Date: Wed, 7 Feb 2018 12:21:08 -0800 Subject: [PATCH] Updated lint rules --- .eslintrc.js | 51 ++++++++++++++++--------- addon/services/theme-changer.js | 3 +- package-lock.json | 67 +++++++++++++++++++++++++++------ package.json | 2 +- 4 files changed, 93 insertions(+), 30 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 5536eae..dbc18ba 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,19 +1,16 @@ module.exports = { - globals: { - server: true, - waitForReduxStateChange: true, - waitForReduxStateToEqual: true, - dispatchReduxAction: true, - waitFor: true - }, root: true, + parser: "babel-eslint", parserOptions: { ecmaVersion: 2017, sourceType: 'module' }, + plugins: [ + 'ember' + ], extends: [ 'eslint:recommended', - 'plugin:ember-suave/recommended' + 'plugin:ember/recommended' ], env: { browser: true @@ -91,13 +88,33 @@ module.exports = { 'words': false, 'nonwords': false }], - 'spaced-comment': ['error', 'always'], + 'spaced-comment': ['error', 'always'] + }, + overrides: [ + // node files + { + files: [ + 'testem.js', + 'ember-cli-build.js', + 'config/**/*.js' + ], + parserOptions: { + sourceType: 'script', + ecmaVersion: 2015 + }, + env: { + browser: false, + node: true + } + }, - // SUAVE CUSTOM RULES - 'ember-suave/no-direct-property-access': 'error', - 'ember-suave/prefer-destructuring': 'error', - 'ember-suave/require-access-in-comments': 'error', - 'ember-suave/require-const-for-ember-properties': 'error', - 'ember-suave/no-const-outside-module-scope': 'off' - } -}; + // test files + { + files: ['tests/**/*.js'], + excludedFiles: ['tests/dummy/**/*.js'], + env: { + embertest: true + } + } + ] +}; \ No newline at end of file diff --git a/addon/services/theme-changer.js b/addon/services/theme-changer.js index 6bdd908..c88e03d 100644 --- a/addon/services/theme-changer.js +++ b/addon/services/theme-changer.js @@ -16,11 +16,12 @@ export default Service.extend(Evented, { defaultTheme: null, cookieName: 'ember-theme-changer__current-theme', eventName: 'ember-theme-changer__theme-changed', - themes: [], + themes: null, // @private init() { this._super(...arguments); + this.themes = []; const owner = getOwner(this); const ENV = owner.factoryFor('config:environment').class; diff --git a/package-lock.json b/package-lock.json index a1a7401..1810e4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4400,13 +4400,23 @@ } } }, - "eslint-plugin-ember-suave": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-ember-suave/-/eslint-plugin-ember-suave-1.0.0.tgz", - "integrity": "sha1-6n0jKhJlYtzYse46onAKw7Ym5RQ=", + "eslint-plugin-ember": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-ember/-/eslint-plugin-ember-5.0.3.tgz", + "integrity": "sha512-wPq2N96YQR2/Ob2LfuLQV8BEotHXxiFcuBiHikN8P+2VGzxBeuydafXy/pExuTsU2RHfPiSgyBHavKGy1DYdrQ==", "dev": true, "requires": { - "requireindex": "1.1.0" + "ember-rfc176-data": "0.2.7", + "require-folder-tree": "1.4.5", + "snake-case": "2.1.0" + }, + "dependencies": { + "ember-rfc176-data": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/ember-rfc176-data/-/ember-rfc176-data-0.2.7.tgz", + "integrity": "sha512-pJE2w+sI22UDsYmudI4nCp3WcImpUzXwe9qHfpOcEu3yM/HD1nGpDRt6kZD0KUnDmqkLeik/nYyzEwN/NU6xxA==", + "dev": true + } } }, "eslint-scope": { @@ -7558,6 +7568,12 @@ "signal-exit": "3.0.2" } }, + "lower-case": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", + "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=", + "dev": true + }, "lru-cache": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", @@ -7929,6 +7945,15 @@ "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", "dev": true }, + "no-case": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", + "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "dev": true, + "requires": { + "lower-case": "1.1.4" + } + }, "node-fetch": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", @@ -9055,6 +9080,23 @@ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, + "require-folder-tree": { + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/require-folder-tree/-/require-folder-tree-1.4.5.tgz", + "integrity": "sha1-3+VTy6uYzIjhxWo/LzWPBu+FvLA=", + "dev": true, + "requires": { + "lodash": "3.8.0" + }, + "dependencies": { + "lodash": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz", + "integrity": "sha1-N265i9zZOCqTZcM8TLglDeEyW5E=", + "dev": true + } + } + }, "require-uncached": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", @@ -9065,12 +9107,6 @@ "resolve-from": "1.0.1" } }, - "requireindex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.1.0.tgz", - "integrity": "sha1-5UBLgVV+91225JxacgBIk/4D4WI=", - "dev": true - }, "requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -9380,6 +9416,15 @@ } } }, + "snake-case": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz", + "integrity": "sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=", + "dev": true, + "requires": { + "no-case": "2.3.2" + } + }, "snapdragon": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz", diff --git a/package.json b/package.json index 168ed20..8bc24c2 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "ember-load-initializers": "^1.0.0", "ember-resolver": "^4.0.0", "ember-source": "~2.18.0", - "eslint-plugin-ember-suave": "^1.0.0", + "eslint-plugin-ember": "^5.0.3", "loader.js": "^4.2.3" }, "engines": {