Import framework code using module syntax

See emberjs/rfcs#176.

.eslintrc.js

@@ -15,7 +15,8 @@ module.exports = {
     browser: true
   },
   rules: {
-    //'ember/new-module-imports': 'off'
+    //'ember/new-module-imports': 'off',
+    'no-console': 1
   },
   overrides: [
     // node files

app/app.js

@@ -5,24 +5,23 @@
  * @category docs
  */
 
-import Ember from 'ember';
+import LinkComponent from '@ember/routing/link-component';
+
+import Route from '@ember/routing/route';
+import Component from '@ember/component';
+import Application from '@ember/application';
+import {
+  computed,
+  defineProperty,
+  getWithDefault,
+  get
+} from '@ember/object';
+import { isNone } from '@ember/utils';
+import { assert } from '@ember/debug';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-const {
-  LinkComponent,
-  Route,
-  Component,
-  Application,
-  get,
-  getWithDefault,
-  defineProperty,
-  computed,
-  isNone,
-  assert
-} = Ember;
-
 let App;
 
 //Ember.MODEL_FACTORY_INJECTIONS = true;

app/helpers/add-em.js

@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import { helper as buildHelper } from '@ember/component/helper';
 
 export function addEm(params) {
   return params.reduce((a, b) => Number(a) + Number(b));
 }
 
-export default Ember.Helper.helper(addEm);
+export default buildHelper(addEm);

app/helpers/bbox-to-poly.js

@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import { helper as buildHelper } from '@ember/component/helper';
 
 export function bboxToPoly(params/*, hash*/) {
   let bbox  = params[0];
@@ -16,4 +16,4 @@ export function bboxToPoly(params/*, hash*/) {
   ];  
 }
 
-export default Ember.Helper.helper(bboxToPoly);
+export default buildHelper(bboxToPoly);

app/helpers/get-dash.js

@@ -1,9 +1,5 @@
-import Ember from 'ember';
-
-const {
-  Helper,
-  get
-} = Ember;
+import Helper from '@ember/component/helper';
+import { get } from '@ember/object';
 
 export function getDash(params /*, hash*/ ) {
   let obj = params[0];

app/helpers/md-markdown.js

@@ -1,9 +1,6 @@
-import Ember from 'ember';
+import { helper as buildHelper } from '@ember/component/helper';
 import marked from 'npm:marked';
-
-const {
-  String: EmString
-} = Ember;
+import { htmlSafe } from '@ember/string';
 
 export function mdMarkdown(params /*, hash*/ ) {
   marked.setOptions({
@@ -18,10 +15,10 @@ export function mdMarkdown(params /*, hash*/ ) {
   });
 
   if(params[0]) {
-    return EmString.htmlSafe(marked(params[0]));
+    return htmlSafe(marked(params[0]));
   }
 
   return params[1] || 'No text supplied.';
 }
 
-export default Ember.Helper.helper(mdMarkdown);
+export default buildHelper(mdMarkdown);

app/helpers/mod.js

@@ -1,7 +1,4 @@
-import Ember from 'ember';
-const {
-  Helper
-} = Ember;
+import Helper from '@ember/component/helper';
 
 export function mod(params) {
   return params.reduce((a, b) => Number(a) % Number(b));

app/helpers/uc-words.js

@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import { helper as buildHelper } from '@ember/component/helper';
 
 export function ucWords(params, hash) {
   var string = String(params[0]),
@@ -11,4 +11,4 @@ export function ucWords(params, hash) {
   });
 }
 
-export default Ember.Helper.helper(ucWords);
+export default buildHelper(ucWords);

app/initializers/local-storage-export.js

@@ -1,11 +1,9 @@
-import Ember from 'ember';
+import { Promise } from 'rsvp';
+import { assign } from '@ember/polyfills';
+import { run } from '@ember/runloop';
 import DS from 'ember-data';
 import { singularize } from 'ember-inflector';
 
-const {
-  run
-} = Ember;
-const assign = Ember.assign || Ember.merge;
 const exportSelected = function(store, types, options) {
   // merge defaults
   options = assign({
@@ -49,7 +47,7 @@ const exportSelected = function(store, types, options) {
     );
   }
 
-  return new Ember.RSVP.Promise((resolve) => {
+  return new Promise((resolve) => {
     run(null, resolve, data);
   }, 'DS: LocalStorageAdapter#exportData');
 };

app/mixins/hash-poll.js

@@ -3,19 +3,16 @@
  * @submodule mixins
  */
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
 
-export const pollInterval = 750; // time in milliseconds
+import { Promise } from 'rsvp';
+import Mixin from '@ember/object/mixin';
+import { on } from '@ember/object/evented';
 
-const {
-  Mixin,
-  //computed,
-  inject,
-  on
-} = Ember;
+export const pollInterval = 750; // time in milliseconds
 
 export default Mixin.create({
-  settings: inject.service(),
+  settings: service(),
 
   // autoSave: computed('settings.data.autoSave', function () {
   //   return this.get('settings')
@@ -56,7 +53,7 @@ export default Mixin.create({
   onPoll() {
     const model = this.currentRouteModel();
 
-    return new Ember.RSVP.Promise(function(resolve) {
+    return new Promise(function(resolve) {
       if (model) {
         model.notifyPropertyChange('currentHash');
       }

app/mixins/object-template.js

@@ -3,16 +3,12 @@
  * @submodule mixins
  */
 
-import Ember from 'ember';
+import Mixin from '@ember/object/mixin';
 
-const {
-  Mixin,
-  isArray,
-  getOwner,
-  A,
-  merge,
-  run
-} = Ember;
+import { getOwner } from '@ember/application';
+import { A, isArray } from '@ember/array';
+import { merge } from '@ember/polyfills';
+import { run } from '@ember/runloop';
 
 export default Mixin.create({
   /**

app/mixins/scroll-to.js

@@ -3,9 +3,9 @@
  * @submodule mixins
  */
 
-import Ember from 'ember';
+import Mixin from '@ember/object/mixin';
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   queryParams: {
     scrollTo: true
   },

app/models/contact.js

@@ -1,4 +1,17 @@
-import Ember from 'ember';
+import {
+  alias,
+  notEmpty
+} from '@ember/object/computed';
+import {
+  isEmpty
+} from '@ember/utils';
+import EmberObject, {
+  get,
+  computed
+} from '@ember/object';
+import {
+  Copyable
+} from 'ember-copy'
 import DS from 'ember-data';
 import uuidV4 from 'npm:uuid/v4';
 import Validator from 'npm:validator';
@@ -10,12 +23,6 @@ import {
 import {
   inject as service
 } from '@ember/service';
-const {
-  Copyable,
-  computed,
-  isEmpty,
-  get
-} = Ember;
 
 const Validations = buildValidations({
   'json.contactId': validator('presence', {
@@ -30,7 +37,7 @@ const Validations = buildValidations({
       message: "Name should not be only white-space."
     }),
     validator('presence', {
-      disabled: computed.notEmpty('model.json.positionName'),
+      disabled: notEmpty('model.json.positionName'),
       presence: true
     })
   ],
@@ -42,7 +49,7 @@ const Validations = buildValidations({
       message: "Position Name should not be only white-space."
     }),
     validator('presence', {
-      disabled: computed.notEmpty('model.json.name'),
+      disabled: notEmpty('model.json.name'),
       presence: true
     })
   ],
@@ -52,7 +59,7 @@ const Validations = buildValidations({
   })
 });
 
-const JsonDefault = Ember.Object.extend({
+const JsonDefault = EmberObject.extend({
   init() {
     this._super(...arguments);
     this.setProperties({
@@ -121,8 +128,8 @@ const Contact = Model.extend(Validations, Copyable, {
     }
   }),
 
-  name: computed.alias('json.name'),
-  contactId: Ember.computed.alias('json.contactId'),
+  name: alias('json.name'),
+  contactId: alias('json.contactId'),
 
   /**
    * The formatted display string for the contact
@@ -133,7 +140,7 @@ const Contact = Model.extend(Validations, Copyable, {
    * @category computed
    * @requires json.name, json.positionName
    */
-  title: computed('json.name', 'json.positionName',
+  title: computed('json.{name,positionName}',
     function () {
       const json = this.get('json');
 
@@ -276,8 +283,8 @@ const Contact = Model.extend(Validations, Copyable, {
    * @category computed
    * @requires json.name, json.isOrganization
    */
-  combinedName: computed('name', 'json.isOrganization',
-    'json.positionName', 'json.memberOfOrganization[]',
+  combinedName: computed('name',
+    'json{isOrganization,positionName,memberOfOrganization[]}',
     function () {
       const json = this.get('json');
 
@@ -319,7 +326,7 @@ const Contact = Model.extend(Validations, Copyable, {
    * @category computed
    * @requires json.contactId
    */
-  shortId: Ember.computed('json.contactId', function () {
+  shortId: computed('json.contactId', function () {
     const contactId = this.get('json.contactId');
     if(contactId && Validator.isUUID(contactId)) {
       let index = contactId.indexOf('-');
@@ -369,7 +376,7 @@ const Contact = Model.extend(Validations, Copyable, {
    */
   copy() {
     let current = this.get('cleanJson');
-    let json = Ember.Object.create(current);
+    let json = EmberObject.create(current);
     let {
       name,
       positionName,

app/models/dictionary.js

@@ -1,22 +1,13 @@
-import Ember from 'ember';
+import { Copyable } from 'ember-copy'
 import DS from 'ember-data';
 import uuidV4 from "npm:uuid/v4";
 import { alias } from '@ember/object/computed';
-//import uuidV4 from 'npm:uuid/v4';
-//import Validator from 'npm:validator';
 import Model from 'mdeditor/models/base';
 import {
   validator,
   buildValidations
 } from 'ember-cp-validations';
-
-const {
-  Copyable,
-  computed,
-  //isEmpty,
-  //get,
-  Object: EmObject
-} = Ember;
+import EmberObject, { computed } from '@ember/object';
 
 const Validations = buildValidations({
   'json.dataDictionary.citation.title': validator('presence', {
@@ -33,7 +24,7 @@ const Validations = buildValidations({
   ]
 });
 
-const JsonDefault = Ember.Object.extend({
+const JsonDefault = EmberObject.extend({
   init() {
     this._super(...arguments);
     this.setProperties({
@@ -106,7 +97,7 @@ export default Model.extend(Validations, Copyable, {
 
   copy() {
     let current = this.get('cleanJson');
-    let json = EmObject.create(current);
+    let json = EmberObject.create(current);
     let name = current.dataDictionary.citation.title;
 
     json.set('dataDictionary.citation.title', `Copy of ${name}`);