Upgrade ember-data import syntax & fix lint errors

Author: patocallaghan

addon/array/fragment.js

@@ -87,7 +87,7 @@ const FragmentArray = StatefulArray.extend({
     @param {Object} data
   */
   _normalizeData(data) {
-    let content = get(this, 'content');
+    let content = this.content;
 
     return normalizeFragmentArray(this, content, data, true);
   },
@@ -200,7 +200,7 @@ const FragmentArray = StatefulArray.extend({
     @private
   */
   replaceContent(index, amount, objs) {
-    let content = get(this, 'content');
+    let content = this.content;
     let replacedContent = content.slice(index, index + amount);
     let fragments = normalizeFragmentArray(this, replacedContent, objs);
 
@@ -239,9 +239,9 @@ const FragmentArray = StatefulArray.extend({
     @return {MF.Fragment} the newly added fragment
     */
   createFragment(props) {
-    let record = get(this, 'owner');
+    let record = this.owner;
     let store = get(record, 'store');
-    let type = get(this, 'type');
+    let type = this.type;
     let fragment = store.createFragment(type, props);
 
     return this.pushObject(fragment);

addon/ext.js

@@ -1,8 +1,9 @@
 import { assert } from '@ember/debug';
-import Store from 'ember-data/store';
-import Model from 'ember-data/model';
+import Store from '@ember-data/store';
+import Model from '@ember-data/model';
+// eslint-disable-next-line ember/use-ember-data-rfc-395-imports
 import { coerceId, RecordData, InternalModel, normalizeModelName } from 'ember-data/-private';
-import JSONSerializer from 'ember-data/serializers/json';
+import JSONSerializer from '@ember-data/serializer/json';
 import FragmentRootState from './states';
 import FragmentRecordData from './record-data';
 import {

addon/record-data.js

@@ -1,7 +1,8 @@
+// eslint-disable-next-line ember/use-ember-data-rfc-395-imports
 import { RecordData } from 'ember-data/-private';
 import { assert } from '@ember/debug';
 import { typeOf } from '@ember/utils';
-import { setProperties } from '@ember/object';
+import { setProperties, get } from '@ember/object';
 import { copy } from 'ember-copy';
 import isInstanceOfType from './util/instance-of-type';
 import { isArray } from '@ember/array';
@@ -14,7 +15,6 @@ import {
   isFragment
 } from './fragment';
 import { assign } from '@ember/polyfills';
-import { get } from '@ember/object';
 import { gte } from 'ember-compatibility-helpers';
 
 let fragmentRecordDatas = new WeakMap();

addon/states.js

@@ -1,4 +1,5 @@
 import { get } from '@ember/object';
+// eslint-disable-next-line ember/use-ember-data-rfc-395-imports
 import { RootState } from 'ember-data/-private';
 
 /**
@@ -152,6 +153,7 @@ function wireState(object, parent, name) {
   object.stateName = name;
 
   for (let prop in object) {
+    // eslint-disable-next-line no-prototype-builtins
     if (!object.hasOwnProperty(prop) || prop === 'parentState' || prop === 'stateName') {
       continue;
     }

addon/transforms/array.js

@@ -1,8 +1,8 @@
 import { assert } from '@ember/debug';
 import { getOwner } from '@ember/application';
 import { makeArray } from '@ember/array';
-import { get, computed } from '@ember/object';
-import Transform from 'ember-data/transform';
+import { computed } from '@ember/object';
+import Transform from '@ember-data/serializer/transform';
 import { inject as service } from '@ember/service';
 
 /**
@@ -26,7 +26,7 @@ const ArrayTransform = Transform.extend({
       return null;
     }
 
-    let transform = get(this, 'transform');
+    let transform = this.transform;
 
     data = makeArray(data);
 
@@ -42,7 +42,7 @@ const ArrayTransform = Transform.extend({
       return null;
     }
 
-    let transform = get(this, 'transform');
+    let transform = this.transform;
 
     array = array.toArray ? array.toArray() : array;
 
@@ -54,7 +54,7 @@ const ArrayTransform = Transform.extend({
   },
 
   transform: computed('type', function() {
-    let attributeType = this.get('type');
+    let attributeType = this.type;
 
     if (!attributeType) {
       return null;

addon/transforms/fragment.js

@@ -1,7 +1,7 @@
 import { assert } from '@ember/debug';
 import { get } from '@ember/object';
-import Transform from 'ember-data/transform';
-import JSONAPISerializer from 'ember-data/serializers/json-api';
+import Transform from '@ember-data/serializer/transform';
+import JSONAPISerializer from '@ember-data/serializer/json-api';
 import { inject as service } from '@ember/service';
 
 /**
@@ -41,8 +41,8 @@ const FragmentTransform = Transform.extend({
   },
 
   modelNameFor(data) {
-    let modelName = get(this, 'type');
-    let polymorphicTypeProp = get(this, 'polymorphicTypeProp');
+    let modelName = this.type;
+    let polymorphicTypeProp = this.polymorphicTypeProp;
 
     if (data && polymorphicTypeProp && data[polymorphicTypeProp]) {
       modelName = data[polymorphicTypeProp];

package.json

@@ -51,7 +51,7 @@
     "ember-cli-htmlbars": "^5.2.0",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-uglify": "^3.0.0",
-    "ember-data": "3.16",
+    "ember-data": "~3.20",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",

testem.js

@@ -1,5 +1,6 @@
 'use strict';
 
+/* eslint-disable camelcase */
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,

tests/dummy/app/adapters/application.js

@@ -1,6 +1,6 @@
-import DS from 'ember-data';
+import RESTAdapter from '@ember-data/adapter/rest';
 
-export default DS.RESTAdapter.extend({
+export default RESTAdapter.extend({
   shouldBackgroundReloadRecord() {
     return false;
   }

tests/dummy/app/models/address.js

@@ -1,9 +1,9 @@
+import { attr } from '@ember-data/model';
 import MF from 'ember-data-model-fragments';
-import DS from 'ember-data';
 
 export default MF.Fragment.extend({
-  street: DS.attr('string'),
-  city: DS.attr('string'),
-  region: DS.attr('string'),
-  country: DS.attr('string')
+  street: attr('string'),
+  city: attr('string'),
+  region: attr('string'),
+  country: attr('string')
 });