Updated lint rules

.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
+      }
+    }
+  ]
+};

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;
 

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": {