Change ember-data import to @ember-data

funkensturm · Sep 4, 2022 · 136a99e · 136a99e
1 parent 1c49ddc
commit 136a99e
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 40 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -26,7 +26,7 @@ module.exports = {
     'ember/no-mixins': 'off',
     'ember/no-new-mixins': 'off',
     'ember/no-string-prototype-extensions': 'off',
-    'ember/use-ember-data-rfc-395-imports': 'off',
+    // 'ember/use-ember-data-rfc-395-imports': 'off',
   },
   overrides: [
     // node files

diff --git a/addon/adapters/base.js b/addon/adapters/base.js
@@ -3,14 +3,12 @@ import RSVP from 'rsvp';
 import { run } from '@ember/runloop';
 import { isEmpty, typeOf } from '@ember/utils';
 import { computed, get } from '@ember/object';
-import DS from 'ember-data';
+import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import ImportExportMixin from '../mixins/adapters/import-export';
 import { _buildKey } from '../helpers/storage';
 
 const getKeys = Object.keys || keys;
 
-const { JSONAPIAdapter } = DS;
-
 // Ember data ships with ember-inflector
 import { singularize, pluralize } from 'ember-inflector';
 

diff --git a/addon/initializers/local-storage-adapter.js b/addon/initializers/local-storage-adapter.js
@@ -1,12 +1,12 @@
-import DS from 'ember-data';
+import Store from '@ember-data/store';
 import {
   importData,
   exportData,
 } from 'ember-local-storage/helpers/import-export';
 
 export function initialize() {
-  if (!DS.Store.prototype._emberLocalStoragePatched) {
-    DS.Store.reopen({
+  if (!Store.prototype._emberLocalStoragePatched) {
+    Store.reopen({
       _emberLocalStoragePatched: true,
       importData: function (json, options) {
         return importData(this, json, options);

diff --git a/addon/serializers/serializer.js b/addon/serializers/serializer.js
@@ -1,7 +1,9 @@
-import DS from 'ember-data';
-
-const { JSONAPISerializer } = DS;
+import JSONAPISerializer from '@ember-data/serializer/json-api';
+import DS from 'ember-data'; // eslint-disable-line ember/use-ember-data-rfc-395-imports
 
+// Should be removed
+// https://github.com/emberjs/data/pull/5317
+// https://github.com/emberjs/data/pull/5324
 const emberDataVersionOlderThan3Point1 = DS.VERSION.match(/^[0-2]\.|^3\.0/);
 
 export default JSONAPISerializer.extend({

diff --git a/tests/dummy/app/models/blog/post.js b/tests/dummy/app/models/blog/post.js
@@ -1,6 +1,4 @@
-import DS from 'ember-data';
-
-const { Model, attr, belongsTo, hasMany } = DS;
+import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 
 export default Model.extend({
   name: attr('string'),

diff --git a/tests/dummy/app/models/book-publication.js b/tests/dummy/app/models/book-publication.js
@@ -1,6 +1,4 @@
-import DS from 'ember-data';
-
-const { Model, attr, hasMany } = DS;
+import Model, { attr, hasMany } from '@ember-data/model';
 
 export default Model.extend({
   name: attr('string'),

diff --git a/tests/dummy/app/models/comment.js b/tests/dummy/app/models/comment.js
@@ -1,6 +1,4 @@
-import DS from 'ember-data';
-
-const { Model, attr, belongsTo } = DS;
+import Model, { attr, belongsTo } from '@ember-data/model';
 
 export default Model.extend({
   name: attr('string'),

diff --git a/tests/dummy/app/models/pet.js b/tests/dummy/app/models/pet.js
@@ -1,6 +1,4 @@
-import DS from 'ember-data';
-
-const { Model, attr, hasMany } = DS;
+import Model, { attr, hasMany } from '@ember-data/model';
 
 export default Model.extend({
   name: attr('string'),

diff --git a/tests/dummy/app/models/post.js b/tests/dummy/app/models/post.js
@@ -1,6 +1,4 @@
-import DS from 'ember-data';
-
-const { Model, attr, belongsTo, hasMany } = DS;
+import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 
 export default Model.extend({
   name: attr('string'),

diff --git a/tests/dummy/app/models/project.js b/tests/dummy/app/models/project.js
@@ -1,6 +1,4 @@
-import DS from 'ember-data';
-
-const { Model, attr, hasMany } = DS;
+import Model, { attr, hasMany } from '@ember-data/model';
 
 export default Model.extend({
   name: attr('string'),

diff --git a/tests/dummy/app/models/task.js b/tests/dummy/app/models/task.js
@@ -1,6 +1,4 @@
-import DS from 'ember-data';
-
-const { Model, attr, belongsTo, hasMany } = DS;
+import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 
 export default Model.extend({
   name: attr('string'),

diff --git a/tests/dummy/app/models/user.js b/tests/dummy/app/models/user.js
@@ -1,6 +1,4 @@
-import DS from 'ember-data';
-
-const { Model, attr, hasMany } = DS;
+import Model, { attr, hasMany } from '@ember-data/model';
 
 export default Model.extend({
   name: attr('string'),

diff --git a/tests/unit/adapters/application-test.js b/tests/unit/adapters/application-test.js
@@ -1,9 +1,9 @@
-import { run } from '@ember/runloop';
-import DS from 'ember-data';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-const { AdapterError, Model, attr } = DS;
+import { run } from '@ember/runloop';
+import Model, { attr } from '@ember-data/model';
+import AdapterError from '@ember-data/adapter/error';
 
 let SimpleModel = Model.extend({
   prop: attr('string'),

diff --git a/tests/unit/models/post-test.js b/tests/unit/models/post-test.js
@@ -1,8 +1,10 @@
-import { get } from '@ember/object';
-import { run } from '@ember/runloop';
-import DS from 'ember-data';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
+
+import { get } from '@ember/object';
+import { run } from '@ember/runloop';
+import DS from 'ember-data'; // eslint-disable-line ember/use-ember-data-rfc-395-imports
+
 import {
   registerConfigEnvironment,
   setConfigEnvironment,