Migrate to new module imports (RFC 176)

addon/components/drag-sort-item.js

@@ -1,10 +1,10 @@
 // ----- Ember modules -----
-import Component from 'ember-component'
-import service from 'ember-service/inject'
-import {reads} from 'ember-computed'
-import on from 'ember-evented/on'
-import observer from 'ember-metal/observer'
-import {next} from 'ember-runloop'
+import Component from '@ember/component'
+import {inject as service} from '@ember/service'
+import {reads} from '@ember/object/computed'
+import {on} from '@ember/object/evented'
+import {observer} from '@ember/object'
+import {next} from '@ember/runloop'
 
 // ----- Ember addons -----
 import computed from 'ember-macro-helpers/computed'

addon/components/drag-sort-list.js

@@ -1,10 +1,9 @@
 // ----- Ember modules -----
-import Component from 'ember-component'
-import service from 'ember-service/inject'
-import {reads} from 'ember-computed'
-import get from 'ember-metal/get'
-import observer from 'ember-metal/observer'
-import {next} from 'ember-runloop'
+import Component from '@ember/component'
+import {inject as service} from '@ember/service'
+import {reads} from '@ember/object/computed'
+import {get, observer} from '@ember/object'
+import {next} from '@ember/runloop'
 
 // ----- Ember addons -----
 // import computed from 'ember-macro-helpers/computed'

addon/services/drag-sort.js

@@ -1,7 +1,7 @@
 // ----- Ember modules -----
-import Service from 'ember-service'
-import EventedMixin from 'ember-evented'
-import {next} from 'ember-runloop'
+import Service from '@ember/service'
+import EventedMixin from '@ember/object/evented'
+import {next} from '@ember/runloop'
 
 
 

addon/utils/trigger.js

@@ -1,6 +1,7 @@
-import run from 'ember-runloop'
+import {run} from '@ember/runloop'
+import {assert} from '@ember/debug'
+
 import $ from 'jquery'
-import {assert} from 'ember-metal/utils'
 import wait from 'ember-test-helpers/wait'
 
 

package.json

@@ -36,6 +36,7 @@
     "ember-awesome-macros": "^0.40.0",
     "ember-cli-babel": "^6.8.2",
     "ember-cli-htmlbars": "^2.0.1",
+    "ember-cli-shims": "^1.1.0",
     "ember-macro-helpers": "^0.17.0"
   },
   "devDependencies": {
@@ -55,7 +56,6 @@
     "ember-cli-node-modules-to-vendor": "^0.3.0",
     "ember-cli-page-object": "^1.12.0",
     "ember-cli-qunit": "^4.0.2",
-    "ember-cli-shims": "^1.1.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
     "ember-composable-helpers": "^2.0.3",

tests/dummy/app/components/nested-item.js

@@ -1,4 +1,4 @@
-import Component from 'ember-component'
+import Component from '@ember/component'
 import layout from '../templates/components/nested-item'
 
 

tests/dummy/app/controllers/index.js

@@ -1,5 +1,6 @@
-import Controller from 'ember-controller'
-import {A} from 'ember-array/utils'
+import Controller from '@ember/controller'
+import {A} from '@ember/array'
+
 import { task, timeout } from 'ember-concurrency'
 import RSVP from 'rsvp'
 import computed from 'ember-computed'

tests/helpers/module-for-acceptance.js

@@ -1,10 +1,8 @@
 import { module } from 'qunit'
-import Ember from 'ember'
+import { Promise } from 'rsvp'
 import startApp from '../helpers/start-app'
 import destroyApp from '../helpers/destroy-app'
 
-const { RSVP: { Promise } } = Ember
-
 export default function (name, options = {}) {
   module(name, {
     beforeEach () {

tests/integration/components/drag-sort-list-test.js

@@ -1,7 +1,7 @@
 import { moduleForComponent, test } from 'ember-qunit'
 import hbs from 'htmlbars-inline-precompile'
 import trigger from 'ember-drag-sort/utils/trigger'
-import {A} from 'ember-array/utils'
+import {A} from '@ember/array'
 import sinon from 'sinon'
 import { withChai } from 'ember-cli-chai/qunit'
 import wait from 'ember-test-helpers/wait'