wip

.eslintrc.js

@@ -21,7 +21,7 @@ module.exports = {
     browser: true,
   },
   rules: {
-    'ember/use-ember-data-rfc-395-imports': 'off',
+    // 'ember/use-ember-data-rfc-395-imports': 'off',
   },
   overrides: [
     // node files

addon/active-model-adapter.ts

@@ -6,6 +6,7 @@ import AdapterError, {
 import { pluralize } from 'ember-inflector';
 import { AnyObject } from 'active-model-adapter';
 import { decamelize, underscore } from '@ember/string';
+// eslint-disable-next-line ember/use-ember-data-rfc-395-imports
 import ModelRegistry from 'ember-data/types/registries/model';
 
 interface ActiveModelPayload {

addon/active-model-serializer.ts

@@ -2,12 +2,15 @@ import RESTSerializer from '@ember-data/serializer/rest';
 import { normalizeModelName } from '@ember-data/store';
 import type Store from '@ember-data/store';
 import Model from '@ember-data/model';
-import DS from 'ember-data';
 import { singularize, pluralize } from 'ember-inflector';
 import { classify, decamelize, camelize, underscore } from '@ember/string';
 import { inject as service } from '@ember/service';
 import { isNone } from '@ember/utils';
 import { AnyObject } from 'active-model-adapter';
+
+// eslint-disable-next-line ember/use-ember-data-rfc-395-imports
+import DS from 'ember-data';
+// eslint-disable-next-line ember/use-ember-data-rfc-395-imports
 import type ModelRegistry from 'ember-data/types/registries/model';
 
 type ModelKeys<K> = Exclude<keyof K, keyof DS.Model>;

tests/dummy/app/routes/application.ts

@@ -1,5 +1,6 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+// eslint-disable-next-line ember/use-ember-data-rfc-395-imports
 import DS from 'ember-data';
 import type Car from 'dummy/models/car';
 import type Store from '@ember-data/store';

tests/unit/adapters/active-model-adapter-errors-test.ts

@@ -9,7 +9,7 @@ import Model, { attr } from '@ember-data/model';
 import ActiveModelAdapter, {
   ActiveModelSerializer,
 } from 'active-model-adapter';
-import { AdapterError } from 'ember-data/adapters/errors';
+import AdapterError from '@ember-data/adapter/error';
 
 class Book extends Model {
   @attr('string')

tests/unit/serializers/active-model-serializer-test.ts

@@ -5,12 +5,15 @@ import ActiveModelAdapter, {
   ActiveModelSerializer,
 } from 'active-model-adapter';
 import { TestContext } from 'ember-test-helpers';
+// eslint-disable-next-line ember/use-ember-data-rfc-395-imports
 import DS from 'ember-data';
 import Pretender from 'pretender';
-import Store from 'ember-data/store';
+import type Store from '@ember-data/store';
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 import { resolve } from 'rsvp';
+// eslint-disable-next-line ember/use-ember-data-rfc-395-imports
 import type ModelRegistry from 'ember-data/types/registries/model';
+import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
 
 class ApplicationAdapter extends ActiveModelAdapter {}
 
@@ -1056,15 +1059,15 @@ module('Unit | Serializer | active model serializer', function (hooks) {
   });
 
   test('when using the DS.EmbeddedRecordsMixin, does not erase attributes for polymorphic embedded models', async function (this: Context, assert) {
+    class MediocreVillianSerializer extends ActiveModelSerializer.extend(EmbeddedRecordsMixin) {
+      attrs = {
+        evilMinions: { serialize: false, deserialize: 'records' },
+      };
+    }
+
     const MediocreVillain = this.store.modelFor('mediocre-villain');
-    this.owner.register(
-      'serializer:mediocre-villain',
-      ActiveModelSerializer.extend(DS.EmbeddedRecordsMixin, {
-        attrs: {
-          evilMinions: { serialize: false, deserialize: 'records' },
-        },
-      })
-    );
+
+    this.owner.register('serializer:mediocre-villain', MediocreVillianSerializer);
 
     const payload = {
       mediocre_villain: {