Es fixes for lib (#16)

* Upgrade eslint and fix errors

* Fix eslint warnings

* package version upgrade

Author: leondmello

.eslintrc.js

@@ -1,15 +1,9 @@
 module.exports = {
-  globals: {
-    server: true,
-  },
   root: true,
   parserOptions: {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
-  plugins: [
-    'ember'
-  ],
   extends: [
     'eslint:recommended',
     'plugin:ember/recommended'
@@ -19,24 +13,7 @@ module.exports = {
   },
   rules: {
   },
-  overrides: [
-    // node files
-    {
-      files: [
-        'ember-cli-build.js',
-        'testem.js',
-        'blueprints/*/index.js',
-        'config/**/*.js',
-        'lib/*/index.js'
-      ],
-      parserOptions: {
-        sourceType: 'script',
-        ecmaVersion: 2015
-      },
-      env: {
-        browser: false,
-        node: true
-      }
-    }
-  ]
+  globals: {
+    module: true
+  }
 };

.jshintrc

@@ -1,4 +1,9 @@
-import Ember from 'ember';
+import Mixin from '@ember/object/mixin';
+import { computed } from '@ember/object';
+import EmberObject from '@ember/object';
+import { A } from '@ember/array';
+import { defineProperty } from '@ember/object';
+import { guidFor } from '@ember/object/internals';
 
 const resetRelations = function(record) {
   Object.keys(record.get('__recordsJustSaved')).forEach((relationName) => {
@@ -23,17 +28,17 @@ const defaultOptions = function(options) {
   }
 };
 
-export default Ember.Mixin.create({
-  hasDirtyAttributes: Ember.computed('currentState.isDirty', 'markedForDestruction', 'markedForDeletion', function() {
+export default Mixin.create({
+  hasDirtyAttributes: computed('currentState.isDirty', 'markedForDestruction', 'markedForDeletion', function() {
     let original = this._super(...arguments);
     return original || this.get('markedForDestruction') || this.get('markedForDeletion');
   }),
 
-  markedForDeletion: Ember.computed('_markedForDeletion', function() {
+  markedForDeletion: computed('_markedForDeletion', function() {
     return this.get('_markedForDeletion') || false;
   }),
 
-  markedForDestruction: Ember.computed('_markedForDestruction', function() {
+  markedForDestruction: computed('_markedForDestruction', function() {
     return this.get('_markedForDestruction') || false;
   }),
 
@@ -56,15 +61,15 @@ export default Ember.Mixin.create({
   markManyToManyDeletion(relation, model) {
     let deletedRelations = this.get('_manyToManyDeleted');
     if(!deletedRelations) {
-      this.set('_manyToManyDeleted', Ember.Object.create());
+      this.set('_manyToManyDeleted', EmberObject.create());
       deletedRelations = this.get('_manyToManyDeleted');
     }
 
     if(!deletedRelations.get(relation)) {
-      deletedRelations.set(relation, Ember.A());
-      Ember.defineProperty(
+      deletedRelations.set(relation, A());
+      defineProperty(
         this,
-        `manyToManyDeleted${relation}`, Ember.computed.readOnly(`_manyToManyDeleted.${relation}`)
+        `manyToManyDeleted${relation}`, computed.readOnly(`_manyToManyDeleted.${relation}`)
       );
     }
 
@@ -87,7 +92,7 @@ export default Ember.Mixin.create({
 
   tempId() {
     if (!this._tempId) {
-      this._tempId = Ember.guidFor(this);
+      this._tempId = guidFor(this);
     }
     return this._tempId;
   },

addon/mixins/model.js

@@ -1,4 +1,6 @@
-import Ember from 'ember';
+import Mixin from '@ember/object/mixin';
+import { copy } from '@ember/object/internals';
+import { merge } from '@ember/polyfills';
 
 // This is for reference in our post-save promise
 // We need to unload these records after save, otherwise
@@ -82,14 +84,14 @@ const jsonapiPayload = function(record, isManyToManyDelete) {
 };
 
 const payloadForInclude = function(payload) {
-  let payloadCopy = Ember.copy(payload, true);
+  let payloadCopy = copy(payload, true);
   delete(payloadCopy.method);
 
   return payloadCopy;
 };
 
 const payloadForRelationship = function(payload) {
-  let payloadCopy = Ember.copy(payload, true);
+  let payloadCopy = copy(payload, true);
   delete(payloadCopy.attributes);
   delete(payloadCopy.relationships);
 
@@ -173,7 +175,7 @@ const relationshipsDirective = function(value) {
       directive[value] = {};
     } else if(Array.isArray(value)) {
       value.forEach((key) => {
-        Ember.merge(directive, relationshipsDirective(key));
+        merge(directive, relationshipsDirective(key));
       });
     } else {
       Object.keys(value).forEach((key) => {
@@ -187,7 +189,7 @@ const relationshipsDirective = function(value) {
   return directive;
 };
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   serialize(snapshot/*, options */) {
     savedRecords = [];
 

addon/mixins/nested-relations.js

@@ -1,6 +1,6 @@
 {
   "name": "ember-data-jsonapi-extensions",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "The default blueprint for ember-cli addons.",
   "directories": {
     "doc": "doc",
@@ -19,33 +19,34 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.2",
-    "ember-ajax": "^2.0.1",
-    "ember-cli": "2.7.0",
-    "ember-cli-app-version": "^1.0.0",
+    "ember-ajax": "^3.0.1",
+    "ember-cli": "^2.7.0",
+    "ember-cli-app-version": "^2.0.0",
     "ember-cli-dependency-checker": "^1.2.0",
+    "ember-cli-eslint": "4.2.3",
     "ember-cli-htmlbars": "^1.0.3",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.4.0",
     "ember-cli-inject-live-reload": "^1.4.0",
-    "ember-cli-jshint": "^1.0.0",
-    "ember-cli-mirage": "0.2.1",
-    "ember-cli-page-object": "1.6.0",
-    "ember-cli-qunit": "^2.0.0",
+    "ember-cli-mirage": "^0.2.1",
+    "ember-cli-page-object": "^1.6.0",
+    "ember-cli-qunit": "^3.0.0",
     "ember-cli-release": "^0.2.9",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-test-loader": "^1.1.0",
+    "ember-cli-test-loader": "^2.0.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-export-application-global": "^1.0.5",
+    "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^0.5.1",
-    "ember-resolver": "^2.0.3",
+    "ember-resolver": "^5.0.0",
+    "eslint-plugin-ember": "^5.2.0",
     "loader.js": "^4.0.1"
   },
   "keywords": [
     "ember-addon"
   ],
   "dependencies": {
-    "ember-data": "^2.7.0",
-    "ember-cli-babel": "^5.1.6"
+    "ember-cli-babel": "^6.6.0",
+    "ember-data": "^2.7.0"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

package.json

@@ -0,0 +1,9 @@
+module.exports = {
+  env: {
+    embertest: true
+  },
+  globals: {
+    server: true,
+    QUnit: true
+  }
+};

tests/.eslintrc.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import Application from '@ember/application';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
@@ -7,7 +8,7 @@ let App;
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
-App = Ember.Application.extend({
+App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

tests/.jshintrc

@@ -1,5 +1,6 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
+import { filterBy } from '@ember/object/computed';
 
-export default Ember.Controller.extend({
-  tags: Ember.computed.filterBy('model.tags', 'markedForDeletion', false)
+export default Controller.extend({
+  tags: filterBy('model.tags', 'markedForDeletion', false)
 });

tests/dummy/app/app.js

@@ -1,9 +1,9 @@
-import Ember from 'ember';
 import PostFormMixin from 'dummy/mixins/post-form-route';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend(PostFormMixin, {
+export default Route.extend(PostFormMixin, {
   model(params) {
-    return this.store.findRecord('post', params.postId, {
+    return this.store.findRecord('post', params.post_id, {
       include: 'tags,author'
     });
   }