Import framework code using module syntax

See emberjs/rfcs#176.

Author: jlblcc

.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');
       }