Fix use-ember-data-rfc-395-imports

emberjs/rfcs#395

Author: fabmiz

app/adapters/collected-metadatum.ts

@@ -1,5 +1,5 @@
+import Store from '@ember-data/store';
 import { assert } from '@ember/debug';
-import DS from 'ember-data';
 import RSVP from 'rsvp';
 
 import OsfAdapter from 'ember-osf-web/adapters/osf-adapter';
@@ -32,7 +32,7 @@ export default class CollectedMetadatumAdapter extends OsfAdapter {
         return `${this.urlPrefix()}/search/collections/`;
     }
 
-    query(_: DS.Store, type: any, query: Record<string, string>): RSVP.Promise<any> {
+    query(_: Store, type: any, query: Record<string, string>): RSVP.Promise<any> {
         const url = this.buildURL(type.modelName, null, null, 'query', query);
         const { page, sort, ...restQuery } = query;
 

app/adapters/collection.ts

@@ -1,5 +1,3 @@
-import DS from 'ember-data';
-
 import OsfAdapter from './osf-adapter';
 
 const requestTypes = ['createRecord', 'updateRecord', 'deleteRecord'];

app/adapters/contributor.ts

@@ -1,12 +1,12 @@
+import Store from '@ember-data/store';
 import { assert } from '@ember/debug';
 import { inject as service } from '@ember/service';
-import DS from 'ember-data';
 
 import pathJoin from 'ember-osf-web/utils/path-join';
 import OsfAdapter from './osf-adapter';
 
 export default class ContributorAdapter extends OsfAdapter {
-    @service store!: DS.Store;
+    @service store!: Store;
 
     buildURL(
         modelName?: string | number,

app/adapters/file.ts

@@ -1,9 +1,11 @@
-import DS from 'ember-data';
-
 import OsfAdapter from './osf-adapter';
 
 export default class FileAdapter extends OsfAdapter {
-    buildURL(modelName?: string | number, id?: string | null, snapshot?: DS.Snapshot | null, requestType?: string): string {
+    buildURL(
+        modelName?: string | number,
+        id?: string | null,
+        snapshot?: DS.Snapshot | null,
+        requestType?: string): string {
         const url = super.buildURL(modelName, id, snapshot, requestType);
 
         // Water Bulter API does not like trailing slashes.

app/adapters/guid.ts

@@ -1,5 +1,3 @@
-import DS from 'ember-data';
-
 import OsfAdapter from './osf-adapter';
 
 export default class GuidAdapter extends OsfAdapter {

app/adapters/meeting-submission.ts

@@ -1,4 +1,3 @@
-// import DS from 'ember-data';
 import OsfAdapter from './osf-adapter';
 
 export default class MeetingSubmissionAdapter extends OsfAdapter {

app/adapters/moderator.ts

@@ -1,4 +1,3 @@
-import DS from 'ember-data';
 import OsfAdapter from './osf-adapter';
 
 interface ModeratorAdapterOptions {

app/adapters/node.ts

@@ -1,5 +1,3 @@
-import DS from 'ember-data';
-
 import OsfAdapter from './osf-adapter';
 
 export default class NodeAdapter extends OsfAdapter {

app/adapters/osf-adapter.ts

@@ -1,15 +1,14 @@
+import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import { assert } from '@ember/debug';
 import { inject as service } from '@ember/service';
 import { underscore } from '@ember/string';
-import DS from 'ember-data';
 import ModelRegistry from 'ember-data/types/registries/model';
 import config from 'ember-get-config';
 import { pluralize } from 'ember-inflector';
 import Session from 'ember-simple-auth/services/session';
 
 import CurrentUser from 'ember-osf-web/services/current-user';
 
-const { JSONAPIAdapter } = DS;
 const {
     OSF: {
         apiUrl: host,

app/adapters/preprint.ts

@@ -1,4 +1,4 @@
-import DS from 'ember-data';
+import Store from '@ember-data/store';
 import RSVP from 'rsvp';
 
 import PreprintModel from 'ember-osf-web/models/preprint';
@@ -7,7 +7,7 @@ import OsfAdapter from './osf-adapter';
 
 export default class PreprintAdapter extends OsfAdapter {
     updateRecord(
-        store: DS.Store,
+        store: Store,
         type: PreprintModel,
         snapshot: DS.Snapshot,
     ): RSVP.Promise<any> {