another pass to improve es6 module usage

packages/ember-application/lib/ext/controller.js

@@ -9,9 +9,9 @@ import { set } from "ember-metal/property_set";
 import EmberError from "ember-metal/error";
 import { inspect } from "ember-metal/utils";
 import { computed } from "ember-metal/computed";
-import { ControllerMixin } from "ember-runtime/controllers/controller";
+import ControllerMixin from "ember-runtime/mixins/controller";
 import { meta } from "ember-metal/utils";
-import { controllerFor } from "ember-routing/system/controller_for";
+import controllerFor from "ember-routing/system/controller_for";
 
 function verifyNeedsDependencies(controller, container, needs) {
   var dependency, i, l, missing = [];

packages/ember-application/lib/system/application.js

@@ -10,12 +10,12 @@ import { runLoadHooks } from "ember-runtime/system/lazy_load";
 import DAG from "ember-application/system/dag";
 import Namespace from "ember-runtime/system/namespace";
 import DeferredMixin from "ember-runtime/mixins/deferred";
-import { DefaultResolver } from "ember-application/system/resolver";
+import DefaultResolver from "ember-application/system/resolver";
 import { create } from "ember-metal/platform";
 import run from "ember-metal/run_loop";
 import { canInvoke } from "ember-metal/utils";
 import Container from 'container/container';
-import { Controller } from "ember-runtime/controllers/controller";
+import Controller from "ember-runtime/controllers/controller";
 import EnumerableUtils from "ember-metal/enumerable_utils";
 import ObjectController from "ember-runtime/controllers/object_controller";
 import ArrayController from "ember-runtime/controllers/array_controller";
@@ -30,31 +30,14 @@ import AutoLocation from "ember-routing/location/auto_location";
 import NoneLocation from "ember-routing/location/none_location";
 import BucketCache from "ember-routing/system/cache";
 
+import {
+  K
+} from 'ember-metal/core';
 import EmberHandlebars from "ember-handlebars-compiler";
+import DeprecatedContainer from "ember-application/system/deprecated-container";
 
-var K = Ember.K;
 var ContainerDebugAdapter;
 
-function DeprecatedContainer(container) {
-  this._container = container;
-}
-
-DeprecatedContainer.deprecate = function(method) {
-  return function() {
-    var container = this._container;
-
-    Ember.deprecate('Using the defaultContainer is no longer supported. [defaultContainer#' + method + '] see: http://git.io/EKPpnA', false);
-    return container[method].apply(container, arguments);
-  };
-};
-
-DeprecatedContainer.prototype = {
-  _container: null,
-  lookup: DeprecatedContainer.deprecate('lookup'),
-  resolve: DeprecatedContainer.deprecate('resolve'),
-  register: DeprecatedContainer.deprecate('register')
-};
-
 /**
   An instance of `Ember.Application` is the starting point for every Ember
   application. It helps to instantiate, initialize and coordinate the many

packages/ember-application/lib/system/deprecated-container.js

@@ -0,0 +1,21 @@
+function DeprecatedContainer(container) {
+  this._container = container;
+}
+
+DeprecatedContainer.deprecate = function(method) {
+  return function() {
+    var container = this._container;
+
+    Ember.deprecate('Using the defaultContainer is no longer supported. [defaultContainer#' + method + '] see: http://git.io/EKPpnA', false);
+    return container[method].apply(container, arguments);
+  };
+};
+
+DeprecatedContainer.prototype = {
+  _container: null,
+  lookup: DeprecatedContainer.deprecate('lookup'),
+  resolve: DeprecatedContainer.deprecate('resolve'),
+  register: DeprecatedContainer.deprecate('register')
+};
+
+export default DeprecatedContainer;

packages/ember-application/lib/system/resolver.js

@@ -118,7 +118,8 @@ export var Resolver = EmberObject.extend({
   @namespace Ember
   @extends Ember.Object
 */
-export var DefaultResolver = EmberObject.extend({
+
+export default EmberObject.extend({
   /**
     This will be set to the Application instance when it is
     created.

packages/ember-application/tests/system/application_test.js

@@ -1,21 +1,21 @@
 /*globals EmberDev */
 
 import Ember from "ember-metal/core";
-import {get} from "ember-metal/property_get";
-import {set} from "ember-metal/property_set";
-import {forEach} from "ember-metal/array";
+import { get } from "ember-metal/property_get";
+import { set } from "ember-metal/property_set";
+import { forEach } from "ember-metal/array";
 import run from "ember-metal/run_loop";
 import Application from "ember-application/system/application";
-import {DefaultResolver} from "ember-application/system/resolver";
+import DefaultResolver from "ember-application/system/resolver";
 import Router from "ember-routing/system/router";
 import View from "ember-views/views/view";
-import {Controller} from "ember-runtime/controllers/controller";
+import Controller from "ember-runtime/controllers/controller";
 import NoneLocation from "ember-routing/location/none_location";
 import EmberHandlebars from "ember-handlebars";
 import EmberObject from "ember-runtime/system/object";
-import {outletHelper} from "ember-routing-handlebars/helpers/outlet";
-
+import { outletHelper } from "ember-routing-handlebars/helpers/outlet";
 import jQuery from "ember-views/system/jquery";
+
 var trim = jQuery.trim;
 
 var view, app, application, originalLookup, originalDebug;

packages/ember-application/tests/system/controller_test.js

@@ -1,6 +1,6 @@
 /*jshint newcap:false */
 
-import { Controller } from "ember-runtime/controllers/controller";
+import Controller from "ember-runtime/controllers/controller";
 import "ember-application/ext/controller";
 
 import Container from "ember-runtime/system/container";

packages/ember-application/tests/system/dependency_injection/custom_resolver_test.js

@@ -1,7 +1,7 @@
 import jQuery from "ember-views/system/jquery";
 import run from "ember-metal/run_loop";
 import Application from "ember-application/system/application";
-import { DefaultResolver } from "ember-application/system/resolver";
+import DefaultResolver from "ember-application/system/resolver";
 
 var application;
 

packages/ember-application/tests/system/dependency_injection/default_resolver_test.js

@@ -1,7 +1,7 @@
 import Ember from "ember-metal/core"; // Ember.TEMPLATES
 import run from "ember-metal/run_loop";
 import Logger from "ember-metal/logger";
-import { Controller } from "ember-runtime/controllers/controller";
+import Controller from "ember-runtime/controllers/controller";
 import EmberObject from "ember-runtime/system/object";
 import EmberHandlebars from "ember-handlebars";
 import Namespace from "ember-runtime/system/namespace";

packages/ember-application/tests/system/dependency_injection/to_string_test.js

@@ -2,7 +2,7 @@ import Ember from "ember-metal/core"; // lookup, etc
 import run from "ember-metal/run_loop";
 import Application from "ember-application/system/application";
 import EmberObject from "ember-runtime/system/object";
-import { DefaultResolver } from "ember-application/system/resolver";
+import DefaultResolver from "ember-application/system/resolver";
 import { guidFor } from "ember-metal/utils";
 
 var originalLookup, App, originalModelInjections;

packages/ember-application/tests/system/logging_test.js

@@ -3,7 +3,7 @@
 import run from "ember-metal/run_loop";
 import Application from "ember-application/system/application";
 import View from "ember-views/views/view";
-import { Controller } from "ember-runtime/controllers/controller";
+import Controller from "ember-runtime/controllers/controller";
 import Route from "ember-routing/system/route";
 import RSVP from "ember-runtime/ext/rsvp";
 import keys from "ember-runtime/keys";

packages/ember-application/tests/system/reset_test.js

@@ -5,7 +5,7 @@ import Application from "ember-application/system/application";
 import EmberObject from "ember-runtime/system/object";
 import Router from "ember-routing/system/router";
 import View from "ember-views/views/view";
-import {Controller} from "ember-runtime/controllers/controller";
+import Controller from "ember-runtime/controllers/controller";
 import EventDispatcher from "ember-views/system/event_dispatcher";
 import jQuery from "ember-views/system/jquery";
 import Container from 'container/container';

packages/ember-extension-support/lib/container_debug_adapter.js

@@ -1,4 +1,5 @@
 import Ember from "ember-metal/core";
+import { A as emberA } from "ember-runtime/system/native_array";
 import { typeOf } from "ember-metal/utils";
 import {
   dasherize,
@@ -46,7 +47,7 @@ import EmberObject from "ember-runtime/system/object";
   @extends EmberObject
   @since 1.5.0
 */
-var ContainerDebugAdapter = EmberObject.extend({
+export default EmberObject.extend({
   /**
     The container of the application being debugged.
     This property will be injected
@@ -88,7 +89,7 @@ var ContainerDebugAdapter = EmberObject.extend({
     @return {Array} An array of strings.
   */
   catalogEntriesByType: function(type) {
-    var namespaces = Ember.A(Namespace.NAMESPACES), types = Ember.A(), self = this;
+    var namespaces = emberA(Namespace.NAMESPACES), types = emberA(), self = this;
     var typeSuffixRegex = new RegExp(classify(type) + "$");
 
     namespaces.forEach(function(namespace) {
@@ -107,5 +108,3 @@ var ContainerDebugAdapter = EmberObject.extend({
     return types;
   }
 });
-
-export default ContainerDebugAdapter;

packages/ember-extension-support/tests/container_debug_adapter_test.js

@@ -1,7 +1,7 @@
 import Ember from "ember-metal/core";
 import run from "ember-metal/run_loop";
 import EmberObject from "ember-runtime/system/object";
-import { Controller as EmberController } from "ember-runtime/controllers/controller";
+import { default as EmberController } from "ember-runtime/controllers/controller";
 import "ember-extension-support"; // Must be required to export Ember.ContainerDebugAdapter
 import Application from "ember-application/system/application";
 

packages/ember-extension-support/tests/data_adapter_test.js

@@ -7,10 +7,10 @@ import {
   removeObserver
 } from "ember-metal/observer";
 import EmberObject from "ember-runtime/system/object";
-import { Controller as EmberController } from "ember-runtime/controllers/controller";
+import { default as EmberController } from "ember-runtime/controllers/controller";
 import EmberDataAdapter from "ember-extension-support/data_adapter";
 import EmberApplication from "ember-application/system/application";
-import { DefaultResolver } from "ember-application/system/resolver";
+import DefaultResolver from "ember-application/system/resolver";
 
 var adapter, App, Model = EmberObject.extend();
 

packages/ember-handlebars/lib/controls/checkbox.js

@@ -31,24 +31,33 @@ import View from "ember-views/views/view";
   @namespace Ember
   @extends Ember.View
 */
-var Checkbox = View.extend({
+export default View.extend({
   instrumentDisplay: '{{input type="checkbox"}}',
 
   classNames: ['ember-checkbox'],
 
   tagName: 'input',
 
-  attributeBindings: ['type', 'checked', 'indeterminate', 'disabled', 'tabindex', 'name',
-                      'autofocus', 'required', 'form'],
-
-  type: "checkbox",
+  attributeBindings: [
+    'type',
+    'checked',
+    'indeterminate',
+    'disabled',
+    'tabindex',
+    'name',
+    'autofocus',
+    'required',
+    'form'
+  ],
+
+  type: 'checkbox',
   checked: false,
   disabled: false,
   indeterminate: false,
 
   init: function() {
     this._super();
-    this.on("change", this, this._updateElementValue);
+    this.on('change', this, this._updateElementValue);
   },
 
   didInsertElement: function() {
@@ -60,5 +69,3 @@ var Checkbox = View.extend({
     set(this, 'checked', this.$().prop('checked'));
   }
 });
-
-export default Checkbox;

packages/ember-handlebars/lib/controls/select.js

@@ -4,7 +4,14 @@
 */
 
 import EmberHandlebars from "ember-handlebars-compiler";
-import EnumerableUtils from "ember-metal/enumerable_utils";
+
+import {
+  forEach,
+  indexOf,
+  indexesOf,
+  replace
+} from "ember-metal/enumerable_utils";
+
 import { get } from "ember-metal/property_get";
 import { set } from "ember-metal/property_set";
 import View from "ember-views/views/view";
@@ -16,11 +23,7 @@ import { A as emberA } from "ember-runtime/system/native_array";
 import { observer } from "ember-metal/mixin";
 import { defineProperty } from "ember-metal/properties";
 
-var indexOf = EnumerableUtils.indexOf,
-    indexesOf = EnumerableUtils.indexesOf,
-    forEach = EnumerableUtils.forEach,
-    replace = EnumerableUtils.replace,
-    precompileTemplate = EmberHandlebars.compile;
+var precompileTemplate = EmberHandlebars.compile;
 
 var SelectOption = View.extend({
   instrumentDisplay: 'Ember.SelectOption',

packages/ember-handlebars/lib/helpers/each.js

@@ -15,7 +15,7 @@ import { get } from "ember-metal/property_get";
 import { set } from "ember-metal/property_set";
 import CollectionView from "ember-views/views/collection_view";
 import { Binding } from "ember-metal/binding";
-import { ControllerMixin } from "ember-runtime/controllers/controller";
+import ControllerMixin from "ember-runtime/mixins/controller";
 import ArrayController from "ember-runtime/controllers/array_controller";
 import EmberArray from "ember-runtime/mixins/array";
 import copy from "ember-runtime/copy";

packages/ember-handlebars/lib/views/handlebars_bound_view.js

@@ -28,7 +28,7 @@ import {
 } from "ember-views/views/states";
 var viewStates = states;
 
-import { _MetamorphView } from "ember-handlebars/views/metamorph_view";
+import _MetamorphView from "ember-handlebars/views/metamorph_view";
 import { handlebarsGet } from "ember-handlebars/ext";
 
 function SimpleHandlebarsView(path, pathRoot, isEscaped, templateData) {

packages/ember-handlebars/lib/views/metamorph_view.js

@@ -136,3 +136,4 @@ export var _MetamorphView = View.extend(_Metamorph);
   @private
 */
 export var _SimpleMetamorphView = CoreView.extend(_Metamorph);
+export default View.extend(_Metamorph);

packages/ember-handlebars/tests/controls/select_test.js

@@ -2,15 +2,14 @@ import EmberObject from "ember-runtime/system/object";
 import run from "ember-metal/run_loop";
 import EmberView from "ember-views/views/view";
 import jQuery from "ember-views/system/jquery";
-import EnumerableUtils from "ember-metal/enumerable_utils";
+import { map } from "ember-metal/enumerable_utils";
 import EventDispatcher from "ember-views/system/event_dispatcher";
 import { computed } from "ember-metal/computed";
 import Namespace from "ember-runtime/system/namespace";
 import ArrayController from "ember-runtime/controllers/array_controller";
 import ArrayProxy from "ember-runtime/system/array_proxy";
 
-var map = EnumerableUtils.map,
-    trim = jQuery.trim;
+var trim = jQuery.trim;
 
 var dispatcher, select, view;
 

packages/ember-handlebars/tests/handlebars_test.js

@@ -4,7 +4,7 @@
 import Ember from "ember-metal/core"; // Ember.lookup
 import jQuery from "ember-views/system/jquery";
 // import {expectAssertion} from "ember-metal/tests/debug_helpers";
-import EnumerableUtils from "ember-metal/enumerable_utils";
+import { forEach } from "ember-metal/enumerable_utils";
 import run from "ember-metal/run_loop";
 import Namespace from "ember-runtime/system/namespace";
 import EmberView from "ember-views/views/view";
@@ -32,7 +32,6 @@ Ember.ContainerView = ContainerView;
 Ember.Logger = Logger;
 
 var trim = jQuery.trim;
-var forEach = EnumerableUtils.forEach;
 
 import { get } from "ember-metal/property_get";
 import { set } from "ember-metal/property_set";

packages/ember-handlebars/tests/helpers/each_test.js

@@ -8,7 +8,7 @@ import ArrayController from "ember-runtime/controllers/array_controller";
 import EmberHandlebars from "ember-handlebars-compiler";
 // import {expectAssertion} from "ember-metal/tests/debug_helpers";
 import { A } from "ember-runtime/system/native_array";
-import { Controller as EmberController } from "ember-runtime/controllers/controller";
+import { default as EmberController } from "ember-runtime/controllers/controller";
 import ObjectController from "ember-runtime/controllers/object_controller";
 import Container from "ember-runtime/system/container";
 

packages/ember-handlebars/tests/views/metamorph_view_test.js

@@ -6,7 +6,7 @@ import { set } from "ember-metal/property_set";
 import { observer } from "ember-metal/mixin";
 import EmberHandlebars from "ember-handlebars-compiler";
 
-import { _MetamorphView } from "ember-handlebars/views/metamorph_view";
+import _MetamorphView from "ember-handlebars/views/metamorph_view";
 
 var view, childView, metamorphView;
 

packages/ember-metal/lib/core.js

@@ -191,8 +191,10 @@ Ember.LOG_VERSION = (Ember.ENV.LOG_VERSION === false) ? false : true;
   @private
   @return {Object}
 */
-Ember.K = function() { return this; };
-
+var K = function() { return this; };
+export var K = K;
+Ember.K = K;
+//TODO: ES6 GLOBL TODO
 
 // Stub out the methods defined by the ember-debug package in case it's not loaded